diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 2a85f70..1b94ca5 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -35,3 +35,6 @@
 
 # js formatting
 ec74a5e56617bbd76ac402451468fd4668af543d
+
+# ruff formatting
+a308792ee7fda18a681e9181f4fd00b36385bc23
diff --git a/.github/helper/documentation.py b/.github/helper/documentation.py
index 8334604..b4f9c39 100644
--- a/.github/helper/documentation.py
+++ b/.github/helper/documentation.py
@@ -1,7 +1,7 @@
 import sys
-import requests
 from urllib.parse import urlparse
 
+import requests
 
 WEBSITE_REPOS = [
 	"erpnext_com",
@@ -36,11 +36,7 @@
 
 
 def contains_documentation_link(body: str) -> bool:
-	return any(
-		is_documentation_link(word)
-		for line in body.splitlines()
-		for word in line.split()
-	)
+	return any(is_documentation_link(word) for line in body.splitlines() for word in line.split())
 
 
 def check_pull_request(number: str) -> "tuple[int, str]":
@@ -53,12 +49,7 @@
 	head_sha = (payload.get("head") or {}).get("sha")
 	body = (payload.get("body") or "").lower()
 
-	if (
-		not title.startswith("feat")
-		or not head_sha
-		or "no-docs" in body
-		or "backport" in body
-	):
+	if not title.startswith("feat") or not head_sha or "no-docs" in body or "backport" in body:
 		return 0, "Skipping documentation checks... 🏃"
 
 	if contains_documentation_link(body):
diff --git a/.github/helper/translation.py b/.github/helper/translation.py
index 9146b3b..2918f78 100644
--- a/.github/helper/translation.py
+++ b/.github/helper/translation.py
@@ -2,7 +2,9 @@
 import sys
 
 errors_encounter = 0
-pattern = re.compile(r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,(\s*?.*?\n*?)*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)")
+pattern = re.compile(
+	r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,(\s*?.*?\n*?)*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)"
+)
 words_pattern = re.compile(r"_{1,2}\([\"'`]{1,3}.*?[a-zA-Z]")
 start_pattern = re.compile(r"_{1,2}\([f\"'`]{1,3}")
 f_string_pattern = re.compile(r"_\(f[\"']")
@@ -10,14 +12,14 @@
 
 # skip first argument
 files = sys.argv[1:]
-files_to_scan = [_file for _file in files if _file.endswith(('.py', '.js'))]
+files_to_scan = [_file for _file in files if _file.endswith((".py", ".js"))]
 
 for _file in files_to_scan:
-	with open(_file, 'r') as f:
-		print(f'Checking: {_file}')
+	with open(_file) as f:
+		print(f"Checking: {_file}")
 		file_lines = f.readlines()
 		for line_number, line in enumerate(file_lines, 1):
-			if 'frappe-lint: disable-translate' in line:
+			if "frappe-lint: disable-translate" in line:
 				continue
 
 			start_matches = start_pattern.search(line)
@@ -28,7 +30,9 @@
 					has_f_string = f_string_pattern.search(line)
 					if has_f_string:
 						errors_encounter += 1
-						print(f'\nF-strings are not supported for translations at line number {line_number}\n{line.strip()[:100]}')
+						print(
+							f"\nF-strings are not supported for translations at line number {line_number}\n{line.strip()[:100]}"
+						)
 						continue
 					else:
 						continue
@@ -36,25 +40,29 @@
 				match = pattern.search(line)
 				error_found = False
 
-				if not match and line.endswith((',\n', '[\n')):
+				if not match and line.endswith((",\n", "[\n")):
 					# concat remaining text to validate multiline pattern
-					line = "".join(file_lines[line_number - 1:])
-					line = line[start_matches.start() + 1:]
+					line = "".join(file_lines[line_number - 1 :])
+					line = line[start_matches.start() + 1 :]
 					match = pattern.match(line)
 
 				if not match:
 					error_found = True
-					print(f'\nTranslation syntax error at line number {line_number}\n{line.strip()[:100]}')
+					print(f"\nTranslation syntax error at line number {line_number}\n{line.strip()[:100]}")
 
 				if not error_found and not words_pattern.search(line):
 					error_found = True
-					print(f'\nTranslation is useless because it has no words at line number {line_number}\n{line.strip()[:100]}')
+					print(
+						f"\nTranslation is useless because it has no words at line number {line_number}\n{line.strip()[:100]}"
+					)
 
 				if error_found:
 					errors_encounter += 1
 
 if errors_encounter > 0:
-	print('\nVisit "https://frappeframework.com/docs/user/en/translations" to learn about valid translation strings.')
+	print(
+		'\nVisit "https://frappeframework.com/docs/user/en/translations" to learn about valid translation strings.'
+	)
 	sys.exit(1)
 else:
-	print('\nGood To Go!')
+	print("\nGood To Go!")
diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml
index 3514f0d..deca007 100644
--- a/.github/workflows/patch.yml
+++ b/.github/workflows/patch.yml
@@ -32,7 +32,7 @@
 
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Check for valid Python & Merge Conflicts
         run: |
@@ -43,12 +43,12 @@
           fi
 
       - name: Setup Python
-        uses: "actions/setup-python@v4"
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.11'
 
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           check-latest: true
@@ -57,7 +57,7 @@
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -66,7 +66,7 @@
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -81,7 +81,7 @@
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
diff --git a/.github/workflows/server-tests-mariadb.yml b/.github/workflows/server-tests-mariadb.yml
index 1e5125e..67f5856 100644
--- a/.github/workflows/server-tests-mariadb.yml
+++ b/.github/workflows/server-tests-mariadb.yml
@@ -54,12 +54,12 @@
 
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.11'
+          python-version: '3.12'
 
       - name: Check for valid Python & Merge Conflicts
         run: |
@@ -70,7 +70,7 @@
           fi
 
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           check-latest: true
@@ -79,7 +79,7 @@
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -88,7 +88,7 @@
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -103,7 +103,7 @@
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -144,13 +144,13 @@
     if: ${{ github.event_name != 'pull_request' }}
     steps:
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Download artifacts
         uses: actions/download-artifact@v3
 
       - name: Upload coverage data
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v4
         with:
           name: MariaDB
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/server-tests-postgres.yml b/.github/workflows/server-tests-postgres.yml
index a688706..7b2d52a 100644
--- a/.github/workflows/server-tests-postgres.yml
+++ b/.github/workflows/server-tests-postgres.yml
@@ -41,12 +41,12 @@
     steps:
 
       - name: Clone
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
-          python-version: '3.10'
+          python-version: '3.12'
 
       - name: Check for valid Python & Merge Conflicts
         run: |
@@ -57,7 +57,7 @@
           fi
 
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           check-latest: true
@@ -66,7 +66,7 @@
         run: echo "127.0.0.1 test_site" | sudo tee -a /etc/hosts
 
       - name: Cache pip
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/*requirements.txt', '**/pyproject.toml') }}
@@ -75,7 +75,7 @@
             ${{ runner.os }}-
 
       - name: Cache node modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         env:
           cache-name: cache-node-modules
         with:
@@ -90,7 +90,7 @@
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: yarn-cache
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1f11581..c3cbbb7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -55,28 +55,15 @@
                 erpnext/templates/includes/.*
             )$
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 6.0.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.2.0
     hooks:
-      - id: flake8
-        additional_dependencies: [
-          'flake8-bugbear',
-          'flake8-tuple',
-        ]
-        args: ['--config', '.github/helper/.flake8_strict']
-        exclude: ".*setup.py$"
+      - id: ruff
+        name: "Run ruff linter and apply fixes"
+        args: ["--fix"]
 
-  - repo: https://github.com/adityahase/black
-    rev: 9cb0a69f4d0030cdf687eddf314468b39ed54119
-    hooks:
-      - id: black
-        additional_dependencies: ['click==8.0.4']
-
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        exclude: ".*setup.py$"
+      - id: ruff-format
+        name: "Format Python code"
 
 
 ci:
diff --git a/babel_extractors.csv b/babel_extractors.csv
new file mode 100644
index 0000000..a8ae8a7
--- /dev/null
+++ b/babel_extractors.csv
@@ -0,0 +1 @@
+**/setup/setup_wizard/data/uom_data.json,erpnext.gettext.extractors.uom_data.extract
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index 1c1c10c..7a8ff19 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -37,9 +37,7 @@
 	if not frappe.flags.company_cost_center:
 		frappe.flags.company_cost_center = {}
 	if company not in frappe.flags.company_cost_center:
-		frappe.flags.company_cost_center[company] = frappe.get_cached_value(
-			"Company", company, "cost_center"
-		)
+		frappe.flags.company_cost_center[company] = frappe.get_cached_value("Company", company, "cost_center")
 	return frappe.flags.company_cost_center[company]
 
 
diff --git a/erpnext/accounts/custom/address.py b/erpnext/accounts/custom/address.py
index 775a81f..ef57a63 100644
--- a/erpnext/accounts/custom/address.py
+++ b/erpnext/accounts/custom/address.py
@@ -11,14 +11,14 @@
 	def validate(self):
 		self.validate_reference()
 		self.update_compnay_address()
-		super(ERPNextAddress, self).validate()
+		super().validate()
 
 	def link_address(self):
 		"""Link address based on owner"""
 		if self.is_your_company_address:
 			return
 
-		return super(ERPNextAddress, self).link_address()
+		return super().link_address()
 
 	def update_compnay_address(self):
 		for link in self.get("links"):
@@ -26,11 +26,11 @@
 				self.is_your_company_address = 1
 
 	def validate_reference(self):
-		if self.is_your_company_address and not [
-			row for row in self.links if row.link_doctype == "Company"
-		]:
+		if self.is_your_company_address and not [row for row in self.links if row.link_doctype == "Company"]:
 			frappe.throw(
-				_("Address needs to be linked to a Company. Please add a row for Company in the Links table."),
+				_(
+					"Address needs to be linked to a Company. Please add a row for Company in the Links table."
+				),
 				title=_("Company Not Linked"),
 			)
 
diff --git a/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py b/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
index f091a4f..01e6c48 100644
--- a/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
+++ b/erpnext/accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.py
@@ -37,7 +37,7 @@
 	filters = frappe.parse_json(filters) or frappe.parse_json(chart.filters_json)
 
 	account = filters.get("account")
-	company = filters.get("company")
+	filters.get("company")
 
 	if not account and chart_name:
 		frappe.throw(
@@ -83,7 +83,6 @@
 
 	# get balances in debit
 	for entry in gl_entries:
-
 		# entry date is after the current pointer, so move the pointer forward
 		while getdate(entry.posting_date) > result[date_index][0]:
 			date_index += 1
@@ -133,8 +132,6 @@
 
 	dates = [get_period_ending(from_date, timegrain)]
 	while getdate(dates[-1]) < getdate(to_date):
-		date = get_period_ending(
-			add_to_date(dates[-1], years=years, months=months, days=days), timegrain
-		)
+		date = get_period_ending(add_to_date(dates[-1], years=years, months=months, days=days), timegrain)
 		dates.append(date)
 	return dates
diff --git a/erpnext/accounts/deferred_revenue.py b/erpnext/accounts/deferred_revenue.py
index 367b017..3dc3e7a 100644
--- a/erpnext/accounts/deferred_revenue.py
+++ b/erpnext/accounts/deferred_revenue.py
@@ -24,14 +24,10 @@
 def validate_service_stop_date(doc):
 	"""Validates service_stop_date for Purchase Invoice and Sales Invoice"""
 
-	enable_check = (
-		"enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
-	)
+	enable_check = "enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
 
 	old_stop_dates = {}
-	old_doc = frappe.db.get_all(
-		"{0} Item".format(doc.doctype), {"parent": doc.name}, ["name", "service_stop_date"]
-	)
+	old_doc = frappe.db.get_all(f"{doc.doctype} Item", {"parent": doc.name}, ["name", "service_stop_date"])
 
 	for d in old_doc:
 		old_stop_dates[d.name] = d.service_stop_date or ""
@@ -62,16 +58,14 @@
 	)
 
 	if account:
-		conditions += "AND %s='%s'" % (deferred_account, account)
+		conditions += f"AND {deferred_account}='{account}'"
 	elif company:
 		conditions += f"AND p.company = {frappe.db.escape(company)}"
 
 	return conditions
 
 
-def convert_deferred_expense_to_expense(
-	deferred_process, start_date=None, end_date=None, conditions=""
-):
+def convert_deferred_expense_to_expense(deferred_process, start_date=None, end_date=None, conditions=""):
 	# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
 
 	if not start_date:
@@ -81,16 +75,14 @@
 
 	# check for the purchase invoice for which GL entries has to be done
 	invoices = frappe.db.sql_list(
-		"""
+		f"""
 		select distinct item.parent
 		from `tabPurchase Invoice Item` item, `tabPurchase Invoice` p
 		where item.service_start_date<=%s and item.service_end_date>=%s
 		and item.enable_deferred_expense = 1 and item.parent=p.name
 		and item.docstatus = 1 and ifnull(item.amount, 0) > 0
-		{0}
-	""".format(
-			conditions
-		),
+		{conditions}
+	""",
 		(end_date, start_date),
 	)  # nosec
 
@@ -103,9 +95,7 @@
 		send_mail(deferred_process)
 
 
-def convert_deferred_revenue_to_income(
-	deferred_process, start_date=None, end_date=None, conditions=""
-):
+def convert_deferred_revenue_to_income(deferred_process, start_date=None, end_date=None, conditions=""):
 	# book the expense/income on the last day, but it will be trigger on the 1st of month at 12:00 AM
 
 	if not start_date:
@@ -115,16 +105,14 @@
 
 	# check for the sales invoice for which GL entries has to be done
 	invoices = frappe.db.sql_list(
-		"""
+		f"""
 		select distinct item.parent
 		from `tabSales Invoice Item` item, `tabSales Invoice` p
 		where item.service_start_date<=%s and item.service_end_date>=%s
 		and item.enable_deferred_revenue = 1 and item.parent=p.name
 		and item.docstatus = 1 and ifnull(item.amount, 0) > 0
-		{0}
-	""".format(
-			conditions
-		),
+		{conditions}
+	""",
 		(end_date, start_date),
 	)  # nosec
 
@@ -243,9 +231,7 @@
 		already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(
 			doc, item
 		)
-		base_amount = flt(
-			item.base_net_amount - already_booked_amount, item.precision("base_net_amount")
-		)
+		base_amount = flt(item.base_net_amount - already_booked_amount, item.precision("base_net_amount"))
 		if account_currency == doc.company_currency:
 			amount = base_amount
 		else:
@@ -265,17 +251,13 @@
 		if account_currency == doc.company_currency:
 			amount = base_amount
 		else:
-			amount = flt(
-				item.net_amount * total_booking_days / flt(total_days), item.precision("net_amount")
-			)
+			amount = flt(item.net_amount * total_booking_days / flt(total_days), item.precision("net_amount"))
 	else:
 		already_booked_amount, already_booked_amount_in_account_currency = get_already_booked_amount(
 			doc, item
 		)
 
-		base_amount = flt(
-			item.base_net_amount - already_booked_amount, item.precision("base_net_amount")
-		)
+		base_amount = flt(item.base_net_amount - already_booked_amount, item.precision("base_net_amount"))
 		if account_currency == doc.company_currency:
 			amount = base_amount
 		else:
@@ -296,26 +278,22 @@
 
 	gl_entries_details = frappe.db.sql(
 		"""
-		select sum({0}) as total_credit, sum({1}) as total_credit_in_account_currency, voucher_detail_no
+		select sum({}) as total_credit, sum({}) as total_credit_in_account_currency, voucher_detail_no
 		from `tabGL Entry` where company=%s and account=%s and voucher_type=%s and voucher_no=%s and voucher_detail_no=%s
 		and is_cancelled = 0
 		group by voucher_detail_no
-	""".format(
-			total_credit_debit, total_credit_debit_currency
-		),
+	""".format(total_credit_debit, total_credit_debit_currency),
 		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
 		as_dict=True,
 	)
 
 	journal_entry_details = frappe.db.sql(
 		"""
-		SELECT sum(c.{0}) as total_credit, sum(c.{1}) as total_credit_in_account_currency, reference_detail_no
+		SELECT sum(c.{}) as total_credit, sum(c.{}) as total_credit_in_account_currency, reference_detail_no
 		FROM `tabJournal Entry` p , `tabJournal Entry Account` c WHERE p.name = c.parent and
 		p.company = %s and c.account=%s and c.reference_type=%s and c.reference_name=%s and c.reference_detail_no=%s
 		and p.docstatus < 2 group by reference_detail_no
-	""".format(
-			total_credit_debit, total_credit_debit_currency
-		),
+	""".format(total_credit_debit, total_credit_debit_currency),
 		(doc.company, item.get(deferred_account), doc.doctype, doc.name, item.name),
 		as_dict=True,
 	)
@@ -337,9 +315,7 @@
 
 
 def book_deferred_income_or_expense(doc, deferred_process, posting_date=None):
-	enable_check = (
-		"enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
-	)
+	enable_check = "enable_deferred_revenue" if doc.doctype == "Sales Invoice" else "enable_deferred_expense"
 
 	accounts_frozen_upto = frappe.db.get_single_value("Accounts Settings", "acc_frozen_upto")
 
@@ -440,9 +416,7 @@
 	via_journal_entry = cint(
 		frappe.db.get_singles_value("Accounts Settings", "book_deferred_entries_via_journal_entry")
 	)
-	submit_journal_entry = cint(
-		frappe.db.get_singles_value("Accounts Settings", "submit_journal_entries")
-	)
+	submit_journal_entry = cint(frappe.db.get_singles_value("Accounts Settings", "submit_journal_entries"))
 	book_deferred_entries_based_on = frappe.db.get_singles_value(
 		"Accounts Settings", "book_deferred_entries_based_on"
 	)
@@ -462,9 +436,7 @@
 		posting_date = today()
 
 	if not cint(
-		frappe.db.get_singles_value(
-			"Accounts Settings", "automatically_process_deferred_accounting_entry"
-		)
+		frappe.db.get_singles_value("Accounts Settings", "automatically_process_deferred_accounting_entry")
 	):
 		return
 
@@ -587,16 +559,13 @@
 	deferred_process=None,
 	submit="No",
 ):
-
 	if amount == 0:
 		return
 
 	journal_entry = frappe.new_doc("Journal Entry")
 	journal_entry.posting_date = posting_date
 	journal_entry.company = doc.company
-	journal_entry.voucher_type = (
-		"Deferred Revenue" if doc.doctype == "Sales Invoice" else "Deferred Expense"
-	)
+	journal_entry.voucher_type = "Deferred Revenue" if doc.doctype == "Sales Invoice" else "Deferred Expense"
 	journal_entry.process_deferred_accounting = deferred_process
 
 	debit_entry = {
@@ -645,7 +614,6 @@
 
 
 def get_deferred_booking_accounts(doctype, voucher_detail_no, dr_or_cr):
-
 	if doctype == "Sales Invoice":
 		credit_account, debit_account = frappe.db.get_value(
 			"Sales Invoice Item",
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index 63911f5..881cf1f 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -193,7 +193,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2024-01-10 04:57:33.681676",
+ "modified": "2024-03-27 13:05:55.866034",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account",
@@ -251,8 +251,8 @@
  "search_fields": "account_number",
  "show_name_in_global_search": 1,
  "show_preview_popup": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/account.py b/erpnext/accounts/doctype/account/account.py
index 3f11798..db95d6c 100644
--- a/erpnext/accounts/doctype/account/account.py
+++ b/erpnext/accounts/doctype/account/account.py
@@ -88,12 +88,10 @@
 		if frappe.local.flags.ignore_update_nsm:
 			return
 		else:
-			super(Account, self).on_update()
+			super().on_update()
 
 	def onload(self):
-		frozen_accounts_modifier = frappe.db.get_single_value(
-			"Accounts Settings", "frozen_accounts_modifier"
-		)
+		frozen_accounts_modifier = frappe.db.get_single_value("Accounts Settings", "frozen_accounts_modifier")
 		if not frozen_accounts_modifier or frozen_accounts_modifier in frappe.get_roles():
 			self.set_onload("can_freeze_account", True)
 
@@ -218,9 +216,7 @@
 
 	def validate_root_company_and_sync_account_to_children(self):
 		# ignore validation while creating new compnay or while syncing to child companies
-		if (
-			frappe.local.flags.ignore_root_company_validation or self.flags.ignore_root_company_validation
-		):
+		if frappe.local.flags.ignore_root_company_validation or self.flags.ignore_root_company_validation:
 			return
 		ancestors = get_root_company(self.company)
 		if ancestors:
@@ -418,7 +414,7 @@
 		if self.check_gle_exists():
 			throw(_("Account with existing transaction can not be deleted"))
 
-		super(Account, self).on_trash(True)
+		super().on_trash(True)
 
 
 @frappe.whitelist()
@@ -426,9 +422,8 @@
 def get_parent_account(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql(
 		"""select name from tabAccount
-		where is_group = 1 and docstatus != 2 and company = %s
-		and %s like %s order by name limit %s offset %s"""
-		% ("%s", searchfield, "%s", "%s", "%s"),
+		where is_group = 1 and docstatus != 2 and company = {}
+		and {} like {} order by name limit {} offset {}""".format("%s", searchfield, "%s", "%s", "%s"),
 		(filters["company"], "%%%s%%" % txt, page_len, start),
 		as_list=1,
 	)
@@ -594,7 +589,5 @@
 	if old_acc_number:
 		filters["account_number"] = old_acc_number
 
-	for d in frappe.db.get_values(
-		"Account", filters=filters, fieldname=["company", "name"], as_dict=True
-	):
+	for d in frappe.db.get_values("Account", filters=filters, fieldname=["company", "name"], as_dict=True):
 		update_account_number(d["name"], account_name, account_number, from_descendant=True)
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
index 05ff2a1..0ddae1b 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
@@ -31,7 +31,6 @@
 					"tax_rate",
 					"account_currency",
 				]:
-
 					account_number = cstr(child.get("account_number")).strip()
 					account_name, account_name_in_db = add_suffix_if_duplicate(
 						account_name, account_number, accounts
@@ -39,7 +38,9 @@
 
 					is_group = identify_is_group(child)
 					report_type = (
-						"Balance Sheet" if root_type in ["Asset", "Liability", "Equity"] else "Profit and Loss"
+						"Balance Sheet"
+						if root_type in ["Asset", "Liability", "Equity"]
+						else "Profit and Loss"
 					)
 
 					account = frappe.get_doc(
@@ -141,7 +142,7 @@
 			for fname in os.listdir(path):
 				fname = frappe.as_unicode(fname)
 				if fname.endswith(".json"):
-					with open(os.path.join(path, fname), "r") as f:
+					with open(os.path.join(path, fname)) as f:
 						chart = f.read()
 						if chart and json.loads(chart).get("name") == chart_template:
 							return json.loads(chart).get("tree")
@@ -173,7 +174,7 @@
 			for fname in os.listdir(path):
 				fname = frappe.as_unicode(fname)
 				if (fname.startswith(country_code) or fname.startswith(country)) and fname.endswith(".json"):
-					with open(os.path.join(path, fname), "r") as f:
+					with open(os.path.join(path, fname)) as f:
 						_get_chart_name(f.read())
 
 	# if more than one charts, returned then add the standard
@@ -249,7 +250,13 @@
 
 		def _get_account_names(account_master):
 			for account_name, child in account_master.items():
-				if account_name not in ["account_number", "account_type", "root_type", "is_group", "tax_rate"]:
+				if account_name not in [
+					"account_number",
+					"account_type",
+					"root_type",
+					"is_group",
+					"tax_rate",
+				]:
 					accounts.append(account_name)
 
 					_get_account_names(child)
diff --git a/erpnext/accounts/doctype/account/test_account.py b/erpnext/accounts/doctype/account/test_account.py
index 7d0869b..be856bc 100644
--- a/erpnext/accounts/doctype/account/test_account.py
+++ b/erpnext/accounts/doctype/account/test_account.py
@@ -261,28 +261,20 @@
 		acc.insert()
 
 		self.assertTrue(
-			frappe.db.exists(
-				"Account", {"account_name": "Test Group Account", "company": "_Test Company 4"}
-			)
+			frappe.db.exists("Account", {"account_name": "Test Group Account", "company": "_Test Company 4"})
 		)
 		self.assertTrue(
-			frappe.db.exists(
-				"Account", {"account_name": "Test Group Account", "company": "_Test Company 5"}
-			)
+			frappe.db.exists("Account", {"account_name": "Test Group Account", "company": "_Test Company 5"})
 		)
 
 		# Try renaming child company account
 		acc_tc_5 = frappe.db.get_value(
 			"Account", {"account_name": "Test Group Account", "company": "_Test Company 5"}
 		)
-		self.assertRaises(
-			frappe.ValidationError, update_account_number, acc_tc_5, "Test Modified Account"
-		)
+		self.assertRaises(frappe.ValidationError, update_account_number, acc_tc_5, "Test Modified Account")
 
 		# Rename child company account with allow_account_creation_against_child_company enabled
-		frappe.db.set_value(
-			"Company", "_Test Company 5", "allow_account_creation_against_child_company", 1
-		)
+		frappe.db.set_value("Company", "_Test Company 5", "allow_account_creation_against_child_company", 1)
 
 		update_account_number(acc_tc_5, "Test Modified Account")
 		self.assertTrue(
@@ -291,9 +283,7 @@
 			)
 		)
 
-		frappe.db.set_value(
-			"Company", "_Test Company 5", "allow_account_creation_against_child_company", 0
-		)
+		frappe.db.set_value("Company", "_Test Company 5", "allow_account_creation_against_child_company", 0)
 
 		to_delete = [
 			"Test Group Account - _TC3",
@@ -318,9 +308,7 @@
 		self.assertEqual(acc.account_currency, "INR")
 
 		# Make a JV against this account
-		make_journal_entry(
-			"Test Currency Account - _TC", "Miscellaneous Expenses - _TC", 100, submit=True
-		)
+		make_journal_entry("Test Currency Account - _TC", "Miscellaneous Expenses - _TC", 100, submit=True)
 
 		acc.account_currency = "USD"
 		self.assertRaises(frappe.ValidationError, acc.save)
diff --git a/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json b/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json
index 8dacb96..7cafacf 100644
--- a/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json
+++ b/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.json
@@ -129,7 +129,7 @@
  "icon": "fa fa-list",
  "in_create": 1,
  "links": [],
- "modified": "2023-03-06 08:56:36.393237",
+ "modified": "2024-03-27 13:05:56.710541",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Account Closing Balance",
@@ -158,7 +158,7 @@
    "role": "Auditor"
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py b/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py
index 65933ab..82821e1 100644
--- a/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py
+++ b/erpnext/accounts/doctype/account_closing_balance/account_closing_balance.py
@@ -40,16 +40,12 @@
 def make_closing_entries(closing_entries, voucher_name, company, closing_date):
 	accounting_dimensions = get_accounting_dimensions()
 
-	previous_closing_entries = get_previous_closing_entries(
-		company, closing_date, accounting_dimensions
-	)
+	previous_closing_entries = get_previous_closing_entries(company, closing_date, accounting_dimensions)
 	combined_entries = closing_entries + previous_closing_entries
 
-	merged_entries = aggregate_with_last_account_closing_balance(
-		combined_entries, accounting_dimensions
-	)
+	merged_entries = aggregate_with_last_account_closing_balance(combined_entries, accounting_dimensions)
 
-	for key, value in merged_entries.items():
+	for _key, value in merged_entries.items():
 		cle = frappe.new_doc("Account Closing Balance")
 		cle.update(value)
 		cle.update(value["dimensions"])
diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json
index 5858f10..0e0e713 100644
--- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json
+++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json
@@ -49,7 +49,7 @@
   }
  ],
  "links": [],
- "modified": "2021-02-08 16:37:53.936656",
+ "modified": "2024-03-27 13:05:56.890002",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting Dimension",
@@ -80,7 +80,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
index 41af06f..db99bcd 100644
--- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
+++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
@@ -40,7 +40,8 @@
 		self.set_fieldname_and_label()
 
 	def validate(self):
-		if self.document_type in core_doctypes_list + (
+		if self.document_type in (
+			*core_doctypes_list,
 			"Accounting Dimension",
 			"Project",
 			"Cost Center",
@@ -48,13 +49,10 @@
 			"Company",
 			"Account",
 		):
-
 			msg = _("Not allowed to create accounting dimension for {0}").format(self.document_type)
 			frappe.throw(msg)
 
-		exists = frappe.db.get_value(
-			"Accounting Dimension", {"document_type": self.document_type}, ["name"]
-		)
+		exists = frappe.db.get_value("Accounting Dimension", {"document_type": self.document_type}, ["name"])
 
 		if exists and self.is_new():
 			frappe.throw(_("Document Type already used as a dimension"))
@@ -113,7 +111,6 @@
 	repostable_doctypes = get_allowed_types_from_settings()
 
 	for doctype in doclist:
-
 		if (doc_count + 1) % 2 == 0:
 			insert_after_field = "dimension_col_break"
 		else:
@@ -148,7 +145,7 @@
 	df.update(
 		{
 			"insert_after": "cost_center",
-			"depends_on": "eval:doc.budget_against == '{0}'".format(doc.document_type),
+			"depends_on": f"eval:doc.budget_against == '{doc.document_type}'",
 		}
 	)
 
@@ -182,19 +179,17 @@
 	frappe.db.sql(
 		"""
 		DELETE FROM `tabCustom Field`
-		WHERE fieldname = %s
-		AND dt IN (%s)"""
-		% ("%s", ", ".join(["%s"] * len(doclist))),  # nosec
-		tuple([doc.fieldname] + doclist),
+		WHERE fieldname = {}
+		AND dt IN ({})""".format("%s", ", ".join(["%s"] * len(doclist))),  # nosec
+		tuple([doc.fieldname, *doclist]),
 	)
 
 	frappe.db.sql(
 		"""
 		DELETE FROM `tabProperty Setter`
-		WHERE field_name = %s
-		AND doc_type IN (%s)"""
-		% ("%s", ", ".join(["%s"] * len(doclist))),  # nosec
-		tuple([doc.fieldname] + doclist),
+		WHERE field_name = {}
+		AND doc_type IN ({})""".format("%s", ", ".join(["%s"] * len(doclist))),  # nosec
+		tuple([doc.fieldname, *doclist]),
 	)
 
 	budget_against_property = frappe.get_doc("Property Setter", "Budget-budget_against-options")
@@ -243,7 +238,6 @@
 
 
 def get_accounting_dimensions(as_list=True, filters=None):
-
 	if not filters:
 		filters = {"disabled": 0}
 
@@ -274,7 +268,6 @@
 
 
 def get_dimension_with_children(doctype, dimensions):
-
 	if isinstance(dimensions, str):
 		dimensions = [dimensions]
 
@@ -282,9 +275,7 @@
 
 	for dimension in dimensions:
 		lft, rgt = frappe.db.get_value(doctype, dimension, ["lft", "rgt"])
-		children = frappe.get_all(
-			doctype, filters={"lft": [">=", lft], "rgt": ["<=", rgt]}, order_by="lft"
-		)
+		children = frappe.get_all(doctype, filters={"lft": [">=", lft], "rgt": ["<=", rgt]}, order_by="lft")
 		all_dimensions += [c.name for c in children]
 
 	return all_dimensions
@@ -292,14 +283,10 @@
 
 @frappe.whitelist()
 def get_dimensions(with_cost_center_and_project=False):
-
 	c = frappe.qb.DocType("Accounting Dimension Detail")
 	p = frappe.qb.DocType("Accounting Dimension")
 	dimension_filters = (
-		frappe.qb.from_(p)
-		.select(p.label, p.fieldname, p.document_type)
-		.where(p.disabled == 0)
-		.run(as_dict=1)
+		frappe.qb.from_(p).select(p.label, p.fieldname, p.document_type).where(p.disabled == 0).run(as_dict=1)
 	)
 	default_dimensions = (
 		frappe.qb.from_(c)
diff --git a/erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.json b/erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.json
index 7b6120a..19ddb46 100644
--- a/erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.json
+++ b/erpnext/accounts/doctype/accounting_dimension_detail/accounting_dimension_detail.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-07-16 17:53:18.718831",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -73,13 +74,15 @@
   }
  ],
  "istable": 1,
- "modified": "2019-08-15 11:59:09.389891",
+ "links": [],
+ "modified": "2024-03-27 13:05:57.056874",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting Dimension Detail",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
index 2bd6c12..34283d9 100644
--- a/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
+++ b/erpnext/accounts/doctype/accounting_dimension_filter/accounting_dimension_filter.json
@@ -94,7 +94,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-06-07 14:59:41.869117",
+ "modified": "2024-03-27 13:05:57.199186",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounting Dimension Filter",
@@ -139,7 +139,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py b/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py
index 3a7bf80..77057c1 100644
--- a/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py
+++ b/erpnext/accounts/doctype/accounting_dimension_filter/test_accounting_dimension_filter.py
@@ -57,9 +57,7 @@
 
 
 def create_accounting_dimension_filter():
-	if not frappe.db.get_value(
-		"Accounting Dimension Filter", {"accounting_dimension": "Cost Center"}
-	):
+	if not frappe.db.get_value("Accounting Dimension Filter", {"accounting_dimension": "Cost Center"}):
 		frappe.get_doc(
 			{
 				"doctype": "Accounting Dimension Filter",
diff --git a/erpnext/accounts/doctype/accounting_period/accounting_period.json b/erpnext/accounts/doctype/accounting_period/accounting_period.json
index 57f8e32..cd233ce 100644
--- a/erpnext/accounts/doctype/accounting_period/accounting_period.json
+++ b/erpnext/accounts/doctype/accounting_period/accounting_period.json
@@ -1,317 +1,112 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:period_name", 
- "beta": 0, 
- "creation": "2018-04-13 18:50:14.672323", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "autoname": "field:period_name",
+ "creation": "2018-04-13 18:50:14.672323",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "period_name",
+  "start_date",
+  "end_date",
+  "column_break_4",
+  "company",
+  "section_break_7",
+  "closed_documents"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "period_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Period Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "start_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Start Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "end_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "End Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "period_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Period Name",
+   "reqd": 1,
+   "unique": 1
   },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_7", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "start_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Start Date",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "closed_documents", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Closed Documents", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Closed Document", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "end_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "End Date",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Company",
+   "options": "Company",
+   "reqd": 1
+  },
+  {
+   "fieldname": "section_break_7",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "closed_documents",
+   "fieldtype": "Table",
+   "label": "Closed Documents",
+   "options": "Closed Document",
+   "reqd": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-08-01 19:14:47.593753", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Accounting Period", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:05:57.388109",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Accounting Period",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/accounting_period/accounting_period.py b/erpnext/accounts/doctype/accounting_period/accounting_period.py
index b32a231..172ef93 100644
--- a/erpnext/accounts/doctype/accounting_period/accounting_period.py
+++ b/erpnext/accounts/doctype/accounting_period/accounting_period.py
@@ -84,7 +84,10 @@
 			for doctype_for_closing in self.get_doctypes_for_closing():
 				self.append(
 					"closed_documents",
-					{"document_type": doctype_for_closing.document_type, "closed": doctype_for_closing.closed},
+					{
+						"document_type": doctype_for_closing.document_type,
+						"closed": doctype_for_closing.closed,
+					},
 				)
 
 
diff --git a/erpnext/accounts/doctype/accounting_period/test_accounting_period.py b/erpnext/accounts/doctype/accounting_period/test_accounting_period.py
index 41d9479..16cae96 100644
--- a/erpnext/accounts/doctype/accounting_period/test_accounting_period.py
+++ b/erpnext/accounts/doctype/accounting_period/test_accounting_period.py
@@ -34,9 +34,7 @@
 		ap1 = create_accounting_period(period_name="Test Accounting Period 2")
 		ap1.save()
 
-		doc = create_sales_invoice(
-			do_not_save=1, cost_center="_Test Company - _TC", warehouse="Stores - _TC"
-		)
+		doc = create_sales_invoice(do_not_save=1, cost_center="_Test Company - _TC", warehouse="Stores - _TC")
 		self.assertRaises(ClosedAccountingPeriod, doc.save)
 
 	def tearDown(self):
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index 0e238e0..23782f7 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -461,7 +461,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-01-30 14:04:26.553554",
+ "modified": "2024-03-27 13:05:57.568638",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Accounts Settings",
@@ -486,7 +486,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/advance_tax/advance_tax.json b/erpnext/accounts/doctype/advance_tax/advance_tax.json
index 68706ab..f030d7f 100644
--- a/erpnext/accounts/doctype/advance_tax/advance_tax.json
+++ b/erpnext/accounts/doctype/advance_tax/advance_tax.json
@@ -45,12 +45,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-11-25 10:27:51.712286",
+ "modified": "2024-03-27 13:05:58.308002",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Advance Tax",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json b/erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
index 05b284a..9d1a518 100644
--- a/erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
@@ -179,12 +179,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-11-25 11:10:10.945027",
+ "modified": "2024-03-27 13:05:58.437605",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Advance Taxes and Charges",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
- "sort_order": "ASC"
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/allowed_dimension/allowed_dimension.json b/erpnext/accounts/doctype/allowed_dimension/allowed_dimension.json
index 7fe2a3c..bbaac79 100644
--- a/erpnext/accounts/doctype/allowed_dimension/allowed_dimension.json
+++ b/erpnext/accounts/doctype/allowed_dimension/allowed_dimension.json
@@ -14,30 +14,27 @@
    "fieldtype": "Link",
    "label": "Accounting Dimension",
    "options": "DocType",
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only": 1
   },
   {
    "fieldname": "dimension_value",
    "fieldtype": "Dynamic Link",
    "in_list_view": 1,
-   "options": "accounting_dimension",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "accounting_dimension"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-11-23 09:56:19.744200",
+ "modified": "2024-03-27 13:05:58.587487",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Allowed Dimension",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.json b/erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.json
index 234ffc8..e20437c 100644
--- a/erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.json
+++ b/erpnext/accounts/doctype/allowed_to_transact_with/allowed_to_transact_with.json
@@ -20,14 +20,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-01-03 11:13:02.669632",
+ "modified": "2024-03-27 13:05:58.698893",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Allowed To Transact With",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/applicable_on_account/applicable_on_account.json b/erpnext/accounts/doctype/applicable_on_account/applicable_on_account.json
index 95e98d0..0a9d71a 100644
--- a/erpnext/accounts/doctype/applicable_on_account/applicable_on_account.json
+++ b/erpnext/accounts/doctype/applicable_on_account/applicable_on_account.json
@@ -15,9 +15,7 @@
    "in_list_view": 1,
    "label": "Accounts",
    "options": "Account",
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "columns": 2,
@@ -25,22 +23,21 @@
    "fieldname": "is_mandatory",
    "fieldtype": "Check",
    "in_list_view": 1,
-   "label": "Is Mandatory",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Is Mandatory"
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-11-22 19:55:13.324136",
+ "modified": "2024-03-27 13:05:59.168897",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Applicable On Account",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank/bank.json b/erpnext/accounts/doctype/bank/bank.json
index 56bae72..2bcc7e5 100644
--- a/erpnext/accounts/doctype/bank/bank.json
+++ b/erpnext/accounts/doctype/bank/bank.json
@@ -101,7 +101,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-17 14:00:13.105433",
+ "modified": "2024-03-27 13:06:36.896195",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank",
@@ -121,7 +121,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_account/bank_account.json b/erpnext/accounts/doctype/bank_account/bank_account.json
index 32f1c67..bcf6feb 100644
--- a/erpnext/accounts/doctype/bank_account/bank_account.json
+++ b/erpnext/accounts/doctype/bank_account/bank_account.json
@@ -209,7 +209,7 @@
   }
  ],
  "links": [],
- "modified": "2023-09-22 21:31:34.763977",
+ "modified": "2024-03-27 13:06:37.049542",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account",
@@ -242,7 +242,7 @@
   }
  ],
  "search_fields": "bank,account",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/bank_account/test_bank_account.py b/erpnext/accounts/doctype/bank_account/test_bank_account.py
index 8949524..0ec388d 100644
--- a/erpnext/accounts/doctype/bank_account/test_bank_account.py
+++ b/erpnext/accounts/doctype/bank_account/test_bank_account.py
@@ -37,11 +37,11 @@
 			try:
 				bank_account.validate_iban()
 			except ValidationError:
-				msg = "BankAccount.validate_iban() failed for valid IBAN {}".format(iban)
+				msg = f"BankAccount.validate_iban() failed for valid IBAN {iban}"
 				self.fail(msg=msg)
 
 		for not_iban in invalid_ibans:
 			bank_account.iban = not_iban
-			msg = "BankAccount.validate_iban() accepted invalid IBAN {}".format(not_iban)
+			msg = f"BankAccount.validate_iban() accepted invalid IBAN {not_iban}"
 			with self.assertRaises(ValidationError, msg=msg):
 				bank_account.validate_iban()
diff --git a/erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.json b/erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.json
index f875db8..827a8be 100644
--- a/erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.json
+++ b/erpnext/accounts/doctype/bank_account_subtype/bank_account_subtype.json
@@ -1,134 +1,69 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:account_subtype",
- "beta": 0,
  "creation": "2018-10-25 15:46:08.054586",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "account_subtype"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "account_subtype",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Account Subtype",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
    "unique": 1
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-10-25 15:47:03.841390",
+ "links": [],
+ "modified": "2024-03-27 13:06:37.221876",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account Subtype",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "System Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Accounts Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Accounts User",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
  "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_account_type/bank_account_type.json b/erpnext/accounts/doctype/bank_account_type/bank_account_type.json
index 5a297cc..cb7d905 100644
--- a/erpnext/accounts/doctype/bank_account_type/bank_account_type.json
+++ b/erpnext/accounts/doctype/bank_account_type/bank_account_type.json
@@ -19,7 +19,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-10 21:13:09.137898",
+ "modified": "2024-03-27 13:06:37.347035",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Account Type",
@@ -63,6 +63,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.json b/erpnext/accounts/doctype/bank_clearance/bank_clearance.json
index 591d019..869e593 100644
--- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.json
+++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.json
@@ -91,7 +91,7 @@
  "idx": 1,
  "issingle": 1,
  "links": [],
- "modified": "2022-11-28 17:24:13.008692",
+ "modified": "2024-03-27 13:06:37.477927",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Clearance",
@@ -107,7 +107,7 @@
  ],
  "quick_entry": 1,
  "read_only": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
index 8a505a8..63758a5 100644
--- a/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
+++ b/erpnext/accounts/doctype/bank_clearance/bank_clearance.py
@@ -127,7 +127,7 @@
 		condition = "and (clearance_date IS NULL or clearance_date='0000-00-00')"
 
 	journal_entries = frappe.db.sql(
-		"""
+		f"""
 			select
 				"Journal Entry" as payment_document, t1.name as payment_entry,
 				t1.cheque_no as cheque_number, t1.cheque_date,
@@ -141,9 +141,7 @@
 				and ifnull(t1.is_opening, 'No') = 'No' {condition}
 			group by t2.account, t1.name
 			order by t1.posting_date ASC, t1.name DESC
-		""".format(
-			condition=condition
-		),
+		""",
 		{"account": account, "from": from_date, "to": to_date},
 		as_dict=1,
 	)
@@ -152,7 +150,7 @@
 		condition += "and bank_account = %(bank_account)s"
 
 	payment_entries = frappe.db.sql(
-		"""
+		f"""
 			select
 				"Payment Entry" as payment_document, name as payment_entry,
 				reference_no as cheque_number, reference_date as cheque_date,
@@ -167,9 +165,7 @@
 				{condition}
 			order by
 				posting_date ASC, name DESC
-		""".format(
-			condition=condition
-		),
+		""",
 		{
 			"account": account,
 			"from": from_date,
@@ -239,10 +235,7 @@
 		).run(as_dict=True)
 
 	entries = (
-		list(payment_entries)
-		+ list(journal_entries)
-		+ list(pos_sales_invoices)
-		+ list(pos_purchase_invoices)
+		list(payment_entries) + list(journal_entries) + list(pos_sales_invoices) + list(pos_purchase_invoices)
 	)
 
 	return entries
diff --git a/erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py b/erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py
index ace751b..d785bfb 100644
--- a/erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py
+++ b/erpnext/accounts/doctype/bank_clearance/test_bank_clearance.py
@@ -68,9 +68,7 @@
 			)
 			loan.submit()
 			make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=getdate())
-			repayment_entry = create_repayment_entry(
-				loan.name, "_Test Customer", getdate(), loan.loan_amount
-			)
+			repayment_entry = create_repayment_entry(loan.name, "_Test Customer", getdate(), loan.loan_amount)
 			repayment_entry.save()
 			repayment_entry.submit()
 
diff --git a/erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json b/erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json
index 04988bf..194c16d 100644
--- a/erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json
+++ b/erpnext/accounts/doctype/bank_clearance_detail/bank_clearance_detail.json
@@ -1,340 +1,112 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2013-02-22 01:27:37", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2013-02-22 01:27:37",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "payment_document",
+  "payment_entry",
+  "against_account",
+  "amount",
+  "column_break_5",
+  "posting_date",
+  "cheque_number",
+  "cheque_date",
+  "clearance_date"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "payment_document", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Payment Document", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "payment_document",
+   "fieldtype": "Link",
+   "label": "Payment Document",
+   "options": "DocType"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "payment_entry", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Payment Entry", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "voucher_id", 
-   "oldfieldtype": "Link", 
-   "options": "payment_document", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "columns": 2,
+   "fieldname": "payment_entry",
+   "fieldtype": "Dynamic Link",
+   "in_list_view": 1,
+   "label": "Payment Entry",
+   "oldfieldname": "voucher_id",
+   "oldfieldtype": "Link",
+   "options": "payment_document",
    "width": "50"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "against_account", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Against Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "against_account", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "columns": 2,
+   "fieldname": "against_account",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Against Account",
+   "oldfieldname": "against_account",
+   "oldfieldtype": "Data",
+   "read_only": 1,
    "width": "15"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "amount", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "debit", 
-   "oldfieldtype": "Currency", 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "amount",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Amount",
+   "oldfieldname": "debit",
+   "oldfieldtype": "Currency",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "posting_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Posting Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "posting_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "posting_date",
+   "fieldtype": "Date",
+   "label": "Posting Date",
+   "oldfieldname": "posting_date",
+   "oldfieldtype": "Date",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "cheque_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Cheque Number", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "cheque_number", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "cheque_number",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Cheque Number",
+   "oldfieldname": "cheque_number",
+   "oldfieldtype": "Data",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cheque_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Cheque Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "cheque_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "cheque_date",
+   "fieldtype": "Date",
+   "label": "Cheque Date",
+   "oldfieldname": "cheque_date",
+   "oldfieldtype": "Date",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "clearance_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Clearance Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "clearance_date", 
-   "oldfieldtype": "Date", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "columns": 2,
+   "fieldname": "clearance_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Clearance Date",
+   "oldfieldname": "clearance_date",
+   "oldfieldtype": "Date"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "menu_index": 0, 
- "modified": "2019-01-07 16:52:07.174687", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Bank Clearance Detail", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_order": "ASC", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:37.609319",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bank Clearance Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json
index 67c4717..89a4b5b 100644
--- a/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json
+++ b/erpnext/accounts/doctype/bank_guarantee/bank_guarantee.json
@@ -1,1056 +1,258 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "ACC-BG-.YYYY.-.#####", 
- "beta": 0, 
- "creation": "2016-12-17 10:43:35.731631", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "autoname": "ACC-BG-.YYYY.-.#####",
+ "creation": "2016-12-17 10:43:35.731631",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "bg_type",
+  "reference_doctype",
+  "reference_docname",
+  "customer",
+  "supplier",
+  "project",
+  "column_break_6",
+  "amount",
+  "start_date",
+  "validity",
+  "end_date",
+  "bank_account_info",
+  "bank",
+  "bank_account",
+  "account",
+  "bank_account_no",
+  "column_break_17",
+  "iban",
+  "branch_code",
+  "swift_number",
+  "section_break_14",
+  "more_information",
+  "margin_details",
+  "bank_guarantee_number",
+  "name_of_beneficiary",
+  "column_break_19",
+  "margin_money",
+  "charges",
+  "fixed_deposit_number",
+  "amended_from"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bg_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Bank Guarantee Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nReceiving\nProviding", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "bg_type",
+   "fieldtype": "Select",
+   "label": "Bank Guarantee Type",
+   "options": "\nReceiving\nProviding",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reference_doctype", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference Document Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "reference_doctype",
+   "fieldtype": "Link",
+   "label": "Reference Document Type",
+   "options": "DocType",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "reference_docname", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Reference Document Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "reference_doctype", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "reference_docname",
+   "fieldtype": "Dynamic Link",
+   "label": "Reference Document Name",
+   "options": "reference_doctype"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: doc.bg_type == \"Receiving\"", 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval: doc.bg_type == \"Receiving\"",
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "label": "Customer",
+   "options": "Customer"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval: doc.bg_type == \"Providing\"", 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval: doc.bg_type == \"Providing\"",
+   "fieldname": "supplier",
+   "fieldtype": "Link",
+   "label": "Supplier",
+   "options": "Supplier"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "project", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Project", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Project", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "allow_on_submit": 1,
+   "fieldname": "project",
+   "fieldtype": "Link",
+   "label": "Project",
+   "options": "Project"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_6", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Amount",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "start_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Start Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "start_date",
+   "fieldtype": "Date",
+   "label": "Start Date",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fieldname": "validity", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Validity in Days", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "validity",
+   "fieldtype": "Int",
+   "label": "Validity in Days"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "end_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "End Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "end_date",
+   "fieldtype": "Date",
+   "label": "End Date",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bank_account_info", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Bank Account Info", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "bank_account_info",
+   "fieldtype": "Section Break",
+   "label": "Bank Account Info"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bank", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Bank", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Bank", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "bank",
+   "fieldtype": "Link",
+   "label": "Bank",
+   "options": "Bank"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bank_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Bank Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Bank Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "bank_account",
+   "fieldtype": "Link",
+   "label": "Bank Account",
+   "options": "Bank Account"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "account",
+   "fieldtype": "Link",
+   "label": "Account",
+   "options": "Account",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bank_account_no", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Bank Account No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "bank_account_no",
+   "fieldtype": "Data",
+   "label": "Bank Account No",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_17", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_17",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "iban", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "IBAN", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "iban",
+   "fieldtype": "Data",
+   "label": "IBAN",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "branch_code", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Branch Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "branch_code",
+   "fieldtype": "Data",
+   "label": "Branch Code",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "swift_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "SWIFT number", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "swift_number",
+   "fieldtype": "Data",
+   "label": "SWIFT number",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_14", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_14",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "more_information", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Clauses and Conditions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "more_information",
+   "fieldtype": "Text Editor",
+   "label": "Clauses and Conditions"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "margin_details", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Other Details", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "margin_details",
+   "fieldtype": "Section Break",
+   "label": "Other Details"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bank_guarantee_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Bank Guarantee Number", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "fieldname": "bank_guarantee_number",
+   "fieldtype": "Data",
+   "label": "Bank Guarantee Number",
    "unique": 1
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "name_of_beneficiary", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Name of Beneficiary", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "name_of_beneficiary",
+   "fieldtype": "Data",
+   "label": "Name of Beneficiary"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_19", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_19",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "margin_money", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Margin Money", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "margin_money",
+   "fieldtype": "Currency",
+   "label": "Margin Money"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "depends_on": "", 
-   "fieldname": "charges", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Charges Incurred", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "charges",
+   "fieldtype": "Currency",
+   "label": "Charges Incurred"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "fieldname": "fixed_deposit_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Fixed Deposit Number", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "fixed_deposit_number",
+   "fieldtype": "Data",
+   "label": "Fixed Deposit Number"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Bank Guarantee", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Bank Guarantee",
+   "print_hide": 1,
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-08-21 16:15:54.741746", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Bank Guarantee", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:37.731207",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bank Guarantee",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "create": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "share": 1,
+   "submit": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 1, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 1, 
+   "cancel": 1,
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "share": 1,
+   "submit": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "customer", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "customer", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "quick_entry": 1,
+ "search_fields": "customer",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "customer"
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
index 93fc443..04ef645 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
@@ -118,7 +118,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-03-07 11:02:24.535714",
+ "modified": "2024-03-27 13:06:37.922473",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Reconciliation Tool",
@@ -136,7 +136,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
index 65158fc..77cb320 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py
@@ -81,9 +81,7 @@
 def get_account_balance(bank_account, till_date):
 	# returns account balance till the specified date
 	account = frappe.db.get_value("Bank Account", bank_account, "account")
-	filters = frappe._dict(
-		{"account": account, "report_date": till_date, "include_pos_transactions": 1}
-	)
+	filters = frappe._dict({"account": account, "report_date": till_date, "include_pos_transactions": 1})
 	data = get_entries(filters)
 
 	balance_as_per_system = get_balance_on(filters["account"], filters["report_date"])
@@ -96,10 +94,7 @@
 	amounts_not_reflected_in_system = get_amounts_not_reflected_in_system(filters)
 
 	bank_bal = (
-		flt(balance_as_per_system)
-		- flt(total_debit)
-		+ flt(total_credit)
-		+ amounts_not_reflected_in_system
+		flt(balance_as_per_system) - flt(total_debit) + flt(total_credit) + amounts_not_reflected_in_system
 	)
 
 	return bank_bal
@@ -538,9 +533,7 @@
 	for query in queries:
 		matching_vouchers.extend(query.run(as_dict=True))
 
-	return (
-		sorted(matching_vouchers, key=lambda x: x["rank"], reverse=True) if matching_vouchers else []
-	)
+	return sorted(matching_vouchers, key=lambda x: x["rank"], reverse=True) if matching_vouchers else []
 
 
 def get_queries(
@@ -654,17 +647,13 @@
 	amount_rank = frappe.qb.terms.Case().when(amount_equality, 1).else_(0)
 	amount_condition = amount_equality if exact_match else getattr(bt, field) > 0.0
 
-	ref_rank = (
-		frappe.qb.terms.Case().when(bt.reference_number == transaction.reference_number, 1).else_(0)
-	)
+	ref_rank = frappe.qb.terms.Case().when(bt.reference_number == transaction.reference_number, 1).else_(0)
 	unallocated_rank = (
 		frappe.qb.terms.Case().when(bt.unallocated_amount == transaction.unallocated_amount, 1).else_(0)
 	)
 
 	party_condition = (
-		(bt.party_type == transaction.party_type)
-		& (bt.party == transaction.party)
-		& bt.party.isnotnull()
+		(bt.party_type == transaction.party_type) & (bt.party == transaction.party) & bt.party.isnotnull()
 	)
 	party_rank = frappe.qb.terms.Case().when(party_condition, 1).else_(0)
 
@@ -716,9 +705,7 @@
 	amount_condition = amount_equality if exact_match else pe.paid_amount > 0.0
 
 	party_condition = (
-		(pe.party_type == transaction.party_type)
-		& (pe.party == transaction.party)
-		& pe.party.isnotnull()
+		(pe.party_type == transaction.party_type) & (pe.party == transaction.party) & pe.party.isnotnull()
 	)
 	party_rank = frappe.qb.terms.Case().when(party_condition, 1).else_(0)
 
@@ -749,7 +736,7 @@
 		.orderby(pe.reference_date if cint(filter_by_reference_date) else pe.posting_date)
 	)
 
-	if frappe.flags.auto_reconcile_vouchers == True:
+	if frappe.flags.auto_reconcile_vouchers is True:
 		query = query.where(ref_condition)
 
 	return query
@@ -810,7 +797,7 @@
 		.orderby(je.cheque_date if cint(filter_by_reference_date) else je.posting_date)
 	)
 
-	if frappe.flags.auto_reconcile_vouchers == True:
+	if frappe.flags.auto_reconcile_vouchers is True:
 		query = query.where(ref_condition)
 
 	return query
diff --git a/erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py b/erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py
index adf5925..3813052 100644
--- a/erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py
+++ b/erpnext/accounts/doctype/bank_reconciliation_tool/test_bank_reconciliation_tool.py
@@ -1,12 +1,11 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
 from frappe import qb
-from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, flt, getdate, today
+from frappe.tests.utils import FrappeTestCase
+from frappe.utils import add_days, today
 
 from erpnext.accounts.doctype.bank_reconciliation_tool.bank_reconciliation_tool import (
 	auto_reconcile_vouchers,
@@ -22,7 +21,7 @@
 		self.create_customer()
 		self.clear_old_entries()
 		bank_dt = qb.DocType("Bank")
-		q = qb.from_(bank_dt).delete().where(bank_dt.name == "HDFC").run()
+		qb.from_(bank_dt).delete().where(bank_dt.name == "HDFC").run()
 		self.create_bank_account()
 
 	def tearDown(self):
diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
index eede3bd..45671f3 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.json
@@ -202,7 +202,7 @@
  ],
  "hide_toolbar": 1,
  "links": [],
- "modified": "2022-09-07 11:11:40.293317",
+ "modified": "2024-03-27 13:06:38.098765",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bank Statement Import",
@@ -221,7 +221,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
index 6728fea..49684df 100644
--- a/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
+++ b/erpnext/accounts/doctype/bank_statement_import/bank_statement_import.py
@@ -45,7 +45,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(BankStatementImport, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 
 	def validate(self):
 		doc_before_save = self.get_doc_before_save()
@@ -54,7 +54,6 @@
 			or (doc_before_save and doc_before_save.import_file != self.import_file)
 			or (doc_before_save and doc_before_save.google_sheets_url != self.google_sheets_url)
 		):
-
 			template_options_dict = {}
 			column_to_field_map = {}
 			bank = frappe.get_doc("Bank", self.bank)
@@ -69,7 +68,6 @@
 		self.validate_google_sheets_url()
 
 	def start_import(self):
-
 		preview = frappe.get_doc("Bank Statement Import", self.name).get_preview_from_template(
 			self.import_file, self.google_sheets_url
 		)
@@ -126,7 +124,7 @@
 def parse_data_from_template(raw_data):
 	data = []
 
-	for i, row in enumerate(raw_data):
+	for _i, row in enumerate(raw_data):
 		if all(v in INVALID_VALUES for v in row):
 			# empty row
 			continue
@@ -136,9 +134,7 @@
 	return data
 
 
-def start_import(
-	data_import, bank_account, import_file_path, google_sheets_url, bank, template_options
-):
+def start_import(data_import, bank_account, import_file_path, google_sheets_url, bank, template_options):
 	"""This method runs in background job"""
 
 	update_mapping_db(bank, template_options)
diff --git a/erpnext/accounts/doctype/bank_transaction/auto_match_party.py b/erpnext/accounts/doctype/bank_transaction/auto_match_party.py
index 04dab4c..230407b 100644
--- a/erpnext/accounts/doctype/bank_transaction/auto_match_party.py
+++ b/erpnext/accounts/doctype/bank_transaction/auto_match_party.py
@@ -1,5 +1,3 @@
-from typing import Tuple, Union
-
 import frappe
 from frappe.utils import flt
 from rapidfuzz import fuzz, process
@@ -19,7 +17,7 @@
 	def get(self, key):
 		return self.__dict__.get(key, None)
 
-	def match(self) -> Union[Tuple, None]:
+	def match(self) -> tuple | None:
 		result = None
 		result = AutoMatchbyAccountIBAN(
 			bank_party_account_number=self.bank_party_account_number,
@@ -50,7 +48,7 @@
 		result = self.match_account_in_party()
 		return result
 
-	def match_account_in_party(self) -> Union[Tuple, None]:
+	def match_account_in_party(self) -> tuple | None:
 		"""Check if there is a IBAN/Account No. match in Customer/Supplier/Employee"""
 		result = None
 		parties = get_parties_in_order(self.deposit)
@@ -97,7 +95,7 @@
 	def get(self, key):
 		return self.__dict__.get(key, None)
 
-	def match(self) -> Union[Tuple, None]:
+	def match(self) -> tuple | None:
 		# fuzzy search by customer/supplier & employee
 		if not (self.bank_party_name or self.description):
 			return None
@@ -105,7 +103,7 @@
 		result = self.match_party_name_desc_in_party()
 		return result
 
-	def match_party_name_desc_in_party(self) -> Union[Tuple, None]:
+	def match_party_name_desc_in_party(self) -> tuple | None:
 		"""Fuzzy search party name and/or description against parties in the system"""
 		result = None
 		parties = get_parties_in_order(self.deposit)
@@ -130,7 +128,7 @@
 
 		return result
 
-	def fuzzy_search_and_return_result(self, party, names, field) -> Union[Tuple, None]:
+	def fuzzy_search_and_return_result(self, party, names, field) -> tuple | None:
 		skip = False
 		result = process.extract(
 			query=self.get(field),
@@ -147,7 +145,7 @@
 			party_name,
 		), skip
 
-	def process_fuzzy_result(self, result: Union[list, None]):
+	def process_fuzzy_result(self, result: list | None):
 		"""
 		If there are multiple valid close matches return None as result may be faulty.
 		Return the result only if one accurate match stands out.
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
index 4246ba5..4354f23 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction.py
@@ -64,7 +64,9 @@
 						_(
 							"Transaction currency: {0} cannot be different from Bank Account({1}) currency: {2}"
 						).format(
-							frappe.bold(self.currency), frappe.bold(self.bank_account), frappe.bold(account_currency)
+							frappe.bold(self.currency),
+							frappe.bold(self.bank_account),
+							frappe.bold(account_currency),
 						)
 					)
 
@@ -180,7 +182,7 @@
 					frappe.throw(_("Voucher {0} is over-allocated by {1}").format(unallocated_amount))
 
 		for payment_entry in to_remove:
-			self.remove(to_remove)
+			self.remove(payment_entry)
 
 	@frappe.whitelist()
 	def remove_payment_entries(self):
@@ -235,9 +237,7 @@
 	"""
 	gl_bank_account = frappe.db.get_value("Bank Account", transaction.bank_account, "account")
 	gles = get_related_bank_gl_entries(payment_entry.payment_document, payment_entry.payment_entry)
-	bt_allocations = get_total_allocated_amount(
-		payment_entry.payment_document, payment_entry.payment_entry
-	)
+	bt_allocations = get_total_allocated_amount(payment_entry.payment_document, payment_entry.payment_entry)
 
 	unallocated_amount = min(
 		transaction.unallocated_amount,
@@ -332,7 +332,6 @@
 
 def get_paid_amount(payment_entry, currency, gl_bank_account):
 	if payment_entry.payment_document in ["Payment Entry", "Sales Invoice", "Purchase Invoice"]:
-
 		paid_amount_field = "paid_amount"
 		if payment_entry.payment_document == "Payment Entry":
 			doc = frappe.get_doc("Payment Entry", payment_entry.payment_entry)
@@ -371,9 +370,7 @@
 		)
 
 	elif payment_entry.payment_document == "Loan Repayment":
-		return frappe.db.get_value(
-			payment_entry.payment_document, payment_entry.payment_entry, "amount_paid"
-		)
+		return frappe.db.get_value(payment_entry.payment_document, payment_entry.payment_entry, "amount_paid")
 
 	elif payment_entry.payment_document == "Bank Transaction":
 		dep, wth = frappe.db.get_value(
@@ -383,9 +380,7 @@
 
 	else:
 		frappe.throw(
-			"Please reconcile {0}: {1} manually".format(
-				payment_entry.payment_document, payment_entry.payment_entry
-			)
+			f"Please reconcile {payment_entry.payment_document}: {payment_entry.payment_entry} manually"
 		)
 
 
diff --git a/erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py b/erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py
index efb9d8c..a03f406 100644
--- a/erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py
+++ b/erpnext/accounts/doctype/bank_transaction/bank_transaction_upload.py
@@ -18,12 +18,12 @@
 		fcontent = frappe.local.uploaded_file
 		fname = frappe.local.uploaded_filename
 
-	if frappe.safe_encode(fname).lower().endswith("csv".encode("utf-8")):
+	if frappe.safe_encode(fname).lower().endswith(b"csv"):
 		from frappe.utils.csvutils import read_csv_content
 
 		rows = read_csv_content(fcontent, False)
 
-	elif frappe.safe_encode(fname).lower().endswith("xlsx".encode("utf-8")):
+	elif frappe.safe_encode(fname).lower().endswith(b"xlsx"):
 		from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file
 
 		rows = read_xlsx_file_from_attached_file(fcontent=fcontent)
diff --git a/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
index 1fe3608..3181a09 100644
--- a/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
+++ b/erpnext/accounts/doctype/bank_transaction/test_bank_transaction.py
@@ -436,9 +436,7 @@
 
 	mode_of_payment = frappe.get_doc({"doctype": "Mode of Payment", "name": "Cash"})
 
-	if not frappe.db.get_value(
-		"Mode of Payment Account", {"company": "_Test Company", "parent": "Cash"}
-	):
+	if not frappe.db.get_value("Mode of Payment Account", {"company": "_Test Company", "parent": "Cash"}):
 		mode_of_payment.append("accounts", {"company": "_Test Company", "default_account": gl_account})
 		mode_of_payment.save()
 
diff --git a/erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.json b/erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.json
index ace554b..b36eb5c 100644
--- a/erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.json
+++ b/erpnext/accounts/doctype/bank_transaction_mapping/bank_transaction_mapping.json
@@ -1,107 +1,38 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-10-24 15:24:56.713277", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-10-24 15:24:56.713277",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "bank_transaction_field",
+  "file_field"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "bank_transaction_field", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Field in Bank Transaction", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "bank_transaction_field",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Field in Bank Transaction",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "file_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Column in Bank File", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "file_field",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Column in Bank File",
+   "reqd": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-10-24 15:24:56.713277", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Bank Transaction Mapping", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:38.436517",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bank Transaction Mapping",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json b/erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json
index ab3f60d..e3adb6c 100644
--- a/erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json
+++ b/erpnext/accounts/doctype/bank_transaction_payments/bank_transaction_payments.json
@@ -1,116 +1,39 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-11-28 08:55:40.815355", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-11-28 08:55:40.815355",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "payment_document",
+  "payment_entry",
+  "allocated_amount",
+  "clearance_date"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "payment_document", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Payment Document", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "payment_document",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Payment Document",
+   "options": "DocType",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "payment_entry", 
-   "fieldtype": "Dynamic Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Payment Entry", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "payment_document", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "payment_entry",
+   "fieldtype": "Dynamic Link",
+   "in_list_view": 1,
+   "label": "Payment Entry",
+   "options": "payment_document",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "allocated_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Allocated Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "allocated_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Allocated Amount",
+   "reqd": 1
+  },
   {
    "depends_on": "eval:doc.docstatus==1",
    "fieldname": "clearance_date",
@@ -120,31 +43,18 @@
    "print_hide": 1,
    "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2020-01-22 00:00:00.000000", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Bank Transaction Payments", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
-}
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:38.549438",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Bank Transaction Payments",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json
index e129fa6..c5fd63d 100644
--- a/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json
+++ b/erpnext/accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.json
@@ -170,7 +170,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-12-01 16:49:54.073890",
+ "modified": "2024-03-27 13:06:39.619458",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bisect Accounting Statements",
@@ -188,7 +188,7 @@
   }
  ],
  "read_only": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.json b/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.json
index 03fad26..f87eafa 100644
--- a/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.json
+++ b/erpnext/accounts/doctype/bisect_nodes/bisect_nodes.json
@@ -70,7 +70,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-12-01 17:46:12.437996",
+ "modified": "2024-03-27 13:06:39.766063",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Bisect Nodes",
@@ -91,7 +91,7 @@
   }
  ],
  "read_only": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/budget/budget.json b/erpnext/accounts/doctype/budget/budget.json
index f0566f4..404b663 100644
--- a/erpnext/accounts/doctype/budget/budget.json
+++ b/erpnext/accounts/doctype/budget/budget.json
@@ -207,7 +207,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-10-10 22:14:36.361509",
+ "modified": "2024-03-27 13:06:42.675933",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Budget",
@@ -231,7 +231,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py
index aa77af6..b585f40 100644
--- a/erpnext/accounts/doctype/budget/budget.py
+++ b/erpnext/accounts/doctype/budget/budget.py
@@ -70,10 +70,11 @@
 			select
 				b.name, ba.account from `tabBudget` b, `tabBudget Account` ba
 			where
-				ba.parent = b.name and b.docstatus < 2 and b.company = %s and %s=%s and
-				b.fiscal_year=%s and b.name != %s and ba.account in (%s) """
-			% ("%s", budget_against_field, "%s", "%s", "%s", ",".join(["%s"] * len(accounts))),
-			(self.company, budget_against, self.fiscal_year, self.name) + tuple(accounts),
+				ba.parent = b.name and b.docstatus < 2 and b.company = {} and {}={} and
+				b.fiscal_year={} and b.name != {} and ba.account in ({}) """.format(
+				"%s", budget_against_field, "%s", "%s", "%s", ",".join(["%s"] * len(accounts))
+			),
+			(self.company, budget_against, self.fiscal_year, self.name, *tuple(accounts)),
 			as_dict=1,
 		)
 
@@ -96,12 +97,14 @@
 				if account_details.is_group:
 					frappe.throw(_("Budget cannot be assigned against Group Account {0}").format(d.account))
 				elif account_details.company != self.company:
-					frappe.throw(_("Account {0} does not belongs to company {1}").format(d.account, self.company))
+					frappe.throw(
+						_("Account {0} does not belongs to company {1}").format(d.account, self.company)
+					)
 				elif account_details.report_type != "Profit and Loss":
 					frappe.throw(
-						_("Budget cannot be assigned against {0}, as it's not an Income or Expense account").format(
-							d.account
-						)
+						_(
+							"Budget cannot be assigned against {0}, as it's not an Income or Expense account"
+						).format(d.account)
 					)
 
 				if d.account in account_list:
@@ -148,9 +151,7 @@
 			"Company", args.get("company"), "exception_budget_approver_role"
 		)
 
-	if not frappe.get_cached_value(
-		"Budget", {"fiscal_year": args.fiscal_year, "company": args.company}
-	):  # nosec
+	if not frappe.get_cached_value("Budget", {"fiscal_year": args.fiscal_year, "company": args.company}):  # nosec
 		return
 
 	if not args.account:
@@ -181,30 +182,24 @@
 			and args.account
 			and (frappe.get_cached_value("Account", args.account, "root_type") == "Expense")
 		):
-
 			doctype = dimension.get("document_type")
 
 			if frappe.get_cached_value("DocType", doctype, "is_tree"):
 				lft, rgt = frappe.get_cached_value(doctype, args.get(budget_against), ["lft", "rgt"])
-				condition = """and exists(select name from `tab%s`
-					where lft<=%s and rgt>=%s and name=b.%s)""" % (
-					doctype,
-					lft,
-					rgt,
-					budget_against,
-				)  # nosec
+				condition = f"""and exists(select name from `tab{doctype}`
+					where lft<={lft} and rgt>={rgt} and name=b.{budget_against})"""  # nosec
 				args.is_tree = True
 			else:
-				condition = "and b.%s=%s" % (budget_against, frappe.db.escape(args.get(budget_against)))
+				condition = f"and b.{budget_against}={frappe.db.escape(args.get(budget_against))}"
 				args.is_tree = False
 
 			args.budget_against_field = budget_against
 			args.budget_against_doctype = doctype
 
 			budget_records = frappe.db.sql(
-				"""
+				f"""
 				select
-					b.{budget_against_field} as budget_against, ba.budget_amount, b.monthly_distribution,
+					b.{budget_against} as budget_against, ba.budget_amount, b.monthly_distribution,
 					ifnull(b.applicable_on_material_request, 0) as for_material_request,
 					ifnull(applicable_on_purchase_order, 0) as for_purchase_order,
 					ifnull(applicable_on_booking_actual_expenses,0) as for_actual_expenses,
@@ -217,9 +212,7 @@
 					b.name=ba.parent and b.fiscal_year=%s
 					and ba.account=%s and b.docstatus=1
 					{condition}
-			""".format(
-					condition=condition, budget_against_field=budget_against
-				),
+			""",
 				(args.fiscal_year, args.account),
 				as_dict=True,
 			)  # nosec
@@ -247,7 +240,12 @@
 				args["month_end_date"] = get_last_day(args.posting_date)
 
 				compare_expense_with_budget(
-					args, budget_amount, _("Accumulated Monthly"), monthly_action, budget.budget_against, amount
+					args,
+					budget_amount,
+					_("Accumulated Monthly"),
+					monthly_action,
+					budget.budget_against,
+					amount,
 				)
 
 
@@ -275,9 +273,8 @@
 			frappe.bold(fmt_money(diff, currency=currency)),
 		)
 
-		if (
-			frappe.flags.exception_approver_role
-			and frappe.flags.exception_approver_role in frappe.get_roles(frappe.session.user)
+		if frappe.flags.exception_approver_role and frappe.flags.exception_approver_role in frappe.get_roles(
+			frappe.session.user
 		):
 			action = "Warn"
 
@@ -323,10 +320,8 @@
 	data = frappe.db.sql(
 		""" select ifnull((sum(child.stock_qty - child.ordered_qty) * rate), 0) as amount
 		from `tabMaterial Request Item` child, `tabMaterial Request` parent where parent.name = child.parent and
-		child.item_code = %s and parent.docstatus = 1 and child.stock_qty > child.ordered_qty and {0} and
-		parent.material_request_type = 'Purchase' and parent.status != 'Stopped'""".format(
-			condition
-		),
+		child.item_code = %s and parent.docstatus = 1 and child.stock_qty > child.ordered_qty and {} and
+		parent.material_request_type = 'Purchase' and parent.status != 'Stopped'""".format(condition),
 		item_code,
 		as_list=1,
 	)
@@ -339,12 +334,10 @@
 	condition = get_other_condition(args, budget, "Purchase Order")
 
 	data = frappe.db.sql(
-		""" select ifnull(sum(child.amount - child.billed_amt), 0) as amount
+		f""" select ifnull(sum(child.amount - child.billed_amt), 0) as amount
 		from `tabPurchase Order Item` child, `tabPurchase Order` parent where
 		parent.name = child.parent and child.item_code = %s and parent.docstatus = 1 and child.amount > child.billed_amt
-		and parent.status != 'Closed' and {0}""".format(
-			condition
-		),
+		and parent.status != 'Closed' and {condition}""",
 		item_code,
 		as_list=1,
 	)
@@ -357,7 +350,7 @@
 	budget_against_field = args.get("budget_against_field")
 
 	if budget_against_field and args.get(budget_against_field):
-		condition += " and child.%s = '%s'" % (budget_against_field, args.get(budget_against_field))
+		condition += f" and child.{budget_against_field} = '{args.get(budget_against_field)}'"
 
 	if args.get("fiscal_year"):
 		date_field = "schedule_date" if for_doc == "Material Request" else "transaction_date"
@@ -365,12 +358,8 @@
 			"Fiscal Year", args.get("fiscal_year"), ["year_start_date", "year_end_date"]
 		)
 
-		condition += """ and parent.%s
-			between '%s' and '%s' """ % (
-			date_field,
-			start_date,
-			end_date,
-		)
+		condition += f""" and parent.{date_field}
+			between '{start_date}' and '{end_date}' """
 
 	return condition
 
@@ -389,21 +378,17 @@
 
 		args.update(lft_rgt)
 
-		condition2 = """and exists(select name from `tab{doctype}`
+		condition2 = f"""and exists(select name from `tab{args.budget_against_doctype}`
 			where lft>=%(lft)s and rgt<=%(rgt)s
-			and name=gle.{budget_against_field})""".format(
-			doctype=args.budget_against_doctype, budget_against_field=budget_against_field  # nosec
-		)
+			and name=gle.{budget_against_field})"""
 	else:
-		condition2 = """and exists(select name from `tab{doctype}`
-		where name=gle.{budget_against} and
-		gle.{budget_against} = %({budget_against})s)""".format(
-			doctype=args.budget_against_doctype, budget_against=budget_against_field
-		)
+		condition2 = f"""and exists(select name from `tab{args.budget_against_doctype}`
+		where name=gle.{budget_against_field} and
+		gle.{budget_against_field} = %({budget_against_field})s)"""
 
 	amount = flt(
 		frappe.db.sql(
-			"""
+			f"""
 		select sum(gle.debit) - sum(gle.credit)
 		from `tabGL Entry` gle
 		where
@@ -414,9 +399,7 @@
 			and gle.company=%(company)s
 			and gle.docstatus=1
 			{condition2}
-	""".format(
-				condition1=condition1, condition2=condition2
-			),
+	""",
 			(args),
 		)[0][0]
 	)  # nosec
diff --git a/erpnext/accounts/doctype/budget/test_budget.py b/erpnext/accounts/doctype/budget/test_budget.py
index 11af9a2..6d9a6f5 100644
--- a/erpnext/accounts/doctype/budget/test_budget.py
+++ b/erpnext/accounts/doctype/budget/test_budget.py
@@ -41,9 +41,7 @@
 
 		budget = make_budget(budget_against="Cost Center")
 
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop"
-		)
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
@@ -63,9 +61,7 @@
 
 		budget = make_budget(budget_against="Cost Center")
 
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop"
-		)
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
@@ -97,9 +93,7 @@
 		)
 
 		fiscal_year = get_fiscal_year(nowdate())[0]
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop"
-		)
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 		frappe.db.set_value("Budget", budget.name, "fiscal_year", fiscal_year)
 
 		mr = frappe.get_doc(
@@ -138,9 +132,7 @@
 		)
 
 		fiscal_year = get_fiscal_year(nowdate())[0]
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop"
-		)
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 		frappe.db.set_value("Budget", budget.name, "fiscal_year", fiscal_year)
 
 		po = create_purchase_order(transaction_date=nowdate(), do_not_submit=True)
@@ -158,9 +150,7 @@
 
 		budget = make_budget(budget_against="Project")
 
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop"
-		)
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		project = frappe.get_value("Project", {"project_name": "_Test Project"})
 
@@ -223,7 +213,7 @@
 		if month > 9:
 			month = 9
 
-		for i in range(month + 1):
+		for _i in range(month + 1):
 			jv = make_journal_entry(
 				"_Test Account Cost for Goods Sold - _TC",
 				"_Test Bank - _TC",
@@ -237,9 +227,7 @@
 				frappe.db.get_value("GL Entry", {"voucher_type": "Journal Entry", "voucher_no": jv.name})
 			)
 
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop"
-		)
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		self.assertRaises(BudgetError, jv.cancel)
 
@@ -255,7 +243,7 @@
 			month = 9
 
 		project = frappe.get_value("Project", {"project_name": "_Test Project"})
-		for i in range(month + 1):
+		for _i in range(month + 1):
 			jv = make_journal_entry(
 				"_Test Account Cost for Goods Sold - _TC",
 				"_Test Bank - _TC",
@@ -270,9 +258,7 @@
 				frappe.db.get_value("GL Entry", {"voucher_type": "Journal Entry", "voucher_no": jv.name})
 			)
 
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop"
-		)
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		self.assertRaises(BudgetError, jv.cancel)
 
@@ -284,9 +270,7 @@
 		set_total_expense_zero(nowdate(), "cost_center", "_Test Cost Center 2 - _TC")
 
 		budget = make_budget(budget_against="Cost Center", cost_center="_Test Company - _TC")
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop"
-		)
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
@@ -316,9 +300,7 @@
 			).insert(ignore_permissions=True)
 
 		budget = make_budget(budget_against="Cost Center", cost_center=cost_center)
-		frappe.db.set_value(
-			"Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop"
-		)
+		frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
 
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
@@ -423,13 +405,11 @@
 	fiscal_year = get_fiscal_year(nowdate())[0]
 
 	if budget_against == "Project":
-		project_name = "{0}%".format("_Test Project/" + fiscal_year)
+		project_name = "{}%".format("_Test Project/" + fiscal_year)
 		budget_list = frappe.get_all("Budget", fields=["name"], filters={"name": ("like", project_name)})
 	else:
-		cost_center_name = "{0}%".format(cost_center or "_Test Cost Center - _TC/" + fiscal_year)
-		budget_list = frappe.get_all(
-			"Budget", fields=["name"], filters={"name": ("like", cost_center_name)}
-		)
+		cost_center_name = "{}%".format(cost_center or "_Test Cost Center - _TC/" + fiscal_year)
+		budget_list = frappe.get_all("Budget", fields=["name"], filters={"name": ("like", cost_center_name)})
 	for d in budget_list:
 		frappe.db.sql("delete from `tabBudget` where name = %(name)s", d)
 		frappe.db.sql("delete from `tabBudget Account` where parent = %(name)s", d)
@@ -451,24 +431,18 @@
 	budget.action_if_annual_budget_exceeded = "Stop"
 	budget.action_if_accumulated_monthly_budget_exceeded = "Ignore"
 	budget.budget_against = budget_against
-	budget.append(
-		"accounts", {"account": "_Test Account Cost for Goods Sold - _TC", "budget_amount": 200000}
-	)
+	budget.append("accounts", {"account": "_Test Account Cost for Goods Sold - _TC", "budget_amount": 200000})
 
 	if args.applicable_on_material_request:
 		budget.applicable_on_material_request = 1
-		budget.action_if_annual_budget_exceeded_on_mr = (
-			args.action_if_annual_budget_exceeded_on_mr or "Warn"
-		)
+		budget.action_if_annual_budget_exceeded_on_mr = args.action_if_annual_budget_exceeded_on_mr or "Warn"
 		budget.action_if_accumulated_monthly_budget_exceeded_on_mr = (
 			args.action_if_accumulated_monthly_budget_exceeded_on_mr or "Warn"
 		)
 
 	if args.applicable_on_purchase_order:
 		budget.applicable_on_purchase_order = 1
-		budget.action_if_annual_budget_exceeded_on_po = (
-			args.action_if_annual_budget_exceeded_on_po or "Warn"
-		)
+		budget.action_if_annual_budget_exceeded_on_po = args.action_if_annual_budget_exceeded_on_po or "Warn"
 		budget.action_if_accumulated_monthly_budget_exceeded_on_po = (
 			args.action_if_accumulated_monthly_budget_exceeded_on_po or "Warn"
 		)
diff --git a/erpnext/accounts/doctype/budget_account/budget_account.json b/erpnext/accounts/doctype/budget_account/budget_account.json
index c7d8726..83f6fe9 100644
--- a/erpnext/accounts/doctype/budget_account/budget_account.json
+++ b/erpnext/accounts/doctype/budget_account/budget_account.json
@@ -29,14 +29,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-03-04 15:43:27.016947",
+ "modified": "2024-03-27 13:06:42.854458",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Budget Account",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/campaign_item/campaign_item.json b/erpnext/accounts/doctype/campaign_item/campaign_item.json
index 69383a4..b592088 100644
--- a/erpnext/accounts/doctype/campaign_item/campaign_item.json
+++ b/erpnext/accounts/doctype/campaign_item/campaign_item.json
@@ -19,13 +19,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-05-07 10:43:49.717633",
+ "modified": "2024-03-27 13:06:44.142625",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Campaign Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cashier_closing/cashier_closing.json b/erpnext/accounts/doctype/cashier_closing/cashier_closing.json
index 051b44b..a78c271 100644
--- a/erpnext/accounts/doctype/cashier_closing/cashier_closing.json
+++ b/erpnext/accounts/doctype/cashier_closing/cashier_closing.json
@@ -124,7 +124,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2023-12-28 13:15:46.858427",
+ "modified": "2024-03-27 13:06:44.260440",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Cashier Closing",
@@ -145,7 +145,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json b/erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json
index 7f16bea..6ac49f8 100644
--- a/erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json
+++ b/erpnext/accounts/doctype/cashier_closing_payments/cashier_closing_payments.json
@@ -1,109 +1,43 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-09-02 14:45:36.303520", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-09-02 14:45:36.303520",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "mode_of_payment",
+  "amount"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "mode_of_payment", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Mode of Payment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Mode of Payment", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "mode_of_payment",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Mode of Payment",
+   "options": "Mode of Payment",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0.00", 
-   "fieldname": "amount", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "default": "0.00",
+   "fieldname": "amount",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Amount"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2019-02-19 08:34:20.268037", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Cashier Closing Payments", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:44.414987",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Cashier Closing Payments",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json b/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json
index ee095ac..84bf069 100644
--- a/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json
+++ b/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json
@@ -50,7 +50,7 @@
  "in_create": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-02-28 08:49:11.422846",
+ "modified": "2024-03-27 13:06:44.535780",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Chart of Accounts Importer",
@@ -66,6 +66,7 @@
  ],
  "quick_entry": 1,
  "read_only": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py b/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py
index 1c805cc..e24c7c9 100644
--- a/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py
+++ b/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py
@@ -38,9 +38,7 @@
 
 	def validate(self):
 		if self.import_file:
-			get_coa(
-				"Chart of Accounts Importer", "All Accounts", file_name=self.import_file, for_validate=1
-			)
+			get_coa("Chart of Accounts Importer", "All Accounts", file_name=self.import_file, for_validate=1)
 
 
 def validate_columns(data):
@@ -116,7 +114,7 @@
 	file_path = file_doc.get_full_path()
 
 	data = []
-	with open(file_path, "r") as in_file:
+	with open(file_path) as in_file:
 		csv_reader = list(csv.reader(in_file))
 		headers = csv_reader[0]
 		del csv_reader[0]  # delete top row and headers row
@@ -215,10 +213,10 @@
 		for row in data:
 			account_name, parent_account, account_number, parent_account_number = row[0:4]
 			if account_number:
-				account_name = "{} - {}".format(account_number, account_name)
+				account_name = f"{account_number} - {account_name}"
 			if parent_account_number:
 				parent_account_number = cstr(parent_account_number).strip()
-				parent_account = "{} - {}".format(parent_account_number, parent_account)
+				parent_account = f"{parent_account_number} - {parent_account}"
 
 			if parent_account == account_name == child:
 				return [parent_account]
@@ -230,7 +228,7 @@
 							frappe.bold(parent_account)
 						)
 					)
-				return [child] + parent_account_list
+				return [child, *parent_account_list]
 
 	charts_map, paths = {}, []
 
@@ -250,12 +248,12 @@
 		) = i
 
 		if not account_name:
-			error_messages.append("Row {0}: Please enter Account Name".format(line_no))
+			error_messages.append(f"Row {line_no}: Please enter Account Name")
 
 		name = account_name
 		if account_number:
 			account_number = cstr(account_number).strip()
-			account_name = "{} - {}".format(account_number, account_name)
+			account_name = f"{account_number} - {account_name}"
 
 		charts_map[account_name] = {}
 		charts_map[account_name]["account_name"] = name
@@ -352,9 +350,9 @@
 
 def get_sample_template(writer, company):
 	currency = frappe.db.get_value("Company", company, "default_currency")
-	with open(os.path.join(os.path.dirname(__file__), "coa_sample_template.csv"), "r") as f:
+	with open(os.path.join(os.path.dirname(__file__), "coa_sample_template.csv")) as f:
 		for row in f:
-			row = row.strip().split(",") + [currency]
+			row = [*row.strip().split(","), currency]
 			writer.writerow(row)
 
 	return writer
@@ -463,7 +461,7 @@
 		"Purchase Taxes and Charges Template",
 	]:
 		frappe.db.sql(
-			'''delete from `tab{0}` where `company`="%s"'''.format(doctype) % (company)  # nosec
+			f'''delete from `tab{doctype}` where `company`="%s"''' % (company)  # nosec
 		)
 
 
diff --git a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json
index e9993c3..46380db 100644
--- a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json
+++ b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.json
@@ -1,1102 +1,343 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:bank_name", 
- "beta": 0, 
- "creation": "2016-05-04 14:35:00.402544", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
+ "actions": [],
+ "autoname": "field:bank_name",
+ "creation": "2016-05-04 14:35:00.402544",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "settings",
+  "has_print_format",
+  "primary_settings",
+  "bank_name",
+  "cheque_size",
+  "starting_position_from_top_edge",
+  "cheque_width",
+  "cheque_height",
+  "scanned_cheque",
+  "column_break_5",
+  "is_account_payable",
+  "acc_pay_dist_from_top_edge",
+  "acc_pay_dist_from_left_edge",
+  "message_to_show",
+  "date_and_payer_settings",
+  "date_settings",
+  "date_dist_from_top_edge",
+  "date_dist_from_left_edge",
+  "payer_settings",
+  "payer_name_from_top_edge",
+  "payer_name_from_left_edge",
+  "amount_in_words_and_figure_settings",
+  "html_19",
+  "amt_in_words_from_top_edge",
+  "amt_in_words_from_left_edge",
+  "amt_in_word_width",
+  "amt_in_words_line_spacing",
+  "amount_in_figure",
+  "amt_in_figures_from_top_edge",
+  "amt_in_figures_from_left_edge",
+  "account_number_and_signatory_settings",
+  "account_no_settings",
+  "acc_no_dist_from_top_edge",
+  "acc_no_dist_from_left_edge",
+  "signatory_position",
+  "signatory_from_top_edge",
+  "signatory_from_left_edge",
+  "preview",
+  "cheque_print_preview"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "", 
-   "fieldname": "settings", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "<div>\n<h3> All dimensions in centimeter only </h3>\n</div>", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "settings",
+   "fieldtype": "HTML",
+   "options": "<div>\n<h3> All dimensions in centimeter only </h3>\n</div>"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "has_print_format", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Has Print Format", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "has_print_format",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Has Print Format",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "primary_settings", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Primary Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "primary_settings",
+   "fieldtype": "Section Break",
+   "label": "Primary Settings"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "bank_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Bank Name", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "bank_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Bank Name",
+   "no_copy": 1,
+   "reqd": 1,
+   "unique": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "Regular", 
-   "fieldname": "cheque_size", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Cheque Size", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nRegular\nA4", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "Regular",
+   "fieldname": "cheque_size",
+   "fieldtype": "Select",
+   "label": "Cheque Size",
+   "options": "\nRegular\nA4"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "depends_on": "eval:doc.cheque_size==\"A4\"", 
-   "fieldname": "starting_position_from_top_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Starting position from top edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.cheque_size==\"A4\"",
+   "fieldname": "starting_position_from_top_edge",
+   "fieldtype": "Float",
+   "label": "Starting position from top edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "20.00", 
-   "fieldname": "cheque_width", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Cheque Width", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "20.00",
+   "fieldname": "cheque_width",
+   "fieldtype": "Float",
+   "label": "Cheque Width",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "9.00", 
-   "fieldname": "cheque_height", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Cheque Height", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "9.00",
+   "fieldname": "cheque_height",
+   "fieldtype": "Float",
+   "label": "Cheque Height",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "", 
-   "fieldname": "scanned_cheque", 
-   "fieldtype": "Attach", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Scanned Cheque", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "scanned_cheque",
+   "fieldtype": "Attach",
+   "label": "Scanned Cheque"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "1", 
-   "fieldname": "is_account_payable", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Is Account Payable", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "1",
+   "fieldname": "is_account_payable",
+   "fieldtype": "Check",
+   "label": "Is Account Payable"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "1.00", 
-   "depends_on": "eval:doc.is_account_payable", 
-   "fieldname": "acc_pay_dist_from_top_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Distance from top edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "1.00",
+   "depends_on": "eval:doc.is_account_payable",
+   "fieldname": "acc_pay_dist_from_top_edge",
+   "fieldtype": "Float",
+   "label": "Distance from top edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "9.00", 
-   "depends_on": "eval:doc.is_account_payable", 
-   "fieldname": "acc_pay_dist_from_left_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Distance from left edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "9.00",
+   "depends_on": "eval:doc.is_account_payable",
+   "fieldname": "acc_pay_dist_from_left_edge",
+   "fieldtype": "Float",
+   "label": "Distance from left edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "Acc. Payee", 
-   "depends_on": "eval:doc.is_account_payable", 
-   "fieldname": "message_to_show", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Message to show", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "Acc. Payee",
+   "depends_on": "eval:doc.is_account_payable",
+   "fieldname": "message_to_show",
+   "fieldtype": "Data",
+   "label": "Message to show"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "date_and_payer_settings", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "date_and_payer_settings",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "date_settings", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Date Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "<label class=\"control-label\" style=\"margin-bottom: 0px;\">Date Settings</label>", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "date_settings",
+   "fieldtype": "HTML",
+   "label": "Date Settings",
+   "options": "<label class=\"control-label\" style=\"margin-bottom: 0px;\">Date Settings</label>"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "1.00", 
-   "fieldname": "date_dist_from_top_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Distance from top edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "1.00",
+   "fieldname": "date_dist_from_top_edge",
+   "fieldtype": "Float",
+   "label": "Distance from top edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "15.00", 
-   "depends_on": "", 
-   "fieldname": "date_dist_from_left_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Starting location from left edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "15.00",
+   "fieldname": "date_dist_from_left_edge",
+   "fieldtype": "Float",
+   "label": "Starting location from left edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "payer_settings", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Payer Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "payer_settings",
+   "fieldtype": "Column Break",
+   "label": "Payer Settings"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "2.00", 
-   "fieldname": "payer_name_from_top_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Distance from top edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "2.00",
+   "fieldname": "payer_name_from_top_edge",
+   "fieldtype": "Float",
+   "label": "Distance from top edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "3.00", 
-   "fieldname": "payer_name_from_left_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Starting location from left edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "3.00",
+   "fieldname": "payer_name_from_left_edge",
+   "fieldtype": "Float",
+   "label": "Starting location from left edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "amount_in_words_and_figure_settings", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "amount_in_words_and_figure_settings",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "html_19", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "<label class=\"control-label\" style=\"margin-bottom: 0px;\">Amount In Words</label>", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "html_19",
+   "fieldtype": "HTML",
+   "options": "<label class=\"control-label\" style=\"margin-bottom: 0px;\">Amount In Words</label>"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "3.00", 
-   "fieldname": "amt_in_words_from_top_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Distance from top edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "3.00",
+   "fieldname": "amt_in_words_from_top_edge",
+   "fieldtype": "Float",
+   "label": "Distance from top edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "4.00", 
-   "fieldname": "amt_in_words_from_left_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Starting location from left edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "4.00",
+   "fieldname": "amt_in_words_from_left_edge",
+   "fieldtype": "Float",
+   "label": "Starting location from left edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "15.00", 
-   "fieldname": "amt_in_word_width", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Width of amount in word", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "15.00",
+   "fieldname": "amt_in_word_width",
+   "fieldtype": "Float",
+   "label": "Width of amount in word",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "0.50", 
-   "fieldname": "amt_in_words_line_spacing", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Line spacing for amount in words", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0.50",
+   "fieldname": "amt_in_words_line_spacing",
+   "fieldtype": "Float",
+   "label": "Line spacing for amount in words",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "amount_in_figure", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Amount In Figure", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "amount_in_figure",
+   "fieldtype": "Column Break",
+   "label": "Amount In Figure"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "3.50", 
-   "fieldname": "amt_in_figures_from_top_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Distance from top edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "3.50",
+   "fieldname": "amt_in_figures_from_top_edge",
+   "fieldtype": "Float",
+   "label": "Distance from top edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "16.00", 
-   "fieldname": "amt_in_figures_from_left_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Starting location from left edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "16.00",
+   "fieldname": "amt_in_figures_from_left_edge",
+   "fieldtype": "Float",
+   "label": "Starting location from left edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "account_number_and_signatory_settings", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "account_number_and_signatory_settings",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "account_no_settings", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "<label class=\"control-label\" style=\"margin-bottom: 0px;\">Account Number Settings</label>", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "account_no_settings",
+   "fieldtype": "HTML",
+   "options": "<label class=\"control-label\" style=\"margin-bottom: 0px;\">Account Number Settings</label>"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "5.00", 
-   "fieldname": "acc_no_dist_from_top_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Distance from top edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "5.00",
+   "fieldname": "acc_no_dist_from_top_edge",
+   "fieldtype": "Float",
+   "label": "Distance from top edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "4.00", 
-   "fieldname": "acc_no_dist_from_left_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Starting location from left edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "4.00",
+   "fieldname": "acc_no_dist_from_left_edge",
+   "fieldtype": "Float",
+   "label": "Starting location from left edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "signatory_position", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Signatory Position", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "signatory_position",
+   "fieldtype": "Column Break",
+   "label": "Signatory Position"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "6.00", 
-   "fieldname": "signatory_from_top_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Distance from top edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "6.00",
+   "fieldname": "signatory_from_top_edge",
+   "fieldtype": "Float",
+   "label": "Distance from top edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "default": "15.00", 
-   "fieldname": "signatory_from_left_edge", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Starting location from left edge", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "2", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "15.00",
+   "fieldname": "signatory_from_left_edge",
+   "fieldtype": "Float",
+   "label": "Starting location from left edge",
+   "precision": "2"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "preview", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Preview", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "preview",
+   "fieldtype": "Section Break",
+   "label": "Preview"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "cheque_print_preview", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "cheque_print_preview",
+   "fieldtype": "HTML"
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 1, 
- "modified": "2016-06-23 20:19:11.694932", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Cheque Print Template", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "max_attachments": 1,
+ "modified": "2024-03-27 13:06:44.654989",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Cheque Print Template",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py
index 205bb29..4b1394e 100644
--- a/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py
+++ b/erpnext/accounts/doctype/cheque_print_template/cheque_print_template.py
@@ -66,71 +66,71 @@
 
 	cheque_print.html = """
 <style>
-	.print-format {
+	.print-format {{
 		padding: 0px;
-	}
-	@media screen {
-		.print-format {
+	}}
+	@media screen {{
+		.print-format {{
 			padding: 0in;
-		}
-	}
+		}}
+	}}
 </style>
-<div style="position: relative; top:%(starting_position_from_top_edge)scm">
-	<div style="width:%(cheque_width)scm;height:%(cheque_height)scm;">
-		<span style="top:%(acc_pay_dist_from_top_edge)scm; left:%(acc_pay_dist_from_left_edge)scm;
+<div style="position: relative; top:{starting_position_from_top_edge}cm">
+	<div style="width:{cheque_width}cm;height:{cheque_height}cm;">
+		<span style="top:{acc_pay_dist_from_top_edge}cm; left:{acc_pay_dist_from_left_edge}cm;
 			border-bottom: solid 1px;border-top:solid 1px; width:2cm;text-align: center; position: absolute;">
-				%(message_to_show)s
+				{message_to_show}
 		</span>
-		<span style="top:%(date_dist_from_top_edge)scm; left:%(date_dist_from_left_edge)scm;
+		<span style="top:{date_dist_from_top_edge}cm; left:{date_dist_from_left_edge}cm;
 			position: absolute;">
-			{{ frappe.utils.formatdate(doc.reference_date) or '' }}
+			{{{{ frappe.utils.formatdate(doc.reference_date) or '' }}}}
 		</span>
-		<span style="top:%(acc_no_dist_from_top_edge)scm;left:%(acc_no_dist_from_left_edge)scm;
+		<span style="top:{acc_no_dist_from_top_edge}cm;left:{acc_no_dist_from_left_edge}cm;
 			position: absolute;  min-width: 6cm;">
-			{{ doc.account_no or '' }}
+			{{{{ doc.account_no or '' }}}}
 		</span>
-		<span style="top:%(payer_name_from_top_edge)scm;left: %(payer_name_from_left_edge)scm;
+		<span style="top:{payer_name_from_top_edge}cm;left: {payer_name_from_left_edge}cm;
 			position: absolute;  min-width: 6cm;">
-			{{doc.party_name}}
+			{{{{doc.party_name}}}}
 		</span>
-		<span style="top:%(amt_in_words_from_top_edge)scm; left:%(amt_in_words_from_left_edge)scm;
-			position: absolute; display: block; width: %(amt_in_word_width)scm;
-			line-height:%(amt_in_words_line_spacing)scm; word-wrap: break-word;">
-				{{frappe.utils.money_in_words(doc.base_paid_amount or doc.base_received_amount)}}
+		<span style="top:{amt_in_words_from_top_edge}cm; left:{amt_in_words_from_left_edge}cm;
+			position: absolute; display: block; width: {amt_in_word_width}cm;
+			line-height:{amt_in_words_line_spacing}cm; word-wrap: break-word;">
+				{{{{frappe.utils.money_in_words(doc.base_paid_amount or doc.base_received_amount)}}}}
 		</span>
-		<span style="top:%(amt_in_figures_from_top_edge)scm;left: %(amt_in_figures_from_left_edge)scm;
+		<span style="top:{amt_in_figures_from_top_edge}cm;left: {amt_in_figures_from_left_edge}cm;
 			position: absolute; min-width: 4cm;">
-			{{doc.get_formatted("base_paid_amount") or doc.get_formatted("base_received_amount")}}
+			{{{{doc.get_formatted("base_paid_amount") or doc.get_formatted("base_received_amount")}}}}
 		</span>
-		<span style="top:%(signatory_from_top_edge)scm;left: %(signatory_from_left_edge)scm;
+		<span style="top:{signatory_from_top_edge}cm;left: {signatory_from_left_edge}cm;
 			position: absolute;  min-width: 6cm;">
-			{{doc.company}}
+			{{{{doc.company}}}}
 		</span>
 	</div>
-</div>""" % {
-		"starting_position_from_top_edge": doc.starting_position_from_top_edge
+</div>""".format(
+		starting_position_from_top_edge=doc.starting_position_from_top_edge
 		if doc.cheque_size == "A4"
 		else 0.0,
-		"cheque_width": doc.cheque_width,
-		"cheque_height": doc.cheque_height,
-		"acc_pay_dist_from_top_edge": doc.acc_pay_dist_from_top_edge,
-		"acc_pay_dist_from_left_edge": doc.acc_pay_dist_from_left_edge,
-		"message_to_show": doc.message_to_show if doc.message_to_show else _("Account Pay Only"),
-		"date_dist_from_top_edge": doc.date_dist_from_top_edge,
-		"date_dist_from_left_edge": doc.date_dist_from_left_edge,
-		"acc_no_dist_from_top_edge": doc.acc_no_dist_from_top_edge,
-		"acc_no_dist_from_left_edge": doc.acc_no_dist_from_left_edge,
-		"payer_name_from_top_edge": doc.payer_name_from_top_edge,
-		"payer_name_from_left_edge": doc.payer_name_from_left_edge,
-		"amt_in_words_from_top_edge": doc.amt_in_words_from_top_edge,
-		"amt_in_words_from_left_edge": doc.amt_in_words_from_left_edge,
-		"amt_in_word_width": doc.amt_in_word_width,
-		"amt_in_words_line_spacing": doc.amt_in_words_line_spacing,
-		"amt_in_figures_from_top_edge": doc.amt_in_figures_from_top_edge,
-		"amt_in_figures_from_left_edge": doc.amt_in_figures_from_left_edge,
-		"signatory_from_top_edge": doc.signatory_from_top_edge,
-		"signatory_from_left_edge": doc.signatory_from_left_edge,
-	}
+		cheque_width=doc.cheque_width,
+		cheque_height=doc.cheque_height,
+		acc_pay_dist_from_top_edge=doc.acc_pay_dist_from_top_edge,
+		acc_pay_dist_from_left_edge=doc.acc_pay_dist_from_left_edge,
+		message_to_show=doc.message_to_show if doc.message_to_show else _("Account Pay Only"),
+		date_dist_from_top_edge=doc.date_dist_from_top_edge,
+		date_dist_from_left_edge=doc.date_dist_from_left_edge,
+		acc_no_dist_from_top_edge=doc.acc_no_dist_from_top_edge,
+		acc_no_dist_from_left_edge=doc.acc_no_dist_from_left_edge,
+		payer_name_from_top_edge=doc.payer_name_from_top_edge,
+		payer_name_from_left_edge=doc.payer_name_from_left_edge,
+		amt_in_words_from_top_edge=doc.amt_in_words_from_top_edge,
+		amt_in_words_from_left_edge=doc.amt_in_words_from_left_edge,
+		amt_in_word_width=doc.amt_in_word_width,
+		amt_in_words_line_spacing=doc.amt_in_words_line_spacing,
+		amt_in_figures_from_top_edge=doc.amt_in_figures_from_top_edge,
+		amt_in_figures_from_left_edge=doc.amt_in_figures_from_left_edge,
+		signatory_from_top_edge=doc.signatory_from_top_edge,
+		signatory_from_left_edge=doc.signatory_from_left_edge,
+	)
 
 	cheque_print.save(ignore_permissions=True)
 
diff --git a/erpnext/accounts/doctype/closed_document/closed_document.json b/erpnext/accounts/doctype/closed_document/closed_document.json
index f6ec76b..48fcc56 100644
--- a/erpnext/accounts/doctype/closed_document/closed_document.json
+++ b/erpnext/accounts/doctype/closed_document/closed_document.json
@@ -1,104 +1,41 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-04-13 18:51:29.720606", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-04-13 18:51:29.720606",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "document_type",
+  "closed"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "document_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Document Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "document_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Document Type",
+   "options": "DocType",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "closed", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Closed", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "default": "0",
+   "fieldname": "closed",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Closed"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-04-13 18:51:41.118025", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Closed Document", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:44.854280",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Closed Document",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 2e66db7..b6c5830 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -125,7 +125,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2022-01-31 13:22:58.916273",
+ "modified": "2024-03-27 13:06:46.762208",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Cost Center",
@@ -167,7 +167,7 @@
  ],
  "search_fields": "parent_cost_center, is_group",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.py b/erpnext/accounts/doctype/cost_center/cost_center.py
index f662eb1..761369c 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.py
+++ b/erpnext/accounts/doctype/cost_center/cost_center.py
@@ -34,9 +34,7 @@
 	def autoname(self):
 		from erpnext.accounts.utils import get_autoname_with_number
 
-		self.name = get_autoname_with_number(
-			self.cost_center_number, self.cost_center_name, self.company
-		)
+		self.name = get_autoname_with_number(self.cost_center_number, self.cost_center_name, self.company)
 
 	def validate(self):
 		self.validate_mandatory()
@@ -109,14 +107,14 @@
 		new_cost_center = get_name_with_abbr(newdn, self.company)
 
 		# Validate properties before merging
-		super(CostCenter, self).before_rename(olddn, new_cost_center, merge, "is_group")
+		super().before_rename(olddn, new_cost_center, merge, "is_group")
 		if not merge:
 			new_cost_center = get_name_with_number(new_cost_center, self.cost_center_number)
 
 		return new_cost_center
 
 	def after_rename(self, olddn, newdn, merge=False):
-		super(CostCenter, self).after_rename(olddn, newdn, merge)
+		super().after_rename(olddn, newdn, merge)
 
 		if not merge:
 			new_cost_center = frappe.db.get_value(
diff --git a/erpnext/accounts/doctype/cost_center/test_cost_center.py b/erpnext/accounts/doctype/cost_center/test_cost_center.py
index 2ec1609..7d01918 100644
--- a/erpnext/accounts/doctype/cost_center/test_cost_center.py
+++ b/erpnext/accounts/doctype/cost_center/test_cost_center.py
@@ -10,7 +10,6 @@
 
 class TestCostCenter(unittest.TestCase):
 	def test_cost_center_creation_against_child_node(self):
-
 		if not frappe.db.get_value("Cost Center", {"name": "_Test Cost Center 2 - _TC"}):
 			frappe.get_doc(test_records[1]).insert()
 
diff --git a/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.json b/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.json
index 45ab886..19c694d 100644
--- a/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.json
+++ b/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.json
@@ -68,11 +68,10 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-01-31 11:47:12.086253",
+ "modified": "2024-03-27 13:06:46.938642",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Cost Center Allocation",
- "name_case": "UPPER CASE",
  "naming_rule": "Expression (old style)",
  "owner": "Administrator",
  "permissions": [
@@ -122,7 +121,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py b/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py
index 9ed5ddf..784ad27 100644
--- a/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py
+++ b/erpnext/accounts/doctype/cost_center_allocation/cost_center_allocation.py
@@ -48,7 +48,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(CostCenterAllocation, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self._skip_from_date_validation = False
 
 	def validate(self):
@@ -63,9 +63,7 @@
 		total_percentage = sum([d.percentage for d in self.get("allocation_percentages", [])])
 
 		if total_percentage != 100:
-			frappe.throw(
-				_("Total percentage against cost centers should be 100"), WrongPercentageAllocation
-			)
+			frappe.throw(_("Total percentage against cost centers should be 100"), WrongPercentageAllocation)
 
 	def validate_from_date_based_on_existing_gle(self):
 		# Check if GLE exists against the main cost center
diff --git a/erpnext/accounts/doctype/cost_center_allocation_percentage/cost_center_allocation_percentage.json b/erpnext/accounts/doctype/cost_center_allocation_percentage/cost_center_allocation_percentage.json
index 7e50962..093a98c 100644
--- a/erpnext/accounts/doctype/cost_center_allocation_percentage/cost_center_allocation_percentage.json
+++ b/erpnext/accounts/doctype/cost_center_allocation_percentage/cost_center_allocation_percentage.json
@@ -29,13 +29,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-02-01 22:22:31.589523",
+ "modified": "2024-03-27 13:06:47.100633",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Cost Center Allocation Percentage",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/coupon_code/coupon_code.json b/erpnext/accounts/doctype/coupon_code/coupon_code.json
index c6b1477..f88057f 100644
--- a/erpnext/accounts/doctype/coupon_code/coupon_code.json
+++ b/erpnext/accounts/doctype/coupon_code/coupon_code.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "field:coupon_name",
  "creation": "2018-01-22 14:34:39.701832",
@@ -115,7 +116,8 @@
    "read_only": 1
   }
  ],
- "modified": "2024-01-24 02:20:26.145996",
+ "links": [],
+ "modified": "2024-03-27 13:06:47.220931",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Coupon Code",
@@ -170,8 +172,9 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "coupon_name",
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
index bd90b8a..992d961 100644
--- a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
+++ b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
@@ -104,7 +104,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-03-18 08:32:26.895076",
+ "modified": "2024-03-27 13:06:47.653110",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Currency Exchange Settings",
@@ -141,7 +141,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
index b8817c6..8cbb99e 100644
--- a/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
+++ b/erpnext/accounts/doctype/currency_exchange_settings/currency_exchange_settings.py
@@ -43,7 +43,6 @@
 
 	def set_parameters_and_result(self):
 		if self.service_provider == "exchangerate.host":
-
 			if not self.access_key:
 				frappe.throw(
 					_("Access Key is required for Service Provider: {0}").format(
@@ -78,9 +77,7 @@
 				transaction_date=nowdate(), to_currency="INR", from_currency="USD"
 			)
 
-		api_url = self.api_endpoint.format(
-			transaction_date=nowdate(), to_currency="INR", from_currency="USD"
-		)
+		api_url = self.api_endpoint.format(transaction_date=nowdate(), to_currency="INR", from_currency="USD")
 
 		try:
 			response = requests.get(api_url, params=params)
@@ -100,14 +97,14 @@
 				]
 		except Exception:
 			frappe.throw(_("Invalid result key. Response:") + " " + response.text)
-		if not isinstance(value, (int, float)):
+		if not isinstance(value, int | float):
 			frappe.throw(_("Returned exchange rate is neither integer not float."))
 
 		self.url = response.url
 
 
 @frappe.whitelist()
-def get_api_endpoint(service_provider: str = None, use_http: bool = False):
+def get_api_endpoint(service_provider: str | None = None, use_http: bool = False):
 	if service_provider and service_provider in ["exchangerate.host", "frankfurter.app"]:
 		if service_provider == "exchangerate.host":
 			api = "api.exchangerate.host/convert"
diff --git a/erpnext/accounts/doctype/currency_exchange_settings_details/currency_exchange_settings_details.json b/erpnext/accounts/doctype/currency_exchange_settings_details/currency_exchange_settings_details.json
index 3093587..26ace53 100644
--- a/erpnext/accounts/doctype/currency_exchange_settings_details/currency_exchange_settings_details.json
+++ b/erpnext/accounts/doctype/currency_exchange_settings_details/currency_exchange_settings_details.json
@@ -27,13 +27,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-11-03 19:14:55.889037",
+ "modified": "2024-03-27 13:06:47.819210",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Currency Exchange Settings Details",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/currency_exchange_settings_result/currency_exchange_settings_result.json b/erpnext/accounts/doctype/currency_exchange_settings_result/currency_exchange_settings_result.json
index fff5337..7c4f093 100644
--- a/erpnext/accounts/doctype/currency_exchange_settings_result/currency_exchange_settings_result.json
+++ b/erpnext/accounts/doctype/currency_exchange_settings_result/currency_exchange_settings_result.json
@@ -19,13 +19,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-11-03 19:14:40.054245",
+ "modified": "2024-03-27 13:06:47.937025",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Currency Exchange Settings Result",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/customer_group_item/customer_group_item.json b/erpnext/accounts/doctype/customer_group_item/customer_group_item.json
index bd1229d..79dc199 100644
--- a/erpnext/accounts/doctype/customer_group_item/customer_group_item.json
+++ b/erpnext/accounts/doctype/customer_group_item/customer_group_item.json
@@ -19,13 +19,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-05-07 10:39:21.563506",
+ "modified": "2024-03-27 13:06:48.735688",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Customer Group Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/customer_item/customer_item.json b/erpnext/accounts/doctype/customer_item/customer_item.json
index f3dac02..08b9c41 100644
--- a/erpnext/accounts/doctype/customer_item/customer_item.json
+++ b/erpnext/accounts/doctype/customer_item/customer_item.json
@@ -19,13 +19,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-05-06 10:02:32.967841",
+ "modified": "2024-03-27 13:06:48.844074",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Customer Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json b/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json
index 02b0c4d..5d19fd6 100644
--- a/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json
+++ b/erpnext/accounts/doctype/discounted_invoice/discounted_invoice.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-03-07 12:07:09.416101",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -61,14 +62,16 @@
   }
  ],
  "istable": 1,
- "modified": "2020-02-20 16:16:20.724620",
+ "links": [],
+ "modified": "2024-03-27 13:06:51.610919",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Discounted Invoice",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/dunning/dunning.json b/erpnext/accounts/doctype/dunning/dunning.json
index b7e8aea..bfd1feb 100644
--- a/erpnext/accounts/doctype/dunning/dunning.json
+++ b/erpnext/accounts/doctype/dunning/dunning.json
@@ -185,7 +185,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Address",
    "read_only": 1
   },
@@ -204,7 +204,7 @@
   },
   {
    "fieldname": "company_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Company Address Display",
    "read_only": 1
   },
@@ -381,7 +381,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-15 15:46:53.865712",
+ "modified": "2024-03-27 13:08:19.176146",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Dunning",
@@ -430,7 +430,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "title_field": "customer_name",
diff --git a/erpnext/accounts/doctype/dunning/dunning.py b/erpnext/accounts/doctype/dunning/dunning.py
index e3897bf..f7c4d90 100644
--- a/erpnext/accounts/doctype/dunning/dunning.py
+++ b/erpnext/accounts/doctype/dunning/dunning.py
@@ -32,14 +32,14 @@
 
 		from erpnext.accounts.doctype.overdue_payment.overdue_payment import OverduePayment
 
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		base_dunning_amount: DF.Currency
 		body_text: DF.TextEditor | None
 		closing_text: DF.TextEditor | None
 		company: DF.Link
 		company_address: DF.Link | None
-		company_address_display: DF.SmallText | None
+		company_address_display: DF.TextEditor | None
 		contact_display: DF.SmallText | None
 		contact_email: DF.Data | None
 		contact_mobile: DF.SmallText | None
diff --git a/erpnext/accounts/doctype/dunning/test_dunning.py b/erpnext/accounts/doctype/dunning/test_dunning.py
index b29ace2..62a0c90 100644
--- a/erpnext/accounts/doctype/dunning/test_dunning.py
+++ b/erpnext/accounts/doctype/dunning/test_dunning.py
@@ -109,9 +109,7 @@
 
 def create_dunning(overdue_days, dunning_type_name=None):
 	posting_date = add_days(today(), -1 * overdue_days)
-	sales_invoice = create_sales_invoice_against_cost_center(
-		posting_date=posting_date, qty=1, rate=100
-	)
+	sales_invoice = create_sales_invoice_against_cost_center(posting_date=posting_date, qty=1, rate=100)
 	dunning = create_dunning_from_sales_invoice(sales_invoice.name)
 
 	if dunning_type_name:
diff --git a/erpnext/accounts/doctype/dunning_letter_text/dunning_letter_text.json b/erpnext/accounts/doctype/dunning_letter_text/dunning_letter_text.json
index 5ede3a1..0e5c044 100644
--- a/erpnext/accounts/doctype/dunning_letter_text/dunning_letter_text.json
+++ b/erpnext/accounts/doctype/dunning_letter_text/dunning_letter_text.json
@@ -58,13 +58,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-07-14 18:02:35.988958",
+ "modified": "2024-03-27 13:08:19.435616",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Dunning Letter Text",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/dunning_type/dunning_type.json b/erpnext/accounts/doctype/dunning_type/dunning_type.json
index 5e39769..bc5b336 100644
--- a/erpnext/accounts/doctype/dunning_type/dunning_type.json
+++ b/erpnext/accounts/doctype/dunning_type/dunning_type.json
@@ -107,7 +107,7 @@
    "link_fieldname": "dunning_type"
   }
  ],
- "modified": "2021-11-13 00:25:35.659283",
+ "modified": "2024-03-27 13:08:19.584112",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Dunning Type",
@@ -151,7 +151,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json
index 79428d5..02ec9e3 100644
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.json
@@ -109,7 +109,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-20 07:29:06.972434",
+ "modified": "2024-03-27 13:09:42.951164",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Exchange Rate Revaluation",
@@ -162,7 +162,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
index 29732ef..2b17779 100644
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py
@@ -268,7 +268,6 @@
 
 			# Handle Accounts with '0' balance in Account/Base Currency
 			for d in [x for x in account_details if x.zero_balance]:
-
 				if d.balance != 0:
 					current_exchange_rate = new_exchange_rate = 0
 
@@ -281,7 +280,8 @@
 					new_balance_in_account_currency = 0
 
 					current_exchange_rate = (
-						calculate_exchange_rate_using_last_gle(company, d.account, d.party_type, d.party) or 0.0
+						calculate_exchange_rate_using_last_gle(company, d.account, d.party_type, d.party)
+						or 0.0
 					)
 
 					gain_loss = new_balance_in_account_currency - (
@@ -335,9 +335,7 @@
 
 		revaluation_jv = self.make_jv_for_revaluation()
 		if revaluation_jv:
-			frappe.msgprint(
-				f"Revaluation Journal: {get_link_to_form('Journal Entry', revaluation_jv.name)}"
-			)
+			frappe.msgprint(f"Revaluation Journal: {get_link_to_form('Journal Entry', revaluation_jv.name)}")
 
 		return {
 			"revaluation_jv": revaluation_jv.name if revaluation_jv else None,
@@ -394,7 +392,8 @@
 				journal_account.update(
 					{
 						dr_or_cr: flt(
-							abs(d.get("balance_in_account_currency")), d.precision("balance_in_account_currency")
+							abs(d.get("balance_in_account_currency")),
+							d.precision("balance_in_account_currency"),
 						),
 						reverse_dr_or_cr: 0,
 						"debit": 0,
@@ -520,7 +519,9 @@
 						abs(d.get("balance_in_account_currency")), d.precision("balance_in_account_currency")
 					),
 					"cost_center": erpnext.get_default_cost_center(self.company),
-					"exchange_rate": flt(d.get("current_exchange_rate"), d.precision("current_exchange_rate")),
+					"exchange_rate": flt(
+						d.get("current_exchange_rate"), d.precision("current_exchange_rate")
+					),
 					"reference_type": "Exchange Rate Revaluation",
 					"reference_name": self.name,
 				}
@@ -598,7 +599,7 @@
 
 @frappe.whitelist()
 def get_account_details(
-	company, posting_date, account, party_type=None, party=None, rounding_loss_allowance: float = None
+	company, posting_date, account, party_type=None, party=None, rounding_loss_allowance: float | None = None
 ):
 	if not (company and posting_date):
 		frappe.throw(_("Company and Posting Date is mandatory"))
@@ -611,7 +612,7 @@
 		frappe.throw(_("Party Type and Party is mandatory for {0} account").format(account_type))
 
 	account_details = {}
-	company_currency = erpnext.get_company_currency(company)
+	erpnext.get_company_currency(company)
 
 	account_details = {
 		"account_currency": account_currency,
@@ -625,9 +626,7 @@
 		rounding_loss_allowance=rounding_loss_allowance,
 	)
 
-	if account_balance and (
-		account_balance[0].balance or account_balance[0].balance_in_account_currency
-	):
+	if account_balance and (account_balance[0].balance or account_balance[0].balance_in_account_currency):
 		if account_with_new_balance := ExchangeRateRevaluation.calculate_new_account_balance(
 			company, posting_date, account_balance
 		):
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py b/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py
index e520872..51053f1 100644
--- a/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation/test_exchange_rate_revaluation.py
@@ -1,21 +1,14 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
-from frappe import qb
 from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils import add_days, flt, today
 
-from erpnext import get_default_cost_center
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
-from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
-from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-from erpnext.accounts.party import get_party_account
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
-from erpnext.stock.doctype.item.test_item import create_item
 
 
 class TestExchangeRateRevaluation(AccountsTestMixin, FrappeTestCase):
@@ -73,9 +66,7 @@
 		err.extend("accounts", accounts)
 		row = err.accounts[0]
 		row.new_exchange_rate = 85
-		row.new_balance_in_base_currency = flt(
-			row.new_exchange_rate * flt(row.balance_in_account_currency)
-		)
+		row.new_balance_in_base_currency = flt(row.new_exchange_rate * flt(row.balance_in_account_currency))
 		row.gain_loss = row.new_balance_in_base_currency - flt(row.balance_in_base_currency)
 		err.set_total_gain_loss()
 		err = err.save().submit()
@@ -127,9 +118,9 @@
 		pe.save().submit()
 
 		# Cancel the auto created gain/loss JE to simulate balance only in base currency
-		je = frappe.db.get_all(
-			"Journal Entry Account", filters={"reference_name": si.name}, pluck="parent"
-		)[0]
+		je = frappe.db.get_all("Journal Entry Account", filters={"reference_name": si.name}, pluck="parent")[
+			0
+		]
 		frappe.get_doc("Journal Entry", je).cancel()
 
 		err = frappe.new_doc("Exchange Rate Revaluation")
@@ -235,9 +226,9 @@
 			self.assertEqual(flt(acc.debit, precision), 0.0)
 			self.assertEqual(flt(acc.credit, precision), 0.0)
 
-		row = [x for x in je.accounts if x.account == self.debtors_usd][0]
+		row = next(x for x in je.accounts if x.account == self.debtors_usd)
 		self.assertEqual(flt(row.credit_in_account_currency, precision), 5.0)  # in USD
-		row = [x for x in je.accounts if x.account != self.debtors_usd][0]
+		row = next(x for x in je.accounts if x.account != self.debtors_usd)
 		self.assertEqual(flt(row.debit_in_account_currency, precision), 421.06)  # in INR
 
 		# total_debit and total_credit will be 0.0, as JV is posting only to account currency fields
@@ -294,5 +285,5 @@
 			"new_balance_in_account_currency": 100.0,
 		}
 
-		for key, val in expected_data.items():
+		for key, _val in expected_data.items():
 			self.assertEqual(expected_data.get(key), account_details.get(key))
diff --git a/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json b/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json
index fd2d931..66deb2e 100644
--- a/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json
+++ b/erpnext/accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json
@@ -149,14 +149,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-06-22 12:39:56.446722",
+ "modified": "2024-03-27 13:09:43.128675",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Exchange Rate Revaluation Account",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/finance_book/finance_book.json b/erpnext/accounts/doctype/finance_book/finance_book.json
index c9fb843..87cdaa5 100644
--- a/erpnext/accounts/doctype/finance_book/finance_book.json
+++ b/erpnext/accounts/doctype/finance_book/finance_book.json
@@ -1,133 +1,67 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "field:finance_book_name", 
- "beta": 0, 
- "creation": "2018-04-13 17:42:43.252224", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "field:finance_book_name",
+ "creation": "2018-04-13 17:42:43.252224",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "finance_book_name"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "finance_book_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "finance_book_name",
+   "fieldtype": "Data",
+   "label": "Name",
+   "unique": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-book", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-05-09 14:55:01.394387", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Finance Book", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-book",
+ "links": [],
+ "modified": "2024-03-27 13:09:44.514241",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Finance Book",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 0
-  }, 
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "share": 1
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Auditor", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 0
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Auditor",
+   "share": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "finance_book_name", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
+ ],
+ "quick_entry": 1,
+ "search_fields": "finance_book_name",
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1,
  "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
index 85f3ffd..25aa3f3 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.py
@@ -108,9 +108,9 @@
 
 				if overlap:
 					frappe.throw(
-						_("Year start date or end date is overlapping with {0}. To avoid please set company").format(
-							existing.name
-						),
+						_(
+							"Year start date or end date is overlapping with {0}. To avoid please set company"
+						).format(existing.name),
 						frappe.NameError,
 					)
 
@@ -126,9 +126,9 @@
 			not frappe.flags.in_test
 		):
 			frappe.throw(
-				_("Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0}").format(
-					fiscal_year
-				)
+				_(
+					"Fiscal Year Start Date and Fiscal Year End Date are already set in Fiscal Year {0}"
+				).format(fiscal_year)
 			)
 
 
diff --git a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
index 67acb26..ef1d9b0 100644
--- a/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
+++ b/erpnext/accounts/doctype/fiscal_year_company/fiscal_year_company.json
@@ -21,13 +21,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-09-28 18:01:53.495929",
+ "modified": "2024-03-27 13:09:44.659251",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Fiscal Year Company",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index 991a08b..dde3b77 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -291,7 +291,7 @@
  "idx": 1,
  "in_create": 1,
  "links": [],
- "modified": "2024-03-19 18:43:42.235373",
+ "modified": "2024-03-27 13:09:45.205364",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "GL Entry",
@@ -323,7 +323,7 @@
  ],
  "quick_entry": 1,
  "search_fields": "voucher_no,account,posting_date,against_voucher",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index a6f6d4e..c494eec 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -105,13 +105,18 @@
 			]:
 				# Update outstanding amt on against voucher
 				if (
-					self.against_voucher_type in ["Journal Entry", "Sales Invoice", "Purchase Invoice", "Fees"]
+					self.against_voucher_type
+					in ["Journal Entry", "Sales Invoice", "Purchase Invoice", "Fees"]
 					and self.against_voucher
 					and self.flags.update_outstanding == "Yes"
 					and not frappe.flags.is_reverse_depr_entry
 				):
 					update_outstanding_amt(
-						self.account, self.party_type, self.party, self.against_voucher_type, self.against_voucher
+						self.account,
+						self.party_type,
+						self.party,
+						self.against_voucher_type,
+						self.against_voucher,
 					)
 
 	def check_mandatory(self):
@@ -180,9 +185,9 @@
 			):
 				if not self.get(dimension.fieldname):
 					frappe.throw(
-						_("Accounting Dimension <b>{0}</b> is required for 'Profit and Loss' account {1}.").format(
-							dimension.label, self.account
-						)
+						_(
+							"Accounting Dimension <b>{0}</b> is required for 'Profit and Loss' account {1}."
+						).format(dimension.label, self.account)
 					)
 
 			if (
@@ -193,9 +198,9 @@
 			):
 				if not self.get(dimension.fieldname):
 					frappe.throw(
-						_("Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}.").format(
-							dimension.label, self.account
-						)
+						_(
+							"Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}."
+						).format(dimension.label, self.account)
 					)
 
 	def check_pl_account(self):
@@ -243,9 +248,7 @@
 		if not self.cost_center:
 			return
 
-		is_group, company = frappe.get_cached_value(
-			"Cost Center", self.cost_center, ["is_group", "company"]
-		)
+		is_group, company = frappe.get_cached_value("Cost Center", self.cost_center, ["is_group", "company"])
 
 		if company != self.company:
 			frappe.throw(
@@ -314,7 +317,7 @@
 	account, party_type, party, against_voucher_type, against_voucher, on_cancel=False
 ):
 	if party_type and party:
-		party_condition = " and party_type={0} and party={1}".format(
+		party_condition = " and party_type={} and party={}".format(
 			frappe.db.escape(party_type), frappe.db.escape(party)
 		)
 	else:
@@ -322,23 +325,19 @@
 
 	if against_voucher_type == "Sales Invoice":
 		party_account = frappe.get_cached_value(against_voucher_type, against_voucher, "debit_to")
-		account_condition = "and account in ({0}, {1})".format(
-			frappe.db.escape(account), frappe.db.escape(party_account)
-		)
+		account_condition = f"and account in ({frappe.db.escape(account)}, {frappe.db.escape(party_account)})"
 	else:
-		account_condition = " and account = {0}".format(frappe.db.escape(account))
+		account_condition = f" and account = {frappe.db.escape(account)}"
 
 	# get final outstanding amt
 	bal = flt(
 		frappe.db.sql(
-			"""
+			f"""
 		select sum(debit_in_account_currency) - sum(credit_in_account_currency)
 		from `tabGL Entry`
 		where against_voucher_type=%s and against_voucher=%s
 		and voucher_type != 'Invoice Discounting'
-		{0} {1}""".format(
-				party_condition, account_condition
-			),
+		{party_condition} {account_condition}""",
 			(against_voucher_type, against_voucher),
 		)[0][0]
 		or 0.0
@@ -349,12 +348,10 @@
 	elif against_voucher_type == "Journal Entry":
 		against_voucher_amount = flt(
 			frappe.db.sql(
-				"""
+				f"""
 			select sum(debit_in_account_currency) - sum(credit_in_account_currency)
 			from `tabGL Entry` where voucher_type = 'Journal Entry' and voucher_no = %s
-			and account = %s and (against_voucher is null or against_voucher='') {0}""".format(
-					party_condition
-				),
+			and account = %s and (against_voucher is null or against_voucher='') {party_condition}""",
 				(against_voucher, account),
 			)[0][0]
 		)
@@ -373,7 +370,9 @@
 		# Validation : Outstanding can not be negative for JV
 		if bal < 0 and not on_cancel:
 			frappe.throw(
-				_("Outstanding for {0} cannot be less than zero ({1})").format(against_voucher, fmt_money(bal))
+				_("Outstanding for {0} cannot be less than zero ({1})").format(
+					against_voucher, fmt_money(bal)
+				)
 			)
 
 	if against_voucher_type in ["Sales Invoice", "Purchase Invoice", "Fees"]:
@@ -446,7 +445,7 @@
 		set_name_from_naming_options(frappe.get_meta(doctype).autoname, doc)
 		newname = doc.name
 		frappe.db.sql(
-			"UPDATE `tab{}` SET name = %s, to_rename = 0 where name = %s".format(doctype),
+			f"UPDATE `tab{doctype}` SET name = %s, to_rename = 0 where name = %s",
 			(newname, oldname),
 			auto_commit=True,
 		)
diff --git a/erpnext/accounts/doctype/gl_entry/test_gl_entry.py b/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
index b188b09..3edfd67 100644
--- a/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/test_gl_entry.py
@@ -14,9 +14,7 @@
 class TestGLEntry(unittest.TestCase):
 	def test_round_off_entry(self):
 		frappe.db.set_value("Company", "_Test Company", "round_off_account", "_Test Write Off - _TC")
-		frappe.db.set_value(
-			"Company", "_Test Company", "round_off_cost_center", "_Test Cost Center - _TC"
-		)
+		frappe.db.set_value("Company", "_Test Company", "round_off_cost_center", "_Test Cost Center - _TC")
 
 		jv = make_journal_entry(
 			"_Test Account Cost for Goods Sold - _TC",
@@ -73,7 +71,9 @@
 		)
 		self.assertTrue(all(entry.to_rename == 0 for entry in new_gl_entries))
 
-		self.assertTrue(all(new.name != old.name for new, old in zip(gl_entries, new_gl_entries)))
+		self.assertTrue(
+			all(new.name != old.name for new, old in zip(gl_entries, new_gl_entries, strict=False))
+		)
 
 		new_naming_series_current_value = frappe.db.sql(
 			"SELECT current from tabSeries where name = %s", naming_series
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
index 3bfe259..bc38946 100644
--- a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
+++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "ACC-INV-DISC-.YYYY.-.#####",
  "creation": "2019-03-07 12:01:56.296952",
@@ -168,7 +169,8 @@
   }
  ],
  "is_submittable": 1,
- "modified": "2019-05-30 19:08:21.199759",
+ "links": [],
+ "modified": "2024-03-27 13:09:52.746196",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Invoice Discounting",
@@ -191,7 +193,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
index 76f4dad..5d3c2b9 100644
--- a/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
+++ b/erpnext/accounts/doctype/invoice_discounting/invoice_discounting.py
@@ -83,9 +83,7 @@
 				frappe.throw(
 					_(
 						"Row({0}): Outstanding Amount cannot be greater than actual Outstanding Amount {1} in {2}"
-					).format(
-						record.idx, frappe.bold(actual_outstanding), frappe.bold(record.sales_invoice)
-					)
+					).format(record.idx, frappe.bold(actual_outstanding), frappe.bold(record.sales_invoice))
 				)
 
 	def calculate_total_amount(self):
@@ -105,7 +103,9 @@
 			self.status = status
 			self.db_set("status", status)
 			for d in self.invoices:
-				frappe.get_doc("Sales Invoice", d.sales_invoice).set_status(update=True, update_modified=False)
+				frappe.get_doc("Sales Invoice", d.sales_invoice).set_status(
+					update=True, update_modified=False
+				)
 		else:
 			self.status = "Draft"
 			if self.docstatus == 1:
diff --git a/erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py b/erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py
index a85fdfc..01050c0 100644
--- a/erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py
+++ b/erpnext/accounts/doctype/invoice_discounting/test_invoice_discounting.py
@@ -75,8 +75,8 @@
 		gle = get_gl_entries("Invoice Discounting", inv_disc.name)
 
 		expected_gle = {inv.debit_to: [0.0, 200], self.ar_credit: [200, 0.0]}
-		for i, gle in enumerate(gle):
-			self.assertEqual([gle.debit, gle.credit], expected_gle.get(gle.account))
+		for _i, gle_value in enumerate(gle):
+			self.assertEqual([gle_value.debit, gle_value.credit], expected_gle.get(gle_value.account))
 
 	def test_loan_on_submit(self):
 		inv = create_sales_invoice(rate=300)
@@ -92,9 +92,7 @@
 			period=60,
 		)
 		self.assertEqual(inv_disc.status, "Sanctioned")
-		self.assertEqual(
-			inv_disc.loan_end_date, add_days(inv_disc.loan_start_date, inv_disc.loan_period)
-		)
+		self.assertEqual(inv_disc.loan_end_date, add_days(inv_disc.loan_start_date, inv_disc.loan_period))
 
 	def test_on_disbursed(self):
 		inv = create_sales_invoice(rate=500)
@@ -262,13 +260,9 @@
 		je_on_payment.submit()
 
 		self.assertEqual(je_on_payment.accounts[0].account, self.ar_discounted)
-		self.assertEqual(
-			je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount)
-		)
+		self.assertEqual(je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount))
 		self.assertEqual(je_on_payment.accounts[1].account, self.bank_account)
-		self.assertEqual(
-			je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount)
-		)
+		self.assertEqual(je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount))
 
 		inv.reload()
 		self.assertEqual(inv.outstanding_amount, 0)
@@ -304,13 +298,9 @@
 		je_on_payment.submit()
 
 		self.assertEqual(je_on_payment.accounts[0].account, self.ar_unpaid)
-		self.assertEqual(
-			je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount)
-		)
+		self.assertEqual(je_on_payment.accounts[0].credit_in_account_currency, flt(inv.outstanding_amount))
 		self.assertEqual(je_on_payment.accounts[1].account, self.bank_account)
-		self.assertEqual(
-			je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount)
-		)
+		self.assertEqual(je_on_payment.accounts[1].debit_in_account_currency, flt(inv.outstanding_amount))
 
 		inv.reload()
 		self.assertEqual(inv.outstanding_amount, 0)
diff --git a/erpnext/accounts/doctype/item_tax_template/item_tax_template.json b/erpnext/accounts/doctype/item_tax_template/item_tax_template.json
index 87f0ad1..7d0d968 100644
--- a/erpnext/accounts/doctype/item_tax_template/item_tax_template.json
+++ b/erpnext/accounts/doctype/item_tax_template/item_tax_template.json
@@ -57,7 +57,7 @@
   }
  ],
  "links": [],
- "modified": "2023-07-09 18:11:23.105589",
+ "modified": "2024-03-27 13:09:55.573483",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Item Tax Template",
@@ -98,9 +98,9 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title",
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/item_tax_template/item_tax_template.py b/erpnext/accounts/doctype/item_tax_template/item_tax_template.py
index 8d3cdc8..02b7455 100644
--- a/erpnext/accounts/doctype/item_tax_template/item_tax_template.py
+++ b/erpnext/accounts/doctype/item_tax_template/item_tax_template.py
@@ -32,7 +32,7 @@
 	def autoname(self):
 		if self.company and self.title:
 			abbr = frappe.get_cached_value("Company", self.company, "abbr")
-			self.name = "{0} - {1}".format(self.title, abbr)
+			self.name = f"{self.title} - {abbr}"
 
 	def validate_tax_accounts(self):
 		"""Check whether Tax Rate is not entered twice for same Tax Type"""
diff --git a/erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json b/erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json
index fa40222..5092489 100644
--- a/erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json
+++ b/erpnext/accounts/doctype/item_tax_template_detail/item_tax_template_detail.json
@@ -1,108 +1,40 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-11-22 23:47:02.804568", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-11-22 23:47:02.804568",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "tax_type",
+  "tax_rate"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "tax_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Tax", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "tax_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Tax",
+   "options": "Account",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "tax_rate", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Tax Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "tax_rate",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Tax Rate"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-12-21 23:51:39.445198", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Item Tax Template Detail", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:09:55.735360",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Item Tax Template Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index a0fcaf9..e54e1c4 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -567,8 +567,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2023-11-23 12:11:04.128015",
-
+ "modified": "2024-03-27 13:09:58.366953",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry",
@@ -614,7 +613,7 @@
   }
  ],
  "search_fields": "voucher_type,posting_date, due_date, cheque_no",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title",
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 835d202..048b04b 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -112,7 +112,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(JournalEntry, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 
 	def validate(self):
 		if self.voucher_type == "Opening Entry":
@@ -191,7 +191,7 @@
 
 	def on_cancel(self):
 		# References for this Journal are removed on the `on_cancel` event in accounts_controller
-		super(JournalEntry, self).on_cancel()
+		super().on_cancel()
 		self.ignore_linked_doctypes = (
 			"GL Entry",
 			"Stock Ledger Entry",
@@ -216,9 +216,9 @@
 
 	def update_advance_paid(self):
 		advance_paid = frappe._dict()
-		advance_payment_doctypes = frappe.get_hooks(
-			"advance_payment_receivable_doctypes"
-		) + frappe.get_hooks("advance_payment_payable_doctypes")
+		advance_payment_doctypes = frappe.get_hooks("advance_payment_receivable_doctypes") + frappe.get_hooks(
+			"advance_payment_payable_doctypes"
+		)
 		for d in self.get("accounts"):
 			if d.is_advance:
 				if d.reference_type in advance_payment_doctypes:
@@ -229,10 +229,7 @@
 				frappe.get_doc(voucher_type, voucher_no).set_total_advance_paid()
 
 	def validate_inter_company_accounts(self):
-		if (
-			self.voucher_type == "Inter Company Journal Entry"
-			and self.inter_company_journal_entry_reference
-		):
+		if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
 			doc = frappe.get_doc("Journal Entry", self.inter_company_journal_entry_reference)
 			account_currency = frappe.get_cached_value("Company", self.company, "default_currency")
 			previous_account_currency = frappe.get_cached_value("Company", doc.company, "default_currency")
@@ -378,10 +375,7 @@
 				asset.set_status()
 
 	def update_inter_company_jv(self):
-		if (
-			self.voucher_type == "Inter Company Journal Entry"
-			and self.inter_company_journal_entry_reference
-		):
+		if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
 			frappe.db.set_value(
 				"Journal Entry",
 				self.inter_company_journal_entry_reference,
@@ -409,17 +403,25 @@
 				if d.account == inv_disc_doc.short_term_loan and d.reference_name == inv_disc:
 					if self.docstatus == 1:
 						if d.credit > 0:
-							_validate_invoice_discounting_status(inv_disc, inv_disc_doc.status, "Sanctioned", d.idx)
+							_validate_invoice_discounting_status(
+								inv_disc, inv_disc_doc.status, "Sanctioned", d.idx
+							)
 							status = "Disbursed"
 						elif d.debit > 0:
-							_validate_invoice_discounting_status(inv_disc, inv_disc_doc.status, "Disbursed", d.idx)
+							_validate_invoice_discounting_status(
+								inv_disc, inv_disc_doc.status, "Disbursed", d.idx
+							)
 							status = "Settled"
 					else:
 						if d.credit > 0:
-							_validate_invoice_discounting_status(inv_disc, inv_disc_doc.status, "Disbursed", d.idx)
+							_validate_invoice_discounting_status(
+								inv_disc, inv_disc_doc.status, "Disbursed", d.idx
+							)
 							status = "Sanctioned"
 						elif d.debit > 0:
-							_validate_invoice_discounting_status(inv_disc, inv_disc_doc.status, "Settled", d.idx)
+							_validate_invoice_discounting_status(
+								inv_disc, inv_disc_doc.status, "Settled", d.idx
+							)
 							status = "Disbursed"
 					break
 			if status:
@@ -488,10 +490,7 @@
 					)
 
 	def unlink_inter_company_jv(self):
-		if (
-			self.voucher_type == "Inter Company Journal Entry"
-			and self.inter_company_journal_entry_reference
-		):
+		if self.voucher_type == "Inter Company Journal Entry" and self.inter_company_journal_entry_reference:
 			frappe.db.set_value(
 				"Journal Entry",
 				self.inter_company_journal_entry_reference,
@@ -513,9 +512,9 @@
 			if account_type in ["Receivable", "Payable"]:
 				if not (d.party_type and d.party):
 					frappe.throw(
-						_("Row {0}: Party Type and Party is required for Receivable / Payable account {1}").format(
-							d.idx, d.account
-						)
+						_(
+							"Row {0}: Party Type and Party is required for Receivable / Payable account {1}"
+						).format(d.idx, d.account)
 					)
 				elif (
 					d.party_type
@@ -580,16 +579,18 @@
 
 	def system_generated_gain_loss(self):
 		return (
-			self.voucher_type == "Exchange Gain Or Loss"
-			and self.multi_currency
-			and self.is_system_generated
+			self.voucher_type == "Exchange Gain Or Loss" and self.multi_currency and self.is_system_generated
 		)
 
 	def validate_against_jv(self):
 		for d in self.get("accounts"):
 			if d.reference_type == "Journal Entry":
 				account_root_type = frappe.get_cached_value("Account", d.account, "root_type")
-				if account_root_type == "Asset" and flt(d.debit) > 0 and not self.system_generated_gain_loss():
+				if (
+					account_root_type == "Asset"
+					and flt(d.debit) > 0
+					and not self.system_generated_gain_loss()
+				):
 					frappe.throw(
 						_(
 							"Row #{0}: For {1}, you can select reference document only if account gets credited"
@@ -671,7 +672,9 @@
 
 				if d.reference_type == "Purchase Order" and flt(d.credit) > 0:
 					frappe.throw(
-						_("Row {0}: Credit entry can not be linked with a {1}").format(d.idx, d.reference_type)
+						_("Row {0}: Credit entry can not be linked with a {1}").format(
+							d.idx, d.reference_type
+						)
 					)
 
 				# set totals
@@ -693,7 +696,10 @@
 
 				# check if party and account match
 				if d.reference_type in ("Sales Invoice", "Purchase Invoice"):
-					if self.voucher_type in ("Deferred Revenue", "Deferred Expense") and d.reference_detail_no:
+					if (
+						self.voucher_type in ("Deferred Revenue", "Deferred Expense")
+						and d.reference_detail_no
+					):
 						debit_or_credit = "Debit" if d.debit else "Credit"
 						party_account = get_deferred_booking_accounts(
 							d.reference_type, d.reference_detail_no, debit_or_credit
@@ -702,7 +708,8 @@
 					else:
 						if d.reference_type == "Sales Invoice":
 							party_account = (
-								get_party_account_based_on_invoice_discounting(d.reference_name) or against_voucher[1]
+								get_party_account_based_on_invoice_discounting(d.reference_name)
+								or against_voucher[1]
 							)
 						else:
 							party_account = against_voucher[1]
@@ -826,7 +833,9 @@
 		if not (self.voucher_type == "Exchange Gain Or Loss" and self.multi_currency):
 			if self.difference:
 				frappe.throw(
-					_("Total Debit must be equal to Total Credit. The difference is {0}").format(self.difference)
+					_("Total Debit must be equal to Total Credit. The difference is {0}").format(
+						self.difference
+					)
 				)
 
 	def set_total_debit_credit(self):
@@ -890,7 +899,6 @@
 					and self.posting_date
 				)
 			):
-
 				ignore_exchange_rate = False
 				if self.get("flags") and self.flags.get("ignore_exchange_rate"):
 					ignore_exchange_rate = True
@@ -1136,27 +1144,21 @@
 		self.validate_total_debit_and_credit()
 
 	def get_values(self):
-		cond = (
-			" and outstanding_amount <= {0}".format(self.write_off_amount)
-			if flt(self.write_off_amount) > 0
-			else ""
-		)
+		cond = f" and outstanding_amount <= {self.write_off_amount}" if flt(self.write_off_amount) > 0 else ""
 
 		if self.write_off_based_on == "Accounts Receivable":
 			return frappe.db.sql(
 				"""select name, debit_to as account, customer as party, outstanding_amount
-				from `tabSales Invoice` where docstatus = 1 and company = %s
-				and outstanding_amount > 0 %s"""
-				% ("%s", cond),
+				from `tabSales Invoice` where docstatus = 1 and company = {}
+				and outstanding_amount > 0 {}""".format("%s", cond),
 				self.company,
 				as_dict=True,
 			)
 		elif self.write_off_based_on == "Accounts Payable":
 			return frappe.db.sql(
 				"""select name, credit_to as account, supplier as party, outstanding_amount
-				from `tabPurchase Invoice` where docstatus = 1 and company = %s
-				and outstanding_amount > 0 %s"""
-				% ("%s", cond),
+				from `tabPurchase Invoice` where docstatus = 1 and company = {}
+				and outstanding_amount > 0 {}""".format("%s", cond),
 				self.company,
 				as_dict=True,
 			)
@@ -1267,7 +1269,7 @@
 			"amount_field_bank": amount_field_bank,
 			"amount": amount,
 			"debit_in_account_currency": debit_in_account_currency,
-			"remarks": "Advance Payment received against {0} {1}".format(dt, dn),
+			"remarks": f"Advance Payment received against {dt} {dn}",
 			"is_advance": "Yes",
 			"bank_account": bank_account,
 			"journal_entry": journal_entry,
@@ -1306,7 +1308,7 @@
 			"amount_field_bank": amount_field_bank,
 			"amount": amount if amount else abs(ref_doc.outstanding_amount),
 			"debit_in_account_currency": debit_in_account_currency,
-			"remarks": "Payment received against {0} {1}. {2}".format(dt, dn, ref_doc.remarks),
+			"remarks": f"Payment received against {dt} {dn}. {ref_doc.remarks}",
 			"is_advance": "No",
 			"bank_account": bank_account,
 			"journal_entry": journal_entry,
@@ -1332,9 +1334,7 @@
 		)
 
 	je = frappe.new_doc("Journal Entry")
-	je.update(
-		{"voucher_type": "Bank Entry", "company": ref_doc.company, "remark": args.get("remarks")}
-	)
+	je.update({"voucher_type": "Bank Entry", "company": ref_doc.company, "remark": args.get("remarks")})
 
 	party_row = je.append(
 		"accounts",
@@ -1357,9 +1357,7 @@
 	bank_row = je.append("accounts")
 
 	# Make it bank_details
-	bank_account = get_default_bank_cash_account(
-		ref_doc.company, "Bank", account=args.get("bank_account")
-	)
+	bank_account = get_default_bank_cash_account(ref_doc.company, "Bank", account=args.get("bank_account"))
 	if bank_account:
 		bank_row.update(bank_account)
 		# Modified to include the posting date for which the exchange rate is required.
@@ -1399,7 +1397,7 @@
 		return []
 
 	return frappe.db.sql(
-		"""
+		f"""
 		SELECT jv.name, jv.posting_date, jv.user_remark
 		FROM `tabJournal Entry` jv, `tabJournal Entry Account` jv_detail
 		WHERE jv_detail.parent = jv.name
@@ -1410,16 +1408,14 @@
 				OR jv_detail.reference_type = ''
 			)
 			AND jv.docstatus = 1
-			AND jv.`{0}` LIKE %(txt)s
+			AND jv.`{searchfield}` LIKE %(txt)s
 		ORDER BY jv.name DESC
 		LIMIT %(limit)s offset %(offset)s
-		""".format(
-			searchfield
-		),
+		""",
 		dict(
 			account=filters.get("account"),
 			party=cstr(filters.get("party")),
-			txt="%{0}%".format(txt),
+			txt=f"%{txt}%",
 			offset=start,
 			limit=page_len,
 		),
@@ -1441,19 +1437,15 @@
 		condition = " and party=%(party)s" if args.get("party") else ""
 
 		against_jv_amount = frappe.db.sql(
-			"""
+			f"""
 			select sum(debit_in_account_currency) - sum(credit_in_account_currency)
-			from `tabJournal Entry Account` where parent=%(docname)s and account=%(account)s {0}
-			and (reference_type is null or reference_type = '')""".format(
-				condition
-			),
+			from `tabJournal Entry Account` where parent=%(docname)s and account=%(account)s {condition}
+			and (reference_type is null or reference_type = '')""",
 			args,
 		)
 
 		against_jv_amount = flt(against_jv_amount[0][0]) if against_jv_amount else 0
-		amount_field = (
-			"credit_in_account_currency" if against_jv_amount > 0 else "debit_in_account_currency"
-		)
+		amount_field = "credit_in_account_currency" if against_jv_amount > 0 else "debit_in_account_currency"
 		return {amount_field: abs(against_jv_amount)}
 	elif args.get("doctype") in ("Sales Invoice", "Purchase Invoice"):
 		party_type = "Customer" if args.get("doctype") == "Sales Invoice" else "Supplier"
@@ -1466,9 +1458,7 @@
 
 		due_date = invoice.get("due_date")
 
-		exchange_rate = (
-			invoice.conversion_rate if (args.get("account_currency") != company_currency) else 1
-		)
+		exchange_rate = invoice.conversion_rate if (args.get("account_currency") != company_currency) else 1
 
 		if args["doctype"] == "Sales Invoice":
 			amount_field = (
@@ -1506,9 +1496,7 @@
 
 
 @frappe.whitelist()
-def get_account_details_and_party_type(
-	account, date, company, debit=None, credit=None, exchange_rate=None
-):
+def get_account_details_and_party_type(account, date, company, debit=None, credit=None, exchange_rate=None):
 	"""Returns dict of account details and party type to be set in Journal Entry on selection of account."""
 	if not frappe.has_permission("Account"):
 		frappe.msgprint(_("No Permission"), raise_exception=1)
diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
index 798d3bb..5bfb65a 100644
--- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
@@ -69,10 +69,8 @@
 
 		self.assertTrue(
 			frappe.db.sql(
-				"""select name from `tabJournal Entry Account`
-			where reference_type = %s and reference_name = %s and {0}=400""".format(
-					dr_or_cr
-				),
+				f"""select name from `tabJournal Entry Account`
+			where reference_type = %s and reference_name = %s and {dr_or_cr}=400""",
 				(submitted_voucher.doctype, submitted_voucher.name),
 			)
 		)
@@ -84,9 +82,8 @@
 	def advance_paid_testcase(self, base_jv, test_voucher, dr_or_cr):
 		# Test advance paid field
 		advance_paid = frappe.db.sql(
-			"""select advance_paid from `tab%s`
-					where name=%s"""
-			% (test_voucher.doctype, "%s"),
+			"""select advance_paid from `tab{}`
+					where name={}""".format(test_voucher.doctype, "%s"),
 			(test_voucher.name),
 		)
 		payment_against_order = base_jv.get("accounts")[0].get(dr_or_cr)
@@ -159,9 +156,7 @@
 			jv.cancel()
 
 	def test_multi_currency(self):
-		jv = make_journal_entry(
-			"_Test Bank USD - _TC", "_Test Bank - _TC", 100, exchange_rate=50, save=False
-		)
+		jv = make_journal_entry("_Test Bank USD - _TC", "_Test Bank - _TC", 100, exchange_rate=50, save=False)
 
 		jv.get("accounts")[1].credit_in_account_currency = 5000
 		jv.submit()
@@ -477,9 +472,7 @@
 			query = query.select(gl[field])
 
 		query = query.where(
-			(gl.voucher_type == "Journal Entry")
-			& (gl.voucher_no == self.voucher_no)
-			& (gl.is_cancelled == 0)
+			(gl.voucher_type == "Journal Entry") & (gl.voucher_no == self.voucher_no) & (gl.is_cancelled == 0)
 		).orderby(gl.account)
 
 		gl_entries = query.run(as_dict=True)
diff --git a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
index a61f8bf..e3dbcf5 100644
--- a/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
+++ b/erpnext/accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -267,14 +267,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-05 01:10:50.224840",
+ "modified": "2024-03-27 13:09:58.647732",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry Account",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json b/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
index 660ae85..552269b 100644
--- a/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
+++ b/erpnext/accounts/doctype/journal_entry_template/journal_entry_template.json
@@ -86,7 +86,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-01 18:32:01.420488",
+ "modified": "2024-03-27 13:09:58.814734",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry Template",
@@ -127,8 +127,9 @@
   }
  ],
  "search_fields": "voucher_type, company",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "template_title",
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_entry_template_account/journal_entry_template_account.json b/erpnext/accounts/doctype/journal_entry_template_account/journal_entry_template_account.json
index eecd877..e621fa2 100644
--- a/erpnext/accounts/doctype/journal_entry_template_account/journal_entry_template_account.json
+++ b/erpnext/accounts/doctype/journal_entry_template_account/journal_entry_template_account.json
@@ -19,13 +19,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-04-25 01:15:44.879839",
+ "modified": "2024-03-27 13:09:58.986448",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Journal Entry Template Account",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/ledger_merge/ledger_merge.json b/erpnext/accounts/doctype/ledger_merge/ledger_merge.json
index dd816df..d4c25a0 100644
--- a/erpnext/accounts/doctype/ledger_merge/ledger_merge.json
+++ b/erpnext/accounts/doctype/ledger_merge/ledger_merge.json
@@ -93,7 +93,7 @@
  ],
  "hide_toolbar": 1,
  "links": [],
- "modified": "2021-12-12 21:34:55.155146",
+ "modified": "2024-03-27 13:10:02.198009",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Ledger Merge",
@@ -124,7 +124,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py b/erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py
index 992ce9e..dccd73c 100644
--- a/erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py
+++ b/erpnext/accounts/doctype/ledger_merge/test_ledger_merge.py
@@ -83,7 +83,10 @@
 				"account": "Indirect Income - _TC",
 				"merge_accounts": [
 					{"account": "Indirect Test Income - _TC", "account_name": "Indirect Test Income"},
-					{"account": "Administrative Test Income - _TC", "account_name": "Administrative Test Income"},
+					{
+						"account": "Administrative Test Income - _TC",
+						"account_name": "Administrative Test Income",
+					},
 				],
 			}
 		).insert(ignore_permissions=True)
diff --git a/erpnext/accounts/doctype/ledger_merge_accounts/ledger_merge_accounts.json b/erpnext/accounts/doctype/ledger_merge_accounts/ledger_merge_accounts.json
index 4ce55ad..41107d8 100644
--- a/erpnext/accounts/doctype/ledger_merge_accounts/ledger_merge_accounts.json
+++ b/erpnext/accounts/doctype/ledger_merge_accounts/ledger_merge_accounts.json
@@ -41,12 +41,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-12-10 15:27:24.477139",
+ "modified": "2024-03-27 13:10:02.352067",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Ledger Merge Accounts",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json b/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json
index 4c1be65..0d7c2e7 100644
--- a/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json
+++ b/erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2018-01-23 05:40:18.117583",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -84,7 +85,8 @@
   }
  ],
  "in_create": 1,
- "modified": "2020-01-30 17:27:55.964242",
+ "links": [],
+ "modified": "2024-03-27 13:10:03.015035",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Loyalty Point Entry",
@@ -116,8 +118,9 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "customer",
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/loyalty_point_entry_redemption/loyalty_point_entry_redemption.json b/erpnext/accounts/doctype/loyalty_point_entry_redemption/loyalty_point_entry_redemption.json
index 8a8dfbb..240c4aa 100644
--- a/erpnext/accounts/doctype/loyalty_point_entry_redemption/loyalty_point_entry_redemption.json
+++ b/erpnext/accounts/doctype/loyalty_point_entry_redemption/loyalty_point_entry_redemption.json
@@ -1,134 +1,45 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-03-26 01:32:10.108450", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-03-26 01:32:10.108450",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "sales_invoice",
+  "redemption_date",
+  "redeemed_points"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sales_invoice", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Sales Invoice", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "sales_invoice",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Sales Invoice"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "redemption_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Redemption Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "redemption_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Redemption Date"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "redeemed_points", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Redeemed Points", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "redeemed_points",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Redeemed Points"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-03-26 03:12:59.173071", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Loyalty Point Entry Redemption", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:03.240439",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Loyalty Point Entry Redemption",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/loyalty_program/loyalty_program.json b/erpnext/accounts/doctype/loyalty_program/loyalty_program.json
index f4eb500..decf4cf 100644
--- a/erpnext/accounts/doctype/loyalty_program/loyalty_program.json
+++ b/erpnext/accounts/doctype/loyalty_program/loyalty_program.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "field:loyalty_program_name",
  "creation": "2018-01-23 06:23:05.731431",
  "doctype": "DocType",
@@ -145,7 +146,8 @@
    "fieldtype": "Column Break"
   }
  ],
- "modified": "2019-05-26 09:11:46.120251",
+ "links": [],
+ "modified": "2024-03-27 13:10:03.361383",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Loyalty Program",
@@ -165,7 +167,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/loyalty_program/loyalty_program.py b/erpnext/accounts/doctype/loyalty_program/loyalty_program.py
index 463b3cd..f3ad84b 100644
--- a/erpnext/accounts/doctype/loyalty_program/loyalty_program.py
+++ b/erpnext/accounts/doctype/loyalty_program/loyalty_program.py
@@ -52,13 +52,11 @@
 		condition += " and expiry_date>='%s' " % expiry_date
 
 	loyalty_point_details = frappe.db.sql(
-		"""select sum(loyalty_points) as loyalty_points,
+		f"""select sum(loyalty_points) as loyalty_points,
 		sum(purchase_amount) as total_spent from `tabLoyalty Point Entry`
 		where customer=%s and loyalty_program=%s and posting_date <= %s
 		{condition}
-		group by customer""".format(
-			condition=condition
-		),
+		group by customer""",
 		(customer, loyalty_program, expiry_date),
 		as_dict=1,
 	)
@@ -79,9 +77,7 @@
 	include_expired_entry=False,
 	current_transaction_amount=0,
 ):
-	lp_details = get_loyalty_program_details(
-		customer, loyalty_program, company=company, silent=silent
-	)
+	lp_details = get_loyalty_program_details(customer, loyalty_program, company=company, silent=silent)
 	loyalty_program = frappe.get_doc("Loyalty Program", loyalty_program)
 	lp_details.update(
 		get_loyalty_details(customer, loyalty_program.name, expiry_date, company, include_expired_entry)
diff --git a/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py b/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py
index cbfb17b..4d21fb6 100644
--- a/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py
+++ b/erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py
@@ -19,9 +19,7 @@
 		create_records()
 
 	def test_loyalty_points_earned_single_tier(self):
-		frappe.db.set_value(
-			"Customer", "Test Loyalty Customer", "loyalty_program", "Test Single Loyalty"
-		)
+		frappe.db.set_value("Customer", "Test Loyalty Customer", "loyalty_program", "Test Single Loyalty")
 		# create a new sales invoice
 		si_original = create_sales_invoice_record()
 		si_original.insert()
@@ -69,9 +67,7 @@
 			d.cancel()
 
 	def test_loyalty_points_earned_multiple_tier(self):
-		frappe.db.set_value(
-			"Customer", "Test Loyalty Customer", "loyalty_program", "Test Multiple Loyalty"
-		)
+		frappe.db.set_value("Customer", "Test Loyalty Customer", "loyalty_program", "Test Multiple Loyalty")
 		# assign multiple tier program to the customer
 		customer = frappe.get_doc("Customer", {"customer_name": "Test Loyalty Customer"})
 		customer.loyalty_program = frappe.get_doc(
@@ -128,9 +124,7 @@
 
 	def test_cancel_sales_invoice(self):
 		"""cancelling the sales invoice should cancel the earned points"""
-		frappe.db.set_value(
-			"Customer", "Test Loyalty Customer", "loyalty_program", "Test Single Loyalty"
-		)
+		frappe.db.set_value("Customer", "Test Loyalty Customer", "loyalty_program", "Test Single Loyalty")
 		# create a new sales invoice
 		si = create_sales_invoice_record()
 		si.insert()
@@ -148,9 +142,7 @@
 		self.assertEqual(True, (lpe is None))
 
 	def test_sales_invoice_return(self):
-		frappe.db.set_value(
-			"Customer", "Test Loyalty Customer", "loyalty_program", "Test Single Loyalty"
-		)
+		frappe.db.set_value("Customer", "Test Loyalty Customer", "loyalty_program", "Test Single Loyalty")
 		# create a new sales invoice
 		si_original = create_sales_invoice_record(2)
 		si_original.conversion_rate = flt(1)
@@ -346,9 +338,7 @@
 		).insert()
 
 	# create item price
-	if not frappe.db.exists(
-		"Item Price", {"price_list": "Standard Selling", "item_code": "Loyal Item"}
-	):
+	if not frappe.db.exists("Item Price", {"price_list": "Standard Selling", "item_code": "Loyal Item"}):
 		frappe.get_doc(
 			{
 				"doctype": "Item Price",
diff --git a/erpnext/accounts/doctype/loyalty_program_collection/loyalty_program_collection.json b/erpnext/accounts/doctype/loyalty_program_collection/loyalty_program_collection.json
index 6ea5216..f5fc26d 100644
--- a/erpnext/accounts/doctype/loyalty_program_collection/loyalty_program_collection.json
+++ b/erpnext/accounts/doctype/loyalty_program_collection/loyalty_program_collection.json
@@ -1,161 +1,51 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-01-23 06:56:37.163859", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-01-23 06:56:37.163859",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "tier_name",
+  "min_spent",
+  "column_break_3",
+  "collection_factor"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "tier_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Tier Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "tier_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Tier Name",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "min_spent", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Minimum Total Spent", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "min_spent",
+   "fieldtype": "Currency",
+   "label": "Minimum Total Spent"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "For how much spent = 1 Loyalty Point", 
-   "fieldname": "collection_factor", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Collection Factor (=1 LP)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "description": "For how much spent = 1 Loyalty Point",
+   "fieldname": "collection_factor",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Collection Factor (=1 LP)",
+   "reqd": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-01-23 07:19:10.316392", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Loyalty Program Collection", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:03.536071",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Loyalty Program Collection",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
index 51fc3f7..75022fd 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -48,7 +48,7 @@
  "idx": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-09-18 17:57:23.835236",
+ "modified": "2024-03-27 13:10:05.597711",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Mode of Payment",
@@ -72,6 +72,7 @@
  ],
  "quick_entry": 1,
  "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "ASC"
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/mode_of_payment_account/mode_of_payment_account.json b/erpnext/accounts/doctype/mode_of_payment_account/mode_of_payment_account.json
index 6cda742..427c89f 100644
--- a/erpnext/accounts/doctype/mode_of_payment_account/mode_of_payment_account.json
+++ b/erpnext/accounts/doctype/mode_of_payment_account/mode_of_payment_account.json
@@ -1,105 +1,39 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2015-01-05 14:17:53.101432", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2015-01-05 14:17:53.101432",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "company",
+  "default_account"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Company",
+   "options": "Company"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Default account will be automatically updated in POS Invoice when this mode is selected.", 
-   "fieldname": "default_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Default Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "description": "Default account will be automatically updated in POS Invoice when this mode is selected.",
+   "fieldname": "default_account",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Default Account",
+   "options": "Account"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-02-21 16:05:56.284652", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Mode of Payment Account", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:05.748999",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Mode of Payment Account",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
index 488e8b2..c867f93 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
@@ -46,7 +46,7 @@
  "icon": "fa fa-bar-chart",
  "idx": 1,
  "links": [],
- "modified": "2024-01-30 13:57:55.802744",
+ "modified": "2024-03-27 13:10:05.873547",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Monthly Distribution",
@@ -71,7 +71,7 @@
    "role": "Accounts Manager"
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py
index 7270576..cda5f4b 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.py
@@ -54,9 +54,7 @@
 		total = sum(flt(d.percentage_allocation) for d in self.get("percentages"))
 
 		if flt(total, 2) != 100.0:
-			frappe.throw(
-				_("Percentage Allocation should be equal to 100%") + " ({0}%)".format(str(flt(total, 2)))
-			)
+			frappe.throw(_("Percentage Allocation should be equal to 100%") + f" ({flt(total, 2)!s}%)")
 
 
 def get_periodwise_distribution_data(distribution_id, period_list, periodicity):
diff --git a/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json b/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
index 8c9fc5e..e75779b 100644
--- a/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
+++ b/erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
@@ -1,86 +1,44 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "beta": 0, 
- "creation": "2013-02-22 01:27:38", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 1, 
+ "actions": [],
+ "autoname": "hash",
+ "creation": "2013-02-22 01:27:38",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "month",
+  "percentage_allocation"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "month", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Month", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "month", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "month",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Month",
+   "oldfieldname": "month",
+   "oldfieldtype": "Data",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "percentage_allocation", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Percentage Allocation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "percentage_allocation", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "percentage_allocation",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Percentage Allocation",
+   "oldfieldname": "percentage_allocation",
+   "oldfieldtype": "Currency"
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-07-11 03:28:02.714462", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Monthly Distribution Percentage", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "track_seen": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:06.023385",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Monthly Distribution Percentage",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
index daee8f8..bf3a4e5 100644
--- a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_copy": 1,
  "beta": 1,
  "creation": "2017-08-29 02:22:54.947711",
@@ -75,7 +76,8 @@
  ],
  "hide_toolbar": 1,
  "issingle": 1,
- "modified": "2022-01-04 15:25:06.053187",
+ "links": [],
+ "modified": "2024-03-27 13:10:06.564397",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Opening Invoice Creation Tool",
@@ -92,7 +94,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
index acd9933..e71d322 100644
--- a/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py
@@ -172,7 +172,7 @@
 			income_expense_account_field = (
 				"income_account" if row.party_type == "Customer" else "expense_account"
 			)
-			default_uom = frappe.db.get_single_value("Stock Settings", "stock_uom") or _("Nos")
+			default_uom = frappe.db.get_single_value("Stock Settings", "stock_uom") or "Nos"
 			rate = flt(row.outstanding_amount) / flt(row.qty)
 
 			item_dict = frappe._dict(
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py b/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py
index 02c2c67..378fbde 100644
--- a/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool/test_opening_invoice_creation_tool.py
@@ -83,9 +83,7 @@
 		company = "_Test Opening Invoice Company"
 		party_1, party_2 = make_customer("Customer A"), make_customer("Customer B")
 
-		old_default_receivable_account = frappe.db.get_value(
-			"Company", company, "default_receivable_account"
-		)
+		old_default_receivable_account = frappe.db.get_value("Company", company, "default_receivable_account")
 		frappe.db.set_value("Company", company, "default_receivable_account", "")
 
 		if not frappe.db.exists("Cost Center", "_Test Opening Invoice Company - _TOIC"):
@@ -121,9 +119,7 @@
 		self.assertTrue(error_log)
 
 		# teardown
-		frappe.db.set_value(
-			"Company", company, "default_receivable_account", old_default_receivable_account
-		)
+		frappe.db.set_value("Company", company, "default_receivable_account", old_default_receivable_account)
 
 	def test_renaming_of_invoice_using_invoice_number_field(self):
 		company = "_Test Opening Invoice Company"
@@ -169,7 +165,7 @@
 				{
 					"qty": 1.0,
 					"outstanding_amount": 300,
-					"party": args.get("party_1") or "_Test {0}".format(party),
+					"party": args.get("party_1") or f"_Test {party}",
 					"item_name": "Opening Item",
 					"due_date": "2016-09-10",
 					"posting_date": "2016-09-05",
@@ -179,7 +175,7 @@
 				{
 					"qty": 2.0,
 					"outstanding_amount": 250,
-					"party": args.get("party_2") or "_Test {0} 1".format(party),
+					"party": args.get("party_2") or f"_Test {party} 1",
 					"item_name": "Opening Item",
 					"due_date": "2016-09-10",
 					"posting_date": "2016-09-05",
diff --git a/erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json b/erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json
index ed8ff7c..bc9229d 100644
--- a/erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json
+++ b/erpnext/accounts/doctype/opening_invoice_creation_tool_item/opening_invoice_creation_tool_item.json
@@ -115,14 +115,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-03-21 19:31:45.382656",
+ "modified": "2024-03-27 13:10:06.703006",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Opening Invoice Creation Tool Item",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/overdue_payment/overdue_payment.json b/erpnext/accounts/doctype/overdue_payment/overdue_payment.json
index 99e1646..beae9d5 100644
--- a/erpnext/accounts/doctype/overdue_payment/overdue_payment.json
+++ b/erpnext/accounts/doctype/overdue_payment/overdue_payment.json
@@ -157,14 +157,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-09-23 13:48:27.898830",
+ "modified": "2024-03-27 13:10:07.823644",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Overdue Payment",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/party_account/party_account.json b/erpnext/accounts/doctype/party_account/party_account.json
index 7e345d8..fdb0bc3 100644
--- a/erpnext/accounts/doctype/party_account/party_account.json
+++ b/erpnext/accounts/doctype/party_account/party_account.json
@@ -36,14 +36,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-06-06 14:15:42.053150",
+ "modified": "2024-03-27 13:10:08.489183",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Party Account",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/party_link/party_link.json b/erpnext/accounts/doctype/party_link/party_link.json
index a1bb15f..ce725c5 100644
--- a/erpnext/accounts/doctype/party_link/party_link.json
+++ b/erpnext/accounts/doctype/party_link/party_link.json
@@ -52,7 +52,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-08-25 20:08:56.761150",
+ "modified": "2024-03-27 13:10:08.607170",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Party Link",
@@ -95,8 +95,9 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "primary_party",
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/party_link/party_link.py b/erpnext/accounts/doctype/party_link/party_link.py
index d60acce..16484fc 100644
--- a/erpnext/accounts/doctype/party_link/party_link.py
+++ b/erpnext/accounts/doctype/party_link/party_link.py
@@ -38,7 +38,10 @@
 		if existing_party_link:
 			frappe.throw(
 				_("{} {} is already linked with {} {}").format(
-					self.primary_role, bold(self.primary_party), self.secondary_role, bold(self.secondary_party)
+					self.primary_role,
+					bold(self.primary_party),
+					self.secondary_role,
+					bold(self.secondary_party),
 				)
 			)
 
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index b1b8d5e..9fe09e8 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -776,7 +776,7 @@
    "table_fieldname": "payment_entries"
   }
  ],
- "modified": "2024-01-08 13:17:15.744754",
+ "modified": "2024-03-27 13:10:09.131139",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry",
@@ -817,7 +817,7 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title",
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index b4d1d39..e2041bf 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -30,7 +30,7 @@
 	make_reverse_gl_entries,
 	process_gl_map,
 )
-from erpnext.accounts.party import get_party_account, set_contact_details
+from erpnext.accounts.party import complete_contact_details, get_party_account, set_contact_details
 from erpnext.accounts.utils import (
 	cancel_exchange_gain_loss_journal,
 	get_account_currency,
@@ -134,7 +134,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(PaymentEntry, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		if not self.is_new():
 			self.setup_party_account_field()
 
@@ -247,7 +247,7 @@
 			"Unreconcile Payment",
 			"Unreconcile Payment Entries",
 		)
-		super(PaymentEntry, self).on_cancel()
+		super().on_cancel()
 		self.make_gl_entries(cancel=1)
 		self.update_outstanding_amounts()
 		self.update_advance_paid()
@@ -357,9 +357,7 @@
 				# If term based allocation is enabled, throw
 				if (
 					d.payment_term is None or d.payment_term == ""
-				) and self.term_based_allocation_enabled_for_reference(
-					d.reference_doctype, d.reference_name
-				):
+				) and self.term_based_allocation_enabled_for_reference(d.reference_doctype, d.reference_name):
 					frappe.throw(
 						_(
 							"{0} has Payment Term based allocation enabled. Select a Payment Term for Row #{1} in Payment References section"
@@ -371,7 +369,9 @@
 				# The reference has already been fully paid
 				if not latest:
 					frappe.throw(
-						_("{0} {1} has already been fully paid.").format(_(d.reference_doctype), d.reference_name)
+						_("{0} {1} has already been fully paid.").format(
+							_(d.reference_doctype), d.reference_name
+						)
 					)
 				# The reference has already been partly paid
 				elif (
@@ -395,14 +395,14 @@
 						and latest.payment_term_outstanding
 						and (flt(d.allocated_amount) > flt(latest.payment_term_outstanding))
 					)
-					and self.term_based_allocation_enabled_for_reference(d.reference_doctype, d.reference_name)
+					and self.term_based_allocation_enabled_for_reference(
+						d.reference_doctype, d.reference_name
+					)
 				):
 					frappe.throw(
 						_(
 							"Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}"
-						).format(
-							d.idx, d.allocated_amount, latest.payment_term_outstanding, d.payment_term
-						)
+						).format(d.idx, d.allocated_amount, latest.payment_term_outstanding, d.payment_term)
 					)
 
 				if (flt(d.allocated_amount)) > 0 and flt(d.allocated_amount) > flt(latest.outstanding_amount):
@@ -445,7 +445,11 @@
 
 		if self.party:
 			if not self.contact_person:
-				set_contact_details(self, party=frappe._dict({"name": self.party}), party_type=self.party_type)
+				set_contact_details(
+					self, party=frappe._dict({"name": self.party}), party_type=self.party_type
+				)
+			else:
+				complete_contact_details(self)
 			if not self.party_balance:
 				self.party_balance = get_balance_on(
 					party_type=self.party_type, party=self.party, date=self.posting_date, company=self.company
@@ -525,7 +529,9 @@
 			else:
 				if ref_doc:
 					if self.paid_from_account_currency == ref_doc.currency:
-						self.source_exchange_rate = ref_doc.get("exchange_rate") or ref_doc.get("conversion_rate")
+						self.source_exchange_rate = ref_doc.get("exchange_rate") or ref_doc.get(
+							"conversion_rate"
+						)
 
 			if not self.source_exchange_rate:
 				self.source_exchange_rate = get_exchange_rate(
@@ -562,7 +568,7 @@
 			if d.reference_doctype not in valid_reference_doctypes:
 				frappe.throw(
 					_("Reference Doctype must be one of {0}").format(
-						comma_or((_(d) for d in valid_reference_doctypes))
+						comma_or(_(d) for d in valid_reference_doctypes)
 					)
 				)
 
@@ -585,7 +591,8 @@
 					if d.reference_doctype in frappe.get_hooks("invoice_doctypes"):
 						if self.party_type == "Customer":
 							ref_party_account = (
-								get_party_account_based_on_invoice_discounting(d.reference_name) or ref_doc.debit_to
+								get_party_account_based_on_invoice_discounting(d.reference_name)
+								or ref_doc.debit_to
 							)
 						elif self.party_type == "Supplier":
 							ref_party_account = ref_doc.credit_to
@@ -598,7 +605,10 @@
 						):
 							frappe.throw(
 								_("{0} {1} is associated with {2}, but Party Account is {3}").format(
-									_(d.reference_doctype), d.reference_name, ref_party_account, self.party_account
+									_(d.reference_doctype),
+									d.reference_name,
+									ref_party_account,
+									self.party_account,
 								)
 							)
 
@@ -609,7 +619,9 @@
 							)
 
 					if ref_doc.docstatus != 1:
-						frappe.throw(_("{0} {1} must be submitted").format(_(d.reference_doctype), d.reference_name))
+						frappe.throw(
+							_("{0} {1} must be submitted").format(_(d.reference_doctype), d.reference_name)
+						)
 
 	def get_valid_reference_doctypes(self):
 		if self.party_type == "Customer":
@@ -780,9 +792,7 @@
 		if not (is_single_currency and reference_is_multi_currency):
 			return allocated_amount
 
-		allocated_amount = flt(
-			allocated_amount / ref_exchange_rate, self.precision("total_allocated_amount")
-		)
+		allocated_amount = flt(allocated_amount / ref_exchange_rate, self.precision("total_allocated_amount"))
 
 		return allocated_amount
 
@@ -845,7 +855,6 @@
 		accounts = []
 		for d in self.taxes:
 			if d.account_head == tax_withholding_details.get("account_head"):
-
 				# Preserve user updated included in paid amount
 				if d.included_in_paid_amount:
 					tax_withholding_details.update({"included_in_paid_amount": d.included_in_paid_amount})
@@ -951,9 +960,9 @@
 
 	def calculate_base_allocated_amount_for_reference(self, d) -> float:
 		base_allocated_amount = 0
-		advance_payment_doctypes = frappe.get_hooks(
-			"advance_payment_receivable_doctypes"
-		) + frappe.get_hooks("advance_payment_payable_doctypes")
+		advance_payment_doctypes = frappe.get_hooks("advance_payment_receivable_doctypes") + frappe.get_hooks(
+			"advance_payment_payable_doctypes"
+		)
 		if d.reference_doctype in advance_payment_doctypes:
 			# When referencing Sales/Purchase Order, use the source/target exchange rate depending on payment type.
 			# This is so there are no Exchange Gain/Loss generated for such doctypes
@@ -968,7 +977,6 @@
 				flt(d.allocated_amount) * flt(exchange_rate), self.precision("base_paid_amount")
 			)
 		else:
-
 			# Use source/target exchange rate, so no difference amount is calculated.
 			# then update exchange gain/loss amount in reference table
 			# if there is an exchange gain/loss amount in reference table, submit a JE for that
@@ -1106,7 +1114,6 @@
 				)
 			]
 		else:
-
 			remarks = [
 				_("Amount {0} {1} {2} {3}").format(
 					_(self.party_account_currency),
@@ -1126,14 +1133,19 @@
 				if d.allocated_amount:
 					remarks.append(
 						_("Amount {0} {1} against {2} {3}").format(
-							_(self.party_account_currency), d.allocated_amount, d.reference_doctype, d.reference_name
+							_(self.party_account_currency),
+							d.allocated_amount,
+							d.reference_doctype,
+							d.reference_name,
 						)
 					)
 
 		for d in self.get("deductions"):
 			if d.amount:
 				remarks.append(
-					_("Amount {0} {1} deducted against {2}").format(_(self.company_currency), d.amount, d.account)
+					_("Amount {0} {1} deducted against {2}").format(
+						_(self.company_currency), d.amount, d.account
+					)
 				)
 
 		self.set("remarks", "\n".join(remarks))
@@ -1207,21 +1219,31 @@
 					dr_or_cr = "credit" if self.payment_type == "Receive" else "debit"
 					cost_center = self.cost_center
 					if d.reference_doctype == "Sales Invoice" and not cost_center:
-						cost_center = frappe.db.get_value(d.reference_doctype, d.reference_name, "cost_center")
+						cost_center = frappe.db.get_value(
+							d.reference_doctype, d.reference_name, "cost_center"
+						)
 
 					gle = party_gl_dict.copy()
 
-					allocated_amount_in_company_currency = self.calculate_base_allocated_amount_for_reference(d)
+					allocated_amount_in_company_currency = self.calculate_base_allocated_amount_for_reference(
+						d
+					)
 					reverse_dr_or_cr = 0
 
 					if d.reference_doctype in ["Sales Invoice", "Purchase Invoice"]:
 						is_return = frappe.db.get_value(d.reference_doctype, d.reference_name, "is_return")
 						payable_party_types = get_party_types_from_account_type("Payable")
 						receivable_party_types = get_party_types_from_account_type("Receivable")
-						if is_return and self.party_type in receivable_party_types and (self.payment_type == "Pay"):
+						if (
+							is_return
+							and self.party_type in receivable_party_types
+							and (self.payment_type == "Pay")
+						):
 							reverse_dr_or_cr = 1
 						elif (
-							is_return and self.party_type in payable_party_types and (self.payment_type == "Receive")
+							is_return
+							and self.party_type in payable_party_types
+							and (self.payment_type == "Receive")
 						):
 							reverse_dr_or_cr = 1
 
@@ -1304,9 +1326,7 @@
 		if getdate(posting_date) < getdate(self.posting_date):
 			posting_date = self.posting_date
 
-		dr_or_cr = (
-			"credit" if invoice.reference_doctype in ["Sales Invoice", "Payment Entry"] else "debit"
-		)
+		dr_or_cr = "credit" if invoice.reference_doctype in ["Sales Invoice", "Payment Entry"] else "debit"
 		args_dict["account"] = invoice.account
 		args_dict[dr_or_cr] = invoice.allocated_amount
 		args_dict[dr_or_cr + "_in_account_currency"] = invoice.allocated_amount
@@ -1692,7 +1712,8 @@
 				return []
 			elif supplier_status["hold_type"] == "Payments":
 				if (
-					not supplier_status["release_date"] or getdate(nowdate()) <= supplier_status["release_date"]
+					not supplier_status["release_date"]
+					or getdate(nowdate()) <= supplier_status["release_date"]
 				):
 					return []
 
@@ -1702,7 +1723,7 @@
 	# Get positive outstanding sales /purchase invoices
 	condition = ""
 	if args.get("voucher_type") and args.get("voucher_no"):
-		condition = " and voucher_type={0} and voucher_no={1}".format(
+		condition = " and voucher_type={} and voucher_no={}".format(
 			frappe.db.escape(args["voucher_type"]), frappe.db.escape(args["voucher_no"])
 		)
 		common_filter.append(ple.voucher_type == args["voucher_type"])
@@ -1717,7 +1738,7 @@
 	active_dimensions = get_dimensions()[0]
 	for dim in active_dimensions:
 		if args.get(dim.fieldname):
-			condition += " and {0}='{1}'".format(dim.fieldname, args.get(dim.fieldname))
+			condition += f" and {dim.fieldname}='{args.get(dim.fieldname)}'"
 			accounting_dimensions_filter.append(ple[dim.fieldname] == args.get(dim.fieldname))
 
 	date_fields_dict = {
@@ -1727,21 +1748,21 @@
 
 	for fieldname, date_fields in date_fields_dict.items():
 		if args.get(date_fields[0]) and args.get(date_fields[1]):
-			condition += " and {0} between '{1}' and '{2}'".format(
+			condition += " and {} between '{}' and '{}'".format(
 				fieldname, args.get(date_fields[0]), args.get(date_fields[1])
 			)
 			posting_and_due_date.append(ple[fieldname][args.get(date_fields[0]) : args.get(date_fields[1])])
 		elif args.get(date_fields[0]):
 			# if only from date is supplied
-			condition += " and {0} >= '{1}'".format(fieldname, args.get(date_fields[0]))
+			condition += f" and {fieldname} >= '{args.get(date_fields[0])}'"
 			posting_and_due_date.append(ple[fieldname].gte(args.get(date_fields[0])))
 		elif args.get(date_fields[1]):
 			# if only to date is supplied
-			condition += " and {0} <= '{1}'".format(fieldname, args.get(date_fields[1]))
+			condition += f" and {fieldname} <= '{args.get(date_fields[1])}'"
 			posting_and_due_date.append(ple[fieldname].lte(args.get(date_fields[1])))
 
 	if args.get("company"):
-		condition += " and company = {0}".format(frappe.db.escape(args.get("company")))
+		condition += " and company = {}".format(frappe.db.escape(args.get("company")))
 		common_filter.append(ple.company == args.get("company"))
 
 	outstanding_invoices = []
@@ -1857,12 +1878,10 @@
 	return outstanding_invoices_after_split
 
 
-def get_currency_data(outstanding_invoices: list, company: str = None) -> dict:
+def get_currency_data(outstanding_invoices: list, company: str | None = None) -> dict:
 	"""Get currency and conversion data for a list of invoices."""
 	exc_rates = frappe._dict()
-	company_currency = (
-		frappe.db.get_value("Company", company, "default_currency") if company else None
-	)
+	company_currency = frappe.db.get_value("Company", company, "default_currency") if company else None
 
 	for doctype in ["Sales Invoice", "Purchase Invoice"]:
 		invoices = [x.voucher_no for x in outstanding_invoices if x.voucher_type == doctype]
@@ -1957,7 +1976,7 @@
 	active_dimensions = get_dimensions()[0]
 	for dim in active_dimensions:
 		if filters.get(dim.fieldname):
-			condition += " and {0}='{1}'".format(dim.fieldname, filters.get(dim.fieldname))
+			condition += f" and {dim.fieldname}='{filters.get(dim.fieldname)}'"
 
 	if party_account_currency == company_currency:
 		grand_total_field = "base_grand_total"
@@ -2107,18 +2126,14 @@
 	frappe.has_permission("Payment Entry", throw=True)
 
 	# to check if the passed account is accessible under reference doctype Payment Entry
-	account_list = frappe.get_list(
-		"Account", {"name": account}, reference_doctype="Payment Entry", limit=1
-	)
+	account_list = frappe.get_list("Account", {"name": account}, reference_doctype="Payment Entry", limit=1)
 
 	# There might be some user permissions which will allow account under certain doctypes
 	# except for Payment Entry, only in such case we should throw permission error
 	if not account_list:
 		frappe.throw(_("Account: {0} is not permitted under Payment Entry").format(account))
 
-	account_balance = get_balance_on(
-		account, date, cost_center=cost_center, ignore_account_permission=True
-	)
+	account_balance = get_balance_on(account, date, cost_center=cost_center, ignore_account_permission=True)
 
 	return frappe._dict(
 		{
@@ -2165,9 +2180,7 @@
 	total_amount = outstanding_amount = exchange_rate = account = None
 
 	ref_doc = frappe.get_doc(reference_doctype, reference_name)
-	company_currency = ref_doc.get("company_currency") or erpnext.get_company_currency(
-		ref_doc.company
-	)
+	company_currency = ref_doc.get("company_currency") or erpnext.get_company_currency(ref_doc.company)
 
 	if reference_doctype == "Dunning":
 		total_amount = outstanding_amount = ref_doc.get("dunning_amount")
@@ -2176,9 +2189,7 @@
 	elif reference_doctype == "Journal Entry" and ref_doc.docstatus == 1:
 		total_amount = ref_doc.get("total_amount")
 		if ref_doc.multi_currency:
-			exchange_rate = get_exchange_rate(
-				party_account_currency, company_currency, ref_doc.posting_date
-			)
+			exchange_rate = get_exchange_rate(party_account_currency, company_currency, ref_doc.posting_date)
 		else:
 			exchange_rate = 1
 			outstanding_amount = get_outstanding_on_journal_entry(reference_name)
@@ -2248,9 +2259,7 @@
 ):
 	doc = frappe.get_doc(dt, dn)
 	over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")
-	if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) >= (
-		100.0 + over_billing_allowance
-	):
+	if dt in ("Sales Order", "Purchase Order") and flt(doc.per_billed, 2) >= (100.0 + over_billing_allowance):
 		frappe.throw(_("Can only make payment against unbilled {0}").format(_(dt)))
 
 	if not party_type:
@@ -2295,7 +2304,7 @@
 	pe.party_type = party_type
 	pe.party = doc.get(scrub(party_type))
 	pe.contact_person = doc.get("contact_person")
-	pe.contact_email = doc.get("contact_email")
+	complete_contact_details(pe)
 	pe.ensure_supplier_is_not_blocked()
 
 	pe.paid_from = party_account if payment_type == "Receive" else bank.account
@@ -2303,9 +2312,7 @@
 	pe.paid_from_account_currency = (
 		party_account_currency if payment_type == "Receive" else bank.account_currency
 	)
-	pe.paid_to_account_currency = (
-		party_account_currency if payment_type == "Pay" else bank.account_currency
-	)
+	pe.paid_to_account_currency = party_account_currency if payment_type == "Pay" else bank.account_currency
 	pe.paid_amount = paid_amount
 	pe.received_amount = received_amount
 	pe.letter_head = doc.get("letter_head")
@@ -2334,7 +2341,6 @@
 			doc.payment_terms_template,
 			"allocate_payment_based_on_payment_terms",
 		):
-
 			for reference in get_reference_as_per_payment_terms(
 				doc.payment_schedule, dt, dn, doc, grand_total, outstanding_amount, party_account_currency
 			):
@@ -2522,9 +2528,7 @@
 	return paid_amount, received_amount
 
 
-def apply_early_payment_discount(
-	paid_amount, received_amount, doc, party_account_currency, reference_date
-):
+def apply_early_payment_discount(paid_amount, received_amount, doc, party_account_currency, reference_date):
 	total_discount = 0
 	valid_discounts = []
 	eligible_for_payments = ["Sales Order", "Sales Invoice", "Purchase Order", "Purchase Invoice"]
@@ -2534,7 +2538,6 @@
 	if doc.doctype in eligible_for_payments and has_payment_schedule:
 		for term in doc.payment_schedule:
 			if not term.discounted_amount and term.discount and reference_date <= term.discount_date:
-
 				if term.discount_type == "Percentage":
 					grand_total = doc.get("grand_total") if is_multi_currency else doc.get("base_grand_total")
 					discount_amount = flt(grand_total) * (term.discount / 100)
@@ -2563,9 +2566,7 @@
 	return paid_amount, received_amount, total_discount, valid_discounts
 
 
-def set_pending_discount_loss(
-	pe, doc, discount_amount, base_total_discount_loss, party_account_currency
-):
+def set_pending_discount_loss(pe, doc, discount_amount, base_total_discount_loss, party_account_currency):
 	# If multi-currency, get base discount amount to adjust with base currency deductions/losses
 	if party_account_currency != doc.company_currency:
 		discount_amount = discount_amount * doc.get("conversion_rate", 1)
@@ -2585,7 +2586,8 @@
 		pe.set_gain_or_loss(
 			account_details={
 				"account": frappe.get_cached_value("Company", pe.company, account_type),
-				"cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"),
+				"cost_center": pe.cost_center
+				or frappe.get_cached_value("Company", pe.company, "cost_center"),
 				"amount": discount_amount * positive_negative,
 			}
 		)
@@ -2608,9 +2610,7 @@
 def get_total_discount_percent(doc, valid_discounts) -> float:
 	"""Get total percentage and amount discount applied as a percentage."""
 	total_discount_percent = (
-		sum(
-			discount.get("discount") for discount in valid_discounts if discount.get("type") == "Percentage"
-		)
+		sum(discount.get("discount") for discount in valid_discounts if discount.get("type") == "Percentage")
 		or 0.0
 	)
 
@@ -2653,9 +2653,7 @@
 
 	# The same account head could be used more than once
 	for tax in doc.get("taxes", []):
-		base_tax_loss = tax.get("base_tax_amount_after_discount_amount") * (
-			total_discount_percentage / 100
-		)
+		base_tax_loss = tax.get("base_tax_amount_after_discount_amount") * (total_discount_percentage / 100)
 
 		account = tax.get("account_head")
 		if not tax_discount_loss.get(account):
@@ -2672,7 +2670,8 @@
 			"deductions",
 			{
 				"account": account,
-				"cost_center": pe.cost_center or frappe.get_cached_value("Company", pe.company, "cost_center"),
+				"cost_center": pe.cost_center
+				or frappe.get_cached_value("Company", pe.company, "cost_center"),
 				"amount": flt(loss, precision),
 			},
 		)
@@ -2695,7 +2694,8 @@
 		if not is_multi_currency_acc:
 			# If accounting is done in company currency for multi-currency transaction
 			payment_term_outstanding = flt(
-				payment_term_outstanding * doc.get("conversion_rate"), payment_term.precision("payment_amount")
+				payment_term_outstanding * doc.get("conversion_rate"),
+				payment_term.precision("payment_amount"),
 			)
 
 		if payment_term_outstanding:
@@ -2723,7 +2723,7 @@
 		dr_or_cr = "debit_in_account_currency - credit_in_account_currency"
 
 	paid_amount = frappe.db.sql(
-		"""
+		f"""
 		select ifnull(sum({dr_or_cr}), 0) as paid_amount
 		from `tabGL Entry`
 		where against_voucher_type = %s
@@ -2733,9 +2733,7 @@
 			and account = %s
 			and due_date = %s
 			and {dr_or_cr} > 0
-	""".format(
-			dr_or_cr=dr_or_cr
-		),
+	""",
 		(dt, dn, party_type, party, account, due_date),
 	)
 
diff --git a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
index 6323e4c..0b3037a 100644
--- a/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/test_payment_entry.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
 from frappe import qb
@@ -10,7 +9,6 @@
 
 from erpnext.accounts.doctype.account.test_account import create_account
 from erpnext.accounts.doctype.payment_entry.payment_entry import (
-	InvalidPaymentEntry,
 	get_outstanding_reference_documents,
 	get_payment_entry,
 	get_reference_details,
@@ -162,7 +160,7 @@
 
 				supplier.on_hold = 0
 				supplier.save()
-			except:
+			except Exception:
 				pass
 			else:
 				raise Exception
@@ -469,9 +467,7 @@
 		si.save()
 		si.submit()
 
-		pe = get_payment_entry(
-			"Sales Invoice", si.name, bank_account="_Test Bank - _TC", bank_amount=4700
-		)
+		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank - _TC", bank_amount=4700)
 		pe.reference_no = si.name
 		pe.reference_date = nowdate()
 
@@ -638,9 +634,7 @@
 		pe.set_exchange_rate()
 		pe.set_amounts()
 
-		self.assertEqual(
-			pe.source_exchange_rate, 65.1, "{0} is not equal to {1}".format(pe.source_exchange_rate, 65.1)
-		)
+		self.assertEqual(pe.source_exchange_rate, 65.1, f"{pe.source_exchange_rate} is not equal to {65.1}")
 
 	def test_internal_transfer_usd_to_inr(self):
 		pe = frappe.new_doc("Payment Entry")
@@ -896,9 +890,7 @@
 		cost_center = "_Test Cost Center for BS Account - _TC"
 		create_cost_center(cost_center_name="_Test Cost Center for BS Account", company="_Test Company")
 
-		pi = make_purchase_invoice_against_cost_center(
-			cost_center=cost_center, credit_to="Creditors - _TC"
-		)
+		pi = make_purchase_invoice_against_cost_center(cost_center=cost_center, credit_to="Creditors - _TC")
 
 		pe = get_payment_entry("Purchase Invoice", pi.name, bank_account="_Test Bank - _TC")
 		self.assertEqual(pe.cost_center, pi.cost_center)
@@ -939,9 +931,7 @@
 		si = create_sales_invoice_against_cost_center(cost_center=cost_center, debit_to="Debtors - _TC")
 
 		account_balance = get_balance_on(account="_Test Bank - _TC", cost_center=si.cost_center)
-		party_balance = get_balance_on(
-			party_type="Customer", party=si.customer, cost_center=si.cost_center
-		)
+		party_balance = get_balance_on(party_type="Customer", party=si.customer, cost_center=si.cost_center)
 		party_account_balance = get_balance_on(si.debit_to, cost_center=si.cost_center)
 
 		pe = get_payment_entry("Sales Invoice", si.name, bank_account="_Test Bank - _TC")
@@ -1203,7 +1193,7 @@
 		Overallocation validation shouldn't fire for Template without "Allocate Payment based on Payment Terms" enabled
 
 		"""
-		customer = create_customer()
+		create_customer()
 		create_payment_terms_template()
 
 		template = frappe.get_doc("Payment Terms Template", "Test Receivable Template")
@@ -1262,9 +1252,7 @@
 		create_payment_terms_template()
 
 		# SI has an earlier due date and SI2 has a later due date
-		si = create_sales_invoice(
-			qty=1, rate=100, customer=customer, posting_date=add_days(nowdate(), -4)
-		)
+		si = create_sales_invoice(qty=1, rate=100, customer=customer, posting_date=add_days(nowdate(), -4))
 		si2 = create_sales_invoice(do_not_save=1, qty=1, rate=100, customer=customer)
 		si2.payment_terms_template = "Test Receivable Template"
 		si2.submit()
@@ -1363,8 +1351,6 @@
 		self.check_gl_entries()
 
 	def test_ledger_entries_for_advance_as_liability(self):
-		from erpnext.accounts.doctype.account.test_account import create_account
-
 		company = "_Test Company"
 
 		advance_account = create_account(
@@ -1466,7 +1452,7 @@
 		self.check_pl_entries()
 
 		# Unreconcile
-		unrecon = (
+		(
 			frappe.get_doc(
 				{
 					"doctype": "Unreconcile Payment",
@@ -1554,8 +1540,6 @@
 		self.assertEqual(len(pr.payments), 0)
 
 	def test_advance_reverse_payment_reconciliation(self):
-		from erpnext.accounts.doctype.account.test_account import create_account
-
 		company = "_Test Company"
 		customer = create_customer(frappe.generate_hash(length=10), "INR")
 		advance_account = create_account(
@@ -1645,14 +1629,16 @@
 		self.check_pl_entries()
 
 		# Unreconcile
-		unrecon = (
+		(
 			frappe.get_doc(
 				{
 					"doctype": "Unreconcile Payment",
 					"company": company,
 					"voucher_type": pe.doctype,
 					"voucher_no": pe.name,
-					"allocations": [{"reference_doctype": reverse_pe.doctype, "reference_name": reverse_pe.name}],
+					"allocations": [
+						{"reference_doctype": reverse_pe.doctype, "reference_name": reverse_pe.name}
+					],
 				}
 			)
 			.save()
@@ -1703,12 +1689,11 @@
 
 
 def create_payment_terms_template():
-
 	create_payment_term("Basic Amount Receivable")
 	create_payment_term("Tax Receivable")
 
 	if not frappe.db.exists("Payment Terms Template", "Test Receivable Template"):
-		payment_term_template = frappe.get_doc(
+		frappe.get_doc(
 			{
 				"doctype": "Payment Terms Template",
 				"template_name": "Test Receivable Template",
diff --git a/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json b/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
index 1c31829..881b9be 100644
--- a/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
+++ b/erpnext/accounts/doctype/payment_entry_deduction/payment_entry_deduction.json
@@ -50,14 +50,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-03-06 07:11:57.739619",
+ "modified": "2024-03-27 13:10:09.454552",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry Deduction",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
index 12aa0b5..e518009b 100644
--- a/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
+++ b/erpnext/accounts/doctype/payment_entry_reference/payment_entry_reference.json
@@ -113,14 +113,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-06-08 07:40:38.487874",
+ "modified": "2024-03-27 13:10:09.578312",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Entry Reference",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
index 12e6f5e..0a74c50 100644
--- a/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
+++ b/erpnext/accounts/doctype/payment_gateway_account/payment_gateway_account.json
@@ -3,6 +3,7 @@
  "creation": "2015-12-23 21:31:52.699821",
  "doctype": "DocType",
  "editable_grid": 1,
+ "engine": "InnoDB",
  "field_order": [
   "payment_gateway",
   "payment_channel",
@@ -74,7 +75,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-09-20 13:30:27.722852",
+ "modified": "2024-03-27 13:10:09.836254",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Gateway Account",
@@ -93,6 +94,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
index 28c9529..9f882ce 100644
--- a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
+++ b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.json
@@ -159,7 +159,7 @@
  "in_create": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-11-03 16:39:58.904113",
+ "modified": "2024-03-27 13:10:09.967095",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Ledger Entry",
@@ -194,7 +194,7 @@
   }
  ],
  "search_fields": "voucher_no, against_voucher_no",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py
index 3fea325..2bc4489 100644
--- a/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py
+++ b/erpnext/accounts/doctype/payment_ledger_entry/payment_ledger_entry.py
@@ -137,9 +137,9 @@
 			):
 				if not self.get(dimension.fieldname):
 					frappe.throw(
-						_("Accounting Dimension <b>{0}</b> is required for 'Profit and Loss' account {1}.").format(
-							dimension.label, self.account
-						)
+						_(
+							"Accounting Dimension <b>{0}</b> is required for 'Profit and Loss' account {1}."
+						).format(dimension.label, self.account)
 					)
 
 			if (
@@ -150,9 +150,9 @@
 			):
 				if not self.get(dimension.fieldname):
 					frappe.throw(
-						_("Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}.").format(
-							dimension.label, self.account
-						)
+						_(
+							"Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}."
+						).format(dimension.label, self.account)
 					)
 
 	def validate(self):
diff --git a/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py b/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py
index ce9579e..3eac98d 100644
--- a/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py
+++ b/erpnext/accounts/doctype/payment_ledger_entry/test_payment_ledger_entry.py
@@ -84,11 +84,14 @@
 			self.customer = customer.name
 
 	def create_sales_invoice(
-		self, qty=1, rate=100, posting_date=nowdate(), do_not_save=False, do_not_submit=False
+		self, qty=1, rate=100, posting_date=None, do_not_save=False, do_not_submit=False
 	):
 		"""
 		Helper function to populate default values in sales invoice
 		"""
+		if posting_date is None:
+			posting_date = nowdate()
+
 		sinv = create_sales_invoice(
 			qty=qty,
 			rate=rate,
@@ -112,10 +115,12 @@
 		)
 		return sinv
 
-	def create_payment_entry(self, amount=100, posting_date=nowdate()):
+	def create_payment_entry(self, amount=100, posting_date=None):
 		"""
 		Helper function to populate default values in payment entry
 		"""
+		if posting_date is None:
+			posting_date = nowdate()
 		payment = create_payment_entry(
 			company=self.company,
 			payment_type="Receive",
@@ -128,9 +133,10 @@
 		payment.posting_date = posting_date
 		return payment
 
-	def create_sales_order(
-		self, qty=1, rate=100, posting_date=nowdate(), do_not_save=False, do_not_submit=False
-	):
+	def create_sales_order(self, qty=1, rate=100, posting_date=None, do_not_save=False, do_not_submit=False):
+		if posting_date is None:
+			posting_date = nowdate()
+
 		so = make_sales_order(
 			company=self.company,
 			transaction_date=posting_date,
@@ -159,9 +165,7 @@
 		for doctype in doctype_list:
 			qb.from_(qb.DocType(doctype)).delete().where(qb.DocType(doctype).company == self.company).run()
 
-	def create_journal_entry(
-		self, acc1=None, acc2=None, amount=0, posting_date=None, cost_center=None
-	):
+	def create_journal_entry(self, acc1=None, acc2=None, amount=0, posting_date=None, cost_center=None):
 		je = frappe.new_doc("Journal Entry")
 		je.posting_date = posting_date or nowdate()
 		je.company = self.company
@@ -319,9 +323,7 @@
 				ple.amount,
 				ple.delinked,
 			)
-			.where(
-				(ple.against_voucher_type == cr_note1.doctype) & (ple.against_voucher_no == cr_note1.name)
-			)
+			.where((ple.against_voucher_type == cr_note1.doctype) & (ple.against_voucher_no == cr_note1.name))
 			.orderby(ple.creation)
 			.run(as_dict=True)
 		)
@@ -362,9 +364,7 @@
 		)
 		cr_note2.is_return = 1
 		cr_note2 = cr_note2.save().submit()
-		je1 = self.create_journal_entry(
-			self.debit_to, self.debit_to, amount, posting_date=transaction_date
-		)
+		je1 = self.create_journal_entry(self.debit_to, self.debit_to, amount, posting_date=transaction_date)
 		je1.get("accounts")[0].party_type = je1.get("accounts")[1].party_type = "Customer"
 		je1.get("accounts")[0].party = je1.get("accounts")[1].party = self.customer
 		je1.get("accounts")[0].reference_type = cr_note2.doctype
@@ -419,9 +419,7 @@
 				ple.amount,
 				ple.delinked,
 			)
-			.where(
-				(ple.against_voucher_type == cr_note2.doctype) & (ple.against_voucher_no == cr_note2.name)
-			)
+			.where((ple.against_voucher_type == cr_note2.doctype) & (ple.against_voucher_no == cr_note2.name))
 			.orderby(ple.creation)
 			.run(as_dict=True)
 		)
@@ -518,7 +516,7 @@
 		amount = 100
 		so = self.create_sales_order(qty=1, rate=amount, posting_date=transaction_date).save().submit()
 
-		pe = get_payment_entry(so.doctype, so.name).save().submit()
+		get_payment_entry(so.doctype, so.name).save().submit()
 
 		so.reload()
 		so.cancel()
diff --git a/erpnext/accounts/doctype/payment_order/payment_order.json b/erpnext/accounts/doctype/payment_order/payment_order.json
index 2ed0a4a..165be47 100644
--- a/erpnext/accounts/doctype/payment_order/payment_order.json
+++ b/erpnext/accounts/doctype/payment_order/payment_order.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "naming_series:",
  "creation": "2018-07-20 16:43:08.505978",
  "doctype": "DocType",
@@ -107,7 +108,8 @@
   }
  ],
  "is_submittable": 1,
- "modified": "2020-04-06 18:00:56.022642",
+ "links": [],
+ "modified": "2024-03-27 13:10:10.186727",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Order",
@@ -144,7 +146,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_order/payment_order.py b/erpnext/accounts/doctype/payment_order/payment_order.py
index 0ed26e4..a4c5962 100644
--- a/erpnext/accounts/doctype/payment_order/payment_order.py
+++ b/erpnext/accounts/doctype/payment_order/payment_order.py
@@ -90,9 +90,7 @@
 	je = frappe.new_doc("Journal Entry")
 	je.payment_order = doc.name
 	je.posting_date = nowdate()
-	mode_of_payment_type = frappe._dict(
-		frappe.get_all("Mode of Payment", fields=["name", "type"], as_list=1)
-	)
+	mode_of_payment_type = frappe._dict(frappe.get_all("Mode of Payment", fields=["name", "type"], as_list=1))
 
 	je.voucher_type = "Bank Entry"
 	if mode_of_payment and mode_of_payment_type.get(mode_of_payment) == "Cash":
diff --git a/erpnext/accounts/doctype/payment_order/test_payment_order.py b/erpnext/accounts/doctype/payment_order/test_payment_order.py
index 60f288e..7af0966 100644
--- a/erpnext/accounts/doctype/payment_order/test_payment_order.py
+++ b/erpnext/accounts/doctype/payment_order/test_payment_order.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
 from frappe.tests.utils import FrappeTestCase
@@ -41,9 +40,7 @@
 		payment_entry.insert()
 		payment_entry.submit()
 
-		doc = create_payment_order_against_payment_entry(
-			payment_entry, "Payment Entry", self.bank_account
-		)
+		doc = create_payment_order_against_payment_entry(payment_entry, "Payment Entry", self.bank_account)
 		reference_doc = doc.get("references")[0]
 		self.assertEqual(reference_doc.reference_name, payment_entry.name)
 		self.assertEqual(reference_doc.reference_doctype, "Payment Entry")
diff --git a/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json b/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
index d94ba74..08eb028 100644
--- a/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
+++ b/erpnext/accounts/doctype/payment_order_reference/payment_order_reference.json
@@ -108,14 +108,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-09-04 08:29:51.014390",
+ "modified": "2024-03-27 13:10:10.347330",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Order Reference",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
index ff2aa6d..589b260 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -230,7 +230,7 @@
  "is_virtual": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-01-18 11:56:20.234667",
+ "modified": "2024-03-27 13:10:10.488007",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation",
@@ -253,7 +253,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
index dcb1a16..a2f355a 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -67,7 +67,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(PaymentReconciliation, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.common_filter_conditions = []
 		self.accounting_dimension_filter_conditions = []
 		self.ple_posting_date_filter = []
@@ -286,7 +286,6 @@
 		self.return_invoices = self.return_invoices_query.run(as_dict=True)
 
 	def get_dr_or_cr_notes(self):
-
 		self.build_qb_filter_conditions(get_return_invoices=True)
 
 		ple = qb.DocType("Payment Ledger Entry")
@@ -412,9 +411,7 @@
 				payment_entry[0].get("reference_name")
 			)
 
-		new_difference_amount = self.get_difference_amount(
-			payment_entry[0], invoice[0], allocated_amount
-		)
+		new_difference_amount = self.get_difference_amount(payment_entry[0], invoice[0], allocated_amount)
 		return new_difference_amount
 
 	@frappe.whitelist()
@@ -532,9 +529,9 @@
 
 			if running_doc:
 				frappe.throw(
-					_("A Reconciliation Job {0} is running for the same filters. Cannot reconcile now").format(
-						get_link_to_form("Auto Reconcile", running_doc)
-					)
+					_(
+						"A Reconciliation Job {0} is running for the same filters. Cannot reconcile now"
+					).format(get_link_to_form("Auto Reconcile", running_doc))
 				)
 				return
 
@@ -627,9 +624,7 @@
 
 			invoice_exchange_map.update(purchase_invoice_map)
 
-		journals = [
-			d.get("invoice_number") for d in invoices if d.get("invoice_type") == "Journal Entry"
-		]
+		journals = [d.get("invoice_number") for d in invoices if d.get("invoice_type") == "Journal Entry"]
 		journals.extend(
 			[d.get("reference_name") for d in payments if d.get("reference_type") == "Journal Entry"]
 		)
@@ -721,7 +716,7 @@
 	def get_journal_filter_conditions(self):
 		conditions = []
 		je = qb.DocType("Journal Entry")
-		jea = qb.DocType("Journal Entry Account")
+		qb.DocType("Journal Entry Account")
 		conditions.append(je.company == self.company)
 
 		if self.from_payment_date:
@@ -841,7 +836,7 @@
 
 
 @frappe.whitelist()
-def get_queries_for_dimension_filters(company: str = None):
+def get_queries_for_dimension_filters(company: str | None = None):
 	dimensions_with_filters = []
 	for d in get_dimensions()[0]:
 		filters = {}
diff --git a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
index 1d20a5b..8b55c11 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
+++ b/erpnext/accounts/doctype/payment_reconciliation/test_payment_reconciliation.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
 from frappe import qb
@@ -127,11 +126,14 @@
 			setattr(self, x.attribute, acc.name)
 
 	def create_sales_invoice(
-		self, qty=1, rate=100, posting_date=nowdate(), do_not_save=False, do_not_submit=False
+		self, qty=1, rate=100, posting_date=None, do_not_save=False, do_not_submit=False
 	):
 		"""
 		Helper function to populate default values in sales invoice
 		"""
+		if posting_date is None:
+			posting_date = nowdate()
+
 		sinv = create_sales_invoice(
 			qty=qty,
 			rate=rate,
@@ -155,10 +157,13 @@
 		)
 		return sinv
 
-	def create_payment_entry(self, amount=100, posting_date=nowdate(), customer=None):
+	def create_payment_entry(self, amount=100, posting_date=None, customer=None):
 		"""
 		Helper function to populate default values in payment entry
 		"""
+		if posting_date is None:
+			posting_date = nowdate()
+
 		payment = create_payment_entry(
 			company=self.company,
 			payment_type="Receive",
@@ -172,11 +177,14 @@
 		return payment
 
 	def create_purchase_invoice(
-		self, qty=1, rate=100, posting_date=nowdate(), do_not_save=False, do_not_submit=False
+		self, qty=1, rate=100, posting_date=None, do_not_save=False, do_not_submit=False
 	):
 		"""
 		Helper function to populate default values in sales invoice
 		"""
+		if posting_date is None:
+			posting_date = nowdate()
+
 		pinv = make_purchase_invoice(
 			qty=qty,
 			rate=rate,
@@ -201,11 +209,14 @@
 		return pinv
 
 	def create_purchase_order(
-		self, qty=1, rate=100, posting_date=nowdate(), do_not_save=False, do_not_submit=False
+		self, qty=1, rate=100, posting_date=None, do_not_save=False, do_not_submit=False
 	):
 		"""
 		Helper function to populate default values in sales invoice
 		"""
+		if posting_date is None:
+			posting_date = nowdate()
+
 		pord = create_purchase_order(
 			qty=qty,
 			rate=rate,
@@ -250,9 +261,7 @@
 		pr.from_invoice_date = pr.to_invoice_date = pr.from_payment_date = pr.to_payment_date = nowdate()
 		return pr
 
-	def create_journal_entry(
-		self, acc1=None, acc2=None, amount=0, posting_date=None, cost_center=None
-	):
+	def create_journal_entry(self, acc1=None, acc2=None, amount=0, posting_date=None, cost_center=None):
 		je = frappe.new_doc("Journal Entry")
 		je.posting_date = posting_date or nowdate()
 		je.company = self.company
@@ -402,7 +411,7 @@
 		rate = 100
 		invoices = []
 		payments = []
-		for i in range(5):
+		for _i in range(5):
 			invoices.append(self.create_sales_invoice(qty=1, rate=rate, posting_date=transaction_date))
 			pe = self.create_payment_entry(amount=rate, posting_date=transaction_date).save().submit()
 			payments.append(pe)
@@ -821,9 +830,7 @@
 
 		cr_note.cancel()
 
-		pay = self.create_payment_entry(
-			amount=amount, posting_date=transaction_date, customer=self.customer3
-		)
+		pay = self.create_payment_entry(amount=amount, posting_date=transaction_date, customer=self.customer3)
 		pay.paid_from = self.debtors_eur
 		pay.paid_from_account_currency = "EUR"
 		pay.source_exchange_rate = exchange_rate
@@ -1025,9 +1032,7 @@
 		rate = 100
 
 		# 'Main - PR' Cost Center
-		si1 = self.create_sales_invoice(
-			qty=1, rate=rate, posting_date=transaction_date, do_not_submit=True
-		)
+		si1 = self.create_sales_invoice(qty=1, rate=rate, posting_date=transaction_date, do_not_submit=True)
 		si1.cost_center = self.main_cc.name
 		si1.submit()
 
@@ -1043,9 +1048,7 @@
 		je1 = je1.save().submit()
 
 		# 'Sub - PR' Cost Center
-		si2 = self.create_sales_invoice(
-			qty=1, rate=rate, posting_date=transaction_date, do_not_submit=True
-		)
+		si2 = self.create_sales_invoice(qty=1, rate=rate, posting_date=transaction_date, do_not_submit=True)
 		si2.cost_center = self.sub_cc.name
 		si2.submit()
 
diff --git a/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json b/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
index 3f85b21..124933f 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
@@ -173,13 +173,13 @@
  "is_virtual": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-12-14 13:38:26.104150",
+ "modified": "2024-03-27 13:10:10.704417",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation Allocation",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
index 7c9d49e..1efb815 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
@@ -74,14 +74,14 @@
  "is_virtual": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-11-17 17:33:45.455166",
+ "modified": "2024-03-27 13:10:10.857341",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation Invoice",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
index d199236..470c193 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
@@ -110,14 +110,14 @@
  "is_virtual": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-11-17 17:33:34.818530",
+ "modified": "2024-03-27 13:10:10.980445",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation Payment",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index f62b624..b89cca2 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -405,7 +405,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-01-20 00:37:06.988919",
+ "modified": "2024-03-27 13:10:11.120742",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Request",
@@ -440,7 +440,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.py b/erpnext/accounts/doctype/payment_request/payment_request.py
index 1649183..196838a 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/payment_request.py
@@ -105,7 +105,7 @@
 		)
 
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
-		if not hasattr(ref_doc, "order_type") or getattr(ref_doc, "order_type") != "Shopping Cart":
+		if not hasattr(ref_doc, "order_type") or ref_doc.order_type != "Shopping Cart":
 			ref_amount = get_amount(ref_doc, self.payment_account)
 			if not ref_amount:
 				frappe.throw(_("Payment Entry is already created"))
@@ -160,7 +160,7 @@
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
 
 		if (
-			hasattr(ref_doc, "order_type") and getattr(ref_doc, "order_type") == "Shopping Cart"
+			hasattr(ref_doc, "order_type") and ref_doc.order_type == "Shopping Cart"
 		) or self.flags.mute_email:
 			send_mail = False
 
@@ -172,9 +172,9 @@
 		elif self.payment_channel == "Phone":
 			self.request_phone_payment()
 
-		advance_payment_doctypes = frappe.get_hooks(
-			"advance_payment_receivable_doctypes"
-		) + frappe.get_hooks("advance_payment_payable_doctypes")
+		advance_payment_doctypes = frappe.get_hooks("advance_payment_receivable_doctypes") + frappe.get_hooks(
+			"advance_payment_payable_doctypes"
+		)
 		if self.reference_doctype in advance_payment_doctypes:
 			# set advance payment status
 			ref_doc.set_total_advance_paid()
@@ -218,16 +218,16 @@
 		self.set_as_cancelled()
 
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
-		advance_payment_doctypes = frappe.get_hooks(
-			"advance_payment_receivable_doctypes"
-		) + frappe.get_hooks("advance_payment_payable_doctypes")
+		advance_payment_doctypes = frappe.get_hooks("advance_payment_receivable_doctypes") + frappe.get_hooks(
+			"advance_payment_payable_doctypes"
+		)
 		if self.reference_doctype in advance_payment_doctypes:
 			# set advance payment status
 			ref_doc.set_total_advance_paid()
 
 	def make_invoice(self):
 		ref_doc = frappe.get_doc(self.reference_doctype, self.reference_name)
-		if hasattr(ref_doc, "order_type") and getattr(ref_doc, "order_type") == "Shopping Cart":
+		if hasattr(ref_doc, "order_type") and ref_doc.order_type == "Shopping Cart":
 			from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
 
 			si = make_sales_invoice(self.reference_name, ignore_permissions=True)
@@ -306,14 +306,10 @@
 		else:
 			party_account = get_party_account("Customer", ref_doc.get("customer"), ref_doc.company)
 
-		party_account_currency = ref_doc.get("party_account_currency") or get_account_currency(
-			party_account
-		)
+		party_account_currency = ref_doc.get("party_account_currency") or get_account_currency(party_account)
 
 		bank_amount = self.grand_total
-		if (
-			party_account_currency == ref_doc.company_currency and party_account_currency != self.currency
-		):
+		if party_account_currency == ref_doc.company_currency and party_account_currency != self.currency:
 			party_amount = ref_doc.get("base_rounded_total") or ref_doc.get("base_grand_total")
 		else:
 			party_amount = self.grand_total
@@ -331,7 +327,7 @@
 				"mode_of_payment": self.mode_of_payment,
 				"reference_no": self.name,
 				"reference_date": nowdate(),
-				"remarks": "Payment Entry against {0} {1} via Payment Request {2}".format(
+				"remarks": "Payment Entry against {} {} via Payment Request {}".format(
 					self.reference_doctype, self.reference_name, self.name
 				),
 			}
@@ -465,15 +461,11 @@
 		frappe.db.set_value(
 			"Sales Order", args.dn, "loyalty_points", int(args.loyalty_points), update_modified=False
 		)
-		frappe.db.set_value(
-			"Sales Order", args.dn, "loyalty_amount", loyalty_amount, update_modified=False
-		)
+		frappe.db.set_value("Sales Order", args.dn, "loyalty_amount", loyalty_amount, update_modified=False)
 		grand_total = grand_total - loyalty_amount
 
 	bank_account = (
-		get_party_bank_account(args.get("party_type"), args.get("party"))
-		if args.get("party_type")
-		else ""
+		get_party_bank_account(args.get("party_type"), args.get("party")) if args.get("party_type") else ""
 	)
 
 	draft_payment_request = frappe.db.get_value(
@@ -770,7 +762,10 @@
 			& (
 				(pe_ref.reference_name == dn)
 				| pe_ref.reference_name.isin(
-					frappe.qb.from_(inv_item).select(inv_item.parent).where(inv_item[inv_field] == dn).distinct()
+					frappe.qb.from_(inv_item)
+					.select(inv_item.parent)
+					.where(inv_item[inv_field] == dn)
+					.distinct()
 				)
 			)
 		)
diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py
index feb2fdf..70de886 100644
--- a/erpnext/accounts/doctype/payment_request/test_payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py
@@ -93,7 +93,7 @@
 			return_doc=1,
 		)
 
-		pe = pr.create_payment_entry()
+		pr.create_payment_entry()
 		pr.load_from_db()
 
 		self.assertEqual(pr.status, "Paid")
@@ -158,7 +158,7 @@
 
 		self.assertTrue(gl_entries)
 
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_gle[gle.account][0], gle.account)
 			self.assertEqual(expected_gle[gle.account][1], gle.debit)
 			self.assertEqual(expected_gle[gle.account][2], gle.credit)
diff --git a/erpnext/accounts/doctype/payment_schedule/payment_schedule.json b/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
index dde9980..6008a6f 100644
--- a/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
+++ b/erpnext/accounts/doctype/payment_schedule/payment_schedule.json
@@ -160,14 +160,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-09-16 13:57:06.382859",
+ "modified": "2024-03-27 13:10:11.356171",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Schedule",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/payment_term/payment_term.json b/erpnext/accounts/doctype/payment_term/payment_term.json
index aec4965..b0bd6d5 100644
--- a/erpnext/accounts/doctype/payment_term/payment_term.json
+++ b/erpnext/accounts/doctype/payment_term/payment_term.json
@@ -116,7 +116,7 @@
   }
  ],
  "links": [],
- "modified": "2021-02-15 20:30:56.256403",
+ "modified": "2024-03-27 13:10:11.511137",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Term",
@@ -160,7 +160,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json
index c4a2a88..c7c5926 100644
--- a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json
+++ b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.json
@@ -35,7 +35,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-01 15:35:18.112619",
+ "modified": "2024-03-27 13:10:11.676098",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Terms Template",
@@ -78,7 +78,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py
index 8f028f9..aaf8577 100644
--- a/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py
+++ b/erpnext/accounts/doctype/payment_terms_template/payment_terms_template.py
@@ -36,9 +36,7 @@
 			total_portion += flt(term.get("invoice_portion", 0))
 
 		if flt(total_portion, 2) != 100.00:
-			frappe.msgprint(
-				_("Combined invoice portion must equal 100%"), raise_exception=1, indicator="red"
-			)
+			frappe.msgprint(_("Combined invoice portion must equal 100%"), raise_exception=1, indicator="red")
 
 	def validate_terms(self):
 		terms = []
diff --git a/erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json b/erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json
index 20b3dca..8d5e0f9 100644
--- a/erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json
+++ b/erpnext/accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json
@@ -151,14 +151,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-02-24 11:56:12.410807",
+ "modified": "2024-03-27 13:10:11.829680",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Terms Template Detail",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
index 624b5f8..2d94907 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
@@ -112,7 +112,7 @@
  "idx": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-09-11 20:19:11.810533",
+ "modified": "2024-03-27 13:10:13.013336",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Period Closing Voucher",
@@ -149,7 +149,7 @@
   }
  ],
  "search_fields": "posting_date, fiscal_year",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "closing_account_head"
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
index 76c0a09..e75057c 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
@@ -67,7 +67,8 @@
 				enqueue_after_commit=True,
 			)
 			frappe.msgprint(
-				_("The GL Entries will be cancelled in the background, it can take a few minutes."), alert=True
+				_("The GL Entries will be cancelled in the background, it can take a few minutes."),
+				alert=True,
 			)
 		else:
 			make_reverse_gl_entries(voucher_type="Period Closing Voucher", voucher_no=self.name)
@@ -109,9 +110,7 @@
 			self.posting_date, self.fiscal_year, self.company, label=_("Posting Date"), doc=self
 		)
 
-		self.year_start_date = get_fiscal_year(
-			self.posting_date, self.fiscal_year, company=self.company
-		)[1]
+		self.year_start_date = get_fiscal_year(self.posting_date, self.fiscal_year, company=self.company)[1]
 
 		self.check_if_previous_year_closed()
 
@@ -225,7 +224,9 @@
 				"credit_in_account_currency": abs(flt(acc.bal_in_account_currency))
 				if flt(acc.bal_in_account_currency) > 0
 				else 0,
-				"credit": abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) > 0 else 0,
+				"credit": abs(flt(acc.bal_in_company_currency))
+				if flt(acc.bal_in_company_currency) > 0
+				else 0,
 				"is_period_closing_voucher_entry": 1,
 			},
 			item=acc,
@@ -249,7 +250,9 @@
 				"credit_in_account_currency": abs(flt(acc.bal_in_account_currency))
 				if flt(acc.bal_in_account_currency) < 0
 				else 0,
-				"credit": abs(flt(acc.bal_in_company_currency)) if flt(acc.bal_in_company_currency) < 0 else 0,
+				"credit": abs(flt(acc.bal_in_company_currency))
+				if flt(acc.bal_in_company_currency) < 0
+				else 0,
 				"is_period_closing_voucher_entry": 1,
 			},
 			item=acc,
diff --git a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json
index a98a24c..6415392 100644
--- a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json
+++ b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.json
@@ -236,7 +236,7 @@
    "link_fieldname": "pos_closing_entry"
   }
  ],
- "modified": "2023-08-10 16:25:49.322697",
+ "modified": "2024-03-27 13:10:14.073467",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Closing Entry",
@@ -285,7 +285,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py
index 0f3a5bb..b158eda 100644
--- a/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py
+++ b/erpnext/accounts/doctype/pos_closing_entry/pos_closing_entry.py
@@ -70,7 +70,7 @@
 		for key, value in pos_occurences.items():
 			if len(value) > 1:
 				error_list.append(
-					_("{} is added multiple times on rows: {}".format(frappe.bold(key), frappe.bold(value)))
+					_(f"{frappe.bold(key)} is added multiple times on rows: {frappe.bold(value)}")
 				)
 
 		if error_list:
@@ -165,9 +165,7 @@
 		as_dict=1,
 	)
 
-	data = list(
-		filter(lambda d: get_datetime(start) <= get_datetime(d.timestamp) <= get_datetime(end), data)
-	)
+	data = list(filter(lambda d: get_datetime(start) <= get_datetime(d.timestamp) <= get_datetime(end), data))
 	# need to get taxes and payments so can't avoid get_doc
 	data = [frappe.get_doc("POS Invoice", d.name).as_dict() for d in data]
 
@@ -238,7 +236,11 @@
 			else:
 				payments.append(
 					frappe._dict(
-						{"mode_of_payment": p.mode_of_payment, "opening_amount": 0, "expected_amount": p.amount}
+						{
+							"mode_of_payment": p.mode_of_payment,
+							"opening_amount": 0,
+							"expected_amount": p.amount,
+						}
 					)
 				)
 
diff --git a/erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py b/erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py
index 62b342a..6319d5d 100644
--- a/erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py
+++ b/erpnext/accounts/doctype/pos_closing_entry/test_pos_closing_entry.py
@@ -62,9 +62,7 @@
 		test_user, pos_profile = init_user_and_profile()
 		opening_entry = create_opening_entry(pos_profile, test_user.name)
 
-		pos_inv = create_pos_invoice(
-			rate=3500, do_not_submit=1, item_name="Test Item", without_item_code=1
-		)
+		pos_inv = create_pos_invoice(rate=3500, do_not_submit=1, item_name="Test Item", without_item_code=1)
 		pos_inv.append("payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 3500})
 		pos_inv.submit()
 
@@ -211,7 +209,7 @@
 		item_group="All Item Groups",
 	)
 
-	test_item_qty = [item for item in test_item_pos["items"] if item["item_code"] == "_Test Item"][
-		0
-	].get("actual_qty")
+	test_item_qty = next(item for item in test_item_pos["items"] if item["item_code"] == "_Test Item").get(
+		"actual_qty"
+	)
 	return test_item_qty
diff --git a/erpnext/accounts/doctype/pos_closing_entry_detail/pos_closing_entry_detail.json b/erpnext/accounts/doctype/pos_closing_entry_detail/pos_closing_entry_detail.json
index bbf1ba0..9fc8d97 100644
--- a/erpnext/accounts/doctype/pos_closing_entry_detail/pos_closing_entry_detail.json
+++ b/erpnext/accounts/doctype/pos_closing_entry_detail/pos_closing_entry_detail.json
@@ -58,14 +58,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-05-19 20:08:44.523861",
+ "modified": "2024-03-27 13:10:14.302402",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Closing Entry Detail",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_closing_entry_taxes/pos_closing_entry_taxes.json b/erpnext/accounts/doctype/pos_closing_entry_taxes/pos_closing_entry_taxes.json
index 42e7d0e..c10405c 100644
--- a/erpnext/accounts/doctype/pos_closing_entry_taxes/pos_closing_entry_taxes.json
+++ b/erpnext/accounts/doctype/pos_closing_entry_taxes/pos_closing_entry_taxes.json
@@ -35,14 +35,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-05-29 15:03:39.872884",
+ "modified": "2024-03-27 13:10:14.420657",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Closing Entry Taxes",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json b/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json
index 3ad450b..effb989 100644
--- a/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json
+++ b/erpnext/accounts/doctype/pos_customer_group/pos_customer_group.json
@@ -1,66 +1,32 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-11-16 15:27:16.413449", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2016-11-16 15:27:16.413449",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "customer_group"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "customer_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Customer Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "customer_group",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Customer Group",
+   "options": "Customer Group",
+   "reqd": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-11-16 15:27:25.730507", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "POS Customer Group", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:14.539093",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "POS Customer Group",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_field/pos_field.json b/erpnext/accounts/doctype/pos_field/pos_field.json
index 13edabd..fef76af 100644
--- a/erpnext/accounts/doctype/pos_field/pos_field.json
+++ b/erpnext/accounts/doctype/pos_field/pos_field.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-08-22 14:35:39.043242",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -64,14 +65,16 @@
   }
  ],
  "istable": 1,
- "modified": "2019-08-23 13:59:34.025523",
+ "links": [],
+ "modified": "2024-03-27 13:10:14.648160",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Field",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
index d7b1736..c0934b0 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.json
@@ -420,7 +420,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Address",
    "read_only": 1
   },
@@ -475,7 +475,7 @@
   },
   {
    "fieldname": "shipping_address",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Shipping Address",
    "print_hide": 1,
    "read_only": 1
@@ -489,7 +489,7 @@
   },
   {
    "fieldname": "company_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "hidden": 1,
    "label": "Company Address",
    "print_hide": 1,
@@ -1563,7 +1563,7 @@
  "icon": "fa fa-file-text",
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-20 16:00:34.268756",
+ "modified": "2024-03-27 13:10:14.787999",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice",
@@ -1610,7 +1610,7 @@
  ],
  "search_fields": "posting_date, due_date, customer, base_grand_total, outstanding_amount",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "customer",
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
index 5db3da1..b497279 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
@@ -47,7 +47,7 @@
 
 		account_for_change_amount: DF.Link | None
 		additional_discount_percentage: DF.Float
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		advances: DF.Table[SalesInvoiceAdvance]
 		against_income_account: DF.SmallText | None
 		allocate_advances_automatically: DF.Check
@@ -72,7 +72,7 @@
 		commission_rate: DF.Float
 		company: DF.Link
 		company_address: DF.Link | None
-		company_address_display: DF.SmallText | None
+		company_address_display: DF.TextEditor | None
 		consolidated_invoice: DF.Link | None
 		contact_display: DF.SmallText | None
 		contact_email: DF.Data | None
@@ -138,7 +138,7 @@
 		selling_price_list: DF.Link
 		set_posting_time: DF.Check
 		set_warehouse: DF.Link | None
-		shipping_address: DF.SmallText | None
+		shipping_address: DF.TextEditor | None
 		shipping_address_name: DF.Link | None
 		shipping_rule: DF.Link | None
 		source: DF.Link | None
@@ -183,7 +183,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(POSInvoice, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 
 	def validate(self):
 		if not cint(self.is_pos):
@@ -308,7 +308,9 @@
 				)
 
 				if paid_amt and pay.amount != paid_amt:
-					return frappe.throw(_("Payment related to {0} is not completed").format(pay.mode_of_payment))
+					return frappe.throw(
+						_("Payment related to {0} is not completed").format(pay.mode_of_payment)
+					)
 
 	def validate_stock_availablility(self):
 		if self.is_return:
@@ -328,7 +330,7 @@
 
 				available_stock, is_stock_item = get_stock_availability(d.item_code, d.warehouse)
 
-				item_code, warehouse, qty = (
+				item_code, warehouse, _qty = (
 					frappe.bold(d.item_code),
 					frappe.bold(d.warehouse),
 					frappe.bold(d.qty),
@@ -408,8 +410,7 @@
 		if (
 			self.change_amount
 			and self.account_for_change_amount
-			and frappe.get_cached_value("Account", self.account_for_change_amount, "company")
-			!= self.company
+			and frappe.get_cached_value("Account", self.account_for_change_amount, "company") != self.company
 		):
 			frappe.throw(
 				_("The selected change account {} doesn't belongs to Company {}.").format(
diff --git a/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
index 8fab290..773ef01 100644
--- a/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/test_pos_invoice.py
@@ -245,7 +245,6 @@
 		self.assertEqual(pos_return.get("payments")[1].amount, -500)
 
 	def test_pos_return_for_serialized_item(self):
-		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
 
 		se = make_serialized_item(
@@ -287,7 +286,6 @@
 		)
 
 	def test_partial_pos_returns(self):
-		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
 
 		se = make_serialized_item(
@@ -359,9 +357,7 @@
 		)
 
 		pos.set("payments", [])
-		pos.append(
-			"payments", {"mode_of_payment": "Bank Draft", "account": "_Test Bank - _TC", "amount": 50}
-		)
+		pos.append("payments", {"mode_of_payment": "Bank Draft", "account": "_Test Bank - _TC", "amount": 50})
 		pos.append(
 			"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 60, "default": 1}
 		)
@@ -379,7 +375,6 @@
 		self.assertRaises(frappe.ValidationError, inv.insert)
 
 	def test_serialized_item_transaction(self):
-		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
 
 		se = make_serialized_item(
@@ -434,7 +429,6 @@
 		self.assertRaises(frappe.ValidationError, pos2.submit)
 
 	def test_delivered_serialized_item_transaction(self):
-		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
 
 		se = make_serialized_item(
@@ -583,9 +577,7 @@
 		from erpnext.accounts.doctype.loyalty_program.test_loyalty_program import create_records
 
 		create_records()
-		frappe.db.set_value(
-			"Customer", "Test Loyalty Customer", "loyalty_program", "Test Single Loyalty"
-		)
+		frappe.db.set_value("Customer", "Test Loyalty Customer", "loyalty_program", "Test Single Loyalty")
 		before_lp_details = get_loyalty_program_details_with_points(
 			"Test Loyalty Customer", company="_Test Company", loyalty_program="Test Single Loyalty"
 		)
@@ -659,9 +651,7 @@
 		consolidate_pos_invoices()
 
 		pos_inv.load_from_db()
-		rounded_total = frappe.db.get_value(
-			"Sales Invoice", pos_inv.consolidated_invoice, "rounded_total"
-		)
+		rounded_total = frappe.db.get_value("Sales Invoice", pos_inv.consolidated_invoice, "rounded_total")
 		self.assertEqual(rounded_total, 3470)
 
 	def test_merging_into_sales_invoice_with_discount_and_inclusive_tax(self):
@@ -708,9 +698,7 @@
 		consolidate_pos_invoices()
 
 		pos_inv.load_from_db()
-		rounded_total = frappe.db.get_value(
-			"Sales Invoice", pos_inv.consolidated_invoice, "rounded_total"
-		)
+		rounded_total = frappe.db.get_value("Sales Invoice", pos_inv.consolidated_invoice, "rounded_total")
 		self.assertEqual(rounded_total, 840)
 
 	def test_merging_with_validate_selling_price(self):
@@ -762,9 +750,7 @@
 		consolidate_pos_invoices()
 
 		pos_inv2.load_from_db()
-		rounded_total = frappe.db.get_value(
-			"Sales Invoice", pos_inv2.consolidated_invoice, "rounded_total"
-		)
+		rounded_total = frappe.db.get_value("Sales Invoice", pos_inv2.consolidated_invoice, "rounded_total")
 		self.assertEqual(rounded_total, 400)
 
 	def test_pos_batch_reservation(self):
@@ -788,9 +774,7 @@
 		batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle)
 
 		# POS Invoice 1, for the batch without bundle
-		pos_inv1 = create_pos_invoice(
-			item="_BATCH ITEM Test For Reserve", rate=300, qty=15, do_not_save=1
-		)
+		pos_inv1 = create_pos_invoice(item="_BATCH ITEM Test For Reserve", rate=300, qty=15, do_not_save=1)
 
 		pos_inv1.items[0].batch_no = batch_no
 		pos_inv1.save()
@@ -800,9 +784,7 @@
 		self.assertFalse(pos_inv1.items[0].serial_and_batch_bundle)
 
 		batches = get_auto_batch_nos(
-			frappe._dict(
-				{"item_code": "_BATCH ITEM Test For Reserve", "warehouse": "_Test Warehouse - _TC"}
-			)
+			frappe._dict({"item_code": "_BATCH ITEM Test For Reserve", "warehouse": "_Test Warehouse - _TC"})
 		)
 
 		for batch in batches:
@@ -817,9 +799,7 @@
 		self.assertTrue(pos_inv2.items[0].serial_and_batch_bundle)
 
 		batches = get_auto_batch_nos(
-			frappe._dict(
-				{"item_code": "_BATCH ITEM Test For Reserve", "warehouse": "_Test Warehouse - _TC"}
-			)
+			frappe._dict({"item_code": "_BATCH ITEM Test For Reserve", "warehouse": "_Test Warehouse - _TC"})
 		)
 
 		for batch in batches:
@@ -896,19 +876,19 @@
 			pos_inv = create_pos_invoice(qty=1, do_not_submit=1)
 			pos_inv.items[0].rate = 300
 			pos_inv.save()
-			self.assertEquals(pos_inv.items[0].discount_percentage, 10)
+			self.assertEqual(pos_inv.items[0].discount_percentage, 10)
 			# rate shouldn't change
-			self.assertEquals(pos_inv.items[0].rate, 405)
+			self.assertEqual(pos_inv.items[0].rate, 405)
 
 			pos_inv.ignore_pricing_rule = 1
 			pos_inv.save()
-			self.assertEquals(pos_inv.ignore_pricing_rule, 1)
+			self.assertEqual(pos_inv.ignore_pricing_rule, 1)
 			# rate should reset since pricing rules are ignored
-			self.assertEquals(pos_inv.items[0].rate, 450)
+			self.assertEqual(pos_inv.items[0].rate, 450)
 
 			pos_inv.items[0].rate = 300
 			pos_inv.save()
-			self.assertEquals(pos_inv.items[0].rate, 300)
+			self.assertEqual(pos_inv.items[0].rate, 300)
 
 		finally:
 			item_price.delete()
@@ -920,7 +900,6 @@
 			init_user_and_profile,
 		)
 		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
-		from erpnext.stock.doctype.serial_no.test_serial_no import get_serial_nos
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
 
 		frappe.db.savepoint("before_test_delivered_serial_no_case")
diff --git a/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json b/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
index b92579e..9ee73c7 100644
--- a/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
+++ b/erpnext/accounts/doctype/pos_invoice_item/pos_invoice_item.json
@@ -853,14 +853,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-02-25 15:50:17.140269",
+ "modified": "2024-03-27 13:10:15.336778",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
index a059455..2f94e34 100644
--- a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
+++ b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.json
@@ -118,7 +118,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-08-01 11:36:42.456429",
+ "modified": "2024-03-27 13:10:15.620564",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice Merge Log",
@@ -179,7 +179,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
index cd858ca..7501df0 100644
--- a/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
+++ b/erpnext/accounts/doctype/pos_invoice_merge_log/pos_invoice_merge_log.py
@@ -54,7 +54,7 @@
 		for key, value in pos_occurences.items():
 			if len(value) > 1:
 				error_list.append(
-					_("{} is added multiple times on rows: {}".format(frappe.bold(key), frappe.bold(value)))
+					_(f"{frappe.bold(key)} is added multiple times on rows: {frappe.bold(value)}")
 				)
 
 		if error_list:
@@ -81,7 +81,9 @@
 			bold_pos_invoice = frappe.bold(d.pos_invoice)
 			bold_status = frappe.bold(status)
 			if docstatus != 1:
-				frappe.throw(_("Row #{}: POS Invoice {} is not submitted yet").format(d.idx, bold_pos_invoice))
+				frappe.throw(
+					_("Row #{}: POS Invoice {} is not submitted yet").format(d.idx, bold_pos_invoice)
+				)
 			if status == "Consolidated":
 				frappe.throw(
 					_("Row #{}: POS Invoice {} has been {}").format(d.idx, bold_pos_invoice, bold_status)
@@ -100,15 +102,17 @@
 						d.idx, bold_return_against, bold_pos_invoice, bold_unconsolidated
 					)
 					msg += " "
-					msg += _("Original invoice should be consolidated before or along with the return invoice.")
+					msg += _(
+						"Original invoice should be consolidated before or along with the return invoice."
+					)
 					msg += "<br><br>"
-					msg += _("You can add original invoice {} manually to proceed.").format(bold_return_against)
+					msg += _("You can add original invoice {} manually to proceed.").format(
+						bold_return_against
+					)
 					frappe.throw(msg)
 
 	def on_submit(self):
-		pos_invoice_docs = [
-			frappe.get_cached_doc("POS Invoice", d.pos_invoice) for d in self.pos_invoices
-		]
+		pos_invoice_docs = [frappe.get_cached_doc("POS Invoice", d.pos_invoice) for d in self.pos_invoices]
 
 		returns = [d for d in pos_invoice_docs if d.get("is_return") == 1]
 		sales = [d for d in pos_invoice_docs if d.get("is_return") == 0]
@@ -124,9 +128,7 @@
 		self.update_pos_invoices(pos_invoice_docs, sales_invoice, credit_note)
 
 	def on_cancel(self):
-		pos_invoice_docs = [
-			frappe.get_cached_doc("POS Invoice", d.pos_invoice) for d in self.pos_invoices
-		]
+		pos_invoice_docs = [frappe.get_cached_doc("POS Invoice", d.pos_invoice) for d in self.pos_invoices]
 
 		self.update_pos_invoices(pos_invoice_docs)
 		self.cancel_linked_invoices()
@@ -217,7 +219,9 @@
 				for t in taxes:
 					if t.account_head == tax.account_head and t.cost_center == tax.cost_center:
 						t.tax_amount = flt(t.tax_amount) + flt(tax.tax_amount_after_discount_amount)
-						t.base_tax_amount = flt(t.base_tax_amount) + flt(tax.base_tax_amount_after_discount_amount)
+						t.base_tax_amount = flt(t.base_tax_amount) + flt(
+							tax.base_tax_amount_after_discount_amount
+						)
 						update_item_wise_tax_detail(t, tax)
 						found = True
 				if not found:
@@ -333,9 +337,7 @@
 		else:
 			consolidated_tax_detail.update({item_code: [tax_data[0], tax_data[1]]})
 
-	consolidate_tax_row.item_wise_tax_detail = json.dumps(
-		consolidated_tax_detail, separators=(",", ":")
-	)
+	consolidate_tax_row.item_wise_tax_detail = json.dumps(consolidated_tax_detail, separators=(",", ":"))
 
 
 def get_all_unconsolidated_invoices():
@@ -380,9 +382,7 @@
 
 	if len(invoices) >= 10 and closing_entry:
 		closing_entry.set_status(update=True, status="Queued")
-		enqueue_job(
-			create_merge_logs, invoice_by_customer=invoice_by_customer, closing_entry=closing_entry
-		)
+		enqueue_job(create_merge_logs, invoice_by_customer=invoice_by_customer, closing_entry=closing_entry)
 	else:
 		create_merge_logs(invoice_by_customer, closing_entry)
 
@@ -431,9 +431,7 @@
 			if not item.serial_no and not item.serial_and_batch_bundle:
 				continue
 
-			return_against_is_added = any(
-				d for d in _invoices if d.pos_invoice == pos_invoice.return_against
-			)
+			return_against_is_added = any(d for d in _invoices if d.pos_invoice == pos_invoice.return_against)
 			if return_against_is_added:
 				break
 
@@ -482,7 +480,7 @@
 
 		if closing_entry:
 			closing_entry.set_status(update=True, status="Failed")
-			if type(error_message) == list:
+			if isinstance(error_message, list):
 				error_message = frappe.json.dumps(error_message)
 			closing_entry.db_set("error_message", error_message)
 		raise
@@ -533,7 +531,7 @@
 			timeout=10000,
 			event="processing_merge_logs",
 			job_id=job_id,
-			now=frappe.conf.developer_mode or frappe.flags.in_test
+			now=frappe.conf.developer_mode or frappe.flags.in_test,
 		)
 
 		if job == create_merge_logs:
diff --git a/erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py b/erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
index 0ad9131..904d8e8 100644
--- a/erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
+++ b/erpnext/accounts/doctype/pos_invoice_merge_log/test_pos_invoice_merge_log.py
@@ -31,15 +31,11 @@
 			pos_inv.submit()
 
 			pos_inv2 = create_pos_invoice(rate=3200, do_not_submit=1)
-			pos_inv2.append(
-				"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 3200}
-			)
+			pos_inv2.append("payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 3200})
 			pos_inv2.submit()
 
 			pos_inv3 = create_pos_invoice(customer="_Test Customer 2", rate=2300, do_not_submit=1)
-			pos_inv3.append(
-				"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 2300}
-			)
+			pos_inv3.append("payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 2300})
 			pos_inv3.submit()
 
 			consolidate_pos_invoices()
@@ -68,15 +64,11 @@
 			pos_inv.submit()
 
 			pos_inv2 = create_pos_invoice(rate=3200, do_not_submit=1)
-			pos_inv2.append(
-				"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 3200}
-			)
+			pos_inv2.append("payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 3200})
 			pos_inv2.submit()
 
 			pos_inv3 = create_pos_invoice(customer="_Test Customer 2", rate=2300, do_not_submit=1)
-			pos_inv3.append(
-				"payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 2300}
-			)
+			pos_inv3.append("payments", {"mode_of_payment": "Cash", "account": "Cash - _TC", "amount": 2300})
 			pos_inv3.submit()
 
 			pos_inv_cn = make_sales_return(pos_inv.name)
@@ -312,7 +304,7 @@
 			init_user_and_profile()
 
 			item_rates = [69, 59, 29]
-			for i in [1, 2]:
+			for _i in [1, 2]:
 				inv = create_pos_invoice(is_return=1, do_not_save=1)
 				inv.items = []
 				for rate in item_rates:
@@ -406,7 +398,6 @@
 		The second and third POS Invoice should be consolidated with a single Merge Log
 		"""
 
-		from erpnext.stock.doctype.serial_no.test_serial_no import get_serial_nos
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
 
 		frappe.db.sql("delete from `tabPOS Invoice`")
diff --git a/erpnext/accounts/doctype/pos_invoice_reference/pos_invoice_reference.json b/erpnext/accounts/doctype/pos_invoice_reference/pos_invoice_reference.json
index 387c4b0..90952ec 100644
--- a/erpnext/accounts/doctype/pos_invoice_reference/pos_invoice_reference.json
+++ b/erpnext/accounts/doctype/pos_invoice_reference/pos_invoice_reference.json
@@ -70,14 +70,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-03-24 13:32:02.366257",
+ "modified": "2024-03-27 13:10:15.790122",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Invoice Reference",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/pos_item_group/pos_item_group.json b/erpnext/accounts/doctype/pos_item_group/pos_item_group.json
index 860c449..fe0f387 100644
--- a/erpnext/accounts/doctype/pos_item_group/pos_item_group.json
+++ b/erpnext/accounts/doctype/pos_item_group/pos_item_group.json
@@ -1,66 +1,32 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-11-16 15:26:47.706713", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2016-11-16 15:26:47.706713",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "item_group"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Item Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item Group", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "item_group",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Group",
+   "options": "Item Group",
+   "reqd": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-11-16 15:27:32.263630", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "POS Item Group", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:15.920412",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "POS Item Group",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.json b/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.json
index de729ce..45bc52a 100644
--- a/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.json
+++ b/erpnext/accounts/doctype/pos_opening_entry/pos_opening_entry.json
@@ -131,7 +131,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2020-05-29 15:08:40.955310",
+ "modified": "2024-03-27 13:10:16.034296",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Opening Entry",
@@ -179,7 +179,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_opening_entry_detail/pos_opening_entry_detail.json b/erpnext/accounts/doctype/pos_opening_entry_detail/pos_opening_entry_detail.json
index c23e3df..27354ec 100644
--- a/erpnext/accounts/doctype/pos_opening_entry_detail/pos_opening_entry_detail.json
+++ b/erpnext/accounts/doctype/pos_opening_entry_detail/pos_opening_entry_detail.json
@@ -29,14 +29,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-05-29 15:08:41.949378",
+ "modified": "2024-03-27 13:10:16.209635",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Opening Entry Detail",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_payment_method/pos_payment_method.json b/erpnext/accounts/doctype/pos_payment_method/pos_payment_method.json
index 30ebd30..44eedb1 100644
--- a/erpnext/accounts/doctype/pos_payment_method/pos_payment_method.json
+++ b/erpnext/accounts/doctype/pos_payment_method/pos_payment_method.json
@@ -37,13 +37,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-10-20 12:58:46.114456",
+ "modified": "2024-03-27 13:10:16.345262",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Payment Method",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index 994b677..5a0f825 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -402,7 +402,7 @@
    "link_fieldname": "pos_profile"
   }
  ],
- "modified": "2022-08-10 12:57:06.241439",
+ "modified": "2024-03-27 13:10:16.476972",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Profile",
@@ -428,7 +428,7 @@
    "role": "Accounts User"
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.py b/erpnext/accounts/doctype/pos_profile/pos_profile.py
index c1add57..29403ab 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.py
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.py
@@ -180,10 +180,8 @@
 			condition = " where pfu.default = 1 "
 
 		pos_view_users = frappe.db.sql_list(
-			"""select pfu.user
-			from `tabPOS Profile User` as pfu {0}""".format(
-				condition
-			)
+			f"""select pfu.user
+			from `tabPOS Profile User` as pfu {condition}"""
 		)
 
 		for user in pos_view_users:
@@ -210,16 +208,13 @@
 def get_child_nodes(group_type, root):
 	lft, rgt = frappe.db.get_value(group_type, root, ["lft", "rgt"])
 	return frappe.db.sql(
-		""" Select name, lft, rgt from `tab{tab}` where
-			lft >= {lft} and rgt <= {rgt} order by lft""".format(
-			tab=group_type, lft=lft, rgt=rgt
-		),
+		f""" Select name, lft, rgt from `tab{group_type}` where
+			lft >= {lft} and rgt <= {rgt} order by lft""",
 		as_dict=1,
 	)
 
 
 def required_accounting_dimensions():
-
 	p = frappe.qb.DocType("Accounting Dimension")
 	c = frappe.qb.DocType("Accounting Dimension Detail")
 
diff --git a/erpnext/accounts/doctype/pos_profile/test_pos_profile.py b/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
index b468ad3..f2e3c8f 100644
--- a/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
+++ b/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
@@ -7,7 +7,6 @@
 
 from erpnext.accounts.doctype.pos_profile.pos_profile import (
 	get_child_nodes,
-	required_accounting_dimensions,
 )
 from erpnext.stock.get_item_details import get_pos_profile
 
@@ -55,11 +54,9 @@
 
 	return (
 		frappe.db.sql(
-			""" select name, customer_name, customer_group,
+			f""" select name, customer_name, customer_group,
 		territory, customer_pos_id from tabCustomer where disabled = 0
-		and {cond}""".format(
-				cond=cond
-			),
+		and {cond}""",
 			tuple(customer_groups),
 			as_dict=1,
 		)
@@ -78,7 +75,7 @@
 			cond = "and i.item_group in (%s)" % (", ".join(["%s"] * len(args_list)))
 
 	return frappe.db.sql(
-		"""
+		f"""
 		select
 			i.name, i.item_code, i.item_name, i.description, i.item_group, i.has_batch_no,
 			i.has_serial_no, i.is_stock_item, i.brand, i.stock_uom, i.image,
@@ -91,10 +88,8 @@
 		where
 			i.disabled = 0 and i.has_variants = 0 and i.is_sales_item = 1 and i.is_fixed_asset = 0
 			{cond}
-		""".format(
-			cond=cond
-		),
-		tuple([company] + args_list),
+		""",
+		tuple([company, *args_list]),
 		as_dict=1,
 	)
 
diff --git a/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.json b/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.json
index c8f3f5e..708e2b2 100644
--- a/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.json
+++ b/erpnext/accounts/doctype/pos_profile_user/pos_profile_user.json
@@ -26,14 +26,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-05-13 23:57:33.627305",
+ "modified": "2024-03-27 13:10:16.846276",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Profile User",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_search_fields/pos_search_fields.json b/erpnext/accounts/doctype/pos_search_fields/pos_search_fields.json
index a627f5b..44555b5 100644
--- a/erpnext/accounts/doctype/pos_search_fields/pos_search_fields.json
+++ b/erpnext/accounts/doctype/pos_search_fields/pos_search_fields.json
@@ -25,13 +25,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-04-21 11:12:54.632093",
+ "modified": "2024-03-27 13:10:16.969895",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Search Fields",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_settings/pos_settings.json b/erpnext/accounts/doctype/pos_settings/pos_settings.json
index 962eb94..03bf85b 100644
--- a/erpnext/accounts/doctype/pos_settings/pos_settings.json
+++ b/erpnext/accounts/doctype/pos_settings/pos_settings.json
@@ -24,7 +24,7 @@
  ],
  "issingle": 1,
  "links": [],
- "modified": "2021-04-19 14:56:24.465218",
+ "modified": "2024-03-27 13:10:17.083132",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "POS Settings",
@@ -56,7 +56,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index 61c01a4..8c06a56 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -608,7 +608,7 @@
  "icon": "fa fa-gift",
  "idx": 1,
  "links": [],
- "modified": "2024-01-24 02:20:26.145996",
+ "modified": "2024-03-27 13:10:17.521896",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Pricing Rule",
@@ -666,8 +666,8 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title"
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 300692f..11529ef 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -186,9 +186,9 @@
 
 			if self.priority and cint(self.priority) == 1:
 				throw(
-					_("As the field {0} is enabled, the value of the field {1} should be more than 1.").format(
-						frappe.bold("Apply Discount on Discounted Rate"), frappe.bold("Priority")
-					)
+					_(
+						"As the field {0} is enabled, the value of the field {1} should be more than 1."
+					).format(frappe.bold("Apply Discount on Discounted Rate"), frappe.bold("Priority"))
 				)
 
 	def validate_applicable_for_selling_or_buying(self):
@@ -458,9 +458,11 @@
 				)
 
 				if pricing_rule.apply_rule_on_other_items:
-					item_details["apply_rule_on_other_items"] = json.dumps(pricing_rule.apply_rule_on_other_items)
+					item_details["apply_rule_on_other_items"] = json.dumps(
+						pricing_rule.apply_rule_on_other_items
+					)
 
-			if pricing_rule.coupon_code_based == 1 and args.coupon_code == None:
+			if pricing_rule.coupon_code_based == 1 and args.coupon_code is None:
 				return item_details
 
 			if not pricing_rule.validate_applied_rule:
@@ -504,7 +506,6 @@
 
 	if args.transaction_type == "selling":
 		if args.customer and not (args.customer_group and args.territory):
-
 			if args.quotation_to and args.quotation_to != "Customer":
 				customer = frappe._dict()
 			else:
@@ -535,9 +536,9 @@
 def apply_price_discount_rule(pricing_rule, item_details, args):
 	item_details.pricing_rule_for = pricing_rule.rate_or_discount
 
-	if (
-		pricing_rule.margin_type in ["Amount", "Percentage"] and pricing_rule.currency == args.currency
-	) or (pricing_rule.margin_type == "Percentage"):
+	if (pricing_rule.margin_type in ["Amount", "Percentage"] and pricing_rule.currency == args.currency) or (
+		pricing_rule.margin_type == "Percentage"
+	):
 		item_details.margin_type = pricing_rule.margin_type
 		item_details.has_margin = True
 
@@ -685,7 +686,7 @@
 
 	return frappe.get_all(
 		"UOM Conversion Detail",
-		filters={"parent": ("in", items), "uom": ("like", "{0}%".format(txt))},
+		filters={"parent": ("in", items), "uom": ("like", f"{txt}%")},
 		fields=["distinct uom"],
 		as_list=1,
 	)
diff --git a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
index 5bb366a..046a599 100644
--- a/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/test_pricing_rule.py
@@ -103,8 +103,6 @@
 		self.assertEqual(details.get("discount_percentage"), 15)
 
 	def test_pricing_rule_for_margin(self):
-		from frappe import MandatoryError
-
 		from erpnext.stock.get_item_details import get_item_details
 
 		test_record = {
@@ -205,8 +203,6 @@
 		self.assertEqual(details.get("discount_percentage"), 10)
 
 	def test_pricing_rule_for_variants(self):
-		from frappe import MandatoryError
-
 		from erpnext.stock.get_item_details import get_item_details
 
 		if not frappe.db.exists("Item", "Test Variant PRT"):
@@ -1181,8 +1177,7 @@
 		"Pricing Rule Item Group",
 		"Pricing Rule Brand",
 	]:
-
-		frappe.db.sql("delete from `tab{0}`".format(doctype))
+		frappe.db.sql(f"delete from `tab{doctype}`")
 
 
 def make_item_price(item, price_list_name, item_price):
diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py
index 73c5d59..2144233 100644
--- a/erpnext/accounts/doctype/pricing_rule/utils.py
+++ b/erpnext/accounts/doctype/pricing_rule/utils.py
@@ -101,14 +101,12 @@
 	if not args.get(apply_on_field):
 		return []
 
-	child_doc = "`tabPricing Rule {0}`".format(apply_on)
+	child_doc = f"`tabPricing Rule {apply_on}`"
 
 	conditions = item_variant_condition = item_conditions = ""
 	values[apply_on_field] = args.get(apply_on_field)
 	if apply_on_field in ["item_code", "brand"]:
-		item_conditions = "{child_doc}.{apply_on_field}= %({apply_on_field})s".format(
-			child_doc=child_doc, apply_on_field=apply_on_field
-		)
+		item_conditions = f"{child_doc}.{apply_on_field}= %({apply_on_field})s"
 
 		if apply_on_field == "item_code":
 			if args.get("uom", None):
@@ -121,23 +119,19 @@
 				args.variant_of = frappe.get_cached_value("Item", args.item_code, "variant_of")
 
 			if args.variant_of:
-				item_variant_condition = " or {child_doc}.item_code=%(variant_of)s ".format(
-					child_doc=child_doc
-				)
+				item_variant_condition = f" or {child_doc}.item_code=%(variant_of)s "
 				values["variant_of"] = args.variant_of
 	elif apply_on_field == "item_group":
 		item_conditions = _get_tree_conditions(args, "Item Group", child_doc, False)
 		if args.get("uom", None):
-			item_conditions += (
-				" and ({child_doc}.uom='{item_uom}' or IFNULL({child_doc}.uom, '')='')".format(
-					child_doc=child_doc, item_uom=args.get("uom")
-				)
+			item_conditions += " and ({child_doc}.uom='{item_uom}' or IFNULL({child_doc}.uom, '')='')".format(
+				child_doc=child_doc, item_uom=args.get("uom")
 			)
 
 	conditions += get_other_conditions(conditions, values, args)
 	warehouse_conditions = _get_tree_conditions(args, "Warehouse", "`tabPricing Rule`")
 	if warehouse_conditions:
-		warehouse_conditions = " and {0}".format(warehouse_conditions)
+		warehouse_conditions = f" and {warehouse_conditions}"
 
 	if not args.price_list:
 		args.price_list = None
@@ -163,7 +157,7 @@
 				item_variant_condition=item_variant_condition,
 				transaction_type=args.transaction_type,
 				warehouse_cond=warehouse_conditions,
-				apply_on_other_field="other_{0}".format(apply_on_field),
+				apply_on_other_field=f"other_{apply_on_field}",
 				conditions=conditions,
 			),
 			values,
@@ -202,14 +196,13 @@
 			frappe.throw(_("Invalid {0}").format(args.get(field)))
 
 		parent_groups = frappe.db.sql_list(
-			"""select name from `tab%s`
-			where lft<=%s and rgt>=%s"""
-			% (parenttype, "%s", "%s"),
+			"""select name from `tab{}`
+			where lft<={} and rgt>={}""".format(parenttype, "%s", "%s"),
 			(lft, rgt),
 		)
 
 		if parenttype in ["Customer Group", "Item Group", "Territory"]:
-			parent_field = "parent_{0}".format(frappe.scrub(parenttype))
+			parent_field = f"parent_{frappe.scrub(parenttype)}"
 			root_name = frappe.db.get_list(
 				parenttype,
 				{"is_group": 1, parent_field: ("is", "not set")},
@@ -235,10 +228,10 @@
 def get_other_conditions(conditions, values, args):
 	for field in ["company", "customer", "supplier", "campaign", "sales_partner"]:
 		if args.get(field):
-			conditions += " and ifnull(`tabPricing Rule`.{0}, '') in (%({1})s, '')".format(field, field)
+			conditions += f" and ifnull(`tabPricing Rule`.{field}, '') in (%({field})s, '')"
 			values[field] = args.get(field)
 		else:
-			conditions += " and ifnull(`tabPricing Rule`.{0}, '') = ''".format(field)
+			conditions += f" and ifnull(`tabPricing Rule`.{field}, '') = ''"
 
 	for parenttype in ["Customer Group", "Territory", "Supplier Group"]:
 		group_condition = _get_tree_conditions(args, parenttype, "`tabPricing Rule`")
@@ -510,7 +503,7 @@
 		"transaction_date" if frappe.get_meta(doctype).has_field("transaction_date") else "posting_date"
 	)
 
-	child_doctype = "{0} Item".format(doctype)
+	child_doctype = f"{doctype} Item"
 	apply_on = frappe.scrub(pr_doc.get("apply_on"))
 
 	values = [pr_doc.valid_from, pr_doc.valid_upto]
@@ -520,9 +513,7 @@
 		warehouses = get_child_warehouses(pr_doc.warehouse)
 
 		condition += """ and `tab{child_doc}`.warehouse in ({warehouses})
-			""".format(
-			child_doc=child_doctype, warehouses=",".join(["%s"] * len(warehouses))
-		)
+			""".format(child_doc=child_doctype, warehouses=",".join(["%s"] * len(warehouses)))
 
 		values.extend(warehouses)
 
@@ -534,16 +525,14 @@
 		values.extend(items)
 
 	data_set = frappe.db.sql(
-		""" SELECT `tab{child_doc}`.stock_qty,
-			`tab{child_doc}`.amount
-		FROM `tab{child_doc}`, `tab{parent_doc}`
+		f""" SELECT `tab{child_doctype}`.stock_qty,
+			`tab{child_doctype}`.amount
+		FROM `tab{child_doctype}`, `tab{doctype}`
 		WHERE
-			`tab{child_doc}`.parent = `tab{parent_doc}`.name and `tab{parent_doc}`.{date_field}
-			between %s and %s and `tab{parent_doc}`.docstatus = 1
-			{condition} group by `tab{child_doc}`.name
-	""".format(
-			parent_doc=doctype, child_doc=child_doctype, condition=condition, date_field=date_field
-		),
+			`tab{child_doctype}`.parent = `tab{doctype}`.name and `tab{doctype}`.{date_field}
+			between %s and %s and `tab{doctype}`.docstatus = 1
+			{condition} group by `tab{child_doctype}`.name
+	""",
 		tuple(values),
 		as_dict=1,
 	)
@@ -562,11 +551,9 @@
 	conditions = get_other_conditions(conditions, values, doc)
 
 	pricing_rules = frappe.db.sql(
-		""" Select `tabPricing Rule`.* from `tabPricing Rule`
+		f""" Select `tabPricing Rule`.* from `tabPricing Rule`
 		where  {conditions} and `tabPricing Rule`.disable = 0
-	""".format(
-			conditions=conditions
-		),
+	""",
 		values,
 		as_dict=1,
 	)
@@ -591,7 +578,9 @@
 						continue
 
 					if (
-						d.validate_applied_rule and doc.get(field) is not None and doc.get(field) < d.get(pr_field)
+						d.validate_applied_rule
+						and doc.get(field) is not None
+						and doc.get(field) < d.get(pr_field)
 					):
 						frappe.msgprint(_("User has not applied rule on the invoice {0}").format(doc.name))
 					else:
@@ -660,9 +649,7 @@
 
 	qty = pricing_rule.free_qty or 1
 	if pricing_rule.is_recursive:
-		transaction_qty = (
-			args.get("qty") if args else doc.total_qty
-		) - pricing_rule.apply_recursion_over
+		transaction_qty = (args.get("qty") if args else doc.total_qty) - pricing_rule.apply_recursion_over
 		if transaction_qty:
 			qty = flt(transaction_qty) * qty / pricing_rule.recurse_for
 			if pricing_rule.round_free_qty:
diff --git a/erpnext/accounts/doctype/pricing_rule_brand/pricing_rule_brand.json b/erpnext/accounts/doctype/pricing_rule_brand/pricing_rule_brand.json
index b631ba3..67c0525 100644
--- a/erpnext/accounts/doctype/pricing_rule_brand/pricing_rule_brand.json
+++ b/erpnext/accounts/doctype/pricing_rule_brand/pricing_rule_brand.json
@@ -1,110 +1,41 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
+ "actions": [],
  "creation": "2019-03-24 14:48:59.649168",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "brand",
+  "uom"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "eval:parent.apply_on == 'Item Code'",
    "fieldname": "brand",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Brand",
-   "length": 0,
-   "no_copy": 0,
    "options": "Brand",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "uom",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "UOM",
-   "length": 0,
-   "no_copy": 0,
-   "options": "UOM",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "options": "UOM"
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
  "istable": 1,
- "max_attachments": 0,
- "modified": "2019-03-24 14:48:59.649168",
+ "links": [],
+ "modified": "2024-03-27 13:10:17.857046",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Pricing Rule Brand",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule_detail/pricing_rule_detail.json b/erpnext/accounts/doctype/pricing_rule_detail/pricing_rule_detail.json
index 196c5f4..b67bd78 100644
--- a/erpnext/accounts/doctype/pricing_rule_detail/pricing_rule_detail.json
+++ b/erpnext/accounts/doctype/pricing_rule_detail/pricing_rule_detail.json
@@ -1,237 +1,75 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2019-02-01 13:07:49.073255", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2019-02-01 13:07:49.073255",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "pricing_rule",
+  "item_code",
+  "margin_type",
+  "rate_or_discount",
+  "child_docname",
+  "rule_applied"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "pricing_rule", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Pricing Rule", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Pricing Rule", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "pricing_rule",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Pricing Rule",
+   "options": "Pricing Rule",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_code", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "item_code",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Item Code",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "margin_type", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Margin Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "margin_type",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Margin Type",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "rate_or_discount", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rate or Discount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "rate_or_discount",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Rate or Discount",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "child_docname", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Child Docname", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "child_docname",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Child Docname",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "1", 
-   "fieldname": "rule_applied", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Rule Applied", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "default": "1",
+   "fieldname": "rule_applied",
+   "fieldtype": "Check",
+   "label": "Rule Applied",
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2019-03-06 16:01:49.855764", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Pricing Rule Detail", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:17.968137",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Pricing Rule Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json b/erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json
index 80b204d..bebb313 100644
--- a/erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json
+++ b/erpnext/accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json
@@ -1,112 +1,41 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2019-03-24 14:48:59.649168", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2019-03-24 14:48:59.649168",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "item_code",
+  "uom"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:parent.apply_on == 'Item Code'", 
-   "fetch_if_empty": 0, 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:parent.apply_on == 'Item Code'",
+   "fieldname": "item_code",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Code",
+   "options": "Item",
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "uom",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "UOM",
+   "options": "UOM"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2019-03-25 14:05:41.504182", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Pricing Rule Item Code", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:18.103860",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Pricing Rule Item Code",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pricing_rule_item_group/pricing_rule_item_group.json b/erpnext/accounts/doctype/pricing_rule_item_group/pricing_rule_item_group.json
index 30027ba..a3ac162 100644
--- a/erpnext/accounts/doctype/pricing_rule_item_group/pricing_rule_item_group.json
+++ b/erpnext/accounts/doctype/pricing_rule_item_group/pricing_rule_item_group.json
@@ -1,110 +1,41 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
+ "actions": [],
  "creation": "2019-03-24 14:48:59.649168",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "item_group",
+  "uom"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "depends_on": "eval:parent.apply_on == 'Item Code'",
    "fieldname": "item_group",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Item Group",
-   "length": 0,
-   "no_copy": 0,
    "options": "Item Group",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 1,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "search_index": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "uom",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "UOM",
-   "length": 0,
-   "no_copy": 0,
-   "options": "UOM",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "options": "UOM"
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
  "istable": 1,
- "max_attachments": 0,
- "modified": "2019-03-24 14:48:59.649168",
+ "links": [],
+ "modified": "2024-03-27 13:10:18.221095",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Pricing Rule Item Group",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json b/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
index 457e98c..2461626 100644
--- a/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
+++ b/erpnext/accounts/doctype/process_deferred_accounting/process_deferred_accounting.json
@@ -77,7 +77,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2020-09-03 18:07:02.463754",
+ "modified": "2024-03-27 13:10:18.458661",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Deferred Accounting",
@@ -125,6 +125,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py b/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
index 263621d..fddd9f8 100644
--- a/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
+++ b/erpnext/accounts/doctype/process_deferred_accounting/test_process_deferred_accounting.py
@@ -40,7 +40,7 @@
 		si.save()
 		si.submit()
 
-		process_deferred_accounting = doc = frappe.get_doc(
+		process_deferred_accounting = frappe.get_doc(
 			dict(
 				doctype="Process Deferred Accounting",
 				posting_date="2023-07-01",
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
index 1a1ab4d..1d7e0b7 100644
--- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
@@ -146,7 +146,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-08-11 10:56:51.699137",
+ "modified": "2024-03-27 13:10:18.601732",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Payment Reconciliation",
@@ -176,7 +176,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "company"
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
index 761c2bc..068cb78 100644
--- a/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
+++ b/erpnext/accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py
@@ -66,9 +66,7 @@
 
 	def on_cancel(self):
 		self.db_set("status", "Cancelled")
-		log = frappe.db.get_value(
-			"Process Payment Reconciliation Log", filters={"process_pr": self.name}
-		)
+		log = frappe.db.get_value("Process Payment Reconciliation Log", filters={"process_pr": self.name})
 		if log:
 			frappe.db.set_value("Process Payment Reconciliation Log", log, "status", "Cancelled")
 
@@ -416,7 +414,6 @@
 					# If Payment Entry, update details only for newly linked references
 					# This is for performance
 					if allocations[0].reference_type == "Payment Entry":
-
 						references = [(x.invoice_type, x.invoice_number) for x in allocations]
 						pe = frappe.get_doc(allocations[0].reference_type, allocations[0].reference_name)
 						pe.flags.ignore_validate_update_after_submit = True
@@ -430,13 +427,14 @@
 
 					# Update reconciled count
 					reconciled_count = frappe.db.count(
-						"Process Payment Reconciliation Log Allocations", filters={"parent": log, "reconciled": True}
+						"Process Payment Reconciliation Log Allocations",
+						filters={"parent": log, "reconciled": True},
 					)
 					frappe.db.set_value(
 						"Process Payment Reconciliation Log", log, "reconciled_entries", reconciled_count
 					)
 
-				except Exception as err:
+				except Exception:
 					# Update the parent doc about the exception
 					frappe.db.rollback()
 
@@ -474,15 +472,12 @@
 						frappe.db.set_value("Process Payment Reconciliation Log", log, "reconciled", True)
 						frappe.db.set_value("Process Payment Reconciliation", doc, "status", "Completed")
 					else:
-
 						if frappe.db.get_value("Process Payment Reconciliation", doc, "status") != "Paused":
 							# trigger next batch in job
 							# generate reconcile job name
 							allocation = get_next_allocation(log)
 							if allocation:
-								reconcile_job_name = (
-									f"process_{doc}_reconcile_allocation_{allocation[0].idx}_{allocation[-1].idx}"
-								)
+								reconcile_job_name = f"process_{doc}_reconcile_allocation_{allocation[0].idx}_{allocation[-1].idx}"
 							else:
 								reconcile_job_name = f"process_{doc}_reconcile"
 
@@ -506,7 +501,7 @@
 def is_any_doc_running(for_filter: str | dict | None = None) -> str | None:
 	running_doc = None
 	if for_filter:
-		if type(for_filter) == str:
+		if isinstance(for_filter, str):
 			for_filter = frappe.json.loads(for_filter)
 
 		running_doc = frappe.db.get_value(
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
index b4ac981..fb7f59c 100644
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.json
@@ -110,7 +110,7 @@
  "in_create": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-11-02 11:32:12.254018",
+ "modified": "2024-03-27 13:10:18.769659",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Payment Reconciliation Log",
@@ -143,7 +143,7 @@
   }
  ],
  "search_fields": "allocated, reconciled, total_allocations, reconciled_entries",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.py b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.py
index 153fffc..80337e1 100644
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.py
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log/process_payment_reconciliation_log.py
@@ -24,9 +24,7 @@
 		process_pr: DF.Link
 		reconciled: DF.Check
 		reconciled_entries: DF.Int
-		status: DF.Literal[
-			"Running", "Paused", "Reconciled", "Partially Reconciled", "Failed", "Cancelled"
-		]
+		status: DF.Literal["Running", "Paused", "Reconciled", "Partially Reconciled", "Failed", "Cancelled"]
 		total_allocations: DF.Int
 	# end: auto-generated types
 
diff --git a/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json b/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
index b97d738..9c96721 100644
--- a/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
+++ b/erpnext/accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
@@ -157,13 +157,13 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-03-20 21:05:43.121945",
+ "modified": "2024-03-27 13:10:18.933928",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Payment Reconciliation Log Allocations",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
index ae6059c..387c963 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
@@ -386,7 +386,7 @@
   }
  ],
  "links": [],
- "modified": "2023-12-18 12:20:08.965120",
+ "modified": "2024-03-27 13:10:19.075913",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Statement Of Accounts",
@@ -418,7 +418,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
index f9d6136..c73c13e 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py
@@ -46,9 +46,7 @@
 		company: DF.Link
 		cost_center: DF.TableMultiSelect[PSOACostCenter]
 		currency: DF.Link | None
-		customer_collection: DF.Literal[
-			"", "Customer Group", "Territory", "Sales Partner", "Sales Person"
-		]
+		customer_collection: DF.Literal["", "Customer Group", "Territory", "Sales Partner", "Sales Person"]
 		customers: DF.Table[ProcessStatementOfAccountsCustomer]
 		enable_auto_email: DF.Check
 		filter_duration: DF.Int
@@ -406,9 +404,7 @@
 			{mcond}
 		ORDER BY
 			contact.creation desc
-		""".format(
-			mcond=get_match_cond("Contact")
-		),
+		""".format(mcond=get_match_cond("Contact")),
 		customer_name,
 	)
 
@@ -481,9 +477,7 @@
 			else:
 				new_to_date = add_months(new_to_date, 1 if doc.frequency == "Monthly" else 3)
 			new_from_date = add_months(new_to_date, -1 * doc.filter_duration)
-			doc.add_comment(
-				"Comment", "Emails sent on: " + frappe.utils.format_datetime(frappe.utils.now())
-			)
+			doc.add_comment("Comment", "Emails sent on: " + frappe.utils.format_datetime(frappe.utils.now()))
 			if doc.report == "General Ledger":
 				doc.db_set("to_date", new_to_date, commit=True)
 				doc.db_set("from_date", new_from_date, commit=True)
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py
index a3a74df..92dbb5e 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py
+++ b/erpnext/accounts/doctype/process_statement_of_accounts/test_process_statement_of_accounts.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
 from frappe.tests.utils import FrappeTestCase
diff --git a/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json b/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
index 1749d72..46b5b66 100644
--- a/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
+++ b/erpnext/accounts/doctype/process_statement_of_accounts_customer/process_statement_of_accounts_customer.json
@@ -41,14 +41,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-04-26 13:02:41.964499",
+ "modified": "2024-03-27 13:10:19.335889",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Statement Of Accounts Customer",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/process_subscription/process_subscription.json b/erpnext/accounts/doctype/process_subscription/process_subscription.json
index 502d002..c237c18 100644
--- a/erpnext/accounts/doctype/process_subscription/process_subscription.json
+++ b/erpnext/accounts/doctype/process_subscription/process_subscription.json
@@ -38,7 +38,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-09-17 17:33:37.974166",
+ "modified": "2024-03-27 13:10:19.450675",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Process Subscription",
@@ -84,7 +84,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/process_subscription/process_subscription.py b/erpnext/accounts/doctype/process_subscription/process_subscription.py
index b271e7c..b4d18a3 100644
--- a/erpnext/accounts/doctype/process_subscription/process_subscription.py
+++ b/erpnext/accounts/doctype/process_subscription/process_subscription.py
@@ -1,14 +1,11 @@
 # Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-from datetime import datetime
-from typing import Union
-
 import frappe
 from frappe.model.document import Document
 from frappe.utils import getdate
 
-from erpnext.accounts.doctype.subscription.subscription import process_all
+from erpnext.accounts.doctype.subscription.subscription import DateTimeLikeObject, process_all
 
 
 class ProcessSubscription(Document):
@@ -30,7 +27,7 @@
 
 
 def create_subscription_process(
-	subscription: str | None = None, posting_date: Union[str, datetime.date] | None = None
+	subscription: str | None = None, posting_date: DateTimeLikeObject | None = None
 ):
 	"""Create a new Process Subscription document"""
 	doc = frappe.new_doc("Process Subscription")
diff --git a/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json b/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
index 7fdfdcd..68cff61 100644
--- a/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
+++ b/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.json
@@ -278,7 +278,7 @@
   }
  ],
  "links": [],
- "modified": "2024-01-24 02:20:26.145996",
+ "modified": "2024-03-27 13:10:22.103686",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Promotional Scheme",
@@ -333,7 +333,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py b/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py
index a9c1900..ed4e3d2 100644
--- a/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py
+++ b/erpnext/accounts/doctype/promotional_scheme/promotional_scheme.py
@@ -169,9 +169,7 @@
 		docnames = frappe.get_all("Pricing Rule", filters={"promotional_scheme": self.name})
 
 		for docname in docnames:
-			if frappe.db.exists(
-				"Pricing Rule Detail", {"pricing_rule": docname.name, "docstatus": ("<", 2)}
-			):
+			if frappe.db.exists("Pricing Rule Detail", {"pricing_rule": docname.name, "docstatus": ("<", 2)}):
 				raise_for_transaction_exists(self.name)
 
 		if docnames and not transaction_exists:
@@ -246,7 +244,7 @@
 	args = get_args_for_pricing_rule(doc)
 	applicable_for = frappe.scrub(doc.get("applicable_for"))
 
-	for idx, d in enumerate(doc.get(child_doc)):
+	for _idx, d in enumerate(doc.get(child_doc)):
 		if d.name in rules:
 			if not args.get(applicable_for):
 				docname = get_pricing_rule_docname(d)
@@ -256,7 +254,14 @@
 				for applicable_for_value in args.get(applicable_for):
 					docname = get_pricing_rule_docname(d, applicable_for, applicable_for_value)
 					pr = prepare_pricing_rule(
-						args, doc, child_doc, discount_fields, d, docname, applicable_for, applicable_for_value
+						args,
+						doc,
+						child_doc,
+						discount_fields,
+						d,
+						docname,
+						applicable_for,
+						applicable_for_value,
 					)
 					new_doc.append(pr)
 
@@ -282,7 +287,7 @@
 
 
 def get_pricing_rule_docname(
-	row: dict, applicable_for: str = None, applicable_for_value: str = None
+	row: dict, applicable_for: str | None = None, applicable_for_value: str | None = None
 ) -> str:
 	fields = ["promotional_scheme_id", "name"]
 	filters = {"promotional_scheme_id": row.name}
diff --git a/erpnext/accounts/doctype/promotional_scheme_price_discount/promotional_scheme_price_discount.json b/erpnext/accounts/doctype/promotional_scheme_price_discount/promotional_scheme_price_discount.json
index aa3696d..f0bb30e 100644
--- a/erpnext/accounts/doctype/promotional_scheme_price_discount/promotional_scheme_price_discount.json
+++ b/erpnext/accounts/doctype/promotional_scheme_price_discount/promotional_scheme_price_discount.json
@@ -169,12 +169,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-11-16 00:25:33.843996",
+ "modified": "2024-03-27 13:10:22.448265",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Promotional Scheme Price Discount",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json b/erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
index 4e61d04..5b39440 100644
--- a/erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+++ b/erpnext/accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
@@ -186,13 +186,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-12 12:53:58.199108",
+ "modified": "2024-03-27 13:10:22.605892",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Promotional Scheme Product Discount",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
index e292b60..e3dd8f3 100644
--- a/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
+++ b/erpnext/accounts/doctype/psoa_cost_center/psoa_cost_center.json
@@ -17,14 +17,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-08-03 16:56:45.744905",
+ "modified": "2024-03-27 13:10:23.244686",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "PSOA Cost Center",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/psoa_project/psoa_project.json b/erpnext/accounts/doctype/psoa_project/psoa_project.json
index 20a03ee..92dae45 100644
--- a/erpnext/accounts/doctype/psoa_project/psoa_project.json
+++ b/erpnext/accounts/doctype/psoa_project/psoa_project.json
@@ -17,14 +17,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-08-03 16:53:39.219736",
+ "modified": "2024-03-27 13:10:23.351144",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "PSOA Project",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 44d3d48..5e070d0 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -443,7 +443,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Address",
    "read_only": 1
   },
@@ -489,7 +489,7 @@
   },
   {
    "fieldname": "shipping_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Shipping Address",
    "print_hide": 1,
    "read_only": 1
@@ -1363,7 +1363,7 @@
   },
   {
    "fieldname": "billing_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Billing Address",
    "read_only": 1
   },
@@ -1638,7 +1638,7 @@
  "idx": 204,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-20 15:57:00.736868",
+ "modified": "2024-03-27 13:10:23.476658",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice",
@@ -1695,7 +1695,7 @@
  ],
  "search_fields": "posting_date, supplier, bill_no, base_grand_total, outstanding_amount",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "supplier",
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index 19b7092..e224b59 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -82,7 +82,7 @@
 		)
 
 		additional_discount_percentage: DF.Float
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		advance_tax: DF.Table[AdvanceTax]
 		advances: DF.Table[PurchaseInvoiceAdvance]
 		against_expense_account: DF.SmallText | None
@@ -107,7 +107,7 @@
 		bill_date: DF.Date | None
 		bill_no: DF.Data | None
 		billing_address: DF.Link | None
-		billing_address_display: DF.SmallText | None
+		billing_address_display: DF.TextEditor | None
 		buying_price_list: DF.Link | None
 		cash_bank_account: DF.Link | None
 		clearance_date: DF.Date | None
@@ -174,7 +174,7 @@
 		set_posting_time: DF.Check
 		set_warehouse: DF.Link | None
 		shipping_address: DF.Link | None
-		shipping_address_display: DF.SmallText | None
+		shipping_address_display: DF.TextEditor | None
 		shipping_rule: DF.Link | None
 		status: DF.Literal[
 			"",
@@ -227,7 +227,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(PurchaseInvoice, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.status_updater = [
 			{
 				"source_dt": "Purchase Invoice Item",
@@ -244,7 +244,7 @@
 		]
 
 	def onload(self):
-		super(PurchaseInvoice, self).onload()
+		super().onload()
 		supplier_tds = frappe.db.get_value("Supplier", self.supplier, "tax_withholding_category")
 		self.set_onload("supplier_tds", supplier_tds)
 
@@ -264,7 +264,7 @@
 
 		self.validate_posting_time()
 
-		super(PurchaseInvoice, self).validate()
+		super().validate()
 
 		if not self.is_return:
 			self.po_required()
@@ -324,7 +324,6 @@
 		if flt(self.paid_amount) + flt(self.write_off_amount) - flt(
 			self.get("rounded_total") or self.grand_total
 		) > 1 / (10 ** (self.precision("base_grand_total") + 1)):
-
 			frappe.throw(_("""Paid amount + Write Off Amount can not be greater than Grand Total"""))
 
 	def create_remarks(self):
@@ -353,7 +352,7 @@
 			self.tax_withholding_category = tds_category
 			self.set_onload("supplier_tds", tds_category)
 
-		super(PurchaseInvoice, self).set_missing_values(for_validate)
+		super().set_missing_values(for_validate)
 
 	def validate_credit_to_acc(self):
 		if not self.credit_to:
@@ -392,7 +391,7 @@
 				check_on_hold_or_closed_status("Purchase Order", d.purchase_order)
 
 	def validate_with_previous_doc(self):
-		super(PurchaseInvoice, self).validate_with_previous_doc(
+		super().validate_with_previous_doc(
 			{
 				"Purchase Order": {
 					"ref_dn_field": "purchase_order",
@@ -440,7 +439,7 @@
 						exc=WarehouseMissingError,
 					)
 
-		super(PurchaseInvoice, self).validate_warehouse()
+		super().validate_warehouse()
 
 	def validate_item_code(self):
 		for d in self.get("items"):
@@ -476,7 +475,6 @@
 					or not frappe.db.get_value("Purchase Order Item", item.po_detail, "delivered_by_supplier")
 				)
 			):
-
 				if self.update_stock and item.warehouse and (not item.from_warehouse):
 					if (
 						for_validate
@@ -504,12 +502,16 @@
 
 						if negative_expense_booked_in_pr:
 							if (
-								for_validate and item.expense_account and item.expense_account != stock_not_billed_account
+								for_validate
+								and item.expense_account
+								and item.expense_account != stock_not_billed_account
 							):
 								msg = _(
 									"Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
 								).format(
-									item.idx, frappe.bold(stock_not_billed_account), frappe.bold(item.purchase_receipt)
+									item.idx,
+									frappe.bold(stock_not_billed_account),
+									frappe.bold(item.purchase_receipt),
 								)
 								frappe.msgprint(msg, title=_("Expense Head Changed"))
 
@@ -518,7 +520,9 @@
 						# If no purchase receipt present then book expense in 'Stock Received But Not Billed'
 						# This is done in cases when Purchase Invoice is created before Purchase Receipt
 						if (
-							for_validate and item.expense_account and item.expense_account != stock_not_billed_account
+							for_validate
+							and item.expense_account
+							and item.expense_account != stock_not_billed_account
 						):
 							msg = _(
 								"Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
@@ -569,7 +573,6 @@
 
 	def po_required(self):
 		if frappe.db.get_single_value("Buying Settings", "po_required") == "Yes":
-
 			if frappe.get_value(
 				"Supplier", self.supplier, "allow_purchase_invoice_creation_without_purchase_order"
 			):
@@ -579,7 +582,9 @@
 				if not d.purchase_order:
 					msg = _("Purchase Order Required for item {}").format(frappe.bold(d.item_code))
 					msg += "<br><br>"
-					msg += _("To submit the invoice without purchase order please set {0} as {1} in {2}").format(
+					msg += _(
+						"To submit the invoice without purchase order please set {0} as {1} in {2}"
+					).format(
 						frappe.bold(_("Purchase Order Required")),
 						frappe.bold("No"),
 						get_link_to_form("Buying Settings", "Buying Settings", "Buying Settings"),
@@ -589,7 +594,6 @@
 	def pr_required(self):
 		stock_items = self.get_stock_items()
 		if frappe.db.get_single_value("Buying Settings", "pr_required") == "Yes":
-
 			if frappe.get_value(
 				"Supplier", self.supplier, "allow_purchase_invoice_creation_without_purchase_receipt"
 			):
@@ -622,7 +626,8 @@
 					frappe.throw(_("Purchase Order {0} is not submitted").format(d.purchase_order))
 			if d.purchase_receipt:
 				submitted = frappe.db.sql(
-					"select name from `tabPurchase Receipt` where docstatus = 1 and name = %s", d.purchase_receipt
+					"select name from `tabPurchase Receipt` where docstatus = 1 and name = %s",
+					d.purchase_receipt,
 				)
 				if not submitted:
 					frappe.throw(_("Purchase Receipt {0} is not submitted").format(d.purchase_receipt))
@@ -670,7 +675,9 @@
 			for item in self.get("items"):
 				if item.purchase_receipt:
 					frappe.throw(
-						_("Stock cannot be updated against Purchase Receipt {0}").format(item.purchase_receipt)
+						_("Stock cannot be updated against Purchase Receipt {0}").format(
+							item.purchase_receipt
+						)
 					)
 
 	def validate_for_repost(self):
@@ -680,7 +687,7 @@
 		validate_docs_for_deferred_accounting([], [self.name])
 
 	def on_submit(self):
-		super(PurchaseInvoice, self).on_submit()
+		super().on_submit()
 
 		self.check_prev_docstatus()
 
@@ -717,9 +724,7 @@
 		if self.update_stock == 1:
 			self.repost_future_sle_and_gle()
 
-		if (
-			frappe.db.get_single_value("Buying Settings", "project_update_frequency") == "Each Transaction"
-		):
+		if frappe.db.get_single_value("Buying Settings", "project_update_frequency") == "Each Transaction":
 			self.update_project()
 
 		update_linked_doc(self.doctype, self.name, self.inter_company_invoice_reference)
@@ -911,7 +916,7 @@
 			if flt(item.base_net_amount):
 				account_currency = get_account_currency(item.expense_account)
 				if item.item_code:
-					asset_category = frappe.get_cached_value("Item", item.item_code, "asset_category")
+					frappe.get_cached_value("Item", item.item_code, "asset_category")
 
 				if (
 					self.update_stock
@@ -1016,7 +1021,9 @@
 					if flt(item.rm_supp_cost):
 						supplier_warehouse_account = warehouse_account[self.supplier_warehouse]["account"]
 						if not supplier_warehouse_account:
-							frappe.throw(_("Please set account in Warehouse {0}").format(self.supplier_warehouse))
+							frappe.throw(
+								_("Please set account in Warehouse {0}").format(self.supplier_warehouse)
+							)
 						gl_entries.append(
 							self.get_gl_dict(
 								{
@@ -1066,10 +1073,9 @@
 								and self.conversion_rate != exchange_rate_map[item.purchase_receipt]
 								and item.net_rate == net_rate_map[item.pr_detail]
 							):
-
-								discrepancy_caused_by_exchange_rate_difference = (item.qty * item.net_rate) * (
-									exchange_rate_map[item.purchase_receipt] - self.conversion_rate
-								)
+								discrepancy_caused_by_exchange_rate_difference = (
+									item.qty * item.net_rate
+								) * (exchange_rate_map[item.purchase_receipt] - self.conversion_rate)
 
 								gl_entries.append(
 									self.get_gl_dict(
@@ -1111,7 +1117,7 @@
 						(item.purchase_receipt, valuation_tax_accounts),
 					)
 
-					stock_rbnb = (
+					(
 						self.get_company_default("asset_received_but_not_billed")
 						if item.is_fixed_asset
 						else self.stock_received_but_not_billed
@@ -1150,7 +1156,9 @@
 		default_provisional_account = self.get_company_default("default_provisional_account")
 		provisional_accounts = set(
 			[
-				d.provisional_expense_account if d.provisional_expense_account else default_provisional_account
+				d.provisional_expense_account
+				if d.provisional_expense_account
+				else default_provisional_account
 				for d in pr_items
 			]
 		)
@@ -1207,9 +1215,7 @@
 				},
 			)
 
-	def make_stock_adjustment_entry(
-		self, gl_entries, item, voucher_wise_stock_value, account_currency
-	):
+	def make_stock_adjustment_entry(self, gl_entries, item, voucher_wise_stock_value, account_currency):
 		net_amt_precision = item.precision("base_net_amount")
 		val_rate_db_precision = 6 if cint(item.precision("valuation_rate")) <= 6 else 9
 
@@ -1225,7 +1231,6 @@
 			and warehouse_debit_amount
 			!= flt(voucher_wise_stock_value.get((item.name, item.warehouse)), net_amt_precision)
 		):
-
 			cost_of_goods_sold_account = self.get_company_default("default_expense_account")
 			stock_amount = flt(voucher_wise_stock_value.get((item.name, item.warehouse)), net_amt_precision)
 			stock_adjustment_amt = warehouse_debit_amount - stock_amount
@@ -1448,9 +1453,7 @@
 		# base_rounding_adjustment may become zero due to small precision
 		# eg: rounding_adjustment = 0.01 and exchange rate = 0.05 and precision of base_rounding_adjustment is 2
 		# 	then base_rounding_adjustment becomes zero and error is thrown in GL Entry
-		if (
-			not self.is_internal_transfer() and self.rounding_adjustment and self.base_rounding_adjustment
-		):
+		if not self.is_internal_transfer() and self.rounding_adjustment and self.base_rounding_adjustment:
 			round_off_account, round_off_cost_center = get_round_off_account_and_cost_center(
 				self.company, "Purchase Invoice", self.name, self.use_company_roundoff_cost_center
 			)
@@ -1473,7 +1476,7 @@
 	def on_cancel(self):
 		check_if_return_invoice_linked_with_payment_entry(self)
 
-		super(PurchaseInvoice, self).on_cancel()
+		super().on_cancel()
 
 		self.check_on_hold_or_closed_status()
 
@@ -1504,9 +1507,7 @@
 		if self.update_stock == 1:
 			self.repost_future_sle_and_gle()
 
-		if (
-			frappe.db.get_single_value("Buying Settings", "project_update_frequency") == "Each Transaction"
-		):
+		if frappe.db.get_single_value("Buying Settings", "project_update_frequency") == "Each Transaction":
 			self.update_project()
 		self.db_set("status", "Cancelled")
 
@@ -1538,9 +1539,7 @@
 
 		pj = frappe.qb.DocType("Project")
 		for proj, value in projects.items():
-			res = (
-				frappe.qb.from_(pj).select(pj.total_purchase_cost).where(pj.name == proj).for_update().run()
-			)
+			res = frappe.qb.from_(pj).select(pj.total_purchase_cost).where(pj.name == proj).for_update().run()
 			current_purchase_cost = res and res[0][0] or 0
 			frappe.db.set_value("Project", proj, "total_purchase_cost", current_purchase_cost + value)
 
@@ -1808,9 +1807,7 @@
 	)
 
 	net_rate_map = frappe._dict(
-		frappe.get_all(
-			child_doctype, filters={"name": ("in", items)}, fields=["name", "net_rate"], as_list=1
-		)
+		frappe.get_all(child_doctype, filters={"name": ("in", items)}, fields=["name", "net_rate"], as_list=1)
 	)
 
 	return exchange_rate_map, net_rate_map
diff --git a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
index 2ef0275..6f7ab21 100644
--- a/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
@@ -2,8 +2,6 @@
 # License: GNU General Public License v3. See license.txt
 
 
-import unittest
-
 import frappe
 from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils import add_days, cint, flt, getdate, nowdate, today
@@ -233,7 +231,7 @@
 
 				supplier.on_hold = 0
 				supplier.save()
-			except:
+			except Exception:
 				pass
 			else:
 				raise Exception
@@ -267,7 +265,6 @@
 		self.assertEqual(pi.on_hold, 0)
 
 	def test_gl_entries_with_perpetual_inventory_against_pr(self):
-
 		pr = make_purchase_receipt(
 			company="_Test Company with perpetual inventory",
 			supplier_warehouse="Work In Progress - TCP1",
@@ -318,7 +315,7 @@
 			]
 		)
 
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account][0], gle.account)
 			self.assertEqual(expected_values[gle.account][1], gle.debit)
 			self.assertEqual(expected_values[gle.account][2], gle.credit)
@@ -342,9 +339,7 @@
 		pi.submit()
 
 		# Get exchnage gain and loss account
-		exchange_gain_loss_account = frappe.db.get_value(
-			"Company", pi.company, "exchange_gain_loss_account"
-		)
+		exchange_gain_loss_account = frappe.db.get_value("Company", pi.company, "exchange_gain_loss_account")
 
 		# fetching the latest GL Entry with exchange gain and loss account account
 		amount = frappe.db.get_value(
@@ -560,12 +555,10 @@
 			project = frappe.get_doc("Project", {"project_name": "_Test Project for Purchase"})
 
 		existing_purchase_cost = frappe.db.sql(
-			"""select sum(base_net_amount)
+			f"""select sum(base_net_amount)
 			from `tabPurchase Invoice Item`
-			where project = '{0}'
-			and docstatus=1""".format(
-				project.name
-			)
+			where project = '{project.name}'
+			and docstatus=1"""
 		)
 		existing_purchase_cost = existing_purchase_cost and existing_purchase_cost[0][0] or 0
 
@@ -740,7 +733,7 @@
 			"credit",
 			"credit_in_account_currency",
 		):
-			for i, gle in enumerate(gl_entries):
+			for _i, gle in enumerate(gl_entries):
 				self.assertEqual(expected_values[gle.account][field], gle[field])
 
 		# Check for valid currency
@@ -762,7 +755,6 @@
 		self.assertFalse(gle)
 
 	def test_purchase_invoice_update_stock_gl_entry_with_perpetual_inventory(self):
-
 		pi = make_purchase_invoice(
 			update_stock=1,
 			posting_date=frappe.utils.nowdate(),
@@ -791,13 +783,12 @@
 			(d[0], d) for d in [[pi.credit_to, 0.0, 250.0], [stock_in_hand_account, 250.0, 0.0]]
 		)
 
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_gl_entries[gle.account][0], gle.account)
 			self.assertEqual(expected_gl_entries[gle.account][1], gle.debit)
 			self.assertEqual(expected_gl_entries[gle.account][2], gle.credit)
 
 	def test_purchase_invoice_for_is_paid_and_update_stock_gl_entry_with_perpetual_inventory(self):
-
 		pi = make_purchase_invoice(
 			update_stock=1,
 			posting_date=frappe.utils.nowdate(),
@@ -832,7 +823,7 @@
 			]
 		)
 
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_gl_entries[gle.account][0], gle.account)
 			self.assertEqual(expected_gl_entries[gle.account][1], gle.debit)
 			self.assertEqual(expected_gl_entries[gle.account][2], gle.credit)
@@ -904,9 +895,9 @@
 		pi.load_from_db()
 
 		serial_no = get_serial_nos_from_bundle(pi.get("items")[0].serial_and_batch_bundle)[0]
-		rejected_serial_no = get_serial_nos_from_bundle(
-			pi.get("items")[0].rejected_serial_and_batch_bundle
-		)[0]
+		rejected_serial_no = get_serial_nos_from_bundle(pi.get("items")[0].rejected_serial_and_batch_bundle)[
+			0
+		]
 
 		self.assertEqual(
 			frappe.db.get_value("Serial No", serial_no, "warehouse"),
@@ -1036,12 +1027,8 @@
 
 	def test_duplicate_due_date_in_terms(self):
 		pi = make_purchase_invoice(do_not_save=1)
-		pi.append(
-			"payment_schedule", dict(due_date="2017-01-01", invoice_portion=50.00, payment_amount=50)
-		)
-		pi.append(
-			"payment_schedule", dict(due_date="2017-01-01", invoice_portion=50.00, payment_amount=50)
-		)
+		pi.append("payment_schedule", dict(due_date="2017-01-01", invoice_portion=50.00, payment_amount=50))
+		pi.append("payment_schedule", dict(due_date="2017-01-01", invoice_portion=50.00, payment_amount=50))
 
 		self.assertRaises(frappe.ValidationError, pi.insert)
 
@@ -1079,9 +1066,7 @@
 		cost_center = "_Test Cost Center for BS Account - _TC"
 		create_cost_center(cost_center_name="_Test Cost Center for BS Account", company="_Test Company")
 
-		pi = make_purchase_invoice_against_cost_center(
-			cost_center=cost_center, credit_to="Creditors - _TC"
-		)
+		pi = make_purchase_invoice_against_cost_center(cost_center=cost_center, credit_to="Creditors - _TC")
 		self.assertEqual(pi.cost_center, cost_center)
 
 		expected_values = {
@@ -1541,9 +1526,7 @@
 	def test_provisional_accounting_entry(self):
 		setup_provisional_accounting()
 
-		pr = make_purchase_receipt(
-			item_code="_Test Non Stock Item", posting_date=add_days(nowdate(), -2)
-		)
+		pr = make_purchase_receipt(item_code="_Test Non Stock Item", posting_date=add_days(nowdate(), -2))
 
 		pi = create_purchase_invoice_from_receipt(pr.name)
 		pi.set_posting_time = 1
@@ -1552,7 +1535,7 @@
 		pi.save()
 		pi.submit()
 
-		self.assertEquals(pr.items[0].provisional_expense_account, "Provision Account - _TC")
+		self.assertEqual(pr.items[0].provisional_expense_account, "Provision Account - _TC")
 
 		# Check GLE for Purchase Invoice
 		expected_gle = [
@@ -1579,9 +1562,7 @@
 			["_Test Account Cost for Goods Sold - _TC", 250, 0, pi.posting_date],
 		]
 
-		check_gl_entries(
-			self, pr.name, expected_gle_for_purchase_receipt_post_pi_cancel, pr.posting_date
-		)
+		check_gl_entries(self, pr.name, expected_gle_for_purchase_receipt_post_pi_cancel, pr.posting_date)
 
 		toggle_provisional_accounting_setting()
 
@@ -1630,9 +1611,7 @@
 			["_Test Account Cost for Goods Sold - _TC", 5000, 0, pi.posting_date],
 		]
 
-		check_gl_entries(
-			self, pr.name, expected_gle_for_purchase_receipt_post_pi_cancel, pr.posting_date
-		)
+		check_gl_entries(self, pr.name, expected_gle_for_purchase_receipt_post_pi_cancel, pr.posting_date)
 
 		toggle_provisional_accounting_setting()
 
@@ -1678,9 +1657,7 @@
 	def test_adjust_incoming_rate(self):
 		frappe.db.set_single_value("Buying Settings", "maintain_same_rate", 0)
 
-		frappe.db.set_single_value(
-			"Buying Settings", "set_landed_cost_based_on_purchase_invoice_rate", 1
-		)
+		frappe.db.set_single_value("Buying Settings", "set_landed_cost_based_on_purchase_invoice_rate", 1)
 
 		# Increase the cost of the item
 
@@ -1732,9 +1709,7 @@
 		)
 		self.assertEqual(stock_value_difference, 50)
 
-		frappe.db.set_single_value(
-			"Buying Settings", "set_landed_cost_based_on_purchase_invoice_rate", 0
-		)
+		frappe.db.set_single_value("Buying Settings", "set_landed_cost_based_on_purchase_invoice_rate", 0)
 
 		# Don't adjust incoming rate
 
@@ -1764,7 +1739,6 @@
 		frappe.db.set_single_value("Buying Settings", "maintain_same_rate", 1)
 
 	def test_item_less_defaults(self):
-
 		pi = frappe.new_doc("Purchase Invoice")
 		pi.supplier = "_Test Supplier"
 		pi.company = "_Test Company"
@@ -2301,7 +2275,7 @@
 	pi.cost_center = args.parent_cost_center
 
 	bundle_id = None
-	if not args.use_serial_batch_fields and ((args.get("batch_no") or args.get("serial_no"))):
+	if not args.use_serial_batch_fields and (args.get("batch_no") or args.get("serial_no")):
 		batches = {}
 		qty = args.qty if args.qty is not None else 5
 		item_code = args.item or args.item_code or "_Test Item"
@@ -2450,9 +2424,7 @@
 		parent_account=args.parent_account or "Current Liabilities - _TC",
 		company=company,
 	)
-	toggle_provisional_accounting_setting(
-		enable=1, company=company, provisional_account=provisional_account
-	)
+	toggle_provisional_accounting_setting(enable=1, company=company, provisional_account=provisional_account)
 
 
 def toggle_provisional_accounting_setting(**args):
diff --git a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
index 4db531e..f01060f 100644
--- a/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
+++ b/erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
@@ -117,14 +117,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-06-23 21:13:18.013816",
+ "modified": "2024-03-27 13:10:24.072896",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice Advance",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index 66df76a..d0cef85 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -939,14 +939,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-19 19:09:47.210965",
+ "modified": "2024-03-27 13:10:24.204495",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Invoice Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
index adab54b..87f666b 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
@@ -230,13 +230,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-01-14 10:04:36.618240",
+ "modified": "2024-03-27 13:10:26.775139",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Taxes and Charges",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
index 2ff6a45..12443c0 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
@@ -77,7 +77,7 @@
  "icon": "fa fa-money",
  "idx": 1,
  "links": [],
- "modified": "2024-01-30 13:08:09.537242",
+ "modified": "2024-03-27 13:10:26.945131",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Purchase Taxes and Charges Template",
@@ -107,7 +107,7 @@
   }
  ],
  "show_title_field_in_link": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title",
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.py b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.py
index 16c30c5..4c8504b 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.py
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.py
@@ -37,4 +37,4 @@
 	def autoname(self):
 		if self.company and self.title:
 			abbr = frappe.get_cached_value("Company", self.company, "abbr")
-			self.name = "{0} - {1}".format(self.title, abbr)
+			self.name = f"{self.title} - {abbr}"
diff --git a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
index 5b7cd2b..38163a8 100644
--- a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
+++ b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
@@ -55,7 +55,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-09-26 14:21:27.362567",
+ "modified": "2024-03-27 13:10:32.013542",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Repost Accounting Ledger",
@@ -75,7 +75,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py
index b050bc8..6bc1922 100644
--- a/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py
+++ b/erpnext/accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py
@@ -27,7 +27,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(RepostAccountingLedger, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self._allowed_types = get_allowed_types_from_settings()
 
 	def validate(self):
@@ -154,7 +154,9 @@
 				doc = frappe.get_doc(x.voucher_type, x.voucher_no)
 
 				if repost_doc.delete_cancelled_entries:
-					frappe.db.delete("GL Entry", filters={"voucher_type": doc.doctype, "voucher_no": doc.name})
+					frappe.db.delete(
+						"GL Entry", filters={"voucher_type": doc.doctype, "voucher_no": doc.name}
+					)
 					frappe.db.delete(
 						"Payment Ledger Entry", filters={"voucher_type": doc.doctype, "voucher_no": doc.name}
 					)
@@ -200,7 +202,9 @@
 	if docs_with_deferred_revenue or docs_with_deferred_expense:
 		frappe.throw(
 			_("Documents: {0} have deferred revenue/expense enabled for them. Cannot repost.").format(
-				frappe.bold(comma_and([x[0] for x in docs_with_deferred_expense + docs_with_deferred_revenue]))
+				frappe.bold(
+					comma_and([x[0] for x in docs_with_deferred_expense + docs_with_deferred_revenue])
+				)
 			)
 		)
 
diff --git a/erpnext/accounts/doctype/repost_accounting_ledger/test_repost_accounting_ledger.py b/erpnext/accounts/doctype/repost_accounting_ledger/test_repost_accounting_ledger.py
index d6f7096..f631ef4 100644
--- a/erpnext/accounts/doctype/repost_accounting_ledger/test_repost_accounting_ledger.py
+++ b/erpnext/accounts/doctype/repost_accounting_ledger/test_repost_accounting_ledger.py
@@ -9,7 +9,6 @@
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request
-from erpnext.accounts.doctype.repost_accounting_ledger.repost_accounting_ledger import start_repost
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
 from erpnext.accounts.utils import get_fiscal_year
diff --git a/erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json b/erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json
index 4a2041f..fd5bb92 100644
--- a/erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json
+++ b/erpnext/accounts/doctype/repost_accounting_ledger_items/repost_accounting_ledger_items.json
@@ -28,13 +28,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-07-04 14:15:51.165584",
+ "modified": "2024-03-27 13:10:32.170897",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Repost Accounting Ledger Items",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json b/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json
index 8aa0a84..7cf5284 100644
--- a/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json
+++ b/erpnext/accounts/doctype/repost_accounting_ledger_settings/repost_accounting_ledger_settings.json
@@ -17,7 +17,7 @@
  "in_create": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-11-07 14:24:13.321522",
+ "modified": "2024-03-27 13:10:32.287007",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Repost Accounting Ledger Settings",
@@ -39,7 +39,7 @@
    "select": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/repost_allowed_types/repost_allowed_types.json b/erpnext/accounts/doctype/repost_allowed_types/repost_allowed_types.json
index ede12fb..cb7e6ba 100644
--- a/erpnext/accounts/doctype/repost_allowed_types/repost_allowed_types.json
+++ b/erpnext/accounts/doctype/repost_allowed_types/repost_allowed_types.json
@@ -33,13 +33,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-11-07 10:01:39.217861",
+ "modified": "2024-03-27 13:10:32.415806",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Repost Allowed Types",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json
index ed8d395..91271b2 100644
--- a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json
+++ b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.json
@@ -99,7 +99,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-09-26 14:21:35.719727",
+ "modified": "2024-03-27 13:10:32.740806",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Repost Payment Ledger",
@@ -153,7 +153,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.py b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.py
index 2d10f7c..6b90300 100644
--- a/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.py
+++ b/erpnext/accounts/doctype/repost_payment_ledger/repost_payment_ledger.py
@@ -40,7 +40,7 @@
 
 				frappe.db.set_value(repost_doc.doctype, repost_doc.name, "repost_error_log", "")
 				frappe.db.set_value(repost_doc.doctype, repost_doc.name, "repost_status", "Completed")
-			except Exception as e:
+			except Exception:
 				frappe.db.rollback()
 
 				traceback = frappe.get_traceback(with_context=True)
@@ -75,7 +75,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(RepostPaymentLedger, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.vouchers = []
 
 	def before_validate(self):
diff --git a/erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json b/erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json
index 93005ee..9eed9b4 100644
--- a/erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json
+++ b/erpnext/accounts/doctype/repost_payment_ledger_items/repost_payment_ledger_items.json
@@ -23,13 +23,13 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-10-28 14:47:11.838109",
+ "modified": "2024-03-27 13:10:32.915489",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Repost Payment Ledger Items",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index cffb097..91ea502 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -495,7 +495,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "hide_days": 1,
    "hide_seconds": 1,
    "label": "Address",
@@ -566,7 +566,7 @@
   },
   {
    "fieldname": "shipping_address",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "hide_days": 1,
    "hide_seconds": 1,
    "label": "Shipping Address",
@@ -584,7 +584,7 @@
   },
   {
    "fieldname": "company_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "hide_days": 1,
    "hide_seconds": 1,
    "label": "Company Address",
@@ -1999,7 +1999,7 @@
   {
    "allow_on_submit": 1,
    "fieldname": "dispatch_address",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Dispatch Address",
    "read_only": 1
   },
@@ -2201,7 +2201,7 @@
    "link_fieldname": "consolidated_invoice"
   }
  ],
- "modified": "2024-03-22 17:50:34.395602",
+ "modified": "2024-03-27 13:10:35.407256",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice",
@@ -2249,7 +2249,7 @@
  "quick_entry": 1,
  "search_fields": "posting_date, due_date, customer, base_grand_total, outstanding_amount",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "customer",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index aa0048d..3ccaba9 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -77,7 +77,7 @@
 		account_for_change_amount: DF.Link | None
 		additional_discount_account: DF.Link | None
 		additional_discount_percentage: DF.Float
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		advances: DF.Table[SalesInvoiceAdvance]
 		against_income_account: DF.SmallText | None
 		allocate_advances_automatically: DF.Check
@@ -102,7 +102,7 @@
 		commission_rate: DF.Float
 		company: DF.Link
 		company_address: DF.Link | None
-		company_address_display: DF.SmallText | None
+		company_address_display: DF.TextEditor | None
 		company_tax_id: DF.Data | None
 		contact_display: DF.SmallText | None
 		contact_email: DF.Data | None
@@ -119,7 +119,7 @@
 		debit_to: DF.Link
 		disable_rounded_total: DF.Check
 		discount_amount: DF.Currency
-		dispatch_address: DF.SmallText | None
+		dispatch_address: DF.TextEditor | None
 		dispatch_address_name: DF.Link | None
 		dont_create_loyalty_points: DF.Check
 		due_date: DF.Date | None
@@ -183,7 +183,7 @@
 		set_posting_time: DF.Check
 		set_target_warehouse: DF.Link | None
 		set_warehouse: DF.Link | None
-		shipping_address: DF.SmallText | None
+		shipping_address: DF.TextEditor | None
 		shipping_address_name: DF.Link | None
 		shipping_rule: DF.Link | None
 		source: DF.Link | None
@@ -235,7 +235,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(SalesInvoice, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.status_updater = [
 			{
 				"source_dt": "Sales Invoice Item",
@@ -272,7 +272,7 @@
 			self.indicator_title = _("Paid")
 
 	def validate(self):
-		super(SalesInvoice, self).validate()
+		super().validate()
 		self.validate_auto_set_posting_time()
 
 		if not (self.is_pos or self.is_debit_note):
@@ -475,9 +475,7 @@
 
 		self.update_time_sheet(self.name)
 
-		if (
-			frappe.db.get_single_value("Selling Settings", "sales_update_frequency") == "Each Transaction"
-		):
+		if frappe.db.get_single_value("Selling Settings", "sales_update_frequency") == "Each Transaction":
 			update_company_current_month_sales(self.company)
 			self.update_project()
 		update_linked_doc(self.doctype, self.name, self.inter_company_invoice_reference)
@@ -493,9 +491,7 @@
 			and not self.dont_create_loyalty_points
 		):
 			self.make_loyalty_point_entry()
-		elif (
-			self.is_return and self.return_against and not self.is_consolidated and self.loyalty_program
-		):
+		elif self.is_return and self.return_against and not self.is_consolidated and self.loyalty_program:
 			against_si_doc = frappe.get_doc("Sales Invoice", self.return_against)
 			against_si_doc.delete_loyalty_point_entry()
 			against_si_doc.make_loyalty_point_entry()
@@ -524,11 +520,11 @@
 	def check_if_consolidated_invoice(self):
 		# since POS Invoice extends Sales Invoice, we explicitly check if doctype is Sales Invoice
 		if self.doctype == "Sales Invoice" and self.is_consolidated:
-			invoice_or_credit_note = (
-				"consolidated_credit_note" if self.is_return else "consolidated_invoice"
-			)
+			invoice_or_credit_note = "consolidated_credit_note" if self.is_return else "consolidated_invoice"
 			pos_closing_entry = frappe.get_all(
-				"POS Invoice Merge Log", filters={invoice_or_credit_note: self.name}, pluck="pos_closing_entry"
+				"POS Invoice Merge Log",
+				filters={invoice_or_credit_note: self.name},
+				pluck="pos_closing_entry",
 			)
 			if pos_closing_entry and pos_closing_entry[0]:
 				msg = _("To cancel a {} you need to cancel the POS Closing Entry {}.").format(
@@ -540,13 +536,13 @@
 	def before_cancel(self):
 		self.check_if_consolidated_invoice()
 
-		super(SalesInvoice, self).before_cancel()
+		super().before_cancel()
 		self.update_time_sheet(None)
 
 	def on_cancel(self):
 		check_if_return_invoice_linked_with_payment_entry(self)
 
-		super(SalesInvoice, self).on_cancel()
+		super().on_cancel()
 
 		self.check_sales_order_on_hold_or_close("sales_order")
 
@@ -578,16 +574,12 @@
 		if self.coupon_code:
 			update_coupon_code_count(self.coupon_code, "cancelled")
 
-		if (
-			frappe.db.get_single_value("Selling Settings", "sales_update_frequency") == "Each Transaction"
-		):
+		if frappe.db.get_single_value("Selling Settings", "sales_update_frequency") == "Each Transaction":
 			update_company_current_month_sales(self.company)
 			self.update_project()
 		if not self.is_return and not self.is_consolidated and self.loyalty_program:
 			self.delete_loyalty_point_entry()
-		elif (
-			self.is_return and self.return_against and not self.is_consolidated and self.loyalty_program
-		):
+		elif self.is_return and self.return_against and not self.is_consolidated and self.loyalty_program:
 			against_si_doc = frappe.get_doc("Sales Invoice", self.return_against)
 			against_si_doc.delete_loyalty_point_entry()
 			against_si_doc.make_loyalty_point_entry()
@@ -694,7 +686,7 @@
 		if not self.due_date and self.customer:
 			self.due_date = get_due_date(self.posting_date, "Customer", self.customer, self.company)
 
-		super(SalesInvoice, self).set_missing_values(for_validate)
+		super().set_missing_values(for_validate)
 
 		print_format = pos.get("print_format") if pos else None
 		if not print_format and not cint(frappe.db.get_value("Print Format", "POS Invoice", "disabled")):
@@ -885,7 +877,8 @@
 
 		if account.report_type != "Balance Sheet":
 			msg = (
-				_("Please ensure {} account is a Balance Sheet account.").format(frappe.bold("Debit To")) + " "
+				_("Please ensure {} account is a Balance Sheet account.").format(frappe.bold("Debit To"))
+				+ " "
 			)
 			msg += _(
 				"You can change the parent account to a Balance Sheet account or select a different account."
@@ -914,11 +907,16 @@
 		)
 
 	def validate_with_previous_doc(self):
-		super(SalesInvoice, self).validate_with_previous_doc(
+		super().validate_with_previous_doc(
 			{
 				"Sales Order": {
 					"ref_dn_field": "sales_order",
-					"compare_fields": [["customer", "="], ["company", "="], ["project", "="], ["currency", "="]],
+					"compare_fields": [
+						["customer", "="],
+						["company", "="],
+						["project", "="],
+						["currency", "="],
+					],
 				},
 				"Sales Order Item": {
 					"ref_dn_field": "so_detail",
@@ -928,7 +926,12 @@
 				},
 				"Delivery Note": {
 					"ref_dn_field": "delivery_note",
-					"compare_fields": [["customer", "="], ["company", "="], ["project", "="], ["currency", "="]],
+					"compare_fields": [
+						["customer", "="],
+						["company", "="],
+						["project", "="],
+						["currency", "="],
+					],
 				},
 				"Delivery Note Item": {
 					"ref_dn_field": "dn_detail",
@@ -983,13 +986,14 @@
 		}
 		for key, value in prev_doc_field_map.items():
 			if frappe.db.get_single_value("Selling Settings", value[0]) == "Yes":
-
 				if frappe.get_value("Customer", self.customer, value[0]):
 					continue
 
 				for d in self.get("items"):
 					if d.item_code and not d.get(key.lower().replace(" ", "_")) and not self.get(value[1]):
-						msgprint(_("{0} is mandatory for Item {1}").format(key, d.item_code), raise_exception=1)
+						msgprint(
+							_("{0} is mandatory for Item {1}").format(key, d.item_code), raise_exception=1
+						)
 
 	def validate_proj_cust(self):
 		"""check for does customer belong to same project as entered.."""
@@ -1011,7 +1015,7 @@
 				frappe.throw(_("Paid amount + Write Off Amount can not be greater than Grand Total"))
 
 	def validate_warehouse(self):
-		super(SalesInvoice, self).validate_warehouse()
+		super().validate_warehouse()
 
 		for d in self.get_item_list():
 			if (
@@ -1331,7 +1335,9 @@
 						add_asset_activity(asset.name, _("Asset returned"))
 
 						if asset.calculate_depreciation:
-							posting_date = frappe.db.get_value("Sales Invoice", self.return_against, "posting_date")
+							posting_date = frappe.db.get_value(
+								"Sales Invoice", self.return_against, "posting_date"
+							)
 							reverse_depreciation_entry_made_after_disposal(asset, posting_date)
 							notes = _(
 								"This schedule was created when Asset {0} was returned through Sales Invoice {1}."
@@ -1379,7 +1385,9 @@
 							else item.deferred_revenue_account
 						)
 
-						amount, base_amount = self.get_amount_and_base_amount(item, enable_discount_accounting)
+						amount, base_amount = self.get_amount_and_base_amount(
+							item, enable_discount_accounting
+						)
 
 						account_currency = get_account_currency(income_account)
 						gl_entries.append(
@@ -1403,7 +1411,7 @@
 
 		# expense account gl entries
 		if cint(self.update_stock) and erpnext.is_perpetual_inventory_enabled(self.company):
-			gl_entries += super(SalesInvoice, self).get_gl_entries()
+			gl_entries += super().get_gl_entries()
 
 	def get_asset(self, item):
 		if item.get("asset"):
@@ -1466,7 +1474,6 @@
 
 	def make_pos_gl_entries(self, gl_entries):
 		if cint(self.is_pos):
-
 			skip_change_gl_entries = not cint(
 				frappe.db.get_single_value("Accounts Settings", "post_change_gl_entries")
 			)
@@ -1624,7 +1631,9 @@
 						"credit_in_account_currency": flt(
 							self.rounding_adjustment, self.precision("rounding_adjustment")
 						),
-						"credit": flt(self.base_rounding_adjustment, self.precision("base_rounding_adjustment")),
+						"credit": flt(
+							self.base_rounding_adjustment, self.precision("base_rounding_adjustment")
+						),
 						"cost_center": round_off_cost_center
 						if self.use_company_roundoff_cost_center
 						else (self.cost_center or round_off_cost_center),
@@ -1646,7 +1655,11 @@
 				)
 				billed_amt = billed_amt and billed_amt[0][0] or 0
 				frappe.db.set_value(
-					"Delivery Note Item", d.dn_detail, "billed_amt", billed_amt, update_modified=update_modified
+					"Delivery Note Item",
+					d.dn_detail,
+					"billed_amt",
+					billed_amt,
+					update_modified=update_modified,
 				)
 				updated_delivery_notes.append(d.delivery_note)
 			elif d.so_detail:
@@ -1701,7 +1714,6 @@
 			and getdate(lp_details.from_date) <= getdate(self.posting_date)
 			and (not lp_details.to_date or getdate(lp_details.to_date) >= getdate(self.posting_date))
 		):
-
 			collection_factor = lp_details.collection_factor if lp_details.collection_factor else 1.0
 			points_earned = cint(eligible_amount / collection_factor)
 
@@ -1954,14 +1966,13 @@
 		companies = [d.company for d in companies]
 		if company not in companies:
 			frappe.throw(
-				_("{0} not allowed to transact with {1}. Please change the Company.").format(
-					_(partytype), company
-				)
+				_(
+					"{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."
+				).format(_(partytype), company)
 			)
 
 
 def update_linked_doc(doctype, name, inter_company_reference):
-
 	if doctype in ["Sales Invoice", "Purchase Invoice"]:
 		ref_field = "inter_company_invoice_reference"
 	else:
@@ -1972,7 +1983,6 @@
 
 
 def unlink_inter_company_doc(doctype, name, inter_company_reference):
-
 	if doctype in ["Sales Invoice", "Purchase Invoice"]:
 		ref_doc = "Purchase Invoice" if doctype == "Sales Invoice" else "Sales Invoice"
 		ref_field = "inter_company_invoice_reference"
@@ -2147,16 +2157,13 @@
 
 
 def validate_inter_company_transaction(doc, doctype):
-
 	details = get_inter_company_details(doc, doctype)
 	price_list = (
 		doc.selling_price_list
 		if doctype in ["Sales Invoice", "Sales Order", "Delivery Note"]
 		else doc.buying_price_list
 	)
-	valid_price_list = frappe.db.get_value(
-		"Price List", {"name": price_list, "buying": 1, "selling": 1}
-	)
+	valid_price_list = frappe.db.get_value("Price List", {"name": price_list, "buying": 1, "selling": 1})
 	if not valid_price_list and not doc.is_internal_transfer():
 		frappe.throw(_("Selected Price List should have buying and selling fields checked."))
 
@@ -2417,9 +2424,7 @@
 	for item in doc.get("items"):
 		item.warehouse = warehouse_map.get(sales_item_map.get(item.delivery_note_item))
 		if not item.warehouse and item.get("purchase_order") and item.get("purchase_order_item"):
-			item.warehouse = frappe.db.get_value(
-				"Purchase Order Item", item.purchase_order_item, "warehouse"
-			)
+			item.warehouse = frappe.db.get_value("Purchase Order Item", item.purchase_order_item, "warehouse")
 
 
 def get_delivery_note_details(internal_reference):
@@ -2665,9 +2670,7 @@
 	# If a Return invoice is linked with payment entry along with other invoices,
 	# the cancellation of the Return causes allocated amount to be greater than paid
 
-	if not frappe.db.get_single_value(
-		"Accounts Settings", "unlink_payment_on_cancellation_of_invoice"
-	):
+	if not frappe.db.get_single_value("Accounts Settings", "unlink_payment_on_cancellation_of_invoice"):
 		return
 
 	payment_entries = []
diff --git a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
index 7e3eec5..2e28b76 100644
--- a/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/test_sales_invoice.py
@@ -2,7 +2,6 @@
 # License: GNU General Public License v3. See license.txt
 
 import copy
-import unittest
 
 import frappe
 from frappe.model.dynamic_links import get_dynamic_link_map
@@ -925,7 +924,7 @@
 			]
 		)
 
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account][0], gle.account)
 			self.assertEqual(expected_values[gle.account][1], gle.debit)
 			self.assertEqual(expected_values[gle.account][2], gle.credit)
@@ -951,7 +950,7 @@
 			write_off_account="_Test Write Off - TCP1",
 		)
 
-		pr = make_purchase_receipt(
+		make_purchase_receipt(
 			company="_Test Company with perpetual inventory",
 			item_code="_Test FG Item",
 			warehouse="Stores - TCP1",
@@ -1332,7 +1331,7 @@
 		expected_values = dict(
 			(d[0], d) for d in [["Debtors - TCP1", 100.0, 0.0], ["Sales - TCP1", 0.0, 100.0]]
 		)
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account][0], gle.account)
 			self.assertEqual(expected_values[gle.account][1], gle.debit)
 			self.assertEqual(expected_values[gle.account][2], gle.credit)
@@ -1356,7 +1355,7 @@
 				[test_records[1]["items"][0]["income_account"], 0.0, 100.0],
 			]
 		)
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account][0], gle.account)
 			self.assertEqual(expected_values[gle.account][1], gle.debit)
 			self.assertEqual(expected_values[gle.account][2], gle.credit)
@@ -1431,7 +1430,6 @@
 		si.cancel()
 
 	def test_serialized(self):
-		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
 
 		se = make_serialized_item()
@@ -1771,7 +1769,7 @@
 			"credit",
 			"credit_in_account_currency",
 		):
-			for i, gle in enumerate(gl_entries):
+			for _i, gle in enumerate(gl_entries):
 				self.assertEqual(expected_values[gle.account][field], gle[field])
 
 		# cancel
@@ -2315,12 +2313,8 @@
 
 	def test_duplicate_due_date_in_terms(self):
 		si = create_sales_invoice(do_not_save=1)
-		si.append(
-			"payment_schedule", dict(due_date="2017-01-01", invoice_portion=50.00, payment_amount=50)
-		)
-		si.append(
-			"payment_schedule", dict(due_date="2017-01-01", invoice_portion=50.00, payment_amount=50)
-		)
+		si.append("payment_schedule", dict(due_date="2017-01-01", invoice_portion=50.00, payment_amount=50))
+		si.append("payment_schedule", dict(due_date="2017-01-01", invoice_portion=50.00, payment_amount=50))
 
 		self.assertRaises(frappe.ValidationError, si.insert)
 
@@ -2514,9 +2508,7 @@
 		item.no_of_months = 12
 		item.save()
 
-		si = create_sales_invoice(
-			item=item.name, posting_date="2019-01-16", rate=50000, do_not_submit=True
-		)
+		si = create_sales_invoice(item=item.name, posting_date="2019-01-16", rate=50000, do_not_submit=True)
 		si.items[0].enable_deferred_revenue = 1
 		si.items[0].service_start_date = "2019-01-16"
 		si.items[0].service_end_date = "2019-03-31"
@@ -2837,21 +2829,16 @@
 		item.save()
 
 		sales_invoice = create_sales_invoice(item="T Shirt", rate=700, do_not_submit=True)
-		self.assertEqual(
-			sales_invoice.items[0].item_tax_template, "_Test Account Excise Duty @ 12 - _TC"
-		)
+		self.assertEqual(sales_invoice.items[0].item_tax_template, "_Test Account Excise Duty @ 12 - _TC")
 
 		# Apply discount
 		sales_invoice.apply_discount_on = "Net Total"
 		sales_invoice.discount_amount = 300
 		sales_invoice.save()
-		self.assertEqual(
-			sales_invoice.items[0].item_tax_template, "_Test Account Excise Duty @ 10 - _TC"
-		)
+		self.assertEqual(sales_invoice.items[0].item_tax_template, "_Test Account Excise Duty @ 10 - _TC")
 
 	@change_settings("Selling Settings", {"enable_discount_accounting": 1})
 	def test_sales_invoice_with_discount_accounting_enabled(self):
-
 		discount_account = create_account(
 			account_name="Discount Account",
 			parent_account="Indirect Expenses - _TC",
@@ -2869,7 +2856,6 @@
 
 	@change_settings("Selling Settings", {"enable_discount_accounting": 1})
 	def test_additional_discount_for_sales_invoice_with_discount_accounting_enabled(self):
-
 		from erpnext.accounts.doctype.repost_accounting_ledger.test_repost_accounting_ledger import (
 			update_repost_settings,
 		)
@@ -2882,7 +2868,7 @@
 			company="_Test Company",
 		)
 
-		tds_payable_account = create_account(
+		create_account(
 			account_name="TDS Payable",
 			account_type="Tax",
 			parent_account="Duties and Taxes - _TC",
@@ -3204,9 +3190,7 @@
 		"""
 		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
 
-		over_billing_allowance = frappe.db.get_single_value(
-			"Accounts Settings", "over_billing_allowance"
-		)
+		over_billing_allowance = frappe.db.get_single_value("Accounts Settings", "over_billing_allowance")
 		frappe.db.set_single_value("Accounts Settings", "over_billing_allowance", 0)
 
 		dn = create_delivery_note()
@@ -3398,7 +3382,7 @@
 		self.assertEqual(len(journals), 1)
 		je_type = frappe.get_cached_value("Journal Entry", journals[0], "voucher_type")
 		self.assertEqual(je_type, "Exchange Gain Or Loss")
-		ledger_outstanding = frappe.db.get_all(
+		frappe.db.get_all(
 			"Payment Ledger Entry",
 			filters={"against_voucher_no": si.name, "delinked": 0},
 			fields=["sum(amount), sum(amount_in_account_currency)"],
@@ -3660,41 +3644,6 @@
 	)
 
 
-def get_sales_invoice_for_e_invoice():
-	si = make_sales_invoice_for_ewaybill()
-	si.naming_series = "INV-2020-.#####"
-	si.items = []
-	si.append(
-		"items",
-		{
-			"item_code": "_Test Item",
-			"uom": "Nos",
-			"warehouse": "_Test Warehouse - _TC",
-			"qty": 2000,
-			"rate": 12,
-			"income_account": "Sales - _TC",
-			"expense_account": "Cost of Goods Sold - _TC",
-			"cost_center": "_Test Cost Center - _TC",
-		},
-	)
-
-	si.append(
-		"items",
-		{
-			"item_code": "_Test Item 2",
-			"uom": "Nos",
-			"warehouse": "_Test Warehouse - _TC",
-			"qty": 420,
-			"rate": 15,
-			"income_account": "Sales - _TC",
-			"expense_account": "Cost of Goods Sold - _TC",
-			"cost_center": "_Test Cost Center - _TC",
-		},
-	)
-
-	return si
-
-
 def check_gl_entries(doc, voucher_no, expected_gle, posting_date, voucher_type="Sales Invoice"):
 	gl = frappe.qb.DocType("GL Entry")
 	q = (
diff --git a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
index 0ae85d9..46968ef 100644
--- a/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
+++ b/erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
@@ -118,14 +118,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-06-23 21:12:57.557731",
+ "modified": "2024-03-27 13:10:36.003704",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Advance",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index e7536e9..2db4e71 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -926,14 +926,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-25 15:56:44.828634",
+ "modified": "2024-03-27 13:10:36.139679",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json b/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
index bd59f65..1389e09 100644
--- a/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
+++ b/erpnext/accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
@@ -85,14 +85,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-01-23 16:20:06.436979",
+ "modified": "2024-03-27 13:10:36.427565",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Payment",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
index 69b7c12..1302fd3 100644
--- a/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
+++ b/erpnext/accounts/doctype/sales_invoice_timesheet/sales_invoice_timesheet.json
@@ -117,14 +117,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2021-10-02 03:48:44.979777",
+ "modified": "2024-03-27 13:10:36.562795",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Invoice Timesheet",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_partner_item/sales_partner_item.json b/erpnext/accounts/doctype/sales_partner_item/sales_partner_item.json
index c176e4d..9f66742 100644
--- a/erpnext/accounts/doctype/sales_partner_item/sales_partner_item.json
+++ b/erpnext/accounts/doctype/sales_partner_item/sales_partner_item.json
@@ -19,13 +19,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-05-07 10:43:37.532095",
+ "modified": "2024-03-27 13:10:37.651093",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Partner Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
index f9e5f41..c6671f8 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
@@ -218,13 +218,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-10-18 13:08:17.776528",
+ "modified": "2024-03-27 13:10:38.190993",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Taxes and Charges",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
index 736d283..1f8c1e9 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
@@ -79,7 +79,7 @@
  "icon": "fa fa-money",
  "idx": 1,
  "links": [],
- "modified": "2024-01-30 13:07:28.801104",
+ "modified": "2024-03-27 13:10:38.343481",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Sales Taxes and Charges Template",
@@ -116,7 +116,7 @@
   }
  ],
  "show_title_field_in_link": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "title_field": "title",
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
index ce3eda9..e0b4258 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.py
@@ -42,7 +42,7 @@
 	def autoname(self):
 		if self.company and self.title:
 			abbr = frappe.get_cached_value("Company", self.company, "abbr")
-			self.name = "{0} - {1}".format(self.title, abbr)
+			self.name = f"{self.title} - {abbr}"
 
 	def set_missing_values(self):
 		for data in self.taxes:
@@ -57,10 +57,8 @@
 
 	if doc.is_default == 1:
 		frappe.db.sql(
-			"""update `tab{0}` set is_default = 0
-			where is_default = 1 and name != %s and company = %s""".format(
-				doc.doctype
-			),
+			f"""update `tab{doc.doctype}` set is_default = 0
+			where is_default = 1 and name != %s and company = %s""",
 			(doc.name, doc.company),
 		)
 
diff --git a/erpnext/accounts/doctype/share_balance/share_balance.json b/erpnext/accounts/doctype/share_balance/share_balance.json
index 04d7bb7..48a8cd6 100644
--- a/erpnext/accounts/doctype/share_balance/share_balance.json
+++ b/erpnext/accounts/doctype/share_balance/share_balance.json
@@ -1,342 +1,105 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-01-10 13:03:35.544736", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-01-10 13:03:35.544736",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "share_type",
+  "from_no",
+  "rate",
+  "column_break_4",
+  "no_of_shares",
+  "to_no",
+  "amount",
+  "section_break_8",
+  "is_company",
+  "current_state"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "share_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Share Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Share Type", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "share_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Share Type",
+   "options": "Share Type",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "from_no", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "From No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "from_no",
+   "fieldtype": "Int",
+   "label": "From No",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "rate", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "rate",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Rate",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "no_of_shares", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "No of Shares", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "no_of_shares",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "No of Shares",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "to_no", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "To No", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "to_no",
+   "fieldtype": "Int",
+   "label": "To No",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amount", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "amount",
+   "fieldtype": "Int",
+   "in_list_view": 1,
+   "label": "Amount",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_8", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_8",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "is_company", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Is Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "is_company",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Is Company",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "current_state", 
-   "fieldtype": "Select", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Current State", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nIssued\nPurchased", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "current_state",
+   "fieldtype": "Select",
+   "hidden": 1,
+   "label": "Current State",
+   "options": "\nIssued\nPurchased",
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-01-10 18:32:36.201124", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Share Balance", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:39.866399",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Share Balance",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.json b/erpnext/accounts/doctype/share_transfer/share_transfer.json
index 51f2ac1..894d249 100644
--- a/erpnext/accounts/doctype/share_transfer/share_transfer.json
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "ACC-SHT-.YYYY.-.#####",
  "creation": "2017-12-25 17:18:03.143726",
  "doctype": "DocType",
@@ -190,7 +191,8 @@
   }
  ],
  "is_submittable": 1,
- "modified": "2019-12-20 14:48:01.990600",
+ "links": [],
+ "modified": "2024-03-27 13:10:40.003178",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Share Transfer",
@@ -238,7 +240,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/share_transfer/share_transfer.py b/erpnext/accounts/doctype/share_transfer/share_transfer.py
index 6a3ff7c..bc86594 100644
--- a/erpnext/accounts/doctype/share_transfer/share_transfer.py
+++ b/erpnext/accounts/doctype/share_transfer/share_transfer.py
@@ -205,7 +205,9 @@
 		doc = self.get_shareholder_doc(shareholder)
 		for entry in doc.share_balance:
 			if (
-				entry.share_type != self.share_type or entry.from_no > self.to_no or entry.to_no < self.from_no
+				entry.share_type != self.share_type
+				or entry.from_no > self.to_no
+				or entry.to_no < self.from_no
 			):
 				continue  # since query lies outside bounds
 			elif entry.from_no <= self.from_no and entry.to_no >= self.to_no:  # both inside
@@ -257,7 +259,9 @@
 		for entry in current_entries:
 			# use spaceage logic here
 			if (
-				entry.share_type != self.share_type or entry.from_no > self.to_no or entry.to_no < self.from_no
+				entry.share_type != self.share_type
+				or entry.from_no > self.to_no
+				or entry.to_no < self.from_no
 			):
 				new_entries.append(entry)
 				continue  # since query lies outside bounds
@@ -267,7 +271,9 @@
 					if entry.to_no == self.to_no:
 						pass  # nothing to append
 					else:
-						new_entries.append(self.return_share_balance_entry(self.to_no + 1, entry.to_no, entry.rate))
+						new_entries.append(
+							self.return_share_balance_entry(self.to_no + 1, entry.to_no, entry.rate)
+						)
 				else:
 					if entry.to_no == self.to_no:
 						new_entries.append(
@@ -277,7 +283,9 @@
 						new_entries.append(
 							self.return_share_balance_entry(entry.from_no, self.from_no - 1, entry.rate)
 						)
-						new_entries.append(self.return_share_balance_entry(self.to_no + 1, entry.to_no, entry.rate))
+						new_entries.append(
+							self.return_share_balance_entry(self.to_no + 1, entry.to_no, entry.rate)
+						)
 			elif entry.from_no >= self.from_no and entry.to_no <= self.to_no:
 				# split and check
 				pass  # nothing to append
@@ -309,7 +317,7 @@
 	def get_shareholder_doc(self, shareholder):
 		# Get Shareholder doc based on the Shareholder name
 		if shareholder:
-			query_filters = {"name": shareholder}
+			pass
 
 		name = frappe.db.get_value("Shareholder", {"name": shareholder}, "name")
 
diff --git a/erpnext/accounts/doctype/share_type/share_type.json b/erpnext/accounts/doctype/share_type/share_type.json
index 0680498..9586711 100644
--- a/erpnext/accounts/doctype/share_type/share_type.json
+++ b/erpnext/accounts/doctype/share_type/share_type.json
@@ -1,222 +1,112 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "actions": [],
  "autoname": "field:title",
- "beta": 0,
  "creation": "2017-12-28 14:55:20.950877",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "title",
+  "description"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "title",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Title",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
    "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
    "unique": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "description",
    "fieldtype": "Long Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Description",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Description"
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-07-11 14:46:51.639031",
+ "links": [],
+ "modified": "2024-03-27 13:10:40.190914",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Share Type",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "System Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Accounts User",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Accounts Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Sales Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Sales User",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Sales Master Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
  "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/shareholder/shareholder.json b/erpnext/accounts/doctype/shareholder/shareholder.json
index e80b057..7bbde51 100644
--- a/erpnext/accounts/doctype/shareholder/shareholder.json
+++ b/erpnext/accounts/doctype/shareholder/shareholder.json
@@ -113,7 +113,7 @@
   }
  ],
  "links": [],
- "modified": "2023-04-10 22:02:20.406087",
+ "modified": "2024-03-27 13:10:40.356171",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Shareholder",
@@ -158,7 +158,7 @@
   }
  ],
  "search_fields": "folio_no",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title",
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
index 1b71db6..e3f7d0f 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -1,9 +1,11 @@
 {
+ "actions": [],
  "allow_import": 1,
  "autoname": "field:label",
  "creation": "2013-06-25 11:48:03",
  "description": "Specify conditions to calculate shipping amount",
  "doctype": "DocType",
+ "engine": "InnoDB",
  "field_order": [
   "label",
   "disabled",
@@ -140,7 +142,8 @@
  ],
  "icon": "fa fa-truck",
  "idx": 1,
- "modified": "2019-05-25 23:12:26.156405",
+ "links": [],
+ "modified": "2024-03-27 13:10:41.653314",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Shipping Rule",
@@ -170,7 +173,6 @@
    "read": 1,
    "report": 1,
    "role": "Accounts Manager",
-   "set_user_permissions": 1,
    "share": 1,
    "write": 1
   },
@@ -184,10 +186,11 @@
    "read": 1,
    "report": 1,
    "role": "Sales Master Manager",
-   "set_user_permissions": 1,
    "share": 1,
    "write": 1
   }
  ],
- "sort_order": "ASC"
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.py b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py
index 6877a74..d9b7b0a 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.py
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.py
@@ -71,7 +71,8 @@
 				zero_to_values.append(d)
 			elif d.from_value >= d.to_value:
 				throw(
-					_("From value must be less than to value in row {0}").format(d.idx), FromGreaterThanToError
+					_("From value must be less than to value in row {0}").format(d.idx),
+					FromGreaterThanToError,
 				)
 
 		# check if more than two or more rows has To Value = 0
@@ -114,9 +115,7 @@
 
 	def get_shipping_amount_from_rules(self, value):
 		for condition in self.get("conditions"):
-			if not condition.to_value or (
-				flt(condition.from_value) <= flt(value) <= flt(condition.to_value)
-			):
+			if not condition.to_value or (flt(condition.from_value) <= flt(value) <= flt(condition.to_value)):
 				return condition.shipping_amount
 
 		return 0.0
@@ -131,7 +130,9 @@
 				)
 			if shipping_country not in [d.country for d in self.countries]:
 				frappe.throw(
-					_("Shipping rule not applicable for country {0} in Shipping Address").format(shipping_country)
+					_("Shipping rule not applicable for country {0} in Shipping Address").format(
+						shipping_country
+					)
 				)
 
 	def add_shipping_rule_to_tax_table(self, doc, shipping_amount):
@@ -199,11 +200,9 @@
 			messages = []
 			for d1, d2 in overlaps:
 				messages.append(
-					"%s-%s = %s "
-					% (d1.from_value, d1.to_value, fmt_money(d1.shipping_amount, currency=company_currency))
+					f"{d1.from_value}-{d1.to_value} = {fmt_money(d1.shipping_amount, currency=company_currency)} "
 					+ _("and")
-					+ " %s-%s = %s"
-					% (d2.from_value, d2.to_value, fmt_money(d2.shipping_amount, currency=company_currency))
+					+ f" {d2.from_value}-{d2.to_value} = {fmt_money(d2.shipping_amount, currency=company_currency)}"
 				)
 
 			msgprint("\n".join(messages), raise_exception=OverlappingConditionError)
diff --git a/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
index a24e834..a5a0ada 100644
--- a/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
+++ b/erpnext/accounts/doctype/shipping_rule/test_shipping_rule.py
@@ -45,7 +45,6 @@
 
 
 def create_shipping_rule(shipping_rule_type, shipping_rule_name):
-
 	if frappe.db.exists("Shipping Rule", shipping_rule_name):
 		return frappe.get_doc("Shipping Rule", shipping_rule_name)
 
diff --git a/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
index 0a06f57..6e8f715 100644
--- a/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+++ b/erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
@@ -1,107 +1,48 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2013-06-25 11:54:50", 
- "custom": 0, 
- "description": "A condition for a Shipping Rule", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2013-06-25 11:54:50",
+ "description": "A condition for a Shipping Rule",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "from_value",
+  "to_value",
+  "shipping_amount"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "from_value", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "From Value", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "from_value",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "From Value",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "to_value", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "To Value", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "to_value",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "To Value"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "shipping_amount", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Shipping Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company:company:default_currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "shipping_amount",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Shipping Amount",
+   "options": "Company:company:default_currency",
+   "reqd": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-07-11 03:28:08.503506", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Shipping Rule Condition", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "track_seen": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:41.848136",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Shipping Rule Condition",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json b/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
index 46fd377..a8a31b4 100644
--- a/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
+++ b/erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
@@ -1,63 +1,32 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2015-09-17 06:43:22.767534", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Other", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2015-09-17 06:43:22.767534",
+ "doctype": "DocType",
+ "document_type": "Other",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "country"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "country", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Country", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Country", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "country",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Country",
+   "options": "Country",
+   "reqd": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-07-11 03:28:08.567594", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Shipping Rule Country", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:41.965545",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Shipping Rule Country",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/south_africa_vat_account/south_africa_vat_account.json b/erpnext/accounts/doctype/south_africa_vat_account/south_africa_vat_account.json
index fa1aa7d..f269882 100644
--- a/erpnext/accounts/doctype/south_africa_vat_account/south_africa_vat_account.json
+++ b/erpnext/accounts/doctype/south_africa_vat_account/south_africa_vat_account.json
@@ -22,13 +22,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-07-08 22:35:33.202911",
+ "modified": "2024-03-27 13:10:43.141409",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "South Africa VAT Account",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/subscription/subscription.json b/erpnext/accounts/doctype/subscription/subscription.json
index afa8bcb..50cff8c 100644
--- a/erpnext/accounts/doctype/subscription/subscription.json
+++ b/erpnext/accounts/doctype/subscription/subscription.json
@@ -267,7 +267,7 @@
    "link_fieldname": "subscription"
   }
  ],
- "modified": "2024-01-24 02:20:26.145996",
+ "modified": "2024-03-27 13:10:47.578120",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Subscription",
@@ -311,7 +311,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/subscription/subscription.py b/erpnext/accounts/doctype/subscription/subscription.py
index 1a79103..81817c2 100644
--- a/erpnext/accounts/doctype/subscription/subscription.py
+++ b/erpnext/accounts/doctype/subscription/subscription.py
@@ -2,8 +2,7 @@
 # For license information, please see license.txt
 
 
-from datetime import datetime
-from typing import Dict, List, Optional, Union
+from datetime import date
 
 import frappe
 from frappe import _
@@ -37,7 +36,7 @@
 	pass
 
 
-DateTimeLikeObject = Union[str, datetime.date]
+DateTimeLikeObject = str | date
 
 
 class Subscription(Document):
@@ -88,7 +87,7 @@
 		# update start just before the subscription doc is created
 		self.update_subscription_period(self.start_date)
 
-	def update_subscription_period(self, date: Optional["DateTimeLikeObject"] = None):
+	def update_subscription_period(self, date: DateTimeLikeObject | None = None):
 		"""
 		Subscription period is the period to be billed. This method updates the
 		beginning of the billing period and end of the billing period.
@@ -99,15 +98,13 @@
 		self.current_invoice_start = self.get_current_invoice_start(date)
 		self.current_invoice_end = self.get_current_invoice_end(self.current_invoice_start)
 
-	def _get_subscription_period(self, date: Optional["DateTimeLikeObject"] = None):
+	def _get_subscription_period(self, date: DateTimeLikeObject | None = None):
 		_current_invoice_start = self.get_current_invoice_start(date)
 		_current_invoice_end = self.get_current_invoice_end(_current_invoice_start)
 
 		return _current_invoice_start, _current_invoice_end
 
-	def get_current_invoice_start(
-		self, date: Optional["DateTimeLikeObject"] = None
-	) -> Union[datetime.date, str]:
+	def get_current_invoice_start(self, date: DateTimeLikeObject | None = None) -> DateTimeLikeObject:
 		"""
 		This returns the date of the beginning of the current billing period.
 		If the `date` parameter is not given , it will be automatically set as today's
@@ -130,9 +127,7 @@
 
 		return _current_invoice_start
 
-	def get_current_invoice_end(
-		self, date: Optional["DateTimeLikeObject"] = None
-	) -> Union[datetime.date, str]:
+	def get_current_invoice_end(self, date: DateTimeLikeObject | None = None) -> DateTimeLikeObject:
 		"""
 		This returns the date of the end of the current billing period.
 		If the subscription is in trial period, it will be set as the end of the
@@ -174,7 +169,7 @@
 		return _current_invoice_end
 
 	@staticmethod
-	def validate_plans_billing_cycle(billing_cycle_data: List[Dict[str, str]]) -> None:
+	def validate_plans_billing_cycle(billing_cycle_data: list[dict[str, str]]) -> None:
 		"""
 		Makes sure that all `Subscription Plan` in the `Subscription` have the
 		same billing interval
@@ -182,7 +177,7 @@
 		if billing_cycle_data and len(billing_cycle_data) != 1:
 			frappe.throw(_("You can only have Plans with the same billing cycle in a Subscription"))
 
-	def get_billing_cycle_and_interval(self) -> List[Dict[str, str]]:
+	def get_billing_cycle_and_interval(self) -> list[dict[str, str]]:
 		"""
 		Returns a dict representing the billing interval and cycle for this `Subscription`.
 		You shouldn't need to call this directly. Use `get_billing_cycle` instead.
@@ -199,7 +194,7 @@
 
 		return billing_info
 
-	def get_billing_cycle_data(self) -> Dict[str, int]:
+	def get_billing_cycle_data(self) -> dict[str, int]:
 		"""
 		Returns dict contain the billing cycle data.
 		You shouldn't need to call this directly. Use `get_billing_cycle` instead.
@@ -226,15 +221,13 @@
 
 		return data
 
-	def set_subscription_status(self, posting_date: Optional["DateTimeLikeObject"] = None) -> None:
+	def set_subscription_status(self, posting_date: DateTimeLikeObject | None = None) -> None:
 		"""
 		Sets the status of the `Subscription`
 		"""
 		if self.is_trialling():
 			self.status = "Trialing"
-		elif (
-			self.status == "Active" and self.end_date and getdate(posting_date) > getdate(self.end_date)
-		):
+		elif self.status == "Active" and self.end_date and getdate(posting_date) > getdate(self.end_date):
 			self.status = "Completed"
 		elif self.is_past_grace_period():
 			self.status = self.get_status_for_past_grace_period()
@@ -252,7 +245,7 @@
 
 	@staticmethod
 	def period_has_passed(
-		end_date: Union[str, datetime.date], posting_date: Optional["DateTimeLikeObject"] = None
+		end_date: DateTimeLikeObject, posting_date: DateTimeLikeObject | None = None
 	) -> bool:
 		"""
 		Returns true if the given `end_date` has passed
@@ -272,7 +265,7 @@
 
 		return status
 
-	def is_past_grace_period(self, posting_date: Optional["DateTimeLikeObject"] = None) -> bool:
+	def is_past_grace_period(self, posting_date: DateTimeLikeObject | None = None) -> bool:
 		"""
 		Returns `True` if the grace period for the `Subscription` has passed
 		"""
@@ -282,9 +275,7 @@
 		grace_period = cint(frappe.get_value("Subscription Settings", None, "grace_period"))
 		return getdate(posting_date) >= getdate(add_days(self.current_invoice.due_date, grace_period))
 
-	def current_invoice_is_past_due(
-		self, posting_date: Optional["DateTimeLikeObject"] = None
-	) -> bool:
+	def current_invoice_is_past_due(self, posting_date: DateTimeLikeObject | None = None) -> bool:
 		"""
 		Returns `True` if the current generated invoice is overdue
 		"""
@@ -334,14 +325,15 @@
 			unsupported_plans = []
 			for x in subscription_plan_currencies:
 				if x.currency != party_billing_currency:
-					unsupported_plans.append("{0}".format(get_link_to_form("Subscription Plan", x.name)))
+					unsupported_plans.append("{}".format(get_link_to_form("Subscription Plan", x.name)))
 
 			if unsupported_plans:
 				unsupported_plans = [
 					_(
 						"Below Subscription Plans are of different currency to the party default billing currency/Company currency: {0}"
-					).format(frappe.bold(party_billing_currency))
-				] + unsupported_plans
+					).format(frappe.bold(party_billing_currency)),
+					*unsupported_plans,
+				]
 
 				frappe.throw(
 					unsupported_plans, frappe.ValidationError, "Unsupported Subscription Plans", as_list=True
@@ -384,9 +376,9 @@
 
 	def generate_invoice(
 		self,
-		from_date: Optional[Union[str, datetime.date]] = None,
-		to_date: Optional[Union[str, datetime.date]] = None,
-		posting_date: Optional[Union[str, datetime.date]] = None,
+		from_date: DateTimeLikeObject | None = None,
+		to_date: DateTimeLikeObject | None = None,
+		posting_date: DateTimeLikeObject | None = None,
 	) -> Document:
 		"""
 		Creates a `Invoice` for the `Subscription`, updates `self.invoices` and
@@ -397,9 +389,9 @@
 
 	def create_invoice(
 		self,
-		from_date: Optional[Union[str, datetime.date]] = None,
-		to_date: Optional[Union[str, datetime.date]] = None,
-		posting_date: Optional[Union[str, datetime.date]] = None,
+		from_date: DateTimeLikeObject | None = None,
+		to_date: DateTimeLikeObject | None = None,
+		posting_date: DateTimeLikeObject | None = None,
 	) -> Document:
 		"""
 		Creates a `Invoice`, submits it and returns it
@@ -503,9 +495,7 @@
 
 		return invoice
 
-	def get_items_from_plans(
-		self, plans: List[Dict[str, str]], prorate: Optional[bool] = None
-	) -> List[Dict]:
+	def get_items_from_plans(self, plans: list[dict[str, str]], prorate: bool | None = None) -> list[dict]:
 		"""
 		Returns the `Item`s linked to `Subscription Plan`
 		"""
@@ -581,7 +571,7 @@
 		return items
 
 	@frappe.whitelist()
-	def process(self, posting_date: Optional["DateTimeLikeObject"] = None) -> bool:
+	def process(self, posting_date: DateTimeLikeObject | None = None) -> bool:
 		"""
 		To be called by task periodically. It checks the subscription and takes appropriate action
 		as need be. It calls either of these methods depending the `Subscription` status:
@@ -606,7 +596,7 @@
 
 		self.save()
 
-	def can_generate_new_invoice(self, posting_date: Optional["DateTimeLikeObject"] = None) -> bool:
+	def can_generate_new_invoice(self, posting_date: DateTimeLikeObject | None = None) -> bool:
 		if self.cancelation_date:
 			return False
 
@@ -628,8 +618,8 @@
 
 	def is_current_invoice_generated(
 		self,
-		_current_start_date: Union[datetime.date, str] = None,
-		_current_end_date: Union[datetime.date, str] = None,
+		_current_start_date: DateTimeLikeObject | None = None,
+		_current_end_date: DateTimeLikeObject | None = None,
 	) -> bool:
 		if not (_current_start_date and _current_end_date):
 			_current_start_date, _current_end_date = self._get_subscription_period(
@@ -644,13 +634,13 @@
 		return False
 
 	@property
-	def current_invoice(self) -> Union[Document, None]:
+	def current_invoice(self) -> Document | None:
 		"""
 		Adds property for accessing the current_invoice
 		"""
 		return self.get_current_invoice()
 
-	def get_current_invoice(self) -> Union[Document, None]:
+	def get_current_invoice(self) -> Document | None:
 		"""
 		Returns the most recent generated invoice.
 		"""
@@ -675,7 +665,7 @@
 		self.cancelation_date = nowdate()
 
 	@property
-	def invoices(self) -> List[Dict]:
+	def invoices(self) -> list[dict]:
 		return frappe.get_all(
 			self.invoice_document_type,
 			filters={"subscription": self.name},
@@ -725,7 +715,7 @@
 		self.save()
 
 	@frappe.whitelist()
-	def restart_subscription(self, posting_date: Optional["DateTimeLikeObject"] = None) -> None:
+	def restart_subscription(self, posting_date: DateTimeLikeObject | None = None) -> None:
 		"""
 		This sets the subscription as active. The subscription will be made to be like a new
 		subscription and the `Subscription` will lose all the history of generated invoices
@@ -745,10 +735,10 @@
 
 
 def get_prorata_factor(
-	period_end: Union[datetime.date, str],
-	period_start: Union[datetime.date, str],
-	is_prepaid: Optional[int] = None,
-) -> Union[int, float]:
+	period_end: DateTimeLikeObject,
+	period_start: DateTimeLikeObject,
+	is_prepaid: int | None = None,
+) -> int | float:
 	if is_prepaid:
 		return 1
 
@@ -757,9 +747,7 @@
 	return diff / plan_days
 
 
-def process_all(
-	subscription: str | None = None, posting_date: Optional["DateTimeLikeObject"] = None
-) -> None:
+def process_all(subscription: str | None = None, posting_date: DateTimeLikeObject | None = None) -> None:
 	"""
 	Task to updates the status of all `Subscription` apart from those that are cancelled
 	"""
diff --git a/erpnext/accounts/doctype/subscription/test_subscription.py b/erpnext/accounts/doctype/subscription/test_subscription.py
index 89be543..13c6a52 100644
--- a/erpnext/accounts/doctype/subscription/test_subscription.py
+++ b/erpnext/accounts/doctype/subscription/test_subscription.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
 from frappe.tests.utils import FrappeTestCase
@@ -201,9 +200,7 @@
 
 		invoice = subscription.get_current_invoice()
 		diff = flt(date_diff(nowdate(), subscription.current_invoice_start) + 1)
-		plan_days = flt(
-			date_diff(subscription.current_invoice_end, subscription.current_invoice_start) + 1
-		)
+		plan_days = flt(date_diff(subscription.current_invoice_end, subscription.current_invoice_start) + 1)
 		prorate_factor = flt(diff / plan_days)
 
 		self.assertEqual(
@@ -249,9 +246,7 @@
 
 		invoice = subscription.get_current_invoice()
 		diff = flt(date_diff(nowdate(), subscription.current_invoice_start) + 1)
-		plan_days = flt(
-			date_diff(subscription.current_invoice_end, subscription.current_invoice_start) + 1
-		)
+		plan_days = flt(date_diff(subscription.current_invoice_end, subscription.current_invoice_start) + 1)
 		prorate_factor = flt(diff / plan_days)
 
 		self.assertEqual(flt(invoice.grand_total, 2), flt(prorate_factor * 900, 2))
@@ -385,9 +380,7 @@
 		settings.prorate = 1
 		settings.save()
 
-		subscription = create_subscription(
-			generate_invoice_at="Beginning of the current subscription period"
-		)
+		subscription = create_subscription(generate_invoice_at="Beginning of the current subscription period")
 		subscription.process()
 		subscription.cancel_subscription()
 
@@ -546,9 +539,7 @@
 		billing_interval_count=3,
 		currency="INR",
 	)
-	create_plan(
-		plan_name="_Test Plan Multicurrency", cost=50, billing_interval="Month", currency="USD"
-	)
+	create_plan(plan_name="_Test Plan Multicurrency", cost=50, billing_interval="Month", currency="USD")
 
 
 def create_plan(**kwargs):
@@ -575,9 +566,7 @@
 		customer = frappe.new_doc("Customer")
 		customer.customer_name = "_Test Subscription Customer"
 		customer.billing_currency = "USD"
-		customer.append(
-			"accounts", {"company": "_Test Company", "account": "_Test Receivable USD - _TC"}
-		)
+		customer.append("accounts", {"company": "_Test Company", "account": "_Test Receivable USD - _TC"})
 		customer.insert()
 
 
@@ -600,9 +589,7 @@
 	subscription.additional_discount_percentage = kwargs.get("additional_discount_percentage")
 	subscription.additional_discount_amount = kwargs.get("additional_discount_amount")
 	subscription.follow_calendar_months = kwargs.get("follow_calendar_months")
-	subscription.generate_new_invoices_past_due_date = kwargs.get(
-		"generate_new_invoices_past_due_date"
-	)
+	subscription.generate_new_invoices_past_due_date = kwargs.get("generate_new_invoices_past_due_date")
 	subscription.submit_invoice = kwargs.get("submit_invoice")
 	subscription.days_until_due = kwargs.get("days_until_due")
 	subscription.number_of_days = kwargs.get("number_of_days")
diff --git a/erpnext/accounts/doctype/subscription_invoice/subscription_invoice.json b/erpnext/accounts/doctype/subscription_invoice/subscription_invoice.json
index 8a0d1de..4b5324a 100644
--- a/erpnext/accounts/doctype/subscription_invoice/subscription_invoice.json
+++ b/erpnext/accounts/doctype/subscription_invoice/subscription_invoice.json
@@ -15,9 +15,7 @@
    "label": "Document Type ",
    "no_copy": 1,
    "options": "DocType",
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only": 1
   },
   {
    "fieldname": "invoice",
@@ -26,22 +24,21 @@
    "label": "Invoice",
    "no_copy": 1,
    "options": "document_type",
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only": 1
   }
  ],
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-02-09 15:43:32.026233",
+ "modified": "2024-03-27 13:10:47.880704",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Subscription Invoice",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/subscription_plan/subscription_plan.json b/erpnext/accounts/doctype/subscription_plan/subscription_plan.json
index bc1f579..d8f57e2 100644
--- a/erpnext/accounts/doctype/subscription_plan/subscription_plan.json
+++ b/erpnext/accounts/doctype/subscription_plan/subscription_plan.json
@@ -149,7 +149,7 @@
   }
  ],
  "links": [],
- "modified": "2024-01-14 17:59:34.687977",
+ "modified": "2024-03-27 13:10:47.998597",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Subscription Plan",
@@ -193,7 +193,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/subscription_plan_detail/subscription_plan_detail.json b/erpnext/accounts/doctype/subscription_plan_detail/subscription_plan_detail.json
index 3e16303..ea7284c 100644
--- a/erpnext/accounts/doctype/subscription_plan_detail/subscription_plan_detail.json
+++ b/erpnext/accounts/doctype/subscription_plan_detail/subscription_plan_detail.json
@@ -27,14 +27,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-06-14 17:44:05.275100",
+ "modified": "2024-03-27 13:10:48.168122",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Subscription Plan Detail",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/subscription_settings/subscription_settings.json b/erpnext/accounts/doctype/subscription_settings/subscription_settings.json
index 821db7e..827b0fe 100644
--- a/erpnext/accounts/doctype/subscription_settings/subscription_settings.json
+++ b/erpnext/accounts/doctype/subscription_settings/subscription_settings.json
@@ -32,7 +32,7 @@
  ],
  "issingle": 1,
  "links": [],
- "modified": "2020-06-23 09:13:44.292792",
+ "modified": "2024-03-27 13:10:48.283833",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Subscription Settings",
@@ -70,7 +70,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/supplier_group_item/supplier_group_item.json b/erpnext/accounts/doctype/supplier_group_item/supplier_group_item.json
index 67fac45..e4bc4ae 100644
--- a/erpnext/accounts/doctype/supplier_group_item/supplier_group_item.json
+++ b/erpnext/accounts/doctype/supplier_group_item/supplier_group_item.json
@@ -19,13 +19,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-05-07 10:43:59.877938",
+ "modified": "2024-03-27 13:10:48.895401",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Supplier Group Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/supplier_item/supplier_item.json b/erpnext/accounts/doctype/supplier_item/supplier_item.json
index 95c4dc6..a786ad2 100644
--- a/erpnext/accounts/doctype/supplier_item/supplier_item.json
+++ b/erpnext/accounts/doctype/supplier_item/supplier_item.json
@@ -19,13 +19,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-05-07 10:44:09.707778",
+ "modified": "2024-03-27 13:10:48.995425",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Supplier Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_category/tax_category.json b/erpnext/accounts/doctype/tax_category/tax_category.json
index 44a339f..033faa6 100644
--- a/erpnext/accounts/doctype/tax_category/tax_category.json
+++ b/erpnext/accounts/doctype/tax_category/tax_category.json
@@ -29,7 +29,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2022-01-18 21:13:41.161017",
+ "modified": "2024-03-27 13:10:51.976600",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Tax Category",
@@ -71,7 +71,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.json b/erpnext/accounts/doctype/tax_rule/tax_rule.json
index 5a6911c..101a0c8 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.json
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.json
@@ -226,7 +226,7 @@
   }
  ],
  "links": [],
- "modified": "2024-03-09 08:08:27.186879",
+ "modified": "2024-03-27 13:10:52.121252",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Tax Rule",
@@ -246,6 +246,7 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
-}
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.py b/erpnext/accounts/doctype/tax_rule/tax_rule.py
index 9ff530b..ed623c6 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.py
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.py
@@ -112,27 +112,23 @@
 		for d in filters:
 			if conds:
 				conds += " and "
-			conds += """ifnull({0}, '') = {1}""".format(d, frappe.db.escape(cstr(filters[d])))
+			conds += f"""ifnull({d}, '') = {frappe.db.escape(cstr(filters[d]))}"""
 
 		if self.from_date and self.to_date:
-			conds += """ and ((from_date > '{from_date}' and from_date < '{to_date}') or
-					(to_date > '{from_date}' and to_date < '{to_date}') or
-					('{from_date}' > from_date and '{from_date}' < to_date) or
-					('{from_date}' = from_date and '{to_date}' = to_date))""".format(
-				from_date=self.from_date, to_date=self.to_date
-			)
+			conds += f""" and ((from_date > '{self.from_date}' and from_date < '{self.to_date}') or
+					(to_date > '{self.from_date}' and to_date < '{self.to_date}') or
+					('{self.from_date}' > from_date and '{self.from_date}' < to_date) or
+					('{self.from_date}' = from_date and '{self.to_date}' = to_date))"""
 
 		elif self.from_date and not self.to_date:
-			conds += """ and to_date > '{from_date}'""".format(from_date=self.from_date)
+			conds += f""" and to_date > '{self.from_date}'"""
 
 		elif self.to_date and not self.from_date:
-			conds += """ and from_date < '{to_date}'""".format(to_date=self.to_date)
+			conds += f""" and from_date < '{self.to_date}'"""
 
 		tax_rule = frappe.db.sql(
-			"select name, priority \
-			from `tabTax Rule` where {0} and name != '{1}'".format(
-				conds, self.name
-			),
+			f"select name, priority \
+			from `tabTax Rule` where {conds} and name != '{self.name}'",
 			as_dict=1,
 		)
 
@@ -189,27 +185,25 @@
 		conditions.append("(from_date is null) and (to_date is null)")
 
 	conditions.append(
-		"ifnull(tax_category, '') = {0}".format(frappe.db.escape(cstr(args.get("tax_category"))))
+		"ifnull(tax_category, '') = {}".format(frappe.db.escape(cstr(args.get("tax_category"))))
 	)
 	if "tax_category" in args.keys():
 		del args["tax_category"]
 
 	for key, value in args.items():
 		if key == "use_for_shopping_cart":
-			conditions.append("use_for_shopping_cart = {0}".format(1 if value else 0))
+			conditions.append(f"use_for_shopping_cart = {1 if value else 0}")
 		elif key == "customer_group":
 			if not value:
 				value = get_root_of("Customer Group")
 			customer_group_condition = get_customer_group_condition(value)
-			conditions.append("ifnull({0}, '') in ('', {1})".format(key, customer_group_condition))
+			conditions.append(f"ifnull({key}, '') in ('', {customer_group_condition})")
 		else:
-			conditions.append("ifnull({0}, '') in ('', {1})".format(key, frappe.db.escape(cstr(value))))
+			conditions.append(f"ifnull({key}, '') in ('', {frappe.db.escape(cstr(value))})")
 
 	tax_rule = frappe.db.sql(
 		"""select * from `tabTax Rule`
-		where {0}""".format(
-			" and ".join(conditions)
-		),
+		where {}""".format(" and ".join(conditions)),
 		as_dict=True,
 	)
 
@@ -234,7 +228,7 @@
 	)[0]
 
 	tax_template = rule.sales_tax_template or rule.purchase_tax_template
-	doctype = "{0} Taxes and Charges Template".format(rule.tax_type)
+	doctype = f"{rule.tax_type} Taxes and Charges Template"
 
 	if frappe.db.get_value(doctype, tax_template, "disabled") == 1:
 		return None
@@ -244,9 +238,7 @@
 
 def get_customer_group_condition(customer_group):
 	condition = ""
-	customer_groups = [
-		"%s" % (frappe.db.escape(d.name)) for d in get_parent_customer_groups(customer_group)
-	]
+	customer_groups = ["%s" % (frappe.db.escape(d.name)) for d in get_parent_customer_groups(customer_group)]
 	if customer_groups:
 		condition = ",".join(["%s"] * len(customer_groups)) % (tuple(customer_groups))
 	return condition
diff --git a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
index 46b430c..a8a79ce 100644
--- a/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
+++ b/erpnext/accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
@@ -36,14 +36,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-01-13 13:40:41.479208",
+ "modified": "2024-03-27 13:10:52.307012",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Tax Withheld Vouchers",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_withholding_account/tax_withholding_account.json b/erpnext/accounts/doctype/tax_withholding_account/tax_withholding_account.json
index 06d6b08..e5734b3 100644
--- a/erpnext/accounts/doctype/tax_withholding_account/tax_withholding_account.json
+++ b/erpnext/accounts/doctype/tax_withholding_account/tax_withholding_account.json
@@ -1,105 +1,42 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-04-13 18:43:14.898336", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-04-13 18:43:14.898336",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "company",
+  "account"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "company", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "company",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Company",
+   "options": "Company",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "account",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Account",
+   "options": "Account",
+   "reqd": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-04-13 18:44:25.055382", 
- "modified_by": "Administrator", 
- "module": "Accounts", 
- "name": "Tax Withholding Account", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:52.419915",
+ "modified_by": "Administrator",
+ "module": "Accounts",
+ "name": "Tax Withholding Account",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
index 153906f..1f06ce4 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
+++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.json
@@ -24,85 +24,66 @@
    "fieldname": "category_name",
    "fieldtype": "Data",
    "in_list_view": 1,
-   "label": "Category Name",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Category Name"
   },
   {
    "fieldname": "section_break_8",
    "fieldtype": "Section Break",
-   "label": "Tax Withholding Rates",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Tax Withholding Rates"
   },
   {
    "fieldname": "rates",
    "fieldtype": "Table",
    "label": "Rates",
    "options": "Tax Withholding Rate",
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "fieldname": "section_break_7",
    "fieldtype": "Section Break",
-   "label": "Account Details",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Account Details"
   },
   {
    "fieldname": "accounts",
    "fieldtype": "Table",
    "label": "Accounts",
    "options": "Tax Withholding Account",
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "fieldname": "category_details_section",
    "fieldtype": "Section Break",
-   "label": "Category Details",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Category Details"
   },
   {
    "fieldname": "column_break_2",
-   "fieldtype": "Column Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Column Break"
   },
   {
    "default": "0",
    "description": "Even invoices with apply tax withholding unchecked will be considered for checking cumulative threshold breach",
    "fieldname": "consider_party_ledger_amount",
    "fieldtype": "Check",
-   "label": "Consider Entire Party Ledger Amount",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Consider Entire Party Ledger Amount"
   },
   {
    "default": "0",
    "description": "Tax will be withheld only for amount exceeding the cumulative threshold",
    "fieldname": "tax_on_excess_amount",
    "fieldtype": "Check",
-   "label": "Only Deduct Tax On Excess Amount ",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Only Deduct Tax On Excess Amount "
   },
   {
+   "default": "0",
    "description": "Checking this will round off the tax amount to the nearest integer",
    "fieldname": "round_off_tax_amount",
    "fieldtype": "Check",
-   "label": "Round Off Tax Amount",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Round Off Tax Amount"
   }
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-07-27 21:47:34.396071",
+ "modified": "2024-03-27 13:10:52.531436",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Tax Withholding Category",
@@ -145,7 +126,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
index 405f587..b043f9a 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
+++ b/erpnext/accounts/doctype/tax_withholding_category/tax_withholding_category.py
@@ -57,13 +57,11 @@
 
 	def validate_thresholds(self):
 		for d in self.get("rates"):
-			if (
-				d.cumulative_threshold and d.single_threshold and d.cumulative_threshold < d.single_threshold
-			):
+			if d.cumulative_threshold and d.single_threshold and d.cumulative_threshold < d.single_threshold:
 				frappe.throw(
-					_("Row #{0}: Cumulative threshold cannot be less than Single Transaction threshold").format(
-						d.idx
-					)
+					_(
+						"Row #{0}: Cumulative threshold cannot be less than Single Transaction threshold"
+					).format(d.idx)
 				)
 
 
@@ -319,9 +317,7 @@
 def get_invoice_vouchers(parties, tax_details, company, party_type="Supplier"):
 	doctype = "Purchase Invoice" if party_type == "Supplier" else "Sales Invoice"
 	field = (
-		"base_tax_withholding_net_total as base_net_total"
-		if party_type == "Supplier"
-		else "base_net_total"
+		"base_tax_withholding_net_total as base_net_total" if party_type == "Supplier" else "base_net_total"
 	)
 	voucher_wise_amount = {}
 	vouchers = []
@@ -375,9 +371,7 @@
 	return vouchers, voucher_wise_amount
 
 
-def get_advance_vouchers(
-	parties, company=None, from_date=None, to_date=None, party_type="Supplier"
-):
+def get_advance_vouchers(parties, company=None, from_date=None, to_date=None, party_type="Supplier"):
 	"""
 	Use Payment Ledger to fetch unallocated Advance Payments
 	"""
@@ -398,9 +392,7 @@
 	if from_date and to_date:
 		conditions.append(ple.posting_date[from_date:to_date])
 
-	advances = (
-		qb.from_(ple).select(ple.voucher_no).distinct().where(Criterion.all(conditions)).run(as_list=1)
-	)
+	advances = qb.from_(ple).select(ple.voucher_no).distinct().where(Criterion.all(conditions)).run(as_list=1)
 	if advances:
 		advances = [x[0] for x in advances]
 
@@ -566,9 +558,7 @@
 	conditions.append(ple.voucher_no == ple.against_voucher_no)
 	conditions.append(ple.company == inv.company)
 
-	advances = (
-		qb.from_(ple).select(Abs(Sum(ple.amount))).where(Criterion.all(conditions)).run(as_list=1)
-	)
+	qb.from_(ple).select(Abs(Sum(ple.amount))).where(Criterion.all(conditions)).run(as_list=1)
 
 	advance_amt = (
 		qb.from_(ple).select(Abs(Sum(ple.amount))).where(Criterion.all(conditions)).run()[0][0] or 0.0
@@ -627,9 +617,7 @@
 	return limit_consumed
 
 
-def get_lower_deduction_amount(
-	current_amount, limit_consumed, certificate_limit, rate, tax_details
-):
+def get_lower_deduction_amount(current_amount, limit_consumed, certificate_limit, rate, tax_details):
 	if certificate_limit - flt(limit_consumed) - flt(current_amount) >= 0:
 		return current_amount * rate / 100
 	else:
@@ -641,9 +629,7 @@
 
 def is_valid_certificate(ldc, posting_date, limit_consumed):
 	available_amount = flt(ldc.certificate_limit) - flt(limit_consumed)
-	if (
-		getdate(ldc.valid_from) <= getdate(posting_date) <= getdate(ldc.valid_upto)
-	) and available_amount > 0:
+	if (getdate(ldc.valid_from) <= getdate(posting_date) <= getdate(ldc.valid_upto)) and available_amount > 0:
 		return True
 
 	return False
diff --git a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
index 0fbaf23..087e0d0 100644
--- a/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
+++ b/erpnext/accounts/doctype/tax_withholding_category/test_tax_withholding_category.py
@@ -95,9 +95,7 @@
 
 	def test_tax_withholding_category_checks(self):
 		invoices = []
-		frappe.db.set_value(
-			"Supplier", "Test TDS Supplier3", "tax_withholding_category", "New TDS Category"
-		)
+		frappe.db.set_value("Supplier", "Test TDS Supplier3", "tax_withholding_category", "New TDS Category")
 
 		# First Invoice with no tds check
 		pi = create_purchase_invoice(supplier="Test TDS Supplier3", rate=20000, do_not_save=True)
@@ -448,7 +446,7 @@
 		pe3.save()
 		pe3.submit()
 
-		self.assertEquals(pe3.get("taxes")[0].tax_amount, 1200)
+		self.assertEqual(pe3.get("taxes")[0].tax_amount, 1200)
 		pe1.cancel()
 		pe2.cancel()
 		pe3.cancel()
@@ -845,9 +843,7 @@
 		).insert()
 
 
-def create_lower_deduction_certificate(
-	supplier, tax_withholding_category, tax_rate, certificate_no, limit
-):
+def create_lower_deduction_certificate(supplier, tax_withholding_category, tax_rate, certificate_no, limit):
 	fiscal_year = get_fiscal_year(today(), company="_Test Company")
 	if not frappe.db.exists("Lower Deduction Certificate", certificate_no):
 		frappe.get_doc(
diff --git a/erpnext/accounts/doctype/tax_withholding_rate/tax_withholding_rate.json b/erpnext/accounts/doctype/tax_withholding_rate/tax_withholding_rate.json
index e032bb3..c58d945 100644
--- a/erpnext/accounts/doctype/tax_withholding_rate/tax_withholding_rate.json
+++ b/erpnext/accounts/doctype/tax_withholding_rate/tax_withholding_rate.json
@@ -59,14 +59,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-01-13 12:04:42.904263",
+ "modified": "2024-03-27 13:10:52.708165",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Tax Withholding Rate",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/accounts/doctype/territory_item/territory_item.json b/erpnext/accounts/doctype/territory_item/territory_item.json
index 0f0fdea..7d06644 100644
--- a/erpnext/accounts/doctype/territory_item/territory_item.json
+++ b/erpnext/accounts/doctype/territory_item/territory_item.json
@@ -19,13 +19,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-05-07 10:43:26.641030",
+ "modified": "2024-03-27 13:10:53.433659",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Territory Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json b/erpnext/accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
index fe4b085..9023ee9 100644
--- a/erpnext/accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+++ b/erpnext/accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
@@ -46,13 +46,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-05 17:35:09.556054",
+ "modified": "2024-03-27 13:10:55.008837",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Transaction Deletion Record Details",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py b/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py
index 57f66dd..882dd1d 100644
--- a/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py
+++ b/erpnext/accounts/doctype/unreconcile_payment/test_unreconcile_payment.py
@@ -93,7 +93,7 @@
 		unreconcile.add_references()
 		self.assertEqual(len(unreconcile.allocations), 2)
 		allocations = [x.reference_name for x in unreconcile.allocations]
-		self.assertEquals([si1.name, si2.name], allocations)
+		self.assertEqual([si1.name, si2.name], allocations)
 		# unreconcile si1
 		for x in unreconcile.allocations:
 			if x.reference_name != si1.name:
@@ -158,7 +158,7 @@
 		unreconcile.add_references()
 		self.assertEqual(len(unreconcile.allocations), 2)
 		allocations = [x.reference_name for x in unreconcile.allocations]
-		self.assertEquals([si1.name, si2.name], allocations)
+		self.assertEqual([si1.name, si2.name], allocations)
 		# unreconcile si1 from pe2
 		for x in unreconcile.allocations:
 			if x.reference_name != si1.name:
@@ -216,7 +216,7 @@
 		unreconcile.add_references()
 		self.assertEqual(len(unreconcile.allocations), 2)
 		allocations = [x.reference_name for x in unreconcile.allocations]
-		self.assertEquals([si1.name, si2.name], allocations)
+		self.assertEqual([si1.name, si2.name], allocations)
 		# unreconcile si1 from pe
 		for x in unreconcile.allocations:
 			if x.reference_name != si1.name:
@@ -301,7 +301,7 @@
 		unreconcile.add_references()
 		self.assertEqual(len(unreconcile.allocations), 2)
 		allocations = [x.reference_name for x in unreconcile.allocations]
-		self.assertEquals([si1.name, si2.name], allocations)
+		self.assertEqual([si1.name, si2.name], allocations)
 		# unreconcile si1 from pe2
 		for x in unreconcile.allocations:
 			if x.reference_name != si1.name:
@@ -353,7 +353,7 @@
 		unreconcile.add_references()
 		self.assertEqual(len(unreconcile.allocations), 1)
 		allocations = [x.reference_name for x in unreconcile.allocations]
-		self.assertEquals([so.name], allocations)
+		self.assertEqual([so.name], allocations)
 		# unreconcile so
 		unreconcile.save().submit()
 
diff --git a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
index f906dc6..c36837a 100644
--- a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
+++ b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.json
@@ -58,7 +58,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-08-28 17:42:50.261377",
+ "modified": "2024-03-27 13:10:57.073165",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Unreconcile Payment",
@@ -86,8 +86,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py
index 664622f..29eb270 100644
--- a/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py
+++ b/erpnext/accounts/doctype/unreconcile_payment/unreconcile_payment.py
@@ -91,7 +91,7 @@
 
 
 @frappe.whitelist()
-def doc_has_references(doctype: str = None, docname: str = None):
+def doc_has_references(doctype: str | None = None, docname: str | None = None):
 	if doctype in ["Sales Invoice", "Purchase Invoice"]:
 		return frappe.db.count(
 			"Payment Ledger Entry",
@@ -106,7 +106,7 @@
 
 @frappe.whitelist()
 def get_linked_payments_for_doc(
-	company: str = None, doctype: str = None, docname: str = None
+	company: str | None = None, doctype: str | None = None, docname: str | None = None
 ) -> list:
 	if company and doctype and docname:
 		_dt = doctype
diff --git a/erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json b/erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
index 42da669..d3e49dc 100644
--- a/erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
+++ b/erpnext/accounts/doctype/unreconcile_payment_entries/unreconcile_payment_entries.json
@@ -71,13 +71,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-09-05 09:33:28.620149",
+ "modified": "2024-03-27 13:10:57.224053",
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Unreconcile Payment Entries",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 825a01e..700d777 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -78,7 +78,7 @@
 					"credit": credit,
 					"debit_in_account_currency": debit,
 					"credit_in_account_currency": credit,
-					"remarks": _("Offsetting for Accounting Dimension") + " - {0}".format(dimension.name),
+					"remarks": _("Offsetting for Accounting Dimension") + f" - {dimension.name}",
 					"against_voucher": None,
 				}
 			)
@@ -179,9 +179,7 @@
 
 
 def distribute_gl_based_on_cost_center_allocation(gl_map, precision=None):
-	cost_center_allocation = get_cost_center_allocation_data(
-		gl_map[0]["company"], gl_map[0]["posting_date"]
-	)
+	cost_center_allocation = get_cost_center_allocation_data(gl_map[0]["company"], gl_map[0]["posting_date"])
 	if not cost_center_allocation:
 		return gl_map
 
@@ -190,9 +188,7 @@
 		cost_center = d.get("cost_center")
 
 		# Validate budget against main cost center
-		validate_expense_against_budget(
-			d, expense_amount=flt(d.debit, precision) - flt(d.credit, precision)
-		)
+		validate_expense_against_budget(d, expense_amount=flt(d.debit, precision) - flt(d.credit, precision))
 
 		if cost_center and cost_center_allocation.get(cost_center):
 			for sub_cost_center, percentage in cost_center_allocation.get(cost_center, {}).items():
@@ -224,9 +220,7 @@
 
 	cc_allocation = frappe._dict()
 	for d in records:
-		cc_allocation.setdefault(d.main_cost_center, frappe._dict()).setdefault(
-			d.cost_center, d.percentage
-		)
+		cc_allocation.setdefault(d.main_cost_center, frappe._dict()).setdefault(d.cost_center, d.percentage)
 
 	return cc_allocation
 
@@ -541,9 +535,7 @@
 			round_off_gle[dimension] = dimension_values.get(dimension)
 
 
-def get_round_off_account_and_cost_center(
-	company, voucher_type, voucher_no, use_company_default=False
-):
+def get_round_off_account_and_cost_center(company, voucher_type, voucher_no, use_company_default=False):
 	round_off_account, round_off_cost_center = frappe.get_cached_value(
 		"Company", company, ["round_off_account", "round_off_cost_center"]
 	) or [None, None]
@@ -678,9 +670,7 @@
 
 
 def validate_against_pcv(is_opening, posting_date, company):
-	if is_opening and frappe.db.exists(
-		"Period Closing Voucher", {"docstatus": 1, "company": company}
-	):
+	if is_opening and frappe.db.exists("Period Closing Voucher", {"docstatus": 1, "company": company}):
 		frappe.throw(
 			_("Opening Entry can not be created after Period Closing Voucher is created."),
 			title=_("Invalid Opening Entry"),
@@ -691,9 +681,7 @@
 	)
 
 	if last_pcv_date and getdate(posting_date) <= getdate(last_pcv_date):
-		message = _("Books have been closed till the period ending on {0}").format(
-			formatdate(last_pcv_date)
-		)
+		message = _("Books have been closed till the period ending on {0}").format(formatdate(last_pcv_date))
 		message += "</br >"
 		message += _("You cannot create/amend any accounting entries till this date.")
 		frappe.throw(message, title=_("Period Closed"))
diff --git a/erpnext/accounts/party.py b/erpnext/accounts/party.py
index d8ae2a4..85fe605 100644
--- a/erpnext/accounts/party.py
+++ b/erpnext/accounts/party.py
@@ -2,8 +2,6 @@
 # License: GNU General Public License v3. See license.txt
 
 
-from typing import Optional
-
 import frappe
 from frappe import _, msgprint, qb, scrub
 from frappe.contacts.doctype.address.address import get_company_address, get_default_address
@@ -69,7 +67,6 @@
 	shipping_address=None,
 	pos_profile=None,
 ):
-
 	if not party:
 		return {}
 	if not frappe.db.exists(party_type, party):
@@ -153,9 +150,7 @@
 		party_details["taxes_and_charges"] = tax_template
 
 	if cint(fetch_payment_terms_template):
-		party_details["payment_terms_template"] = get_payment_terms_template(
-			party.name, party_type, company
-		)
+		party_details["payment_terms_template"] = get_payment_terms_template(party.name, party_type, company)
 
 	if not party_details.get("currency"):
 		party_details["currency"] = currency
@@ -173,9 +168,7 @@
 
 	# supplier tax withholding category
 	if party_type == "Supplier" and party:
-		party_details["supplier_tds"] = frappe.get_value(
-			party_type, party.name, "tax_withholding_category"
-		)
+		party_details["supplier_tds"] = frappe.get_value(party_type, party.name, "tax_withholding_category")
 
 	if not party_details.get("tax_category") and pos_profile:
 		party_details["tax_category"] = frappe.get_value("POS Profile", pos_profile, "tax_category")
@@ -195,12 +188,8 @@
 	*,
 	ignore_permissions=False,
 ):
-	billing_address_field = (
-		"customer_address" if party_type == "Lead" else party_type.lower() + "_address"
-	)
-	party_details[billing_address_field] = party_address or get_default_address(
-		party_type, party.name
-	)
+	billing_address_field = "customer_address" if party_type == "Lead" else party_type.lower() + "_address"
+	party_details[billing_address_field] = party_address or get_default_address(party_type, party.name)
 	if doctype:
 		party_details.update(
 			get_fetch_values(doctype, billing_address_field, party_details[billing_address_field])
@@ -282,9 +271,7 @@
 	pass
 
 
-def set_contact_details(party_details, party, party_type):
-	party_details.contact_person = get_default_contact(party_type, party.name)
-
+def complete_contact_details(party_details):
 	if not party_details.contact_person:
 		party_details.update(
 			{
@@ -308,13 +295,16 @@
 			"department as contact_department",
 		]
 
-		contact_details = frappe.db.get_value(
-			"Contact", party_details.contact_person, fields, as_dict=True
-		)
+		contact_details = frappe.db.get_value("Contact", party_details.contact_person, fields, as_dict=True)
 
 		party_details.update(contact_details)
 
 
+def set_contact_details(party_details, party, party_type):
+	party_details.contact_person = get_default_contact(party_type, party.name)
+	complete_contact_details(party_details)
+
+
 def set_other_values(party_details, party, party_type):
 	# copy
 	if party_type == "Customer":
@@ -325,9 +315,7 @@
 		party_details[f] = party.get(f)
 
 	# fields prepended with default in Customer doctype
-	for f in ["currency"] + (
-		["sales_partner", "commission_rate"] if party_type == "Customer" else []
-	):
+	for f in ["currency"] + (["sales_partner", "commission_rate"] if party_type == "Customer" else []):
 		if party.get("default_" + f):
 			party_details[f] = party.get("default_" + f)
 
@@ -364,14 +352,10 @@
 			"Price List", price_list, "currency", cache=True
 		)
 
-	party_details[
-		"selling_price_list" if party.doctype == "Customer" else "buying_price_list"
-	] = price_list
+	party_details["selling_price_list" if party.doctype == "Customer" else "buying_price_list"] = price_list
 
 
-def set_account_and_due_date(
-	party, account, party_type, company, posting_date, bill_date, doctype
-):
+def set_account_and_due_date(party, account, party_type, company, posting_date, bill_date, doctype):
 	if doctype not in ["POS Invoice", "Sales Invoice", "Purchase Invoice"]:
 		# not an invoice
 		return {party_type.lower(): party}
@@ -459,9 +443,7 @@
 
 	if not account:
 		account_name = (
-			"default_advance_received_account"
-			if party_type == "Customer"
-			else "default_advance_paid_account"
+			"default_advance_received_account" if party_type == "Customer" else "default_advance_paid_account"
 		)
 		account = frappe.get_cached_value("Company", company, account_name)
 
@@ -470,9 +452,7 @@
 
 @frappe.whitelist()
 def get_party_bank_account(party_type, party):
-	return frappe.db.get_value(
-		"Bank Account", {"party_type": party_type, "party": party, "is_default": 1}
-	)
+	return frappe.db.get_value("Bank Account", {"party_type": party_type, "party": party, "is_default": 1})
 
 
 def get_party_account_currency(party_type, party, company):
@@ -564,9 +544,7 @@
 				"Company", frappe.db.get_default("Company"), "default_currency"
 			)
 		else:
-			company_default_currency = frappe.get_cached_value(
-				"Company", account.company, "default_currency"
-			)
+			company_default_currency = frappe.get_cached_value("Company", account.company, "default_currency")
 
 		validate_party_gle_currency(doc.doctype, doc.name, account.company, party_account_currency)
 
@@ -597,9 +575,7 @@
 		template_name = get_payment_terms_template(party, party_type, company)
 
 		if template_name:
-			due_date = get_due_date_from_template(template_name, posting_date, bill_date).strftime(
-				"%Y-%m-%d"
-			)
+			due_date = get_due_date_from_template(template_name, posting_date, bill_date).strftime("%Y-%m-%d")
 		else:
 			if party_type == "Supplier":
 				supplier_group = frappe.get_cached_value(party_type, party, "supplier_group")
@@ -758,7 +734,6 @@
 
 
 def validate_party_frozen_disabled(party_type, party_name):
-
 	if frappe.flags.ignore_party_validation:
 		return
 
@@ -894,9 +869,7 @@
 		party_account_currency = get_party_account_currency(party_type, party, d.company)
 
 		if party_account_currency == company_default_currency:
-			billing_this_year = flt(
-				company_wise_billing_this_year.get(d.company, {}).get("base_grand_total")
-			)
+			billing_this_year = flt(company_wise_billing_this_year.get(d.company, {}).get("base_grand_total"))
 		else:
 			billing_this_year = flt(company_wise_billing_this_year.get(d.company, {}).get("grand_total"))
 
@@ -922,7 +895,7 @@
 	return company_wise_info
 
 
-def get_party_shipping_address(doctype: str, name: str) -> Optional[str]:
+def get_party_shipping_address(doctype: str, name: str) -> str | None:
 	"""
 	Returns an Address name (best guess) for the given doctype and name for which `address_type == 'Shipping'` is true.
 	and/or `is_shipping_address = 1`.
@@ -988,7 +961,7 @@
 		return frappe._dict(data)
 
 
-def get_default_contact(doctype: str, name: str) -> Optional[str]:
+def get_default_contact(doctype: str, name: str) -> str | None:
 	"""
 	Returns contact name only if there is a primary contact for given doctype and name.
 
diff --git a/erpnext/accounts/report/account_balance/account_balance.py b/erpnext/accounts/report/account_balance/account_balance.py
index b3e80a7..628aca5 100644
--- a/erpnext/accounts/report/account_balance/account_balance.py
+++ b/erpnext/accounts/report/account_balance/account_balance.py
@@ -61,7 +61,6 @@
 
 
 def get_data(filters):
-
 	data = []
 	conditions = get_conditions(filters)
 	accounts = frappe.db.get_all(
diff --git a/erpnext/accounts/report/accounts_payable/test_accounts_payable.py b/erpnext/accounts/report/accounts_payable/test_accounts_payable.py
index b4cb25f..f5c9d16 100644
--- a/erpnext/accounts/report/accounts_payable/test_accounts_payable.py
+++ b/erpnext/accounts/report/accounts_payable/test_accounts_payable.py
@@ -1,16 +1,10 @@
-import unittest
-
 import frappe
-from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, flt, getdate, today
+from frappe.tests.utils import FrappeTestCase
+from frappe.utils import today
 
-from erpnext import get_default_cost_center
-from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
-from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.accounts.report.accounts_payable.accounts_payable import execute
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
-from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 
 
 class TestAccountsReceivable(AccountsTestMixin, FrappeTestCase):
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 38723e9..c7862c1 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -40,24 +40,20 @@
 	return ReceivablePayableReport(filters).run(args)
 
 
-class ReceivablePayableReport(object):
+class ReceivablePayableReport:
 	def __init__(self, filters=None):
 		self.filters = frappe._dict(filters or {})
 		self.qb_selection_filter = []
 		self.ple = qb.DocType("Payment Ledger Entry")
 		self.filters.report_date = getdate(self.filters.report_date or nowdate())
 		self.age_as_on = (
-			getdate(nowdate())
-			if self.filters.report_date > getdate(nowdate())
-			else self.filters.report_date
+			getdate(nowdate()) if self.filters.report_date > getdate(nowdate()) else self.filters.report_date
 		)
 
 	def run(self, args):
 		self.filters.update(args)
 		self.set_defaults()
-		self.party_naming_by = frappe.db.get_single_value(
-			args.get("naming_by")[0], args.get("naming_by")[1]
-		)
+		self.party_naming_by = frappe.db.get_single_value(args.get("naming_by")[0], args.get("naming_by")[1])
 		self.get_columns()
 		self.get_data()
 		self.get_chart_data()
@@ -279,7 +275,7 @@
 	def build_data(self):
 		# set outstanding for all the accumulated balances
 		# as we can use this to filter out invoices without outstanding
-		for key, row in self.voucher_balance.items():
+		for _key, row in self.voucher_balance.items():
 			row.outstanding = flt(row.invoiced - row.paid - row.credit_note, self.currency_precision)
 			row.outstanding_in_account_currency = flt(
 				row.invoiced_in_account_currency
@@ -293,7 +289,7 @@
 			must_consider = False
 			if self.filters.get("for_revaluation_journals"):
 				if (abs(row.outstanding) > 0.0 / 10**self.currency_precision) or (
-					(abs(row.outstanding_in_account_currency) > 0.0 / 10**self.currency_precision)
+					abs(row.outstanding_in_account_currency) > 0.0 / 10**self.currency_precision
 				):
 					must_consider = True
 			else:
@@ -479,19 +475,17 @@
 	def get_payment_terms(self, row):
 		# build payment_terms for row
 		payment_terms_details = frappe.db.sql(
-			"""
+			f"""
 			select
 				si.name, si.party_account_currency, si.currency, si.conversion_rate,
 				si.total_advance, ps.due_date, ps.payment_term, ps.payment_amount, ps.base_payment_amount,
 				ps.description, ps.paid_amount, ps.discounted_amount
-			from `tab{0}` si, `tabPayment Schedule` ps
+			from `tab{row.voucher_type}` si, `tabPayment Schedule` ps
 			where
 				si.name = ps.parent and
 				si.name = %s
 			order by ps.paid_amount desc, due_date
-		""".format(
-				row.voucher_type
-			),
+		""",
 			row.voucher_no,
 			as_dict=1,
 		)
@@ -735,9 +729,7 @@
 		row.age = (getdate(self.age_as_on) - getdate(entry_date)).days or 0
 		index = None
 
-		if not (
-			self.filters.range1 and self.filters.range2 and self.filters.range3 and self.filters.range4
-		):
+		if not (self.filters.range1 and self.filters.range2 and self.filters.range3 and self.filters.range4):
 			self.filters.range1, self.filters.range2, self.filters.range3, self.filters.range4 = (
 				30,
 				60,
@@ -763,12 +755,10 @@
 
 		if self.filters.show_future_payments:
 			self.qb_selection_filter.append(
-				(
-					self.ple.posting_date.lte(self.filters.report_date)
-					| (
-						(self.ple.voucher_no == self.ple.against_voucher_no)
-						& (Date(self.ple.creation).lte(self.filters.report_date))
-					)
+				self.ple.posting_date.lte(self.filters.report_date)
+				| (
+					(self.ple.voucher_no == self.ple.against_voucher_no)
+					& (Date(self.ple.creation).lte(self.filters.report_date))
 				)
 			)
 		else:
@@ -836,7 +826,7 @@
 		self.qb_selection_filter = []
 		self.or_filters = []
 
-		for party_type in self.party_type:
+		for _party_type in self.party_type:
 			self.add_common_filters()
 
 			if self.account_type == "Receivable":
diff --git a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
index de49139..83d95de 100644
--- a/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/test_accounts_receivable.py
@@ -1,11 +1,8 @@
-import unittest
-
 import frappe
 from frappe import qb
 from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils import add_days, flt, getdate, today
 
-from erpnext import get_default_cost_center
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.accounts.report.accounts_receivable.accounts_receivable import execute
@@ -126,7 +123,6 @@
 
 		# check invoice grand total and invoiced column's value for 3 payment terms
 		si = self.create_sales_invoice()
-		name = si.name
 
 		report = execute(filters)
 
@@ -218,7 +214,7 @@
 			[0, 0, 100.0, 0.0, -100.0, cr_note.name],
 		]
 		self.assertEqual(len(report[1]), 2)
-		si_row = [
+		si_row = next(
 			[
 				row.invoice_grand_total,
 				row.invoiced,
@@ -229,9 +225,9 @@
 			]
 			for row in report[1]
 			if row.voucher_no == si.name
-		][0]
+		)
 
-		cr_note_row = [
+		cr_note_row = next(
 			[
 				row.invoice_grand_total,
 				row.invoiced,
@@ -242,7 +238,7 @@
 			]
 			for row in report[1]
 			if row.voucher_no == cr_note.name
-		][0]
+		)
 		self.assertEqual(expected_data_after_credit_note[0], si_row)
 		self.assertEqual(expected_data_after_credit_note[1], cr_note_row)
 
@@ -317,9 +313,7 @@
 		err.extend("accounts", accounts)
 		err.accounts[0].new_exchange_rate = 85
 		row = err.accounts[0]
-		row.new_balance_in_base_currency = flt(
-			row.new_exchange_rate * flt(row.balance_in_account_currency)
-		)
+		row.new_balance_in_base_currency = flt(row.new_exchange_rate * flt(row.balance_in_account_currency))
 		row.gain_loss = row.new_balance_in_base_currency - flt(row.balance_in_base_currency)
 		err.set_total_gain_loss()
 		err = err.save().submit()
@@ -340,7 +334,7 @@
 		report = execute(filters)
 
 		expected_data_for_err = [0, -500, 0, 500]
-		row = [x for x in report[1] if x.voucher_type == je.doctype and x.voucher_no == je.name][0]
+		row = next(x for x in report[1] if x.voucher_type == je.doctype and x.voucher_no == je.name)
 		self.assertEqual(
 			expected_data_for_err,
 			[
@@ -551,7 +545,7 @@
 		self.assertEqual(expected_data, [row.invoiced, row.outstanding, row.sales_person])
 
 	def test_cost_center_filter(self):
-		si = self.create_sales_invoice()
+		self.create_sales_invoice()
 		filters = {
 			"company": self.company,
 			"report_date": today(),
@@ -568,7 +562,7 @@
 		self.assertEqual(expected_data, [row.invoiced, row.outstanding, row.cost_center])
 
 	def test_customer_group_filter(self):
-		si = self.create_sales_invoice()
+		self.create_sales_invoice()
 		cus_group = frappe.db.get_value("Customer", self.customer, "customer_group")
 		filters = {
 			"company": self.company,
@@ -590,7 +584,7 @@
 		self.assertEqual(len(report), 0)
 
 	def test_multi_customer_group_filter(self):
-		si = self.create_sales_invoice()
+		self.create_sales_invoice()
 		cus_group = frappe.db.get_value("Customer", self.customer, "customer_group")
 		# Create a list of customer groups, e.g., ["Group1", "Group2"]
 		cus_groups_list = [cus_group, "_Test Customer Group 1"]
@@ -703,7 +697,6 @@
 		si.conversion_rate = 80
 		si.debit_to = self.debtors_usd
 		si.save().submit()
-		name = si.name
 
 		# check invoice grand total and invoiced column's value for 3 payment terms
 		report = execute(filters)
@@ -763,9 +756,7 @@
 
 	def test_report_output_if_party_is_missing(self):
 		acc_name = "Additional Debtors"
-		if not frappe.db.get_value(
-			"Account", filters={"account_name": acc_name, "company": self.company}
-		):
+		if not frappe.db.get_value("Account", filters={"account_name": acc_name, "company": self.company}):
 			additional_receivable_acc = frappe.get_doc(
 				{
 					"doctype": "Account",
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
index 0947cff..1aab7f7 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.py
@@ -24,9 +24,7 @@
 	def run(self, args):
 		self.account_type = args.get("account_type")
 		self.party_type = get_party_types_from_account_type(self.account_type)
-		self.party_naming_by = frappe.db.get_single_value(
-			args.get("naming_by")[0], args.get("naming_by")[1]
-		)
+		self.party_naming_by = frappe.db.get_single_value(args.get("naming_by")[0], args.get("naming_by")[1])
 		self.get_columns()
 		self.get_data(args)
 		return self.columns, self.data
diff --git a/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py b/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py
index 3ee35a1..4ef607b 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py
+++ b/erpnext/accounts/report/accounts_receivable_summary/test_accounts_receivable_summary.py
@@ -1,5 +1,3 @@
-import unittest
-
 import frappe
 from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils import today
diff --git a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
index 48da17a..4fa485f 100644
--- a/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
+++ b/erpnext/accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py
@@ -70,7 +70,7 @@
 	if filters.get("asset_category"):
 		condition += " and asset_category = %(asset_category)s"
 	return frappe.db.sql(
-		"""
+		f"""
 		SELECT asset_category,
 			   ifnull(sum(case when purchase_date < %(from_date)s then
 							   case when ifnull(disposal_date, 0) = 0 or disposal_date >= %(from_date)s then
@@ -109,11 +109,9 @@
 								0
 						   end), 0) as cost_of_scrapped_asset
 		from `tabAsset`
-		where docstatus=1 and company=%(company)s and purchase_date <= %(to_date)s {}
+		where docstatus=1 and company=%(company)s and purchase_date <= %(to_date)s {condition}
 		group by asset_category
-	""".format(
-			condition
-		),
+	""",
 		{
 			"to_date": filters.to_date,
 			"from_date": filters.from_date,
@@ -129,7 +127,7 @@
 	if filters.get("asset"):
 		condition += " and name = %(asset)s"
 	return frappe.db.sql(
-		"""
+		f"""
 		SELECT name,
 			   ifnull(sum(case when purchase_date < %(from_date)s then
 							   case when ifnull(disposal_date, 0) = 0 or disposal_date >= %(from_date)s then
@@ -168,11 +166,9 @@
 								0
 						   end), 0) as cost_of_scrapped_asset
 		from `tabAsset`
-		where docstatus=1 and company=%(company)s and purchase_date <= %(to_date)s {}
+		where docstatus=1 and company=%(company)s and purchase_date <= %(to_date)s {condition}
 		group by name
-	""".format(
-			condition
-		),
+	""",
 		{
 			"to_date": filters.to_date,
 			"from_date": filters.from_date,
@@ -276,9 +272,7 @@
 			where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {0}
 			group by a.asset_category) as results
 		group by results.asset_category
-		""".format(
-			condition
-		),
+		""".format(condition),
 		{"to_date": filters.to_date, "from_date": filters.from_date, "company": filters.company},
 		as_dict=1,
 	)
@@ -338,9 +332,7 @@
 			where a.docstatus=1 and a.company=%(company)s and a.purchase_date <= %(to_date)s {0}
 			group by a.name) as results
 		group by results.name
-		""".format(
-			condition
-		),
+		""".format(condition),
 		{"to_date": filters.to_date, "from_date": filters.from_date, "company": filters.company},
 		as_dict=1,
 	)
diff --git a/erpnext/accounts/report/balance_sheet/balance_sheet.py b/erpnext/accounts/report/balance_sheet/balance_sheet.py
index d45dc07..b2e55b6 100644
--- a/erpnext/accounts/report/balance_sheet/balance_sheet.py
+++ b/erpnext/accounts/report/balance_sheet/balance_sheet.py
@@ -180,7 +180,6 @@
 	filters,
 	consolidated=False,
 ):
-
 	net_asset, net_liability, net_equity, net_provisional_profit_loss = 0.0, 0.0, 0.0, 0.0
 
 	if filters.get("accumulated_values"):
diff --git a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
index 7e0bdea..ae67567 100644
--- a/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
+++ b/erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
@@ -83,31 +83,27 @@
 	conditions = get_conditions(filters)
 
 	journal_entries = frappe.db.sql(
-		"""SELECT
+		f"""SELECT
 			"Journal Entry", jv.name, jv.posting_date, jv.cheque_no,
 			jv.clearance_date, jvd.against_account, jvd.debit - jvd.credit
 		FROM
 			`tabJournal Entry Account` jvd, `tabJournal Entry` jv
 		WHERE
-			jvd.parent = jv.name and jv.docstatus=1 and jvd.account = %(account)s {0}
-			order by posting_date DESC, jv.name DESC""".format(
-			conditions
-		),
+			jvd.parent = jv.name and jv.docstatus=1 and jvd.account = %(account)s {conditions}
+			order by posting_date DESC, jv.name DESC""",
 		filters,
 		as_list=1,
 	)
 
 	payment_entries = frappe.db.sql(
-		"""SELECT
+		f"""SELECT
 			"Payment Entry", name, posting_date, reference_no, clearance_date, party,
 			if(paid_from=%(account)s, ((paid_amount * -1) - total_taxes_and_charges) , received_amount)
 		FROM
 			`tabPayment Entry`
 		WHERE
-			docstatus=1 and (paid_from = %(account)s or paid_to = %(account)s) {0}
-			order by posting_date DESC, name DESC""".format(
-			conditions
-		),
+			docstatus=1 and (paid_from = %(account)s or paid_to = %(account)s) {conditions}
+			order by posting_date DESC, name DESC""",
 		filters,
 		as_list=1,
 	)
diff --git a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
index 206654c..8a8e3a5 100644
--- a/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
+++ b/erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
@@ -32,10 +32,7 @@
 	amounts_not_reflected_in_system = get_amounts_not_reflected_in_system(filters)
 
 	bank_bal = (
-		flt(balance_as_per_system)
-		- flt(total_debit)
-		+ flt(total_credit)
-		+ amounts_not_reflected_in_system
+		flt(balance_as_per_system) - flt(total_debit) + flt(total_credit) + amounts_not_reflected_in_system
 	)
 
 	data += [
diff --git a/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py b/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py
index 62bee82..f6efc8a 100644
--- a/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py
+++ b/erpnext/accounts/report/billed_items_to_be_received/billed_items_to_be_received.py
@@ -30,9 +30,7 @@
 	]
 
 	if report_filters.get("purchase_invoice"):
-		filters.append(
-			["Purchase Invoice", "per_received", "in", [report_filters.get("purchase_invoice")]]
-		)
+		filters.append(["Purchase Invoice", "per_received", "in", [report_filters.get("purchase_invoice")]])
 
 	return filters
 
@@ -40,10 +38,10 @@
 def get_report_fields():
 	fields = []
 	for p_field in ["name", "supplier", "company", "posting_date", "currency"]:
-		fields.append("`tabPurchase Invoice`.`{}`".format(p_field))
+		fields.append(f"`tabPurchase Invoice`.`{p_field}`")
 
 	for c_field in ["item_code", "item_name", "uom", "qty", "received_qty", "rate", "amount"]:
-		fields.append("`tabPurchase Invoice Item`.`{}`".format(c_field))
+		fields.append(f"`tabPurchase Invoice Item`.`{c_field}`")
 
 	return fields
 
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
index 96cfab9..e540aa9 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
@@ -112,7 +112,9 @@
 				]:
 					if group_months:
 						label = label % (
-							formatdate(from_date, format_string="MMM") + "-" + formatdate(to_date, format_string="MMM")
+							formatdate(from_date, format_string="MMM")
+							+ "-"
+							+ formatdate(to_date, format_string="MMM")
 						)
 					else:
 						label = label % formatdate(from_date, format_string="MMM")
@@ -147,9 +149,7 @@
 				where
 					company = %s
 				{order_by}
-			""".format(
-				tab=filters.get("budget_against"), order_by=order_by
-			),
+			""".format(tab=filters.get("budget_against"), order_by=order_by),
 			filters.get("company"),
 		)
 	else:
@@ -159,9 +159,7 @@
 					name
 				from
 					`tab{tab}`
-			""".format(
-				tab=filters.get("budget_against")
-			)
+			""".format(tab=filters.get("budget_against"))
 		)  # nosec
 
 
@@ -170,12 +168,12 @@
 	budget_against = frappe.scrub(filters.get("budget_against"))
 	cond = ""
 	if filters.get("budget_against_filter"):
-		cond += """ and b.{budget_against} in (%s)""".format(budget_against=budget_against) % ", ".join(
+		cond += f""" and b.{budget_against} in (%s)""" % ", ".join(
 			["%s"] * len(filters.get("budget_against_filter"))
 		)
 
 	return frappe.db.sql(
-		"""
+		f"""
 			select
 				b.{budget_against} as budget_against,
 				b.monthly_distribution,
@@ -194,10 +192,7 @@
 				{cond}
 			order by
 				b.fiscal_year
-		""".format(
-			budget_against=budget_against,
-			cond=cond,
-		),
+		""",
 		tuple(
 			[
 				filters.from_fiscal_year,
@@ -244,15 +239,13 @@
 
 	if filters.get("budget_against") == "Cost Center":
 		cc_lft, cc_rgt = frappe.db.get_value("Cost Center", name, ["lft", "rgt"])
-		cond = """
-				and lft >= "{lft}"
-				and rgt <= "{rgt}"
-			""".format(
-			lft=cc_lft, rgt=cc_rgt
-		)
+		cond = f"""
+				and lft >= "{cc_lft}"
+				and rgt <= "{cc_rgt}"
+			"""
 
 	ac_details = frappe.db.sql(
-		"""
+		f"""
 			select
 				gl.account,
 				gl.debit,
@@ -275,7 +268,7 @@
 					select
 						name
 					from
-						`tab{tab}`
+						`tab{filters.budget_against}`
 					where
 						name = gl.{budget_against}
 						{cond}
@@ -283,9 +276,7 @@
 				group by
 					gl.name
 				order by gl.fiscal_year
-		""".format(
-			tab=filters.budget_against, budget_against=budget_against, cond=cond
-		),
+		""",
 		(filters.from_fiscal_year, filters.to_fiscal_year, name),
 		as_dict=1,
 	)
@@ -314,7 +305,9 @@
 
 			tav_dict = cam_map[ccd.budget_against][ccd.account][ccd.fiscal_year][month]
 			month_percentage = (
-				tdd.get(ccd.monthly_distribution, {}).get(month, 0) if ccd.monthly_distribution else 100.0 / 12
+				tdd.get(ccd.monthly_distribution, {}).get(month, 0)
+				if ccd.monthly_distribution
+				else 100.0 / 12
 			)
 
 			tav_dict.target = flt(ccd.budget_amount) * month_percentage / 100
@@ -327,7 +320,6 @@
 
 
 def get_fiscal_years(filters):
-
 	fiscal_year = frappe.db.sql(
 		"""
 			select
@@ -344,7 +336,6 @@
 
 
 def get_chart_data(filters, columns, data):
-
 	if not data:
 		return None
 
@@ -360,7 +351,9 @@
 			else:
 				if group_months:
 					label = (
-						formatdate(from_date, format_string="MMM") + "-" + formatdate(to_date, format_string="MMM")
+						formatdate(from_date, format_string="MMM")
+						+ "-"
+						+ formatdate(to_date, format_string="MMM")
 					)
 					labels.append(label)
 				else:
diff --git a/erpnext/accounts/report/cash_flow/cash_flow.py b/erpnext/accounts/report/cash_flow/cash_flow.py
index d3b0692..c034f95 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -109,9 +109,7 @@
 	add_total_row_account(
 		data, data, _("Net Change in Cash"), period_list, company_currency, summary_data, filters
 	)
-	columns = get_columns(
-		filters.periodicity, period_list, filters.accumulated_values, filters.company
-	)
+	columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company)
 
 	chart = get_chart_data(columns, data)
 
@@ -178,8 +176,8 @@
 
 	if filters.include_default_book_entries:
 		company_fb = frappe.get_cached_value("Company", company, "default_finance_book")
-		cond = """ AND (finance_book in (%s, %s, '') OR finance_book IS NULL)
-			""" % (
+		cond = """ AND (finance_book in ({}, {}, '') OR finance_book IS NULL)
+			""".format(
 			frappe.db.escape(filters.finance_book),
 			frappe.db.escape(company_fb),
 		)
@@ -193,15 +191,13 @@
 		cond += " and cost_center in %(cost_center)s"
 
 	gl_sum = frappe.db.sql_list(
-		"""
+		f"""
 		select sum(credit) - sum(debit)
 		from `tabGL Entry`
 		where company=%(company)s and posting_date >= %(start_date)s and posting_date <= %(end_date)s
 			and voucher_type != 'Period Closing Voucher'
 			and account in ( SELECT name FROM tabAccount WHERE account_type = %(account_type)s) {cond}
-	""".format(
-			cond=cond
-		),
+	""",
 		filters,
 	)
 
@@ -219,9 +215,7 @@
 	return start_date
 
 
-def add_total_row_account(
-	out, data, label, period_list, currency, summary_data, filters, consolidated=False
-):
+def add_total_row_account(out, data, label, period_list, currency, summary_data, filters, consolidated=False):
 	total_row = {
 		"account_name": "'" + _("{0}").format(label) + "'",
 		"account": "'" + _("{0}").format(label) + "'",
@@ -253,9 +247,7 @@
 	report_summary = []
 
 	for label, value in summary_data.items():
-		report_summary.append(
-			{"value": value, "label": label, "datatype": "Currency", "currency": currency}
-		)
+		report_summary.append({"value": value, "label": label, "datatype": "Currency", "currency": currency})
 
 	return report_summary
 
@@ -268,7 +260,7 @@
 			"values": [account.get(d.get("fieldname")) for d in columns[2:]],
 		}
 		for account in data
-		if account.get("parent_account") == None and account.get("currency")
+		if account.get("parent_account") is None and account.get("currency")
 	]
 	datasets = datasets[:-1]
 
diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
index 0051ba6..b20f3b3 100644
--- a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
+++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
@@ -55,9 +55,7 @@
 			fiscal_year, companies, columns, filters
 		)
 	elif filters.get("report") == "Profit and Loss Statement":
-		data, message, chart, report_summary = get_profit_loss_data(
-			fiscal_year, companies, columns, filters
-		)
+		data, message, chart, report_summary = get_profit_loss_data(fiscal_year, companies, columns, filters)
 	else:
 		data, report_summary = get_cash_flow_data(fiscal_year, companies, filters)
 
@@ -81,9 +79,7 @@
 		asset, liability, equity, companies, filters.get("company"), company_currency, True
 	)
 
-	message, opening_balance = prepare_companywise_opening_balance(
-		asset, liability, equity, companies
-	)
+	message, opening_balance = prepare_companywise_opening_balance(asset, liability, equity, companies)
 
 	if opening_balance:
 		unclosed = {
@@ -192,9 +188,7 @@
 
 	expense = get_data(companies, "Expense", "Debit", fiscal_year, filters, True)
 
-	net_profit_loss = get_net_profit_loss(
-		income, expense, companies, filters.company, company_currency, True
-	)
+	net_profit_loss = get_net_profit_loss(income, expense, companies, filters.company, company_currency, True)
 
 	return income, expense, net_profit_loss
 
@@ -323,9 +317,7 @@
 	return columns
 
 
-def get_data(
-	companies, root_type, balance_must_be, fiscal_year, filters=None, ignore_closing_entries=False
-):
+def get_data(companies, root_type, balance_must_be, fiscal_year, filters=None, ignore_closing_entries=False):
 	accounts, accounts_by_name, parent_children_map = get_account_heads(root_type, companies, filters)
 
 	if not accounts:
@@ -349,7 +341,6 @@
 		root_type,
 		as_dict=1,
 	):
-
 		set_gl_entries_by_account(
 			start_date,
 			end_date,
@@ -366,9 +357,7 @@
 	calculate_values(accounts_by_name, gl_entries_by_account, companies, filters, fiscal_year)
 	accumulate_values_into_parents(accounts, accounts_by_name, companies)
 
-	out = prepare_data(
-		accounts, start_date, end_date, balance_must_be, companies, company_currency, filters
-	)
+	out = prepare_data(accounts, start_date, end_date, balance_must_be, companies, company_currency, filters)
 
 	out = filter_out_zero_value_rows(
 		out, parent_children_map, show_zero_values=filters.get("show_zero_values")
@@ -388,9 +377,7 @@
 
 def calculate_values(accounts_by_name, gl_entries_by_account, companies, filters, fiscal_year):
 	start_date = (
-		fiscal_year.year_start_date
-		if filters.filter_based_on == "Fiscal Year"
-		else filters.period_start_date
+		fiscal_year.year_start_date if filters.filter_based_on == "Fiscal Year" else filters.period_start_date
 	)
 
 	for entries in gl_entries_by_account.values():
@@ -422,8 +409,12 @@
 							and parent_company_currency != child_company_currency
 							and filters.get("accumulated_in_group_company")
 						):
-							debit = convert(debit, parent_company_currency, child_company_currency, filters.end_date)
-							credit = convert(credit, parent_company_currency, child_company_currency, filters.end_date)
+							debit = convert(
+								debit, parent_company_currency, child_company_currency, filters.end_date
+							)
+							credit = convert(
+								credit, parent_company_currency, child_company_currency, filters.end_date
+							)
 
 						d[company] = d.get(company, 0.0) + flt(debit) - flt(credit)
 
@@ -507,10 +498,8 @@
 	lft, rgt = frappe.get_cached_value("Company", company, ["lft", "rgt"])
 
 	return frappe.db.sql_list(
-		"""select name from `tabCompany`
-		where lft >= {0} and rgt <= {1} order by lft, rgt""".format(
-			lft, rgt
-		)
+		f"""select name from `tabCompany`
+		where lft >= {lft} and rgt <= {rgt} order by lft, rgt"""
 	)
 
 
@@ -547,9 +536,7 @@
 	return accounts
 
 
-def prepare_data(
-	accounts, start_date, end_date, balance_must_be, companies, company_currency, filters
-):
+def prepare_data(accounts, start_date, end_date, balance_must_be, companies, company_currency, filters):
 	data = []
 
 	for d in accounts:
@@ -559,9 +546,7 @@
 		row = frappe._dict(
 			{
 				"account_name": (
-					"%s - %s" % (_(d.account_number), _(d.account_name))
-					if d.account_number
-					else _(d.account_name)
+					f"{_(d.account_number)} - {_(d.account_name)}" if d.account_number else _(d.account_name)
 				),
 				"account": _(d.name),
 				"parent_account": _(d.parent_account),
@@ -609,9 +594,7 @@
 ):
 	"""Returns a dict like { "account": [gl entries], ... }"""
 
-	company_lft, company_rgt = frappe.get_cached_value(
-		"Company", filters.get("company"), ["lft", "rgt"]
-	)
+	company_lft, company_rgt = frappe.get_cached_value("Company", filters.get("company"), ["lft", "rgt"])
 
 	companies = frappe.db.sql(
 		""" select name, default_currency from `tabCompany`
@@ -739,7 +722,7 @@
 	additional_conditions = []
 
 	if ignore_closing_entries:
-		additional_conditions.append((gle.voucher_type != "Period Closing Voucher"))
+		additional_conditions.append(gle.voucher_type != "Period Closing Voucher")
 
 	if from_date:
 		additional_conditions.append(gle.posting_date >= from_date)
@@ -802,7 +785,7 @@
 	def add_to_list(parent, level):
 		if level < depth:
 			children = parent_children_map.get(parent) or []
-			sort_accounts(children, is_root=True if parent == None else False)
+			sort_accounts(children, is_root=True if parent is None else False)
 
 			for child in children:
 				child.indent = level
diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
index f4a0175..7b99096 100644
--- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
+++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
@@ -7,7 +7,7 @@
 from frappe.utils import getdate, nowdate
 
 
-class PartyLedgerSummaryReport(object):
+class PartyLedgerSummaryReport:
 	def __init__(self, filters=None):
 		self.filters = frappe._dict(filters or {})
 		self.filters.from_date = getdate(self.filters.from_date or nowdate())
@@ -21,9 +21,7 @@
 			frappe.throw(_("From Date must be before To Date"))
 
 		self.filters.party_type = args.get("party_type")
-		self.party_naming_by = frappe.db.get_single_value(
-			args.get("naming_by")[0], args.get("naming_by")[1]
-		)
+		self.party_naming_by = frappe.db.get_single_value(args.get("naming_by")[0], args.get("naming_by")[1])
 
 		self.get_gl_entries()
 		self.get_additional_columns()
@@ -49,7 +47,7 @@
 				.select(
 					customer.name, customer.territory, customer.customer_group, customer.default_sales_partner
 				)
-				.where((customer.disabled == 0))
+				.where(customer.disabled == 0)
 				.run(as_dict=True)
 			)
 
@@ -62,7 +60,7 @@
 			result = (
 				frappe.qb.from_(supplier)
 				.select(supplier.name, supplier.supplier_group)
-				.where((supplier.disabled == 0))
+				.where(supplier.disabled == 0)
 				.run(as_dict=True)
 			)
 
@@ -184,9 +182,7 @@
 		return columns
 
 	def get_data(self):
-		company_currency = frappe.get_cached_value(
-			"Company", self.filters.get("company"), "default_currency"
-		)
+		company_currency = frappe.get_cached_value("Company", self.filters.get("company"), "default_currency")
 		invoice_dr_or_cr = "debit" if self.filters.party_type == "Customer" else "credit"
 		reverse_dr_or_cr = "credit" if self.filters.party_type == "Customer" else "debit"
 
@@ -260,7 +256,7 @@
 			join = "left join `tabSupplier` p on gle.party = p.name"
 
 		self.gl_entries = frappe.db.sql(
-			"""
+			f"""
 			select
 				gle.posting_date, gle.party, gle.voucher_type, gle.voucher_no, gle.against_voucher_type,
 				gle.against_voucher, gle.debit, gle.credit, gle.is_opening {join_field}
@@ -270,9 +266,7 @@
 				gle.docstatus < 2 and gle.is_cancelled = 0 and gle.party_type=%(party_type)s and ifnull(gle.party, '') != ''
 				and gle.posting_date <= %(to_date)s {conditions}
 			order by gle.posting_date
-		""".format(
-				join=join, join_field=join_field, conditions=conditions
-			),
+		""",
 			self.filters,
 			as_dict=True,
 		)
@@ -296,22 +290,18 @@
 				)
 
 				conditions.append(
-					"""party in (select name from tabCustomer
-					where exists(select name from `tabCustomer Group` where lft >= {0} and rgt <= {1}
-						and name=tabCustomer.customer_group))""".format(
-						lft, rgt
-					)
+					f"""party in (select name from tabCustomer
+					where exists(select name from `tabCustomer Group` where lft >= {lft} and rgt <= {rgt}
+						and name=tabCustomer.customer_group))"""
 				)
 
 			if self.filters.get("territory"):
 				lft, rgt = frappe.db.get_value("Territory", self.filters.get("territory"), ["lft", "rgt"])
 
 				conditions.append(
-					"""party in (select name from tabCustomer
-					where exists(select name from `tabTerritory` where lft >= {0} and rgt <= {1}
-						and name=tabCustomer.territory))""".format(
-						lft, rgt
-					)
+					f"""party in (select name from tabCustomer
+					where exists(select name from `tabTerritory` where lft >= {lft} and rgt <= {rgt}
+						and name=tabCustomer.territory))"""
 				)
 
 			if self.filters.get("payment_terms_template"):
@@ -331,12 +321,10 @@
 
 				conditions.append(
 					"""exists(select name from `tabSales Team` steam where
-					steam.sales_person in (select name from `tabSales Person` where lft >= {0} and rgt <= {1})
+					steam.sales_person in (select name from `tabSales Person` where lft >= {} and rgt <= {})
 					and ((steam.parent = voucher_no and steam.parenttype = voucher_type)
 						or (steam.parent = against_voucher and steam.parenttype = against_voucher_type)
-						or (steam.parent = party and steam.parenttype = 'Customer')))""".format(
-						lft, rgt
-					)
+						or (steam.parent = party and steam.parenttype = 'Customer')))""".format(lft, rgt)
 				)
 
 		if self.filters.party_type == "Supplier":
@@ -392,7 +380,7 @@
 		)
 
 		gl_entries = frappe.db.sql(
-			"""
+			f"""
 			select
 				posting_date, account, party, voucher_type, voucher_no, debit, credit
 			from
@@ -406,10 +394,7 @@
 					where gle.party_type=%(party_type)s and ifnull(party, '') != ''
 					and gle.posting_date between %(from_date)s and %(to_date)s and gle.docstatus < 2 {conditions}
 				)
-			""".format(
-				accounts_query=accounts_query,
-				conditions=conditions,
-			),
+			""",
 			self.filters,
 			as_dict=True,
 		)
@@ -440,14 +425,14 @@
 
 			if parties and accounts:
 				if len(parties) == 1:
-					party = list(parties.keys())[0]
+					party = next(iter(parties.keys()))
 					for account, amount in accounts.items():
 						self.party_adjustment_accounts.add(account)
 						self.party_adjustment_details.setdefault(party, {})
 						self.party_adjustment_details[party].setdefault(account, 0)
 						self.party_adjustment_details[party][account] += amount
 				elif len(accounts) == 1 and not has_irrelevant_entry:
-					account = list(accounts.keys())[0]
+					account = next(iter(accounts.keys()))
 					self.party_adjustment_accounts.add(account)
 					for party, amount in parties.items():
 						self.party_adjustment_details.setdefault(party, {})
diff --git a/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py b/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py
index eebd61c..ef993e4 100644
--- a/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py
+++ b/erpnext/accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py
@@ -10,7 +10,7 @@
 from erpnext.accounts.utils import get_fiscal_year
 
 
-class Deferred_Item(object):
+class Deferred_Item:
 	"""
 	Helper class for processing items with deferred revenue/expense
 	"""
@@ -152,13 +152,11 @@
 					if posting.posted == "posted":
 						actual += self.get_amount(posting)
 
-			self.period_total.append(
-				frappe._dict({"key": period.key, "total": period_sum, "actual": actual})
-			)
+			self.period_total.append(frappe._dict({"key": period.key, "total": period_sum, "actual": actual}))
 		return self.period_total
 
 
-class Deferred_Invoice(object):
+class Deferred_Invoice:
 	def __init__(self, invoice, items, filters, period_list):
 		"""
 		Helper class for processing invoices with deferred revenue/expense items
@@ -194,7 +192,7 @@
 		for item in self.items:
 			item_total = item.calculate_item_revenue_expense_for_period()
 			# update invoice total
-			for idx, period in enumerate(self.period_list, 0):
+			for idx in range(len(self.period_list)):
 				self.period_total[idx].total += item_total[idx].total
 				self.period_total[idx].actual += item_total[idx].actual
 		return self.period_total
@@ -219,7 +217,7 @@
 		return ret_data
 
 
-class Deferred_Revenue_and_Expense_Report(object):
+class Deferred_Revenue_and_Expense_Report:
 	def __init__(self, filters=None):
 		"""
 		Initialize deferred revenue/expense report with user provided filters or system defaults, if none is provided
@@ -348,7 +346,7 @@
 		for inv in self.deferred_invoices:
 			inv_total = inv.calculate_invoice_revenue_expense_for_period()
 			# calculate total for whole report
-			for idx, period in enumerate(self.period_list, 0):
+			for idx in range(len(self.period_list)):
 				self.period_total[idx].total += inv_total[idx].total
 				self.period_total[idx].actual += inv_total[idx].actual
 
diff --git a/erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py b/erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py
index 7b1a902..f8a965b 100644
--- a/erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py
+++ b/erpnext/accounts/report/deferred_revenue_and_expense/test_deferred_revenue_and_expense.py
@@ -1,5 +1,3 @@
-import unittest
-
 import frappe
 from frappe import qb
 from frappe.tests.utils import FrappeTestCase, change_settings
@@ -13,8 +11,6 @@
 )
 from erpnext.accounts.test.accounts_mixin import AccountsTestMixin
 from erpnext.accounts.utils import get_fiscal_year
-from erpnext.buying.doctype.supplier.test_supplier import create_supplier
-from erpnext.stock.doctype.item.test_item import create_item
 
 
 class TestDeferredRevenueAndExpense(FrappeTestCase, AccountsTestMixin):
diff --git a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py
index 5939a26..db984e8 100644
--- a/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py
+++ b/erpnext/accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.py
@@ -15,7 +15,6 @@
 
 
 def execute(filters=None):
-
 	validate_filters(filters)
 	dimension_list = get_dimensions(filters)
 
@@ -90,9 +89,7 @@
 	gl_filters["dimensions"] = set(dimension_list)
 
 	if filters.get("include_default_book_entries"):
-		gl_filters["company_fb"] = frappe.get_cached_value(
-			"Company", filters.company, "default_finance_book"
-		)
+		gl_filters["company_fb"] = frappe.get_cached_value("Company", filters.company, "default_finance_book")
 
 	gl_entries = frappe.db.sql(
 		"""
@@ -119,7 +116,6 @@
 
 
 def format_gl_entries(gl_entries_by_account, accounts_by_name, dimension_list, dimension_type):
-
 	for entries in gl_entries_by_account.values():
 		for entry in entries:
 			d = accounts_by_name.get(entry.account)
@@ -151,7 +147,7 @@
 			"to_date": filters.to_date,
 			"currency": company_currency,
 			"account_name": (
-				"{} - {}".format(d.account_number, d.account_name) if d.account_number else d.account_name
+				f"{d.account_number} - {d.account_name}" if d.account_number else d.account_name
 			),
 		}
 
@@ -183,7 +179,7 @@
 def get_condition(dimension):
 	conditions = []
 
-	conditions.append("{0} in %(dimensions)s".format(frappe.scrub(dimension)))
+	conditions.append(f"{frappe.scrub(dimension)} in %(dimensions)s")
 
 	return " and {}".format(" and ".join(conditions)) if conditions else ""
 
diff --git a/erpnext/accounts/report/financial_ratios/financial_ratios.py b/erpnext/accounts/report/financial_ratios/financial_ratios.py
index 47b4fd0..c97cd89 100644
--- a/erpnext/accounts/report/financial_ratios/financial_ratios.py
+++ b/erpnext/accounts/report/financial_ratios/financial_ratios.py
@@ -67,7 +67,6 @@
 
 
 def get_ratios_data(filters, period_list, years):
-
 	data = []
 	assets, liabilities, income, expense = get_gl_data(filters, period_list, years)
 
@@ -113,9 +112,7 @@
 	add_solvency_ratios(
 		data, years, total_asset, total_liability, net_sales, cogs, total_income, total_expense
 	)
-	add_turnover_ratios(
-		data, years, period_list, filters, total_asset, net_sales, cogs, direct_expense
-	)
+	add_turnover_ratios(data, years, period_list, filters, total_asset, net_sales, cogs, direct_expense)
 
 	return data
 
@@ -180,9 +177,7 @@
 		profit_after_tax = flt(total_income.get(year)) + flt(total_expense.get(year))
 		share_holder_fund = flt(total_asset.get(year)) - flt(total_liability.get(year))
 
-		debt_equity_ratio[year] = calculate_ratio(
-			total_liability.get(year), share_holder_fund, precision
-		)
+		debt_equity_ratio[year] = calculate_ratio(total_liability.get(year), share_holder_fund, precision)
 		return_on_equity_ratio[year] = calculate_ratio(profit_after_tax, share_holder_fund, precision)
 
 		net_profit_ratio[year] = calculate_ratio(profit_after_tax, net_sales.get(year), precision)
@@ -198,9 +193,7 @@
 	data.append(return_on_equity_ratio)
 
 
-def add_turnover_ratios(
-	data, years, period_list, filters, total_asset, net_sales, cogs, direct_expense
-):
+def add_turnover_ratios(data, years, period_list, filters, total_asset, net_sales, cogs, direct_expense):
 	precision = frappe.db.get_single_value("System Settings", "float_precision")
 	data.append({"ratio": "Turnover Ratios"})
 
@@ -240,7 +233,6 @@
 	net_dict=None,
 	total_net=0,
 ):
-
 	for entry in root_type_data:
 		if not entry.get("parent_account") and entry.get("is_group"):
 			total_dict[year] = entry[year]
@@ -283,9 +275,7 @@
 			company=filters.company,
 			account_type=account_type,
 		)
-		avg_ratio[period["key"]] = flt(
-			(flt(closing_balance) + flt(opening_balance)) / 2, precision=precision
-		)
+		avg_ratio[period["key"]] = flt((flt(closing_balance) + flt(opening_balance)) / 2, precision=precision)
 
 	return avg_ratio
 
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index aadd873..6d763597 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -162,7 +162,6 @@
 	ignore_accumulated_values_for_fy=False,
 	total=True,
 ):
-
 	accounts = get_accounts(company, root_type)
 	if not accounts:
 		return None
@@ -178,7 +177,6 @@
 		root_type,
 		as_dict=1,
 	):
-
 		set_gl_entries_by_account(
 			company,
 			period_list[0]["year_start_date"] if only_current_fiscal_year else None,
@@ -242,7 +240,8 @@
 
 				if entry.posting_date <= period.to_date:
 					if (accumulated_values or entry.posting_date >= period.from_date) and (
-						not ignore_accumulated_values_for_fy or entry.fiscal_year == period.to_date_fiscal_year
+						not ignore_accumulated_values_for_fy
+						or entry.fiscal_year == period.to_date_fiscal_year
 					):
 						d[period.key] = d.get(period.key, 0.0) + flt(entry.debit) - flt(entry.credit)
 
@@ -286,9 +285,7 @@
 				"is_group": d.is_group,
 				"opening_balance": d.get("opening_balance", 0.0) * (1 if balance_must_be == "Debit" else -1),
 				"account_name": (
-					"%s - %s" % (_(d.account_number), _(d.account_name))
-					if d.account_number
-					else _(d.account_name)
+					f"{_(d.account_number)} - {_(d.account_name)}" if d.account_number else _(d.account_name)
 				),
 			}
 		)
@@ -382,7 +379,7 @@
 	def add_to_list(parent, level):
 		if level < depth:
 			children = parent_children_map.get(parent) or []
-			sort_accounts(children, is_root=True if parent == None else False)
+			sort_accounts(children, is_root=True if parent is None else False)
 
 			for child in children:
 				child.indent = level
@@ -573,7 +570,9 @@
 			company_fb = frappe.get_cached_value("Company", filters.company, "default_finance_book")
 
 			if filters.finance_book and company_fb and cstr(filters.finance_book) != cstr(company_fb):
-				frappe.throw(_("To use a different finance book, please uncheck 'Include Default FB Entries'"))
+				frappe.throw(
+					_("To use a different finance book, please uncheck 'Include Default FB Entries'")
+				)
 
 			query = query.where(
 				(gl_entry.finance_book.isin([cstr(filters.finance_book), cstr(company_fb), ""]))
diff --git a/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py b/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py
index 696a03b..89cf7e5 100644
--- a/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py
+++ b/erpnext/accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.py
@@ -7,7 +7,7 @@
 from frappe.query_builder.functions import Sum
 
 
-class General_Payment_Ledger_Comparison(object):
+class General_Payment_Ledger_Comparison:
 	"""
 	A Utility report to compare Voucher-wise balance between General and Payment Ledger
 	"""
@@ -58,10 +58,9 @@
 
 		for acc_type, val in self.account_types.items():
 			if val.accounts:
-
 				filter_criterion = []
 				if self.filters.voucher_no:
-					filter_criterion.append((gle.voucher_no == self.filters.voucher_no))
+					filter_criterion.append(gle.voucher_no == self.filters.voucher_no)
 
 				if self.filters.period_start_date:
 					filter_criterion.append(gle.posting_date.gte(self.filters.period_start_date))
@@ -102,10 +101,9 @@
 
 		for acc_type, val in self.account_types.items():
 			if val.accounts:
-
 				filter_criterion = []
 				if self.filters.voucher_no:
-					filter_criterion.append((ple.voucher_no == self.filters.voucher_no))
+					filter_criterion.append(ple.voucher_no == self.filters.voucher_no)
 
 				if self.filters.period_start_date:
 					filter_criterion.append(ple.posting_date.gte(self.filters.period_start_date))
@@ -141,7 +139,7 @@
 		self.ple_balances = set()
 
 		# consolidate both receivable and payable balances in one set
-		for acc_type, val in self.account_types.items():
+		for _acc_type, val in self.account_types.items():
 			self.gle_balances = set(val.gle) | self.gle_balances
 			self.ple_balances = set(val.ple) | self.ple_balances
 
@@ -177,7 +175,6 @@
 
 	def get_columns(self):
 		self.columns = []
-		options = None
 		self.columns.append(
 			dict(
 				label=_("Company"),
diff --git a/erpnext/accounts/report/general_and_payment_ledger_comparison/test_general_and_payment_ledger_comparison.py b/erpnext/accounts/report/general_and_payment_ledger_comparison/test_general_and_payment_ledger_comparison.py
index 59e906b..afa81b8 100644
--- a/erpnext/accounts/report/general_and_payment_ledger_comparison/test_general_and_payment_ledger_comparison.py
+++ b/erpnext/accounts/report/general_and_payment_ledger_comparison/test_general_and_payment_ledger_comparison.py
@@ -1,5 +1,3 @@
-import unittest
-
 import frappe
 from frappe import qb
 from frappe.tests.utils import FrappeTestCase
@@ -40,9 +38,7 @@
 		)
 
 		# manually edit the payment ledger entry
-		ple = frappe.db.get_all(
-			"Payment Ledger Entry", filters={"voucher_no": sinv.name, "delinked": 0}
-		)[0]
+		ple = frappe.db.get_all("Payment Ledger Entry", filters={"voucher_no": sinv.name, "delinked": 0})[0]
 		frappe.db.set_value("Payment Ledger Entry", ple.name, "amount", sinv.grand_total - 1)
 
 		filters = frappe._dict({"company": self.company})
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index cea3a7b..bee46c1 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -102,9 +102,7 @@
 
 def set_account_currency(filters):
 	if filters.get("account") or (filters.get("party") and len(filters.party) == 1):
-		filters["company_currency"] = frappe.get_cached_value(
-			"Company", filters.company, "default_currency"
-		)
+		filters["company_currency"] = frappe.get_cached_value("Company", filters.company, "default_currency")
 		account_currency = None
 
 		if filters.get("account"):
@@ -164,9 +162,7 @@
 		credit_in_account_currency """
 
 	if filters.get("show_remarks"):
-		if remarks_length := frappe.db.get_single_value(
-			"Accounts Settings", "general_ledger_remarks_length"
-		):
+		if remarks_length := frappe.db.get_single_value("Accounts Settings", "general_ledger_remarks_length"):
 			select_fields += f",substr(remarks, 1, {remarks_length}) as 'remarks'"
 		else:
 			select_fields += """,remarks"""
@@ -197,7 +193,7 @@
 		)
 
 	gl_entries = frappe.db.sql(
-		"""
+		f"""
 		select
 			name as gl_entry, posting_date, account, party_type, party,
 			voucher_type, voucher_subtype, voucher_no, {dimension_fields}
@@ -205,15 +201,9 @@
 			against_voucher_type, against_voucher, account_currency,
 			against, is_opening, creation {select_fields}
 		from `tabGL Entry`
-		where company=%(company)s {conditions}
+		where company=%(company)s {get_conditions(filters)}
 		{order_by_statement}
-	""".format(
-			dimension_fields=dimension_fields,
-			transaction_currency_fields=transaction_currency_fields,
-			select_fields=select_fields,
-			conditions=get_conditions(filters),
-			order_by_statement=order_by_statement,
-		),
+	""",
 		filters,
 		as_dict=1,
 	)
@@ -283,7 +273,9 @@
 			if filters.get("company_fb") and cstr(filters.get("finance_book")) != cstr(
 				filters.get("company_fb")
 			):
-				frappe.throw(_("To use a different finance book, please uncheck 'Include Default FB Entries'"))
+				frappe.throw(
+					_("To use a different finance book, please uncheck 'Include Default FB Entries'")
+				)
 			else:
 				conditions.append("(finance_book in (%(finance_book)s, '') OR finance_book IS NULL)")
 		else:
@@ -315,9 +307,9 @@
 						filters[dimension.fieldname] = get_dimension_with_children(
 							dimension.document_type, filters.get(dimension.fieldname)
 						)
-						conditions.append("{0} in %({0})s".format(dimension.fieldname))
+						conditions.append(f"{dimension.fieldname} in %({dimension.fieldname})s")
 					else:
-						conditions.append("{0} in %({0})s".format(dimension.fieldname))
+						conditions.append(f"{dimension.fieldname} in %({dimension.fieldname})s")
 
 	return "and {}".format(" and ".join(conditions)) if conditions else ""
 
@@ -351,7 +343,7 @@
 	data.append(totals.opening)
 
 	if filters.get("group_by") != "Group by Voucher (Consolidated)":
-		for acc, acc_dict in gle_map.items():
+		for _acc, acc_dict in gle_map.items():
 			# acc
 			if acc_dict.entries:
 				# opening
@@ -383,7 +375,7 @@
 def get_totals_dict():
 	def _get_debit_credit_dict(label):
 		return _dict(
-			account="'{0}'".format(label),
+			account=f"'{label}'",
 			debit=0.0,
 			credit=0.0,
 			debit_in_account_currency=0.0,
@@ -432,9 +424,10 @@
 		data[key].debit_in_account_currency += gle.debit_in_account_currency
 		data[key].credit_in_account_currency += gle.credit_in_account_currency
 
-		if filters.get("show_net_values_in_party_account") and account_type_map.get(
-			data[key].account
-		) in ("Receivable", "Payable"):
+		if filters.get("show_net_values_in_party_account") and account_type_map.get(data[key].account) in (
+			"Receivable",
+			"Payable",
+		):
 			net_value = data[key].debit - data[key].credit
 			net_value_in_account_currency = (
 				data[key].debit_in_account_currency - data[key].credit_in_account_currency
@@ -502,7 +495,7 @@
 				else:
 					update_value_in_dict(consolidated_gle, key, gle)
 
-	for key, value in consolidated_gle.items():
+	for value in consolidated_gle.values():
 		update_value_in_dict(totals, "total", value)
 		update_value_in_dict(totals, "closing", value)
 		entries.append(value)
@@ -512,21 +505,19 @@
 
 def get_account_type_map(company):
 	account_type_map = frappe._dict(
-		frappe.get_all(
-			"Account", fields=["name", "account_type"], filters={"company": company}, as_list=1
-		)
+		frappe.get_all("Account", fields=["name", "account_type"], filters={"company": company}, as_list=1)
 	)
 
 	return account_type_map
 
 
 def get_result_as_list(data, filters):
-	balance, balance_in_account_currency = 0, 0
+	balance, _balance_in_account_currency = 0, 0
 	inv_details = get_supplier_invoice_details()
 
 	for d in data:
 		if not d.get("posting_date"):
-			balance, balance_in_account_currency = 0, 0
+			balance, _balance_in_account_currency = 0, 0
 
 		balance = get_balance(d, balance, "debit", "credit")
 		d["balance"] = balance
diff --git a/erpnext/accounts/report/general_ledger/test_general_ledger.py b/erpnext/accounts/report/general_ledger/test_general_ledger.py
index 75f9430..33b356f 100644
--- a/erpnext/accounts/report/general_ledger/test_general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/test_general_ledger.py
@@ -203,9 +203,7 @@
 		revaluation.extend("accounts", accounts)
 		row = revaluation.accounts[0]
 		row.new_exchange_rate = 83
-		row.new_balance_in_base_currency = flt(
-			row.new_exchange_rate * flt(row.balance_in_account_currency)
-		)
+		row.new_balance_in_base_currency = flt(row.new_exchange_rate * flt(row.balance_in_account_currency))
 		row.gain_loss = row.new_balance_in_base_currency - flt(row.balance_in_base_currency)
 		revaluation.set_total_gain_loss()
 		revaluation = revaluation.save().submit()
diff --git a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py
index a52aaff..00f9c3e 100644
--- a/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py
+++ b/erpnext/accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.py
@@ -49,9 +49,7 @@
 		total=False,
 	)
 
-	columns = get_columns(
-		filters.periodicity, period_list, filters.accumulated_values, filters.company
-	)
+	columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company)
 
 	gross_income = get_revenue(income, period_list)
 	gross_expense = get_revenue(expense, period_list)
@@ -119,9 +117,7 @@
 
 
 def get_revenue(data, period_list, include_in_gross=1):
-	revenue = [
-		item for item in data if item["include_in_gross"] == include_in_gross or item["is_group"] == 1
-	]
+	revenue = [item for item in data if item["include_in_gross"] == include_in_gross or item["is_group"] == 1]
 
 	data_to_be_removed = True
 	while data_to_be_removed:
diff --git a/erpnext/accounts/report/gross_profit/gross_profit.py b/erpnext/accounts/report/gross_profit/gross_profit.py
index 25958692..dd4546d 100644
--- a/erpnext/accounts/report/gross_profit/gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/gross_profit.py
@@ -158,9 +158,7 @@
 	return columns, data
 
 
-def get_data_when_grouped_by_invoice(
-	columns, gross_profit_data, filters, group_wise_columns, data
-):
+def get_data_when_grouped_by_invoice(columns, gross_profit_data, filters, group_wise_columns, data):
 	column_names = get_column_names()
 
 	# to display item as Item Code: Item Name
@@ -395,7 +393,7 @@
 	)
 
 
-class GrossProfitGenerator(object):
+class GrossProfitGenerator:
 	def __init__(self, filters=None):
 		self.sle = {}
 		self.data = []
@@ -496,10 +494,11 @@
 	def get_average_rate_based_on_group_by(self):
 		for key in list(self.grouped):
 			if self.filters.get("group_by") == "Invoice":
-				for i, row in enumerate(self.grouped[key]):
+				for row in self.grouped[key]:
 					if row.indent == 1.0:
 						if (
-							row.parent in self.returned_invoices and row.item_code in self.returned_invoices[row.parent]
+							row.parent in self.returned_invoices
+							and row.item_code in self.returned_invoices[row.parent]
 						):
 							returned_item_rows = self.returned_invoices[row.parent][row.item_code]
 							for returned_item_row in returned_item_rows:
@@ -512,7 +511,9 @@
 										row.qty = 0
 										returned_item_row.qty += row.qty
 								row.base_amount += flt(returned_item_row.base_amount, self.currency_precision)
-							row.buying_amount = flt(flt(row.qty) * flt(row.buying_rate), self.currency_precision)
+							row.buying_amount = flt(
+								flt(row.qty) * flt(row.buying_rate), self.currency_precision
+							)
 						if flt(row.qty) or row.base_amount:
 							row = self.set_average_rate(row)
 							self.grouped_data.append(row)
@@ -567,9 +568,7 @@
 		new_row.buying_rate = (
 			flt(new_row.buying_amount / new_row.qty, self.float_precision) if new_row.qty else 0
 		)
-		new_row.base_rate = (
-			flt(new_row.base_amount / new_row.qty, self.float_precision) if new_row.qty else 0
-		)
+		new_row.base_rate = flt(new_row.base_amount / new_row.qty, self.float_precision) if new_row.qty else 0
 		return new_row
 
 	def set_average_gross_profit(self, new_row):
@@ -656,7 +655,7 @@
 			elif self.delivery_notes.get((row.parent, row.item_code), None):
 				#  check if Invoice has delivery notes
 				dn = self.delivery_notes.get((row.parent, row.item_code))
-				parenttype, parent, item_row, warehouse = (
+				parenttype, parent, item_row, _warehouse = (
 					"Delivery Note",
 					dn["delivery_note"],
 					dn["item_row"],
@@ -751,7 +750,7 @@
 		conditions += " and (is_return = 0 or (is_return=1 and return_against is null))"
 
 		if self.filters.item_group:
-			conditions += " and {0}".format(get_item_group_condition(self.filters.item_group))
+			conditions += f" and {get_item_group_condition(self.filters.item_group)}"
 
 		if self.filters.sales_person:
 			conditions += """
@@ -770,12 +769,10 @@
 
 		if self.filters.group_by == "Payment Term":
 			payment_term_cols = """,if(`tabSales Invoice`.is_return = 1,
-										'{0}',
-										coalesce(schedule.payment_term, '{1}')) as payment_term,
+										'{}',
+										coalesce(schedule.payment_term, '{}')) as payment_term,
 									schedule.invoice_portion,
-									schedule.payment_amount """.format(
-				_("Sales Return"), _("No Terms")
-			)
+									schedule.payment_amount """.format(_("Sales Return"), _("No Terms"))
 			payment_term_table = """ left join `tabPayment Schedule` schedule on schedule.parent = `tabSales Invoice`.name and
 																				`tabSales Invoice`.is_return = 0 """
 		else:
@@ -949,9 +946,7 @@
 		)
 
 	def get_bundle_item_details(self, item_code):
-		return frappe.db.get_value(
-			"Item", item_code, ["item_name", "description", "item_group", "brand"]
-		)
+		return frappe.db.get_value("Item", item_code, ["item_name", "description", "item_group", "brand"])
 
 	def get_stock_ledger_entries(self, item_code, warehouse):
 		if item_code and warehouse:
diff --git a/erpnext/accounts/report/gross_profit/test_gross_profit.py b/erpnext/accounts/report/gross_profit/test_gross_profit.py
index aa820aa..4809664 100644
--- a/erpnext/accounts/report/gross_profit/test_gross_profit.py
+++ b/erpnext/accounts/report/gross_profit/test_gross_profit.py
@@ -1,7 +1,7 @@
 import frappe
 from frappe import qb
 from frappe.tests.utils import FrappeTestCase
-from frappe.utils import add_days, flt, nowdate
+from frappe.utils import flt, nowdate
 
 from erpnext.accounts.doctype.sales_invoice.sales_invoice import make_delivery_note
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
@@ -86,11 +86,14 @@
 			self.customer = customer.name
 
 	def create_sales_invoice(
-		self, qty=1, rate=100, posting_date=nowdate(), do_not_save=False, do_not_submit=False
+		self, qty=1, rate=100, posting_date=None, do_not_save=False, do_not_submit=False
 	):
 		"""
 		Helper function to populate default values in sales invoice
 		"""
+		if posting_date is None:
+			posting_date = nowdate()
+
 		sinv = create_sales_invoice(
 			qty=qty,
 			rate=rate,
@@ -115,11 +118,14 @@
 		return sinv
 
 	def create_delivery_note(
-		self, item=None, qty=1, rate=100, posting_date=nowdate(), do_not_save=False, do_not_submit=False
+		self, item=None, qty=1, rate=100, posting_date=None, do_not_save=False, do_not_submit=False
 	):
 		"""
 		Helper function to populate default values in Delivery Note
 		"""
+		if posting_date is None:
+			posting_date = nowdate()
+
 		dnote = create_delivery_note(
 			company=self.company,
 			customer=self.customer,
@@ -221,7 +227,7 @@
 			"gross_profit_%": -50.0,
 		}
 		gp_entry = [x for x in data if x.parent_invoice == sinv.name]
-		self.assertDictContainsSubset(expected_entry_without_dn, gp_entry[0])
+		self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry_without_dn)
 
 		# make delivery note
 		dn = make_delivery_note(sinv.name)
@@ -249,7 +255,7 @@
 			"gross_profit_%": 0.0,
 		}
 		gp_entry = [x for x in data if x.parent_invoice == sinv.name]
-		self.assertDictContainsSubset(expected_entry_with_dn, gp_entry[0])
+		self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry_with_dn)
 
 	def test_bundled_delivery_note_with_different_warehouses(self):
 		"""
@@ -380,7 +386,7 @@
 			"gross_profit_%": -25.0,
 		}
 		gp_entry = [x for x in data if x.parent_invoice == sinv.name]
-		self.assertDictContainsSubset(expected_entry, gp_entry[0])
+		self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry)
 
 	def test_crnote_against_invoice_with_multiple_instances_of_same_item(self):
 		"""
@@ -422,8 +428,8 @@
 		gp_entry = [x for x in data if x.parent_invoice == sinv.name]
 		# Both items of Invoice should have '0' qty
 		self.assertEqual(len(gp_entry), 2)
-		self.assertDictContainsSubset(expected_entry, gp_entry[0])
-		self.assertDictContainsSubset(expected_entry, gp_entry[1])
+		self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry)
+		self.assertEqual(gp_entry[1], gp_entry[1] | expected_entry)
 
 	def test_standalone_cr_notes(self):
 		"""
@@ -459,7 +465,7 @@
 			"gross_profit_%": 100.0,
 		}
 		gp_entry = [x for x in data if x.parent_invoice == sinv.name]
-		self.assertDictContainsSubset(expected_entry, gp_entry[0])
+		self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry)
 
 	def test_different_rates_in_si_and_dn(self):
 		from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
@@ -551,4 +557,4 @@
 			"gross_profit_%": 12.5,
 		}
 		gp_entry = [x for x in data if x.parent_invoice == sinv.name]
-		self.assertDictContainsSubset(expected_entry, gp_entry[0])
+		self.assertEqual(gp_entry[0], gp_entry[0] | expected_entry)
diff --git a/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py b/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py
index 230b18c..df3fc48 100644
--- a/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py
+++ b/erpnext/accounts/report/inactive_sales_items/inactive_sales_items.py
@@ -92,7 +92,6 @@
 
 
 def get_sales_details(filters):
-	data = []
 	item_details_map = {}
 
 	date_field = "s.transaction_date" if filters["based_on"] == "Sales Order" else "s.posting_date"
@@ -116,7 +115,6 @@
 
 
 def get_territories(filters):
-
 	filter_dict = {}
 	if filters.get("territory"):
 		filter_dict.update({"name": filters["territory"]})
diff --git a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
index 9c6e2d0..4e7ab1b 100644
--- a/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
+++ b/erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
@@ -140,7 +140,6 @@
 
 
 def get_columns(additional_table_columns, filters):
-
 	columns = []
 
 	if filters.get("group_by") != ("Item"):
@@ -194,7 +193,12 @@
 					"options": "Supplier",
 					"width": 120,
 				},
-				{"label": _("Supplier Name"), "fieldname": "supplier_name", "fieldtype": "Data", "width": 120},
+				{
+					"label": _("Supplier Name"),
+					"fieldname": "supplier_name",
+					"fieldtype": "Data",
+					"width": 120,
+				},
 			]
 		)
 
@@ -313,7 +317,7 @@
 	if additional_query_columns:
 		additional_query_columns = "," + ",".join(additional_query_columns)
 	return frappe.db.sql(
-		"""
+		f"""
 		select
 			`tabPurchase Invoice Item`.`name`, `tabPurchase Invoice Item`.`parent`,
 			`tabPurchase Invoice`.posting_date, `tabPurchase Invoice`.credit_to, `tabPurchase Invoice`.company,
@@ -326,14 +330,12 @@
 			`tabPurchase Invoice Item`.`purchase_receipt`, `tabPurchase Invoice Item`.`po_detail`,
 			`tabPurchase Invoice Item`.`expense_account`, `tabPurchase Invoice Item`.`stock_qty`,
 			`tabPurchase Invoice Item`.`stock_uom`, `tabPurchase Invoice Item`.`base_net_amount`,
-			`tabPurchase Invoice`.`supplier_name`, `tabPurchase Invoice`.`mode_of_payment` {0}
+			`tabPurchase Invoice`.`supplier_name`, `tabPurchase Invoice`.`mode_of_payment` {additional_query_columns}
 		from `tabPurchase Invoice`, `tabPurchase Invoice Item`, `tabItem`
 		where `tabPurchase Invoice`.name = `tabPurchase Invoice Item`.`parent` and
 			`tabItem`.name = `tabPurchase Invoice Item`.`item_code` and
-			`tabPurchase Invoice`.docstatus = 1 {1}
-	""".format(
-			additional_query_columns, conditions
-		),
+			`tabPurchase Invoice`.docstatus = 1 {conditions}
+	""",
 		filters,
 		as_dict=1,
 	)
diff --git a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
index a4f01fa..ce04af1 100644
--- a/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
+++ b/erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
@@ -224,7 +224,12 @@
 					"options": "Customer",
 					"width": 120,
 				},
-				{"label": _("Customer Name"), "fieldname": "customer_name", "fieldtype": "Data", "width": 120},
+				{
+					"label": _("Customer Name"),
+					"fieldname": "customer_name",
+					"fieldtype": "Data",
+					"width": 120,
+				},
 			]
 		)
 
@@ -379,9 +384,7 @@
 		"""
 
 	if not filters.get("group_by"):
-		conditions += (
-			"ORDER BY `tabSales Invoice`.posting_date desc, `tabSales Invoice Item`.item_group desc"
-		)
+		conditions += "ORDER BY `tabSales Invoice`.posting_date desc, `tabSales Invoice Item`.item_group desc"
 	else:
 		conditions += get_group_by_conditions(filters, "Sales Invoice")
 
@@ -390,13 +393,13 @@
 
 def get_group_by_conditions(filters, doctype):
 	if filters.get("group_by") == "Invoice":
-		return "ORDER BY `tab{0} Item`.parent desc".format(doctype)
+		return f"ORDER BY `tab{doctype} Item`.parent desc"
 	elif filters.get("group_by") == "Item":
-		return "ORDER BY `tab{0} Item`.`item_code`".format(doctype)
+		return f"ORDER BY `tab{doctype} Item`.`item_code`"
 	elif filters.get("group_by") == "Item Group":
-		return "ORDER BY `tab{0} Item`.{1}".format(doctype, frappe.scrub(filters.get("group_by")))
+		return "ORDER BY `tab{} Item`.{}".format(doctype, frappe.scrub(filters.get("group_by")))
 	elif filters.get("group_by") in ("Customer", "Customer Group", "Territory", "Supplier"):
-		return "ORDER BY `tab{0}`.{1}".format(doctype, frappe.scrub(filters.get("group_by")))
+		return "ORDER BY `tab{}`.{}".format(doctype, frappe.scrub(filters.get("group_by")))
 
 
 def get_items(filters, additional_query_columns, additional_conditions=None):
@@ -423,14 +426,12 @@
 			`tabSales Invoice Item`.stock_qty, `tabSales Invoice Item`.stock_uom,
 			`tabSales Invoice Item`.base_net_rate, `tabSales Invoice Item`.base_net_amount,
 			`tabSales Invoice`.customer_name, `tabSales Invoice`.customer_group, `tabSales Invoice Item`.so_detail,
-			`tabSales Invoice`.update_stock, `tabSales Invoice Item`.uom, `tabSales Invoice Item`.qty {0}
+			`tabSales Invoice`.update_stock, `tabSales Invoice Item`.uom, `tabSales Invoice Item`.qty {}
 		from `tabSales Invoice`, `tabSales Invoice Item`, `tabItem`
 		where `tabSales Invoice`.name = `tabSales Invoice Item`.parent and
 			`tabItem`.name = `tabSales Invoice Item`.`item_code` and
-			`tabSales Invoice`.docstatus = 1 {1}
-		""".format(
-			additional_query_columns, conditions
-		),
+			`tabSales Invoice`.docstatus = 1 {}
+		""".format(additional_query_columns, conditions),
 		filters,
 		as_dict=1,
 	)  # nosec
@@ -460,20 +461,15 @@
 
 
 def get_grand_total(filters, doctype):
-
 	return frappe.db.sql(
-		""" SELECT
-		SUM(`tab{0}`.base_grand_total)
-		FROM `tab{0}`
-		WHERE `tab{0}`.docstatus = 1
+		f""" SELECT
+		SUM(`tab{doctype}`.base_grand_total)
+		FROM `tab{doctype}`
+		WHERE `tab{doctype}`.docstatus = 1
 		and posting_date between %s and %s
-	""".format(
-			doctype
-		),
+	""",
 		(filters.get("from_date"), filters.get("to_date")),
-	)[0][
-		0
-	]  # nosec
+	)[0][0]  # nosec
 
 
 def get_tax_accounts(
@@ -492,9 +488,7 @@
 	add_deduct_tax = "charge_type"
 
 	tax_amount_precision = (
-		get_field_precision(
-			frappe.get_meta(tax_doctype).get_field("tax_amount"), currency=company_currency
-		)
+		get_field_precision(frappe.get_meta(tax_doctype).get_field("tax_amount"), currency=company_currency)
 		or 2
 	)
 
@@ -504,11 +498,13 @@
 
 	conditions = ""
 	if doctype == "Purchase Invoice":
-		conditions = " and category in ('Total', 'Valuation and Total') and base_tax_amount_after_discount_amount != 0"
+		conditions = (
+			" and category in ('Total', 'Valuation and Total') and base_tax_amount_after_discount_amount != 0"
+		)
 		add_deduct_tax = "add_deduct_tax"
 
 	tax_details = frappe.db.sql(
-		"""
+		f"""
 		select
 			name, parent, description, item_wise_tax_detail, account_head,
 			charge_type, {add_deduct_tax}, base_tax_amount_after_discount_amount
@@ -519,11 +515,9 @@
 			and parent in (%s)
 			%s
 		order by description
-	""".format(
-			add_deduct_tax=add_deduct_tax
-		)
+	"""
 		% (tax_doctype, "%s", ", ".join(["%s"] * len(invoice_item_row)), conditions),
-		tuple([doctype] + list(invoice_item_row)),
+		tuple([doctype, *list(invoice_item_row)]),
 	)
 
 	account_doctype = frappe.qb.DocType("Account")
@@ -531,13 +525,13 @@
 	query = (
 		frappe.qb.from_(account_doctype)
 		.select(account_doctype.name)
-		.where((account_doctype.account_type == "Tax"))
+		.where(account_doctype.account_type == "Tax")
 	)
 
 	tax_accounts = query.run()
 
 	for (
-		name,
+		_name,
 		parent,
 		description,
 		item_wise_tax_detail,
@@ -598,7 +592,9 @@
 				itemised_tax.setdefault(d.name, {})[description] = frappe._dict(
 					{
 						"tax_rate": "NA",
-						"tax_amount": flt((tax_amount * d.base_net_amount) / d.base_net_total, tax_amount_precision),
+						"tax_amount": flt(
+							(tax_amount * d.base_net_amount) / d.base_net_total, tax_amount_precision
+						),
 					}
 				)
 
diff --git a/erpnext/accounts/report/payment_ledger/payment_ledger.py b/erpnext/accounts/report/payment_ledger/payment_ledger.py
index 8875d27..9852c6e 100644
--- a/erpnext/accounts/report/payment_ledger/payment_ledger.py
+++ b/erpnext/accounts/report/payment_ledger/payment_ledger.py
@@ -8,7 +8,7 @@
 from frappe.query_builder import Criterion
 
 
-class PaymentLedger(object):
+class PaymentLedger:
 	def __init__(self, filters=None):
 		self.filters = filters
 		self.columns, self.data = [], []
diff --git a/erpnext/accounts/report/payment_ledger/test_payment_ledger.py b/erpnext/accounts/report/payment_ledger/test_payment_ledger.py
index 5ae9b87..c982f31 100644
--- a/erpnext/accounts/report/payment_ledger/test_payment_ledger.py
+++ b/erpnext/accounts/report/payment_ledger/test_payment_ledger.py
@@ -1,5 +1,3 @@
-import unittest
-
 import frappe
 from frappe import qb
 from frappe.tests.utils import FrappeTestCase
@@ -57,7 +55,7 @@
 			income_account=self.income_account,
 			warehouse=self.warehouse,
 		)
-		pe = get_payment_entry(sinv.doctype, sinv.name).save().submit()
+		get_payment_entry(sinv.doctype, sinv.name).save().submit()
 
 		filters = frappe._dict({"company": self.company})
 		columns, data = execute(filters=filters)
diff --git a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
index eaeaa62..834eb5f 100644
--- a/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
+++ b/erpnext/accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py
@@ -163,10 +163,8 @@
 		"""select
 		voucher_type, voucher_no, party_type, party, posting_date, debit, credit, remarks, against_voucher
 		from `tabGL Entry`
-		where company=%(company)s and voucher_type in ('Journal Entry', 'Payment Entry') and is_cancelled = 0 {0}
-	""".format(
-			get_conditions(filters)
-		),
+		where company=%(company)s and voucher_type in ('Journal Entry', 'Payment Entry') and is_cancelled = 0 {}
+	""".format(get_conditions(filters)),
 		filters,
 		as_dict=1,
 	)
@@ -175,7 +173,7 @@
 def get_invoice_posting_date_map(filters):
 	invoice_details = {}
 	dt = "Sales Invoice" if filters.get("payment_type") == _("Incoming") else "Purchase Invoice"
-	for t in frappe.db.sql("select name, posting_date, due_date from `tab{0}`".format(dt), as_dict=1):
+	for t in frappe.db.sql(f"select name, posting_date, due_date from `tab{dt}`", as_dict=1):
 		invoice_details[t.name] = t
 
 	return invoice_details
diff --git a/erpnext/accounts/report/pos_register/pos_register.py b/erpnext/accounts/report/pos_register/pos_register.py
index 488bb99..7640ae8 100644
--- a/erpnext/accounts/report/pos_register/pos_register.py
+++ b/erpnext/accounts/report/pos_register/pos_register.py
@@ -50,17 +50,19 @@
 	order_by = "p.posting_date"
 	select_mop_field, from_sales_invoice_payment, group_by_mop_condition = "", "", ""
 	if group_by_field == "mode_of_payment":
-		select_mop_field = ", sip.mode_of_payment, sip.base_amount - IF(sip.type='Cash', p.change_amount, 0) as paid_amount"
+		select_mop_field = (
+			", sip.mode_of_payment, sip.base_amount - IF(sip.type='Cash', p.change_amount, 0) as paid_amount"
+		)
 		from_sales_invoice_payment = ", `tabSales Invoice Payment` sip"
 		group_by_mop_condition = "sip.parent = p.name AND ifnull(sip.base_amount - IF(sip.type='Cash', p.change_amount, 0), 0) != 0 AND"
 		order_by += ", sip.mode_of_payment"
 
 	elif group_by_field:
-		order_by += ", p.{}".format(group_by_field)
+		order_by += f", p.{group_by_field}"
 		select_mop_field = ", p.base_paid_amount - p.change_amount  as paid_amount "
 
 	return frappe.db.sql(
-		"""
+		f"""
 		SELECT
 			p.posting_date, p.name as pos_invoice, p.pos_profile,
 			p.owner, p.customer, p.is_return, p.base_grand_total as grand_total {select_mop_field}
@@ -72,13 +74,7 @@
 			{conditions}
 		ORDER BY
 			{order_by}
-		""".format(
-			select_mop_field=select_mop_field,
-			from_sales_invoice_payment=from_sales_invoice_payment,
-			group_by_mop_condition=group_by_mop_condition,
-			conditions=conditions,
-			order_by=order_by,
-		),
+		""",
 		filters,
 		as_dict=1,
 	)
@@ -131,9 +127,7 @@
 
 
 def get_conditions(filters):
-	conditions = (
-		"company = %(company)s AND posting_date >= %(from_date)s AND posting_date <= %(to_date)s"
-	)
+	conditions = "company = %(company)s AND posting_date >= %(from_date)s AND posting_date <= %(to_date)s"
 
 	if filters.get("pos_profile"):
 		conditions += " AND pos_profile = %(pos_profile)s"
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
index 2ffd3b3..98c6656 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.js
@@ -24,3 +24,10 @@
 	fieldtype: "Check",
 	default: 1,
 });
+
+frappe.query_reports["Profit and Loss Statement"]["filters"].push({
+	fieldname: "include_default_book_entries",
+	label: __("Include Default FB Entries"),
+	fieldtype: "Check",
+	default: 1,
+});
diff --git a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
index 12a8554..58610b2 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/profit_and_loss_statement.py
@@ -57,9 +57,7 @@
 	if net_profit_loss:
 		data.append(net_profit_loss)
 
-	columns = get_columns(
-		filters.periodicity, period_list, filters.accumulated_values, filters.company
-	)
+	columns = get_columns(filters.periodicity, period_list, filters.accumulated_values, filters.company)
 
 	chart = get_chart_data(filters, columns, income, expense, net_profit_loss)
 
diff --git a/erpnext/accounts/report/profit_and_loss_statement/test_profit_and_loss_statement.py b/erpnext/accounts/report/profit_and_loss_statement/test_profit_and_loss_statement.py
index b4423ab..816c2b9 100644
--- a/erpnext/accounts/report/profit_and_loss_statement/test_profit_and_loss_statement.py
+++ b/erpnext/accounts/report/profit_and_loss_statement/test_profit_and_loss_statement.py
@@ -3,7 +3,7 @@
 
 import frappe
 from frappe.tests.utils import FrappeTestCase
-from frappe.utils import add_days, getdate, today
+from frappe.utils import getdate, today
 
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.accounts.report.financial_statements import get_period_list
@@ -61,7 +61,7 @@
 		)
 
 	def test_profit_and_loss_output_and_summary(self):
-		si = self.create_sales_invoice(qty=1, rate=150)
+		self.create_sales_invoice(qty=1, rate=150)
 
 		filters = self.get_report_filters()
 		period_list = get_period_list(
@@ -75,9 +75,7 @@
 		)
 
 		result = execute(filters)[1]
-		current_period = [x for x in period_list if x.from_date <= getdate() and x.to_date >= getdate()][
-			0
-		]
+		current_period = next(x for x in period_list if x.from_date <= getdate() and x.to_date >= getdate())
 		current_period_key = current_period.key
 		without_current_period = [x for x in period_list if x.key != current_period.key]
 		# all period except current period(whence invoice was posted), should be '0'
diff --git a/erpnext/accounts/report/purchase_register/purchase_register.py b/erpnext/accounts/report/purchase_register/purchase_register.py
index 39eb312..504c74b 100644
--- a/erpnext/accounts/report/purchase_register/purchase_register.py
+++ b/erpnext/accounts/report/purchase_register/purchase_register.py
@@ -316,16 +316,12 @@
 			tuple([inv.name for inv in invoice_list]),
 		)
 
-		purchase_taxes_query = get_taxes_query(
-			invoice_list, "Purchase Taxes and Charges", "Purchase Invoice"
-		)
+		purchase_taxes_query = get_taxes_query(invoice_list, "Purchase Taxes and Charges", "Purchase Invoice")
 		purchase_tax_accounts = purchase_taxes_query.run(as_dict=True, pluck="account_head")
 		tax_accounts = purchase_tax_accounts
 
 		if include_payments:
-			advance_taxes_query = get_taxes_query(
-				invoice_list, "Advance Taxes and Charges", "Payment Entry"
-			)
+			advance_taxes_query = get_taxes_query(invoice_list, "Advance Taxes and Charges", "Payment Entry")
 			advance_tax_accounts = advance_taxes_query.run(as_dict=True, pluck="account_head")
 			tax_accounts = set(tax_accounts + advance_tax_accounts)
 
@@ -399,7 +395,7 @@
 			pi.outstanding_amount,
 			pi.mode_of_payment,
 		)
-		.where((pi.docstatus == 1))
+		.where(pi.docstatus == 1)
 		.orderby(pi.posting_date, pi.name, order=Order.desc)
 	)
 
@@ -443,9 +439,7 @@
 		account_fieldname="paid_to",
 		party="supplier",
 		party_name="supplier_name",
-		party_account=get_party_account(
-			"Supplier", filters.supplier, filters.company, include_advance=True
-		),
+		party_account=get_party_account("Supplier", filters.supplier, filters.company, include_advance=True),
 	)
 	payment_entries = get_payment_entries(filters, args)
 	journal_entries = get_journal_entries(filters, args)
@@ -491,9 +485,7 @@
 	return internal_invoice_map
 
 
-def get_invoice_tax_map(
-	invoice_list, invoice_expense_map, expense_accounts, include_payments=False
-):
+def get_invoice_tax_map(invoice_list, invoice_expense_map, expense_accounts, include_payments=False):
 	tax_details = frappe.db.sql(
 		"""
 		select parent, account_head, case add_deduct_tax when "Add" then sum(base_tax_amount_after_discount_amount)
@@ -558,9 +550,7 @@
 			invoice_po_pr_map.setdefault(d.parent, frappe._dict()).setdefault("purchase_receipt", pr_list)
 
 		if d.project:
-			invoice_po_pr_map.setdefault(d.parent, frappe._dict()).setdefault("project", []).append(
-				d.project
-			)
+			invoice_po_pr_map.setdefault(d.parent, frappe._dict()).setdefault("project", []).append(d.project)
 
 	return invoice_po_pr_map
 
diff --git a/erpnext/accounts/report/purchase_register/test_purchase_register.py b/erpnext/accounts/report/purchase_register/test_purchase_register.py
index 6903662..a7a5c07 100644
--- a/erpnext/accounts/report/purchase_register/test_purchase_register.py
+++ b/erpnext/accounts/report/purchase_register/test_purchase_register.py
@@ -3,7 +3,7 @@
 
 import frappe
 from frappe.tests.utils import FrappeTestCase
-from frappe.utils import add_months, getdate, today
+from frappe.utils import add_months, today
 
 from erpnext.accounts.report.purchase_register.purchase_register import execute
 
@@ -13,9 +13,7 @@
 		frappe.db.sql("delete from `tabPurchase Invoice` where company='_Test Company 6'")
 		frappe.db.sql("delete from `tabGL Entry` where company='_Test Company 6'")
 
-		filters = frappe._dict(
-			company="_Test Company 6", from_date=add_months(today(), -1), to_date=today()
-		)
+		filters = frappe._dict(company="_Test Company 6", from_date=add_months(today(), -1), to_date=today())
 
 		pi = make_purchase_invoice()
 
@@ -40,7 +38,7 @@
 			supplier="_Test Supplier",
 		)
 
-		pi = make_purchase_invoice()
+		make_purchase_invoice()
 		pe = make_payment_entry()
 
 		report_results = execute(filters)
@@ -58,7 +56,7 @@
 	from erpnext.accounts.doctype.cost_center.test_cost_center import create_cost_center
 	from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
 
-	gst_acc = create_account(
+	create_account(
 		account_name="GST",
 		account_type="Tax",
 		parent_account="Duties and Taxes - _TC6",
diff --git a/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py b/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py
index 0577214..7c2bf7e 100644
--- a/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py
+++ b/erpnext/accounts/report/sales_payment_summary/sales_payment_summary.py
@@ -144,9 +144,9 @@
 		"ON ("
 		"t1.parent = a.name and t1.base_total = a.base_total) "
 		"WHERE a.docstatus = 1"
-		" AND {conditions} "
+		f" AND {conditions} "
 		"GROUP BY "
-		"owner, posting_date, warehouse".format(conditions=conditions),
+		"owner, posting_date, warehouse",
 		filters,
 		as_dict=1,
 	)
@@ -156,7 +156,7 @@
 def get_sales_invoice_data(filters):
 	conditions = get_conditions(filters)
 	return frappe.db.sql(
-		"""
+		f"""
 		select
 			a.posting_date, a.owner,
 			sum(a.net_total) as "net_total",
@@ -168,9 +168,7 @@
 			and {conditions}
 			group by
 			a.owner, a.posting_date
-	""".format(
-			conditions=conditions
-		),
+	""",
 		filters,
 		as_dict=1,
 	)
@@ -182,7 +180,7 @@
 	invoice_list_names = ",".join("'" + invoice["name"] + "'" for invoice in invoice_list)
 	if invoice_list:
 		inv_mop = frappe.db.sql(
-			"""select a.owner,a.posting_date, ifnull(b.mode_of_payment, '') as mode_of_payment
+			f"""select a.owner,a.posting_date, ifnull(b.mode_of_payment, '') as mode_of_payment
 			from `tabSales Invoice` a, `tabSales Invoice Payment` b
 			where a.name = b.parent
 			and a.docstatus = 1
@@ -202,9 +200,7 @@
 			and a.docstatus = 1
 			and b.reference_type = 'Sales Invoice'
 			and b.reference_name in ({invoice_list_names})
-			""".format(
-				invoice_list_names=invoice_list_names
-			),
+			""",
 			as_dict=1,
 		)
 		for d in inv_mop:
@@ -215,11 +211,9 @@
 def get_invoices(filters):
 	conditions = get_conditions(filters)
 	return frappe.db.sql(
-		"""select a.name
+		f"""select a.name
 		from `tabSales Invoice` a
-		where a.docstatus = 1 and {conditions}""".format(
-			conditions=conditions
-		),
+		where a.docstatus = 1 and {conditions}""",
 		filters,
 		as_dict=1,
 	)
@@ -231,7 +225,7 @@
 	invoice_list_names = ",".join("'" + invoice["name"] + "'" for invoice in invoice_list)
 	if invoice_list:
 		inv_mop_detail = frappe.db.sql(
-			"""
+			f"""
 			select t.owner,
 			       t.posting_date,
 				   t.mode_of_payment,
@@ -264,23 +258,19 @@
 				group by a.owner, a.posting_date, mode_of_payment
 			) t
 			group by t.owner, t.posting_date, t.mode_of_payment
-			""".format(
-				invoice_list_names=invoice_list_names
-			),
+			""",
 			as_dict=1,
 		)
 
 		inv_change_amount = frappe.db.sql(
-			"""select a.owner, a.posting_date,
+			f"""select a.owner, a.posting_date,
 			ifnull(b.mode_of_payment, '') as mode_of_payment, sum(a.base_change_amount) as change_amount
 			from `tabSales Invoice` a, `tabSales Invoice Payment` b
 			where a.name = b.parent
 			and a.name in ({invoice_list_names})
 			and b.type = 'Cash'
 			and a.base_change_amount > 0
-			group by a.owner, a.posting_date, mode_of_payment""".format(
-				invoice_list_names=invoice_list_names
-			),
+			group by a.owner, a.posting_date, mode_of_payment""",
 			as_dict=1,
 		)
 
diff --git a/erpnext/accounts/report/sales_payment_summary/test_sales_payment_summary.py b/erpnext/accounts/report/sales_payment_summary/test_sales_payment_summary.py
index 3ad0ff2..3be96c6 100644
--- a/erpnext/accounts/report/sales_payment_summary/test_sales_payment_summary.py
+++ b/erpnext/accounts/report/sales_payment_summary/test_sales_payment_summary.py
@@ -33,7 +33,7 @@
 	def test_get_mode_of_payments(self):
 		filters = get_filters()
 
-		for dummy in range(2):
+		for _dummy in range(2):
 			si = create_sales_invoice_record()
 			si.insert()
 			si.submit()
@@ -53,8 +53,8 @@
 			pe.submit()
 
 		mop = get_mode_of_payments(filters)
-		self.assertTrue("Credit Card" in list(mop.values())[0])
-		self.assertTrue("Cash" in list(mop.values())[0])
+		self.assertTrue("Credit Card" in next(iter(mop.values())))
+		self.assertTrue("Cash" in next(iter(mop.values())))
 
 		# Cancel all Cash payment entry and check if this mode of payment is still fetched.
 		payment_entries = frappe.get_all(
@@ -67,13 +67,13 @@
 			pe.cancel()
 
 		mop = get_mode_of_payments(filters)
-		self.assertTrue("Credit Card" in list(mop.values())[0])
-		self.assertTrue("Cash" not in list(mop.values())[0])
+		self.assertTrue("Credit Card" in next(iter(mop.values())))
+		self.assertTrue("Cash" not in next(iter(mop.values())))
 
 	def test_get_mode_of_payments_details(self):
 		filters = get_filters()
 
-		for dummy in range(2):
+		for _dummy in range(2):
 			si = create_sales_invoice_record()
 			si.insert()
 			si.submit()
@@ -94,7 +94,7 @@
 
 		mopd = get_mode_of_payment_details(filters)
 
-		mopd_values = list(mopd.values())[0]
+		mopd_values = next(iter(mopd.values()))
 		for mopd_value in mopd_values:
 			if mopd_value[0] == "Credit Card":
 				cc_init_amount = mopd_value[1]
@@ -110,7 +110,7 @@
 			pe.cancel()
 
 		mopd = get_mode_of_payment_details(filters)
-		mopd_values = list(mopd.values())[0]
+		mopd_values = next(iter(mopd.values()))
 		for mopd_value in mopd_values:
 			if mopd_value[0] == "Credit Card":
 				cc_final_amount = mopd_value[1]
diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index ec6dd72..f275695 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -129,7 +129,8 @@
 			if tax_acc not in income_accounts:
 				tax_amount_precision = (
 					get_field_precision(
-						frappe.get_meta("Sales Taxes and Charges").get_field("tax_amount"), currency=company_currency
+						frappe.get_meta("Sales Taxes and Charges").get_field("tax_amount"),
+						currency=company_currency,
 					)
 					or 2
 				)
@@ -357,9 +358,7 @@
 		tax_accounts = sales_tax_accounts
 
 		if include_payments:
-			advance_taxes_query = get_taxes_query(
-				invoice_list, "Advance Taxes and Charges", "Payment Entry"
-			)
+			advance_taxes_query = get_taxes_query(invoice_list, "Advance Taxes and Charges", "Payment Entry")
 			advance_tax_accounts = advance_taxes_query.run(as_dict=True, pluck="account_head")
 			tax_accounts = set(tax_accounts + advance_tax_accounts)
 
@@ -438,7 +437,7 @@
 			si.represents_company,
 			si.company,
 		)
-		.where((si.docstatus == 1))
+		.where(si.docstatus == 1)
 		.orderby(si.posting_date, si.name, order=Order.desc)
 	)
 
@@ -480,9 +479,7 @@
 		account_fieldname="paid_from",
 		party="customer",
 		party_name="customer_name",
-		party_account=get_party_account(
-			"Customer", filters.customer, filters.company, include_advance=True
-		),
+		party_account=get_party_account("Customer", filters.customer, filters.company, include_advance=True),
 	)
 	payment_entries = get_payment_entries(filters, args)
 	journal_entries = get_journal_entries(filters, args)
diff --git a/erpnext/accounts/report/share_balance/share_balance.py b/erpnext/accounts/report/share_balance/share_balance.py
index d02f53b..1d02a99 100644
--- a/erpnext/accounts/report/share_balance/share_balance.py
+++ b/erpnext/accounts/report/share_balance/share_balance.py
@@ -15,7 +15,7 @@
 
 	columns = get_columns(filters)
 
-	date = filters.get("date")
+	filters.get("date")
 
 	data = []
 
diff --git a/erpnext/accounts/report/share_ledger/share_ledger.py b/erpnext/accounts/report/share_ledger/share_ledger.py
index 629528e..ed65687 100644
--- a/erpnext/accounts/report/share_ledger/share_ledger.py
+++ b/erpnext/accounts/report/share_ledger/share_ledger.py
@@ -26,9 +26,9 @@
 		for transfer in transfers:
 			if transfer.transfer_type == "Transfer":
 				if transfer.from_shareholder == filters.get("shareholder"):
-					transfer.transfer_type += " to {}".format(transfer.to_shareholder)
+					transfer.transfer_type += f" to {transfer.to_shareholder}"
 				else:
-					transfer.transfer_type += " from {}".format(transfer.from_shareholder)
+					transfer.transfer_type += f" from {transfer.from_shareholder}"
 			row = [
 				filters.get("shareholder"),
 				transfer.date,
@@ -66,13 +66,11 @@
 	# if company:
 	# 	condition = 'AND company = %(company)s '
 	return frappe.db.sql(
-		"""SELECT * FROM `tabShare Transfer`
+		f"""SELECT * FROM `tabShare Transfer`
 		WHERE ((DATE(date) <= %(date)s AND from_shareholder = %(shareholder)s {condition})
 		OR (DATE(date) <= %(date)s AND to_shareholder = %(shareholder)s {condition}))
 		AND docstatus = 1
-		ORDER BY date""".format(
-			condition=condition
-		),
+		ORDER BY date""",
 		{"date": date, "shareholder": shareholder},
 		as_dict=1,
 	)
diff --git a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
index b18570b..ab50fcd 100644
--- a/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
+++ b/erpnext/accounts/report/tax_withholding_details/tax_withholding_details.py
@@ -37,9 +37,7 @@
 		frappe.throw(_("From Date must be before To Date"))
 
 
-def get_result(
-	filters, tds_docs, tds_accounts, tax_category_map, journal_entry_party_map, net_total_map
-):
+def get_result(filters, tds_docs, tds_accounts, tax_category_map, journal_entry_party_map, net_total_map):
 	party_map = get_party_pan_map(filters.get("party_type"))
 	tax_rate_map = get_tax_rate_map(filters)
 	gle_map = get_gle_map(tds_docs)
@@ -92,9 +90,9 @@
 					party_type = "customer_type"
 
 				row = {
-					"pan"
-					if frappe.db.has_column(filters.party_type, "pan")
-					else "tax_id": party_map.get(party, {}).get("pan"),
+					"pan" if frappe.db.has_column(filters.party_type, "pan") else "tax_id": party_map.get(
+						party, {}
+					).get("pan"),
 					"party": party_map.get(party, {}).get("name"),
 				}
 
@@ -281,7 +279,7 @@
 	journal_entries = []
 	tax_category_map = frappe._dict()
 	net_total_map = frappe._dict()
-	or_filters = frappe._dict()
+	frappe._dict()
 	journal_entry_party_map = frappe._dict()
 	bank_accounts = frappe.get_all("Account", {"is_group": 0, "account_type": "Bank"}, pluck="name")
 
@@ -344,7 +342,7 @@
 	query = (
 		frappe.qb.from_(gle)
 		.select("voucher_no", "voucher_type", "against", "party")
-		.where((gle.is_cancelled == 0))
+		.where(gle.is_cancelled == 0)
 	)
 
 	if filters.get("from_date"):
diff --git a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py
index 2b5566f..e14d932 100644
--- a/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py
+++ b/erpnext/accounts/report/tds_computation_summary/tds_computation_summary.py
@@ -67,13 +67,13 @@
 			},
 		)
 
-		party_category_wise_map.get((row.get("party"), row.get("section_code")))[
-			"total_amount"
-		] += row.get("total_amount", 0.0)
+		party_category_wise_map.get((row.get("party"), row.get("section_code")))["total_amount"] += row.get(
+			"total_amount", 0.0
+		)
 
-		party_category_wise_map.get((row.get("party"), row.get("section_code")))[
-			"tax_amount"
-		] += row.get("tax_amount", 0.0)
+		party_category_wise_map.get((row.get("party"), row.get("section_code")))["tax_amount"] += row.get(
+			"tax_amount", 0.0
+		)
 
 	final_result = get_final_result(party_category_wise_map)
 
@@ -82,7 +82,7 @@
 
 def get_final_result(party_category_wise_map):
 	out = []
-	for key, value in party_category_wise_map.items():
+	for _key, value in party_category_wise_map.items():
 		out.append(value)
 
 	return out
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.py b/erpnext/accounts/report/trial_balance/trial_balance.py
index 2ff0eff..f216ece 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.py
+++ b/erpnext/accounts/report/trial_balance/trial_balance.py
@@ -120,9 +120,7 @@
 		ignore_opening_entries=True,
 	)
 
-	calculate_values(
-		accounts, gl_entries_by_account, opening_balances, filters.get("show_net_values")
-	)
+	calculate_values(accounts, gl_entries_by_account, opening_balances, filters.get("show_net_values"))
 	accumulate_values_into_parents(accounts, accounts_by_name)
 
 	data = prepare_data(accounts, filters, parent_children_map, company_currency)
@@ -170,9 +168,7 @@
 		)
 
 		# Report getting generate from the mid of a fiscal year
-		if getdate(last_period_closing_voucher[0].posting_date) < getdate(
-			add_days(filters.from_date, -1)
-		):
+		if getdate(last_period_closing_voucher[0].posting_date) < getdate(add_days(filters.from_date, -1)):
 			start_date = add_days(last_period_closing_voucher[0].posting_date, 1)
 			gle += get_opening_balance(
 				"GL Entry", filters, report_type, accounting_dimensions, start_date=start_date
@@ -253,9 +249,7 @@
 		if doctype == "Account Closing Balance":
 			opening_balance = opening_balance.where(closing_balance.is_period_closing_voucher_entry == 0)
 		else:
-			opening_balance = opening_balance.where(
-				closing_balance.voucher_type != "Period Closing Voucher"
-			)
+			opening_balance = opening_balance.where(closing_balance.voucher_type != "Period Closing Voucher")
 
 	if filters.cost_center:
 		lft, rgt = frappe.db.get_value("Cost Center", filters.cost_center, ["lft", "rgt"])
@@ -388,7 +382,7 @@
 			"to_date": filters.to_date,
 			"currency": company_currency,
 			"account_name": (
-				"{} - {}".format(d.account_number, d.account_name) if d.account_number else d.account_name
+				f"{d.account_number} - {d.account_name}" if d.account_number else d.account_name
 			),
 		}
 
diff --git a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
index ee22348..dd1a125 100644
--- a/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
+++ b/erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
@@ -22,7 +22,7 @@
 
 def get_data(filters, show_party_name):
 	if filters.get("party_type") in ("Customer", "Supplier", "Employee", "Member"):
-		party_name_field = "{0}_name".format(frappe.scrub(filters.get("party_type")))
+		party_name_field = "{}_name".format(frappe.scrub(filters.get("party_type")))
 	elif filters.get("party_type") == "Shareholder":
 		party_name_field = "title"
 	else:
@@ -65,9 +65,7 @@
 		row.update({"debit": debit, "credit": credit})
 
 		# closing
-		closing_debit, closing_credit = toggle_debit_credit(
-			opening_debit + debit, opening_credit + credit
-		)
+		closing_debit, closing_credit = toggle_debit_credit(opening_debit + debit, opening_credit + credit)
 		row.update({"closing_debit": closing_debit, "closing_credit": closing_credit})
 
 		# totals
@@ -92,13 +90,12 @@
 
 
 def get_opening_balances(filters):
-
 	account_filter = ""
 	if filters.get("account"):
 		account_filter = "and account = %s" % (frappe.db.escape(filters.get("account")))
 
 	gle = frappe.db.sql(
-		"""
+		f"""
 		select party, sum(debit) as opening_debit, sum(credit) as opening_credit
 		from `tabGL Entry`
 		where company=%(company)s
@@ -106,9 +103,7 @@
 			and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''
 			and (posting_date < %(from_date)s or (ifnull(is_opening, 'No') = 'Yes' and posting_date <= %(to_date)s))
 			{account_filter}
-		group by party""".format(
-			account_filter=account_filter
-		),
+		group by party""",
 		{
 			"company": filters.company,
 			"from_date": filters.from_date,
@@ -127,13 +122,12 @@
 
 
 def get_balances_within_period(filters):
-
 	account_filter = ""
 	if filters.get("account"):
 		account_filter = "and account = %s" % (frappe.db.escape(filters.get("account")))
 
 	gle = frappe.db.sql(
-		"""
+		f"""
 		select party, sum(debit) as debit, sum(credit) as credit
 		from `tabGL Entry`
 		where company=%(company)s
@@ -142,9 +136,7 @@
 			and posting_date >= %(from_date)s and posting_date <= %(to_date)s
 			and ifnull(is_opening, 'No') = 'No'
 			{account_filter}
-		group by party""".format(
-			account_filter=account_filter
-		),
+		group by party""",
 		{
 			"company": filters.company,
 			"from_date": filters.from_date,
diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py
index aed338a7..bd1b355 100644
--- a/erpnext/accounts/report/utils.py
+++ b/erpnext/accounts/report/utils.py
@@ -78,10 +78,10 @@
 	:return: Retrieved exchange rate
 	"""
 
-	rate = __exchange_rates.get("{0}-{1}@{2}".format(from_currency, to_currency, date))
+	rate = __exchange_rates.get(f"{from_currency}-{to_currency}@{date}")
 	if not rate:
 		rate = get_exchange_rate(from_currency, to_currency, date) or 1
-		__exchange_rates["{0}-{1}@{2}".format(from_currency, to_currency, date)] = rate
+		__exchange_rates[f"{from_currency}-{to_currency}@{date}"] = rate
 
 	return rate
 
@@ -136,9 +136,7 @@
 
 
 @frappe.whitelist()
-def get_invoiced_item_gross_margin(
-	sales_invoice=None, item_code=None, company=None, with_item_data=False
-):
+def get_invoiced_item_gross_margin(sales_invoice=None, item_code=None, company=None, with_item_data=False):
 	from erpnext.accounts.report.gross_profit.gross_profit import GrossProfitGenerator
 
 	sales_invoice = sales_invoice or frappe.form_dict.get("sales_invoice")
diff --git a/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py b/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py
index bd9e9fc..1918165 100644
--- a/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py
+++ b/erpnext/accounts/report/voucher_wise_balance/voucher_wise_balance.py
@@ -43,9 +43,7 @@
 	gle = frappe.qb.DocType("GL Entry")
 	query = (
 		frappe.qb.from_(gle)
-		.select(
-			gle.voucher_type, gle.voucher_no, Sum(gle.debit).as_("debit"), Sum(gle.credit).as_("credit")
-		)
+		.select(gle.voucher_type, gle.voucher_no, Sum(gle.debit).as_("debit"), Sum(gle.credit).as_("credit"))
 		.where(gle.is_cancelled == 0)
 		.groupby(gle.voucher_no)
 	)
diff --git a/erpnext/accounts/test/test_reports.py b/erpnext/accounts/test/test_reports.py
index 609f74e..c2e10f8 100644
--- a/erpnext/accounts/test/test_reports.py
+++ b/erpnext/accounts/test/test_reports.py
@@ -1,5 +1,4 @@
 import unittest
-from typing import List, Tuple
 
 from erpnext.tests.utils import ReportFilters, ReportName, execute_script_report
 
@@ -12,7 +11,7 @@
 }
 
 
-REPORT_FILTER_TEST_CASES: List[Tuple[ReportName, ReportFilters]] = [
+REPORT_FILTER_TEST_CASES: list[tuple[ReportName, ReportFilters]] = [
 	("General Ledger", {"group_by": "Group by Voucher (Consolidated)"}),
 	("General Ledger", {"group_by": "Group by Voucher (Consolidated)", "include_dimensions": 1}),
 	("Accounts Payable", {"range1": 30, "range2": 60, "range3": 90, "range4": 120}),
diff --git a/erpnext/accounts/test/test_utils.py b/erpnext/accounts/test/test_utils.py
index c439d4b..59cbc11 100644
--- a/erpnext/accounts/test/test_utils.py
+++ b/erpnext/accounts/test/test_utils.py
@@ -10,7 +10,6 @@
 	get_future_stock_vouchers,
 	get_voucherwise_gl_entries,
 	sort_stock_vouchers_by_posting_date,
-	update_reference_in_payment_entry,
 )
 from erpnext.stock.doctype.item.test_item import make_item
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
@@ -20,7 +19,7 @@
 class TestUtils(unittest.TestCase):
 	@classmethod
 	def setUpClass(cls):
-		super(TestUtils, cls).setUpClass()
+		super().setUpClass()
 		make_test_objects("Address", ADDRESS_RECORDS)
 
 	@classmethod
@@ -36,7 +35,6 @@
 		self.assertEqual(address, "_Test Shipping Address 2 Title-Shipping")
 
 	def test_get_voucher_wise_gl_entry(self):
-
 		pr = make_purchase_receipt(
 			item_code="_Test Item",
 			posting_date="2021-02-01",
@@ -144,12 +142,8 @@
 		frappe.db.set_default("supp_master_name", "Auto Name")
 
 		# Configure Autoname in Supplier DocType
-		make_property_setter(
-			"Supplier", None, "naming_rule", "Expression", "Data", for_doctype="Doctype"
-		)
-		make_property_setter(
-			"Supplier", None, "autoname", "SUP-.FY.-.#####", "Data", for_doctype="Doctype"
-		)
+		make_property_setter("Supplier", None, "naming_rule", "Expression", "Data", for_doctype="Doctype")
+		make_property_setter("Supplier", None, "autoname", "SUP-.FY.-.#####", "Data", for_doctype="Doctype")
 
 		fiscal_year = get_fiscal_year(nowdate())[0]
 
@@ -171,9 +165,7 @@
 		"address_title": "_Test Billing Address Title",
 		"city": "Lagos",
 		"country": "Nigeria",
-		"links": [
-			{"link_doctype": "Customer", "link_name": "_Test Customer 2", "doctype": "Dynamic Link"}
-		],
+		"links": [{"link_doctype": "Customer", "link_name": "_Test Customer 2", "doctype": "Dynamic Link"}],
 	},
 	{
 		"doctype": "Address",
@@ -182,9 +174,7 @@
 		"address_title": "_Test Shipping Address 1 Title",
 		"city": "Lagos",
 		"country": "Nigeria",
-		"links": [
-			{"link_doctype": "Customer", "link_name": "_Test Customer 2", "doctype": "Dynamic Link"}
-		],
+		"links": [{"link_doctype": "Customer", "link_name": "_Test Customer 2", "doctype": "Dynamic Link"}],
 	},
 	{
 		"doctype": "Address",
@@ -194,9 +184,7 @@
 		"city": "Lagos",
 		"country": "Nigeria",
 		"is_shipping_address": "1",
-		"links": [
-			{"link_doctype": "Customer", "link_name": "_Test Customer 2", "doctype": "Dynamic Link"}
-		],
+		"links": [{"link_doctype": "Customer", "link_name": "_Test Customer 2", "doctype": "Dynamic Link"}],
 	},
 	{
 		"doctype": "Address",
@@ -206,8 +194,6 @@
 		"city": "Lagos",
 		"country": "Nigeria",
 		"is_shipping_address": "1",
-		"links": [
-			{"link_doctype": "Customer", "link_name": "_Test Customer 1", "doctype": "Dynamic Link"}
-		],
+		"links": [{"link_doctype": "Customer", "link_name": "_Test Customer 1", "doctype": "Dynamic Link"}],
 	},
 ]
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 02012ad..b61f195 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -3,7 +3,7 @@
 
 
 from json import loads
-from typing import TYPE_CHECKING, List, Optional, Tuple
+from typing import TYPE_CHECKING, Optional
 
 import frappe
 import frappe.defaults
@@ -29,7 +29,7 @@
 import erpnext
 
 # imported to enable erpnext.accounts.utils.get_account_currency
-from erpnext.accounts.doctype.account.account import get_account_currency  # noqa
+from erpnext.accounts.doctype.account.account import get_account_currency
 from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_dimensions
 from erpnext.stock import get_warehouse_account_map
 from erpnext.stock.utils import get_stock_value_on
@@ -81,9 +81,7 @@
 		FY = DocType("Fiscal Year")
 
 		query = (
-			frappe.qb.from_(FY)
-			.select(FY.name, FY.year_start_date, FY.year_end_date)
-			.where(FY.disabled == 0)
+			frappe.qb.from_(FY).select(FY.name, FY.year_start_date, FY.year_end_date).where(FY.disabled == 0)
 		)
 
 		if fiscal_year:
@@ -130,9 +128,7 @@
 			else:
 				return ((fy.name, fy.year_start_date, fy.year_end_date),)
 
-	error_msg = _("""{0} {1} is not in any active Fiscal Year""").format(
-		label, formatdate(transaction_date)
-	)
+	error_msg = _("""{0} {1} is not in any active Fiscal Year""").format(label, formatdate(transaction_date))
 	if company:
 		error_msg = _("""{0} for {1}""").format(error_msg, frappe.bold(company))
 
@@ -209,12 +205,12 @@
 		acc = frappe.get_doc("Account", account)
 
 	try:
-		year_start_date = get_fiscal_year(date, company=company, verbose=0)[1]
+		get_fiscal_year(date, company=company, verbose=0)[1]
 	except FiscalYearError:
 		if getdate(date) > getdate(nowdate()):
 			# if fiscal year not found and the date is greater than today
 			# get fiscal year for today's date and its corresponding year start date
-			year_start_date = get_fiscal_year(nowdate(), verbose=1)[1]
+			get_fiscal_year(nowdate(), verbose=1)[1]
 		else:
 			# this indicates that it is a date older than any existing fiscal year.
 			# hence, assuming balance as 0.0
@@ -229,15 +225,14 @@
 		cc = frappe.get_doc("Cost Center", cost_center)
 		if cc.is_group:
 			cond.append(
-				""" exists (
+				f""" exists (
 				select 1 from `tabCost Center` cc where cc.name = gle.cost_center
-				and cc.lft >= %s and cc.rgt <= %s
+				and cc.lft >= {cc.lft} and cc.rgt <= {cc.rgt}
 			)"""
-				% (cc.lft, cc.rgt)
 			)
 
 		else:
-			cond.append("""gle.cost_center = %s """ % (frappe.db.escape(cost_center),))
+			cond.append(f"""gle.cost_center = {frappe.db.escape(cost_center)} """)
 
 	if account:
 		if not (frappe.flags.ignore_account_permission or ignore_account_permission):
@@ -246,11 +241,10 @@
 		# different filter for group and ledger - improved performance
 		if acc.is_group:
 			cond.append(
-				"""exists (
+				f"""exists (
 				select name from `tabAccount` ac where ac.name = gle.account
-				and ac.lft >= %s and ac.rgt <= %s
+				and ac.lft >= {acc.lft} and ac.rgt <= {acc.rgt}
 			)"""
-				% (acc.lft, acc.rgt)
 			)
 
 			# If group and currency same as company,
@@ -258,7 +252,7 @@
 			if acc.account_currency == frappe.get_cached_value("Company", acc.company, "default_currency"):
 				in_account_currency = False
 		else:
-			cond.append("""gle.account = %s """ % (frappe.db.escape(account),))
+			cond.append(f"""gle.account = {frappe.db.escape(account)} """)
 
 	if account_type:
 		accounts = frappe.db.get_all(
@@ -277,8 +271,7 @@
 
 	if party_type and party:
 		cond.append(
-			"""gle.party_type = %s and gle.party = %s """
-			% (frappe.db.escape(party_type), frappe.db.escape(party))
+			f"""gle.party_type = {frappe.db.escape(party_type)} and gle.party = {frappe.db.escape(party)} """
 		)
 
 	if company:
@@ -295,11 +288,9 @@
 
 		bal = frappe.db.sql(
 			"""
-			SELECT {0}
+			SELECT {}
 			FROM `tabGL Entry` gle
-			WHERE {1}""".format(
-				select_field, " and ".join(cond)
-			),
+			WHERE {}""".format(select_field, " and ".join(cond)),
 			(precision, precision),
 		)[0][0]
 		# if bal is None, return 0
@@ -334,30 +325,25 @@
 
 		# for pl accounts, get balance within a fiscal year
 		if acc.report_type == "Profit and Loss":
-			cond.append(
-				"posting_date >= '%s' and voucher_type != 'Period Closing Voucher'" % year_start_date
-			)
+			cond.append("posting_date >= '%s' and voucher_type != 'Period Closing Voucher'" % year_start_date)
 
 		# different filter for group and ledger - improved performance
 		if acc.is_group:
 			cond.append(
-				"""exists (
+				f"""exists (
 				select name from `tabAccount` ac where ac.name = gle.account
-				and ac.lft >= %s and ac.rgt <= %s
+				and ac.lft >= {acc.lft} and ac.rgt <= {acc.rgt}
 			)"""
-				% (acc.lft, acc.rgt)
 			)
 		else:
-			cond.append("""gle.account = %s """ % (frappe.db.escape(account),))
+			cond.append(f"""gle.account = {frappe.db.escape(account)} """)
 
 		entries = frappe.db.sql(
 			"""
 			SELECT name, posting_date, account, party_type, party,debit,credit,
 				voucher_type, voucher_no, against_voucher_type, against_voucher
 			FROM `tabGL Entry` gle
-			WHERE {0}""".format(
-				" and ".join(cond)
-			),
+			WHERE {}""".format(" and ".join(cond)),
 			as_dict=True,
 		)
 
@@ -380,13 +366,11 @@
 					or (gle.against_voucher == gle.voucher_no and gle.get(dr_or_cr) > 0)
 				):
 					payment_amount = frappe.db.sql(
-						"""
-						SELECT {0}
+						f"""
+						SELECT {select_fields}
 						FROM `tabGL Entry` gle
 						WHERE docstatus < 2 and posting_date <= %(date)s and against_voucher = %(voucher_no)s
-						and party = %(party)s and name != %(name)s""".format(
-							select_fields
-						),
+						and party = %(party)s and name != %(name)s""",
 						{"date": date, "voucher_no": gle.voucher_no, "party": gle.party, "name": gle.name},
 					)[0][0]
 
@@ -441,7 +425,7 @@
 	args = make_tree_args(**args)
 
 	if args.parent_cost_center == args.company:
-		args.parent_cost_center = "{0} - {1}".format(
+		args.parent_cost_center = "{} - {}".format(
 			args.parent_cost_center, frappe.get_cached_value("Company", args.company, "abbr")
 		)
 
@@ -457,7 +441,7 @@
 
 
 def _build_dimensions_dict_for_exc_gain_loss(
-	entry: dict | object = None, active_dimensions: list = None
+	entry: dict | object = None, active_dimensions: list | None = None
 ):
 	dimensions_dict = frappe._dict()
 	if entry and active_dimensions:
@@ -535,7 +519,11 @@
 		# Only update outstanding for newly linked vouchers
 		for entry in entries:
 			update_voucher_outstanding(
-				entry.against_voucher_type, entry.against_voucher, entry.account, entry.party_type, entry.party
+				entry.against_voucher_type,
+				entry.against_voucher,
+				entry.account,
+				entry.party_type,
+				entry.party,
 			)
 		# update advance paid in Advance Receivable/Payable doctypes
 		if update_advance_paid:
@@ -566,15 +554,15 @@
 			.select(journal_acc[args.get("dr_or_cr")])
 			.where(
 				(journal_acc.account == args.get("account"))
-				& ((journal_acc.party_type == args.get("party_type")))
-				& ((journal_acc.party == args.get("party")))
+				& (journal_acc.party_type == args.get("party_type"))
+				& (journal_acc.party == args.get("party"))
 				& (
 					(journal_acc.reference_type.isnull())
 					| (journal_acc.reference_type.isin(["", "Sales Order", "Purchase Order"]))
 				)
-				& ((journal_entry.name == args.get("voucher_no")))
-				& ((journal_acc.name == args.get("voucher_detail_no")))
-				& ((journal_entry.docstatus == 1))
+				& (journal_entry.name == args.get("voucher_no"))
+				& (journal_acc.name == args.get("voucher_detail_no"))
+				& (journal_entry.docstatus == 1)
 			)
 		)
 
@@ -614,9 +602,7 @@
 
 
 def validate_allocated_amount(args):
-	precision = args.get("precision") or frappe.db.get_single_value(
-		"System Settings", "currency_precision"
-	)
+	precision = args.get("precision") or frappe.db.get_single_value("System Settings", "currency_precision")
 	if args.get("allocated_amount") < 0:
 		throw(_("Allocated amount cannot be negative"))
 	elif flt(args.get("allocated_amount"), precision) > flt(args.get("unadjusted_amount"), precision):
@@ -631,9 +617,9 @@
 
 	# Update Advance Paid in SO/PO since they might be getting unlinked
 	update_advance_paid = []
-	advance_payment_doctypes = frappe.get_hooks(
-		"advance_payment_receivable_doctypes"
-	) + frappe.get_hooks("advance_payment_payable_doctypes")
+	advance_payment_doctypes = frappe.get_hooks("advance_payment_receivable_doctypes") + frappe.get_hooks(
+		"advance_payment_payable_doctypes"
+	)
 	if jv_detail.get("reference_type") in advance_payment_doctypes:
 		update_advance_paid.append((jv_detail.reference_type, jv_detail.reference_name))
 
@@ -709,9 +695,9 @@
 		existing_row = payment_entry.get("references", {"name": d["voucher_detail_no"]})[0]
 
 		# Update Advance Paid in SO/PO since they are getting unlinked
-		advance_payment_doctypes = frappe.get_hooks(
-			"advance_payment_receivable_doctypes"
-		) + frappe.get_hooks("advance_payment_payable_doctypes")
+		advance_payment_doctypes = frappe.get_hooks("advance_payment_receivable_doctypes") + frappe.get_hooks(
+			"advance_payment_payable_doctypes"
+		)
 		if existing_row.get("reference_doctype") in advance_payment_doctypes:
 			update_advance_paid.append((existing_row.reference_doctype, existing_row.reference_name))
 
@@ -747,7 +733,7 @@
 
 
 def cancel_exchange_gain_loss_journal(
-	parent_doc: dict | object, referenced_dt: str = None, referenced_dn: str = None
+	parent_doc: dict | object, referenced_dt: str | None = None, referenced_dn: str | None = None
 ) -> None:
 	"""
 	Cancel Exchange Gain/Loss for Sales/Purchase Invoice, if they have any.
@@ -790,7 +776,7 @@
 
 
 def update_accounting_ledgers_after_reference_removal(
-	ref_type: str = None, ref_no: str = None, payment_name: str = None
+	ref_type: str | None = None, ref_no: str | None = None, payment_name: str | None = None
 ):
 	# General Ledger
 	gle = qb.DocType("GL Entry")
@@ -816,9 +802,7 @@
 		.set(ple.modified, now())
 		.set(ple.modified_by, frappe.session.user)
 		.where(
-			(ple.against_voucher_type == ref_type)
-			& (ple.against_voucher_no == ref_no)
-			& (ple.delinked == 0)
+			(ple.against_voucher_type == ref_type) & (ple.against_voucher_no == ref_no) & (ple.delinked == 0)
 		)
 	)
 
@@ -835,7 +819,7 @@
 		qb.from_(adv_type).delete().where(adv_type.parent == ref_doc.name).run()
 
 
-def unlink_ref_doc_from_payment_entries(ref_doc: object = None, payment_name: str = None):
+def unlink_ref_doc_from_payment_entries(ref_doc: object = None, payment_name: str | None = None):
 	remove_ref_doc_link_from_jv(ref_doc.doctype, ref_doc.name, payment_name)
 	remove_ref_doc_link_from_pe(ref_doc.doctype, ref_doc.name, payment_name)
 	update_accounting_ledgers_after_reference_removal(ref_doc.doctype, ref_doc.name, payment_name)
@@ -843,7 +827,7 @@
 
 
 def remove_ref_doc_link_from_jv(
-	ref_type: str = None, ref_no: str = None, payment_name: str = None
+	ref_type: str | None = None, ref_no: str | None = None, payment_name: str | None = None
 ):
 	jea = qb.DocType("Journal Entry Account")
 
@@ -883,7 +867,7 @@
 
 
 def remove_ref_doc_link_from_pe(
-	ref_type: str = None, ref_no: str = None, payment_name: str = None
+	ref_type: str | None = None, ref_no: str | None = None, payment_name: str | None = None
 ):
 	per = qb.DocType("Payment Entry Reference")
 	pay = qb.DocType("Payment Entry")
@@ -891,9 +875,7 @@
 	linked_pe = (
 		qb.from_(per)
 		.select(per.parent)
-		.where(
-			(per.reference_doctype == ref_type) & (per.reference_name == ref_no) & (per.docstatus.lt(2))
-		)
+		.where((per.reference_doctype == ref_type) & (per.reference_name == ref_no) & (per.docstatus.lt(2)))
 		.run(as_list=1)
 	)
 	linked_pe = convert_to_list(linked_pe)
@@ -906,9 +888,7 @@
 			.set(per.allocated_amount, 0)
 			.set(per.modified, now())
 			.set(per.modified_by, frappe.session.user)
-			.where(
-				(per.docstatus.lt(2) & (per.reference_doctype == ref_type) & (per.reference_name == ref_no))
-			)
+			.where(per.docstatus.lt(2) & (per.reference_doctype == ref_type) & (per.reference_name == ref_no))
 		)
 
 		if payment_name:
@@ -923,13 +903,15 @@
 
 				# Call cancel on only removed reference
 				references = [
-					x for x in pe_doc.references if x.reference_doctype == ref_type and x.reference_name == ref_no
+					x
+					for x in pe_doc.references
+					if x.reference_doctype == ref_type and x.reference_name == ref_no
 				]
 				[pe_doc.make_advance_gl_entries(x, cancel=1) for x in references]
 
 				pe_doc.clear_unallocated_reference_document_rows()
 				pe_doc.validate_payment_type_with_outstanding()
-			except Exception as e:
+			except Exception:
 				msg = _("There were issues unlinking payment entry {0}.").format(pe_doc.name)
 				msg += "<br>"
 				msg += _("Please cancel payment entry manually first")
@@ -939,9 +921,7 @@
 				pay.base_total_allocated_amount, pe_doc.base_total_allocated_amount
 			).set(pay.unallocated_amount, pe_doc.unallocated_amount).set(pay.modified, now()).set(
 				pay.modified_by, frappe.session.user
-			).where(
-				pay.name == pe
-			).run()
+			).where(pay.name == pe).run()
 
 		frappe.msgprint(_("Payment Entries {0} are un-linked").format("\n".join(linked_pe)))
 
@@ -975,9 +955,10 @@
 			dr_or_cr = d.voucher_type == "Sales Invoice" and "credit" or "debit"
 
 			frappe.db.sql(
-				"""update `tabGL Entry` set %s = %s + %s
-				where voucher_type = %s and voucher_no = %s and %s > 0 limit 1"""
-				% (dr_or_cr, dr_or_cr, "%s", "%s", "%s", dr_or_cr),
+				"""update `tabGL Entry` set {} = {} + {}
+				where voucher_type = {} and voucher_no = {} and {} > 0 limit 1""".format(
+					dr_or_cr, dr_or_cr, "%s", "%s", "%s", dr_or_cr
+				),
 				(d.diff, d.voucher_type, d.voucher_no),
 			)
 
@@ -1020,7 +1001,6 @@
 	limit=None,  # passed by reconciliation tool
 	voucher_no=None,  # filter passed by reconciliation tool
 ):
-
 	ple = qb.DocType("Payment Ledger Entry")
 	outstanding_invoices = []
 	precision = frappe.get_precision("Sales Invoice", "outstanding_amount") or 2
@@ -1083,15 +1063,11 @@
 					)
 				)
 
-	outstanding_invoices = sorted(
-		outstanding_invoices, key=lambda k: k["due_date"] or getdate(nowdate())
-	)
+	outstanding_invoices = sorted(outstanding_invoices, key=lambda k: k["due_date"] or getdate(nowdate()))
 	return outstanding_invoices
 
 
-def get_account_name(
-	account_type=None, root_type=None, is_group=None, account_currency=None, company=None
-):
+def get_account_name(account_type=None, root_type=None, is_group=None, account_currency=None, company=None):
 	"""return account based on matching conditions"""
 	return frappe.db.get_value(
 		"Account",
@@ -1124,7 +1100,7 @@
 	if frappe.db.has_column(doctype, "disabled") and not include_disabled:
 		filters.append(["disabled", "=", False])
 
-	filters.append(['ifnull(`{0}`,"")'.format(parent_fieldname), "=", "" if is_root else parent])
+	filters.append([f'ifnull(`{parent_fieldname}`,"")', "=", "" if is_root else parent])
 
 	if is_root:
 		fields += ["root_type", "report_type", "account_currency"] if doctype == "Account" else []
@@ -1144,7 +1120,6 @@
 
 @frappe.whitelist()
 def get_account_balances(accounts, company):
-
 	if isinstance(accounts, str):
 		accounts = loads(accounts)
 
@@ -1155,9 +1130,7 @@
 
 	for account in accounts:
 		account["company_currency"] = company_currency
-		account["balance"] = flt(
-			get_balance_on(account["value"], in_account_currency=False, company=company)
-		)
+		account["balance"] = flt(get_balance_on(account["value"], in_account_currency=False, company=company))
 		if account["account_currency"] and account["account_currency"] != company_currency:
 			account["balance_in_account_currency"] = flt(get_balance_on(account["value"], company=company))
 
@@ -1307,20 +1280,17 @@
 	warehouse_account=None,
 	company=None,
 ):
-	stock_vouchers = get_future_stock_vouchers(
-		posting_date, posting_time, for_warehouses, for_items, company
-	)
+	stock_vouchers = get_future_stock_vouchers(posting_date, posting_time, for_warehouses, for_items, company)
 	repost_gle_for_stock_vouchers(stock_vouchers, posting_date, company, warehouse_account)
 
 
 def repost_gle_for_stock_vouchers(
-	stock_vouchers: List[Tuple[str, str]],
+	stock_vouchers: list[tuple[str, str]],
 	posting_date: str,
-	company: Optional[str] = None,
+	company: str | None = None,
 	warehouse_account=None,
 	repost_doc: Optional["RepostItemValuation"] = None,
 ):
-
 	from erpnext.accounts.general_ledger import toggle_debit_credit_if_negative
 
 	if not stock_vouchers:
@@ -1366,16 +1336,12 @@
 
 def _delete_pl_entries(voucher_type, voucher_no):
 	ple = qb.DocType("Payment Ledger Entry")
-	qb.from_(ple).delete().where(
-		(ple.voucher_type == voucher_type) & (ple.voucher_no == voucher_no)
-	).run()
+	qb.from_(ple).delete().where((ple.voucher_type == voucher_type) & (ple.voucher_no == voucher_no)).run()
 
 
 def _delete_gl_entries(voucher_type, voucher_no):
 	gle = qb.DocType("GL Entry")
-	qb.from_(gle).delete().where(
-		(gle.voucher_type == voucher_type) & (gle.voucher_no == voucher_no)
-	).run()
+	qb.from_(gle).delete().where((gle.voucher_type == voucher_type) & (gle.voucher_no == voucher_no)).run()
 
 
 def _delete_accounting_ledger_entries(voucher_type, voucher_no):
@@ -1386,9 +1352,7 @@
 	_delete_pl_entries(voucher_type, voucher_no)
 
 
-def sort_stock_vouchers_by_posting_date(
-	stock_vouchers: List[Tuple[str, str]]
-) -> List[Tuple[str, str]]:
+def sort_stock_vouchers_by_posting_date(stock_vouchers: list[tuple[str, str]]) -> list[tuple[str, str]]:
 	sle = frappe.qb.DocType("Stock Ledger Entry")
 	voucher_nos = [v[1] for v in stock_vouchers]
 
@@ -1409,10 +1373,7 @@
 	return sorted_vouchers
 
 
-def get_future_stock_vouchers(
-	posting_date, posting_time, for_warehouses=None, for_items=None, company=None
-):
-
+def get_future_stock_vouchers(posting_date, posting_time, for_warehouses=None, for_items=None, company=None):
 	values = []
 	condition = ""
 	if for_items:
@@ -1428,16 +1389,14 @@
 		values.append(company)
 
 	future_stock_vouchers = frappe.db.sql(
-		"""select distinct sle.voucher_type, sle.voucher_no
+		f"""select distinct sle.voucher_type, sle.voucher_no
 		from `tabStock Ledger Entry` sle
 		where
 			timestamp(sle.posting_date, sle.posting_time) >= timestamp(%s, %s)
 			and is_cancelled = 0
 			{condition}
-		order by timestamp(sle.posting_date, sle.posting_time) asc, creation asc for update""".format(
-			condition=condition
-		),
-		tuple([posting_date, posting_time] + values),
+		order by timestamp(sle.posting_date, sle.posting_time) asc, creation asc for update""",
+		tuple([posting_date, posting_time, *values]),
 		as_dict=True,
 	)
 
@@ -1464,9 +1423,8 @@
 		select name, account, credit, debit, cost_center, project, voucher_type, voucher_no
 			from `tabGL Entry`
 		where
-			posting_date >= %s and voucher_no in (%s)"""
-		% ("%s", ", ".join(["%s"] * len(voucher_nos))),
-		tuple([posting_date] + voucher_nos),
+			posting_date >= {} and voucher_no in ({})""".format("%s", ", ".join(["%s"] * len(voucher_nos))),
+		tuple([posting_date, *voucher_nos]),
 		as_dict=1,
 	)
 
@@ -1505,16 +1463,16 @@
 def get_stock_accounts(company, voucher_type=None, voucher_no=None):
 	stock_accounts = [
 		d.name
-		for d in frappe.db.get_all(
-			"Account", {"account_type": "Stock", "company": company, "is_group": 0}
-		)
+		for d in frappe.db.get_all("Account", {"account_type": "Stock", "company": company, "is_group": 0})
 	]
 	if voucher_type and voucher_no:
 		if voucher_type == "Journal Entry":
 			stock_accounts = [
 				d.account
 				for d in frappe.db.get_all(
-					"Journal Entry Account", {"parent": voucher_no, "account": ["in", stock_accounts]}, "account"
+					"Journal Entry Account",
+					{"parent": voucher_no, "account": ["in", stock_accounts]},
+					"account",
 				)
 			]
 
@@ -1523,7 +1481,11 @@
 				d.account
 				for d in frappe.db.get_all(
 					"GL Entry",
-					{"voucher_type": voucher_type, "voucher_no": voucher_no, "account": ["in", stock_accounts]},
+					{
+						"voucher_type": voucher_type,
+						"voucher_no": voucher_no,
+						"account": ["in", stock_accounts],
+					},
 					"account",
 				)
 			]
@@ -1554,9 +1516,7 @@
 
 
 def get_journal_entry(account, stock_adjustment_account, amount):
-	db_or_cr_warehouse_account = (
-		"credit_in_account_currency" if amount < 0 else "debit_in_account_currency"
-	)
+	db_or_cr_warehouse_account = "credit_in_account_currency" if amount < 0 else "debit_in_account_currency"
 	db_or_cr_stock_adjustment_account = (
 		"debit_in_account_currency" if amount < 0 else "credit_in_account_currency"
 	)
@@ -1577,7 +1537,7 @@
 			frappe.delete_doc("Desktop Icon", icon)
 
 
-def create_err_and_its_journals(companies: list = None) -> None:
+def create_err_and_its_journals(companies: list | None = None) -> None:
 	if companies:
 		for company in companies:
 			err = frappe.new_doc("Exchange Rate Revaluation")
@@ -1634,9 +1594,7 @@
 		accounts_with_types = (
 			qb.from_(account)
 			.select(account.name, account.account_type)
-			.where(
-				(account.account_type.isin(["Receivable", "Payable"]) & (account.company.isin(companies)))
-			)
+			.where(account.account_type.isin(["Receivable", "Payable"]) & (account.company.isin(companies)))
 			.run(as_dict=True)
 		)
 		receivable_or_payable_accounts = [y.name for y in accounts_with_types]
@@ -1703,7 +1661,6 @@
 		ple_map = get_payment_ledger_entries(gl_entries, cancel=cancel)
 
 		for entry in ple_map:
-
 			ple = frappe.get_doc(entry)
 
 			if cancel:
@@ -1781,7 +1738,7 @@
 		query.run()
 
 
-class QueryPaymentLedger(object):
+class QueryPaymentLedger:
 	"""
 	Helper Class for Querying Payment Ledger Entry
 	"""
@@ -1949,7 +1906,8 @@
 				Table("outstanding").amount_in_account_currency.as_("outstanding_in_account_currency"),
 				(Table("vouchers").amount - Table("outstanding").amount).as_("paid_amount"),
 				(
-					Table("vouchers").amount_in_account_currency - Table("outstanding").amount_in_account_currency
+					Table("vouchers").amount_in_account_currency
+					- Table("outstanding").amount_in_account_currency
 				).as_("paid_amount_in_account_currency"),
 				Table("vouchers").due_date,
 				Table("vouchers").currency,
diff --git a/erpnext/assets/dashboard_fixtures.py b/erpnext/assets/dashboard_fixtures.py
index fc9ba38..3b1d144 100644
--- a/erpnext/assets/dashboard_fixtures.py
+++ b/erpnext/assets/dashboard_fixtures.py
@@ -12,7 +12,6 @@
 
 
 def get_data():
-
 	fiscal_year = _get_fiscal_year(nowdate())
 
 	if not fiscal_year:
@@ -168,9 +167,7 @@
 			"is_public": 1,
 			"show_percentage_stats": 1,
 			"stats_time_interval": "Monthly",
-			"filters_json": json.dumps(
-				[["Asset", "creation", "between", [year_start_date, year_end_date]]]
-			),
+			"filters_json": json.dumps([["Asset", "creation", "between", [year_start_date, year_end_date]]]),
 			"doctype": "Number Card",
 		},
 		{
diff --git a/erpnext/assets/doctype/asset/asset.json b/erpnext/assets/doctype/asset/asset.json
index 39a0867..0e89319 100644
--- a/erpnext/assets/doctype/asset/asset.json
+++ b/erpnext/assets/doctype/asset/asset.json
@@ -589,7 +589,7 @@
    "link_fieldname": "target_asset"
   }
  ],
- "modified": "2024-01-15 17:35:49.226603",
+ "modified": "2024-03-27 13:06:32.494326",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset",
@@ -628,7 +628,7 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "asset_name",
diff --git a/erpnext/assets/doctype/asset/asset.py b/erpnext/assets/doctype/asset/asset.py
index 385797f..0311d3c 100644
--- a/erpnext/assets/doctype/asset/asset.py
+++ b/erpnext/assets/doctype/asset/asset.py
@@ -211,9 +211,7 @@
 				)
 
 		if self.is_existing_asset and self.purchase_invoice:
-			frappe.throw(
-				_("Purchase Invoice cannot be made against an existing asset {0}").format(self.name)
-			)
+			frappe.throw(_("Purchase Invoice cannot be made against an existing asset {0}").format(self.name))
 
 	def prepare_depreciation_data(self):
 		if self.calculate_depreciation:
@@ -274,9 +272,9 @@
 		for d in self.finance_books:
 			if d.depreciation_start_date == self.available_for_use_date:
 				frappe.throw(
-					_("Row #{}: Depreciation Posting Date should not be equal to Available for Use Date.").format(
-						d.idx
-					),
+					_(
+						"Row #{}: Depreciation Posting Date should not be equal to Available for Use Date."
+					).format(d.idx),
 					title=_("Incorrect Date"),
 				)
 
@@ -285,9 +283,7 @@
 			self.asset_category = frappe.get_cached_value("Item", self.item_code, "asset_category")
 
 		if self.item_code and not self.get("finance_books"):
-			finance_books = get_item_details(
-				self.item_code, self.asset_category, self.gross_purchase_amount
-			)
+			finance_books = get_item_details(self.item_code, self.asset_category, self.gross_purchase_amount)
 			self.set("finance_books", finance_books)
 
 	def validate_finance_books(self):
@@ -337,7 +333,9 @@
 				and not frappe.db.get_value("Purchase Invoice", self.purchase_invoice, "update_stock")
 			):
 				frappe.throw(
-					_("Update stock must be enabled for the purchase invoice {0}").format(self.purchase_invoice)
+					_("Update stock must be enabled for the purchase invoice {0}").format(
+						self.purchase_invoice
+					)
 				)
 
 		if not self.calculate_depreciation:
@@ -351,9 +349,7 @@
 		if self.is_existing_asset:
 			return
 
-		if self.available_for_use_date and getdate(self.available_for_use_date) < getdate(
-			self.purchase_date
-		):
+		if self.available_for_use_date and getdate(self.available_for_use_date) < getdate(self.purchase_date):
 			frappe.throw(_("Available-for-use Date should be after purchase date"))
 
 	def validate_gross_and_purchase_amount(self):
@@ -376,7 +372,7 @@
 			posting_date, posting_time = frappe.db.get_value(
 				reference_doctype, reference_docname, ["posting_date", "posting_time"]
 			)
-			transaction_date = get_datetime("{} {}".format(posting_date, posting_time))
+			transaction_date = get_datetime(f"{posting_date} {posting_time}")
 		assets = [
 			{
 				"asset": self.name,
@@ -416,7 +412,8 @@
 		if not row.depreciation_start_date:
 			if not self.available_for_use_date:
 				frappe.throw(
-					_("Row {0}: Depreciation Start Date is required").format(row.idx), title=_("Invalid Schedule")
+					_("Row {0}: Depreciation Start Date is required").format(row.idx),
+					title=_("Invalid Schedule"),
 				)
 			row.depreciation_start_date = get_last_day(self.available_for_use_date)
 
@@ -446,9 +443,7 @@
 					title=_("Invalid Schedule"),
 				)
 
-		if row.depreciation_start_date and getdate(row.depreciation_start_date) < getdate(
-			self.purchase_date
-		):
+		if row.depreciation_start_date and getdate(row.depreciation_start_date) < getdate(self.purchase_date):
 			frappe.throw(
 				_("Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date").format(
 					row.idx
@@ -567,11 +562,14 @@
 
 				if self.calculate_depreciation:
 					idx = self.get_default_finance_book_idx() or 0
-					expected_value_after_useful_life = self.finance_books[idx].expected_value_after_useful_life
+					expected_value_after_useful_life = self.finance_books[
+						idx
+					].expected_value_after_useful_life
 					value_after_depreciation = self.finance_books[idx].value_after_depreciation
 
 				if (
-					flt(value_after_depreciation) <= expected_value_after_useful_life or self.is_fully_depreciated
+					flt(value_after_depreciation) <= expected_value_after_useful_life
+					or self.is_fully_depreciated
 				):
 					status = "Fully Depreciated"
 				elif flt(value_after_depreciation) < flt(self.gross_purchase_amount):
@@ -604,9 +602,7 @@
 
 	@frappe.whitelist()
 	def get_manual_depreciation_entries(self):
-		(_, _, depreciation_expense_account) = get_depreciation_accounts(
-			self.asset_category, self.company
-		)
+		(_, _, depreciation_expense_account) = get_depreciation_accounts(self.asset_category, self.company)
 
 		gle = frappe.qb.DocType("GL Entry")
 
@@ -704,7 +700,6 @@
 			and self.purchase_receipt_amount
 			and getdate(self.available_for_use_date) <= getdate()
 		):
-
 			gl_entries.append(
 				self.get_gl_dict(
 					{
@@ -751,7 +746,8 @@
 		if args.get("depreciation_method") == "Double Declining Balance":
 			return 200.0 / (
 				(
-					flt(args.get("total_number_of_depreciations"), 2) * flt(args.get("frequency_of_depreciation"))
+					flt(args.get("total_number_of_depreciations"), 2)
+					* flt(args.get("frequency_of_depreciation"))
 				)
 				/ 12
 			)
@@ -795,9 +791,7 @@
 		asset = frappe.get_doc("Asset", asset.name)
 		if frappe.db.exists("Asset Repair", {"asset_name": asset.name, "repair_status": "Pending"}):
 			asset.set_status("Out of Order")
-		elif frappe.db.exists(
-			"Asset Maintenance Task", {"parent": asset.name, "next_due_date": today()}
-		):
+		elif frappe.db.exists("Asset Maintenance Task", {"parent": asset.name, "next_due_date": today()}):
 			asset.set_status("In Maintenance")
 		else:
 			asset.set_status()
@@ -881,9 +875,7 @@
 @frappe.whitelist()
 def create_asset_value_adjustment(asset, asset_category, company):
 	asset_value_adjustment = frappe.new_doc("Asset Value Adjustment")
-	asset_value_adjustment.update(
-		{"asset": asset, "company": company, "asset_category": asset_category}
-	)
+	asset_value_adjustment.update({"asset": asset, "company": company, "asset_category": asset_category})
 	return asset_value_adjustment
 
 
@@ -940,18 +932,14 @@
 		)
 
 	if not asset and not account:
-		account = get_asset_category_account(
-			account_name, asset_category=asset_category, company=company
-		)
+		account = get_asset_category_account(account_name, asset_category=asset_category, company=company)
 
 	if not account:
 		account = frappe.get_cached_value("Company", company, account_name)
 
 	if not account:
 		if not asset_category:
-			frappe.throw(
-				_("Set {0} in company {1}").format(account_name.replace("_", " ").title(), company)
-			)
+			frappe.throw(_("Set {0} in company {1}").format(account_name.replace("_", " ").title(), company))
 		else:
 			frappe.throw(
 				_("Set {0} in asset category {1} or company {2}").format(
@@ -980,7 +968,7 @@
 	je.voucher_type = "Depreciation Entry"
 	je.naming_series = depreciation_series
 	je.company = asset.company
-	je.remark = ("Depreciation Entry against asset {0}").format(asset_name)
+	je.remark = f"Depreciation Entry against asset {asset_name}"
 
 	je.append(
 		"accounts",
@@ -1081,15 +1069,11 @@
 
 	add_asset_activity(
 		asset.name,
-		_("Asset updated after being split into Asset {0}").format(
-			get_link_to_form("Asset", new_asset_name)
-		),
+		_("Asset updated after being split into Asset {0}").format(get_link_to_form("Asset", new_asset_name)),
 	)
 
 	for row in asset.get("finance_books"):
-		value_after_depreciation = flt(
-			(row.value_after_depreciation * remaining_qty) / asset.asset_quantity
-		)
+		value_after_depreciation = flt((row.value_after_depreciation * remaining_qty) / asset.asset_quantity)
 		expected_value_after_useful_life = flt(
 			(row.expected_value_after_useful_life * remaining_qty) / asset.asset_quantity
 		)
@@ -1103,9 +1087,7 @@
 			expected_value_after_useful_life,
 		)
 
-		current_asset_depr_schedule_doc = get_asset_depr_schedule_doc(
-			asset.name, "Active", row.finance_book
-		)
+		current_asset_depr_schedule_doc = get_asset_depr_schedule_doc(asset.name, "Active", row.finance_book)
 		new_asset_depr_schedule_doc = frappe.copy_doc(current_asset_depr_schedule_doc)
 
 		new_asset_depr_schedule_doc.set_draft_asset_depr_schedule_details(asset, row)
@@ -1120,9 +1102,7 @@
 
 		notes = _(
 			"This schedule was created when Asset {0} was updated after being split into new Asset {1}."
-		).format(
-			get_link_to_form(asset.doctype, asset.name), get_link_to_form(asset.doctype, new_asset_name)
-		)
+		).format(get_link_to_form(asset.doctype, asset.name), get_link_to_form(asset.doctype, new_asset_name))
 		new_asset_depr_schedule_doc.notes = notes
 
 		current_asset_depr_schedule_doc.flags.should_not_cancel_depreciation_entries = True
@@ -1146,9 +1126,7 @@
 	new_asset.split_from = asset.name
 
 	for row in new_asset.get("finance_books"):
-		row.value_after_depreciation = flt(
-			(row.value_after_depreciation * split_qty) / asset.asset_quantity
-		)
+		row.value_after_depreciation = flt((row.value_after_depreciation * split_qty) / asset.asset_quantity)
 		row.expected_value_after_useful_life = flt(
 			(row.expected_value_after_useful_life * split_qty) / asset.asset_quantity
 		)
@@ -1157,18 +1135,14 @@
 
 	add_asset_activity(
 		new_asset.name,
-		_("Asset created after being split from Asset {0}").format(
-			get_link_to_form("Asset", asset.name)
-		),
+		_("Asset created after being split from Asset {0}").format(get_link_to_form("Asset", asset.name)),
 	)
 
 	new_asset.submit()
 	new_asset.set_status()
 
 	for row in new_asset.get("finance_books"):
-		current_asset_depr_schedule_doc = get_asset_depr_schedule_doc(
-			asset.name, "Active", row.finance_book
-		)
+		current_asset_depr_schedule_doc = get_asset_depr_schedule_doc(asset.name, "Active", row.finance_book)
 		new_asset_depr_schedule_doc = frappe.copy_doc(current_asset_depr_schedule_doc)
 
 		new_asset_depr_schedule_doc.set_draft_asset_depr_schedule_details(new_asset, row)
diff --git a/erpnext/assets/doctype/asset/depreciation.py b/erpnext/assets/doctype/asset/depreciation.py
index 205f4b9..b6a4d91 100644
--- a/erpnext/assets/doctype/asset/depreciation.py
+++ b/erpnext/assets/doctype/asset/depreciation.py
@@ -71,7 +71,10 @@
 		) not in credit_and_debit_accounts_for_asset_category_and_company:
 			credit_and_debit_accounts_for_asset_category_and_company.update(
 				{
-					(asset_category, asset_company): get_credit_and_debit_accounts_for_asset_category_and_company(
+					(
+						asset_category,
+						asset_company,
+					): get_credit_and_debit_accounts_for_asset_category_and_company(
 						asset_category, asset_company
 					),
 				}
@@ -135,9 +138,7 @@
 
 def make_depreciation_entry_for_all_asset_depr_schedules(asset_doc, date=None):
 	for row in asset_doc.get("finance_books"):
-		asset_depr_schedule_name = get_asset_depr_schedule_name(
-			asset_doc.name, "Active", row.finance_book
-		)
+		asset_depr_schedule_name = get_asset_depr_schedule_name(asset_doc.name, "Active", row.finance_book)
 		make_depreciation_entry(asset_depr_schedule_name, date)
 
 
@@ -147,9 +148,7 @@
 	if not acc_frozen_upto:
 		return
 
-	frozen_accounts_modifier = frappe.db.get_single_value(
-		"Accounts Settings", "frozen_accounts_modifier"
-	)
+	frozen_accounts_modifier = frappe.db.get_single_value("Accounts Settings", "frozen_accounts_modifier")
 
 	if frozen_accounts_modifier not in frappe.get_roles() or frappe.session.user == "Administrator":
 		return getdate(acc_frozen_upto)
@@ -278,9 +277,7 @@
 	je.posting_date = depr_schedule.schedule_date
 	je.company = asset.company
 	je.finance_book = asset_depr_schedule_doc.finance_book
-	je.remark = "Depreciation Entry against {0} worth {1}".format(
-		asset.name, depr_schedule.depreciation_amount
-	)
+	je.remark = f"Depreciation Entry against {asset.name} worth {depr_schedule.depreciation_amount}"
 
 	credit_entry = {
 		"account": credit_account,
@@ -361,11 +358,7 @@
 		if not depreciation_expense_account:
 			depreciation_expense_account = accounts[1]
 
-	if (
-		not fixed_asset_account
-		or not accumulated_depreciation_account
-		or not depreciation_expense_account
-	):
+	if not fixed_asset_account or not accumulated_depreciation_account or not depreciation_expense_account:
 		frappe.throw(
 			_("Please set Depreciation related Accounts in Asset Category {0} or Company {1}").format(
 				asset_category, company
@@ -443,9 +436,7 @@
 	if asset.docstatus != 1:
 		frappe.throw(_("Asset {0} must be submitted").format(asset.name))
 	elif asset.status in ("Cancelled", "Sold", "Scrapped", "Capitalized", "Decapitalized"):
-		frappe.throw(
-			_("Asset {0} cannot be scrapped, as it is already {1}").format(asset.name, asset.status)
-		)
+		frappe.throw(_("Asset {0} cannot be scrapped, as it is already {1}").format(asset.name, asset.status))
 
 	date = today()
 
@@ -456,16 +447,14 @@
 	depreciate_asset(asset, date, notes)
 	asset.reload()
 
-	depreciation_series = frappe.get_cached_value(
-		"Company", asset.company, "series_for_depreciation_entry"
-	)
+	depreciation_series = frappe.get_cached_value("Company", asset.company, "series_for_depreciation_entry")
 
 	je = frappe.new_doc("Journal Entry")
 	je.voucher_type = "Journal Entry"
 	je.naming_series = depreciation_series
 	je.posting_date = date
 	je.company = asset.company
-	je.remark = "Scrap Entry for asset {0}".format(asset_name)
+	je.remark = f"Scrap Entry for asset {asset_name}"
 
 	for entry in get_gl_entries_on_asset_disposal(asset, date):
 		entry.update({"reference_type": "Asset", "reference_name": asset_name})
@@ -513,9 +502,7 @@
 
 	asset_doc.flags.ignore_validate_update_after_submit = True
 
-	make_new_active_asset_depr_schedules_and_cancel_current_ones(
-		asset_doc, notes, date_of_disposal=date
-	)
+	make_new_active_asset_depr_schedules_and_cancel_current_ones(asset_doc, notes, date_of_disposal=date)
 
 	asset_doc.save()
 
@@ -536,9 +523,7 @@
 
 	asset_doc.flags.ignore_validate_update_after_submit = True
 
-	make_new_active_asset_depr_schedules_and_cancel_current_ones(
-		asset_doc, notes, date_of_return=date
-	)
+	make_new_active_asset_depr_schedules_and_cancel_current_ones(asset_doc, notes, date_of_return=date)
 
 	modify_depreciation_schedule_for_asset_repairs(asset_doc, notes)
 
@@ -781,9 +766,7 @@
 	)
 
 	if not disposal_account:
-		frappe.throw(
-			_("Please set 'Gain/Loss Account on Asset Disposal' in Company {0}").format(company)
-		)
+		frappe.throw(_("Please set 'Gain/Loss Account on Asset Disposal' in Company {0}").format(company))
 	if not depreciation_cost_center:
 		frappe.throw(_("Please set 'Asset Depreciation Cost Center' in Company {0}").format(company))
 
@@ -796,7 +779,7 @@
 
 	if asset_doc.available_for_use_date > getdate(disposal_date):
 		frappe.throw(
-			"Disposal date {0} cannot be before available for use date {1} of the asset.".format(
+			"Disposal date {} cannot be before available for use date {} of the asset.".format(
 				disposal_date, asset_doc.available_for_use_date
 			)
 		)
diff --git a/erpnext/assets/doctype/asset/test_asset.py b/erpnext/assets/doctype/asset/test_asset.py
index 25d0105..088641a 100644
--- a/erpnext/assets/doctype/asset/test_asset.py
+++ b/erpnext/assets/doctype/asset/test_asset.py
@@ -109,9 +109,7 @@
 		self.assertRaises(frappe.ValidationError, asset.save)
 
 	def test_purchase_asset(self):
-		pr = make_purchase_receipt(
-			item_code="Macbook Pro", qty=1, rate=100000.0, location="Test Location"
-		)
+		pr = make_purchase_receipt(item_code="Macbook Pro", qty=1, rate=100000.0, location="Test Location")
 
 		asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, "name")
 		asset = frappe.get_doc("Asset", asset_name)
@@ -210,7 +208,7 @@
 		)
 
 		first_asset_depr_schedule = get_asset_depr_schedule_doc(asset.name, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Active")
 
 		post_depreciation_entries(date=add_months(purchase_date, 2))
 		asset.load_from_db()
@@ -219,15 +217,15 @@
 			asset.gross_purchase_amount - asset.finance_books[0].value_after_depreciation,
 			asset.precision("gross_purchase_amount"),
 		)
-		self.assertEquals(accumulated_depr_amount, 18000.0)
+		self.assertEqual(accumulated_depr_amount, 18000.0)
 
 		scrap_asset(asset.name)
 		asset.load_from_db()
 		first_asset_depr_schedule.load_from_db()
 
 		second_asset_depr_schedule = get_asset_depr_schedule_doc(asset.name, "Active")
-		self.assertEquals(second_asset_depr_schedule.status, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Cancelled")
+		self.assertEqual(second_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Cancelled")
 
 		accumulated_depr_amount = flt(
 			asset.gross_purchase_amount - asset.finance_books[0].value_after_depreciation,
@@ -237,7 +235,7 @@
 			asset.finance_books[0], 9000, get_last_day(add_months(purchase_date, 1)), date
 		)
 		pro_rata_amount = flt(pro_rata_amount, asset.precision("gross_purchase_amount"))
-		self.assertEquals(
+		self.assertEqual(
 			accumulated_depr_amount,
 			flt(18000.0 + pro_rata_amount, asset.precision("gross_purchase_amount")),
 		)
@@ -266,8 +264,8 @@
 		second_asset_depr_schedule.load_from_db()
 
 		third_asset_depr_schedule = get_asset_depr_schedule_doc(asset.name, "Active")
-		self.assertEquals(third_asset_depr_schedule.status, "Active")
-		self.assertEquals(second_asset_depr_schedule.status, "Cancelled")
+		self.assertEqual(third_asset_depr_schedule.status, "Active")
+		self.assertEqual(second_asset_depr_schedule.status, "Cancelled")
 
 		asset.load_from_db()
 		self.assertFalse(asset.journal_entry_for_scrap)
@@ -279,7 +277,7 @@
 		)
 		this_month_depr_amount = 9000.0 if is_last_day_of_the_month(date) else 0
 
-		self.assertEquals(accumulated_depr_amount, 18000.0 + this_month_depr_amount)
+		self.assertEqual(accumulated_depr_amount, 18000.0 + this_month_depr_amount)
 
 	def test_gle_made_by_asset_sale(self):
 		date = nowdate()
@@ -296,7 +294,7 @@
 		)
 
 		first_asset_depr_schedule = get_asset_depr_schedule_doc(asset.name, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Active")
 
 		post_depreciation_entries(date=add_months(purchase_date, 2))
 
@@ -312,8 +310,8 @@
 		first_asset_depr_schedule.load_from_db()
 
 		second_asset_depr_schedule = get_asset_depr_schedule_doc(asset.name, "Active")
-		self.assertEquals(second_asset_depr_schedule.status, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Cancelled")
+		self.assertEqual(second_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Cancelled")
 
 		pro_rata_amount, _, _ = _get_pro_rata_amt(
 			asset.finance_books[0], 9000, get_last_day(add_months(purchase_date, 1)), date
@@ -457,7 +455,7 @@
 		)
 
 		first_asset_depr_schedule = get_asset_depr_schedule_doc(asset.name, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Active")
 
 		post_depreciation_entries(date="2021-01-01")
 
@@ -471,9 +469,9 @@
 
 		second_asset_depr_schedule = get_asset_depr_schedule_doc(asset.name, "Active")
 		first_asset_depr_schedule_of_new_asset = get_asset_depr_schedule_doc(new_asset.name, "Active")
-		self.assertEquals(second_asset_depr_schedule.status, "Active")
-		self.assertEquals(first_asset_depr_schedule_of_new_asset.status, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Cancelled")
+		self.assertEqual(second_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule_of_new_asset.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Cancelled")
 
 		depr_schedule_of_asset = second_asset_depr_schedule.get("depreciation_schedule")
 		depr_schedule_of_new_asset = first_asset_depr_schedule_of_new_asset.get("depreciation_schedule")
@@ -505,9 +503,7 @@
 		self.assertEqual(jv.accounts[3].reference_name, new_asset.name)
 
 	def test_expense_head(self):
-		pr = make_purchase_receipt(
-			item_code="Macbook Pro", qty=2, rate=200000.0, location="Test Location"
-		)
+		pr = make_purchase_receipt(item_code="Macbook Pro", qty=2, rate=200000.0, location="Test Location")
 		doc = make_invoice(pr.name)
 
 		self.assertEqual("Asset Received But Not Billed - _TC", doc.items[0].expense_account)
@@ -617,9 +613,7 @@
 		self.assertFalse(gle)
 
 		# case 1 -- PR with cwip disabled, Asset with cwip enabled
-		pr = make_purchase_receipt(
-			item_code="Macbook Pro", qty=1, rate=200000.0, location="Test Location"
-		)
+		pr = make_purchase_receipt(item_code="Macbook Pro", qty=1, rate=200000.0, location="Test Location")
 		frappe.db.set_value("Asset Category", "Computers", "enable_cwip_accounting", 1)
 		frappe.db.set_value("Asset Category Account", name, "capital_work_in_progress_account", cwip_acc)
 		asset = frappe.db.get_value("Asset", {"purchase_receipt": pr.name, "docstatus": 0}, "name")
@@ -631,9 +625,7 @@
 		self.assertFalse(gle)
 
 		# case 2 -- PR with cwip enabled, Asset with cwip disabled
-		pr = make_purchase_receipt(
-			item_code="Macbook Pro", qty=1, rate=200000.0, location="Test Location"
-		)
+		pr = make_purchase_receipt(item_code="Macbook Pro", qty=1, rate=200000.0, location="Test Location")
 		frappe.db.set_value("Asset Category", "Computers", "enable_cwip_accounting", 0)
 		asset = frappe.db.get_value("Asset", {"purchase_receipt": pr.name, "docstatus": 0}, "name")
 		asset_doc = frappe.get_doc("Asset", asset)
@@ -1248,8 +1240,7 @@
 
 		je = frappe.get_doc("Journal Entry", get_depr_schedule(asset.name, "Active")[0].journal_entry)
 		accounting_entries = [
-			{"account": entry.account, "debit": entry.debit, "credit": entry.credit}
-			for entry in je.accounts
+			{"account": entry.account, "debit": entry.debit, "credit": entry.credit} for entry in je.accounts
 		]
 
 		for entry in accounting_entries:
@@ -1284,8 +1275,7 @@
 
 		je = frappe.get_doc("Journal Entry", get_depr_schedule(asset.name, "Active")[0].journal_entry)
 		accounting_entries = [
-			{"account": entry.account, "debit": entry.debit, "credit": entry.credit}
-			for entry in je.accounts
+			{"account": entry.account, "debit": entry.debit, "credit": entry.credit} for entry in je.accounts
 		]
 
 		for entry in accounting_entries:
@@ -1366,21 +1356,15 @@
 		post_depreciation_entries(date="2020-04-01")
 		asset.load_from_db()
 
-		asset_depr_schedule_doc_1 = get_asset_depr_schedule_doc(
-			asset.name, "Active", "Test Finance Book 1"
-		)
+		asset_depr_schedule_doc_1 = get_asset_depr_schedule_doc(asset.name, "Active", "Test Finance Book 1")
 		asset_depr_schedule_doc_1.clear_depr_schedule()
 		self.assertEqual(len(asset_depr_schedule_doc_1.get("depreciation_schedule")), 3)
 
-		asset_depr_schedule_doc_2 = get_asset_depr_schedule_doc(
-			asset.name, "Active", "Test Finance Book 2"
-		)
+		asset_depr_schedule_doc_2 = get_asset_depr_schedule_doc(asset.name, "Active", "Test Finance Book 2")
 		asset_depr_schedule_doc_2.clear_depr_schedule()
 		self.assertEqual(len(asset_depr_schedule_doc_2.get("depreciation_schedule")), 3)
 
-		asset_depr_schedule_doc_3 = get_asset_depr_schedule_doc(
-			asset.name, "Active", "Test Finance Book 3"
-		)
+		asset_depr_schedule_doc_3 = get_asset_depr_schedule_doc(asset.name, "Active", "Test Finance Book 3")
 		asset_depr_schedule_doc_3.clear_depr_schedule()
 		self.assertEqual(len(asset_depr_schedule_doc_3.get("depreciation_schedule")), 0)
 
@@ -1412,14 +1396,10 @@
 		)
 		asset.save()
 
-		asset_depr_schedule_doc_1 = get_asset_depr_schedule_doc(
-			asset.name, "Draft", "Test Finance Book 1"
-		)
+		asset_depr_schedule_doc_1 = get_asset_depr_schedule_doc(asset.name, "Draft", "Test Finance Book 1")
 		self.assertEqual(len(asset_depr_schedule_doc_1.get("depreciation_schedule")), 3)
 
-		asset_depr_schedule_doc_2 = get_asset_depr_schedule_doc(
-			asset.name, "Draft", "Test Finance Book 2"
-		)
+		asset_depr_schedule_doc_2 = get_asset_depr_schedule_doc(asset.name, "Draft", "Test Finance Book 2")
 		self.assertEqual(len(asset_depr_schedule_doc_2.get("depreciation_schedule")), 6)
 
 	def test_depreciation_entry_cancellation(self):
@@ -1521,13 +1501,13 @@
 		asset.finance_books[0].expected_value_after_useful_life = 100
 		asset.save()
 		asset.reload()
-		self.assertEquals(asset.finance_books[0].value_after_depreciation, 98000.0)
+		self.assertEqual(asset.finance_books[0].value_after_depreciation, 98000.0)
 
 		# changing expected_value_after_useful_life shouldn't affect value_after_depreciation
 		asset.finance_books[0].expected_value_after_useful_life = 200
 		asset.save()
 		asset.reload()
-		self.assertEquals(asset.finance_books[0].value_after_depreciation, 98000.0)
+		self.assertEqual(asset.finance_books[0].value_after_depreciation, 98000.0)
 
 	def test_asset_cost_center(self):
 		asset = create_asset(is_existing_asset=1, do_not_save=1)
diff --git a/erpnext/assets/doctype/asset_activity/asset_activity.json b/erpnext/assets/doctype/asset_activity/asset_activity.json
index 00992e2..1d16f66 100644
--- a/erpnext/assets/doctype/asset_activity/asset_activity.json
+++ b/erpnext/assets/doctype/asset_activity/asset_activity.json
@@ -75,7 +75,7 @@
  "in_create": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-09-29 15:56:17.608643",
+ "modified": "2024-03-27 13:06:32.933603",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Activity",
@@ -106,7 +106,7 @@
    "share": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
index 9ddc442..a452918 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
@@ -356,7 +356,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-10-03 22:55:59.461456",
+ "modified": "2024-03-27 13:06:33.080441",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Capitalization",
@@ -394,7 +394,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title",
diff --git a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
index 2f4d710..db9170c 100644
--- a/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
+++ b/erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
@@ -70,9 +70,7 @@
 		amended_from: DF.Link | None
 		asset_items: DF.Table[AssetCapitalizationAssetItem]
 		asset_items_total: DF.Currency
-		capitalization_method: DF.Literal[
-			"", "Create a new composite asset", "Choose a WIP composite asset"
-		]
+		capitalization_method: DF.Literal["", "Create a new composite asset", "Choose a WIP composite asset"]
 		company: DF.Link
 		cost_center: DF.Link | None
 		entry_type: DF.Literal["Capitalization", "Decapitalization"]
@@ -147,7 +145,7 @@
 
 	def on_trash(self):
 		frappe.db.set_value("Asset", self.target_asset, "capitalized_in", None)
-		super(AssetCapitalization, self).on_trash()
+		super().on_trash()
 
 	def cancel_target_asset(self):
 		if self.entry_type == "Capitalization" and self.target_asset:
@@ -240,7 +238,9 @@
 
 			if target_asset.item_code != self.target_item_code:
 				frappe.throw(
-					_("Asset {0} does not belong to Item {1}").format(self.target_asset, self.target_item_code)
+					_("Asset {0} does not belong to Item {1}").format(
+						self.target_asset, self.target_item_code
+					)
 				)
 
 			if target_asset.status in ("Scrapped", "Sold", "Capitalized", "Decapitalized"):
@@ -255,7 +255,9 @@
 
 			if target_asset.company != self.company:
 				frappe.throw(
-					_("Target Asset {0} does not belong to company {1}").format(target_asset.name, self.company)
+					_("Target Asset {0} does not belong to company {1}").format(
+						target_asset.name, self.company
+					)
 				)
 
 	def validate_consumed_stock_item(self):
@@ -285,13 +287,17 @@
 
 				if asset.status in ("Draft", "Scrapped", "Sold", "Capitalized", "Decapitalized"):
 					frappe.throw(
-						_("Row #{0}: Consumed Asset {1} cannot be {2}").format(d.idx, asset.name, asset.status)
+						_("Row #{0}: Consumed Asset {1} cannot be {2}").format(
+							d.idx, asset.name, asset.status
+						)
 					)
 
 				if asset.docstatus == 0:
 					frappe.throw(_("Row #{0}: Consumed Asset {1} cannot be Draft").format(d.idx, asset.name))
 				elif asset.docstatus == 2:
-					frappe.throw(_("Row #{0}: Consumed Asset {1} cannot be cancelled").format(d.idx, asset.name))
+					frappe.throw(
+						_("Row #{0}: Consumed Asset {1} cannot be cancelled").format(d.idx, asset.name)
+					)
 
 				if asset.company != self.company:
 					frappe.throw(
@@ -444,9 +450,7 @@
 		elif self.docstatus == 2:
 			make_reverse_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
 
-	def get_gl_entries(
-		self, warehouse_account=None, default_expense_account=None, default_cost_center=None
-	):
+	def get_gl_entries(self, warehouse_account=None, default_expense_account=None, default_cost_center=None):
 		# Stock GL Entries
 		gl_entries = []
 
@@ -460,15 +464,9 @@
 		target_account = self.get_target_account()
 		target_against = set()
 
-		self.get_gl_entries_for_consumed_stock_items(
-			gl_entries, target_account, target_against, precision
-		)
-		self.get_gl_entries_for_consumed_asset_items(
-			gl_entries, target_account, target_against, precision
-		)
-		self.get_gl_entries_for_consumed_service_items(
-			gl_entries, target_account, target_against, precision
-		)
+		self.get_gl_entries_for_consumed_stock_items(gl_entries, target_account, target_against, precision)
+		self.get_gl_entries_for_consumed_asset_items(gl_entries, target_account, target_against, precision)
+		self.get_gl_entries_for_consumed_service_items(gl_entries, target_account, target_against, precision)
 
 		self.get_gl_entries_for_target_item(gl_entries, target_against, precision)
 
@@ -480,9 +478,7 @@
 		else:
 			return self.warehouse_account[self.target_warehouse]["account"]
 
-	def get_gl_entries_for_consumed_stock_items(
-		self, gl_entries, target_account, target_against, precision
-	):
+	def get_gl_entries_for_consumed_stock_items(self, gl_entries, target_account, target_against, precision):
 		# Consumed Stock Items
 		for item_row in self.stock_items:
 			sle_list = self.sle_map.get(item_row.name)
@@ -511,9 +507,7 @@
 						)
 					)
 
-	def get_gl_entries_for_consumed_asset_items(
-		self, gl_entries, target_account, target_against, precision
-	):
+	def get_gl_entries_for_consumed_asset_items(self, gl_entries, target_account, target_against, precision):
 		# Consumed Assets
 		for item in self.asset_items:
 			asset = frappe.get_doc("Asset", item.asset)
@@ -522,7 +516,8 @@
 				notes = _(
 					"This schedule was created when Asset {0} was consumed through Asset Capitalization {1}."
 				).format(
-					get_link_to_form(asset.doctype, asset.name), get_link_to_form(self.doctype, self.get("name"))
+					get_link_to_form(asset.doctype, asset.name),
+					get_link_to_form(self.doctype, self.get("name")),
 				)
 				depreciate_asset(asset, self.posting_date, notes)
 				asset.reload()
@@ -642,9 +637,9 @@
 		)
 
 		frappe.msgprint(
-			_(
-				"Asset {0} has been created. Please set the depreciation details if any and submit it."
-			).format(get_link_to_form("Asset", asset_doc.name))
+			_("Asset {0} has been created. Please set the depreciation details if any and submit it.").format(
+				get_link_to_form("Asset", asset_doc.name)
+			)
 		)
 
 	def update_target_asset(self):
@@ -664,9 +659,9 @@
 		asset_doc.save()
 
 		frappe.msgprint(
-			_(
-				"Asset {0} has been updated. Please set the depreciation details if any and submit it."
-			).format(get_link_to_form("Asset", asset_doc.name))
+			_("Asset {0} has been updated. Please set the depreciation details if any and submit it.").format(
+				get_link_to_form("Asset", asset_doc.name)
+			)
 		)
 
 	def restore_consumed_asset_items(self):
@@ -805,9 +800,7 @@
 	item_defaults = get_item_defaults(item.name, args.company)
 	item_group_defaults = get_item_group_defaults(item.name, args.company)
 	brand_defaults = get_brand_defaults(item.name, args.company)
-	out.cost_center = get_default_cost_center(
-		args, item_defaults, item_group_defaults, brand_defaults
-	)
+	out.cost_center = get_default_cost_center(args, item_defaults, item_group_defaults, brand_defaults)
 
 	if args.item_code and out.warehouse:
 		incoming_rate_args = frappe._dict(
@@ -893,9 +886,7 @@
 		item_defaults = get_item_defaults(item.name, args.company)
 		item_group_defaults = get_item_group_defaults(item.name, args.company)
 		brand_defaults = get_brand_defaults(item.name, args.company)
-		out.cost_center = get_default_cost_center(
-			args, item_defaults, item_group_defaults, brand_defaults
-		)
+		out.cost_center = get_default_cost_center(args, item_defaults, item_group_defaults, brand_defaults)
 	return out
 
 
@@ -922,9 +913,7 @@
 	out.expense_account = get_default_expense_account(
 		args, item_defaults, item_group_defaults, brand_defaults
 	)
-	out.cost_center = get_default_cost_center(
-		args, item_defaults, item_group_defaults, brand_defaults
-	)
+	out.cost_center = get_default_cost_center(args, item_defaults, item_group_defaults, brand_defaults)
 
 	return out
 
diff --git a/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py b/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py
index ac7c90d..86a18c0 100644
--- a/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py
+++ b/erpnext/assets/doctype/asset_capitalization/test_asset_capitalization.py
@@ -17,8 +17,6 @@
 )
 from erpnext.stock.doctype.item.test_item import create_item
 from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
-	get_batch_from_bundle,
-	get_serial_nos_from_bundle,
 	make_serial_batch_bundle,
 )
 
@@ -323,7 +321,7 @@
 		)
 
 		first_asset_depr_schedule = get_asset_depr_schedule_doc(consumed_asset.name, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Active")
 
 		# Create and submit Asset Captitalization
 		asset_capitalization = create_asset_capitalization(
@@ -357,8 +355,8 @@
 		first_asset_depr_schedule.load_from_db()
 
 		second_asset_depr_schedule = get_asset_depr_schedule_doc(consumed_asset.name, "Active")
-		self.assertEquals(second_asset_depr_schedule.status, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Cancelled")
+		self.assertEqual(second_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Cancelled")
 
 		depr_schedule_of_consumed_asset = second_asset_depr_schedule.get("depreciation_schedule")
 
@@ -367,9 +365,7 @@
 			for d in depr_schedule_of_consumed_asset
 			if getdate(d.schedule_date) == getdate(capitalization_date)
 		]
-		self.assertTrue(
-			consumed_depreciation_schedule and consumed_depreciation_schedule[0].journal_entry
-		)
+		self.assertTrue(consumed_depreciation_schedule and consumed_depreciation_schedule[0].journal_entry)
 		self.assertEqual(
 			consumed_depreciation_schedule[0].depreciation_amount, depreciation_before_disposal_amount
 		)
@@ -392,15 +388,9 @@
 
 
 def create_asset_capitalization_data():
-	create_item(
-		"Capitalization Target Stock Item", is_stock_item=1, is_fixed_asset=0, is_purchase_item=0
-	)
-	create_item(
-		"Capitalization Source Stock Item", is_stock_item=1, is_fixed_asset=0, is_purchase_item=0
-	)
-	create_item(
-		"Capitalization Source Service Item", is_stock_item=0, is_fixed_asset=0, is_purchase_item=0
-	)
+	create_item("Capitalization Target Stock Item", is_stock_item=1, is_fixed_asset=0, is_purchase_item=0)
+	create_item("Capitalization Source Stock Item", is_stock_item=1, is_fixed_asset=0, is_purchase_item=0)
+	create_item("Capitalization Source Service Item", is_stock_item=0, is_fixed_asset=0, is_purchase_item=0)
 
 
 def create_asset_capitalization(**args):
diff --git a/erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json b/erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
index ebaaffb..456e83b 100644
--- a/erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
+++ b/erpnext/assets/doctype/asset_capitalization_asset_item/asset_capitalization_asset_item.json
@@ -116,13 +116,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-09-12 14:30:02.915132",
+ "modified": "2024-03-27 13:06:33.350191",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Capitalization Asset Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json b/erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
index 31c9d52..d502d46 100644
--- a/erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
+++ b/erpnext/assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
@@ -110,13 +110,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-05 11:23:40.766844",
+ "modified": "2024-03-27 13:06:33.503815",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Capitalization Service Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json b/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
index c838f8b..7d9ace4 100644
--- a/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
+++ b/erpnext/assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
@@ -178,13 +178,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-05 11:22:57.346889",
+ "modified": "2024-03-27 13:06:33.664691",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Capitalization Stock Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/assets/doctype/asset_category/asset_category.json b/erpnext/assets/doctype/asset_category/asset_category.json
index a25f546..888da48 100644
--- a/erpnext/assets/doctype/asset_category/asset_category.json
+++ b/erpnext/assets/doctype/asset_category/asset_category.json
@@ -66,7 +66,7 @@
   }
  ],
  "links": [],
- "modified": "2021-02-24 15:05:38.621803",
+ "modified": "2024-03-27 13:06:33.840414",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Category",
@@ -112,7 +112,8 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_category/asset_category.py b/erpnext/assets/doctype/asset_category/asset_category.py
index d401b81..8c2d301 100644
--- a/erpnext/assets/doctype/asset_category/asset_category.py
+++ b/erpnext/assets/doctype/asset_category/asset_category.py
@@ -57,7 +57,9 @@
 					account_currency = frappe.get_value("Account", d.get(type_of_account), "account_currency")
 					if account_currency != company_currency:
 						invalid_accounts.append(
-							frappe._dict({"type": type_of_account, "idx": d.idx, "account": d.get(type_of_account)})
+							frappe._dict(
+								{"type": type_of_account, "idx": d.idx, "account": d.get(type_of_account)}
+							)
 						)
 
 		for d in invalid_accounts:
diff --git a/erpnext/assets/doctype/asset_category/test_asset_category.py b/erpnext/assets/doctype/asset_category/test_asset_category.py
index 2c92656..516e27e00 100644
--- a/erpnext/assets/doctype/asset_category/test_asset_category.py
+++ b/erpnext/assets/doctype/asset_category/test_asset_category.py
@@ -31,9 +31,7 @@
 			pass
 
 	def test_cwip_accounting(self):
-		company_cwip_acc = frappe.db.get_value(
-			"Company", "_Test Company", "capital_work_in_progress_account"
-		)
+		frappe.db.get_value("Company", "_Test Company", "capital_work_in_progress_account")
 		frappe.db.set_value("Company", "_Test Company", "capital_work_in_progress_account", "")
 
 		asset_category = frappe.new_doc("Asset Category")
diff --git a/erpnext/assets/doctype/asset_category_account/asset_category_account.json b/erpnext/assets/doctype/asset_category_account/asset_category_account.json
index b7df557..912fc1e 100644
--- a/erpnext/assets/doctype/asset_category_account/asset_category_account.json
+++ b/erpnext/assets/doctype/asset_category_account/asset_category_account.json
@@ -1,196 +1,71 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2016-03-07 15:55:18.806409", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2016-03-07 15:55:18.806409",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "company_name",
+  "fixed_asset_account",
+  "accumulated_depreciation_account",
+  "depreciation_expense_account",
+  "capital_work_in_progress_account"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "company_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Company", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Company", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "company_name",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Company",
+   "options": "Company",
+   "remember_last_selected_value": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "fixed_asset_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Fixed Asset Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "fixed_asset_account",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Fixed Asset Account",
+   "options": "Account",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "accumulated_depreciation_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Accumulated Depreciation Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "accumulated_depreciation_account",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Accumulated Depreciation Account",
+   "options": "Account"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "depreciation_expense_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Depreciation Expense Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "depreciation_expense_account",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Depreciation Expense Account",
+   "options": "Account"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "capital_work_in_progress_account", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Capital Work In Progress Account", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Account", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "columns": 2,
+   "fieldname": "capital_work_in_progress_account",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Capital Work In Progress Account",
+   "options": "Account"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-05-10 17:06:48.839347", 
- "modified_by": "Administrator", 
- "module": "Assets", 
- "name": "Asset Category Account", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:34.012854",
+ "modified_by": "Administrator",
+ "module": "Assets",
+ "name": "Asset Category Account",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
index 7383816..ffb06c7 100644
--- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
+++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
@@ -207,7 +207,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-01-08 16:31:04.533928",
+ "modified": "2024-03-27 13:06:34.135004",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Depreciation Schedule",
@@ -244,7 +244,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
index 6e16508..d22377d 100644
--- a/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
+++ b/erpnext/assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py
@@ -275,9 +275,7 @@
 			row.depreciation_method in ("Written Down Value", "Double Declining Balance")
 			and cint(row.frequency_of_depreciation) != 12
 		):
-			has_wdv_or_dd_non_yearly_pro_rata = _check_is_pro_rata(
-				asset_doc, row, wdv_or_dd_non_yearly=True
-			)
+			has_wdv_or_dd_non_yearly_pro_rata = _check_is_pro_rata(asset_doc, row, wdv_or_dd_non_yearly=True)
 
 		skip_row = False
 		should_get_last_day = is_last_day_of_the_month(row.depreciation_start_date)
@@ -567,9 +565,7 @@
 		)
 
 
-def _get_pro_rata_amt(
-	row, depreciation_amount, from_date, to_date, has_wdv_or_dd_non_yearly_pro_rata=False
-):
+def _get_pro_rata_amt(row, depreciation_amount, from_date, to_date, has_wdv_or_dd_non_yearly_pro_rata=False):
 	days = date_diff(to_date, from_date)
 	months = month_diff(to_date, from_date)
 	if has_wdv_or_dd_non_yearly_pro_rata:
@@ -668,7 +664,9 @@
 			)
 			from_date = add_days(
 				get_last_day(
-					add_months(row.depreciation_start_date, (schedule_idx - 1) * row.frequency_of_depreciation)
+					add_months(
+						row.depreciation_start_date, (schedule_idx - 1) * row.frequency_of_depreciation
+					)
 				),
 				1,
 			)
@@ -694,7 +692,8 @@
 					)
 				),
 				add_days(
-					get_last_day(add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)), 1
+					get_last_day(add_months(row.depreciation_start_date, -1 * row.frequency_of_depreciation)),
+					1,
 				),
 			)
 
@@ -703,7 +702,9 @@
 			)
 			from_date = add_days(
 				get_last_day(
-					add_months(row.depreciation_start_date, (schedule_idx - 1) * row.frequency_of_depreciation)
+					add_months(
+						row.depreciation_start_date, (schedule_idx - 1) * row.frequency_of_depreciation
+					)
 				),
 				1,
 			)
@@ -930,9 +931,7 @@
 	update_asset_finance_book_row=False,
 	new_depr_schedule=None,
 ):
-	current_asset_depr_schedule_doc = get_asset_depr_schedule_doc(
-		asset_doc.name, "Active", row.finance_book
-	)
+	current_asset_depr_schedule_doc = get_asset_depr_schedule_doc(asset_doc.name, "Active", row.finance_book)
 
 	if not current_asset_depr_schedule_doc:
 		frappe.throw(
diff --git a/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py b/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py
index 024121d..c55063f 100644
--- a/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py
+++ b/erpnext/assets/doctype/asset_depreciation_schedule/test_asset_depreciation_schedule.py
@@ -18,7 +18,7 @@
 		asset = create_asset(item_code="Macbook Pro", calculate_depreciation=1, submit=1)
 
 		first_asset_depr_schedule = get_asset_depr_schedule_doc(asset.name, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Active")
 
 		second_asset_depr_schedule = frappe.get_doc(
 			{"doctype": "Asset Depreciation Schedule", "asset": asset.name, "finance_book": None}
diff --git a/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json
index ba5b5f8..a18e3a6 100644
--- a/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json
+++ b/erpnext/assets/doctype/asset_finance_book/asset_finance_book.json
@@ -109,14 +109,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-12-29 08:49:39.876439",
+ "modified": "2024-03-27 13:06:34.342264",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Finance Book",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
index c0c2566..73dcae5 100644
--- a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.json
@@ -103,7 +103,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-28 20:28:32.993823",
+ "modified": "2024-03-27 13:06:34.491299",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Maintenance",
@@ -134,7 +134,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
index 780f61f..99829df 100644
--- a/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
+++ b/erpnext/assets/doctype/asset_maintenance/asset_maintenance.py
@@ -92,9 +92,7 @@
 	if not start_date and not last_completion_date:
 		start_date = frappe.utils.now()
 
-	if last_completion_date and (
-		(start_date and last_completion_date > start_date) or not start_date
-	):
+	if last_completion_date and ((start_date and last_completion_date > start_date) or not start_date):
 		start_date = last_completion_date
 	if periodicity == "Daily":
 		next_due_date = add_days(start_date, 1)
diff --git a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
index 7d33176..1753adb 100644
--- a/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
+++ b/erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
@@ -173,7 +173,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2021-01-22 12:33:45.888124",
+ "modified": "2024-03-27 13:06:34.654633",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Maintenance Log",
@@ -195,8 +195,9 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1,
  "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json b/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
index 80d90c6..5405ddf 100644
--- a/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
+++ b/erpnext/assets/doctype/asset_maintenance_task/asset_maintenance_task.json
@@ -144,13 +144,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-03-23 07:03:07.113452",
+ "modified": "2024-03-27 13:06:34.835687",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Maintenance Task",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
-}
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.json b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.json
index ffa04e5..cf57e3a 100644
--- a/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.json
+++ b/erpnext/assets/doctype/asset_maintenance_team/asset_maintenance_team.json
@@ -61,7 +61,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-01-22 15:09:03.347345",
+ "modified": "2024-03-27 13:06:34.976117",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Maintenance Team",
@@ -81,7 +81,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.json b/erpnext/assets/doctype/asset_movement/asset_movement.json
index 5382f9e..bc220b2 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.json
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.json
@@ -96,7 +96,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-28 16:54:26.571083",
+ "modified": "2024-03-27 13:06:35.116228",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Movement",
@@ -149,7 +149,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_movement/asset_movement.py b/erpnext/assets/doctype/asset_movement/asset_movement.py
index ff52643..29c8b3c 100644
--- a/erpnext/assets/doctype/asset_movement/asset_movement.py
+++ b/erpnext/assets/doctype/asset_movement/asset_movement.py
@@ -54,7 +54,9 @@
 				if d.source_location:
 					if current_location != d.source_location:
 						frappe.throw(
-							_("Asset {0} does not belongs to the location {1}").format(d.asset, d.source_location)
+							_("Asset {0} does not belongs to the location {1}").format(
+								d.asset, d.source_location
+							)
 						)
 				else:
 					d.source_location = current_location
@@ -79,19 +81,25 @@
 						title=_("Incorrect Movement Purpose"),
 					)
 				if not d.target_location:
-					frappe.throw(_("Target Location is required while transferring Asset {0}").format(d.asset))
+					frappe.throw(
+						_("Target Location is required while transferring Asset {0}").format(d.asset)
+					)
 				if d.source_location == d.target_location:
 					frappe.throw(_("Source and Target Location cannot be same"))
 
 			if self.purpose == "Receipt":
 				if not (d.source_location) and not d.target_location and not d.to_employee:
 					frappe.throw(
-						_("Target Location or To Employee is required while receiving Asset {0}").format(d.asset)
+						_("Target Location or To Employee is required while receiving Asset {0}").format(
+							d.asset
+						)
 					)
 				elif d.source_location:
 					if d.from_employee and not d.target_location:
 						frappe.throw(
-							_("Target Location is required while receiving Asset {0} from an employee").format(d.asset)
+							_(
+								"Target Location is required while receiving Asset {0} from an employee"
+							).format(d.asset)
 						)
 					elif d.to_employee and d.target_location:
 						frappe.throw(
@@ -131,19 +139,17 @@
 			# latest entry corresponds to current document's location, employee when transaction date > previous dates
 			# In case of cancellation it corresponds to previous latest document's location, employee
 			latest_movement_entry = frappe.db.sql(
-				"""
+				f"""
 				SELECT asm_item.target_location, asm_item.to_employee
 				FROM `tabAsset Movement Item` asm_item, `tabAsset Movement` asm
 				WHERE
 					asm_item.parent=asm.name and
 					asm_item.asset=%(asset)s and
 					asm.company=%(company)s and
-					asm.docstatus=1 and {0}
+					asm.docstatus=1 and {cond}
 				ORDER BY
 					asm.transaction_date desc limit 1
-				""".format(
-					cond
-				),
+				""",
 				args,
 			)
 			if latest_movement_entry:
@@ -164,7 +170,9 @@
 			elif current_location:
 				add_asset_activity(
 					d.asset,
-					_("Asset transferred to Location {0}").format(get_link_to_form("Location", current_location)),
+					_("Asset transferred to Location {0}").format(
+						get_link_to_form("Location", current_location)
+					),
 				)
 			elif current_employee:
 				add_asset_activity(
diff --git a/erpnext/assets/doctype/asset_movement/test_asset_movement.py b/erpnext/assets/doctype/asset_movement/test_asset_movement.py
index 27e7e55..52590d2 100644
--- a/erpnext/assets/doctype/asset_movement/test_asset_movement.py
+++ b/erpnext/assets/doctype/asset_movement/test_asset_movement.py
@@ -20,9 +20,7 @@
 		make_location()
 
 	def test_movement(self):
-		pr = make_purchase_receipt(
-			item_code="Macbook Pro", qty=1, rate=100000.0, location="Test Location"
-		)
+		pr = make_purchase_receipt(item_code="Macbook Pro", qty=1, rate=100000.0, location="Test Location")
 
 		asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, "name")
 		asset = frappe.get_doc("Asset", asset_name)
@@ -51,7 +49,11 @@
 			purpose="Transfer",
 			company=asset.company,
 			assets=[
-				{"asset": asset.name, "source_location": "Test Location", "target_location": "Test Location 2"}
+				{
+					"asset": asset.name,
+					"source_location": "Test Location",
+					"target_location": "Test Location 2",
+				}
 			],
 			reference_doctype="Purchase Receipt",
 			reference_name=pr.name,
@@ -62,7 +64,11 @@
 			purpose="Transfer",
 			company=asset.company,
 			assets=[
-				{"asset": asset.name, "source_location": "Test Location 2", "target_location": "Test Location"}
+				{
+					"asset": asset.name,
+					"source_location": "Test Location 2",
+					"target_location": "Test Location",
+				}
 			],
 			reference_doctype="Purchase Receipt",
 			reference_name=pr.name,
@@ -97,9 +103,7 @@
 		self.assertEqual(frappe.db.get_value("Asset", asset.name, "location"), "Test Location")
 
 	def test_last_movement_cancellation(self):
-		pr = make_purchase_receipt(
-			item_code="Macbook Pro", qty=1, rate=100000.0, location="Test Location"
-		)
+		pr = make_purchase_receipt(item_code="Macbook Pro", qty=1, rate=100000.0, location="Test Location")
 
 		asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, "name")
 		asset = frappe.get_doc("Asset", asset_name)
@@ -129,7 +133,11 @@
 			purpose="Transfer",
 			company=asset.company,
 			assets=[
-				{"asset": asset.name, "source_location": "Test Location", "target_location": "Test Location 2"}
+				{
+					"asset": asset.name,
+					"source_location": "Test Location",
+					"target_location": "Test Location 2",
+				}
 			],
 			reference_doctype="Purchase Receipt",
 			reference_name=pr.name,
@@ -167,6 +175,4 @@
 def make_location():
 	for location in ["Pune", "Mumbai", "Nagpur"]:
 		if not frappe.db.exists("Location", location):
-			frappe.get_doc({"doctype": "Location", "location_name": location}).insert(
-				ignore_permissions=True
-			)
+			frappe.get_doc({"doctype": "Location", "location_name": location}).insert(ignore_permissions=True)
diff --git a/erpnext/assets/doctype/asset_movement_item/asset_movement_item.json b/erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
index 994c3c0..762b589 100644
--- a/erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
+++ b/erpnext/assets/doctype/asset_movement_item/asset_movement_item.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-10-07 18:49:00.737806",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -73,14 +74,16 @@
   }
  ],
  "istable": 1,
- "modified": "2019-10-09 15:59:08.265141",
+ "links": [],
+ "modified": "2024-03-27 13:06:35.272015",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Movement Item",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.json b/erpnext/assets/doctype/asset_repair/asset_repair.json
index accb5bf..d6cf095 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.json
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.json
@@ -264,7 +264,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-08-16 15:55:25.023471",
+ "modified": "2024-03-27 13:06:35.397626",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Repair",
@@ -302,7 +302,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "asset_name",
diff --git a/erpnext/assets/doctype/asset_repair/asset_repair.py b/erpnext/assets/doctype/asset_repair/asset_repair.py
index 10d36e6..27542bc 100644
--- a/erpnext/assets/doctype/asset_repair/asset_repair.py
+++ b/erpnext/assets/doctype/asset_repair/asset_repair.py
@@ -169,9 +169,7 @@
 
 	def check_for_stock_items_and_warehouse(self):
 		if not self.get("stock_items"):
-			frappe.throw(
-				_("Please enter Stock Items consumed during the Repair."), title=_("Missing Items")
-			)
+			frappe.throw(_("Please enter Stock Items consumed during the Repair."), title=_("Missing Items"))
 		if not self.warehouse:
 			frappe.throw(
 				_("Please enter Warehouse from which Stock Items consumed during the Repair were taken."),
@@ -263,9 +261,7 @@
 	def get_gl_entries(self):
 		gl_entries = []
 
-		fixed_asset_account = get_asset_account(
-			"fixed_asset_account", asset=self.asset, company=self.company
-		)
+		fixed_asset_account = get_asset_account("fixed_asset_account", asset=self.asset, company=self.company)
 		self.get_gl_entries_for_repair_cost(gl_entries, fixed_asset_account)
 		self.get_gl_entries_for_consumed_items(gl_entries, fixed_asset_account)
 
diff --git a/erpnext/assets/doctype/asset_repair/test_asset_repair.py b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
index b3e0954..3a5acbe 100644
--- a/erpnext/assets/doctype/asset_repair/test_asset_repair.py
+++ b/erpnext/assets/doctype/asset_repair/test_asset_repair.py
@@ -199,9 +199,7 @@
 			self.assertEqual(expected_values[d.account][1], d.credit)
 
 	def test_gl_entries_with_periodical_inventory(self):
-		frappe.db.set_value(
-			"Company", "_Test Company", "default_expense_account", "Cost of Goods Sold - _TC"
-		)
+		frappe.db.set_value("Company", "_Test Company", "default_expense_account", "Cost of Goods Sold - _TC")
 		asset_repair = create_asset_repair(
 			capitalize_repair_cost=1,
 			stock_consumption=1,
@@ -244,7 +242,7 @@
 		asset = create_asset(calculate_depreciation=1, submit=1)
 
 		first_asset_depr_schedule = get_asset_depr_schedule_doc(asset.name, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Active")
 
 		initial_num_of_depreciations = num_of_depreciations(asset)
 		create_asset_repair(asset=asset, capitalize_repair_cost=1, submit=1)
@@ -253,8 +251,8 @@
 		first_asset_depr_schedule.load_from_db()
 
 		second_asset_depr_schedule = get_asset_depr_schedule_doc(asset.name, "Active")
-		self.assertEquals(second_asset_depr_schedule.status, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Cancelled")
+		self.assertEqual(second_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Cancelled")
 
 		self.assertEqual((initial_num_of_depreciations + 1), num_of_depreciations(asset))
 		self.assertEqual(
@@ -291,9 +289,7 @@
 
 	if args.stock_consumption:
 		asset_repair.stock_consumption = 1
-		asset_repair.warehouse = args.warehouse or create_warehouse(
-			"Test Warehouse", company=asset.company
-		)
+		asset_repair.warehouse = args.warehouse or create_warehouse("Test Warehouse", company=asset.company)
 
 		bundle = None
 		if args.serial_no:
diff --git a/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json b/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
index 6910c2e..2a537ae 100644
--- a/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
+++ b/erpnext/assets/doctype/asset_repair_consumed_item/asset_repair_consumed_item.json
@@ -56,13 +56,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-04-06 02:24:20.375870",
+ "modified": "2024-03-27 13:06:35.608355",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Repair Consumed Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json b/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json
index 89fa298..7693037 100644
--- a/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json
+++ b/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.json
@@ -70,7 +70,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-11-29 04:05:04.683518",
+ "modified": "2024-03-27 13:06:35.732191",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Shift Allocation",
@@ -105,7 +105,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py b/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py
index 13915c7..323cb73 100644
--- a/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py
+++ b/erpnext/assets/doctype/asset_shift_allocation/asset_shift_allocation.py
@@ -45,9 +45,7 @@
 		self.fetch_and_set_depr_schedule()
 
 	def validate(self):
-		self.asset_depr_schedule_doc = get_asset_depr_schedule_doc(
-			self.asset, "Active", self.finance_book
-		)
+		self.asset_depr_schedule_doc = get_asset_depr_schedule_doc(self.asset, "Active", self.finance_book)
 
 		self.validate_invalid_shift_change()
 		self.update_depr_schedule()
@@ -90,9 +88,7 @@
 			return
 
 		for i, sch in enumerate(self.depreciation_schedule):
-			if (
-				sch.journal_entry and self.asset_depr_schedule_doc.depreciation_schedule[i].shift != sch.shift
-			):
+			if sch.journal_entry and self.asset_depr_schedule_doc.depreciation_schedule[i].shift != sch.shift:
 				frappe.throw(
 					_(
 						"Row {0}: Shift cannot be changed since the depreciation has already been processed"
@@ -130,9 +126,7 @@
 
 	def allocate_shift_diff_in_depr_schedule(self):
 		asset_shift_factors_map = get_asset_shift_factors_map()
-		reverse_asset_shift_factors_map = {
-			asset_shift_factors_map[k]: k for k in asset_shift_factors_map
-		}
+		reverse_asset_shift_factors_map = {asset_shift_factors_map[k]: k for k in asset_shift_factors_map}
 
 		original_shift_factors_sum = sum(
 			flt(asset_shift_factors_map.get(schedule.shift))
@@ -162,9 +156,9 @@
 						)
 						diff = 0
 					except Exception:
-						frappe.throw(_("Could not auto update shifts. Shift with shift factor {0} needed.")).format(
-							shift_factor - diff
-						)
+						frappe.throw(
+							_("Could not auto update shifts. Shift with shift factor {0} needed.")
+						).format(shift_factor - diff)
 		elif diff < 0:
 			shift_factors = list(asset_shift_factors_map.values())
 			desc_shift_factors = sorted(shift_factors, reverse=True)
@@ -222,9 +216,9 @@
 							)
 							diff = 0
 						except Exception:
-							frappe.throw(_("Could not auto update shifts. Shift with shift factor {0} needed.")).format(
-								shift_factor + diff
-							)
+							frappe.throw(
+								_("Could not auto update shifts. Shift with shift factor {0} needed.")
+							).format(shift_factor + diff)
 
 	def create_new_asset_depr_schedule(self):
 		new_asset_depr_schedule_doc = frappe.copy_doc(self.asset_depr_schedule_doc)
@@ -273,9 +267,7 @@
 		return
 
 	# Include the current number in the subset
-	find_subsets_with_sum(
-		numbers, k - 1, target_sum - numbers[0], current_subset + [numbers[0]], result
-	)
+	find_subsets_with_sum(numbers, k - 1, target_sum - numbers[0], [*current_subset, numbers[0]], result)
 
 	# Exclude the current number from the subset
 	find_subsets_with_sum(numbers[1:], k, target_sum, current_subset, result)
diff --git a/erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.json b/erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.json
index fd04ffc..00bc0fc 100644
--- a/erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.json
+++ b/erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.json
@@ -36,7 +36,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-11-29 04:04:24.272872",
+ "modified": "2024-03-27 13:06:35.869900",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Shift Factor",
@@ -68,7 +68,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.py b/erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.py
index 365a817..4af7067 100644
--- a/erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.py
+++ b/erpnext/assets/doctype/asset_shift_factor/asset_shift_factor.py
@@ -25,9 +25,7 @@
 
 	def validate_default(self):
 		if self.default:
-			existing_default_shift_factor = frappe.db.get_value(
-				"Asset Shift Factor", {"default": 1}, "name"
-			)
+			existing_default_shift_factor = frappe.db.get_value("Asset Shift Factor", {"default": 1}, "name")
 
 			if existing_default_shift_factor:
 				frappe.throw(
diff --git a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
index 57e04e2..442e488 100644
--- a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
+++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.json
@@ -125,7 +125,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2021-01-22 14:10:23.085181",
+ "modified": "2024-03-27 13:06:36.004049",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Asset Value Adjustment",
@@ -178,8 +178,9 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "asset",
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py
index 769571c..0d02347 100644
--- a/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py
+++ b/erpnext/assets/doctype/asset_value_adjustment/asset_value_adjustment.py
@@ -98,7 +98,7 @@
 		je.naming_series = depreciation_series
 		je.posting_date = self.date
 		je.company = self.company
-		je.remark = "Depreciation Entry against {0} worth {1}".format(self.asset, self.difference_amount)
+		je.remark = f"Depreciation Entry against {self.asset} worth {self.difference_amount}"
 		je.finance_book = self.finance_book
 
 		credit_entry = {
diff --git a/erpnext/assets/doctype/asset_value_adjustment/test_asset_value_adjustment.py b/erpnext/assets/doctype/asset_value_adjustment/test_asset_value_adjustment.py
index 2c97bae..634ed41 100644
--- a/erpnext/assets/doctype/asset_value_adjustment/test_asset_value_adjustment.py
+++ b/erpnext/assets/doctype/asset_value_adjustment/test_asset_value_adjustment.py
@@ -23,9 +23,7 @@
 		)
 
 	def test_current_asset_value(self):
-		pr = make_purchase_receipt(
-			item_code="Macbook Pro", qty=1, rate=100000.0, location="Test Location"
-		)
+		pr = make_purchase_receipt(item_code="Macbook Pro", qty=1, rate=100000.0, location="Test Location")
 
 		asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, "name")
 		asset_doc = frappe.get_doc("Asset", asset_name)
@@ -52,9 +50,7 @@
 		self.assertEqual(current_value, 100000.0)
 
 	def test_asset_depreciation_value_adjustment(self):
-		pr = make_purchase_receipt(
-			item_code="Macbook Pro", qty=1, rate=120000.0, location="Test Location"
-		)
+		pr = make_purchase_receipt(item_code="Macbook Pro", qty=1, rate=120000.0, location="Test Location")
 
 		asset_name = frappe.db.get_value("Asset", {"purchase_receipt": pr.name}, "name")
 		asset_doc = frappe.get_doc("Asset", asset_name)
@@ -75,7 +71,7 @@
 		asset_doc.submit()
 
 		first_asset_depr_schedule = get_asset_depr_schedule_doc(asset_doc.name, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Active")
 
 		post_depreciation_entries(getdate("2023-08-21"))
 
@@ -92,8 +88,8 @@
 		first_asset_depr_schedule.load_from_db()
 
 		second_asset_depr_schedule = get_asset_depr_schedule_doc(asset_doc.name, "Active")
-		self.assertEquals(second_asset_depr_schedule.status, "Active")
-		self.assertEquals(first_asset_depr_schedule.status, "Cancelled")
+		self.assertEqual(second_asset_depr_schedule.status, "Active")
+		self.assertEqual(first_asset_depr_schedule.status, "Cancelled")
 
 		expected_gle = (
 			("_Test Accumulated Depreciations - _TC", 0.0, 4625.29),
diff --git a/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json b/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json
index ef706e8..84ae8c7 100644
--- a/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json
+++ b/erpnext/assets/doctype/depreciation_schedule/depreciation_schedule.json
@@ -68,14 +68,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-11-27 18:28:35.325376",
+ "modified": "2024-03-27 13:06:51.227001",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Depreciation Schedule",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/linked_location/linked_location.json b/erpnext/assets/doctype/linked_location/linked_location.json
index f04a79e..fe53d72 100644
--- a/erpnext/assets/doctype/linked_location/linked_location.json
+++ b/erpnext/assets/doctype/linked_location/linked_location.json
@@ -1,74 +1,33 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-11-22 14:34:59.461273", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2017-11-22 14:34:59.461273",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "location"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "location", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Location", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Location", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "location",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Location",
+   "options": "Location",
+   "reqd": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-06-20 04:35:59.514281", 
- "modified_by": "Administrator", 
- "module": "Assets", 
- "name": "Linked Location", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:02.464102",
+ "modified_by": "Administrator",
+ "module": "Assets",
+ "name": "Linked Location",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/assets/doctype/location/location.json b/erpnext/assets/doctype/location/location.json
index 9202fb9..baf9b99 100644
--- a/erpnext/assets/doctype/location/location.json
+++ b/erpnext/assets/doctype/location/location.json
@@ -142,7 +142,7 @@
  ],
  "is_tree": 1,
  "links": [],
- "modified": "2023-08-29 12:49:33.290527",
+ "modified": "2024-03-27 13:10:02.572355",
  "modified_by": "Administrator",
  "module": "Assets",
  "name": "Location",
@@ -223,7 +223,7 @@
  ],
  "quick_entry": 1,
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/assets/doctype/location/location.py b/erpnext/assets/doctype/location/location.py
index 01228f4..03d0980 100644
--- a/erpnext/assets/doctype/location/location.py
+++ b/erpnext/assets/doctype/location/location.py
@@ -216,17 +216,15 @@
 		parent = ""
 
 	return frappe.db.sql(
-		"""
+		f"""
 		select
 			name as value,
 			is_group as expandable
 		from
 			`tabLocation` comp
 		where
-			ifnull(parent_location, "")={parent}
-		""".format(
-			parent=frappe.db.escape(parent)
-		),
+			ifnull(parent_location, "")={frappe.db.escape(parent)}
+		""",
 		as_dict=1,
 	)
 
diff --git a/erpnext/assets/doctype/location/test_location.py b/erpnext/assets/doctype/location/test_location.py
index b8563cb..3b5af61 100644
--- a/erpnext/assets/doctype/location/test_location.py
+++ b/erpnext/assets/doctype/location/test_location.py
@@ -31,9 +31,7 @@
 		ordered_test_location_features = sorted(
 			test_location_features, key=lambda x: x["properties"]["feature_of"]
 		)
-		ordered_formatted_locations = sorted(
-			formatted_locations, key=lambda x: x["properties"]["feature_of"]
-		)
+		ordered_formatted_locations = sorted(formatted_locations, key=lambda x: x["properties"]["feature_of"])
 
 		self.assertEqual(ordered_formatted_locations, ordered_test_location_features)
 		self.assertEqual(area, test_location.get("area"))
diff --git a/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.json b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.json
index 5155b0b..7d3ccf8 100644
--- a/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.json
+++ b/erpnext/assets/doctype/maintenance_team_member/maintenance_team_member.json
@@ -1,140 +1,57 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:team_member", 
- "beta": 0, 
- "creation": "2016-10-26 10:56:04.534717", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Document", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "autoname": "field:team_member",
+ "creation": "2016-10-26 10:56:04.534717",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "team_member",
+  "full_name",
+  "maintenance_role"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "team_member", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Team Member", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "User", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }, 
+   "fieldname": "team_member",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Team Member",
+   "options": "User",
+   "reqd": 1,
+   "unique": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
    "fetch_from": "team_member.full_name",
-   "fieldname": "full_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Full Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }, 
+   "fieldname": "full_name",
+   "fieldtype": "Data",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Full Name",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "maintenance_role", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Maintenance Role", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Role", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
+   "fieldname": "maintenance_role",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Maintenance Role",
+   "options": "Role",
+   "reqd": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-05-16 22:43:15.255185",
- "modified_by": "Administrator", 
- "module": "Assets", 
- "name": "Maintenance Team Member", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:04.127108",
+ "modified_by": "Administrator",
+ "module": "Assets",
+ "name": "Maintenance Team Member",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
index e689b05..f299d69 100644
--- a/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
+++ b/erpnext/assets/report/fixed_asset_register/fixed_asset_register.py
@@ -122,11 +122,7 @@
 	assets_record = frappe.db.get_all("Asset", filters=conditions, fields=fields)
 
 	for asset in assets_record:
-		if (
-			assets_linked_to_fb
-			and asset.calculate_depreciation
-			and asset.asset_id not in assets_linked_to_fb
-		):
+		if assets_linked_to_fb and asset.calculate_depreciation and asset.asset_id not in assets_linked_to_fb:
 			continue
 
 		asset_value = get_asset_value_after_depreciation(
@@ -240,9 +236,7 @@
 
 
 def get_asset_depreciation_amount_map(filters, finance_book):
-	start_date = (
-		filters.from_date if filters.filter_based_on == "Date Range" else filters.year_start_date
-	)
+	start_date = filters.from_date if filters.filter_based_on == "Date Range" else filters.year_start_date
 	end_date = filters.to_date if filters.filter_based_on == "Date Range" else filters.year_end_date
 
 	asset = frappe.qb.DocType("Asset")
@@ -259,9 +253,7 @@
 		.join(company)
 		.on(company.name == asset.company)
 		.select(asset.name.as_("asset"), Sum(gle.debit).as_("depreciation_amount"))
-		.where(
-			gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account)
-		)
+		.where(gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account))
 		.where(gle.debit != 0)
 		.where(gle.is_cancelled == 0)
 		.where(company.name == filters.company)
@@ -280,9 +272,7 @@
 		else:
 			query = query.where(asset.status.isin(["Sold", "Scrapped", "Capitalized", "Decapitalized"]))
 	if finance_book:
-		query = query.where(
-			(gle.finance_book.isin([cstr(finance_book), ""])) | (gle.finance_book.isnull())
-		)
+		query = query.where((gle.finance_book.isin([cstr(finance_book), ""])) | (gle.finance_book.isnull()))
 	else:
 		query = query.where((gle.finance_book.isin([""])) | (gle.finance_book.isnull()))
 	if filters.filter_based_on in ("Date Range", "Fiscal Year"):
diff --git a/erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.json b/erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.json
index 75cb358..8968119 100644
--- a/erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.json
+++ b/erpnext/bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.json
@@ -58,7 +58,7 @@
  "in_create": 1,
  "is_virtual": 1,
  "links": [],
- "modified": "2023-11-11 04:52:49.347376",
+ "modified": "2024-03-27 13:06:43.111628",
  "modified_by": "Administrator",
  "module": "Bulk Transaction",
  "name": "Bulk Transaction Log",
@@ -77,7 +77,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "date"
diff --git a/erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json b/erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
index 9590325..cee3153 100644
--- a/erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
+++ b/erpnext/bulk_transaction/doctype/bulk_transaction_log_detail/bulk_transaction_log_detail.json
@@ -81,7 +81,7 @@
  "in_create": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-11-10 11:44:10.758342",
+ "modified": "2024-03-27 13:06:43.240040",
  "modified_by": "Administrator",
  "module": "Bulk Transaction",
  "name": "Bulk Transaction Log Detail",
@@ -100,7 +100,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json
index d98a00f..fb7104d 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.json
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -214,7 +214,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-01-31 13:34:18.101256",
+ "modified": "2024-03-27 13:06:43.375495",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Buying Settings",
@@ -260,7 +260,7 @@
    "role": "Purchase User"
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index c3a155a..4aee9ef 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -350,7 +350,9 @@
 					if (flt(doc.per_received, 2) < 100 && allow_receipt) {
 						this.frm.add_custom_button(
 							__("Purchase Receipt"),
-							this.make_purchase_receipt,
+							() => {
+								me.make_purchase_receipt();
+							},
 							__("Create")
 						);
 						if (doc.is_subcontracted) {
@@ -367,7 +369,9 @@
 							} else {
 								this.frm.add_custom_button(
 									__("Subcontracting Order"),
-									this.make_subcontracting_order,
+									() => {
+										me.make_subcontracting_order();
+									},
 									__("Create")
 								);
 							}
@@ -376,7 +380,9 @@
 					if (flt(doc.per_billed, 2) < 100)
 						this.frm.add_custom_button(
 							__("Purchase Invoice"),
-							this.make_purchase_invoice,
+							() => {
+								me.make_purchase_invoice();
+							},
 							__("Create")
 						);
 
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 0916ff5..cac6854 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -355,7 +355,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Supplier Address Details",
    "read_only": 1
   },
@@ -394,7 +394,7 @@
   },
   {
    "fieldname": "shipping_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Shipping Address Details",
    "print_hide": 1,
    "read_only": 1
@@ -1098,7 +1098,7 @@
   },
   {
    "fieldname": "billing_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Billing Address Details",
    "read_only": 1
   },
@@ -1288,7 +1288,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-20 16:03:31.611808",
+ "modified": "2024-03-27 13:10:24.518785",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order",
@@ -1337,7 +1337,7 @@
  ],
  "search_fields": "status, transaction_date, supplier, grand_total",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "supplier",
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 4f24ec2..13f1f3b 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -55,7 +55,7 @@
 		)
 
 		additional_discount_percentage: DF.Float
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		advance_paid: DF.Currency
 		advance_payment_status: DF.Literal["Not Initiated", "Initiated", "Partially Paid", "Fully Paid"]
 		amended_from: DF.Link | None
@@ -74,7 +74,7 @@
 		base_total: DF.Currency
 		base_total_taxes_and_charges: DF.Currency
 		billing_address: DF.Link | None
-		billing_address_display: DF.SmallText | None
+		billing_address_display: DF.TextEditor | None
 		buying_price_list: DF.Link | None
 		company: DF.Link
 		contact_display: DF.SmallText | None
@@ -131,7 +131,7 @@
 		set_reserve_warehouse: DF.Link | None
 		set_warehouse: DF.Link | None
 		shipping_address: DF.Link | None
-		shipping_address_display: DF.SmallText | None
+		shipping_address_display: DF.TextEditor | None
 		shipping_rule: DF.Link | None
 		status: DF.Literal[
 			"",
@@ -169,7 +169,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(PurchaseOrder, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.status_updater = [
 			{
 				"source_dt": "Purchase Order Item",
@@ -190,7 +190,7 @@
 		self.set_onload("can_update_items", self.can_update_items())
 
 	def validate(self):
-		super(PurchaseOrder, self).validate()
+		super().validate()
 
 		self.set_status()
 
@@ -230,7 +230,7 @@
 		if self.is_subcontracted:
 			mri_compare_fields = [["project", "="]]
 
-		super(PurchaseOrder, self).validate_with_previous_doc(
+		super().validate_with_previous_doc(
 			{
 				"Supplier Quotation": {
 					"ref_dn_field": "supplier_quotation",
@@ -325,9 +325,7 @@
 		itemwise_min_order_qty = frappe._dict(
 			frappe.db.sql(
 				"""select name, min_order_qty
-			from tabItem where name in ({0})""".format(
-					", ".join(["%s"] * len(items))
-				),
+			from tabItem where name in ({})""".format(", ".join(["%s"] * len(items))),
 				items,
 			)
 		)
@@ -373,7 +371,9 @@
 							)
 						elif not frappe.get_value("Item", item.fg_item, "default_bom"):
 							frappe.throw(
-								_("Row #{0}: Default BOM not found for FG Item {1}").format(item.idx, item.fg_item)
+								_("Row #{0}: Default BOM not found for FG Item {1}").format(
+									item.idx, item.fg_item
+								)
 							)
 					if not item.fg_item_qty:
 						frappe.throw(_("Row #{0}: Finished Good Item Qty can not be zero").format(item.idx))
@@ -407,8 +407,9 @@
 					d.rate = d.base_rate / conversion_rate
 					d.last_purchase_rate = d.rate
 				else:
-
-					item_last_purchase_rate = frappe.get_cached_value("Item", d.item_code, "last_purchase_rate")
+					item_last_purchase_rate = frappe.get_cached_value(
+						"Item", d.item_code, "last_purchase_rate"
+					)
 					if item_last_purchase_rate:
 						d.base_price_list_rate = (
 							d.base_rate
@@ -443,7 +444,7 @@
 
 	def check_modified_date(self):
 		mod_db = frappe.db.sql("select modified from `tabPurchase Order` where name = %s", self.name)
-		date_diff = frappe.db.sql("select '%s' - '%s' " % (mod_db[0][0], cstr(self.modified)))
+		date_diff = frappe.db.sql(f"select '{mod_db[0][0]}' - '{cstr(self.modified)}' ")
 
 		if date_diff and date_diff[0][0]:
 			msgprint(
@@ -463,7 +464,7 @@
 		clear_doctype_notifications(self)
 
 	def on_submit(self):
-		super(PurchaseOrder, self).on_submit()
+		super().on_submit()
 
 		if self.is_against_so():
 			self.update_status_updater()
@@ -488,7 +489,7 @@
 
 	def on_cancel(self):
 		self.ignore_linked_doctypes = ("GL Entry", "Payment Ledger Entry")
-		super(PurchaseOrder, self).on_cancel()
+		super().on_cancel()
 
 		if self.is_against_so():
 			self.update_status_updater()
@@ -674,7 +675,9 @@
 		po = frappe.get_doc("Purchase Order", name)
 		if po.docstatus == 1:
 			if status == "Closed":
-				if po.status not in ("Cancelled", "Closed") and (po.per_received < 100 or po.per_billed < 100):
+				if po.status not in ("Cancelled", "Closed") and (
+					po.per_received < 100 or po.per_billed < 100
+				):
 					po.update_status(status)
 			else:
 				if po.status == "Closed":
@@ -845,9 +848,7 @@
 
 
 @frappe.whitelist()
-def make_subcontracting_order(
-	source_name, target_doc=None, save=False, submit=False, notify=False
-):
+def make_subcontracting_order(source_name, target_doc=None, save=False, submit=False, notify=False):
 	target_doc = get_mapped_subcontracting_order(source_name, target_doc)
 
 	if (save or submit) and frappe.has_permission(target_doc.doctype, "create"):
@@ -872,7 +873,6 @@
 
 
 def get_mapped_subcontracting_order(source_name, target_doc=None):
-
 	if target_doc and isinstance(target_doc, str):
 		target_doc = json.loads(target_doc)
 		for key in ["service_items", "items", "supplied_items"]:
diff --git a/erpnext/buying/doctype/purchase_order/test_purchase_order.py b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
index c667ee8..c390edd 100644
--- a/erpnext/buying/doctype/purchase_order/test_purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/test_purchase_order.py
@@ -11,11 +11,13 @@
 
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.party import get_due_date_from_template
-from erpnext.buying.doctype.purchase_order.purchase_order import make_inter_company_sales_order
+from erpnext.buying.doctype.purchase_order.purchase_order import (
+	make_inter_company_sales_order,
+	make_purchase_receipt,
+)
 from erpnext.buying.doctype.purchase_order.purchase_order import (
 	make_purchase_invoice as make_pi_from_po,
 )
-from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_receipt
 from erpnext.controllers.accounts_controller import InvalidQtyError, update_child_qty_rate
 from erpnext.manufacturing.doctype.blanket_order.test_blanket_order import make_blanket_order
 from erpnext.stock.doctype.item.test_item import make_item
@@ -198,7 +200,7 @@
 		po.items[0].qty = 4
 		po.save()
 		po.submit()
-		pr = make_pr_against_po(po.name, 2)
+		make_pr_against_po(po.name, 2)
 
 		po.load_from_db()
 		existing_ordered_qty = get_ordered_qty()
@@ -228,7 +230,7 @@
 		po.items[0].qty = 4
 		po.save()
 		po.submit()
-		pr = make_pr_against_po(po.name, 2)
+		make_pr_against_po(po.name, 2)
 
 		po.reload()
 		first_item_of_po = po.get("items")[0]
@@ -469,9 +471,7 @@
 			make_purchase_receipt as make_purchase_receipt_return,
 		)
 
-		pr1 = make_purchase_receipt_return(
-			is_return=1, return_against=pr.name, qty=-3, do_not_submit=True
-		)
+		pr1 = make_purchase_receipt_return(is_return=1, return_against=pr.name, qty=-3, do_not_submit=True)
 		pr1.items[0].purchase_order = po.name
 		pr1.items[0].purchase_order_item = po.items[0].name
 		pr1.submit()
@@ -552,9 +552,7 @@
 		self.assertEqual(po.payment_schedule[0].payment_amount, 2500.0)
 		self.assertEqual(getdate(po.payment_schedule[0].due_date), getdate(po.transaction_date))
 		self.assertEqual(po.payment_schedule[1].payment_amount, 2500.0)
-		self.assertEqual(
-			getdate(po.payment_schedule[1].due_date), add_days(getdate(po.transaction_date), 30)
-		)
+		self.assertEqual(getdate(po.payment_schedule[1].due_date), add_days(getdate(po.transaction_date), 30))
 		pi = make_pi_from_po(po.name)
 		pi.save()
 
@@ -564,9 +562,7 @@
 		self.assertEqual(pi.payment_schedule[0].payment_amount, 2500.0)
 		self.assertEqual(getdate(pi.payment_schedule[0].due_date), getdate(po.transaction_date))
 		self.assertEqual(pi.payment_schedule[1].payment_amount, 2500.0)
-		self.assertEqual(
-			getdate(pi.payment_schedule[1].due_date), add_days(getdate(po.transaction_date), 30)
-		)
+		self.assertEqual(getdate(pi.payment_schedule[1].due_date), add_days(getdate(po.transaction_date), 30))
 		automatically_fetch_payment_terms(enable=0)
 
 	def test_warehouse_company_validation(self):
@@ -704,15 +700,15 @@
 
 				supplier.on_hold = 0
 				supplier.save()
-			except:
+			except Exception:
 				pass
 			else:
 				raise Exception
 
 	def test_default_payment_terms(self):
-		due_date = get_due_date_from_template(
-			"_Test Payment Term Template 1", "2023-02-03", None
-		).strftime("%Y-%m-%d")
+		due_date = get_due_date_from_template("_Test Payment Term Template 1", "2023-02-03", None).strftime(
+			"%Y-%m-%d"
+		)
 		self.assertEqual(due_date, "2023-03-31")
 
 	def test_terms_are_not_copied_if_automatically_fetch_payment_terms_is_unchecked(self):
@@ -763,9 +759,7 @@
 		pe_doc.cancel()
 
 	def create_account(self, account_name, company, currency, parent):
-		if not frappe.db.get_value(
-			"Account", filters={"account_name": account_name, "company": company}
-		):
+		if not frappe.db.get_value("Account", filters={"account_name": account_name, "company": company}):
 			account = frappe.get_doc(
 				{
 					"doctype": "Account",
@@ -796,9 +790,7 @@
 		company = "_Test Company"
 
 		# Setup default 'Advance Paid' account
-		account = self.create_account(
-			"Advance Paid", company, "INR", "Application of Funds (Assets) - _TC"
-		)
+		account = self.create_account("Advance Paid", company, "INR", "Application of Funds (Assets) - _TC")
 		company_doc = frappe.get_doc("Company", company)
 		company_doc.book_advance_payments_in_separate_party_account = True
 		company_doc.default_advance_paid_account = account.name
@@ -893,7 +885,7 @@
 		Second Purchase Order should not add on to Blanket Orders Ordered Quantity.
 		"""
 
-		bo = make_blanket_order(blanket_order_type="Purchasing", quantity=10, rate=10)
+		make_blanket_order(blanket_order_type="Purchasing", quantity=10, rate=10)
 
 		po = create_purchase_order(item_code="_Test Item", qty=5, against_blanket_order=1)
 		po_doc = frappe.get_doc("Purchase Order", po.get("name"))
@@ -1133,17 +1125,13 @@
 		from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request
 
 		po = create_purchase_order()
-		self.assertEqual(
-			frappe.db.get_value(po.doctype, po.name, "advance_payment_status"), "Not Initiated"
-		)
+		self.assertEqual(frappe.db.get_value(po.doctype, po.name, "advance_payment_status"), "Not Initiated")
 
 		pr = make_payment_request(dt=po.doctype, dn=po.name, submit_doc=True, return_doc=True)
 		self.assertEqual(frappe.db.get_value(po.doctype, po.name, "advance_payment_status"), "Initiated")
 
 		pe = get_payment_entry(po.doctype, po.name).save().submit()
-		self.assertEqual(
-			frappe.db.get_value(po.doctype, po.name, "advance_payment_status"), "Fully Paid"
-		)
+		self.assertEqual(frappe.db.get_value(po.doctype, po.name, "advance_payment_status"), "Fully Paid")
 
 		pe.reload()
 		pe.cancel()
@@ -1151,9 +1139,7 @@
 
 		pr.reload()
 		pr.cancel()
-		self.assertEqual(
-			frappe.db.get_value(po.doctype, po.name, "advance_payment_status"), "Not Initiated"
-		)
+		self.assertEqual(frappe.db.get_value(po.doctype, po.name, "advance_payment_status"), "Not Initiated")
 
 	def test_po_billed_amount_against_return_entry(self):
 		from erpnext.accounts.doctype.purchase_invoice.purchase_invoice import make_debit_note
@@ -1316,15 +1302,11 @@
 
 
 def get_ordered_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"):
-	return flt(
-		frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, "ordered_qty")
-	)
+	return flt(frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, "ordered_qty"))
 
 
 def get_requested_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"):
-	return flt(
-		frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, "indented_qty")
-	)
+	return flt(frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, "indented_qty"))
 
 
 test_dependencies = ["BOM", "Item Price"]
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index e3e8def..bce7ed1 100644
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -915,7 +915,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-05 11:23:24.859435",
+ "modified": "2024-03-27 13:10:24.979325",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order Item",
@@ -924,7 +924,7 @@
  "permissions": [],
  "quick_entry": 1,
  "search_fields": "item_name",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json b/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
index 60247bd..69969eb 100644
--- a/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
+++ b/erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
@@ -183,12 +183,13 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-06-09 15:17:58.128242",
+ "modified": "2024-03-27 13:10:25.280016",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Order Item Supplied",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json b/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
index f9cd720..48680ac 100644
--- a/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
+++ b/erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
@@ -207,13 +207,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-06-19 19:33:04.431213",
+ "modified": "2024-03-27 13:10:26.235916",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Purchase Receipt Item Supplied",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
index fd73f77..424bccd 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -303,7 +303,7 @@
   },
   {
    "fieldname": "billing_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Billing Address Details",
    "read_only": 1
   }
@@ -312,7 +312,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-11-06 12:45:28.898706",
+ "modified": "2024-03-27 13:10:33.030915",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Request for Quotation",
@@ -379,7 +379,7 @@
  ],
  "search_fields": "status, transaction_date",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
index f261773..059e36f 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.py
@@ -3,7 +3,6 @@
 
 
 import json
-from typing import Optional
 
 import frappe
 from frappe import _
@@ -40,7 +39,7 @@
 
 		amended_from: DF.Link | None
 		billing_address: DF.Link | None
-		billing_address_display: DF.SmallText | None
+		billing_address_display: DF.TextEditor | None
 		company: DF.Link
 		email_template: DF.Link | None
 		incoterm: DF.Link | None
@@ -65,9 +64,9 @@
 	def validate(self):
 		self.validate_duplicate_supplier()
 		self.validate_supplier_list()
-		super(RequestforQuotation, self).validate_qty_is_not_zero()
+		super().validate_qty_is_not_zero()
 		validate_for_items(self)
-		super(RequestforQuotation, self).set_qty_as_per_stock_uom()
+		super().set_qty_as_per_stock_uom()
 		self.update_email_id()
 
 		if self.docstatus < 1:
@@ -317,7 +316,7 @@
 
 	def update_rfq_supplier_status(self, sup_name=None):
 		for supplier in self.suppliers:
-			if sup_name == None or supplier.supplier == sup_name:
+			if sup_name is None or supplier.supplier == sup_name:
 				quote_status = _("Received")
 				for item in self.items:
 					sqi_count = frappe.db.sql(
@@ -348,9 +347,7 @@
 
 
 def check_portal_enabled(reference_doctype):
-	if not frappe.db.get_value(
-		"Portal Menu Item", {"reference_doctype": reference_doctype}, "enabled"
-	):
+	if not frappe.db.get_value("Portal Menu Item", {"reference_doctype": reference_doctype}, "enabled"):
 		frappe.throw(
 			_(
 				"The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings."
@@ -479,9 +476,9 @@
 def get_pdf(
 	name: str,
 	supplier: str,
-	print_format: Optional[str] = None,
-	language: Optional[str] = None,
-	letterhead: Optional[str] = None,
+	print_format: str | None = None,
+	language: str | None = None,
+	letterhead: str | None = None,
 ):
 	doc = frappe.get_doc("Request for Quotation", name)
 	if supplier:
@@ -556,9 +553,7 @@
 @frappe.whitelist()
 def get_supplier_tag():
 	filters = {"document_type": "Supplier"}
-	tags = list(
-		set(tag.tag for tag in frappe.get_all("Tag Link", filters=filters, fields=["tag"]) if tag)
-	)
+	tags = list(set(tag.tag for tag in frappe.get_all("Tag Link", filters=filters, fields=["tag"]) if tag))
 
 	return tags
 
@@ -571,7 +566,7 @@
 		conditions += "and rfq.name like '%%" + txt + "%%' "
 
 	if filters.get("transaction_date"):
-		conditions += "and rfq.transaction_date = '{0}'".format(filters.get("transaction_date"))
+		conditions += "and rfq.transaction_date = '{}'".format(filters.get("transaction_date"))
 
 	rfq_data = frappe.db.sql(
 		f"""
diff --git a/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py b/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py
index fe1466c..4effe13 100644
--- a/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py
+++ b/erpnext/buying/doctype/request_for_quotation/test_request_for_quotation.py
@@ -75,9 +75,7 @@
 
 		rfq = make_request_for_quotation(supplier_data=supplier_wt_appos)
 
-		sq = make_supplier_quotation_from_rfq(
-			rfq.name, for_supplier=supplier_wt_appos[0].get("supplier")
-		)
+		sq = make_supplier_quotation_from_rfq(rfq.name, for_supplier=supplier_wt_appos[0].get("supplier"))
 		sq.submit()
 
 		frappe.form_dict.name = rfq.name
@@ -108,9 +106,7 @@
 			row = item.append("uoms", {"uom": "Kg", "conversion_factor": 2})
 			row.db_update()
 
-		rfq = make_request_for_quotation(
-			item_code="_Test Multi UOM RFQ Item", uom="Kg", conversion_factor=2
-		)
+		rfq = make_request_for_quotation(item_code="_Test Multi UOM RFQ Item", uom="Kg", conversion_factor=2)
 		rfq.get("items")[0].rate = 100
 		rfq.supplier = rfq.suppliers[0].supplier
 
diff --git a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
index 6cdd2ba..bb50e3d 100644
--- a/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
+++ b/erpnext/buying/doctype/request_for_quotation_item/request_for_quotation_item.json
@@ -261,14 +261,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-11-14 18:34:48.327224",
+ "modified": "2024-03-27 13:10:33.272106",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Request for Quotation Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
index 534cd90..4019be3 100644
--- a/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
+++ b/erpnext/buying/doctype/request_for_quotation_supplier/request_for_quotation_supplier.json
@@ -87,13 +87,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-11-04 22:01:43.832942",
+ "modified": "2024-03-27 13:10:33.435013",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Request for Quotation Supplier",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index 3dae044..fa4b468 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -485,7 +485,7 @@
    "link_fieldname": "party"
   }
  ],
- "modified": "2024-03-13 11:14:06.516519",
+ "modified": "2024-03-27 13:10:48.412732",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier",
@@ -546,7 +546,7 @@
  "quick_entry": 1,
  "search_fields": "supplier_group",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "title_field": "supplier_name",
diff --git a/erpnext/buying/doctype/supplier/supplier.py b/erpnext/buying/doctype/supplier/supplier.py
index c8ed5aa..0df17fd 100644
--- a/erpnext/buying/doctype/supplier/supplier.py
+++ b/erpnext/buying/doctype/supplier/supplier.py
@@ -11,9 +11,8 @@
 )
 from frappe.model.naming import set_name_by_naming_series, set_name_from_naming_options
 
-from erpnext.accounts.party import (  # noqa
+from erpnext.accounts.party import (
 	get_dashboard_info,
-	get_timeline_data,
 	validate_party_accounts,
 )
 from erpnext.controllers.website_list_for_contact import add_role_for_portal_user
@@ -126,9 +125,7 @@
 			return
 
 		user_doc.add_roles("Supplier")
-		frappe.msgprint(
-			_("Added Supplier Role to User {0}.").format(frappe.bold(user_doc.name)), alert=True
-		)
+		frappe.msgprint(_("Added Supplier Role to User {0}.").format(frappe.bold(user_doc.name)), alert=True)
 
 	def validate(self):
 		self.flags.is_new_doc = self.is_new()
@@ -230,6 +227,6 @@
 		.where(
 			(dynamic_link.link_name == supplier)
 			& (dynamic_link.link_doctype == "Supplier")
-			& (contact.name.like("%{0}%".format(txt)))
+			& (contact.name.like(f"%{txt}%"))
 		)
 	).run(as_dict=False)
diff --git a/erpnext/buying/doctype/supplier/test_supplier.py b/erpnext/buying/doctype/supplier/test_supplier.py
index 55974ea..e4475c7 100644
--- a/erpnext/buying/doctype/supplier/test_supplier.py
+++ b/erpnext/buying/doctype/supplier/test_supplier.py
@@ -3,7 +3,6 @@
 
 
 import frappe
-from frappe.custom.doctype.property_setter.property_setter import make_property_setter
 from frappe.test_runner import make_test_records
 
 from erpnext.accounts.party import get_due_date
@@ -183,7 +182,6 @@
 
 class TestSupplierPortal(FrappeTestCase):
 	def test_portal_user_can_access_supplier_data(self):
-
 		supplier = create_supplier()
 
 		user = frappe.generate_hash() + "@example.com"
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 09be247..210c730 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -228,7 +228,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Address",
    "read_only": 1
   },
@@ -462,7 +462,7 @@
   },
   {
    "fieldname": "other_charges_calculation",
-   "fieldtype": "Markdown Editor",
+   "fieldtype": "Text Editor",
    "label": "Taxes and Charges Calculation",
    "no_copy": 1,
    "oldfieldtype": "HTML",
@@ -865,7 +865,7 @@
   },
   {
    "fieldname": "shipping_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Shipping Address Details",
    "print_hide": 1,
    "read_only": 1
@@ -897,7 +897,7 @@
   },
   {
    "fieldname": "billing_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Billing Address Details",
    "read_only": 1
   },
@@ -928,7 +928,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-20 16:03:59.069145",
+ "modified": "2024-03-28 10:20:30.231915",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Quotation",
@@ -991,7 +991,7 @@
  ],
  "search_fields": "status, transaction_date, supplier,grand_total",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "supplier",
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
index b716f7f..0829b27 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -31,7 +31,7 @@
 		)
 
 		additional_discount_percentage: DF.Float
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
 		auto_repeat: DF.Link | None
@@ -46,7 +46,7 @@
 		base_total: DF.Currency
 		base_total_taxes_and_charges: DF.Currency
 		billing_address: DF.Link | None
-		billing_address_display: DF.SmallText | None
+		billing_address_display: DF.TextEditor | None
 		buying_price_list: DF.Link | None
 		company: DF.Link
 		contact_display: DF.SmallText | None
@@ -71,7 +71,7 @@
 		naming_series: DF.Literal["PUR-SQTN-.YYYY.-"]
 		net_total: DF.Currency
 		opportunity: DF.Link | None
-		other_charges_calculation: DF.MarkdownEditor | None
+		other_charges_calculation: DF.TextEditor | None
 		plc_conversion_rate: DF.Float
 		price_list_currency: DF.Link | None
 		pricing_rules: DF.Table[PricingRuleDetail]
@@ -81,7 +81,7 @@
 		rounding_adjustment: DF.Currency
 		select_print_heading: DF.Link | None
 		shipping_address: DF.Link | None
-		shipping_address_display: DF.SmallText | None
+		shipping_address_display: DF.TextEditor | None
 		shipping_rule: DF.Link | None
 		status: DF.Literal["", "Draft", "Submitted", "Stopped", "Cancelled", "Expired"]
 		supplier: DF.Link
@@ -104,7 +104,7 @@
 	# end: auto-generated types
 
 	def validate(self):
-		super(SupplierQuotation, self).validate()
+		super().validate()
 
 		if not self.status:
 			self.status = "Draft"
@@ -130,7 +130,7 @@
 		pass
 
 	def validate_with_previous_doc(self):
-		super(SupplierQuotation, self).validate_with_previous_doc(
+		super().validate_with_previous_doc(
 			{
 				"Material Request": {
 					"ref_dn_field": "prevdoc_docname",
diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
index a6229b5..f043b82 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -571,14 +571,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-11-17 12:25:26.235367",
+ "modified": "2024-03-27 13:10:49.490628",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Quotation Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json
index 6a077e9..b4f958c 100644
--- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json
+++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.json
@@ -1,700 +1,197 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "actions": [],
  "autoname": "field:supplier",
- "beta": 0,
  "creation": "2017-05-29 01:40:54.786555",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "supplier",
+  "supplier_score",
+  "indicator_color",
+  "status",
+  "column_break_2",
+  "period",
+  "scoring_setup",
+  "weighting_function",
+  "standings",
+  "criteria_setup",
+  "load_criteria",
+  "criteria",
+  "scorecard_actions",
+  "warn_rfqs",
+  "warn_pos",
+  "prevent_rfqs",
+  "prevent_pos",
+  "column_break_16",
+  "notify_supplier",
+  "notify_employee",
+  "employee"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "supplier",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Supplier",
-   "length": 0,
-   "no_copy": 0,
    "options": "Supplier",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "unique": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "supplier_score",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Supplier Score",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "indicator_color",
    "fieldtype": "Data",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Indicator Color",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Indicator Color"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "status",
    "fieldtype": "Data",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Status",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Status"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "column_break_2",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "Per Month",
    "fieldname": "period",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Evaluation Period",
-   "length": 0,
-   "no_copy": 0,
    "options": "Per Week\nPer Month\nPer Year",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "fieldname": "scoring_setup",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Scoring Setup",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Scoring Setup"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "{total_score} * max( 0, min ( 1 , (12 - {period_number}) / 12) )",
    "description": "Scorecard variables can be used, as well as:\n{total_score} (the total score from that period),\n{period_number} (the number of periods to present day)\n",
    "fieldname": "weighting_function",
    "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
    "ignore_xss_filter": 1,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Weighting Function",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "standings",
    "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Scoring Standings",
-   "length": 0,
-   "no_copy": 0,
    "options": "Supplier Scorecard Scoring Standing",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "fieldname": "criteria_setup",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Criteria Setup",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Criteria Setup"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "load_criteria",
    "fieldtype": "Button",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Load All Criteria",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Load All Criteria"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "criteria",
    "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Scoring Criteria",
-   "length": 0,
-   "no_copy": 0,
    "options": "Supplier Scorecard Scoring Criteria",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
    "collapsible_depends_on": "eval: doc.status != 'Unknown'",
-   "columns": 0,
    "fieldname": "scorecard_actions",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Scorecard Actions",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Scorecard Actions"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "default": "0",
    "fieldname": "warn_rfqs",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Warn for new Request for Quotations",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "default": "0",
    "fieldname": "warn_pos",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Warn for new Purchase Orders",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "default": "0",
    "fieldname": "prevent_rfqs",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Prevent RFQs",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "default": "0",
    "fieldname": "prevent_pos",
    "fieldtype": "Check",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Prevent POs",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "column_break_16",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "default": "0",
    "fieldname": "notify_supplier",
    "fieldtype": "Check",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Notify Supplier",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
+   "default": "0",
    "fieldname": "notify_employee",
    "fieldtype": "Check",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Notify Employee",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "employee",
    "fieldtype": "Link",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Employee",
-   "length": 0,
-   "no_copy": 0,
    "options": "Employee",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-01-22 11:42:19.918990",
+ "links": [],
+ "modified": "2024-03-27 13:10:49.727302",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Scorecard",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "System Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
- "track_changes": 0,
- "track_seen": 0
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py
index 0a6024f..a114271 100644
--- a/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py
+++ b/erpnext/buying/doctype/supplier_scorecard/supplier_scorecard.py
@@ -66,7 +66,11 @@
 			for c2 in self.standings:
 				if c1 != c2:
 					if c1.max_grade > c2.min_grade and c1.min_grade < c2.max_grade:
-						throw(_("Overlap in scoring between {0} and {1}").format(c1.standing_name, c2.standing_name))
+						throw(
+							_("Overlap in scoring between {0} and {1}").format(
+								c1.standing_name, c2.standing_name
+							)
+						)
 				if c2.min_grade == score:
 					score = c2.max_grade
 		if score < 100:
@@ -77,7 +81,6 @@
 			)
 
 	def validate_criteria_weights(self):
-
 		weight = 0
 		for c in self.criteria:
 			weight += c.weight
@@ -196,7 +199,6 @@
 
 @frappe.whitelist()
 def make_all_scorecards(docname):
-
 	sc = frappe.get_doc("Supplier Scorecard", docname)
 	supplier = frappe.get_doc("Supplier", sc.supplier)
 
diff --git a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.json b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.json
index 3668b25..e29d04d 100644
--- a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.json
+++ b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.json
@@ -43,7 +43,7 @@
   }
  ],
  "links": [],
- "modified": "2021-11-11 18:34:58.477648",
+ "modified": "2024-03-27 13:10:49.920492",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Scorecard Criteria",
@@ -64,7 +64,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py
index f19ab94..e04d1f9 100644
--- a/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py
+++ b/erpnext/buying/doctype/supplier_scorecard_criteria/supplier_scorecard_criteria.py
@@ -43,8 +43,8 @@
 		regex = r"\{(.*?)\}"
 
 		mylist = re.finditer(regex, test_formula, re.MULTILINE | re.DOTALL)
-		for dummy1, match in enumerate(mylist):
-			for dummy2 in range(0, len(match.groups())):
+		for _dummy1, match in enumerate(mylist):
+			for _dummy2 in range(0, len(match.groups())):
 				test_formula = test_formula.replace("{" + match.group(1) + "}", "0")
 
 		try:
@@ -78,8 +78,8 @@
 	regex = r"\{(.*?)\}"
 
 	mylist = re.finditer(regex, criteria.formula, re.MULTILINE | re.DOTALL)
-	for dummy1, match in enumerate(mylist):
-		for dummy2 in range(0, len(match.groups())):
+	for _dummy1, match in enumerate(mylist):
+		for _dummy2 in range(0, len(match.groups())):
 			try:
 				var = frappe.db.sql(
 					"""
@@ -94,6 +94,8 @@
 				)[0]
 				my_variables.append(var)
 			except Exception:
-				frappe.throw(_("Unable to find variable:") + " " + str(match.group(1)), InvalidFormulaVariable)
+				frappe.throw(
+					_("Unable to find variable:") + " " + str(match.group(1)), InvalidFormulaVariable
+				)
 
 	return my_variables
diff --git a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.json b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.json
index 8cdcaa9..b7df4e7 100644
--- a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.json
+++ b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.json
@@ -1,450 +1,131 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "actions": [],
  "autoname": "naming_series:",
- "beta": 0,
  "creation": "2017-05-30 00:38:18.773013",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "supplier",
+  "naming_series",
+  "total_score",
+  "column_break_2",
+  "start_date",
+  "end_date",
+  "section_break_11",
+  "criteria",
+  "variables",
+  "sec_ref",
+  "scorecard",
+  "amended_from"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "supplier",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Supplier",
-   "length": 0,
-   "no_copy": 0,
    "options": "Supplier",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
    "fieldname": "naming_series",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Naming Series",
-   "length": 0,
-   "no_copy": 0,
    "options": "PU-SSP-.YYYY.-",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "total_score",
    "fieldtype": "Percent",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Period Score",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "column_break_2",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "start_date",
    "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Start Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "end_date",
    "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "End Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "fieldname": "section_break_11",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Calculations",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Calculations"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "criteria",
    "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Criteria",
-   "length": 0,
-   "no_copy": 0,
    "options": "Supplier Scorecard Scoring Criteria",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "variables",
    "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Variables",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Supplier Scorecard Scoring Variable",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "options": "Supplier Scorecard Scoring Variable"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
    "collapsible": 1,
-   "columns": 0,
    "fieldname": "sec_ref",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Reference",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Reference"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "scorecard",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Supplier Scorecard Setup",
-   "length": 0,
-   "no_copy": 0,
    "options": "Supplier Scorecard",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "amended_from",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Amended From",
-   "length": 0,
    "no_copy": 1,
    "options": "Supplier Scorecard Period",
-   "permlevel": 0,
    "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
  "in_create": 1,
  "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2019-01-23 13:58:26.137770",
+ "links": [],
+ "modified": "2024-03-27 13:10:50.051033",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Scorecard Period",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
    "cancel": 1,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "System Manager",
-   "set_user_permissions": 0,
    "share": 1,
    "submit": 1,
    "write": 1
   }
  ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py
index e6ef166..5311ef0 100644
--- a/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py
+++ b/erpnext/buying/doctype/supplier_scorecard_period/supplier_scorecard_period.py
@@ -47,7 +47,6 @@
 		self.calculate_score()
 
 	def validate_criteria_weights(self):
-
 		weight = 0
 		for c in self.criteria:
 			weight += c.weight
@@ -70,14 +69,17 @@
 				crit.score = min(
 					crit.max_score,
 					max(
-						0, frappe.safe_eval(self.get_eval_statement(crit.formula), None, {"max": max, "min": min})
+						0,
+						frappe.safe_eval(
+							self.get_eval_statement(crit.formula), None, {"max": max, "min": min}
+						),
 					),
 				)
 			except Exception:
 				frappe.throw(
-					_("Could not solve criteria score function for {0}. Make sure the formula is valid.").format(
-						crit.criteria_name
-					),
+					_(
+						"Could not solve criteria score function for {0}. Make sure the formula is valid."
+					).format(crit.criteria_name),
 					frappe.ValidationError,
 				)
 				crit.score = 0
@@ -108,7 +110,7 @@
 			if var.value:
 				if var.param_name in my_eval_statement:
 					my_eval_statement = my_eval_statement.replace(
-						"{" + var.param_name + "}", "{:.2f}".format(var.value)
+						"{" + var.param_name + "}", f"{var.value:.2f}"
 					)
 			else:
 				if var.param_name in my_eval_statement:
diff --git a/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json b/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json
index 55ed45e..5624487 100644
--- a/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json
+++ b/erpnext/buying/doctype/supplier_scorecard_scoring_criteria/supplier_scorecard_scoring_criteria.json
@@ -1,252 +1,81 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
+ "actions": [],
  "creation": "2017-05-29 01:32:17.988454",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "criteria_name",
+  "score",
+  "column_break_4",
+  "weight",
+  "max_score",
+  "section_break_6",
+  "formula"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "columns": 5,
    "fieldname": "criteria_name",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Criteria Name",
-   "length": 0,
-   "no_copy": 0,
    "options": "Supplier Scorecard Criteria",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "columns": 2,
    "fieldname": "score",
    "fieldtype": "Percent",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Score",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "column_break_4",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "columns": 2,
    "fieldname": "weight",
    "fieldtype": "Percent",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Criteria Weight",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "default": "100",
    "fieldname": "max_score",
    "fieldtype": "Float",
    "hidden": 1,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Max Score",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "section_break_6",
-   "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "fieldtype": "Section Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "formula",
    "fieldtype": "Small Text",
    "hidden": 1,
-   "ignore_user_permissions": 0,
    "ignore_xss_filter": 1,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Criteria Formula",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
  "istable": 1,
- "max_attachments": 0,
- "modified": "2019-01-23 13:49:13.350095",
+ "links": [],
+ "modified": "2024-03-27 13:10:50.201230",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Scorecard Scoring Criteria",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json b/erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
index e8498ef..4236595 100644
--- a/erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
+++ b/erpnext/buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
@@ -1,491 +1,129 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-05-29 01:36:22.697234", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2017-05-29 01:36:22.697234",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "standing_name",
+  "column_break_2",
+  "standing_color",
+  "section_break_4",
+  "min_grade",
+  "max_grade",
+  "actions",
+  "warn_rfqs",
+  "warn_pos",
+  "prevent_rfqs",
+  "prevent_pos",
+  "column_break_10",
+  "notify_supplier",
+  "notify_employee",
+  "employee_link"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "standing_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Standing Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier Scorecard Standing", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 3,
+   "fieldname": "standing_name",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Standing Name",
+   "options": "Supplier Scorecard Standing"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_2",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "standing_color", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Color", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Blue\nPurple\nGreen\nYellow\nOrange\nRed", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "standing_color",
+   "fieldtype": "Select",
+   "label": "Color",
+   "options": "Blue\nPurple\nGreen\nYellow\nOrange\nRed"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_4", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "min_grade", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Min Grade", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "min_grade",
+   "fieldtype": "Percent",
+   "in_list_view": 1,
+   "label": "Min Grade"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "max_grade", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Max Grade", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "max_grade",
+   "fieldtype": "Percent",
+   "in_list_view": 1,
+   "label": "Max Grade"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "actions", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Actions", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "actions",
+   "fieldtype": "Section Break",
+   "label": "Actions"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "warn_rfqs", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Warn RFQs", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "warn_rfqs",
+   "fieldtype": "Check",
+   "label": "Warn RFQs"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "warn_pos", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Warn Purchase Orders", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "warn_pos",
+   "fieldtype": "Check",
+   "label": "Warn Purchase Orders"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "prevent_rfqs", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Prevent RFQs", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "prevent_rfqs",
+   "fieldtype": "Check",
+   "label": "Prevent RFQs"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "prevent_pos", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Prevent Purchase Orders", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "prevent_pos",
+   "fieldtype": "Check",
+   "label": "Prevent Purchase Orders"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_10", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_10",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "notify_supplier", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Notify Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "notify_supplier",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Notify Supplier"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "notify_employee", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Notify Employee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "notify_employee",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Notify Employee"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "employee_link", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Employee ", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "employee_link",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "label": "Employee ",
+   "options": "Employee"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2019-01-22 10:47:41.146704", 
- "modified_by": "Administrator", 
- "module": "Buying", 
- "name": "Supplier Scorecard Scoring Standing", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:50.322056",
+ "modified_by": "Administrator",
+ "module": "Buying",
+ "name": "Supplier Scorecard Scoring Standing",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_scorecard_scoring_variable/supplier_scorecard_scoring_variable.json b/erpnext/buying/doctype/supplier_scorecard_scoring_variable/supplier_scorecard_scoring_variable.json
index 5e4c5c1..f69451e 100644
--- a/erpnext/buying/doctype/supplier_scorecard_scoring_variable/supplier_scorecard_scoring_variable.json
+++ b/erpnext/buying/doctype/supplier_scorecard_scoring_variable/supplier_scorecard_scoring_variable.json
@@ -1,192 +1,67 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-05-29 01:30:06.105240", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2017-05-29 01:30:06.105240",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "variable_label",
+  "description",
+  "value",
+  "param_name",
+  "path"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "variable_label", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Variable Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier Scorecard Variable", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 3,
+   "fieldname": "variable_label",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Variable Name",
+   "options": "Supplier Scorecard Variable",
+   "read_only": 1,
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "label": "Description",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "value", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Value", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "value",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Value",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "param_name", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Parameter Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "param_name",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Parameter Name",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "path", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Path", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "path",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "Path",
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2019-01-23 09:55:19.749828", 
- "modified_by": "Administrator", 
- "module": "Buying", 
- "name": "Supplier Scorecard Scoring Variable", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:50.456611",
+ "modified_by": "Administrator",
+ "module": "Buying",
+ "name": "Supplier Scorecard Scoring Variable",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.json b/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.json
index b57881a..00b064c 100644
--- a/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.json
+++ b/erpnext/buying/doctype/supplier_scorecard_standing/supplier_scorecard_standing.json
@@ -1,424 +1,118 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:standing_name", 
- "beta": 0, 
- "creation": "2017-05-29 01:36:47.893639", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "autoname": "field:standing_name",
+ "creation": "2017-05-29 01:36:47.893639",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "standing_name",
+  "standing_color",
+  "min_grade",
+  "max_grade",
+  "column_break_5",
+  "warn_rfqs",
+  "warn_pos",
+  "prevent_rfqs",
+  "prevent_pos",
+  "notify_supplier",
+  "notify_employee",
+  "employee_link"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "standing_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Standing Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "fieldname": "standing_name",
+   "fieldtype": "Data",
+   "label": "Standing Name",
    "unique": 1
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "standing_color", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Color", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Blue\nPurple\nGreen\nYellow\nOrange\nRed", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "standing_color",
+   "fieldtype": "Select",
+   "label": "Color",
+   "options": "Blue\nPurple\nGreen\nYellow\nOrange\nRed"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "min_grade", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Min Grade", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "min_grade",
+   "fieldtype": "Percent",
+   "label": "Min Grade"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "max_grade", 
-   "fieldtype": "Percent", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Max Grade", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "max_grade",
+   "fieldtype": "Percent",
+   "label": "Max Grade"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "warn_rfqs", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Warn RFQs", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "warn_rfqs",
+   "fieldtype": "Check",
+   "label": "Warn RFQs"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "warn_pos", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Warn Purchase Orders", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "warn_pos",
+   "fieldtype": "Check",
+   "label": "Warn Purchase Orders"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "prevent_rfqs", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Prevent RFQs", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "prevent_rfqs",
+   "fieldtype": "Check",
+   "label": "Prevent RFQs"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "prevent_pos", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Prevent Purchase Orders", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "prevent_pos",
+   "fieldtype": "Check",
+   "label": "Prevent Purchase Orders"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "notify_supplier", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Notify Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "notify_supplier",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Notify Supplier"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "notify_employee", 
-   "fieldtype": "Check", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Notify Other", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "notify_employee",
+   "fieldtype": "Check",
+   "hidden": 1,
+   "label": "Notify Other"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "employee_link", 
-   "fieldtype": "Link", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Other", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "employee_link",
+   "fieldtype": "Link",
+   "hidden": 1,
+   "label": "Other",
+   "options": "Employee"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-01-22 10:47:49.195421", 
- "modified_by": "Administrator", 
- "module": "Buying", 
- "name": "Supplier Scorecard Standing", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:10:50.574065",
+ "modified_by": "Administrator",
+ "module": "Buying",
+ "name": "Supplier Scorecard Standing",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.json b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.json
index d372905..7078974 100644
--- a/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.json
+++ b/erpnext/buying/doctype/supplier_scorecard_variable/supplier_scorecard_variable.json
@@ -1,242 +1,80 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:variable_label", 
- "beta": 0, 
- "creation": "2017-05-29 01:30:34.688389", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "autoname": "field:variable_label",
+ "creation": "2017-05-29 01:30:34.688389",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "variable_label",
+  "is_custom",
+  "param_name",
+  "path",
+  "column_break_5",
+  "description"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "variable_label", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Variable Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "fieldname": "variable_label",
+   "fieldtype": "Data",
+   "label": "Variable Name",
+   "reqd": 1,
    "unique": 1
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "is_custom", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Custom?", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "is_custom",
+   "fieldtype": "Check",
+   "label": "Custom?",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "param_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Parameter Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
+   "fieldname": "param_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Parameter Name",
+   "reqd": 1,
    "unique": 1
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "path", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Path", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "path",
+   "fieldtype": "Data",
+   "label": "Path",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_5", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_5",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "label": "Description"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-01-23 09:39:59.866398", 
- "modified_by": "Administrator", 
- "module": "Buying", 
- "name": "Supplier Scorecard Variable", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:10:50.711158",
+ "modified_by": "Administrator",
+ "module": "Buying",
+ "name": "Supplier Scorecard Variable",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/buying/report/procurement_tracker/test_procurement_tracker.py b/erpnext/buying/report/procurement_tracker/test_procurement_tracker.py
index 9b53421..ebceb7f 100644
--- a/erpnext/buying/report/procurement_tracker/test_procurement_tracker.py
+++ b/erpnext/buying/report/procurement_tracker/test_procurement_tracker.py
@@ -2,17 +2,8 @@
 # For license information, please see license.txt
 
 
-from datetime import datetime
-
-import frappe
 from frappe.tests.utils import FrappeTestCase
 
-from erpnext.buying.doctype.purchase_order.purchase_order import make_purchase_receipt
-from erpnext.buying.report.procurement_tracker.procurement_tracker import execute
-from erpnext.stock.doctype.material_request.material_request import make_purchase_order
-from erpnext.stock.doctype.material_request.test_material_request import make_material_request
-from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
-
 
 class TestProcurementTracker(FrappeTestCase):
 	pass
diff --git a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py
index b88efe1..b23c3f5 100644
--- a/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py
+++ b/erpnext/buying/report/purchase_order_analysis/purchase_order_analysis.py
@@ -68,9 +68,7 @@
 			po.company,
 			po_item.name,
 		)
-		.where(
-			(po_item.parent == po.name) & (po.status.notin(("Stopped", "Closed"))) & (po.docstatus == 1)
-		)
+		.where((po_item.parent == po.name) & (po.status.notin(("Stopped", "Closed"))) & (po.docstatus == 1))
 		.groupby(po_item.name)
 		.orderby(po.transaction_date)
 	)
@@ -80,9 +78,7 @@
 			query = query.where(po[field] == filters.get(field))
 
 	if filters.get("from_date") and filters.get("to_date"):
-		query = query.where(
-			po.transaction_date.between(filters.get("from_date"), filters.get("to_date"))
-		)
+		query = query.where(po.transaction_date.between(filters.get("from_date"), filters.get("to_date")))
 
 	if filters.get("status"):
 		query = query.where(po.status.isin(filters.get("status")))
diff --git a/erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py b/erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py
index d431010..55189a7 100644
--- a/erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py
+++ b/erpnext/buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py
@@ -57,9 +57,7 @@
 				"qty_to_receive"
 			),
 			Sum(Coalesce(mr_item.received_qty, 0)).as_("received_qty"),
-			(Sum(Coalesce(mr_item.stock_qty, 0)) - Sum(Coalesce(mr_item.ordered_qty, 0))).as_(
-				"qty_to_order"
-			),
+			(Sum(Coalesce(mr_item.stock_qty, 0)) - Sum(Coalesce(mr_item.ordered_qty, 0))).as_("qty_to_order"),
 			mr_item.item_name,
 			mr_item.description,
 			mr.company,
diff --git a/erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.py b/erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.py
index 0213051..130cada 100644
--- a/erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.py
+++ b/erpnext/buying/report/subcontract_order_summary/subcontract_order_summary.py
@@ -112,7 +112,7 @@
 
 
 def get_subcontracted_data(order_details, data):
-	for key, details in order_details.items():
+	for _key, details in order_details.items():
 		res = details.order_item
 		for index, row in enumerate(details.supplied_items):
 			if index != 0:
diff --git a/erpnext/buying/report/subcontracted_item_to_be_received/test_subcontracted_item_to_be_received.py b/erpnext/buying/report/subcontracted_item_to_be_received/test_subcontracted_item_to_be_received.py
index d13d970..d90be66 100644
--- a/erpnext/buying/report/subcontracted_item_to_be_received/test_subcontracted_item_to_be_received.py
+++ b/erpnext/buying/report/subcontracted_item_to_be_received/test_subcontracted_item_to_be_received.py
@@ -62,7 +62,9 @@
 					"from_date": frappe.utils.get_datetime(
 						frappe.utils.add_to_date(sco.transaction_date, days=-10)
 					),
-					"to_date": frappe.utils.get_datetime(frappe.utils.add_to_date(sco.transaction_date, days=10)),
+					"to_date": frappe.utils.get_datetime(
+						frappe.utils.add_to_date(sco.transaction_date, days=10)
+					),
 				}
 			)
 		)
diff --git a/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py b/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py
index 1602957..7b4ec5c 100644
--- a/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py
+++ b/erpnext/buying/report/subcontracted_raw_materials_to_be_transferred/test_subcontracted_raw_materials_to_be_transferred.py
@@ -48,7 +48,9 @@
 					"from_date": frappe.utils.get_datetime(
 						frappe.utils.add_to_date(sco.transaction_date, days=-10)
 					),
-					"to_date": frappe.utils.get_datetime(frappe.utils.add_to_date(sco.transaction_date, days=10)),
+					"to_date": frappe.utils.get_datetime(
+						frappe.utils.add_to_date(sco.transaction_date, days=10)
+					),
 				}
 			)
 		)
diff --git a/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py b/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py
index 73b7d45..684cd3a 100644
--- a/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py
+++ b/erpnext/buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py
@@ -82,18 +82,14 @@
 	group_wise_map = defaultdict(list)
 	supplier_qty_price_map = {}
 
-	group_by_field = (
-		"supplier_name" if filters.get("group_by") == "Group by Supplier" else "item_code"
-	)
+	group_by_field = "supplier_name" if filters.get("group_by") == "Group by Supplier" else "item_code"
 	company_currency = frappe.db.get_default("currency")
 	float_precision = cint(frappe.db.get_default("float_precision")) or 2
 
 	for data in supplier_quotation_data:
 		group = data.get(group_by_field)  # get item or supplier value for this row
 
-		supplier_currency = frappe.db.get_value(
-			"Supplier", data.get("supplier_name"), "default_currency"
-		)
+		supplier_currency = frappe.db.get_value("Supplier", data.get("supplier_name"), "default_currency")
 
 		if supplier_currency:
 			exchange_rate = get_exchange_rate(supplier_currency, company_currency)
diff --git a/erpnext/buying/utils.py b/erpnext/buying/utils.py
index 61e5e6a..a120a49 100644
--- a/erpnext/buying/utils.py
+++ b/erpnext/buying/utils.py
@@ -3,7 +3,6 @@
 
 
 import json
-from typing import Dict
 
 import frappe
 from frappe import _
@@ -82,7 +81,7 @@
 			row.set(field, qty_data[field])
 
 
-def validate_item_and_get_basic_data(row) -> Dict:
+def validate_item_and_get_basic_data(row) -> dict:
 	item = frappe.db.get_values(
 		"Item",
 		filters={"name": row.item_code},
@@ -96,12 +95,7 @@
 
 
 def validate_stock_item_warehouse(row, item) -> None:
-	if (
-		item.is_stock_item == 1
-		and row.qty
-		and not row.warehouse
-		and not row.get("delivered_by_supplier")
-	):
+	if item.is_stock_item == 1 and row.qty and not row.warehouse and not row.get("delivered_by_supplier"):
 		frappe.throw(
 			_("Row #{1}: Warehouse is mandatory for stock Item {0}").format(
 				frappe.bold(row.item_code), row.idx
@@ -113,9 +107,7 @@
 	status = frappe.db.get_value(doctype, docname, "status")
 
 	if status in ("Closed", "On Hold"):
-		frappe.throw(
-			_("{0} {1} status is {2}").format(doctype, docname, status), frappe.InvalidStatusError
-		)
+		frappe.throw(_("{0} {1} status is {2}").format(doctype, docname, status), frappe.InvalidStatusError)
 
 
 @frappe.whitelist()
diff --git a/erpnext/communication/doctype/communication_medium/communication_medium.json b/erpnext/communication/doctype/communication_medium/communication_medium.json
index b6b9c7e..1fb3a18 100644
--- a/erpnext/communication/doctype/communication_medium/communication_medium.json
+++ b/erpnext/communication/doctype/communication_medium/communication_medium.json
@@ -60,12 +60,11 @@
   {
    "fieldname": "communication_channel",
    "fieldtype": "Select",
-   "label": "Communication Channel",
-   "options": ""
+   "label": "Communication Channel"
   }
  ],
  "links": [],
- "modified": "2020-10-27 16:22:08.068542",
+ "modified": "2024-03-27 13:06:45.112268",
  "modified_by": "Administrator",
  "module": "Communication",
  "name": "Communication Medium",
@@ -84,7 +83,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.json b/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.json
index b278ca0..cff636f 100644
--- a/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.json
+++ b/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-06-05 11:43:38.897272",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -44,13 +45,15 @@
   }
  ],
  "istable": 1,
- "modified": "2019-06-05 12:19:59.994979",
+ "links": [],
+ "modified": "2024-03-27 13:06:45.252082",
  "modified_by": "Administrator",
  "module": "Communication",
  "name": "Communication Medium Timeslot",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.py b/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.py
index 4cd65fa..aed5c73 100644
--- a/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.py
+++ b/erpnext/communication/doctype/communication_medium_timeslot/communication_medium_timeslot.py
@@ -15,9 +15,7 @@
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		day_of_week: DF.Literal[
-			"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
-		]
+		day_of_week: DF.Literal["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
 		employee_group: DF.Link
 		from_time: DF.Time
 		parent: DF.Data
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 2aadf59..d90e09e 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -95,7 +95,7 @@
 
 class AccountsController(TransactionBase):
 	def __init__(self, *args, **kwargs):
-		super(AccountsController, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 
 	def get_print_settings(self):
 		print_setting_fields = []
@@ -214,14 +214,13 @@
 		self.validate_return_against_account()
 
 		if self.doctype in ["Purchase Invoice", "Sales Invoice"]:
-			if invalid_advances := [
-				x for x in self.advances if not x.reference_type or not x.reference_name
-			]:
+			if invalid_advances := [x for x in self.advances if not x.reference_type or not x.reference_name]:
 				frappe.throw(
 					_(
 						"Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry."
 					).format(
-						frappe.bold(comma_and([x.idx for x in invalid_advances])), frappe.bold(_("Advance Payments"))
+						frappe.bold(comma_and([x.idx for x in invalid_advances])),
+						frappe.bold(_("Advance Payments")),
 					)
 				)
 
@@ -387,9 +386,7 @@
 			frappe.delete_doc("Batch", row.name)
 
 	def validate_return_against_account(self):
-		if (
-			self.doctype in ["Sales Invoice", "Purchase Invoice"] and self.is_return and self.return_against
-		):
+		if self.doctype in ["Sales Invoice", "Purchase Invoice"] and self.is_return and self.return_against:
 			cr_dr_account_field = "debit_to" if self.doctype == "Sales Invoice" else "credit_to"
 			cr_dr_account_label = "Debit To" if self.doctype == "Sales Invoice" else "Credit To"
 			cr_dr_account = self.get(cr_dr_account_field)
@@ -422,11 +419,7 @@
 						item.set(field_map.get(self.doctype), default_deferred_account)
 
 	def validate_auto_repeat_subscription_dates(self):
-		if (
-			self.get("from_date")
-			and self.get("to_date")
-			and getdate(self.from_date) > getdate(self.to_date)
-		):
+		if self.get("from_date") and self.get("to_date") and getdate(self.from_date) > getdate(self.to_date):
 			frappe.throw(_("To Date cannot be before From Date"), title=_("Invalid Auto Repeat Date"))
 
 	def validate_deferred_start_and_end_date(self):
@@ -434,11 +427,15 @@
 			if d.get("enable_deferred_revenue") or d.get("enable_deferred_expense"):
 				if not (d.service_start_date and d.service_end_date):
 					frappe.throw(
-						_("Row #{0}: Service Start and End Date is required for deferred accounting").format(d.idx)
+						_("Row #{0}: Service Start and End Date is required for deferred accounting").format(
+							d.idx
+						)
 					)
 				elif getdate(d.service_start_date) > getdate(d.service_end_date):
 					frappe.throw(
-						_("Row #{0}: Service Start Date cannot be greater than Service End Date").format(d.idx)
+						_("Row #{0}: Service Start Date cannot be greater than Service End Date").format(
+							d.idx
+						)
 					)
 				elif getdate(self.posting_date) > getdate(d.service_end_date):
 					frappe.throw(
@@ -497,7 +494,9 @@
 				if not self.cash_bank_account:
 					# show message that the amount is not paid
 					frappe.throw(
-						_("Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified")
+						_(
+							"Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
+						)
 					)
 
 				if cint(self.is_return) and self.grand_total > self.paid_amount:
@@ -541,7 +540,11 @@
 
 			if date_field and self.get(date_field):
 				validate_fiscal_year(
-					self.get(date_field), self.fiscal_year, self.company, self.meta.get_label(date_field), self
+					self.get(date_field),
+					self.fiscal_year,
+					self.company,
+					self.meta.get_label(date_field),
+					self,
 				)
 
 	def validate_party_accounts(self):
@@ -611,7 +614,9 @@
 
 			if tax_updated:
 				frappe.msgprint(
-					_("Disabled tax included prices since this {} is an internal transfer").format(self.doctype),
+					_("Disabled tax included prices since this {} is an internal transfer").format(
+						self.doctype
+					),
 					alert=1,
 				)
 
@@ -704,7 +709,7 @@
 				parent_dict[fieldname] = self.get(fieldname)
 
 			if self.doctype in ["Quotation", "Sales Order", "Delivery Note", "Sales Invoice"]:
-				document_type = "{} Item".format(self.doctype)
+				document_type = f"{self.doctype} Item"
 				parent_dict.update({"document_type": document_type})
 
 			# party_name field used for customer in quotation
@@ -743,7 +748,9 @@
 							if item.get(fieldname) is None or fieldname in force_item_fields:
 								item.set(fieldname, value)
 
-							elif fieldname in ["cost_center", "conversion_factor"] and not item.get(fieldname):
+							elif fieldname in ["cost_center", "conversion_factor"] and not item.get(
+								fieldname
+							):
 								item.set(fieldname, value)
 
 							elif fieldname == "serial_no":
@@ -779,7 +786,8 @@
 					# Items add via promotional scheme may not have cost center set
 					if hasattr(item, "cost_center") and not item.get("cost_center"):
 						item.set(
-							"cost_center", self.get("cost_center") or erpnext.get_default_cost_center(self.company)
+							"cost_center",
+							self.get("cost_center") or erpnext.get_default_cost_center(self.company),
 						)
 
 					if ret.get("pricing_rules"):
@@ -904,7 +912,7 @@
 			if isinstance(item_tax_rate, str):
 				item_tax_rate = parse_json(item_tax_rate)
 
-			for account_head, rate in item_tax_rate.items():
+			for account_head, _rate in item_tax_rate.items():
 				row = self.get_tax_row(account_head)
 
 				if not row:
@@ -932,9 +940,7 @@
 		if self.taxes_and_charges and frappe.get_cached_value(
 			taxes_and_charges_doctype, self.taxes_and_charges, "disabled"
 		):
-			frappe.throw(
-				_("{0} '{1}' is disabled").format(taxes_and_charges_doctype, self.taxes_and_charges)
-			)
+			frappe.throw(_("{0} '{1}' is disabled").format(taxes_and_charges_doctype, self.taxes_and_charges))
 
 	def validate_tax_account_company(self):
 		for d in self.get("taxes"):
@@ -1108,9 +1114,8 @@
 		self.set(parentfield, self.get(parentfield, {"allocated_amount": ["not in", [0, None, ""]]}))
 
 		frappe.db.sql(
-			"""delete from `tab%s` where parentfield=%s and parent = %s
-			and allocated_amount = 0"""
-			% (childtype, "%s", "%s"),
+			"""delete from `tab{}` where parentfield={} and parent = {}
+			and allocated_amount = 0""".format(childtype, "%s", "%s"),
 			(parentfield, self.name),
 		)
 
@@ -1206,9 +1211,7 @@
 		return res
 
 	def is_inclusive_tax(self):
-		is_inclusive = cint(
-			frappe.db.get_single_value("Accounts Settings", "show_inclusive_tax_in_print")
-		)
+		is_inclusive = cint(frappe.db.get_single_value("Accounts Settings", "show_inclusive_tax_in_print"))
 
 		if is_inclusive:
 			is_inclusive = 0
@@ -1251,7 +1254,6 @@
 		for d in self.get("advances"):
 			advance_exchange_rate = d.ref_exchange_rate
 			if d.allocated_amount and self.conversion_rate != advance_exchange_rate:
-
 				base_allocated_amount_in_ref_rate = advance_exchange_rate * d.allocated_amount
 				base_allocated_amount_in_inv_rate = self.conversion_rate * d.allocated_amount
 				difference = base_allocated_amount_in_ref_rate - base_allocated_amount_in_inv_rate
@@ -1324,7 +1326,7 @@
 		return False
 
 	def make_exchange_gain_loss_journal(
-		self, args: dict = None, dimensions_dict: dict = None
+		self, args: dict | None = None, dimensions_dict: dict | None = None
 	) -> None:
 		"""
 		Make Exchange Gain/Loss journal for Invoices and Payments
@@ -1344,7 +1346,6 @@
 							flt(arg.get("difference_amount", 0), precision) != 0
 							or flt(arg.get("exchange_gain_loss", 0), precision) != 0
 						) and arg.get("difference_account"):
-
 							party_account = arg.get("account")
 							gain_loss_account = arg.get("difference_account")
 							difference_amount = arg.get("difference_amount") or arg.get("exchange_gain_loss")
@@ -1395,8 +1396,8 @@
 				gain_loss_to_book = [x for x in self.references if x.exchange_gain_loss != 0]
 				booked = []
 				if gain_loss_to_book:
-					vtypes = [x.reference_doctype for x in gain_loss_to_book]
-					vnames = [x.reference_name for x in gain_loss_to_book]
+					[x.reference_doctype for x in gain_loss_to_book]
+					[x.reference_name for x in gain_loss_to_book]
 					je = qb.DocType("Journal Entry")
 					jea = qb.DocType("Journal Entry Account")
 					parents = (
@@ -1509,7 +1510,9 @@
 						"allocated_amount": flt(d.allocated_amount),
 						"precision": d.precision("advance_amount"),
 						"exchange_rate": (
-							self.conversion_rate if self.party_account_currency != self.company_currency else 1
+							self.conversion_rate
+							if self.party_account_currency != self.company_currency
+							else 1
 						),
 						"grand_total": (
 							self.base_grand_total
@@ -1649,52 +1652,33 @@
 		return amount, base_amount
 
 	def make_discount_gl_entries(self, gl_entries):
-		if self.doctype == "Purchase Invoice":
-			enable_discount_accounting = cint(
-				frappe.db.get_single_value("Buying Settings", "enable_discount_accounting")
-			)
-		elif self.doctype == "Sales Invoice":
-			enable_discount_accounting = cint(
-				frappe.db.get_single_value("Selling Settings", "enable_discount_accounting")
-			)
-
-		if self.doctype == "Purchase Invoice":
-			dr_or_cr = "credit"
-			rev_dr_cr = "debit"
-			supplier_or_customer = self.supplier
-
-		else:
-			dr_or_cr = "debit"
-			rev_dr_cr = "credit"
-			supplier_or_customer = self.customer
+		enable_discount_accounting = cint(
+			frappe.db.get_single_value("Selling Settings", "enable_discount_accounting")
+		)
 
 		if enable_discount_accounting:
 			for item in self.get("items"):
 				if item.get("discount_amount") and item.get("discount_account"):
 					discount_amount = item.discount_amount * item.qty
-					if self.doctype == "Purchase Invoice":
-						income_or_expense_account = (
-							item.expense_account
-							if (not item.enable_deferred_expense or self.is_return)
-							else item.deferred_expense_account
-						)
-					else:
-						income_or_expense_account = (
-							item.income_account
-							if (not item.enable_deferred_revenue or self.is_return)
-							else item.deferred_revenue_account
-						)
+					income_account = (
+						item.income_account
+						if (not item.enable_deferred_revenue or self.is_return)
+						else item.deferred_revenue_account
+					)
 
 					account_currency = get_account_currency(item.discount_account)
 					gl_entries.append(
 						self.get_gl_dict(
 							{
 								"account": item.discount_account,
-								"against": supplier_or_customer,
-								dr_or_cr: flt(
-									discount_amount * self.get("conversion_rate"), item.precision("discount_amount")
+								"against": self.customer,
+								"debit": flt(
+									discount_amount * self.get("conversion_rate"),
+									item.precision("discount_amount"),
 								),
-								dr_or_cr + "_in_account_currency": flt(discount_amount, item.precision("discount_amount")),
+								"debit_in_account_currency": flt(
+									discount_amount, item.precision("discount_amount")
+								),
 								"cost_center": item.cost_center,
 								"project": item.project,
 							},
@@ -1703,17 +1687,19 @@
 						)
 					)
 
-					account_currency = get_account_currency(income_or_expense_account)
+					account_currency = get_account_currency(income_account)
 					gl_entries.append(
 						self.get_gl_dict(
 							{
-								"account": income_or_expense_account,
-								"against": supplier_or_customer,
-								rev_dr_cr: flt(
-									discount_amount * self.get("conversion_rate"), item.precision("discount_amount")
+								"account": income_account,
+								"against": self.customer,
+								"credit": flt(
+									discount_amount * self.get("conversion_rate"),
+									item.precision("discount_amount"),
 								),
-								rev_dr_cr
-								+ "_in_account_currency": flt(discount_amount, item.precision("discount_amount")),
+								"credit_in_account_currency": flt(
+									discount_amount, item.precision("discount_amount")
+								),
 								"cost_center": item.cost_center,
 								"project": item.project or self.project,
 							},
@@ -1731,8 +1717,8 @@
 				self.get_gl_dict(
 					{
 						"account": self.additional_discount_account,
-						"against": supplier_or_customer,
-						dr_or_cr: self.base_discount_amount,
+						"against": self.customer,
+						"debit": self.base_discount_amount,
 						"cost_center": self.cost_center or erpnext.get_default_cost_center(self.company),
 					},
 					item=self,
@@ -1753,9 +1739,7 @@
 		total_overbilled_amt = 0.0
 
 		reference_names = [d.get(item_ref_dn) for d in self.get("items") if d.get(item_ref_dn)]
-		reference_details = self.get_billing_reference_details(
-			reference_names, ref_dt + " Item", based_on
-		)
+		reference_details = self.get_billing_reference_details(reference_names, ref_dt + " Item", based_on)
 
 		for item in self.get("items"):
 			if not item.get(item_ref_dn):
@@ -1942,9 +1926,7 @@
 
 		self.set_advance_payment_status(advance_paid, order_total)
 
-	def set_advance_payment_status(
-		self, advance_paid: float | None = None, order_total: float | None = None
-	):
+	def set_advance_payment_status(self, advance_paid: float | None = None, order_total: float | None = None):
 		new_status = None
 		# if money is paid set the paid states
 		if advance_paid:
@@ -1980,17 +1962,13 @@
 
 	def raise_missing_debit_credit_account_error(self, party_type, party):
 		"""Raise an error if debit to/credit to account does not exist."""
-		db_or_cr = (
-			frappe.bold("Debit To") if self.doctype == "Sales Invoice" else frappe.bold("Credit To")
-		)
+		db_or_cr = frappe.bold("Debit To") if self.doctype == "Sales Invoice" else frappe.bold("Credit To")
 		rec_or_pay = "Receivable" if self.doctype == "Sales Invoice" else "Payable"
 
 		link_to_party = frappe.utils.get_link_to_form(party_type, party)
 		link_to_company = frappe.utils.get_link_to_form("Company", self.company)
 
-		message = _("{0} Account not found against Customer {1}.").format(
-			db_or_cr, frappe.bold(party) or ""
-		)
+		message = _("{0} Account not found against Customer {1}.").format(db_or_cr, frappe.bold(party) or "")
 		message += "<br>" + _("Please set one of the following:") + "<br>"
 		message += (
 			"<br><ul><li>"
@@ -2043,7 +2021,6 @@
 					and party_account_currency != self.company_currency
 					and self.currency != party_account_currency
 				):
-
 					frappe.throw(
 						_("Accounting Entry for {0}: {1} can only be made in currency: {2}").format(
 							party_type, party, party_account_currency
@@ -2064,9 +2041,7 @@
 
 		party_type, party = self.get_party()
 		party_gle_currency = get_party_gle_currency(party_type, party, self.company)
-		party_account = (
-			self.get("debit_to") if self.doctype == "Sales Invoice" else self.get("credit_to")
-		)
+		party_account = self.get("debit_to") if self.doctype == "Sales Invoice" else self.get("credit_to")
 		party_account_currency = get_account_currency(party_account)
 		allow_multi_currency_invoices_against_single_party_account = frappe.db.get_singles_value(
 			"Accounts Settings", "allow_multi_currency_invoices_against_single_party_account"
@@ -2089,10 +2064,8 @@
 			consider_for_total_advance = True
 			if adv.reference_name == linked_doc_name:
 				frappe.db.sql(
-					"""delete from `tab{0} Advance`
-					where name = %s""".format(
-						self.doctype
-					),
+					f"""delete from `tab{self.doctype} Advance`
+					where name = %s""",
 					adv.name,
 				)
 				consider_for_total_advance = False
@@ -2304,7 +2277,9 @@
 		for d in self.get("payment_schedule"):
 			if self.doctype == "Sales Order" and getdate(d.due_date) < getdate(self.transaction_date):
 				frappe.throw(
-					_("Row {0}: Due Date in the Payment Terms table cannot be before Posting Date").format(d.idx)
+					_("Row {0}: Due Date in the Payment Terms table cannot be before Posting Date").format(
+						d.idx
+					)
 				)
 			elif d.due_date in dates:
 				li.append(_("{0} in row {1}").format(d.due_date, d.idx))
@@ -2312,9 +2287,7 @@
 
 		if li:
 			duplicates = "<br>" + "<br>".join(li)
-			frappe.throw(
-				_("Rows with duplicate due dates in other rows were found: {0}").format(duplicates)
-			)
+			frappe.throw(_("Rows with duplicate due dates in other rows were found: {0}").format(duplicates))
 
 	def validate_payment_schedule_amount(self):
 		if (self.doctype == "Sales Invoice" and self.is_pos) or self.get("is_opening") == "Yes":
@@ -2437,7 +2410,7 @@
 		jv.voucher_type = "Journal Entry"
 		jv.posting_date = self.posting_date
 		jv.company = self.company
-		jv.remark = "Adjustment for {} {}".format(self.doctype, self.name)
+		jv.remark = f"Adjustment for {self.doctype} {self.name}"
 
 		reconcilation_entry = frappe._dict()
 		advance_entry = frappe._dict()
@@ -2447,9 +2420,7 @@
 		reconcilation_entry.party = secondary_party
 		reconcilation_entry.reference_type = self.doctype
 		reconcilation_entry.reference_name = self.name
-		reconcilation_entry.cost_center = self.cost_center or erpnext.get_default_cost_center(
-			self.company
-		)
+		reconcilation_entry.cost_center = self.cost_center or erpnext.get_default_cost_center(self.company)
 
 		advance_entry.account = primary_account
 		advance_entry.party_type = primary_party_type
@@ -2495,7 +2466,7 @@
 	def check_if_fields_updated(self, fields_to_check, child_tables):
 		# Check if any field affecting accounting entry is altered
 		doc_before_update = self.get_doc_before_save()
-		accounting_dimensions = get_accounting_dimensions() + ["cost_center", "project"]
+		accounting_dimensions = [*get_accounting_dimensions(), "cost_center", "project"]
 
 		# Parent Level Accounts excluding party account
 		fields_to_check += accounting_dimensions
@@ -2528,9 +2499,7 @@
 
 @frappe.whitelist()
 def get_tax_rate(account_head):
-	return frappe.get_cached_value(
-		"Account", account_head, ["tax_rate", "account_name"], as_dict=True
-	)
+	return frappe.get_cached_value("Account", account_head, ["tax_rate", "account_name"], as_dict=True)
 
 
 @frappe.whitelist()
@@ -2560,7 +2529,7 @@
 	tax_master = frappe.get_doc(master_doctype, master_name)
 
 	taxes_and_charges = []
-	for i, tax in enumerate(tax_master.get("taxes")):
+	for _i, tax in enumerate(tax_master.get("taxes")):
 		tax = tax.as_dict()
 
 		for fieldname in default_fields + child_table_fields:
@@ -2679,9 +2648,7 @@
 ):
 	if (not conversion_rate) and (account_currency != company_currency):
 		frappe.throw(
-			_("Account: {0} with currency: {1} can not be selected").format(
-				gl_dict.account, account_currency
-			)
+			_("Account: {0} with currency: {1} can not be selected").format(gl_dict.account, account_currency)
 		)
 
 	gl_dict["account_currency"] = (
@@ -2691,9 +2658,7 @@
 	# set debit/credit in account currency if not provided
 	if flt(gl_dict.debit) and not flt(gl_dict.debit_in_account_currency):
 		gl_dict.debit_in_account_currency = (
-			gl_dict.debit
-			if account_currency == company_currency
-			else flt(gl_dict.debit / conversion_rate, 2)
+			gl_dict.debit if account_currency == company_currency else flt(gl_dict.debit / conversion_rate, 2)
 		)
 
 	if flt(gl_dict.credit) and not flt(gl_dict.credit_in_account_currency):
@@ -2778,7 +2743,6 @@
 	limit=None,
 	condition=None,
 ):
-
 	payment_entries = []
 	payment_entry = frappe.qb.DocType("Payment Entry")
 
@@ -2874,7 +2838,7 @@
 		if condition.get("to_payment_date"):
 			common_filter_conditions.append(payment_entry.posting_date.lte(condition["to_payment_date"]))
 
-		if condition.get("get_payments") == True:
+		if condition.get("get_payments") is True:
 			if condition.get("cost_center"):
 				common_filter_conditions.append(payment_entry.cost_center == condition["cost_center"])
 
@@ -2966,9 +2930,7 @@
 
 	schedule = []
 	for d in terms_doc.get("terms"):
-		term_details = get_payment_term_details(
-			d, posting_date, grand_total, base_grand_total, bill_date
-		)
+		term_details = get_payment_term_details(d, posting_date, grand_total, base_grand_total, bill_date)
 		schedule.append(term_details)
 
 	return schedule
@@ -3086,9 +3048,7 @@
 					tax_row.db_insert()
 
 
-def set_order_defaults(
-	parent_doctype, parent_doctype_name, child_doctype, child_docname, trans_item
-):
+def set_order_defaults(parent_doctype, parent_doctype_name, child_doctype, child_docname, trans_item):
 	"""
 	Returns a Sales/Purchase Order Item child item containing the default values
 	"""
@@ -3104,9 +3064,7 @@
 	child_item.stock_uom = item.stock_uom
 	child_item.uom = trans_item.get("uom") or item.stock_uom
 	child_item.warehouse = get_item_warehouse(item, p_doc, overwrite_warehouse=True)
-	conversion_factor = flt(
-		get_conversion_factor(item.item_code, child_item.uom).get("conversion_factor")
-	)
+	conversion_factor = flt(get_conversion_factor(item.item_code, child_item.uom).get("conversion_factor"))
 	child_item.conversion_factor = flt(trans_item.get("conversion_factor")) or conversion_factor
 
 	if child_doctype == "Purchase Order Item":
@@ -3253,9 +3211,7 @@
 
 	def get_new_child_item(item_row):
 		child_doctype = "Sales Order Item" if parent_doctype == "Sales Order" else "Purchase Order Item"
-		return set_order_defaults(
-			parent_doctype, parent_doctype_name, child_doctype, child_docname, item_row
-		)
+		return set_order_defaults(parent_doctype, parent_doctype_name, child_doctype, child_docname, item_row)
 
 	def validate_quantity(child_item, new_data):
 		if not flt(new_data.get("qty")):
@@ -3269,9 +3225,7 @@
 		if parent_doctype == "Sales Order" and flt(new_data.get("qty")) < flt(child_item.delivered_qty):
 			frappe.throw(_("Cannot set quantity less than delivered quantity"))
 
-		if parent_doctype == "Purchase Order" and flt(new_data.get("qty")) < flt(
-			child_item.received_qty
-		):
+		if parent_doctype == "Purchase Order" and flt(new_data.get("qty")) < flt(child_item.received_qty):
 			frappe.throw(_("Cannot set quantity less than received quantity"))
 
 	def should_update_supplied_items(doc) -> bool:
@@ -3286,9 +3240,7 @@
 			item.supplied_qty or item.consumed_qty or item.returned_qty for item in doc.supplied_items
 		)
 
-		update_supplied_items = (
-			any_qty_changed or items_added_or_removed or any_conversion_factor_changed
-		)
+		update_supplied_items = any_qty_changed or items_added_or_removed or any_conversion_factor_changed
 		if update_supplied_items and supplied_items_processed:
 			frappe.throw(_("Item qty can not be updated as raw materials are already processed."))
 
@@ -3298,7 +3250,9 @@
 		if is_new:
 			if not new_data.get("fg_item"):
 				frappe.throw(
-					_("Finished Good Item is not specified for service item {0}").format(new_data["item_code"])
+					_("Finished Good Item is not specified for service item {0}").format(
+						new_data["item_code"]
+					)
 				)
 			else:
 				is_sub_contracted_item, default_bom = frappe.db.get_value(
@@ -3347,8 +3301,9 @@
 			prev_rate, new_rate = flt(child_item.get("rate")), flt(d.get("rate"))
 			prev_qty, new_qty = flt(child_item.get("qty")), flt(d.get("qty"))
 			prev_fg_qty, new_fg_qty = flt(child_item.get("fg_item_qty")), flt(d.get("fg_item_qty"))
-			prev_con_fac, new_con_fac = flt(child_item.get("conversion_factor")), flt(
-				d.get("conversion_factor")
+			prev_con_fac, new_con_fac = (
+				flt(child_item.get("conversion_factor")),
+				flt(d.get("conversion_factor")),
 			)
 			prev_uom, new_uom = child_item.get("uom"), d.get("uom")
 
@@ -3440,7 +3395,8 @@
 				if parent_doctype in sales_doctypes:
 					child_item.margin_type = "Amount"
 					child_item.margin_rate_or_amount = flt(
-						child_item.rate - child_item.price_list_rate, child_item.precision("margin_rate_or_amount")
+						child_item.rate - child_item.price_list_rate,
+						child_item.precision("margin_rate_or_amount"),
 					)
 					child_item.rate_with_margin = child_item.rate
 			else:
@@ -3542,9 +3498,7 @@
 				parent.create_stock_reservation_entries()
 
 
-def check_if_child_table_updated(
-	child_table_before_update, child_table_after_update, fields_to_check
-):
+def check_if_child_table_updated(child_table_before_update, child_table_after_update, fields_to_check):
 	fields_to_check = list(fields_to_check) + get_accounting_dimensions() + ["cost_center", "project"]
 
 	# Check if any field affecting accounting entry is altered
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index c530727..58bcc8c 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -28,7 +28,7 @@
 	def validate(self):
 		self.set_rate_for_standalone_debit_note()
 
-		super(BuyingController, self).validate()
+		super().validate()
 		if getattr(self, "supplier", None) and not self.supplier_name:
 			self.supplier_name = frappe.db.get_value("Supplier", self.supplier, "supplier_name")
 
@@ -45,9 +45,7 @@
 		if self.doctype == "Purchase Invoice":
 			self.validate_purchase_receipt_if_update_stock()
 
-		if self.doctype == "Purchase Receipt" or (
-			self.doctype == "Purchase Invoice" and self.update_stock
-		):
+		if self.doctype == "Purchase Receipt" or (self.doctype == "Purchase Invoice" and self.update_stock):
 			# self.validate_purchase_return()
 			self.validate_rejected_warehouse()
 			self.validate_accepted_rejected_qty()
@@ -64,12 +62,10 @@
 			self.set_serial_and_batch_bundle()
 
 	def onload(self):
-		super(BuyingController, self).onload()
+		super().onload()
 		self.set_onload(
 			"backflush_based_on",
-			frappe.db.get_single_value(
-				"Buying Settings", "backflush_raw_materials_of_subcontract_based_on"
-			),
+			frappe.db.get_single_value("Buying Settings", "backflush_raw_materials_of_subcontract_based_on"),
 		)
 
 	def create_package_for_transfer(self) -> None:
@@ -128,7 +124,7 @@
 					row.margin_rate_or_amount = 0.0
 
 	def set_missing_values(self, for_validate=False):
-		super(BuyingController, self).set_missing_values(for_validate)
+		super().set_missing_values(for_validate)
 
 		self.set_supplier_from_item_default()
 		self.set_price_list_currency("Buying")
@@ -188,9 +184,7 @@
 		if self.doctype not in ["Purchase Receipt", "Purchase Invoice"] or not self.is_return:
 			return
 
-		purchase_doc_field = (
-			"purchase_receipt" if self.doctype == "Purchase Receipt" else "purchase_invoice"
-		)
+		purchase_doc_field = "purchase_receipt" if self.doctype == "Purchase Receipt" else "purchase_invoice"
 		not_cancelled_asset = []
 		if self.return_against:
 			not_cancelled_asset = [
@@ -508,7 +502,6 @@
 				pr_qty = flt(flt(d.qty) * flt(d.conversion_factor), d.precision("stock_qty"))
 
 				if pr_qty:
-
 					if d.from_warehouse and (
 						(not cint(self.is_return) and self.docstatus == 1)
 						or (cint(self.is_return) and self.docstatus == 2)
@@ -546,7 +539,9 @@
 							"serial_and_batch_bundle": (
 								d.serial_and_batch_bundle
 								if not self.is_internal_transfer() or self.is_return
-								else self.get_package_for_target_warehouse(d, type_of_transaction=type_of_transaction)
+								else self.get_package_for_target_warehouse(
+									d, type_of_transaction=type_of_transaction
+								)
 							),
 						},
 					)
@@ -604,7 +599,9 @@
 						d,
 						{
 							"warehouse": d.rejected_warehouse,
-							"actual_qty": flt(flt(d.rejected_qty) * flt(d.conversion_factor), d.precision("stock_qty")),
+							"actual_qty": flt(
+								flt(d.rejected_qty) * flt(d.conversion_factor), d.precision("stock_qty")
+							),
 							"incoming_rate": 0.0,
 							"serial_and_batch_bundle": d.rejected_serial_and_batch_bundle,
 						},
@@ -670,7 +667,7 @@
 			update_last_purchase_rate(self, is_submit=1)
 
 	def on_cancel(self):
-		super(BuyingController, self).on_cancel()
+		super().on_cancel()
 
 		if self.get("is_return"):
 			return
@@ -695,7 +692,9 @@
 						"doctype": self.doctype,
 						"company": self.company,
 						"posting_date": (
-							self.schedule_date if self.doctype == "Material Request" else self.transaction_date
+							self.schedule_date
+							if self.doctype == "Material Request"
+							else self.transaction_date
 						),
 					}
 				)
@@ -727,17 +726,21 @@
 							asset = self.make_asset(d, is_grouped_asset=True)
 							created_assets.append(asset)
 						else:
-							for qty in range(cint(d.qty)):
+							for _qty in range(cint(d.qty)):
 								asset = self.make_asset(d)
 								created_assets.append(asset)
 
 						if len(created_assets) > 5:
 							# dont show asset form links if more than 5 assets are created
 							messages.append(
-								_("{} Assets created for {}").format(len(created_assets), frappe.bold(d.item_code))
+								_("{} Assets created for {}").format(
+									len(created_assets), frappe.bold(d.item_code)
+								)
 							)
 						else:
-							assets_link = list(map(lambda d: frappe.utils.get_link_to_form("Asset", d), created_assets))
+							assets_link = list(
+								map(lambda d: frappe.utils.get_link_to_form("Asset", d), created_assets)
+							)
 							assets_link = frappe.bold(",".join(assets_link))
 
 							is_plural = "s" if len(created_assets) != 1 else ""
@@ -748,9 +751,9 @@
 							)
 					else:
 						frappe.throw(
-							_("Row {}: Asset Naming Series is mandatory for the auto creation for item {}").format(
-								d.idx, frappe.bold(d.item_code)
-							)
+							_(
+								"Row {}: Asset Naming Series is mandatory for the auto creation for item {}"
+							).format(d.idx, frappe.bold(d.item_code))
 						)
 				else:
 					messages.append(
@@ -912,11 +915,9 @@
 	invalid_items = [
 		d[0]
 		for d in frappe.db.sql(
-			"""
-		select item_code from tabItem where name in ({0}) and {1}=0
-		""".format(
-				item_list, fieldname
-			),
+			f"""
+		select item_code from tabItem where name in ({item_list}) and {fieldname}=0
+		""",
 			as_list=True,
 		)
 	]
diff --git a/erpnext/controllers/item_variant.py b/erpnext/controllers/item_variant.py
index 1eee9ea..7a1db6d 100644
--- a/erpnext/controllers/item_variant.py
+++ b/erpnext/controllers/item_variant.py
@@ -64,9 +64,7 @@
 	variant.flags.ignore_mandatory = True
 	variant.save()
 
-	if not frappe.db.exists(
-		"Item Manufacturer", {"item_code": variant.name, "manufacturer": manufacturer}
-	):
+	if not frappe.db.exists("Item Manufacturer", {"item_code": variant.name, "manufacturer": manufacturer}):
 		manufacturer_doc = frappe.new_doc("Item Manufacturer")
 		manufacturer_doc.update(
 			{
@@ -130,9 +128,7 @@
 		)
 
 
-def validate_item_attribute_value(
-	attributes_list, attribute, attribute_value, item, from_variant=True
-):
+def validate_item_attribute_value(attributes_list, attribute, attribute_value, item, from_variant=True):
 	allow_rename_attribute_value = frappe.db.get_single_value(
 		"Item Variant Settings", "allow_rename_attribute_value"
 	)
@@ -179,9 +175,7 @@
 
 
 def find_variant(template, args, variant_item_code=None):
-	possible_variants = [
-		i for i in get_item_codes_by_attributes(args, template) if i != variant_item_code
-	]
+	possible_variants = [i for i in get_item_codes_by_attributes(args, template) if i != variant_item_code]
 
 	for variant in possible_variants:
 		variant = frappe.get_doc("Item", variant)
@@ -357,7 +351,9 @@
 			if variant.attributes:
 				attributes_description = item.description + " "
 				for d in variant.attributes:
-					attributes_description += "<div>" + d.attribute + ": " + cstr(d.attribute_value) + "</div>"
+					attributes_description += (
+						"<div>" + d.attribute + ": " + cstr(d.attribute_value) + "</div>"
+					)
 
 				if attributes_description not in variant.description:
 					variant.description = attributes_description
@@ -391,8 +387,8 @@
 		abbreviations.append(abbr_or_value)
 
 	if abbreviations:
-		variant.item_code = "{0}-{1}".format(template_item_code, "-".join(abbreviations))
-		variant.item_name = "{0}-{1}".format(template_item_name, "-".join(abbreviations))
+		variant.item_code = "{}-{}".format(template_item_code, "-".join(abbreviations))
+		variant.item_name = "{}-{}".format(template_item_name, "-".join(abbreviations))
 
 
 @frappe.whitelist()
diff --git a/erpnext/controllers/print_settings.py b/erpnext/controllers/print_settings.py
index 59f13c6..f997116 100644
--- a/erpnext/controllers/print_settings.py
+++ b/erpnext/controllers/print_settings.py
@@ -40,7 +40,7 @@
 
 
 def format_columns(display_columns, compact_fields):
-	compact_fields = compact_fields + ["image", "item_code", "item_name"]
+	compact_fields = [*compact_fields, "image", "item_code", "item_name"]
 	final_columns = []
 	for column in display_columns:
 		if column not in compact_fields:
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 0de75d4..4764629 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -98,7 +98,7 @@
 			account_type_condition = "AND account_type in %(account_types)s"
 
 		accounts = frappe.db.sql(
-			"""
+			f"""
 			SELECT name, parent_account
 			FROM `tabAccount`
 			WHERE `tabAccount`.docstatus!=2
@@ -108,20 +108,16 @@
 				AND disabled = %(disabled)s
 				AND (account_currency = %(currency)s or ifnull(account_currency, '') = '')
 				AND `{searchfield}` LIKE %(txt)s
-				{mcond}
+				{get_match_cond(doctype)}
 			ORDER BY idx DESC, name
 			LIMIT %(limit)s offset %(offset)s
-		""".format(
-				account_type_condition=account_type_condition,
-				searchfield=searchfield,
-				mcond=get_match_cond(doctype),
-			),
+		""",
 			dict(
 				account_types=filters.get("account_type"),
 				company=filters.get("company"),
 				disabled=filters.get("disabled", 0),
 				currency=company_currency,
-				txt="%{}%".format(txt),
+				txt=f"%{txt}%",
 				offset=start,
 				limit=page_len,
 			),
@@ -176,7 +172,9 @@
 		if filters.get("customer") or filters.get("supplier"):
 			party = filters.get("customer") or filters.get("supplier")
 			item_rules_list = frappe.get_all(
-				"Party Specific Item", filters={"party": party}, fields=["restrict_based_on", "based_on_value"]
+				"Party Specific Item",
+				filters={"party": party},
+				fields=["restrict_based_on", "based_on_value"],
 			)
 
 			filters_dict = {}
@@ -325,11 +323,11 @@
 
 	return frappe.db.sql(
 		"""
-		select %(fields)s
+		select {fields}
 		from `tabDelivery Note`
-		where `tabDelivery Note`.`%(key)s` like %(txt)s and
+		where `tabDelivery Note`.`{key}` like {txt} and
 			`tabDelivery Note`.docstatus = 1
-			and status not in ('Stopped', 'Closed') %(fcond)s
+			and status not in ('Stopped', 'Closed') {fcond}
 			and (
 				(`tabDelivery Note`.is_return = 0 and `tabDelivery Note`.per_billed < 100)
 				or (`tabDelivery Note`.grand_total = 0 and `tabDelivery Note`.per_billed < 100)
@@ -338,17 +336,16 @@
 					and return_against in (select name from `tabDelivery Note` where per_billed < 100)
 				)
 			)
-			%(mcond)s order by `tabDelivery Note`.`%(key)s` asc limit %(page_len)s offset %(start)s
-	"""
-		% {
-			"fields": ", ".join(["`tabDelivery Note`.{0}".format(f) for f in fields]),
-			"key": searchfield,
-			"fcond": get_filters_cond(doctype, filters, []),
-			"mcond": get_match_cond(doctype),
-			"start": start,
-			"page_len": page_len,
-			"txt": "%(txt)s",
-		},
+			{mcond} order by `tabDelivery Note`.`{key}` asc limit {page_len} offset {start}
+	""".format(
+			fields=", ".join([f"`tabDelivery Note`.{f}" for f in fields]),
+			key=searchfield,
+			fcond=get_filters_cond(doctype, filters, []),
+			mcond=get_match_cond(doctype),
+			start=start,
+			page_len=page_len,
+			txt="%(txt)s",
+		),
 		{"txt": ("%%%s%%" % txt)},
 		as_dict=as_dict,
 	)
@@ -362,23 +359,31 @@
 	searchfields = meta.get_search_fields()
 
 	batches = get_batches_from_stock_ledger_entries(searchfields, txt, filters, start, page_len)
-	batches.extend(
-		get_batches_from_serial_and_batch_bundle(searchfields, txt, filters, start, page_len)
-	)
+	batches.extend(get_batches_from_serial_and_batch_bundle(searchfields, txt, filters, start, page_len))
 
 	filtered_batches = get_filterd_batches(batches)
 
 	if filters.get("is_inward"):
-		filtered_batches.extend(get_empty_batches(filters))
+		filtered_batches.extend(get_empty_batches(filters, start, page_len, filtered_batches, txt))
 
 	return filtered_batches
 
 
-def get_empty_batches(filters):
+def get_empty_batches(filters, start, page_len, filtered_batches=None, txt=None):
+	query_filter = {"item": filters.get("item_code")}
+	if txt:
+		query_filter["name"] = ("like", f"%{txt}%")
+
+	exclude_batches = [batch[0] for batch in filtered_batches] if filtered_batches else []
+	if exclude_batches:
+		query_filter["name"] = ("not in", exclude_batches)
+
 	return frappe.get_all(
 		"Batch",
 		fields=["name", "batch_qty"],
-		filters={"item": filters.get("item_code"), "batch_qty": 0.0},
+		filters=query_filter,
+		limit_start=start,
+		limit_page_length=page_len,
 		as_list=1,
 	)
 
@@ -393,7 +398,7 @@
 			batches[batch_data[0]][1] += batch_data[1]
 
 	filterd_batch = []
-	for batch, batch_data in batches.items():
+	for _batch, batch_data in batches.items():
 		if batch_data[1] > 0:
 			filterd_batch.append(tuple(batch_data))
 
@@ -414,7 +419,7 @@
 			stock_ledger_entry.batch_no,
 			Sum(stock_ledger_entry.actual_qty).as_("qty"),
 		)
-		.where(((batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull())))
+		.where((batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull()))
 		.where(stock_ledger_entry.is_cancelled == 0)
 		.where(
 			(stock_ledger_entry.item_code == filters.get("item_code"))
@@ -438,9 +443,9 @@
 		query = query.select(batch_table[field])
 
 	if txt:
-		txt_condition = batch_table.name.like("%{0}%".format(txt))
-		for field in searchfields + ["name"]:
-			txt_condition |= batch_table[field].like("%{0}%".format(txt))
+		txt_condition = batch_table.name.like(f"%{txt}%")
+		for field in [*searchfields, "name"]:
+			txt_condition |= batch_table[field].like(f"%{txt}%")
 
 		query = query.where(txt_condition)
 
@@ -464,7 +469,7 @@
 			bundle.batch_no,
 			Sum(bundle.qty).as_("qty"),
 		)
-		.where(((batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull())))
+		.where((batch_table.expiry_date >= expiry_date) | (batch_table.expiry_date.isnull()))
 		.where(stock_ledger_entry.is_cancelled == 0)
 		.where(
 			(stock_ledger_entry.item_code == filters.get("item_code"))
@@ -488,9 +493,9 @@
 		bundle_query = bundle_query.select(batch_table[field])
 
 	if txt:
-		txt_condition = batch_table.name.like("%{0}%".format(txt))
-		for field in searchfields + ["name"]:
-			txt_condition |= batch_table[field].like("%{0}%".format(txt))
+		txt_condition = batch_table.name.like(f"%{txt}%")
+		for field in [*searchfields, "name"]:
+			txt_condition |= batch_table[field].like(f"%{txt}%")
 
 		bundle_query = bundle_query.where(txt_condition)
 
@@ -505,7 +510,7 @@
 
 	if isinstance(filters, dict):
 		for key, val in filters.items():
-			if isinstance(val, (list, tuple)):
+			if isinstance(val, list | tuple):
 				filter_list.append([doctype, key, val[0], val[1]])
 			else:
 				filter_list.append([doctype, key, "=", val])
@@ -566,24 +571,20 @@
 	condition += f"and tabAccount.disabled = {filters.get('disabled', 0)}"
 
 	return frappe.db.sql(
-		"""select tabAccount.name from `tabAccount`
+		f"""select tabAccount.name from `tabAccount`
 			where (tabAccount.report_type = "Profit and Loss"
 					or tabAccount.account_type in ("Income Account", "Temporary"))
 				and tabAccount.is_group=0
-				and tabAccount.`{key}` LIKE %(txt)s
-				{condition} {match_condition}
-			order by idx desc, name""".format(
-			condition=condition, match_condition=get_match_cond(doctype), key=searchfield
-		),
+				and tabAccount.`{searchfield}` LIKE %(txt)s
+				{condition} {get_match_cond(doctype)}
+			order by idx desc, name""",
 		{"txt": "%" + txt + "%", "company": filters.get("company", "")},
 	)
 
 
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
-def get_filtered_dimensions(
-	doctype, txt, searchfield, start, page_len, filters, reference_doctype=None
-):
+def get_filtered_dimensions(doctype, txt, searchfield, start, page_len, filters, reference_doctype=None):
 	from erpnext.accounts.doctype.accounting_dimension_filter.accounting_dimension_filter import (
 		get_dimension_filter_map,
 	)
@@ -649,15 +650,13 @@
 		condition += "and tabAccount.company = %(company)s"
 
 	return frappe.db.sql(
-		"""select tabAccount.name from `tabAccount`
+		f"""select tabAccount.name from `tabAccount`
 		where (tabAccount.report_type = "Profit and Loss"
 				or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary", "Asset Received But Not Billed", "Capital Work in Progress"))
 			and tabAccount.is_group=0
 			and tabAccount.docstatus!=2
-			and tabAccount.{key} LIKE %(txt)s
-			{condition} {match_condition}""".format(
-			condition=condition, key=searchfield, match_condition=get_match_cond(doctype)
-		),
+			and tabAccount.{searchfield} LIKE %(txt)s
+			{condition} {get_match_cond(doctype)}""",
 		{"company": filters.get("company", ""), "txt": "%" + txt + "%"},
 	)
 
@@ -696,7 +695,7 @@
 		mcond=get_match_cond(doctype),
 		start=start,
 		page_len=page_len,
-		txt=frappe.db.escape("%{0}%".format(txt)),
+		txt=frappe.db.escape(f"%{txt}%"),
 	)
 
 	return frappe.db.sql(query)
@@ -716,9 +715,7 @@
 	query = """select batch_id from `tabBatch`
 			where disabled = 0
 			and (expiry_date >= CURRENT_DATE or expiry_date IS NULL)
-			and name like {txt}""".format(
-		txt=frappe.db.escape("%{0}%".format(txt))
-	)
+			and name like {txt}""".format(txt=frappe.db.escape(f"%{txt}%"))
 
 	if filters and filters.get("item"):
 		query += " and item = {item}".format(item=frappe.db.escape(filters.get("item")))
@@ -752,9 +749,7 @@
 		select pr.name
 		from `tabPurchase Receipt` pr, `tabPurchase Receipt Item` pritem
 		where pr.docstatus = 1 and pritem.parent = pr.name
-		and pr.name like {txt}""".format(
-		txt=frappe.db.escape("%{0}%".format(txt))
-	)
+		and pr.name like {txt}""".format(txt=frappe.db.escape(f"%{txt}%"))
 
 	if filters and filters.get("item_code"):
 		query += " and pritem.item_code = {item_code}".format(
@@ -771,9 +766,7 @@
 		select pi.name
 		from `tabPurchase Invoice` pi, `tabPurchase Invoice Item` piitem
 		where pi.docstatus = 1 and piitem.parent = pi.name
-		and pi.name like {txt}""".format(
-		txt=frappe.db.escape("%{0}%".format(txt))
-	)
+		and pi.name like {txt}""".format(txt=frappe.db.escape(f"%{txt}%"))
 
 	if filters and filters.get("item_code"):
 		query += " and piitem.item_code = {item_code}".format(
@@ -795,7 +788,6 @@
 @frappe.whitelist()
 @frappe.validate_and_sanitize_search_inputs
 def get_tax_template(doctype, txt, searchfield, start, page_len, filters):
-
 	item_doc = frappe.get_cached_doc("Item", filters.get("item_code"))
 	item_group = filters.get("item_group")
 	company = filters.get("company")
@@ -807,9 +799,7 @@
 		item_group = item_group_doc.parent_item_group
 
 	if not taxes:
-		return frappe.get_all(
-			"Item Tax Template", filters={"disabled": 0, "company": company}, as_list=True
-		)
+		return frappe.get_all("Item Tax Template", filters={"disabled": 0, "company": company}, as_list=True)
 	else:
 		valid_from = filters.get("valid_from")
 		valid_from = valid_from[1] if isinstance(valid_from, list) else valid_from
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 5594816..83f3410 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -28,9 +28,7 @@
 
 def validate_return_against(doc):
 	if not frappe.db.exists(doc.doctype, doc.return_against):
-		frappe.throw(
-			_("Invalid {0}: {1}").format(doc.meta.get_label("return_against"), doc.return_against)
-		)
+		frappe.throw(_("Invalid {0}: {1}").format(doc.meta.get_label("return_against"), doc.return_against))
 	else:
 		ref_doc = frappe.get_doc(doc.doctype, doc.return_against)
 
@@ -42,8 +40,8 @@
 			and ref_doc.docstatus.is_submitted()
 		):
 			# validate posting date time
-			return_posting_datetime = "%s %s" % (doc.posting_date, doc.get("posting_time") or "00:00:00")
-			ref_posting_datetime = "%s %s" % (
+			return_posting_datetime = "{} {}".format(doc.posting_date, doc.get("posting_time") or "00:00:00")
+			ref_posting_datetime = "{} {}".format(
 				ref_doc.posting_date,
 				ref_doc.get("posting_time") or "00:00:00",
 			)
@@ -81,7 +79,7 @@
 		select_fields += ",rejected_qty, received_qty"
 
 	for d in frappe.db.sql(
-		"""select {0} from `tab{1} Item` where parent = %s""".format(select_fields, doc.doctype),
+		f"""select {select_fields} from `tab{doc.doctype} Item` where parent = %s""",
 		doc.return_against,
 		as_dict=1,
 	):
@@ -229,17 +227,15 @@
 			sum(abs(child.received_qty) * child.conversion_factor) as received_qty"""
 
 	data = frappe.db.sql(
-		"""
-		select {0}
+		f"""
+		select {column}
 		from
-			`tab{1} Item` child, `tab{2}` par
+			`tab{doc.doctype} Item` child, `tab{doc.doctype}` par
 		where
 			child.parent = par.name and par.docstatus = 1
 			and par.is_return = 1 and par.return_against = %s
 		group by item_code
-	""".format(
-			column, doc.doctype, doc.doctype
-		),
+	""",
 		doc.return_against,
 		as_dict=1,
 	)
@@ -272,22 +268,22 @@
 		party_type = "customer"
 
 	fields = [
-		"sum(abs(`tab{0}`.qty)) as qty".format(child_doctype),
+		f"sum(abs(`tab{child_doctype}`.qty)) as qty",
 	]
 
 	if doctype != "Subcontracting Receipt":
 		fields += [
-			"sum(abs(`tab{0}`.stock_qty)) as stock_qty".format(child_doctype),
+			f"sum(abs(`tab{child_doctype}`.stock_qty)) as stock_qty",
 		]
 
 	if doctype in ("Purchase Receipt", "Purchase Invoice", "Subcontracting Receipt"):
 		fields += [
-			"sum(abs(`tab{0}`.rejected_qty)) as rejected_qty".format(child_doctype),
-			"sum(abs(`tab{0}`.received_qty)) as received_qty".format(child_doctype),
+			f"sum(abs(`tab{child_doctype}`.rejected_qty)) as rejected_qty",
+			f"sum(abs(`tab{child_doctype}`.received_qty)) as received_qty",
 		]
 
 		if doctype == "Purchase Receipt":
-			fields += ["sum(abs(`tab{0}`.received_stock_qty)) as received_stock_qty".format(child_doctype)]
+			fields += [f"sum(abs(`tab{child_doctype}`.received_stock_qty)) as received_stock_qty"]
 
 	# Used retrun against and supplier and is_retrun because there is an index added for it
 	data = frappe.get_all(
@@ -305,9 +301,7 @@
 	return data[0]
 
 
-def make_return_doc(
-	doctype: str, source_name: str, target_doc=None, return_against_rejected_qty=False
-):
+def make_return_doc(doctype: str, source_name: str, target_doc=None, return_against_rejected_qty=False):
 	from frappe.model.mapper import get_mapped_doc
 
 	company = frappe.db.get_value("Delivery Note", source_name, "company")
@@ -648,8 +642,7 @@
 					"docstatus": ["=", 1],
 				},
 			},
-			doctype
-			+ " Item": {
+			doctype + " Item": {
 				"doctype": doctype + " Item",
 				"field_map": {"serial_no": "serial_no", "batch_no": "batch_no", "bom": "bom"},
 				"postprocess": update_item,
@@ -747,19 +740,13 @@
 	if reference_voucher_detail_no:
 		filters["voucher_detail_no"] = reference_voucher_detail_no
 
-	if (
-		voucher_type in ["Purchase Receipt", "Purchase Invoice"]
-		and item_row
-		and item_row.get("warehouse")
-	):
+	if voucher_type in ["Purchase Receipt", "Purchase Invoice"] and item_row and item_row.get("warehouse"):
 		filters["warehouse"] = item_row.get("warehouse")
 
 	return filters
 
 
-def get_returned_serial_nos(
-	child_doc, parent_doc, serial_no_field=None, ignore_voucher_detail_no=None
-):
+def get_returned_serial_nos(child_doc, parent_doc, serial_no_field=None, ignore_voucher_detail_no=None):
 	from erpnext.stock.doctype.serial_no.serial_no import (
 		get_serial_nos as get_serial_nos_from_serial_no,
 	)
@@ -809,9 +796,7 @@
 	return serial_nos
 
 
-def get_returned_batches(
-	child_doc, parent_doc, batch_no_field=None, ignore_voucher_detail_no=None
-):
+def get_returned_batches(child_doc, parent_doc, batch_no_field=None, ignore_voucher_detail_no=None):
 	from erpnext.stock.serial_batch_bundle import get_batches_from_bundle
 
 	batches = frappe._dict()
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index 9d86cb2..89e47b4 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -20,13 +20,13 @@
 		self.flags.ignore_permlevel_for_fields = ["selling_price_list", "price_list_currency"]
 
 	def onload(self):
-		super(SellingController, self).onload()
+		super().onload()
 		if self.doctype in ("Sales Order", "Delivery Note", "Sales Invoice"):
 			for item in self.get("items") + (self.get("packed_items") or []):
 				item.update(get_bin_details(item.item_code, item.warehouse, include_child_warehouses=True))
 
 	def validate(self):
-		super(SellingController, self).validate()
+		super().validate()
 		self.validate_items()
 		if not self.get("is_debit_note"):
 			self.validate_max_discount()
@@ -44,7 +44,7 @@
 				self.set_serial_and_batch_bundle(table_field)
 
 	def set_missing_values(self, for_validate=False):
-		super(SellingController, self).set_missing_values(for_validate)
+		super().set_missing_values(for_validate)
 
 		# set contact and address details for customer, if they are not mentioned
 		self.set_missing_lead_customer_details(for_validate=for_validate)
@@ -290,7 +290,10 @@
 
 			if flt(item.base_net_rate) < flt(last_valuation_rate_in_sales_uom):
 				throw_message(
-					item.idx, item.item_name, last_valuation_rate_in_sales_uom, "valuation rate (Moving Average)"
+					item.idx,
+					item.item_name,
+					last_valuation_rate_in_sales_uom,
+					"valuation rate (Moving Average)",
 				)
 
 	def get_item_list(self):
@@ -419,7 +422,8 @@
 					"Cancelled"
 				]:
 					frappe.throw(
-						_("{0} {1} is cancelled or closed").format(_("Sales Order"), so), frappe.InvalidStatusError
+						_("{0} {1} is cancelled or closed").format(_("Sales Order"), so),
+						frappe.InvalidStatusError,
 					)
 
 				sales_order.update_reserved_qty(so_item_rows)
@@ -623,7 +627,8 @@
 		if self.doctype in ["Sales Order", "Quotation"]:
 			for item in self.items:
 				item.gross_profit = flt(
-					((item.base_rate - flt(item.valuation_rate)) * item.stock_qty), self.precision("amount", item)
+					((item.base_rate - flt(item.valuation_rate)) * item.stock_qty),
+					self.precision("amount", item),
 				)
 
 	def set_customer_address(self):
@@ -700,9 +705,9 @@
 			if d.get("target_warehouse") and d.get("warehouse") == d.get("target_warehouse"):
 				warehouse = frappe.bold(d.get("target_warehouse"))
 				frappe.throw(
-					_("Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same").format(
-						d.idx, warehouse, warehouse
-					)
+					_(
+						"Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
+					).format(d.idx, warehouse, warehouse)
 				)
 
 		if not self.get("is_internal_customer") and any(d.get("target_warehouse") for d in items):
@@ -730,14 +735,10 @@
 	if child.get("use_serial_batch_fields"):
 		return
 
-	if not frappe.db.get_single_value(
-		"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward"
-	):
+	if not frappe.db.get_single_value("Stock Settings", "auto_create_serial_and_batch_bundle_for_outward"):
 		return
 
-	item_details = frappe.db.get_value(
-		"Item", child.item_code, ["has_serial_no", "has_batch_no"], as_dict=1
-	)
+	item_details = frappe.db.get_value("Item", child.item_code, ["has_serial_no", "has_batch_no"], as_dict=1)
 
 	if not item_details.has_serial_no and not item_details.has_batch_no:
 		return
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index fcbec22..17f072e 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -257,9 +257,7 @@
 						"""select item_code, `{target_ref_field}`,
 						`{target_field}`, parenttype, parent from `tab{target_dt}`
 						where `{target_ref_field}` < `{target_field}`
-						and name=%s and docstatus=1""".format(
-							**args
-						),
+						and name=%s and docstatus=1""".format(**args),
 						args["name"],
 						as_dict=1,
 					)
@@ -304,9 +302,7 @@
 		role_allowed_to_over_bill = frappe.db.get_single_value(
 			"Accounts Settings", "role_allowed_to_over_bill"
 		)
-		role = (
-			role_allowed_to_over_deliver_receive if qty_or_amount == "qty" else role_allowed_to_over_bill
-		)
+		role = role_allowed_to_over_deliver_receive if qty_or_amount == "qty" else role_allowed_to_over_bill
 
 		overflow_percent = (
 			(item[args["target_field"]] - item[args["target_ref_field"]]) / item[args["target_ref_field"]]
@@ -417,12 +413,11 @@
 					args["second_source_extra_cond"] = ""
 
 				args["second_source_condition"] = frappe.db.sql(
-					""" select ifnull((select sum(%(second_source_field)s)
-					from `tab%(second_source_dt)s`
-					where `%(second_join_field)s`='%(detail_id)s'
-					and (`tab%(second_source_dt)s`.docstatus=1)
-					%(second_source_extra_cond)s), 0) """
-					% args
+					""" select ifnull((select sum({second_source_field})
+					from `tab{second_source_dt}`
+					where `{second_join_field}`='{detail_id}'
+					and (`tab{second_source_dt}`.docstatus=1)
+					{second_source_extra_cond}), 0) """.format(**args)
 				)[0][0]
 
 			if args["detail_id"]:
@@ -432,11 +427,10 @@
 				args["source_dt_value"] = (
 					frappe.db.sql(
 						"""
-						(select ifnull(sum(%(source_field)s), 0)
-							from `tab%(source_dt)s` where `%(join_field)s`='%(detail_id)s'
-							and (docstatus=1 %(cond)s) %(extra_cond)s)
-				"""
-						% args
+						(select ifnull(sum({source_field}), 0)
+							from `tab{source_dt}` where `{join_field}`='{detail_id}'
+							and (docstatus=1 {cond}) {extra_cond})
+				""".format(**args)
 					)[0][0]
 					or 0.0
 				)
@@ -445,10 +439,9 @@
 					args["source_dt_value"] += flt(args["second_source_condition"])
 
 				frappe.db.sql(
-					"""update `tab%(target_dt)s`
-					set %(target_field)s = %(source_dt_value)s %(update_modified)s
-					where name='%(detail_id)s'"""
-					% args
+					"""update `tab{target_dt}`
+					set {target_field} = {source_dt_value} {update_modified}
+					where name='{detail_id}'""".format(**args)
 				)
 
 	def _update_percent_field_in_targets(self, args, update_modified=True):
@@ -475,26 +468,24 @@
 
 		if args.get("target_parent_field"):
 			frappe.db.sql(
-				"""update `tab%(target_parent_dt)s`
-				set %(target_parent_field)s = round(
+				"""update `tab{target_parent_dt}`
+				set {target_parent_field} = round(
 					ifnull((select
-						ifnull(sum(case when abs(%(target_ref_field)s) > abs(%(target_field)s) then abs(%(target_field)s) else abs(%(target_ref_field)s) end), 0)
-						/ sum(abs(%(target_ref_field)s)) * 100
-					from `tab%(target_dt)s` where parent='%(name)s' and parenttype='%(target_parent_dt)s' having sum(abs(%(target_ref_field)s)) > 0), 0), 6)
-					%(update_modified)s
-				where name='%(name)s'"""
-				% args
+						ifnull(sum(case when abs({target_ref_field}) > abs({target_field}) then abs({target_field}) else abs({target_ref_field}) end), 0)
+						/ sum(abs({target_ref_field})) * 100
+					from `tab{target_dt}` where parent='{name}' and parenttype='{target_parent_dt}' having sum(abs({target_ref_field})) > 0), 0), 6)
+					{update_modified}
+				where name='{name}'""".format(**args)
 			)
 
 			# update field
 			if args.get("status_field"):
 				frappe.db.sql(
-					"""update `tab%(target_parent_dt)s`
-					set %(status_field)s = (case when %(target_parent_field)s<0.001 then 'Not %(keyword)s'
-					else case when %(target_parent_field)s>=99.999999 then 'Fully %(keyword)s'
-					else 'Partly %(keyword)s' end end)
-					where name='%(name)s'"""
-					% args
+					"""update `tab{target_parent_dt}`
+					set {status_field} = (case when {target_parent_field}<0.001 then 'Not {keyword}'
+					else case when {target_parent_field}>=99.999999 then 'Fully {keyword}'
+					else 'Partly {keyword}' end end)
+					where name='{name}'""".format(**args)
 				)
 
 			if update_modified:
@@ -507,21 +498,19 @@
 			args["update_modified"] = ""
 			return
 
-		args["update_modified"] = ", modified = {0}, modified_by = {1}".format(
+		args["update_modified"] = ", modified = {}, modified_by = {}".format(
 			frappe.db.escape(now()), frappe.db.escape(frappe.session.user)
 		)
 
 	def update_billing_status_for_zero_amount_refdoc(self, ref_dt):
 		ref_fieldname = frappe.scrub(ref_dt)
 
-		ref_docs = [
-			item.get(ref_fieldname) for item in (self.get("items") or []) if item.get(ref_fieldname)
-		]
+		ref_docs = [item.get(ref_fieldname) for item in (self.get("items") or []) if item.get(ref_fieldname)]
 		if not ref_docs:
 			return
 
 		zero_amount_refdocs = frappe.db.sql_list(
-			"""
+			f"""
 			SELECT
 				name
 			from
@@ -530,9 +519,7 @@
 				docstatus = 1
 				and base_net_total = 0
 				and name in %(ref_docs)s
-		""".format(
-				ref_dt=ref_dt
-			),
+		""",
 			{"ref_docs": ref_docs},
 		)
 
@@ -543,9 +530,8 @@
 		for ref_dn in zero_amount_refdoc:
 			ref_doc_qty = flt(
 				frappe.db.sql(
-					"""select ifnull(sum(qty), 0) from `tab%s Item`
-				where parent=%s"""
-					% (ref_dt, "%s"),
+					"""select ifnull(sum(qty), 0) from `tab{} Item`
+				where parent={}""".format(ref_dt, "%s"),
 					(ref_dn),
 				)[0][0]
 			)
@@ -553,8 +539,7 @@
 			billed_qty = flt(
 				frappe.db.sql(
 					"""select ifnull(sum(qty), 0)
-				from `tab%s Item` where %s=%s and docstatus=1"""
-					% (self.doctype, ref_fieldname, "%s"),
+				from `tab{} Item` where {}={} and docstatus=1""".format(self.doctype, ref_fieldname, "%s"),
 					(ref_dn),
 				)[0][0]
 			)
@@ -612,13 +597,13 @@
 	)
 
 	if qty_or_amount == "qty" and not qty_allowance:
-		if global_qty_allowance == None:
+		if global_qty_allowance is None:
 			global_qty_allowance = flt(
 				frappe.get_cached_value("Stock Settings", None, "over_delivery_receipt_allowance")
 			)
 		qty_allowance = global_qty_allowance
 	elif qty_or_amount == "amount" and not over_billing_allowance:
-		if global_amount_allowance == None:
+		if global_amount_allowance is None:
 			global_amount_allowance = flt(
 				frappe.get_cached_value("Accounts Settings", None, "over_billing_allowance")
 			)
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index a1946e8..5916f2e 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -3,7 +3,6 @@
 
 import json
 from collections import defaultdict
-from typing import List, Tuple
 
 import frappe
 from frappe import _, bold
@@ -45,7 +44,7 @@
 
 class StockController(AccountsController):
 	def validate(self):
-		super(StockController, self).validate()
+		super().validate()
 
 		if self.docstatus == 0:
 			for table_name in ["items", "packed_items", "supplied_items"]:
@@ -289,7 +288,9 @@
 		throw_error = False
 		if row.serial_no:
 			serial_nos = frappe.get_all(
-				"Serial and Batch Entry", fields=["serial_no"], filters={"parent": row.serial_and_batch_bundle}
+				"Serial and Batch Entry",
+				fields=["serial_no"],
+				filters={"parent": row.serial_and_batch_bundle},
 			)
 			serial_nos = sorted([cstr(d.serial_no) for d in serial_nos])
 			parsed_serial_nos = get_serial_nos(row.serial_no)
@@ -323,10 +324,7 @@
 			for row in self.items:
 				row.use_serial_batch_fields = 1
 
-	def get_gl_entries(
-		self, warehouse_account=None, default_expense_account=None, default_cost_center=None
-	):
-
+	def get_gl_entries(self, warehouse_account=None, default_expense_account=None, default_cost_center=None):
 		if not warehouse_account:
 			warehouse_account = get_warehouse_account_map(self.company)
 
@@ -364,7 +362,9 @@
 									"project": item_row.project or self.get("project"),
 									"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
 									"debit": flt(sle.stock_value_difference, precision),
-									"is_opening": item_row.get("is_opening") or self.get("is_opening") or "No",
+									"is_opening": item_row.get("is_opening")
+									or self.get("is_opening")
+									or "No",
 								},
 								warehouse_account[sle.warehouse]["account_currency"],
 								item=item_row,
@@ -380,7 +380,9 @@
 									"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
 									"debit": -1 * flt(sle.stock_value_difference, precision),
 									"project": item_row.get("project") or self.get("project"),
-									"is_opening": item_row.get("is_opening") or self.get("is_opening") or "No",
+									"is_opening": item_row.get("is_opening")
+									or self.get("is_opening")
+									or "No",
 								},
 								item=item_row,
 							)
@@ -447,9 +449,7 @@
 
 	def get_debit_field_precision(self):
 		if not frappe.flags.debit_field_precision:
-			frappe.flags.debit_field_precision = frappe.get_precision(
-				"GL Entry", "debit_in_account_currency"
-			)
+			frappe.flags.debit_field_precision = frappe.get_precision("GL Entry", "debit_in_account_currency")
 
 		return frappe.flags.debit_field_precision
 
@@ -482,7 +482,7 @@
 
 			return details
 
-	def get_items_and_warehouses(self) -> Tuple[List[str], List[str]]:
+	def get_items_and_warehouses(self) -> tuple[list[str], list[str]]:
 		"""Get list of items and warehouses affected by a transaction"""
 
 		if not (hasattr(self, "items") or hasattr(self, "packed_items")):
@@ -763,9 +763,7 @@
 		if item_codes:
 			serialized_items = frappe.db.sql_list(
 				"""select name from `tabItem`
-				where has_serial_no=1 and name in ({})""".format(
-					", ".join(["%s"] * len(item_codes))
-				),
+				where has_serial_no=1 and name in ({})""".format(", ".join(["%s"] * len(item_codes))),
 				tuple(item_codes),
 			)
 
@@ -854,16 +852,12 @@
 
 	def validate_qi_submission(self, row):
 		"""Check if QI is submitted on row level, during submission"""
-		action = frappe.db.get_single_value(
-			"Stock Settings", "action_if_quality_inspection_is_not_submitted"
-		)
+		action = frappe.db.get_single_value("Stock Settings", "action_if_quality_inspection_is_not_submitted")
 		qa_docstatus = frappe.db.get_value("Quality Inspection", row.quality_inspection, "docstatus")
 
 		if qa_docstatus != 1:
 			link = frappe.utils.get_link_to_form("Quality Inspection", row.quality_inspection)
-			msg = (
-				f"Row #{row.idx}: Quality Inspection {link} is not submitted for the item: {row.item_code}"
-			)
+			msg = f"Row #{row.idx}: Quality Inspection {link} is not submitted for the item: {row.item_code}"
 			if action == "Stop":
 				frappe.throw(_(msg), title=_("Inspection Submission"), exc=QualityInspectionNotSubmittedError)
 			else:
@@ -913,7 +907,7 @@
 				self.validate_multi_currency()
 				self.validate_packed_items()
 
-				if self.get("is_internal_supplier"):
+				if self.get("is_internal_supplier") and self.docstatus == 1:
 					self.validate_internal_transfer_qty()
 			else:
 				self.validate_internal_transfer_warehouse()
@@ -927,9 +921,7 @@
 				row.from_warehouse = None
 
 	def validate_in_transit_warehouses(self):
-		if (
-			self.doctype == "Sales Invoice" and self.get("update_stock")
-		) or self.doctype == "Delivery Note":
+		if (self.doctype == "Sales Invoice" and self.get("update_stock")) or self.doctype == "Delivery Note":
 			for item in self.get("items"):
 				if not item.target_warehouse:
 					frappe.throw(
@@ -1098,7 +1090,9 @@
 					if self.doctype == "Stock Reconciliation":
 						stock_qty = flt(item.qty)
 					else:
-						stock_qty = flt(item.transfer_qty) if self.doctype == "Stock Entry" else flt(item.stock_qty)
+						stock_qty = (
+							flt(item.transfer_qty) if self.doctype == "Stock Entry" else flt(item.stock_qty)
+						)
 
 					rule_name = rule.get("name")
 					if not rule_map[rule_name]:
@@ -1114,9 +1108,7 @@
 					frappe.throw(msg=message, title=_("Over Receipt"))
 
 	def prepare_over_receipt_message(self, rule, values):
-		message = _(
-			"{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
-		).format(
+		message = _("{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}.").format(
 			frappe.bold(values["qty_put"]),
 			frappe.bold(values["item"]),
 			frappe.bold(values["warehouse"]),
@@ -1167,7 +1159,6 @@
 		item=None,
 		posting_date=None,
 	):
-
 		gl_entry = {
 			"account": account,
 			"cost_center": cost_center,
@@ -1312,9 +1303,7 @@
 
 
 def get_gl_entries_for_preview(doctype, docname, fields):
-	return frappe.get_all(
-		"GL Entry", filters={"voucher_type": doctype, "voucher_no": docname}, fields=fields
-	)
+	return frappe.get_all("GL Entry", filters={"voucher_type": doctype, "voucher_no": docname}, fields=fields)
 
 
 def get_columns(raw_columns, fields):
@@ -1439,9 +1428,7 @@
 			and is_cancelled = 0
 		GROUP BY
 			item_code, warehouse
-		""".format(
-			" or ".join(or_conditions)
-		),
+		""".format(" or ".join(or_conditions)),
 		args,
 		as_dict=1,
 	)
diff --git a/erpnext/controllers/subcontracting_controller.py b/erpnext/controllers/subcontracting_controller.py
index ffc7f91..fc66345 100644
--- a/erpnext/controllers/subcontracting_controller.py
+++ b/erpnext/controllers/subcontracting_controller.py
@@ -21,7 +21,7 @@
 
 class SubcontractingController(StockController):
 	def __init__(self, *args, **kwargs):
-		super(SubcontractingController, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		if self.get("is_old_subcontracting_flow"):
 			self.subcontract_data = frappe._dict(
 				{
@@ -53,7 +53,7 @@
 			self.validate_items()
 			self.create_raw_materials_supplied()
 		else:
-			super(SubcontractingController, self).validate()
+			super().validate()
 
 	def validate_rejected_warehouse(self):
 		for item in self.get("items"):
@@ -108,14 +108,20 @@
 
 					if not is_active:
 						frappe.throw(
-							_("Row {0}: Please select an active BOM for Item {1}.").format(item.idx, item.item_name)
+							_("Row {0}: Please select an active BOM for Item {1}.").format(
+								item.idx, item.item_name
+							)
 						)
 					if bom_item != item.item_code:
 						frappe.throw(
-							_("Row {0}: Please select an valid BOM for Item {1}.").format(item.idx, item.item_name)
+							_("Row {0}: Please select an valid BOM for Item {1}.").format(
+								item.idx, item.item_name
+							)
 						)
 				else:
-					frappe.throw(_("Row {0}: Please select a BOM for Item {1}.").format(item.idx, item.item_name))
+					frappe.throw(
+						_("Row {0}: Please select a BOM for Item {1}.").format(item.idx, item.item_name)
+					)
 			else:
 				item.bom = None
 
@@ -190,7 +196,6 @@
 				fields=["item_code", "(qty - received_qty) as qty", "parent", "name"],
 				filters={"docstatus": 1, "parent": ("in", self.subcontract_orders)},
 			):
-
 				self.qty_to_be_received[(row.item_code, row.parent)] += row.qty
 
 	def __get_transferred_items(self):
@@ -286,9 +291,7 @@
 		if not receipt_items:
 			return ([], {}) if return_consumed_items else None
 
-		receipt_items = {
-			item.name: item.get(self.subcontract_data.order_field) for item in receipt_items
-		}
+		receipt_items = {item.name: item.get(self.subcontract_data.order_field) for item in receipt_items}
 		consumed_materials = self.__get_consumed_items(doctype, receipt_items.keys())
 
 		voucher_nos = [d.voucher_no for d in consumed_materials if d.voucher_no]
@@ -459,9 +462,7 @@
 			[doctype, "sourced_by_supplier", "=", 0],
 		]
 
-		return (
-			frappe.get_all("BOM", fields=fields, filters=filters, order_by=f"`tab{doctype}`.`idx`") or []
-		)
+		return frappe.get_all("BOM", fields=fields, filters=filters, order_by=f"`tab{doctype}`.`idx`") or []
 
 	def __update_reserve_warehouse(self, row, item):
 		if self.doctype == self.subcontract_data.order_doctype:
@@ -476,9 +477,7 @@
 		if not self.available_materials.get(key):
 			return
 
-		if (
-			not self.available_materials[key]["serial_no"] and not self.available_materials[key]["batch_no"]
-		):
+		if not self.available_materials[key]["serial_no"] and not self.available_materials[key]["batch_no"]:
 			return
 
 		serial_nos = []
@@ -761,7 +760,9 @@
 		for row in self.get("supplied_items"):
 			if row.reference_name == name and row.serial_and_batch_bundle:
 				if row.consumed_qty != abs(
-					frappe.get_cached_value("Serial and Batch Bundle", row.serial_and_batch_bundle, "total_qty")
+					frappe.get_cached_value(
+						"Serial and Batch Bundle", row.serial_and_batch_bundle, "total_qty"
+					)
 				):
 					return row
 
@@ -1048,7 +1049,8 @@
 
 				if mr_obj.status in ["Stopped", "Cancelled"]:
 					frappe.throw(
-						_("Material Request {0} is cancelled or stopped").format(mr), frappe.InvalidStatusError
+						_("Material Request {0} is cancelled or stopped").format(mr),
+						frappe.InvalidStatusError,
 					)
 
 				mr_obj.update_requested_qty(mr_item_rows)
@@ -1131,8 +1133,10 @@
 
 			for fg_item_code in fg_item_code_list:
 				for rm_item in rm_items:
-
-					if rm_item.get("main_item_code") == fg_item_code or rm_item.get("item_code") == fg_item_code:
+					if (
+						rm_item.get("main_item_code") == fg_item_code
+						or rm_item.get("item_code") == fg_item_code
+					):
 						rm_item_code = rm_item.get("rm_item_code")
 						items_dict = {
 							rm_item_code: {
@@ -1142,15 +1146,22 @@
 								"description": item_wh.get(rm_item_code, {}).get("description", ""),
 								"qty": rm_item.get("qty")
 								or max(rm_item.get("required_qty") - rm_item.get("total_supplied_qty"), 0),
-								"from_warehouse": rm_item.get("warehouse") or rm_item.get("reserve_warehouse"),
+								"from_warehouse": rm_item.get("warehouse")
+								or rm_item.get("reserve_warehouse"),
 								"to_warehouse": subcontract_order.supplier_warehouse,
 								"stock_uom": rm_item.get("stock_uom"),
 								"serial_and_batch_bundle": rm_item.get("serial_and_batch_bundle"),
 								"main_item_code": fg_item_code,
-								"allow_alternative_item": item_wh.get(rm_item_code, {}).get("allow_alternative_item"),
+								"allow_alternative_item": item_wh.get(rm_item_code, {}).get(
+									"allow_alternative_item"
+								),
 								"use_serial_batch_fields": rm_item.get("use_serial_batch_fields"),
-								"serial_no": rm_item.get("serial_no") if rm_item.get("use_serial_batch_fields") else None,
-								"batch_no": rm_item.get("batch_no") if rm_item.get("use_serial_batch_fields") else None,
+								"serial_no": rm_item.get("serial_no")
+								if rm_item.get("use_serial_batch_fields")
+								else None,
+								"batch_no": rm_item.get("batch_no")
+								if rm_item.get("use_serial_batch_fields")
+								else None,
 							}
 						}
 
@@ -1164,9 +1175,7 @@
 			frappe.throw(_("No Items selected for transfer."))
 
 
-def add_items_in_ste(
-	ste_doc, row, qty, rm_details, rm_detail_field="sco_rm_detail", batch_no=None
-):
+def add_items_in_ste(ste_doc, row, qty, rm_details, rm_detail_field="sco_rm_detail", batch_no=None):
 	item = ste_doc.append("items", row.item_details)
 
 	rm_detail = list(set(row.get(f"{rm_detail_field}s")).intersection(rm_details))
@@ -1211,7 +1220,7 @@
 	ste_doc.company = order_doc.company
 	ste_doc.is_return = 1
 
-	for key, value in available_materials.items():
+	for _key, value in available_materials.items():
 		if not value.qty:
 			continue
 
@@ -1228,9 +1237,7 @@
 
 
 @frappe.whitelist()
-def get_materials_from_supplier(
-	subcontract_order, rm_details, order_doctype="Subcontracting Order"
-):
+def get_materials_from_supplier(subcontract_order, rm_details, order_doctype="Subcontracting Order"):
 	if isinstance(rm_details, str):
 		rm_details = json.loads(rm_details)
 
@@ -1244,6 +1251,4 @@
 			_("Materials are already received against the {0} {1}").format(order_doctype, subcontract_order)
 		)
 
-	return make_return_stock_entry_for_subcontract(
-		doc.available_materials, doc, rm_details, order_doctype
-	)
+	return make_return_stock_entry_for_subcontract(doc.available_materials, doc, rm_details, order_doctype)
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 69d8caa..d90c14a 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -22,7 +22,7 @@
 from erpnext.utilities.regional import temporary_flag
 
 
-class calculate_taxes_and_totals(object):
+class calculate_taxes_and_totals:
 	def __init__(self, doc: Document):
 		self.doc = doc
 		frappe.flags.round_off_applicable_accounts = []
@@ -160,7 +160,8 @@
 				elif item.price_list_rate:
 					if not item.rate or (item.pricing_rules and item.discount_percentage > 0):
 						item.rate = flt(
-							item.price_list_rate * (1.0 - (item.discount_percentage / 100.0)), item.precision("rate")
+							item.price_list_rate * (1.0 - (item.discount_percentage / 100.0)),
+							item.precision("rate"),
 						)
 
 						item.discount_amount = item.price_list_rate * (item.discount_percentage / 100.0)
@@ -181,7 +182,8 @@
 					item.rate_with_margin, item.base_rate_with_margin = self.calculate_margin(item)
 					if flt(item.rate_with_margin) > 0:
 						item.rate = flt(
-							item.rate_with_margin * (1.0 - (item.discount_percentage / 100.0)), item.precision("rate")
+							item.rate_with_margin * (1.0 - (item.discount_percentage / 100.0)),
+							item.precision("rate"),
 						)
 
 						if item.discount_amount and not item.discount_percentage:
@@ -197,7 +199,9 @@
 				item.net_rate = item.rate
 
 				if (
-					not item.qty and self.doc.get("is_return") and self.doc.get("doctype") != "Purchase Receipt"
+					not item.qty
+					and self.doc.get("is_return")
+					and self.doc.get("doctype") != "Purchase Receipt"
 				):
 					item.amount = flt(-1 * item.rate, item.precision("amount"))
 				elif not item.qty and self.doc.get("is_debit_note"):
@@ -283,7 +287,9 @@
 
 				item.net_amount = flt(amount / (1 + cumulated_tax_fraction), item.precision("net_amount"))
 				item.net_rate = flt(item.net_amount / item.qty, item.precision("net_rate"))
-				item.discount_percentage = flt(item.discount_percentage, item.precision("discount_percentage"))
+				item.discount_percentage = flt(
+					item.discount_percentage, item.precision("discount_percentage")
+				)
 
 				self._set_in_company_currency(item, ["net_rate", "net_amount"])
 
@@ -344,7 +350,6 @@
 		self.doc.round_floats_in(self.doc, ["total", "base_total", "net_total", "base_net_total"])
 
 	def calculate_shipping_charges(self):
-
 		# Do not apply shipping rule for POS
 		if self.doc.get("is_pos"):
 			return
@@ -356,9 +361,7 @@
 			self._calculate()
 
 	def calculate_taxes(self):
-		rounding_adjustment_computed = self.doc.get("is_consolidated") and self.doc.get(
-			"rounding_adjustment"
-		)
+		rounding_adjustment_computed = self.doc.get("is_consolidated") and self.doc.get("rounding_adjustment")
 		if not rounding_adjustment_computed:
 			self.doc.rounding_adjustment = 0
 
@@ -398,7 +401,9 @@
 				# set tax after discount
 				tax.tax_amount_after_discount_amount += current_tax_amount
 
-				current_tax_amount = self.get_tax_amount_if_for_valuation_or_deduction(current_tax_amount, tax)
+				current_tax_amount = self.get_tax_amount_if_for_valuation_or_deduction(
+					current_tax_amount, tax
+				)
 
 				# note: grand_total_for_current_item contains the contribution of
 				# item's amount, previously applied tax and the current tax on that item
@@ -462,9 +467,7 @@
 		if tax.charge_type == "Actual":
 			# distribute the tax amount proportionally to each item row
 			actual = flt(tax.tax_amount, tax.precision("tax_amount"))
-			current_tax_amount = (
-				item.net_amount * actual / self.doc.net_total if self.doc.net_total else 0.0
-			)
+			current_tax_amount = item.net_amount * actual / self.doc.net_total if self.doc.net_total else 0.0
 
 		elif tax.charge_type == "On Net Total":
 			current_tax_amount = (tax_rate / 100.0) * item.net_amount
@@ -596,9 +599,7 @@
 				else self.doc.base_net_total
 			)
 
-			self._set_in_company_currency(
-				self.doc, ["taxes_and_charges_added", "taxes_and_charges_deducted"]
-			)
+			self._set_in_company_currency(self.doc, ["taxes_and_charges_added", "taxes_and_charges_deducted"])
 
 		self.doc.round_floats_in(self.doc, ["grand_total", "base_grand_total"])
 
@@ -652,12 +653,11 @@
 				frappe.throw(_("Please select Apply Discount On"))
 
 			self.doc.base_discount_amount = flt(
-				self.doc.discount_amount * self.doc.conversion_rate, self.doc.precision("base_discount_amount")
+				self.doc.discount_amount * self.doc.conversion_rate,
+				self.doc.precision("base_discount_amount"),
 			)
 
-			if self.doc.apply_discount_on == "Grand Total" and self.doc.get(
-				"is_cash_or_non_trade_discount"
-			):
+			if self.doc.apply_discount_on == "Grand Total" and self.doc.get("is_cash_or_non_trade_discount"):
 				self.discount_amount_applied = True
 				return
 
@@ -682,12 +682,17 @@
 						or total_for_discount_amount == self.doc.net_total
 					) and i == len(self._items) - 1:
 						discount_amount_loss = flt(
-							self.doc.net_total - net_total - self.doc.discount_amount, self.doc.precision("net_total")
+							self.doc.net_total - net_total - self.doc.discount_amount,
+							self.doc.precision("net_total"),
 						)
 
-						item.net_amount = flt(item.net_amount + discount_amount_loss, item.precision("net_amount"))
+						item.net_amount = flt(
+							item.net_amount + discount_amount_loss, item.precision("net_amount")
+						)
 
-					item.net_rate = flt(item.net_amount / item.qty, item.precision("net_rate")) if item.qty else 0
+					item.net_rate = (
+						flt(item.net_amount / item.qty, item.precision("net_rate")) if item.qty else 0
+					)
 
 					self._set_in_company_currency(item, ["net_rate", "net_amount"])
 
@@ -942,7 +947,9 @@
 		total_paid_amount = 0
 		for payment in self.doc.get("payments"):
 			total_paid_amount += (
-				payment.amount if self.doc.party_account_currency == self.doc.currency else payment.base_amount
+				payment.amount
+				if self.doc.party_account_currency == self.doc.currency
+				else payment.base_amount
 			)
 
 		pending_amount = total_amount_to_pay - total_paid_amount
@@ -1016,7 +1023,7 @@
 
 @erpnext.allow_regional
 def get_itemised_tax_breakup_header(item_doctype, tax_accounts):
-	return [_("Item"), _("Taxable Amount")] + tax_accounts
+	return [_("Item"), _("Taxable Amount"), *tax_accounts]
 
 
 @erpnext.allow_regional
@@ -1084,7 +1091,7 @@
 				row["tax_amount"] = flt(row["tax_amount"], precision)
 
 
-class init_landed_taxes_and_totals(object):
+class init_landed_taxes_and_totals:
 	def __init__(self, doc):
 		self.doc = doc
 		self.tax_field = "taxes" if self.doc.doctype == "Landed Cost Voucher" else "additional_costs"
diff --git a/erpnext/controllers/tests/test_accounts_controller.py b/erpnext/controllers/tests/test_accounts_controller.py
index 2170628..80799c3 100644
--- a/erpnext/controllers/tests/test_accounts_controller.py
+++ b/erpnext/controllers/tests/test_accounts_controller.py
@@ -1,18 +1,15 @@
 # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-import unittest
 
 import frappe
 from frappe import qb
 from frappe.query_builder.functions import Sum
-from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, flt, getdate, nowdate
+from frappe.tests.utils import FrappeTestCase
+from frappe.utils import add_days, getdate, nowdate
 
-from erpnext import get_default_cost_center
 from erpnext.accounts.doctype.payment_entry.payment_entry import get_payment_entry
 from erpnext.accounts.doctype.payment_entry.test_payment_entry import create_payment_entry
-from erpnext.accounts.doctype.purchase_invoice.test_purchase_invoice import make_purchase_invoice
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.accounts.party import get_party_account
 from erpnext.stock.doctype.item.test_item import create_item
@@ -142,13 +139,16 @@
 		qty=1,
 		rate=1,
 		conversion_rate=80,
-		posting_date=nowdate(),
+		posting_date=None,
 		do_not_save=False,
 		do_not_submit=False,
 	):
 		"""
 		Helper function to populate default values in sales invoice
 		"""
+		if posting_date is None:
+			posting_date = nowdate()
+
 		sinv = create_sales_invoice(
 			qty=qty,
 			rate=rate,
@@ -173,12 +173,13 @@
 		)
 		return sinv
 
-	def create_payment_entry(
-		self, amount=1, source_exc_rate=75, posting_date=nowdate(), customer=None
-	):
+	def create_payment_entry(self, amount=1, source_exc_rate=75, posting_date=None, customer=None):
 		"""
 		Helper function to populate default values in payment entry
 		"""
+		if posting_date is None:
+			posting_date = nowdate()
+
 		payment = create_payment_entry(
 			company=self.company,
 			payment_type="Receive",
@@ -293,9 +294,7 @@
 			.run(as_dict=True)[0]
 		)
 		self.assertEqual(outstanding, current_outstanding.outstanding)
-		self.assertEqual(
-			outstanding_in_account_currency, current_outstanding.outstanding_in_account_currency
-		)
+		self.assertEqual(outstanding_in_account_currency, current_outstanding.outstanding_in_account_currency)
 
 	def test_10_payment_against_sales_invoice(self):
 		# Sales Invoice in Foreign Currency
@@ -401,7 +400,6 @@
 		adv.reload()
 
 		# sales invoice with advance(partial amount)
-		rate = 80
 		rate_in_account_currency = 1
 		si = self.create_sales_invoice(
 			qty=2, conversion_rate=80, rate=rate_in_account_currency, do_not_submit=True
@@ -788,7 +786,9 @@
 				self.assert_ledger_outstanding(si.doctype, si.name, 0.0, 0.0)
 
 				# Exchange Gain/Loss Journal should've been created.
-				exc_je_for_si = [x for x in self.get_journals_for(si.doctype, si.name) if x.parent != adv.name]
+				exc_je_for_si = [
+					x for x in self.get_journals_for(si.doctype, si.name) if x.parent != adv.name
+				]
 				exc_je_for_adv = self.get_journals_for(adv.doctype, adv.name)
 				self.assertNotEqual(exc_je_for_si, [])
 				self.assertEqual(len(exc_je_for_si), 1)
@@ -1253,7 +1253,9 @@
 			with self.subTest(x=x):
 				self.assertEqual(
 					[self.cost_center, self.cost_center],
-					frappe.db.get_all("Journal Entry Account", filters={"parent": x.parent}, pluck="cost_center"),
+					frappe.db.get_all(
+						"Journal Entry Account", filters={"parent": x.parent}, pluck="cost_center"
+					),
 				)
 
 		frappe.db.set_value("Company", self.company, "cost_center", cc)
@@ -1382,13 +1384,14 @@
 			with self.subTest(x=x):
 				self.assertEqual(
 					[cr_note.department, cr_note.department],
-					frappe.db.get_all("Journal Entry Account", filters={"parent": x.parent}, pluck="department"),
+					frappe.db.get_all(
+						"Journal Entry Account", filters={"parent": x.parent}, pluck="department"
+					),
 				)
 
 	def test_92_dimension_inhertiance_exc_gain_loss(self):
 		# Sales Invoice in Foreign Currency
 		self.setup_dimensions()
-		rate = 80
 		rate_in_account_currency = 1
 		dpt = "Research & Development"
 
diff --git a/erpnext/controllers/tests/test_mapper.py b/erpnext/controllers/tests/test_mapper.py
index 919bcda..9dbcf6c 100644
--- a/erpnext/controllers/tests/test_mapper.py
+++ b/erpnext/controllers/tests/test_mapper.py
@@ -29,7 +29,6 @@
 		self.assertEqual(set(d for d in src_items), set(d.item_code for d in updated_so.items))
 
 	def make_quotation(self, item_list, customer):
-
 		qtn = frappe.get_doc(
 			{
 				"doctype": "Quotation",
diff --git a/erpnext/controllers/tests/test_qty_based_taxes.py b/erpnext/controllers/tests/test_qty_based_taxes.py
index 2e9dfd2..e7896b5 100644
--- a/erpnext/controllers/tests/test_qty_based_taxes.py
+++ b/erpnext/controllers/tests/test_qty_based_taxes.py
@@ -25,7 +25,7 @@
 				"account_name": uuid4(),
 				"account_type": "Tax",
 				"company": self.company.name,
-				"parent_account": "Duties and Taxes - {self.company.abbr}".format(self=self),
+				"parent_account": f"Duties and Taxes - {self.company.abbr}",
 			}
 		).insert()
 		self.item_group = frappe.get_doc(
diff --git a/erpnext/controllers/tests/test_queries.py b/erpnext/controllers/tests/test_queries.py
index c536d1c..0ef108e 100644
--- a/erpnext/controllers/tests/test_queries.py
+++ b/erpnext/controllers/tests/test_queries.py
@@ -7,13 +7,10 @@
 
 
 def add_default_params(func, doctype):
-	return partial(
-		func, doctype=doctype, txt="", searchfield="name", start=0, page_len=20, filters=None
-	)
+	return partial(func, doctype=doctype, txt="", searchfield="name", start=0, page_len=20, filters=None)
 
 
 class TestQueries(unittest.TestCase):
-
 	# All tests are based on doctype/test_records.json
 
 	def assert_nested_in(self, item, container):
diff --git a/erpnext/controllers/tests/test_subcontracting_controller.py b/erpnext/controllers/tests/test_subcontracting_controller.py
index 7374e1e..dfd4351 100644
--- a/erpnext/controllers/tests/test_subcontracting_controller.py
+++ b/erpnext/controllers/tests/test_subcontracting_controller.py
@@ -16,8 +16,6 @@
 from erpnext.manufacturing.doctype.production_plan.test_production_plan import make_bom
 from erpnext.stock.doctype.item.test_item import make_item
 from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
-	get_batch_from_bundle,
-	get_serial_nos_from_bundle,
 	make_serial_batch_bundle,
 )
 from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
@@ -351,7 +349,6 @@
 		- Create the 3 SCR against the SCO and split Subcontracted Items into two batches.
 		- Keep the qty as 2 for Subcontracted Item in the SCR.
 		"""
-		from erpnext.stock.serial_batch_bundle import get_batch_nos
 
 		set_backflush_based_on("BOM")
 		service_items = [
@@ -434,7 +431,7 @@
 		scr1.set_missing_values()
 		scr1.submit()
 
-		for key, value in get_supplied_items(scr1).items():
+		for _key, value in get_supplied_items(scr1).items():
 			self.assertEqual(value.qty, 4)
 
 		frappe.flags.add_debugger = True
@@ -446,7 +443,7 @@
 		scr2.set_missing_values()
 		scr2.submit()
 
-		for key, value in get_supplied_items(scr2).items():
+		for _key, value in get_supplied_items(scr2).items():
 			self.assertEqual(value.qty, 4)
 
 		scr3 = make_subcontracting_receipt(sco.name)
@@ -456,7 +453,7 @@
 		scr3.set_missing_values()
 		scr3.submit()
 
-		for key, value in get_supplied_items(scr3).items():
+		for _key, value in get_supplied_items(scr3).items():
 			self.assertEqual(value.qty, 2)
 
 	def test_item_with_batch_based_on_material_transfer(self):
@@ -563,7 +560,7 @@
 		scr2.set_missing_values()
 		scr2.submit()
 
-		for key, value in get_supplied_items(scr2).items():
+		for value in get_supplied_items(scr2).values():
 			self.assertEqual(value.qty, 4)
 
 		scr3 = make_subcontracting_receipt(sco.name)
@@ -573,7 +570,7 @@
 		scr3.set_missing_values()
 		scr3.submit()
 
-		for key, value in get_supplied_items(scr3).items():
+		for value in get_supplied_items(scr3).values():
 			self.assertEqual(value.qty, 1)
 
 	def test_partial_transfer_serial_no_components_based_on_material_transfer(self):
@@ -700,9 +697,7 @@
 
 		scr1 = make_subcontracting_receipt(sco.name)
 		scr1.save()
-		bundle = frappe.get_doc(
-			"Serial and Batch Bundle", scr1.supplied_items[0].serial_and_batch_bundle
-		)
+		bundle = frappe.get_doc("Serial and Batch Bundle", scr1.supplied_items[0].serial_and_batch_bundle)
 		original_serial_no = ""
 		for row in bundle.entries:
 			if row.idx == 1:
@@ -773,7 +768,6 @@
 		scr1.items[0].qty = 5
 		scr1.save()
 
-		transferred_batch_no = ""
 		for key, value in get_supplied_items(scr1).items():
 			details = itemwise_details.get(key)
 			self.assertEqual(value.qty, 3)
@@ -1139,9 +1133,7 @@
 
 def update_item_details(child_row, details):
 	details.qty += (
-		child_row.get("qty")
-		if child_row.doctype == "Stock Entry Detail"
-		else child_row.get("consumed_qty")
+		child_row.get("qty") if child_row.doctype == "Stock Entry Detail" else child_row.get("consumed_qty")
 	)
 
 	details.use_serial_batch_fields = child_row.get("use_serial_batch_fields")
@@ -1152,7 +1144,9 @@
 				details.serial_no.append(row.serial_no)
 
 			if row.batch_no:
-				details.batch_no[row.batch_no] += row.qty * (-1 if doc.type_of_transaction == "Outward" else 1)
+				details.batch_no[row.batch_no] += row.qty * (
+					-1 if doc.type_of_transaction == "Outward" else 1
+				)
 	else:
 		if child_row.serial_no:
 			details.serial_no.extend(get_serial_nos(child_row.serial_no))
@@ -1268,7 +1262,9 @@
 			make_item(item, properties)
 
 
-def make_service_item(item, properties={}):
+def make_service_item(item, properties=None):
+	if properties is None:
+		properties = {}
 	if not frappe.db.exists("Item", item):
 		properties.update({"is_stock_item": 0})
 		make_item(item, properties)
@@ -1316,9 +1312,7 @@
 
 
 def set_backflush_based_on(based_on):
-	frappe.db.set_single_value(
-		"Buying Settings", "backflush_raw_materials_of_subcontract_based_on", based_on
-	)
+	frappe.db.set_single_value("Buying Settings", "backflush_raw_materials_of_subcontract_based_on", based_on)
 
 
 def get_subcontracting_order(**args):
diff --git a/erpnext/controllers/tests/test_transaction_base.py b/erpnext/controllers/tests/test_transaction_base.py
index 1471543..ab5525a 100644
--- a/erpnext/controllers/tests/test_transaction_base.py
+++ b/erpnext/controllers/tests/test_transaction_base.py
@@ -44,7 +44,10 @@
 					item_code="_Test Item", qty=1, basic_rate=200, s_warehouse="_Test Warehouse - _TC"
 				),
 				frappe._dict(
-					item_code="_Test FG Item", qty=4, t_warehouse="_Test Warehouse 1 - _TC", is_finished_item=1
+					item_code="_Test FG Item",
+					qty=4,
+					t_warehouse="_Test Warehouse 1 - _TC",
+					is_finished_item=1,
 				),
 			],
 		)
diff --git a/erpnext/controllers/trends.py b/erpnext/controllers/trends.py
index 1fb722e..18fe776 100644
--- a/erpnext/controllers/trends.py
+++ b/erpnext/controllers/trends.py
@@ -100,12 +100,11 @@
 		else:
 			inc = 1
 		data1 = frappe.db.sql(
-			""" select %s from `tab%s` t1, `tab%s Item` t2 %s
-					where t2.parent = t1.name and t1.company = %s and %s between %s and %s and
-					t1.docstatus = 1 %s %s
-					group by %s
-				"""
-			% (
+			""" select {} from `tab{}` t1, `tab{} Item` t2 {}
+					where t2.parent = t1.name and t1.company = {} and {} between {} and {} and
+					t1.docstatus = 1 {} {}
+					group by {}
+				""".format(
 				query_details,
 				conditions["trans"],
 				conditions["trans"],
@@ -130,11 +129,10 @@
 
 			# to get distinct value of col specified by group_by in filter
 			row = frappe.db.sql(
-				"""select DISTINCT(%s) from `tab%s` t1, `tab%s Item` t2 %s
-						where t2.parent = t1.name and t1.company = %s and %s between %s and %s
-						and t1.docstatus = 1 and %s = %s %s %s
-					"""
-				% (
+				"""select DISTINCT({}) from `tab{}` t1, `tab{} Item` t2 {}
+						where t2.parent = t1.name and t1.company = {} and {} between {} and {}
+						and t1.docstatus = 1 and {} = {} {} {}
+					""".format(
 					sel_col,
 					conditions["trans"],
 					conditions["trans"],
@@ -157,11 +155,10 @@
 
 				# get data for group_by filter
 				row1 = frappe.db.sql(
-					""" select %s , %s from `tab%s` t1, `tab%s Item` t2 %s
-							where t2.parent = t1.name and t1.company = %s and %s between %s and %s
-							and t1.docstatus = 1 and %s = %s and %s = %s %s %s
-						"""
-					% (
+					""" select {} , {} from `tab{}` t1, `tab{} Item` t2 {}
+							where t2.parent = t1.name and t1.company = {} and {} between {} and {}
+							and t1.docstatus = 1 and {} = {} and {} = {} {} {}
+						""".format(
 						sel_col,
 						conditions["period_wise_select"],
 						conditions["trans"],
@@ -190,12 +187,11 @@
 				data.append(des)
 	else:
 		data = frappe.db.sql(
-			""" select %s from `tab%s` t1, `tab%s Item` t2 %s
-					where t2.parent = t1.name and t1.company = %s and %s between %s and %s and
-					t1.docstatus = 1 %s %s
-					group by %s
-				"""
-			% (
+			""" select {} from `tab{}` t1, `tab{} Item` t2 {}
+					where t2.parent = t1.name and t1.company = {} and {} between {} and {} and
+					t1.docstatus = 1 {} {}
+					group by {}
+				""".format(
 				query_details,
 				conditions["trans"],
 				conditions["trans"],
@@ -260,13 +256,13 @@
 
 
 def get_period_wise_query(bet_dates, trans_date, query_details):
-	query_details += """SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.stock_qty, NULL)),
-					SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.base_net_amount, NULL)),
-				""" % {
-		"trans_date": trans_date,
-		"sd": bet_dates[0],
-		"ed": bet_dates[1],
-	}
+	query_details += """SUM(IF(t1.{trans_date} BETWEEN '{sd}' AND '{ed}', t2.stock_qty, NULL)),
+					SUM(IF(t1.{trans_date} BETWEEN '{sd}' AND '{ed}', t2.base_net_amount, NULL)),
+				""".format(
+		trans_date=trans_date,
+		sd=bet_dates[0],
+		ed=bet_dates[1],
+	)
 	return query_details
 
 
@@ -282,7 +278,7 @@
 	increment = {"Monthly": 1, "Quarterly": 3, "Half-Yearly": 6, "Yearly": 12}.get(period)
 
 	period_date_ranges = []
-	for i in range(1, 13, increment):
+	for _i in range(1, 13, increment):
 		period_end_date = getdate(year_start_date) + relativedelta(months=increment, days=-1)
 		if period_end_date > getdate(year_end_date):
 			period_end_date = year_end_date
@@ -331,9 +327,7 @@
 			"Territory:Link/Territory:120",
 		]
 		based_on_details["based_on_select"] = "t1.customer_name, t1.territory, "
-		based_on_details["based_on_group_by"] = (
-			"t1.party_name" if trans == "Quotation" else "t1.customer"
-		)
+		based_on_details["based_on_group_by"] = "t1.party_name" if trans == "Quotation" else "t1.customer"
 		based_on_details["addl_tables"] = ""
 
 	elif based_on == "Customer Group":
diff --git a/erpnext/controllers/website_list_for_contact.py b/erpnext/controllers/website_list_for_contact.py
index 01b6f5c..f5cbf67 100644
--- a/erpnext/controllers/website_list_for_contact.py
+++ b/erpnext/controllers/website_list_for_contact.py
@@ -35,7 +35,7 @@
 
 
 def get_webform_transaction_list(
-	doctype, txt=None, filters=None, limit_start=0, limit_page_length=20, order_by="modified"
+	doctype, txt=None, filters=None, limit_start=0, limit_page_length=20, order_by="creation"
 ):
 	"""Get List of transactions for custom doctypes"""
 	from frappe.www.list import get_list
@@ -59,7 +59,7 @@
 		limit_page_length,
 		ignore_permissions=False,
 		fields=None,
-		order_by="modified",
+		order_by="creation",
 	)
 
 
@@ -69,7 +69,7 @@
 	filters=None,
 	limit_start=0,
 	limit_page_length=20,
-	order_by="modified",
+	order_by="creation",
 	custom=False,
 ):
 	user = frappe.session.user
@@ -81,9 +81,7 @@
 	filters["docstatus"] = ["<", "2"] if doctype in ["Supplier Quotation", "Purchase Invoice"] else 1
 
 	if (user != "Guest" and is_website_user()) or doctype == "Request for Quotation":
-		parties_doctype = (
-			"Request for Quotation Supplier" if doctype == "Request for Quotation" else doctype
-		)
+		parties_doctype = "Request for Quotation Supplier" if doctype == "Request for Quotation" else doctype
 		# find party for this contact
 		customers, suppliers = get_customers_suppliers(parties_doctype, user)
 
@@ -117,7 +115,7 @@
 		limit_page_length,
 		fields="name",
 		ignore_permissions=ignore_permissions,
-		order_by="modified desc",
+		order_by="creation desc",
 	)
 
 	if custom:
@@ -151,7 +149,7 @@
 		limit_start=limit_start,
 		limit_page_length=limit_page_length,
 		ignore_permissions=ignore_permissions,
-		order_by="modified desc",
+		order_by="creation desc",
 	):
 		data.append(d)
 
@@ -182,7 +180,7 @@
 def rfq_transaction_list(parties_doctype, doctype, parties, limit_start, limit_page_length):
 	data = frappe.db.sql(
 		"""select distinct parent as name, supplier from `tab{doctype}`
-			where supplier = '{supplier}' and docstatus=1  order by modified desc limit {start}, {len}""".format(
+			where supplier = '{supplier}' and docstatus=1  order by creation desc limit {start}, {len}""".format(
 			doctype=parties_doctype, supplier=parties[0], start=limit_start, len=limit_page_length
 		),
 		as_dict=1,
@@ -303,6 +301,4 @@
 		return
 
 	user_doc.add_roles(role)
-	frappe.msgprint(
-		_("Added {1} Role to User {0}.").format(frappe.bold(user_doc.name), role), alert=True
-	)
+	frappe.msgprint(_("Added {1} Role to User {0}.").format(frappe.bold(user_doc.name), role), alert=True)
diff --git a/erpnext/crm/doctype/appointment/appointment.json b/erpnext/crm/doctype/appointment/appointment.json
index c26b064..48dd49e 100644
--- a/erpnext/crm/doctype/appointment/appointment.json
+++ b/erpnext/crm/doctype/appointment/appointment.json
@@ -102,11 +102,10 @@
   }
  ],
  "links": [],
- "modified": "2022-12-15 11:11:02.131986",
+ "modified": "2024-03-27 13:05:59.300573",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Appointment",
- "name_case": "UPPER CASE",
  "owner": "Administrator",
  "permissions": [
   {
@@ -158,7 +157,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/crm/doctype/appointment/appointment.py b/erpnext/crm/doctype/appointment/appointment.py
index 541f77b..b41064c 100644
--- a/erpnext/crm/doctype/appointment/appointment.py
+++ b/erpnext/crm/doctype/appointment/appointment.py
@@ -198,7 +198,9 @@
 				"starts_on": self.scheduled_time,
 				"status": "Open",
 				"type": "Public",
-				"send_reminder": frappe.db.get_single_value("Appointment Booking Settings", "email_reminders"),
+				"send_reminder": frappe.db.get_single_value(
+					"Appointment Booking Settings", "email_reminders"
+				),
 				"event_participants": [
 					dict(reference_doctype=self.appointment_with, reference_docname=self.party)
 				],
@@ -251,9 +253,7 @@
 
 
 def _check_agent_availability(agent_email, scheduled_time):
-	appointemnts_at_scheduled_time = frappe.get_all(
-		"Appointment", filters={"scheduled_time": scheduled_time}
-	)
+	appointemnts_at_scheduled_time = frappe.get_all("Appointment", filters={"scheduled_time": scheduled_time})
 	for appointment in appointemnts_at_scheduled_time:
 		if appointment._assign == agent_email:
 			return False
diff --git a/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json b/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json
index 436eb10..20c6b9f 100644
--- a/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json
+++ b/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.json
@@ -103,7 +103,7 @@
  ],
  "issingle": 1,
  "links": [],
- "modified": "2022-12-15 11:10:13.517742",
+ "modified": "2024-03-27 13:05:59.465023",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Appointment Booking Settings",
@@ -140,7 +140,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py b/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py
index 77e8727..9997f97 100644
--- a/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py
+++ b/erpnext/crm/doctype/appointment_booking_settings/appointment_booking_settings.py
@@ -3,6 +3,7 @@
 
 
 import datetime
+import typing
 
 import frappe
 from frappe import _
@@ -36,7 +37,7 @@
 		success_redirect_url: DF.Data | None
 	# end: auto-generated types
 
-	agent_list = []  # Hack
+	agent_list: typing.ClassVar[list] = []  # Hack
 	min_date = "01/01/1970 "
 	format_string = "%d/%m/%Y %H:%M:%S"
 
@@ -45,13 +46,13 @@
 
 	def save(self):
 		self.number_of_agents = len(self.agent_list)
-		super(AppointmentBookingSettings, self).save()
+		super().save()
 
 	def validate_availability_of_slots(self):
 		for record in self.availability_of_slots:
 			from_time = datetime.datetime.strptime(self.min_date + record.from_time, self.format_string)
 			to_time = datetime.datetime.strptime(self.min_date + record.to_time, self.format_string)
-			timedelta = to_time - from_time
+			to_time - from_time
 			self.validate_from_and_to_time(from_time, to_time, record)
 			self.duration_is_divisible(from_time, to_time)
 
@@ -65,6 +66,4 @@
 	def duration_is_divisible(self, from_time, to_time):
 		timedelta = to_time - from_time
 		if timedelta.total_seconds() % (self.appointment_duration * 60):
-			frappe.throw(
-				_("The difference between from time and To Time must be a multiple of Appointment")
-			)
+			frappe.throw(_("The difference between from time and To Time must be a multiple of Appointment"))
diff --git a/erpnext/crm/doctype/appointment_booking_slots/appointment_booking_slots.json b/erpnext/crm/doctype/appointment_booking_slots/appointment_booking_slots.json
index ddf8738..a259125 100644
--- a/erpnext/crm/doctype/appointment_booking_slots/appointment_booking_slots.json
+++ b/erpnext/crm/doctype/appointment_booking_slots/appointment_booking_slots.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-11-19 10:49:49.494927",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -33,14 +34,16 @@
   }
  ],
  "istable": 1,
- "modified": "2019-11-19 10:49:49.494927",
+ "links": [],
+ "modified": "2024-03-27 13:05:59.620479",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Appointment Booking Slots",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/appointment_booking_slots/appointment_booking_slots.py b/erpnext/crm/doctype/appointment_booking_slots/appointment_booking_slots.py
index ee936dd..ae640e6 100644
--- a/erpnext/crm/doctype/appointment_booking_slots/appointment_booking_slots.py
+++ b/erpnext/crm/doctype/appointment_booking_slots/appointment_booking_slots.py
@@ -15,9 +15,7 @@
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		day_of_week: DF.Literal[
-			"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
-		]
+		day_of_week: DF.Literal["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
 		from_time: DF.Time
 		parent: DF.Data
 		parentfield: DF.Data
diff --git a/erpnext/crm/doctype/availability_of_slots/availability_of_slots.json b/erpnext/crm/doctype/availability_of_slots/availability_of_slots.json
index b54af8d..2524240 100644
--- a/erpnext/crm/doctype/availability_of_slots/availability_of_slots.json
+++ b/erpnext/crm/doctype/availability_of_slots/availability_of_slots.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-09-10 15:02:05.779434",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -33,14 +34,16 @@
   }
  ],
  "istable": 1,
- "modified": "2019-09-10 15:05:20.406855",
+ "links": [],
+ "modified": "2024-03-27 13:06:36.777002",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Availability Of Slots",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/availability_of_slots/availability_of_slots.py b/erpnext/crm/doctype/availability_of_slots/availability_of_slots.py
index 67b6fde..95198e2 100644
--- a/erpnext/crm/doctype/availability_of_slots/availability_of_slots.py
+++ b/erpnext/crm/doctype/availability_of_slots/availability_of_slots.py
@@ -15,9 +15,7 @@
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		day_of_week: DF.Literal[
-			"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"
-		]
+		day_of_week: DF.Literal["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
 		from_time: DF.Time
 		parent: DF.Data
 		parentfield: DF.Data
diff --git a/erpnext/crm/doctype/campaign/campaign.json b/erpnext/crm/doctype/campaign/campaign.json
index f833f4c..79fee3b 100644
--- a/erpnext/crm/doctype/campaign/campaign.json
+++ b/erpnext/crm/doctype/campaign/campaign.json
@@ -67,7 +67,7 @@
  "icon": "fa fa-bullhorn",
  "idx": 1,
  "links": [],
- "modified": "2021-06-30 18:05:06.412712",
+ "modified": "2024-03-27 13:06:43.861206",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Campaign",
@@ -83,7 +83,6 @@
    "read": 1,
    "report": 1,
    "role": "Sales Manager",
-   "set_user_permissions": 1,
    "write": 1
   },
   {
@@ -106,6 +105,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/campaign_email_schedule/campaign_email_schedule.json b/erpnext/crm/doctype/campaign_email_schedule/campaign_email_schedule.json
index 1481a32..a87d1b9 100644
--- a/erpnext/crm/doctype/campaign_email_schedule/campaign_email_schedule.json
+++ b/erpnext/crm/doctype/campaign_email_schedule/campaign_email_schedule.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-06-30 15:56:20.306901",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -25,14 +26,16 @@
   }
  ],
  "istable": 1,
- "modified": "2019-07-12 11:46:43.184123",
+ "links": [],
+ "modified": "2024-03-27 13:06:44.019192",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Campaign Email Schedule",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/competitor/competitor.json b/erpnext/crm/doctype/competitor/competitor.json
index fd6da23..b473e25 100644
--- a/erpnext/crm/doctype/competitor/competitor.json
+++ b/erpnext/crm/doctype/competitor/competitor.json
@@ -38,7 +38,7 @@
    "table_fieldname": "competitors"
   }
  ],
- "modified": "2023-11-23 19:33:54.284279",
+ "modified": "2024-03-27 13:06:45.911065",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Competitor",
@@ -70,7 +70,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/crm/doctype/competitor_detail/competitor_detail.json b/erpnext/crm/doctype/competitor_detail/competitor_detail.json
index 9512b22..50d18d9 100644
--- a/erpnext/crm/doctype/competitor_detail/competitor_detail.json
+++ b/erpnext/crm/doctype/competitor_detail/competitor_detail.json
@@ -21,13 +21,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-10-21 10:34:58.841689",
+ "modified": "2024-03-27 13:06:46.068798",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Competitor Detail",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/contract/contract.json b/erpnext/crm/doctype/contract/contract.json
index de3230f..2dc62d8 100755
--- a/erpnext/crm/doctype/contract/contract.json
+++ b/erpnext/crm/doctype/contract/contract.json
@@ -248,7 +248,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2020-12-07 11:15:58.385521",
+ "modified": "2024-03-27 13:06:46.177457",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Contract",
@@ -316,8 +316,9 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1,
  "track_seen": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/contract/contract.py b/erpnext/crm/doctype/contract/contract.py
index 6f9dcde..6c3aace 100644
--- a/erpnext/crm/doctype/contract/contract.py
+++ b/erpnext/crm/doctype/contract/contract.py
@@ -49,12 +49,12 @@
 		name = self.party_name
 
 		if self.contract_template:
-			name += " - {} Agreement".format(self.contract_template)
+			name += f" - {self.contract_template} Agreement"
 
 		# If identical, append contract name with the next number in the iteration
 		if frappe.db.exists("Contract", name):
-			count = len(frappe.get_all("Contract", filters={"name": ["like", "%{}%".format(name)]}))
-			name = "{} - {}".format(name, count)
+			count = len(frappe.get_all("Contract", filters={"name": ["like", f"%{name}%"]}))
+			name = f"{name} - {count}"
 
 		self.name = _(name)
 
diff --git a/erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json b/erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
index 4a22dce..314988f 100644
--- a/erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
+++ b/erpnext/crm/doctype/contract_fulfilment_checklist/contract_fulfilment_checklist.json
@@ -1,219 +1,69 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-04-16 06:51:33.320037", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-04-16 06:51:33.320037",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "fulfilled",
+  "cb_notes",
+  "requirement",
+  "sb_notes",
+  "notes",
+  "amended_from"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fulfilled", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Fulfilled", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "allow_on_submit": 1,
+   "default": "0",
+   "fieldname": "fulfilled",
+   "fieldtype": "Check",
+   "in_list_view": 1,
+   "label": "Fulfilled"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb_notes", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "cb_notes",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "requirement", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Requirement", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "requirement",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Requirement"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sb_notes", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "sb_notes",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 1, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "notes", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Notes", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "allow_on_submit": 1,
+   "fieldname": "notes",
+   "fieldtype": "Text",
+   "in_list_view": 1,
+   "label": "Notes"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "amended_from", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Amended From", 
-   "length": 0, 
-   "no_copy": 1, 
-   "options": "Contract Fulfilment Checklist", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "amended_from",
+   "fieldtype": "Link",
+   "label": "Amended From",
+   "no_copy": 1,
+   "options": "Contract Fulfilment Checklist",
+   "print_hide": 1,
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 1, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-04-16 08:27:25.156332", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Contract Fulfilment Checklist", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "is_submittable": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:46.377767",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Contract Fulfilment Checklist",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/contract_template/contract_template.json b/erpnext/crm/doctype/contract_template/contract_template.json
index 7cc5ec1..223464d 100644
--- a/erpnext/crm/doctype/contract_template/contract_template.json
+++ b/erpnext/crm/doctype/contract_template/contract_template.json
@@ -56,7 +56,7 @@
   }
  ],
  "links": [],
- "modified": "2020-12-07 10:44:22.587047",
+ "modified": "2024-03-27 13:06:46.495091",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Contract Template",
@@ -111,7 +111,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/contract_template_fulfilment_terms/contract_template_fulfilment_terms.json b/erpnext/crm/doctype/contract_template_fulfilment_terms/contract_template_fulfilment_terms.json
index a84dfee..721fd13 100644
--- a/erpnext/crm/doctype/contract_template_fulfilment_terms/contract_template_fulfilment_terms.json
+++ b/erpnext/crm/doctype/contract_template_fulfilment_terms/contract_template_fulfilment_terms.json
@@ -1,71 +1,30 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-04-16 06:46:48.636936", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-04-16 06:46:48.636936",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "requirement"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "requirement", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Requirement", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "requirement",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Requirement"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-04-16 07:17:38.060049", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Contract Template Fulfilment Terms", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:46.655043",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Contract Template Fulfilment Terms",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/crm_note/crm_note.json b/erpnext/crm/doctype/crm_note/crm_note.json
index fc2a4d1..7bab71c 100644
--- a/erpnext/crm/doctype/crm_note/crm_note.json
+++ b/erpnext/crm/doctype/crm_note/crm_note.json
@@ -35,14 +35,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-06-04 16:29:07.807252",
+ "modified": "2024-03-27 13:06:47.394005",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "CRM Note",
  "naming_rule": "Autoincrement",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/crm_settings/crm_settings.json b/erpnext/crm/doctype/crm_settings/crm_settings.json
index 26a07d2..07b1077 100644
--- a/erpnext/crm/doctype/crm_settings/crm_settings.json
+++ b/erpnext/crm/doctype/crm_settings/crm_settings.json
@@ -91,7 +91,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2022-06-06 11:22:08.464253",
+ "modified": "2024-03-27 13:06:47.508534",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "CRM Settings",
@@ -127,7 +127,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/crm/doctype/email_campaign/email_campaign.json b/erpnext/crm/doctype/email_campaign/email_campaign.json
index 0340364..d0e2ac8 100644
--- a/erpnext/crm/doctype/email_campaign/email_campaign.json
+++ b/erpnext/crm/doctype/email_campaign/email_campaign.json
@@ -72,7 +72,7 @@
   }
  ],
  "links": [],
- "modified": "2020-07-15 12:43:25.548682",
+ "modified": "2024-03-27 13:09:36.177528",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Email Campaign",
@@ -92,7 +92,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index 92f446d..84f6903 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -516,7 +516,7 @@
  "idx": 5,
  "image_field": "image",
  "links": [],
- "modified": "2023-12-01 18:46:49.468526",
+ "modified": "2024-03-27 13:09:59.818450",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Lead",
@@ -579,7 +579,7 @@
  "sender_field": "email_id",
  "sender_name_field": "lead_name",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "subject_field": "title",
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index f3c7e57..c65fbf9 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -61,9 +61,7 @@
 		qualification_status: DF.Literal["Unqualified", "In Process", "Qualified"]
 		qualified_by: DF.Link | None
 		qualified_on: DF.Date | None
-		request_type: DF.Literal[
-			"", "Product Enquiry", "Request for Information", "Suggestions", "Other"
-		]
+		request_type: DF.Literal["", "Product Enquiry", "Request for Information", "Suggestions", "Other"]
 		salutation: DF.Link | None
 		source: DF.Link | None
 		state: DF.Data | None
@@ -187,9 +185,7 @@
 			self.contact_doc.save()
 
 	def update_prospect(self):
-		lead_row_name = frappe.db.get_value(
-			"Prospect Lead", filters={"lead": self.name}, fieldname="name"
-		)
+		lead_row_name = frappe.db.get_value("Prospect Lead", filters={"lead": self.name}, fieldname="name")
 		if lead_row_name:
 			lead_row = frappe.get_doc("Prospect Lead", lead_row_name)
 			lead_row.update(
@@ -239,9 +235,7 @@
 		)
 
 	def has_lost_quotation(self):
-		return frappe.db.get_value(
-			"Quotation", {"party_name": self.name, "docstatus": 1, "status": "Lost"}
-		)
+		return frappe.db.get_value("Quotation", {"party_name": self.name, "docstatus": 1, "status": "Lost"})
 
 	@frappe.whitelist()
 	def create_prospect_and_contact(self, data):
@@ -520,9 +514,9 @@
 	leads = frappe.get_all(
 		"Lead",
 		or_filters={
-			"phone": ["like", "%{}".format(number)],
-			"whatsapp_no": ["like", "%{}".format(number)],
-			"mobile_no": ["like", "%{}".format(number)],
+			"phone": ["like", f"%{number}"],
+			"whatsapp_no": ["like", f"%{number}"],
+			"mobile_no": ["like", f"%{number}"],
 		},
 		limit=1,
 		order_by="creation DESC",
@@ -549,9 +543,7 @@
 	link_open_events("Lead", lead, prospect)
 
 	frappe.msgprint(
-		_("Lead {0} has been added to prospect {1}.").format(
-			frappe.bold(lead), frappe.bold(prospect.name)
-		),
+		_("Lead {0} has been added to prospect {1}.").format(frappe.bold(lead), frappe.bold(prospect.name)),
 		title=_("Lead -> Prospect"),
 		indicator="green",
 	)
diff --git a/erpnext/crm/doctype/lead/test_lead.py b/erpnext/crm/doctype/lead/test_lead.py
index 8fe688d..bab9947 100644
--- a/erpnext/crm/doctype/lead/test_lead.py
+++ b/erpnext/crm/doctype/lead/test_lead.py
@@ -134,9 +134,7 @@
 		self.assertEqual(event.event_participants[1].reference_docname, opportunity.name)
 
 		self.assertTrue(
-			frappe.db.get_value(
-				"ToDo", {"reference_type": "Opportunity", "reference_name": opportunity.name}
-			)
+			frappe.db.get_value("ToDo", {"reference_type": "Opportunity", "reference_name": opportunity.name})
 		)
 
 	def test_copy_events_from_lead_to_prospect(self):
@@ -194,7 +192,7 @@
 			"doctype": "Lead",
 			"first_name": args.first_name or "_Test",
 			"last_name": args.last_name or "Lead",
-			"email_id": args.email_id or "new_lead_{}@example.com".format(random_string(5)),
+			"email_id": args.email_id or f"new_lead_{random_string(5)}@example.com",
 			"company_name": args.company_name or "_Test Company",
 		}
 	).insert()
diff --git a/erpnext/crm/doctype/lead_source/lead_source.json b/erpnext/crm/doctype/lead_source/lead_source.json
index c3cedcc..94ec3b7 100644
--- a/erpnext/crm/doctype/lead_source/lead_source.json
+++ b/erpnext/crm/doctype/lead_source/lead_source.json
@@ -26,7 +26,7 @@
   }
  ],
  "links": [],
- "modified": "2023-02-10 00:51:44.973957",
+ "modified": "2024-03-27 13:10:00.097850",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Lead Source",
@@ -58,7 +58,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "translated_doctype": 1
diff --git a/erpnext/crm/doctype/lost_reason_detail/lost_reason_detail.json b/erpnext/crm/doctype/lost_reason_detail/lost_reason_detail.json
index 76796e8..6e73674 100644
--- a/erpnext/crm/doctype/lost_reason_detail/lost_reason_detail.json
+++ b/erpnext/crm/doctype/lost_reason_detail/lost_reason_detail.json
@@ -1,76 +1,32 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-12-28 14:40:50.635495", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-12-28 14:40:50.635495",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "lost_reason"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "lost_reason", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Opportunity Lost Reason", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Opportunity Lost Reason", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "lost_reason",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Opportunity Lost Reason",
+   "options": "Opportunity Lost Reason"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-12-28 15:02:24.282772", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Lost Reason Detail", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:02.759568",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Lost Reason Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/market_segment/market_segment.json b/erpnext/crm/doctype/market_segment/market_segment.json
index 66cca0e..f493664 100644
--- a/erpnext/crm/doctype/market_segment/market_segment.json
+++ b/erpnext/crm/doctype/market_segment/market_segment.json
@@ -1,96 +1,44 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:market_segment", 
- "beta": 0, 
- "creation": "2018-10-01 09:59:14.479509", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "autoname": "field:market_segment",
+ "creation": "2018-10-01 09:59:14.479509",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "market_segment"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "market_segment", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Market Segment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "fieldname": "market_segment",
+   "fieldtype": "Data",
+   "label": "Market Segment",
    "unique": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-10-01 09:59:14.479509", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Market Segment", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:10:04.846687",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Market Segment",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 07641d2..88b617b 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -250,7 +250,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "hidden": 1,
    "label": "Address",
    "oldfieldname": "address",
@@ -622,7 +622,7 @@
  "icon": "fa fa-info-sign",
  "idx": 195,
  "links": [],
- "modified": "2022-10-13 12:42:21.545636",
+ "modified": "2024-03-27 13:10:07.008338",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Opportunity",
@@ -657,7 +657,7 @@
  "search_fields": "status,transaction_date,party_name,opportunity_type,territory,company",
  "sender_field": "contact_email",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "subject_field": "title",
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 72e26de..bddb331 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -40,7 +40,7 @@
 			OpportunityLostReasonDetail,
 		)
 
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		annual_revenue: DF.Currency
 		base_opportunity_amount: DF.Currency
@@ -370,9 +370,7 @@
 		quotation.conversion_rate = exchange_rate
 
 		# get default taxes
-		taxes = get_default_taxes_and_charges(
-			"Sales Taxes and Charges Template", company=quotation.company
-		)
+		taxes = get_default_taxes_and_charges("Sales Taxes and Charges Template", company=quotation.company)
 		if taxes.get("taxes"):
 			quotation.update(taxes)
 
@@ -478,9 +476,7 @@
 
 def auto_close_opportunity():
 	"""auto close the `Replied` Opportunities after 7 days"""
-	auto_close_after_days = (
-		frappe.db.get_single_value("CRM Settings", "close_opportunity_after_days") or 15
-	)
+	auto_close_after_days = frappe.db.get_single_value("CRM Settings", "close_opportunity_after_days") or 15
 
 	table = frappe.qb.DocType("Opportunity")
 	opportunities = (
diff --git a/erpnext/crm/doctype/opportunity/test_opportunity.py b/erpnext/crm/doctype/opportunity/test_opportunity.py
index 247e20d..6ec3ca4 100644
--- a/erpnext/crm/doctype/opportunity/test_opportunity.py
+++ b/erpnext/crm/doctype/opportunity/test_opportunity.py
@@ -4,7 +4,7 @@
 import unittest
 
 import frappe
-from frappe.utils import add_days, now_datetime, random_string, today
+from frappe.utils import now_datetime, random_string, today
 
 from erpnext.crm.doctype.lead.lead import make_customer
 from erpnext.crm.doctype.lead.test_lead import make_lead
@@ -32,9 +32,7 @@
 
 		self.assertTrue(opp_doc.party_name)
 		self.assertEqual(opp_doc.opportunity_from, "Lead")
-		self.assertEqual(
-			frappe.db.get_value("Lead", opp_doc.party_name, "email_id"), opp_doc.contact_email
-		)
+		self.assertEqual(frappe.db.get_value("Lead", opp_doc.party_name, "email_id"), opp_doc.contact_email)
 
 		# create new customer and create new contact against 'new.opportunity@example.com'
 		customer = make_customer(opp_doc.party_name).insert(ignore_permissions=True)
@@ -64,9 +62,7 @@
 		opportunity_comment_count = frappe.db.count(
 			"Comment", {"reference_doctype": opp_doc.doctype, "reference_name": opp_doc.name}
 		)
-		opportunity_communication_count = len(
-			get_linked_communication_list(opp_doc.doctype, opp_doc.name)
-		)
+		opportunity_communication_count = len(get_linked_communication_list(opp_doc.doctype, opp_doc.name))
 		self.assertEqual(opportunity_comment_count, 2)
 		self.assertEqual(opportunity_communication_count, 2)
 
@@ -77,7 +73,7 @@
 
 
 def make_opportunity_from_lead():
-	new_lead_email_id = "new{}@example.com".format(random_string(5))
+	new_lead_email_id = f"new{random_string(5)}@example.com"
 	args = {
 		"doctype": "Opportunity",
 		"contact_email": new_lead_email_id,
@@ -126,9 +122,7 @@
 	return opp_doc
 
 
-def create_communication(
-	reference_doctype, reference_name, sender, sent_or_received=None, creation=None
-):
+def create_communication(reference_doctype, reference_name, sender, sent_or_received=None, creation=None):
 	communication = frappe.get_doc(
 		{
 			"doctype": "Communication",
diff --git a/erpnext/crm/doctype/opportunity_item/opportunity_item.json b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
index 732f80d..ce1db61 100644
--- a/erpnext/crm/doctype/opportunity_item/opportunity_item.json
+++ b/erpnext/crm/doctype/opportunity_item/opportunity_item.json
@@ -166,13 +166,13 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-11-14 18:35:30.887278",
+ "modified": "2024-03-27 13:10:07.307773",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Opportunity Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/crm/doctype/opportunity_lost_reason/opportunity_lost_reason.json b/erpnext/crm/doctype/opportunity_lost_reason/opportunity_lost_reason.json
index 0cfcf0e..252d49e 100644
--- a/erpnext/crm/doctype/opportunity_lost_reason/opportunity_lost_reason.json
+++ b/erpnext/crm/doctype/opportunity_lost_reason/opportunity_lost_reason.json
@@ -1,153 +1,80 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "field:lost_reason", 
- "beta": 0, 
- "creation": "2018-12-28 14:48:51.044975", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:lost_reason",
+ "creation": "2018-12-28 14:48:51.044975",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "lost_reason"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "lost_reason", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Lost Reason", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "fieldname": "lost_reason",
+   "fieldtype": "Data",
+   "label": "Lost Reason",
    "unique": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2022-02-16 10:49:43.336437", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Opportunity Lost Reason", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:10:07.445661",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Opportunity Lost Reason",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Master Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Master Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
-}
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.json b/erpnext/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.json
index 50620e2..4c38ef2 100644
--- a/erpnext/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.json
+++ b/erpnext/crm/doctype/opportunity_lost_reason_detail/opportunity_lost_reason_detail.json
@@ -18,14 +18,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-07-26 17:58:26.313242",
+ "modified": "2024-03-27 13:10:07.582746",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Opportunity Lost Reason Detail",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/opportunity_type/opportunity_type.json b/erpnext/crm/doctype/opportunity_type/opportunity_type.json
index 3ada0f1..4bded54 100644
--- a/erpnext/crm/doctype/opportunity_type/opportunity_type.json
+++ b/erpnext/crm/doctype/opportunity_type/opportunity_type.json
@@ -1,135 +1,69 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 0, 
- "autoname": "Prompt", 
- "beta": 0, 
- "creation": "2017-10-06 12:55:43.318773", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "Prompt",
+ "creation": "2017-10-06 12:55:43.318773",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "description"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Small Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "in_list_view": 1,
+   "label": "Description"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-11-15 17:27:12.271303", 
- "modified_by": "Administrator", 
- "module": "CRM", 
- "name": "Opportunity Type", 
- "name_case": "Title Case", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:10:07.690090",
+ "modified_by": "Administrator",
+ "module": "CRM",
+ "name": "Opportunity Type",
+ "naming_rule": "Set by user",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 0
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User",
+   "share": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "search_fields": "", 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1,
+ "translated_doctype": 1
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/prospect/prospect.json b/erpnext/crm/doctype/prospect/prospect.json
index d32311b..ca59fc7 100644
--- a/erpnext/crm/doctype/prospect/prospect.json
+++ b/erpnext/crm/doctype/prospect/prospect.json
@@ -218,7 +218,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2022-10-13 12:29:33.674561",
+ "modified": "2024-03-27 13:10:22.771484",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Prospect",
@@ -258,7 +258,7 @@
    "share": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "company_name",
diff --git a/erpnext/crm/doctype/prospect/test_prospect.py b/erpnext/crm/doctype/prospect/test_prospect.py
index 874f84c..c3930ee 100644
--- a/erpnext/crm/doctype/prospect/test_prospect.py
+++ b/erpnext/crm/doctype/prospect/test_prospect.py
@@ -34,7 +34,7 @@
 	prospect_doc = frappe.get_doc(
 		{
 			"doctype": "Prospect",
-			"company_name": args.company_name or "_Test Company {}".format(random_string(3)),
+			"company_name": args.company_name or f"_Test Company {random_string(3)}",
 		}
 	).insert()
 
diff --git a/erpnext/crm/doctype/prospect_lead/prospect_lead.json b/erpnext/crm/doctype/prospect_lead/prospect_lead.json
index 075c0f9..799d2ff 100644
--- a/erpnext/crm/doctype/prospect_lead/prospect_lead.json
+++ b/erpnext/crm/doctype/prospect_lead/prospect_lead.json
@@ -77,13 +77,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-04-28 20:27:58.805970",
+ "modified": "2024-03-27 13:10:22.993745",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Prospect Lead",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/crm/doctype/prospect_opportunity/prospect_opportunity.json b/erpnext/crm/doctype/prospect_opportunity/prospect_opportunity.json
index d8c2520..9a49c20 100644
--- a/erpnext/crm/doctype/prospect_opportunity/prospect_opportunity.json
+++ b/erpnext/crm/doctype/prospect_opportunity/prospect_opportunity.json
@@ -88,14 +88,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-04-28 10:05:38.730368",
+ "modified": "2024-03-27 13:10:23.116345",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Prospect Opportunity",
  "naming_rule": "Autoincrement",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/crm/doctype/sales_stage/sales_stage.json b/erpnext/crm/doctype/sales_stage/sales_stage.json
index caf8ff5..859f642 100644
--- a/erpnext/crm/doctype/sales_stage/sales_stage.json
+++ b/erpnext/crm/doctype/sales_stage/sales_stage.json
@@ -18,7 +18,7 @@
   }
  ],
  "links": [],
- "modified": "2023-02-10 01:40:23.713390",
+ "modified": "2024-03-27 13:10:38.067960",
  "modified_by": "Administrator",
  "module": "CRM",
  "name": "Sales Stage",
@@ -39,7 +39,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1,
diff --git a/erpnext/crm/doctype/utils.py b/erpnext/crm/doctype/utils.py
index 6bcfcb7..c42db17 100644
--- a/erpnext/crm/doctype/utils.py
+++ b/erpnext/crm/doctype/utils.py
@@ -3,7 +3,6 @@
 
 @frappe.whitelist()
 def get_last_interaction(contact=None, lead=None):
-
 	if not contact and not lead:
 		return
 
@@ -23,16 +22,14 @@
 			# remove extra appended 'OR'
 			query_condition = query_condition[:-2]
 			last_communication = frappe.db.sql(
-				"""
+				f"""
 				SELECT `name`, `content`
 				FROM `tabCommunication`
 				WHERE `sent_or_received`='Received'
-				AND ({})
-				ORDER BY `modified`
+				AND ({query_condition})
+				ORDER BY `creation`
 				LIMIT 1
-			""".format(
-					query_condition
-				),
+			""",
 				values,
 				as_dict=1,
 			)  # nosec
diff --git a/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py b/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py
index be7f5ca..6d01bd2 100644
--- a/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py
+++ b/erpnext/crm/report/campaign_efficiency/campaign_efficiency.py
@@ -33,13 +33,11 @@
 	conditions = get_filter_conditions(filters)
 
 	lead_details = frappe.db.sql(
-		"""
+		f"""
 		select {based_on_field}, name
 		from `tabLead`
 		where {based_on_field} is not null and {based_on_field} != '' {conditions}
-	""".format(
-			based_on_field=based_on_field, conditions=conditions
-		),
+	""",
 		filters,
 		as_dict=1,
 	)
@@ -82,9 +80,7 @@
 		where quotation_to = 'Lead' and party_name in (%s)"""
 		% ", ".join(["%s"] * len(leads)),
 		tuple(leads),
-	)[0][
-		0
-	]  # nosec
+	)[0][0]  # nosec
 
 
 def get_lead_opp_count(leads):
diff --git a/erpnext/crm/report/lost_opportunity/lost_opportunity.py b/erpnext/crm/report/lost_opportunity/lost_opportunity.py
index b37cfa4..eb09711 100644
--- a/erpnext/crm/report/lost_opportunity/lost_opportunity.py
+++ b/erpnext/crm/report/lost_opportunity/lost_opportunity.py
@@ -67,7 +67,7 @@
 
 def get_data(filters):
 	return frappe.db.sql(
-		"""
+		f"""
 		SELECT
 			`tabOpportunity`.name,
 			`tabOpportunity`.opportunity_from,
@@ -79,17 +79,15 @@
 			`tabOpportunity`.territory
 		FROM
 			`tabOpportunity`
-			{join}
+			{get_join(filters)}
 		WHERE
 			`tabOpportunity`.status = 'Lost' and `tabOpportunity`.company = %(company)s
 			AND DATE(`tabOpportunity`.modified) BETWEEN %(from_date)s AND %(to_date)s
-			{conditions}
+			{get_conditions(filters)}
 		GROUP BY
 			`tabOpportunity`.name
 		ORDER BY
-			`tabOpportunity`.creation asc  """.format(
-			conditions=get_conditions(filters), join=get_join(filters)
-		),
+			`tabOpportunity`.creation asc  """,
 		filters,
 		as_dict=1,
 	)
@@ -119,9 +117,7 @@
 		join = """JOIN `tabOpportunity Lost Reason Detail`
 			ON `tabOpportunity Lost Reason Detail`.parenttype = 'Opportunity' and
 			`tabOpportunity Lost Reason Detail`.parent = `tabOpportunity`.name and
-			`tabOpportunity Lost Reason Detail`.lost_reason = '{0}'
-			""".format(
-			filters.get("lost_reason")
-		)
+			`tabOpportunity Lost Reason Detail`.lost_reason = '{}'
+			""".format(filters.get("lost_reason"))
 
 	return join
diff --git a/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py b/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py
index 8093117..5a36c99 100644
--- a/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py
+++ b/erpnext/crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py
@@ -14,7 +14,7 @@
 	return OpportunitySummaryBySalesStage(filters).run()
 
 
-class OpportunitySummaryBySalesStage(object):
+class OpportunitySummaryBySalesStage:
 	def __init__(self, filters=None):
 		self.filters = frappe._dict(filters or {})
 
@@ -199,7 +199,6 @@
 		return filters
 
 	def get_chart_data(self):
-		labels = []
 		datasets = []
 		values = [0] * len(self.sales_stage_list)
 
diff --git a/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py b/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py
index 50c42ef..39b49b2 100644
--- a/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py
+++ b/erpnext/crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py
@@ -62,9 +62,7 @@
 	lead_details = []
 	lead_filters = get_lead_filters(filters)
 
-	for lead in frappe.get_all(
-		"Lead", fields=["name", "lead_name", "company_name"], filters=lead_filters
-	):
+	for lead in frappe.get_all("Lead", fields=["name", "lead_name", "company_name"], filters=lead_filters):
 		data = frappe.db.sql(
 			"""
 			select
@@ -90,7 +88,7 @@
 		)
 
 		for lead_info in data:
-			lead_data = [lead.name, lead.lead_name, lead.company_name] + list(lead_info)
+			lead_data = [lead.name, lead.lead_name, lead.company_name, *list(lead_info)]
 			lead_details.append(lead_data)
 
 	return lead_details
diff --git a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
index 4f7436f..9cc69d2 100644
--- a/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
+++ b/erpnext/crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py
@@ -17,7 +17,7 @@
 	return SalesPipelineAnalytics(filters).run()
 
 
-class SalesPipelineAnalytics(object):
+class SalesPipelineAnalytics:
 	def __init__(self, filters=None):
 		self.filters = frappe._dict(filters or {})
 
@@ -98,7 +98,7 @@
 				"Opportunity",
 				filters=self.get_conditions(),
 				fields=[self.based_on, self.data_based_on, self.duration],
-				group_by="{},{}".format(self.group_by_based_on, self.group_by_period),
+				group_by=f"{self.group_by_based_on},{self.group_by_period}",
 				order_by=self.group_by_period,
 			)
 
@@ -230,7 +230,7 @@
 		current_date = date.today()
 		month_number = date.today().month
 
-		for month in range(month_number, 13):
+		for _month in range(month_number, 13):
 			month_list.append(current_date.strftime("%B"))
 			current_date = current_date + relativedelta(months=1)
 
diff --git a/erpnext/crm/utils.py b/erpnext/crm/utils.py
index 7374520..c543c38 100644
--- a/erpnext/crm/utils.py
+++ b/erpnext/crm/utils.py
@@ -94,9 +94,7 @@
 			"Opportunity", reference_name, ["opportunity_from", "party_name"]
 		)
 		if opportunity_from == "Lead":
-			prospect = frappe.db.get_value(
-				"Prospect Opportunity", {"opportunity": reference_name}, "parent"
-			)
+			prospect = frappe.db.get_value("Prospect Opportunity", {"opportunity": reference_name}, "parent")
 		if opportunity_from == "Prospect":
 			prospect = party_name
 
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
index e7176ea..b83bd6f 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.json
@@ -70,7 +70,7 @@
  ],
  "issingle": 1,
  "links": [],
- "modified": "2021-03-02 17:35:27.544259",
+ "modified": "2024-03-27 13:10:13.672028",
  "modified_by": "Administrator",
  "module": "ERPNext Integrations",
  "name": "Plaid Settings",
@@ -87,7 +87,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
index dc5a329..edfab47 100644
--- a/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
+++ b/erpnext/erpnext_integrations/doctype/plaid_settings/plaid_settings.py
@@ -143,7 +143,9 @@
 				result.append(new_account.name)
 			except frappe.UniqueValidationError:
 				frappe.msgprint(
-					_("Bank account {0} already exists and could not be created again").format(account["name"])
+					_("Bank account {0} already exists and could not be created again").format(
+						account["name"]
+					)
 				)
 			except Exception:
 				frappe.log_error("Plaid Link Error")
@@ -220,9 +222,7 @@
 				f"Plaid added {len(result)} new Bank Transactions from '{bank_account}' between {start_date} and {end_date}"
 			)
 
-			frappe.db.set_value(
-				"Bank Account", bank_account, "last_integration_date", last_transaction_date
-			)
+			frappe.db.set_value("Bank Account", bank_account, "last_integration_date", last_transaction_date)
 	except Exception:
 		frappe.log_error(frappe.get_traceback(), _("Plaid transactions sync error"))
 
@@ -244,9 +244,7 @@
 
 	transactions = []
 	try:
-		transactions = plaid.get_transactions(
-			start_date=start_date, end_date=end_date, account_id=account_id
-		)
+		transactions = plaid.get_transactions(start_date=start_date, end_date=end_date, account_id=account_id)
 	except ItemError as e:
 		if e.code == "ITEM_LOGIN_REQUIRED":
 			msg = _("There was an error syncing transactions.") + " "
diff --git a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.json b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.json
index 5428177..2e9c714 100644
--- a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.json
+++ b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "beta": 1,
  "creation": "2018-07-10 14:48:16.757030",
  "doctype": "DocType",
@@ -190,7 +191,8 @@
   }
  ],
  "issingle": 1,
- "modified": "2019-08-07 15:26:00.653433",
+ "links": [],
+ "modified": "2024-03-27 13:10:30.599062",
  "modified_by": "Administrator",
  "module": "ERPNext Integrations",
  "name": "QuickBooks Migrator",
@@ -208,6 +210,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py
index ec7a6e9..5175cbd 100644
--- a/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py
+++ b/erpnext/erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.py
@@ -65,10 +65,8 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(QuickBooksMigrator, self).__init__(*args, **kwargs)
-		self.oauth = OAuth2Session(
-			client_id=self.client_id, redirect_uri=self.redirect_url, scope=self.scope
-		)
+		super().__init__(*args, **kwargs)
+		self.oauth = OAuth2Session(client_id=self.client_id, redirect_uri=self.redirect_url, scope=self.scope)
 		if not self.authorization_url and self.authorization_endpoint:
 			self.authorization_url = self.oauth.authorization_url(self.authorization_endpoint)[0]
 
@@ -76,9 +74,7 @@
 		if self.company:
 			# We need a Cost Center corresponding to the selected erpnext Company
 			self.default_cost_center = frappe.db.get_value("Company", self.company, "cost_center")
-			company_warehouses = frappe.get_all(
-				"Warehouse", filters={"company": self.company, "is_group": 0}
-			)
+			company_warehouses = frappe.get_all("Warehouse", filters={"company": self.company, "is_group": 0})
 			if company_warehouses:
 				self.default_warehouse = company_warehouses[0].name
 		if self.authorization_endpoint:
@@ -226,14 +222,14 @@
 				if not frappe.db.exists(
 					{
 						"doctype": "Account",
-						"name": encode_company_abbr("{} - QB".format(root), self.company),
+						"name": encode_company_abbr(f"{root} - QB", self.company),
 						"company": self.company,
 					}
 				):
 					frappe.get_doc(
 						{
 							"doctype": "Account",
-							"account_name": "{} - QB".format(root),
+							"account_name": f"{root} - QB",
 							"root_type": root,
 							"is_group": "1",
 							"company": self.company,
@@ -245,13 +241,10 @@
 
 	def _migrate_entries(self, entity):
 		try:
-			query_uri = "{}/company/{}/query".format(
-				self.api_endpoint,
-				self.quickbooks_company_id,
-			)
+			query_uri = f"{self.api_endpoint}/company/{self.quickbooks_company_id}/query"
 			max_result_count = 1000
 			# Count number of entries
-			response = self._get(query_uri, params={"query": """SELECT COUNT(*) FROM {}""".format(entity)})
+			response = self._get(query_uri, params={"query": f"""SELECT COUNT(*) FROM {entity}"""})
 			entry_count = response.json()["QueryResponse"]["totalCount"]
 
 			# fetch pages and accumulate
@@ -273,9 +266,7 @@
 
 	def _fetch_general_ledger(self):
 		try:
-			query_uri = "{}/company/{}/reports/GeneralLedger".format(
-				self.api_endpoint, self.quickbooks_company_id
-			)
+			query_uri = f"{self.api_endpoint}/company/{self.quickbooks_company_id}/reports/GeneralLedger"
 			response = self._get(
 				query_uri,
 				params={
@@ -604,7 +595,9 @@
 						"is_stock_item": 0,
 						"item_group": "All Item Groups",
 						"company": self.company,
-						"item_defaults": [{"company": self.company, "default_warehouse": self.default_warehouse}],
+						"item_defaults": [
+							{"company": self.company, "default_warehouse": self.default_warehouse}
+						],
 					}
 					if "ExpenseAccountRef" in item:
 						expense_account = self._get_account_name_by_id(item["ExpenseAccountRef"]["value"])
@@ -644,7 +637,9 @@
 		try:
 			if preference["SalesFormsPrefs"]["AllowShipping"]:
 				default_shipping_account_id = preference["SalesFormsPrefs"]["DefaultShippingAccount"]
-				self.default_shipping_account = self._get_account_name_by_id(self, default_shipping_account_id)
+				self.default_shipping_account = self._get_account_name_by_id(
+					self, default_shipping_account_id
+				)
 				self.save()
 		except Exception as e:
 			self._log_error(e, preference)
@@ -752,7 +747,9 @@
 							"item_code": item["name"],
 							"conversion_factor": 1,
 							"uom": item["stock_uom"],
-							"description": line.get("Description", line["SalesItemLineDetail"]["ItemRef"]["name"]),
+							"description": line.get(
+								"Description", line["SalesItemLineDetail"]["ItemRef"]["name"]
+							),
 							"qty": line["SalesItemLineDetail"]["Qty"],
 							"price_list_rate": line["SalesItemLineDetail"]["UnitPrice"],
 							"cost_center": self.default_cost_center,
@@ -1024,7 +1021,11 @@
 					si_quickbooks_id = "Invoice - {}".format(linked_transaction["TxnId"])
 					# Invoice could have been saved as a Sales Invoice or a Journal Entry
 					if frappe.db.exists(
-						{"doctype": "Sales Invoice", "quickbooks_id": si_quickbooks_id, "company": self.company}
+						{
+							"doctype": "Sales Invoice",
+							"quickbooks_id": si_quickbooks_id,
+							"company": self.company,
+						}
 					):
 						sales_invoice = frappe.get_all(
 							"Sales Invoice",
@@ -1040,7 +1041,11 @@
 						party_account = sales_invoice["debit_to"]
 
 					if frappe.db.exists(
-						{"doctype": "Journal Entry", "quickbooks_id": si_quickbooks_id, "company": self.company}
+						{
+							"doctype": "Journal Entry",
+							"quickbooks_id": si_quickbooks_id,
+							"company": self.company,
+						}
 					):
 						journal_entry = frappe.get_doc(
 							"Journal Entry",
@@ -1050,9 +1055,9 @@
 							},
 						)
 						# Invoice saved as a Journal Entry must have party and party_type set on line containing Receivable Account
-						customer_account_line = list(
+						customer_account_line = next(
 							filter(lambda acc: acc.party_type == "Customer", journal_entry.accounts)
-						)[0]
+						)
 
 						reference_type = "Journal Entry"
 						reference_name = journal_entry.name
@@ -1094,7 +1099,11 @@
 				if linked_transaction["TxnType"] == "Bill":
 					pi_quickbooks_id = "Bill - {}".format(linked_transaction["TxnId"])
 					if frappe.db.exists(
-						{"doctype": "Purchase Invoice", "quickbooks_id": pi_quickbooks_id, "company": self.company}
+						{
+							"doctype": "Purchase Invoice",
+							"quickbooks_id": pi_quickbooks_id,
+							"company": self.company,
+						}
 					):
 						purchase_invoice = frappe.get_all(
 							"Purchase Invoice",
@@ -1229,7 +1238,9 @@
 				else:
 					accounts.append(
 						{
-							"account": self._get_account_name_by_id(line["DepositLineDetail"]["AccountRef"]["value"]),
+							"account": self._get_account_name_by_id(
+								line["DepositLineDetail"]["AccountRef"]["value"]
+							),
 							"credit_in_account_currency": line["Amount"],
 							"cost_center": self.default_cost_center,
 						}
@@ -1284,7 +1295,7 @@
 			return taxes
 		for line in entry["TxnTaxDetail"]["TaxLine"]:
 			tax_rate = line["TaxLineDetail"]["TaxRateRef"]["value"]
-			account_head = self._get_account_name_by_id("TaxRate - {}".format(tax_rate))
+			account_head = self._get_account_name_by_id(f"TaxRate - {tax_rate}")
 			tax_type_applicable = self._get_tax_type(tax_rate)
 			if tax_type_applicable == "TaxOnAmount":
 				taxes.append(
@@ -1333,7 +1344,7 @@
 								return tax_rate_detail["TaxRateRef"]["value"]
 
 	def _get_parent_row_id(self, tax_rate, taxes):
-		tax_account = self._get_account_name_by_id("TaxRate - {}".format(tax_rate))
+		tax_account = self._get_account_name_by_id(f"TaxRate - {tax_rate}")
 		for index, tax in enumerate(taxes):
 			if tax["account_head"] == tax_account:
 				return index + 1
@@ -1358,7 +1369,7 @@
 	def _get(self, *args, **kwargs):
 		kwargs["headers"] = {
 			"Accept": "application/json",
-			"Authorization": "Bearer {}".format(self.access_token),
+			"Authorization": f"Bearer {self.access_token}",
 		}
 		response = requests.get(*args, **kwargs)
 		# HTTP Status code 401 here means that the access_token is expired
@@ -1370,18 +1381,18 @@
 		return response
 
 	def _get_account_name_by_id(self, quickbooks_id):
-		return frappe.get_all(
-			"Account", filters={"quickbooks_id": quickbooks_id, "company": self.company}
-		)[0]["name"]
+		return frappe.get_all("Account", filters={"quickbooks_id": quickbooks_id, "company": self.company})[
+			0
+		]["name"]
 
 	def _publish(self, *args, **kwargs):
 		frappe.publish_realtime("quickbooks_progress_update", *args, **kwargs, user=self.modified_by)
 
 	def _get_unique_account_name(self, quickbooks_name, number=0):
 		if number:
-			quickbooks_account_name = "{} - {} - QB".format(quickbooks_name, number)
+			quickbooks_account_name = f"{quickbooks_name} - {number} - QB"
 		else:
-			quickbooks_account_name = "{} - QB".format(quickbooks_name)
+			quickbooks_account_name = f"{quickbooks_name} - QB"
 		company_encoded_account_name = encode_company_abbr(quickbooks_account_name, self.company)
 		if frappe.db.exists(
 			{"doctype": "Account", "name": company_encoded_account_name, "company": self.company}
diff --git a/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.json b/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.json
index 417d943..e6df549 100644
--- a/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.json
+++ b/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.json
@@ -254,7 +254,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-28 00:29:18.039826",
+ "modified": "2024-03-27 13:10:51.146772",
  "modified_by": "Administrator",
  "module": "ERPNext Integrations",
  "name": "Tally Migration",
@@ -273,7 +273,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py b/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py
index 8cba24a..c811b38 100644
--- a/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py
+++ b/erpnext/erpnext_integrations/doctype/tally_migration/tally_migration.py
@@ -190,7 +190,7 @@
 
 		def get_children_and_parent_dict(accounts):
 			children, parents = {}, {}
-			for parent, account, is_group in accounts:
+			for parent, account, _is_group in accounts:
 				children.setdefault(parent, set()).add(account)
 				parents.setdefault(account, set()).add(parent)
 				parents[account].update(parents.get(parent, []))
@@ -235,7 +235,9 @@
 						{
 							"doctype": party_type,
 							"customer_name": account.NAME.string.strip(),
-							"tax_id": account.INCOMETAXNUMBER.string.strip() if account.INCOMETAXNUMBER else None,
+							"tax_id": account.INCOMETAXNUMBER.string.strip()
+							if account.INCOMETAXNUMBER
+							else None,
 							"customer_group": "All Customer Groups",
 							"territory": "All Territories",
 							"customer_type": "Individual",
@@ -249,7 +251,9 @@
 						{
 							"doctype": party_type,
 							"supplier_name": account.NAME.string.strip(),
-							"pan": account.INCOMETAXNUMBER.string.strip() if account.INCOMETAXNUMBER else None,
+							"pan": account.INCOMETAXNUMBER.string.strip()
+							if account.INCOMETAXNUMBER
+							else None,
 							"supplier_group": "All Supplier Groups",
 							"supplier_type": "Individual",
 						}
@@ -265,7 +269,9 @@
 							"address_line2": address[140:].strip(),
 							"country": account.COUNTRYNAME.string.strip() if account.COUNTRYNAME else None,
 							"state": account.LEDSTATENAME.string.strip() if account.LEDSTATENAME else None,
-							"gst_state": account.LEDSTATENAME.string.strip() if account.LEDSTATENAME else None,
+							"gst_state": account.LEDSTATENAME.string.strip()
+							if account.LEDSTATENAME
+							else None,
 							"pin_code": account.PINCODE.string.strip() if account.PINCODE else None,
 							"mobile": account.LEDGERPHONE.string.strip() if account.LEDGERPHONE else None,
 							"phone": account.LEDGERPHONE.string.strip() if account.LEDGERPHONE else None,
@@ -607,7 +613,7 @@
 				if new_year.year_start_date.year == new_year.year_end_date.year:
 					new_year.year = new_year.year_start_date.year
 				else:
-					new_year.year = "{}-{}".format(new_year.year_start_date.year, new_year.year_end_date.year)
+					new_year.year = f"{new_year.year_start_date.year}-{new_year.year_end_date.year}"
 				new_year.save()
 				oldest_year = new_year
 
diff --git a/erpnext/erpnext_integrations/utils.py b/erpnext/erpnext_integrations/utils.py
index 1924ffb..ea38b0b 100644
--- a/erpnext/erpnext_integrations/utils.py
+++ b/erpnext/erpnext_integrations/utils.py
@@ -13,7 +13,9 @@
 
 		if frappe.request and settings and settings.get(secret_key) and not frappe.flags.in_test:
 			sig = base64.b64encode(
-				hmac.new(settings.get(secret_key).encode("utf8"), frappe.request.data, hashlib.sha256).digest()
+				hmac.new(
+					settings.get(secret_key).encode("utf8"), frappe.request.data, hashlib.sha256
+				).digest()
 			)
 
 			if frappe.request.data and sig != bytes(frappe.get_request_header(hmac_key).encode()):
@@ -26,7 +28,7 @@
 
 
 def get_webhook_address(connector_name, method, exclude_uri=False, force_https=False):
-	endpoint = "erpnext.erpnext_integrations.connectors.{0}.{1}".format(connector_name, method)
+	endpoint = f"erpnext.erpnext_integrations.connectors.{connector_name}.{method}"
 
 	if exclude_uri:
 		return endpoint
diff --git a/erpnext/gettext/__init__.py b/erpnext/gettext/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/gettext/__init__.py
diff --git a/erpnext/gettext/extractors/__init__.py b/erpnext/gettext/extractors/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/erpnext/gettext/extractors/__init__.py
diff --git a/erpnext/gettext/extractors/uom_data.py b/erpnext/gettext/extractors/uom_data.py
new file mode 100644
index 0000000..d279c92
--- /dev/null
+++ b/erpnext/gettext/extractors/uom_data.py
@@ -0,0 +1,17 @@
+import json
+
+
+def extract(fileobj, *args, **kwargs):
+	"""
+	Extract messages from a JSON file with standard UOM data. To be used by the Babel extractor.
+
+	:param fileobj: the file-like object the messages should be extracted from
+	:rtype: `iterator`
+	"""
+	uom_list = json.load(fileobj)
+
+	if not isinstance(uom_list, list):
+		return
+
+	for uom_data in uom_list:
+		yield None, "_", uom_data.get("uom_name"), ["Name of a UOM"]
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 0d70476..013cfb1 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -28,9 +28,7 @@
 
 override_doctype_class = {"Address": "erpnext.accounts.custom.address.ERPNextAddress"}
 
-override_whitelisted_methods = {
-	"frappe.www.contact.send_message": "erpnext.templates.utils.send_message"
-}
+override_whitelisted_methods = {"frappe.www.contact.send_message": "erpnext.templates.utils.send_message"}
 
 welcome_email = "erpnext.setup.utils.welcome_email"
 
@@ -262,9 +260,7 @@
 	{"name": "call-disconnect", "src": "/assets/erpnext/sounds/call-disconnect.mp3", "volume": 0.2},
 ]
 
-has_upload_permission = {
-	"Employee": "erpnext.setup.doctype.employee.employee.has_upload_permission"
-}
+has_upload_permission = {"Employee": "erpnext.setup.doctype.employee.employee.has_upload_permission"}
 
 has_website_permission = {
 	"Sales Order": "erpnext.controllers.website_list_for_contact.has_website_permission",
@@ -466,9 +462,7 @@
 	</span>
 """
 
-get_translated_dict = {
-	("doctype", "Global Defaults"): "frappe.geo.country_info.get_translated_dict"
-}
+get_translated_dict = {("doctype", "Global Defaults"): "frappe.geo.country_info.get_translated_dict"}
 
 bot_parsers = [
 	"erpnext.utilities.bot.FindItemBot",
@@ -557,9 +551,7 @@
 get_entries_for_bank_reconciliation_statement = "erpnext.accounts.report.bank_reconciliation_statement.bank_reconciliation_statement.get_entries_for_bank_reconciliation_statement"
 
 regional_overrides = {
-	"France": {
-		"erpnext.tests.test_regional.test_method": "erpnext.regional.france.utils.test_method"
-	},
+	"France": {"erpnext.tests.test_regional.test_method": "erpnext.regional.france.utils.test_method"},
 	"United Arab Emirates": {
 		"erpnext.controllers.taxes_and_totals.update_itemised_tax_data": "erpnext.regional.united_arab_emirates.utils.update_itemised_tax_data",
 		"erpnext.accounts.doctype.purchase_invoice.purchase_invoice.make_regional_gl_entries": "erpnext.regional.united_arab_emirates.utils.make_regional_gl_entries",
@@ -629,9 +621,7 @@
 	],
 }
 
-additional_timeline_content = {
-	"*": ["erpnext.telephony.doctype.call_log.call_log.get_linked_call_logs"]
-}
+additional_timeline_content = {"*": ["erpnext.telephony.doctype.call_log.call_log.get_linked_call_logs"]}
 
 
 extend_bootinfo = [
diff --git a/erpnext/locale/ar.po b/erpnext/locale/ar.po
index c989ccd..68661e2 100644
--- a/erpnext/locale/ar.po
+++ b/erpnext/locale/ar.po
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: info@erpnext.com\n"
-"POT-Creation-Date: 2024-01-29 18:13+0053\n"
-"PO-Revision-Date: 2024-02-02 12:58\n"
+"POT-Creation-Date: 2024-03-24 09:35+0000\n"
+"PO-Revision-Date: 2024-03-26 12:47\n"
 "Last-Translator: info@erpnext.com\n"
 "Language-Team: Arabic\n"
 "MIME-Version: 1.0\n"
@@ -18,21 +18,17 @@
 "X-Crowdin-File-ID: 46\n"
 "Language: ar_SA\n"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:85
-msgid " "
-msgstr ""
-
 #. Label of a Column Break field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
 msgid "  "
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:76
+#: selling/doctype/quotation/quotation.js:77
 msgid " Address"
 msgstr ""
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:612
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:618
 msgid " Amount"
 msgstr ""
 
@@ -42,29 +38,16 @@
 msgid " Is Child Table"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:184
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:107
 #: selling/report/sales_analytics/sales_analytics.py:66
 msgid " Name"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:108
-msgid " Qty"
-msgstr ""
-
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:603
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:609
 msgid " Rate"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:116
-msgid " Raw Material"
-msgstr ""
-
-#: public/js/bom_configurator/bom_configurator.bundle.js:127
-#: public/js/bom_configurator/bom_configurator.bundle.js:157
-msgid " Sub Assembly"
-msgstr ""
-
 #: projects/doctype/project_update/project_update.py:110
 msgid " Summary"
 msgstr ""
@@ -81,6 +64,10 @@
 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item"
 msgstr "\"اصل ثابت\" لا يمكن أن يكون غير محدد، حيث يوجد سجل أصول مقابل البند"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "#"
+msgstr ""
+
 #. Description of the Onboarding Step 'Accounts Settings'
 #: accounts/onboarding_step/accounts_settings/accounts_settings.json
 msgid "# Account Settings\n\n"
@@ -498,7 +485,7 @@
 msgid "% Completed"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:755
+#: manufacturing/doctype/bom/bom.js:788
 #, python-format
 msgid "% Finished Item Quantity"
 msgstr ""
@@ -510,6 +497,7 @@
 msgstr ""
 
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:70
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:16
 msgid "% Occupied"
 msgstr ""
 
@@ -599,11 +587,11 @@
 msgid "% of materials delivered against this Sales Order"
 msgstr ""
 
-#: controllers/accounts_controller.py:1899
+#: controllers/accounts_controller.py:1991
 msgid "'Account' in the Accounting section of Customer {0}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:263
+#: selling/doctype/sales_order/sales_order.py:266
 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'"
 msgstr ""
 
@@ -611,7 +599,7 @@
 msgid "'Based On' and 'Group By' can not be same"
 msgstr "'على أساس' و 'المجموعة حسب' لا يمكن أن يكونا نفس الشيء"
 
-#: stock/report/product_bundle_balance/product_bundle_balance.py:232
+#: stock/report/product_bundle_balance/product_bundle_balance.py:230
 msgid "'Date' is required"
 msgstr "&quot;التاريخ&quot; مطلوب"
 
@@ -619,11 +607,11 @@
 msgid "'Days Since Last Order' must be greater than or equal to zero"
 msgstr "يجب أن تكون \"الأيام منذ آخر طلب\" أكبر من أو تساوي الصفر"
 
-#: controllers/accounts_controller.py:1904
+#: controllers/accounts_controller.py:1996
 msgid "'Default {0} Account' in Company {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1048
+#: accounts/doctype/journal_entry/journal_entry.py:1075
 msgid "'Entries' cannot be empty"
 msgstr "المدخلات لا يمكن أن تكون فارغة"
 
@@ -641,10 +629,26 @@
 msgid "'Has Serial No' can not be 'Yes' for non-stock item"
 msgstr "\"لهُ رقم تسلسل\"  لا يمكن ان يكون \"نعم\" لبند غير قابل للتخزين"
 
-#: stock/report/stock_ledger/stock_ledger.py:436
+#: stock/report/stock_ledger/stock_ledger.py:538
 msgid "'Opening'"
 msgstr "'افتتاحي'"
 
+#: stock/doctype/delivery_note/delivery_note.py:388
+msgid "'Sales Invoice Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:381
+msgid "'Sales Invoice' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:364
+msgid "'Sales Order Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:357
+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
@@ -659,10 +663,18 @@
 msgid "'Update Stock' can not be checked because items are not delivered via {0}"
 msgstr "&quot;الأوراق المالية التحديث&quot; لا يمكن التحقق من أنه لم يتم تسليم المواد عن طريق {0}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:369
+#: accounts/doctype/sales_invoice/sales_invoice.py:380
 msgid "'Update Stock' cannot be checked for fixed asset sale"
 msgstr "لا يمكن التحقق من ' تحديث المخزون ' لبيع الأصول الثابتة\\n<br>\\n'Update Stock' cannot be checked for fixed asset sale"
 
+#: accounts/doctype/bank_account/bank_account.py:64
+msgid "'{0}' account is already used by {1}. Use another account."
+msgstr ""
+
+#: controllers/accounts_controller.py:392
+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/stock_ledger_invariant_check/stock_ledger_invariant_check.py:180
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:104
@@ -754,7 +766,7 @@
 msgid "* Will be calculated in the transaction."
 msgstr "* سيتم احتسابه في المعاملة."
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:130
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:140
 msgid ", with the inventory {0}: {1}"
 msgstr ""
 
@@ -986,7 +998,7 @@
 msgid "<div class=\"text-muted text-center\">No Matching Bank Transactions Found</div>"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:258
+#: public/js/bank_reconciliation_tool/dialog_manager.js:262
 msgid "<div class=\"text-muted text-center\">{0}</div>"
 msgstr ""
 
@@ -1178,11 +1190,11 @@
 msgid "A BOM with name {0} already exists for item {1}."
 msgstr "يوجد BOM بالاسم {0} بالفعل للعنصر {1}."
 
-#: selling/doctype/customer/customer.py:297
+#: selling/doctype/customer/customer.py:309
 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group"
 msgstr "مجموعة الزبائن موجودة بنفس الاسم أرجو تغير اسم العميل أو اعادة تسمية مجموعة الزبائن\\n<br>\\nA Customer Group exists with same name please change the Customer name or rename the Customer Group"
 
-#: manufacturing/doctype/workstation/workstation.js:47
+#: manufacturing/doctype/workstation/workstation.js:73
 msgid "A Holiday List can be added to exclude counting these days for the Workstation."
 msgstr ""
 
@@ -1194,7 +1206,17 @@
 msgid "A Packing Slip can only be created for Draft Delivery Note."
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:530
+#. Description of a DocType
+#: stock/doctype/price_list/price_list.json
+msgid "A Price List is a collection of Item Prices either Selling, Buying, or both"
+msgstr ""
+
+#. Description of a DocType
+#: stock/doctype/item/item.json
+msgid "A Product or a Service that is bought, sold or kept in stock."
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:535
 msgid "A Reconciliation Job {0} is running for the same filters. Cannot reconcile now"
 msgstr ""
 
@@ -1204,12 +1226,13 @@
 "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:937
-msgid "A Transaction Deletion Job is triggered for {0}"
+#: setup/doctype/company/company.py:916
+msgid "A Transaction Deletion Document: {0} is triggered for {0}"
 msgstr ""
 
-#: setup/doctype/company/company.py:914
-msgid "A Transaction Deletion Job: {0} is already running for {1}"
+#. Description of a DocType
+#: accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+msgid "A condition for a Shipping Rule"
 msgstr ""
 
 #. Description of the 'Send To Primary Contact' (Check) field in DocType
@@ -1227,6 +1250,11 @@
 msgid "A driver must be set to submit."
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/warehouse/warehouse.json
+msgid "A logical Warehouse against which stock entries are made."
+msgstr ""
+
 #: templates/emails/confirm_appointment.html:2
 msgid "A new appointment has been created for you with {0}"
 msgstr "تم إنشاء موعد جديد لك من خلال {0}"
@@ -1235,6 +1263,11 @@
 msgid "A template with tax category {0} already exists. Only one template is allowed with each tax category"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/sales_partner/sales_partner.json
+msgid "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission."
+msgstr ""
+
 #. Option for the 'Blood Group' (Select) field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -1433,11 +1466,11 @@
 msgid "Abbreviation"
 msgstr "اسم مختصر"
 
-#: setup/doctype/company/company.py:164
+#: setup/doctype/company/company.py:163
 msgid "Abbreviation already used for another company"
 msgstr "الاختصار يستخدم بالفعل لشركة أخرى\\n<br>\\nAbbreviation already used for another company"
 
-#: setup/doctype/company/company.py:159
+#: setup/doctype/company/company.py:158
 msgid "Abbreviation is mandatory"
 msgstr "الاسم المختصر إلزامي"
 
@@ -1451,15 +1484,15 @@
 msgid "About Us Settings"
 msgstr "إعدادات صفحة من نحن"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:39
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
 msgid "About {0} minute remaining"
 msgstr "حوالي {0} دقيقة متبقية"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:40
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:38
 msgid "About {0} minutes remaining"
 msgstr "حوالي {0} دقائق متبقية"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:35
 msgid "About {0} seconds remaining"
 msgstr "حوالي {0} ثانية متبقية"
 
@@ -1527,7 +1560,7 @@
 msgid "Accepted Qty in Stock UOM"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2124
+#: public/js/controllers/transaction.js:2167
 msgid "Accepted Quantity"
 msgstr "كمية مقبولة"
 
@@ -1579,7 +1612,7 @@
 msgid "Access Key"
 msgstr ""
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:48
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:49
 msgid "Access Key is required for Service Provider: {0}"
 msgstr ""
 
@@ -1601,13 +1634,13 @@
 #: 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_ledger/general_ledger.js:38
-#: accounts/report/general_ledger/general_ledger.py:565
-#: accounts/report/payment_ledger/payment_ledger.js:31
+#: accounts/report/general_ledger/general_ledger.py:578
+#: 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_for_party/trial_balance_for_party.js:70
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:16
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:16
+#: 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
 msgid "Account"
 msgstr "حساب"
 
@@ -1760,12 +1793,6 @@
 msgid "Account Balance"
 msgstr "رصيد حسابك"
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Account Balance"
-msgstr "رصيد حسابك"
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -1909,8 +1936,8 @@
 msgid "Account Manager"
 msgstr "إدارة حساب المستخدم"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
-#: controllers/accounts_controller.py:1908
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
+#: controllers/accounts_controller.py:2000
 msgid "Account Missing"
 msgstr "الحساب مفقود"
 
@@ -1938,11 +1965,11 @@
 msgid "Account Name"
 msgstr "اسم الحساب"
 
-#: accounts/doctype/account/account.py:306
+#: accounts/doctype/account/account.py:325
 msgid "Account Not Found"
 msgstr "الحساب غير موجود"
 
-#: accounts/doctype/account/account_tree.js:108
+#: accounts/doctype/account/account_tree.js:131
 msgid "Account Number"
 msgstr "رقم الحساب"
 
@@ -1952,7 +1979,7 @@
 msgid "Account Number"
 msgstr "رقم الحساب"
 
-#: accounts/doctype/account/account.py:458
+#: accounts/doctype/account/account.py:477
 msgid "Account Number {0} already used in account {1}"
 msgstr "رقم الحساب {0} بالفعل مستخدم في الحساب {1}"
 
@@ -1990,8 +2017,8 @@
 msgid "Account Subtype"
 msgstr "نوع الحساب الفرعي"
 
-#: accounts/doctype/account/account_tree.js:115
-#: accounts/report/account_balance/account_balance.js:35
+#: accounts/doctype/account/account_tree.js:152
+#: accounts/report/account_balance/account_balance.js:34
 msgid "Account Type"
 msgstr "نوع الحساب"
 
@@ -2035,11 +2062,11 @@
 msgid "Account Value"
 msgstr "قيمة الحساب"
 
-#: accounts/doctype/account/account.py:279
+#: accounts/doctype/account/account.py:298
 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 msgstr "رصيد الحساب بالفعل دائن ، لا يسمح لك لتعيين ' الرصيد يجب ان يكون ' ك ' مدين '\\n<br>\\nAccount balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 
-#: accounts/doctype/account/account.py:273
+#: accounts/doctype/account/account.py:292
 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
 msgstr "رصيد الحساب رصيد مدين، لا يسمح لك بتغييره 'الرصيد يجب أن يكون دائن'"
 
@@ -2061,7 +2088,7 @@
 msgid "Account for Change Amount"
 msgstr "حساب لتغيير المبلغ"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:44
+#: accounts/doctype/bank_clearance/bank_clearance.py:46
 msgid "Account is mandatory to get payment entries"
 msgstr "الحساب إلزامي للحصول على إدخالات الدفع"
 
@@ -2069,28 +2096,28 @@
 msgid "Account is not set for the dashboard chart {0}"
 msgstr "لم يتم تعيين الحساب لمخطط لوحة المعلومات {0}"
 
-#: assets/doctype/asset/asset.py:677
+#: assets/doctype/asset/asset.py:679
 msgid "Account not Found"
 msgstr ""
 
-#: accounts/doctype/account/account.py:360
+#: accounts/doctype/account/account.py:379
 msgid "Account with child nodes cannot be converted to ledger"
 msgstr "لا يمكن تحويل الحساب إلى دفتر الأستاذ لأن لديه حسابات فرعية\\n<br>\\nAccount with child nodes cannot be converted to ledger"
 
-#: accounts/doctype/account/account.py:252
+#: accounts/doctype/account/account.py:271
 msgid "Account with child nodes cannot be set as ledger"
 msgstr "الحساب لديه حسابات فرعية لا يمكن إضافته لدفتر الأستاذ.\\n<br>\\nAccount with child nodes cannot be set as ledger"
 
-#: accounts/doctype/account/account.py:371
+#: accounts/doctype/account/account.py:390
 msgid "Account with existing transaction can not be converted to group."
 msgstr "لا يمكن تحويل حساب جرت عليه أي عملية إلى تصنيف مجموعة"
 
-#: accounts/doctype/account/account.py:400
+#: accounts/doctype/account/account.py:419
 msgid "Account with existing transaction can not be deleted"
 msgstr "الحساب لديه معاملات موجودة لا يمكن حذفه\\n<br>\\nAccount with existing transaction can not be deleted"
 
-#: accounts/doctype/account/account.py:247
-#: accounts/doctype/account/account.py:362
+#: accounts/doctype/account/account.py:266
+#: accounts/doctype/account/account.py:381
 msgid "Account with existing transaction cannot be converted to ledger"
 msgstr "لا يمكن تحويل الحساب مع الحركة الموجودة إلى دفتر الأستاذ\\n<br>\\nAccount with existing transaction cannot be converted to ledger"
 
@@ -2098,7 +2125,7 @@
 msgid "Account {0} added multiple times"
 msgstr ""
 
-#: setup/doctype/company/company.py:187
+#: setup/doctype/company/company.py:186
 msgid "Account {0} does not belong to company: {1}"
 msgstr "الحساب {0} لا يتنمى للشركة {1}\\n<br>\\nAccount {0} does not belong to company: {1}"
 
@@ -2106,7 +2133,7 @@
 msgid "Account {0} does not belongs to company {1}"
 msgstr "الحساب {0} لا ينتمي للشركة {1}\\n<br>\\nAccount {0} does not belongs to company {1}"
 
-#: accounts/doctype/account/account.py:532
+#: accounts/doctype/account/account.py:551
 msgid "Account {0} does not exist"
 msgstr "حساب {0} غير موجود"
 
@@ -2122,7 +2149,7 @@
 msgid "Account {0} does not match with Company {1} in Mode of Account: {2}"
 msgstr "الحساب {0} لا يتطابق مع الشركة {1} في طريقة الحساب: {2}"
 
-#: accounts/doctype/account/account.py:490
+#: accounts/doctype/account/account.py:509
 msgid "Account {0} exists in parent company {1}."
 msgstr "الحساب {0} موجود في الشركة الأم {1}."
 
@@ -2130,51 +2157,51 @@
 msgid "Account {0} has been entered multiple times"
 msgstr "الحساب {0} تم إدخاله عدة مرات\\n<br>\\nAccount {0} has been entered multiple times"
 
-#: accounts/doctype/account/account.py:344
+#: accounts/doctype/account/account.py:363
 msgid "Account {0} is added in the child company {1}"
 msgstr "تتم إضافة الحساب {0} في الشركة التابعة {1}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:443
+#: accounts/doctype/gl_entry/gl_entry.py:397
 msgid "Account {0} is frozen"
 msgstr "الحساب {0} مجمد\\n<br>\\nAccount {0} is frozen"
 
-#: controllers/accounts_controller.py:1032
+#: controllers/accounts_controller.py:1096
 msgid "Account {0} is invalid. Account Currency must be {1}"
 msgstr "الحساب {0} غير صحيح. يجب أن تكون عملة الحساب {1}"
 
-#: accounts/doctype/account/account.py:150
+#: accounts/doctype/account/account.py:151
 msgid "Account {0}: Parent account {1} can not be a ledger"
 msgstr "الحساب {0}: الحساب الرئيسي {1} لا يمكن أن يكون حساب دفتر أستاذ"
 
-#: accounts/doctype/account/account.py:156
+#: accounts/doctype/account/account.py:157
 msgid "Account {0}: Parent account {1} does not belong to company: {2}"
 msgstr "الحساب {0}: الحساب الرئيسي {1} لا ينتمي إلى الشركة: {2}"
 
-#: accounts/doctype/account/account.py:144
+#: accounts/doctype/account/account.py:145
 msgid "Account {0}: Parent account {1} does not exist"
 msgstr "الحساب {0}: الحسابه الأب {1} غير موجود"
 
-#: accounts/doctype/account/account.py:147
+#: accounts/doctype/account/account.py:148
 msgid "Account {0}: You can not assign itself as parent account"
 msgstr "الحساب {0}: لا يمكنك جعله حساب رئيسي"
 
-#: accounts/general_ledger.py:403
+#: accounts/general_ledger.py:412
 msgid "Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry"
 msgstr "الحساب: <b>{0}</b> عبارة &quot;Capital work&quot; قيد التقدم ولا يمكن تحديثها بواسطة &quot;إدخال دفتر اليومية&quot;"
 
-#: accounts/doctype/journal_entry/journal_entry.py:243
+#: accounts/doctype/journal_entry/journal_entry.py:259
 msgid "Account: {0} can only be updated via Stock Transactions"
 msgstr "الحساب: {0} لا يمكن تحديثه إلا من خلال معاملات المخزون"
 
-#: accounts/report/general_ledger/general_ledger.py:325
+#: accounts/report/general_ledger/general_ledger.py:338
 msgid "Account: {0} does not exist"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:2098
+#: accounts/doctype/payment_entry/payment_entry.py:2117
 msgid "Account: {0} is not permitted under Payment Entry"
 msgstr "الحساب: {0} غير مسموح به بموجب إدخال الدفع"
 
-#: controllers/accounts_controller.py:2591
+#: controllers/accounts_controller.py:2676
 msgid "Account: {0} with currency: {1} can not be selected"
 msgstr "الحساب: {0} مع العملة: {1} لا يمكن اختياره"
 
@@ -2334,12 +2361,12 @@
 msgid "Accounting Dimension"
 msgstr "البعد المحاسبي"
 
-#: accounts/doctype/gl_entry/gl_entry.py:206
+#: accounts/doctype/gl_entry/gl_entry.py:196
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:153
 msgid "Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}."
 msgstr "البعد المحاسبي <b>{0}</b> مطلوب لحساب &quot;الميزانية العمومية&quot; {1}."
 
-#: accounts/doctype/gl_entry/gl_entry.py:193
+#: accounts/doctype/gl_entry/gl_entry.py:183
 #: 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 "البعد المحاسبي <b>{0}</b> مطلوب لحساب &quot;الربح والخسارة&quot; {1}."
@@ -2655,53 +2682,54 @@
 msgid "Accounting Entries"
 msgstr "القيود المحاسبة"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:82
+#: accounts/doctype/sales_invoice/sales_invoice.js:86
 msgid "Accounting Entries are reposted"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:42
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
 msgid "Accounting Entries are reposted."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:709 assets/doctype/asset/asset.py:724
-#: assets/doctype/asset_capitalization/asset_capitalization.py:572
+#: assets/doctype/asset/asset.py:713 assets/doctype/asset/asset.py:728
+#: assets/doctype/asset_capitalization/asset_capitalization.py:578
 msgid "Accounting Entry for Asset"
 msgstr "المدخلات الحسابية للأصول"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:738
+#: stock/doctype/purchase_receipt/purchase_receipt.py:737
 msgid "Accounting Entry for Service"
 msgstr "القيد المحاسبي للخدمة"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:906
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:926
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:942
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:959
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:978
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1126
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1266
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1284
-#: controllers/stock_controller.py:168 controllers/stock_controller.py:183
-#: stock/doctype/purchase_receipt/purchase_receipt.py:839
-#: stock/doctype/stock_entry/stock_entry.py:1464
-#: stock/doctype/stock_entry/stock_entry.py:1478
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:519
+#: 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
 msgid "Accounting Entry for Stock"
 msgstr "القيود المحاسبية للمخزون"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:658
+#: stock/doctype/purchase_receipt/purchase_receipt.py:659
 msgid "Accounting Entry for {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:1950
+#: controllers/accounts_controller.py:2042
 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}"
 msgstr "المدخل المحاسبي ل {0}: {1} يمكن أن يكون فقط بالعملة {1}.\\n<br>\\nAccounting Entry for {0}: {1} can only be made in currency: {2}"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:192
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:193
 #: buying/doctype/supplier/supplier.js:85
-#: public/js/controllers/stock_controller.js:72
-#: public/js/utils/ledger_preview.js:7 selling/doctype/customer/customer.js:159
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:43
+#: public/js/controllers/stock_controller.js:84
+#: public/js/utils/ledger_preview.js:8 selling/doctype/customer/customer.js:164
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:48
 msgid "Accounting Ledger"
 msgstr "موازنة دفتر الأستاذ"
 
@@ -2732,15 +2760,19 @@
 msgid "Accounting entries are frozen up to this date. Nobody can create or modify entries except users with the role specified below"
 msgstr "تم تجميد قيود المحاسبة حتى هذا التاريخ. لا يمكن لأي شخص إنشاء أو تعديل الإدخالات باستثناء المستخدمين الذين لديهم الدور المحدد أدناه"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:69
+#: accounts/doctype/journal_entry/journal_entry.js:30
+msgid "Accounting entries for this Journal Entry need to be reposted. Please click on 'Repost' button to update."
+msgstr ""
+
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:82
 msgid "Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:72
+#: accounts/doctype/sales_invoice/sales_invoice.js:73
 msgid "Accounting entries for this invoice needs to be reposted. Please click on 'Repost' button to update."
 msgstr ""
 
-#: setup/doctype/company/company.py:317
+#: setup/doctype/company/company.py:316
 msgid "Accounts"
 msgstr "الحسابات"
 
@@ -2915,7 +2947,7 @@
 msgid "Accounts Manager"
 msgstr "مدير حسابات"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:343
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:341
 msgid "Accounts Missing Error"
 msgstr ""
 
@@ -2925,9 +2957,9 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:85
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117
 #: accounts/report/accounts_payable/accounts_payable.json
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:122
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:125
 #: accounts/workspace/payables/payables.json
-#: buying/doctype/supplier/supplier.js:90
+#: buying/doctype/supplier/supplier.js:97
 msgid "Accounts Payable"
 msgstr "الحسابات الدائنة"
 
@@ -2940,7 +2972,7 @@
 
 #. Name of a report
 #. Label of a Link in the Payables Workspace
-#: accounts/report/accounts_payable/accounts_payable.js:175
+#: accounts/report/accounts_payable/accounts_payable.js:176
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.json
 #: accounts/workspace/payables/payables.json
 msgid "Accounts Payable Summary"
@@ -2953,10 +2985,10 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:12
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:12
 #: accounts/report/accounts_receivable/accounts_receivable.json
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:150
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:153
 #: accounts/workspace/accounting/accounting.json
 #: accounts/workspace/receivables/receivables.json
-#: selling/doctype/customer/customer.js:155
+#: selling/doctype/customer/customer.js:153
 msgid "Accounts Receivable"
 msgstr "الحسابات المدينة"
 
@@ -3115,7 +3147,7 @@
 msgid "Accounts User"
 msgstr "حسابات المستخدمين"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1153
+#: accounts/doctype/journal_entry/journal_entry.py:1180
 msgid "Accounts table cannot be blank."
 msgstr "جدول الحسابات لا يمكن أن يكون فارغا."
 
@@ -3132,7 +3164,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:33
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:46
-#: accounts/report/account_balance/account_balance.js:38
+#: accounts/report/account_balance/account_balance.js:37
 msgid "Accumulated Depreciation"
 msgstr "إستهلاك متراكم"
 
@@ -3155,7 +3187,7 @@
 msgstr "حساب الاستهلاك المتراكم"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:155
-#: assets/doctype/asset/asset.js:242
+#: assets/doctype/asset/asset.js:277
 msgid "Accumulated Depreciation Amount"
 msgstr "قيمة الاستهلاك المتراكمة"
 
@@ -3170,17 +3202,17 @@
 msgid "Accumulated Depreciation as on"
 msgstr "الاستهلاك المتراكم كما في"
 
-#: accounts/doctype/budget/budget.py:243
+#: accounts/doctype/budget/budget.py:250
 msgid "Accumulated Monthly"
 msgstr "متراكمة شهريا"
 
-#: accounts/report/balance_sheet/balance_sheet.js:27
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:13
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:28
+#: accounts/report/balance_sheet/balance_sheet.js:22
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:8
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:23
 msgid "Accumulated Values"
 msgstr "القيم المتراكمة"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:101
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:125
 msgid "Accumulated Values in Group Company"
 msgstr "القيم المتراكمة في مجموعة الشركة"
 
@@ -3195,7 +3227,7 @@
 msgstr "تاريخ شراء المركبة"
 
 #: crm/doctype/lead/lead.js:42
-#: public/js/bank_reconciliation_tool/dialog_manager.js:171
+#: public/js/bank_reconciliation_tool/dialog_manager.js:175
 msgid "Action"
 msgstr "حدث"
 
@@ -3217,7 +3249,7 @@
 msgid "Action If Same Rate is Not Maintained"
 msgstr ""
 
-#: quality_management/doctype/quality_review/quality_review_list.js:9
+#: quality_management/doctype/quality_review/quality_review_list.js:7
 msgid "Action Initialised"
 msgstr "العمل مهيأ"
 
@@ -3263,23 +3295,24 @@
 msgid "Action if Same Rate is Not Maintained Throughout Sales Cycle"
 msgstr ""
 
-#: accounts/doctype/account/account.js:55
-#: accounts/doctype/account/account.js:62
-#: accounts/doctype/account/account.js:91
-#: accounts/doctype/account/account.js:116
-#: accounts/doctype/journal_entry/journal_entry.js:35
-#: accounts/doctype/payment_entry/payment_entry.js:160
+#: accounts/doctype/account/account.js:50
+#: accounts/doctype/account/account.js:57
+#: accounts/doctype/account/account.js:89
+#: accounts/doctype/account/account.js:117
+#: accounts/doctype/journal_entry/journal_entry.js:77
+#: accounts/doctype/payment_entry/payment_entry.js:190
 #: accounts/doctype/subscription/subscription.js:38
 #: accounts/doctype/subscription/subscription.js:44
 #: accounts/doctype/subscription/subscription.js:50
-#: buying/doctype/supplier/supplier.js:104
-#: buying/doctype/supplier/supplier.js:109
-#: projects/doctype/project/project.js:69
-#: projects/doctype/project/project.js:73
-#: projects/doctype/project/project.js:134
-#: public/js/bank_reconciliation_tool/data_table_manager.js:93
-#: public/js/utils/unreconcile.js:22 selling/doctype/customer/customer.js:170
-#: selling/doctype/customer/customer.js:175 stock/doctype/item/item.js:419
+#: buying/doctype/supplier/supplier.js:128
+#: buying/doctype/supplier/supplier.js:137
+#: projects/doctype/project/project.js:78
+#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:160
+#: public/js/bank_reconciliation_tool/data_table_manager.js:88
+#: public/js/bank_reconciliation_tool/data_table_manager.js:121
+#: public/js/utils/unreconcile.js:28 selling/doctype/customer/customer.js:184
+#: selling/doctype/customer/customer.js:193 stock/doctype/item/item.js:486
 #: templates/pages/order.html:20
 msgid "Actions"
 msgstr "الإجراءات"
@@ -3316,7 +3349,7 @@
 msgstr "الإجراءات المنجزة"
 
 #: accounts/doctype/subscription/subscription_list.js:6
-#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:11
+#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:18
 #: stock/doctype/putaway_rule/putaway_rule_list.js:7
 msgid "Active"
 msgstr "نشط"
@@ -3362,6 +3395,12 @@
 msgid "Active Leads"
 msgstr "العروض النشطة"
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Active Status"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -3406,14 +3445,14 @@
 msgid "Activity Cost exists for Employee {0} against Activity Type - {1}"
 msgstr "تكلفة النشاط موجودة للموظف {0} مقابل نوع النشاط - {1}"
 
-#: projects/doctype/activity_type/activity_type.js:7
+#: projects/doctype/activity_type/activity_type.js:10
 msgid "Activity Cost per Employee"
 msgstr "تكلفة النشاط لكل موظف"
 
 #. Name of a DocType
 #: projects/doctype/activity_type/activity_type.json
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:32
-#: public/js/projects/timer.js:8
+#: public/js/projects/timer.js:9 templates/pages/timelog_info.html:25
 msgid "Activity Type"
 msgstr "نوع النشاط"
 
@@ -3553,6 +3592,7 @@
 msgid "Actual Posting"
 msgstr ""
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:21
 #: stock/report/product_bundle_balance/product_bundle_balance.py:96
 #: stock/report/stock_projected_qty/stock_projected_qty.py:136
 msgid "Actual Qty"
@@ -3606,10 +3646,19 @@
 msgid "Actual Qty in Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:185
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:196
 msgid "Actual Qty is mandatory"
 msgstr "الكمية الفعلية هي إلزامية"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:37
+#: stock/dashboard/item_dashboard_list.html:28
+msgid "Actual Qty {0} / Waiting Qty {1}"
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Actual Qty: Quantity available in the warehouse."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:95
 msgid "Actual Quantity"
 msgstr "الكمية الفعلية"
@@ -3676,18 +3725,20 @@
 msgid "Actual qty in stock"
 msgstr "الكمية الفعلية في المخزون"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1223
+#: accounts/doctype/payment_entry/payment_entry.js:1470
 #: public/js/controllers/accounts.js:176
 msgid "Actual type tax cannot be included in Item rate in row {0}"
 msgstr "نوع الضريبة الفعلي لا يمكن تضمينه في معدل الصنف في الصف {0}"
 
-#: crm/doctype/lead/lead.js:82
-#: public/js/bom_configurator/bom_configurator.bundle.js:225
-#: public/js/bom_configurator/bom_configurator.bundle.js:237
-#: public/js/bom_configurator/bom_configurator.bundle.js:291
-#: public/js/utils/crm_activities.js:168
+#: crm/doctype/lead/lead.js:85
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:55
+#: public/js/bom_configurator/bom_configurator.bundle.js:231
+#: public/js/bom_configurator/bom_configurator.bundle.js:244
+#: public/js/bom_configurator/bom_configurator.bundle.js:329
+#: public/js/utils/crm_activities.js:170
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/dashboard/item_dashboard_list.html:59
 msgid "Add"
 msgstr "إضافة"
 
@@ -3705,11 +3756,11 @@
 msgid "Add"
 msgstr "إضافة"
 
-#: stock/doctype/item/item.js:417 stock/doctype/price_list/price_list.js:7
+#: stock/doctype/item/item.js:482 stock/doctype/price_list/price_list.js:8
 msgid "Add / Edit Prices"
 msgstr "إضافة و تعديل الأسعار"
 
-#: accounts/doctype/account/account_tree.js:176
+#: accounts/doctype/account/account_tree.js:256
 msgid "Add Child"
 msgstr "إضافة الطفل"
 
@@ -3717,27 +3768,36 @@
 msgid "Add Columns in Transaction Currency"
 msgstr ""
 
+#: templates/pages/task_info.html:94 templates/pages/task_info.html:96
+msgid "Add Comment"
+msgstr ""
+
 #. Label of a Check field in DocType 'Manufacturing Settings'
 #: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
 msgctxt "Manufacturing Settings"
 msgid "Add Corrective Operation Cost in Finished Good Valuation"
 msgstr ""
 
-#: public/js/event.js:19
+#: public/js/event.js:24
 msgid "Add Customers"
 msgstr "إضافة العملاء"
 
-#: public/js/event.js:27
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:411
+msgid "Add Discount"
+msgstr ""
+
+#: public/js/event.js:40
 msgid "Add Employees"
 msgstr "إضافة موظفين"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:224
-#: selling/doctype/sales_order/sales_order.js:207
-#: stock/dashboard/item_dashboard.js:205
+#: public/js/bom_configurator/bom_configurator.bundle.js:230
+#: selling/doctype/sales_order/sales_order.js:228
+#: stock/dashboard/item_dashboard.js:212
 msgid "Add Item"
 msgstr "اضافة بند"
 
-#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:33
+#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:35
 msgid "Add Items"
 msgstr "إضافة بنود"
 
@@ -3745,11 +3805,11 @@
 msgid "Add Items in the Purpose Table"
 msgstr ""
 
-#: crm/doctype/lead/lead.js:82
+#: crm/doctype/lead/lead.js:84
 msgid "Add Lead to Prospect"
 msgstr ""
 
-#: public/js/event.js:15
+#: public/js/event.js:16
 msgid "Add Leads"
 msgstr "إضافة العملاء المحتملين"
 
@@ -3779,12 +3839,12 @@
 msgid "Add Or Deduct"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:269
+#: selling/page/point_of_sale/pos_item_cart.js:267
 msgid "Add Order Discount"
 msgstr "أضف خصم الطلب"
 
-#: public/js/event.js:17 public/js/event.js:21 public/js/event.js:25
-#: public/js/event.js:29 public/js/event.js:33
+#: public/js/event.js:20 public/js/event.js:28 public/js/event.js:36
+#: public/js/event.js:44 public/js/event.js:52
 msgid "Add Participants"
 msgstr "أضف مشاركين"
 
@@ -3794,7 +3854,7 @@
 msgid "Add Quote"
 msgstr "إضافة  عرض سعر"
 
-#: public/js/event.js:31
+#: public/js/event.js:48
 msgid "Add Sales Partners"
 msgstr "إضافة شركاء المبيعات"
 
@@ -3828,17 +3888,21 @@
 msgid "Add Serial / Batch No (Rejected Qty)"
 msgstr ""
 
-#: public/js/utils.js:61
+#: public/js/utils.js:71
 msgid "Add Serial No"
 msgstr "إضافة رقم تسلسلي"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:231
-#: public/js/bom_configurator/bom_configurator.bundle.js:280
+#: manufacturing/doctype/plant_floor/plant_floor.js:172
+msgid "Add Stock"
+msgstr ""
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:238
+#: public/js/bom_configurator/bom_configurator.bundle.js:318
 msgid "Add Sub Assembly"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:433
-#: public/js/event.js:23
+#: buying/doctype/request_for_quotation/request_for_quotation.js:472
+#: public/js/event.js:32
 msgid "Add Suppliers"
 msgstr "إضافة الموردين"
 
@@ -3858,7 +3922,7 @@
 msgid "Add Weekly Holidays"
 msgstr "أضف عطلات أسبوعية"
 
-#: public/js/utils/crm_activities.js:140
+#: public/js/utils/crm_activities.js:142
 msgid "Add a Note"
 msgstr ""
 
@@ -3877,7 +3941,7 @@
 msgstr ""
 
 #: stock/doctype/pick_list/pick_list.js:71
-#: stock/doctype/pick_list/pick_list.py:614
+#: stock/doctype/pick_list/pick_list.py:654
 msgid "Add items in the Item Locations table"
 msgstr "أضف عناصر في جدول &quot;مواقع العناصر&quot;"
 
@@ -3913,10 +3977,14 @@
 msgid "Add to Transit"
 msgstr "أضف إلى Transit"
 
-#: accounts/doctype/coupon_code/coupon_code.js:39
+#: accounts/doctype/coupon_code/coupon_code.js:36
 msgid "Add/Edit Coupon Conditions"
 msgstr "إضافة / تحرير شروط القسيمة"
 
+#: templates/includes/footer/footer_extension.html:26
+msgid "Added"
+msgstr ""
+
 #. Label of a Link field in DocType 'CRM Note'
 #: crm/doctype/crm_note/crm_note.json
 msgctxt "CRM Note"
@@ -3933,7 +4001,7 @@
 msgid "Added Supplier Role to User {0}."
 msgstr ""
 
-#: public/js/utils/item_selector.js:66 public/js/utils/item_selector.js:80
+#: public/js/utils/item_selector.js:70 public/js/utils/item_selector.js:86
 msgid "Added {0} ({1})"
 msgstr "وأضاف {0} ({1})"
 
@@ -3941,10 +4009,14 @@
 msgid "Added {1} Role to User {0}."
 msgstr ""
 
-#: crm/doctype/lead/lead.js:80
+#: crm/doctype/lead/lead.js:81
 msgid "Adding Lead to Prospect..."
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "Additional"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Asset'
 #: assets/doctype/asset/asset.json
 msgctxt "Asset"
@@ -4272,6 +4344,10 @@
 msgid "Additional Info"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Additional Information"
+msgstr "معلومة اضافية"
+
 #. Label of a Section Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -4596,7 +4672,7 @@
 msgid "Address HTML"
 msgstr "عنوان HTML"
 
-#: public/js/utils/contact_address_quick_entry.js:58
+#: public/js/utils/contact_address_quick_entry.js:61
 msgid "Address Line 1"
 msgstr "العنوان سطر 1"
 
@@ -4606,7 +4682,7 @@
 msgid "Address Line 1"
 msgstr "العنوان سطر 1"
 
-#: public/js/utils/contact_address_quick_entry.js:63
+#: public/js/utils/contact_address_quick_entry.js:66
 msgid "Address Line 2"
 msgstr "العنوان سطر 2"
 
@@ -4705,15 +4781,15 @@
 msgid "Addresses"
 msgstr "عناوين"
 
-#: assets/doctype/asset/asset.js:116
+#: assets/doctype/asset/asset.js:144
 msgid "Adjust Asset Value"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:996
+#: accounts/doctype/sales_invoice/sales_invoice.js:1072
 msgid "Adjustment Against"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:581
+#: stock/doctype/purchase_receipt/purchase_receipt.py:582
 msgid "Adjustment based on Purchase Invoice rate"
 msgstr ""
 
@@ -4730,7 +4806,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:303
+#: stock/reorder_item.py:388
 msgid "Administrator"
 msgstr "مدير"
 
@@ -4762,8 +4838,8 @@
 msgid "Advance Paid"
 msgstr "مسبقا المدفوعة"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:47
-#: selling/doctype/sales_order/sales_order_list.js:61
+#: buying/doctype/purchase_order/purchase_order_list.js:65
+#: selling/doctype/sales_order/sales_order_list.js:105
 msgid "Advance Payment"
 msgstr ""
 
@@ -4779,7 +4855,7 @@
 msgid "Advance Payment Status"
 msgstr ""
 
-#: controllers/accounts_controller.py:214
+#: controllers/accounts_controller.py:224
 msgid "Advance Payments"
 msgstr "دفعات مقدمة"
 
@@ -4835,11 +4911,11 @@
 msgid "Advance amount"
 msgstr "المبلغ مقدما"
 
-#: controllers/taxes_and_totals.py:743
+#: controllers/taxes_and_totals.py:744
 msgid "Advance amount cannot be greater than {0} {1}"
 msgstr "قيمة الدفعة المقدمة لا يمكن أن تكون أكبر من {0} {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:741
+#: accounts/doctype/journal_entry/journal_entry.py:768
 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
 msgstr ""
 
@@ -4887,6 +4963,10 @@
 msgid "Affected Transactions"
 msgstr ""
 
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:23
+msgid "Against"
+msgstr "مقابل"
+
 #. Label of a Text field in DocType 'GL Entry'
 #: accounts/doctype/gl_entry/gl_entry.json
 msgctxt "GL Entry"
@@ -4895,7 +4975,7 @@
 
 #: 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:631
+#: accounts/report/general_ledger/general_ledger.py:644
 msgid "Against Account"
 msgstr "مقابل الحساب"
 
@@ -4929,11 +5009,11 @@
 msgid "Against Blanket Order"
 msgstr "ضد بطانية النظام"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:945
+#: accounts/doctype/sales_invoice/sales_invoice.py:962
 msgid "Against Customer Order {0} dated {1}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:967
+#: selling/doctype/sales_order/sales_order.js:1127
 msgid "Against Default Supplier"
 msgstr "ضد المورد الافتراضي"
 
@@ -4991,12 +5071,12 @@
 msgid "Against Income Account"
 msgstr "مقابل حساب الدخل"
 
-#: accounts/doctype/journal_entry/journal_entry.py:609
-#: accounts/doctype/payment_entry/payment_entry.py:669
+#: accounts/doctype/journal_entry/journal_entry.py:636
+#: accounts/doctype/payment_entry/payment_entry.py:678
 msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
 msgstr "قيد اليومية المقابل {0} لا يحتوى مدخل {1} غير مطابق\\n<br>\\nAgainst Journal Entry {0} does not have any unmatched {1} entry"
 
-#: accounts/doctype/gl_entry/gl_entry.py:410
+#: accounts/doctype/gl_entry/gl_entry.py:364
 msgid "Against Journal Entry {0} is already adjusted against some other voucher"
 msgstr "مدخل قيد اليومية {0} تم تعديله بالفعل لقسيمة أخرى\\n<br>\\nAgainst Journal Entry {0} is already adjusted \\nagainst some other voucher"
 
@@ -5030,11 +5110,11 @@
 msgid "Against Stock Entry"
 msgstr "ضد دخول الأسهم"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
 msgid "Against Supplier Invoice {0} dated {1}"
 msgstr "مقابل فاتورة المورد {0} بتاريخ {1}"
 
-#: accounts/report/general_ledger/general_ledger.py:650
+#: accounts/report/general_ledger/general_ledger.py:663
 msgid "Against Voucher"
 msgstr "مقابل إيصال"
 
@@ -5045,7 +5125,7 @@
 msgstr "مقابل إيصال"
 
 #: accounts/report/general_ledger/general_ledger.js:57
-#: accounts/report/payment_ledger/payment_ledger.js:71
+#: accounts/report/payment_ledger/payment_ledger.js:70
 #: accounts/report/payment_ledger/payment_ledger.py:185
 msgid "Against Voucher No"
 msgstr ""
@@ -5056,7 +5136,7 @@
 msgid "Against Voucher No"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:648
+#: accounts/report/general_ledger/general_ledger.py:661
 #: accounts/report/payment_ledger/payment_ledger.py:176
 msgid "Against Voucher Type"
 msgstr "مقابل إيصال  نوع"
@@ -5074,14 +5154,15 @@
 msgstr "مقابل إيصال  نوع"
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:117
-#: manufacturing/report/work_order_summary/work_order_summary.js:59
+#: manufacturing/report/work_order_summary/work_order_summary.js:58
 #: manufacturing/report/work_order_summary/work_order_summary.py:259
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:96
 msgid "Age"
 msgstr "عمر"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:151
-#: accounts/report/accounts_receivable/accounts_receivable.py:1134
+#: accounts/report/accounts_receivable/accounts_receivable.html:133
+#: accounts/report/accounts_receivable/accounts_receivable.py:1142
 msgid "Age (Days)"
 msgstr "(العمر (أيام"
 
@@ -5091,7 +5172,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:58
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:21
-#: accounts/report/accounts_receivable/accounts_receivable.js:83
+#: accounts/report/accounts_receivable/accounts_receivable.js:86
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:21
 msgid "Ageing Based On"
 msgstr "العمرعلى أساس"
@@ -5104,7 +5185,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:65
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:28
-#: accounts/report/accounts_receivable/accounts_receivable.js:90
+#: accounts/report/accounts_receivable/accounts_receivable.js:93
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:28
 #: stock/report/stock_ageing/stock_ageing.js:49
 msgid "Ageing Range 1"
@@ -5112,7 +5193,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:72
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:35
-#: accounts/report/accounts_receivable/accounts_receivable.js:97
+#: accounts/report/accounts_receivable/accounts_receivable.js:100
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:35
 #: stock/report/stock_ageing/stock_ageing.js:56
 msgid "Ageing Range 2"
@@ -5120,7 +5201,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:79
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:42
-#: accounts/report/accounts_receivable/accounts_receivable.js:104
+#: accounts/report/accounts_receivable/accounts_receivable.js:107
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:42
 #: stock/report/stock_ageing/stock_ageing.js:63
 msgid "Ageing Range 3"
@@ -5128,7 +5209,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:86
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:49
-#: accounts/report/accounts_receivable/accounts_receivable.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:49
 msgid "Ageing Range 4"
 msgstr "الشيخوخة المدى 4"
@@ -5192,6 +5273,11 @@
 msgid "Agents"
 msgstr "عملاء"
 
+#. Description of a DocType
+#: selling/doctype/product_bundle/product_bundle.json
+msgid "Aggregate a group of Items into another Item. This is useful if you are maintaining the stock of the packed items and not the bundled item"
+msgstr ""
+
 #. Name of a role
 #: assets/doctype/location/location.json
 msgid "Agriculture Manager"
@@ -5223,10 +5309,10 @@
 msgid "All"
 msgstr "الكل"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:148
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:168
+#: 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:1324 public/js/setup_wizard.js:163
+#: accounts/utils.py:1293 public/js/setup_wizard.js:174
 msgid "All Accounts"
 msgstr "جميع الحسابات"
 
@@ -5300,14 +5386,14 @@
 #: 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:310 setup/doctype/company/company.py:313
-#: setup/doctype/company/company.py:318 setup/doctype/company/company.py:324
-#: setup/doctype/company/company.py:330 setup/doctype/company/company.py:336
-#: setup/doctype/company/company.py:342 setup/doctype/company/company.py:348
-#: setup/doctype/company/company.py:354 setup/doctype/company/company.py:360
-#: setup/doctype/company/company.py:366 setup/doctype/company/company.py:372
-#: setup/doctype/company/company.py:378 setup/doctype/company/company.py:384
-#: setup/doctype/company/company.py:390
+#: 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
 msgid "All Departments"
 msgstr "جميع الاقسام"
 
@@ -5328,6 +5414,10 @@
 msgid "All Item Groups"
 msgstr "كل مجموعات الأصناف"
 
+#: selling/page/point_of_sale/pos_item_selector.js:25
+msgid "All Items"
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5346,6 +5436,11 @@
 msgid "All Sales Person"
 msgstr "كل مندوبي المبيعات"
 
+#. Description of a DocType
+#: setup/doctype/sales_person/sales_person.json
+msgid "All Sales Transactions can be tagged against multiple Sales Persons so that you can set and monitor targets."
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5375,7 +5470,7 @@
 msgid "All Territories"
 msgstr "جميع الأقاليم"
 
-#: setup/doctype/company/company.py:259 setup/doctype/company/company.py:275
+#: setup/doctype/company/company.py:258 setup/doctype/company/company.py:274
 msgid "All Warehouses"
 msgstr "جميع المخازن"
 
@@ -5386,19 +5481,19 @@
 msgid "All allocations have been successfully reconciled"
 msgstr ""
 
-#: support/doctype/issue/issue.js:97
+#: support/doctype/issue/issue.js:107
 msgid "All communications including and above this shall be moved into the new Issue"
 msgstr "يجب نقل جميع الاتصالات بما في ذلك وما فوقها إلى الإصدار الجديد"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:1170
+#: stock/doctype/purchase_receipt/purchase_receipt.py:1172
 msgid "All items have already been Invoiced/Returned"
 msgstr "تم بالفعل تحرير / إرجاع جميع العناصر"
 
-#: stock/doctype/stock_entry/stock_entry.py:2191
+#: stock/doctype/stock_entry/stock_entry.py:2222
 msgid "All items have already been transferred for this Work Order."
 msgstr "جميع الإصناف تم نقلها لأمر العمل"
 
-#: public/js/controllers/transaction.js:2210
+#: public/js/controllers/transaction.js:2253
 msgid "All items in this document already have a linked Quality Inspection."
 msgstr ""
 
@@ -5409,17 +5504,17 @@
 msgid "All the Comments and Emails will be copied from one document to another newly created document(Lead -> Opportunity -> Quotation) throughout the CRM documents."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:847
+#: manufacturing/doctype/work_order/work_order.js:916
 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:899
+#: stock/doctype/delivery_note/delivery_note.py:960
 msgid "All these items have already been Invoiced/Returned"
 msgstr "تم بالفعل إصدار فاتورة / إرجاع جميع هذه العناصر"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:83
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:95
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:84
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:85
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:92
 msgid "Allocate"
 msgstr "تخصيص"
 
@@ -5435,7 +5530,7 @@
 msgid "Allocate Advances Automatically (FIFO)"
 msgstr "تخصيص السلف تلقائيا (الداخل أولا الخارج أولا)"
 
-#: accounts/doctype/payment_entry/payment_entry.js:679
+#: accounts/doctype/payment_entry/payment_entry.js:831
 msgid "Allocate Payment Amount"
 msgstr "تخصيص مبلغ الدفع"
 
@@ -5458,7 +5553,7 @@
 msgstr "تخصيص"
 
 #: accounts/report/gross_profit/gross_profit.py:314
-#: public/js/utils/unreconcile.js:62
+#: public/js/utils/unreconcile.js:86
 msgid "Allocated Amount"
 msgstr "المبلغ المخصص"
 
@@ -5517,21 +5612,25 @@
 msgid "Allocated Entries"
 msgstr ""
 
+#: public/js/templates/crm_activities.html:49
+msgid "Allocated To:"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Invoice Advance'
 #: accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
 msgctxt "Sales Invoice Advance"
 msgid "Allocated amount"
 msgstr "المبلغ المخصص"
 
-#: accounts/utils.py:614
+#: accounts/utils.py:623
 msgid "Allocated amount cannot be greater than unadjusted amount"
 msgstr "لا يمكن أن يكون المبلغ المخصص أكبر من المبلغ غير المعدل"
 
-#: accounts/utils.py:612
+#: accounts/utils.py:621
 msgid "Allocated amount cannot be negative"
 msgstr "لا يمكن أن يكون المبلغ المخصص سالبًا"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:258
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:262
 msgid "Allocation"
 msgstr "توزيع"
 
@@ -5541,7 +5640,7 @@
 msgid "Allocation"
 msgstr "توزيع"
 
-#: public/js/utils/unreconcile.js:67
+#: public/js/utils/unreconcile.js:97
 msgid "Allocations"
 msgstr ""
 
@@ -5570,7 +5669,7 @@
 msgid "Allow"
 msgstr "السماح"
 
-#: accounts/doctype/account/account.py:488
+#: accounts/doctype/account/account.py:507
 #: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68
 msgid "Allow Account Creation Against Child Company"
 msgstr "السماح بإنشاء حساب ضد شركة تابعة"
@@ -5675,7 +5774,7 @@
 msgid "Allow Material Transfer from Purchase Receipt to Purchase Invoice"
 msgstr "السماح بنقل المواد من إيصال الشراء إلى فاتورة الشراء"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:9
 msgid "Allow Multiple Material Consumption"
 msgstr "السماح باستهلاك المواد المتعددة"
 
@@ -5952,7 +6051,7 @@
 msgid "Allows to keep aside a specific quantity of inventory for a particular order."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:721
+#: stock/doctype/pick_list/pick_list.py:792
 msgid "Already Picked"
 msgstr ""
 
@@ -5964,9 +6063,9 @@
 msgid "Already set default in pos profile {0} for user {1}, kindly disabled default"
 msgstr "تم تعيين الإعداد الافتراضي في الملف الشخصي لنقطة البيع {0} للمستخدم {1}، يرجى تعطيل الإعداد الافتراضي"
 
-#: manufacturing/doctype/bom/bom.js:141
-#: manufacturing/doctype/work_order/work_order.js:162 public/js/utils.js:466
-#: stock/doctype/stock_entry/stock_entry.js:224
+#: manufacturing/doctype/bom/bom.js:152
+#: manufacturing/doctype/work_order/work_order.js:169 public/js/utils.js:519
+#: stock/doctype/stock_entry/stock_entry.js:245
 msgid "Alternate Item"
 msgstr "صنف بديل"
 
@@ -5982,6 +6081,10 @@
 msgid "Alternative Item Name"
 msgstr "اسم الصنف البديل"
 
+#: selling/doctype/quotation/quotation.js:360
+msgid "Alternative Items"
+msgstr ""
+
 #: stock/doctype/item_alternative/item_alternative.py:37
 msgid "Alternative item must not be same as item code"
 msgstr "يجب ألا يكون الصنف البديل هو نفسه رمز الصنف"
@@ -6452,7 +6555,7 @@
 msgid "Amended From"
 msgstr "معدل من"
 
-#: accounts/doctype/journal_entry/journal_entry.js:529
+#: accounts/doctype/journal_entry/journal_entry.js:579
 #: 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
@@ -6466,16 +6569,20 @@
 #: 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
-#: selling/doctype/quotation/quotation.js:286
+#: 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
 #: selling/report/sales_order_analysis/sales_order_analysis.py:290
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:46
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:69
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:67
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:108
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:109
 #: stock/report/delayed_item_report/delayed_item_report.py:152
 #: stock/report/delayed_order_report/delayed_order_report.py:71
-#: templates/pages/order.html:92 templates/pages/rfq.html:46
+#: templates/form_grid/bank_reconciliation_grid.html:4
+#: templates/form_grid/item_grid.html:9
+#: templates/form_grid/stock_entry_grid.html:11 templates/pages/order.html:104
+#: templates/pages/rfq.html:46
 msgid "Amount"
 msgstr "كمية"
 
@@ -6993,19 +7100,19 @@
 msgid "Amount in customer's currency"
 msgstr "المبلغ بعملة العميل"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1119
+#: accounts/doctype/payment_entry/payment_entry.py:1128
 msgid "Amount {0} {1} against {2} {3}"
 msgstr "مبلغ {0} {1} مقابل {2} {3}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1127
+#: accounts/doctype/payment_entry/payment_entry.py:1136
 msgid "Amount {0} {1} deducted against {2}"
 msgstr "مبلغ {0} {1} خصم مقابل {2}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1095
+#: accounts/doctype/payment_entry/payment_entry.py:1104
 msgid "Amount {0} {1} transferred from {2} to {3}"
 msgstr "القيمة {0} {1} نقلت من {2} إلى {3}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1102
+#: accounts/doctype/payment_entry/payment_entry.py:1111
 msgid "Amount {0} {1} {2} {3}"
 msgstr "القيمة {0} {1} {2} {3}"
 
@@ -7014,7 +7121,12 @@
 msgid "Amt"
 msgstr "الإجمالي"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:393
+#. Description of a DocType
+#: setup/doctype/item_group/item_group.json
+msgid "An Item Group is a way to classify items based on types."
+msgstr ""
+
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:408
 msgid "An error has been appeared while reposting item valuation via {0}"
 msgstr ""
 
@@ -7023,19 +7135,19 @@
 msgid "An error has occurred during {0}. Check {1} for more details"
 msgstr ""
 
-#: public/js/controllers/buying.js:297 public/js/utils/sales_common.js:364
+#: public/js/controllers/buying.js:292 public/js/utils/sales_common.js:408
 msgid "An error occurred during the update process"
 msgstr "حدث خطأ أثناء عملية التحديث"
 
-#: stock/reorder_item.py:287
+#: stock/reorder_item.py:372
 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:232
+#: accounts/doctype/budget/budget.py:239
 msgid "Annual"
 msgstr "سنوي"
 
-#: public/js/utils.js:103
+#: public/js/utils.js:120
 msgid "Annual Billing: {0}"
 msgstr "الفواتير السنوية:  {0}"
 
@@ -7107,6 +7219,10 @@
 msgid "Applicable Dimension"
 msgstr ""
 
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:221
+msgid "Applicable For"
+msgstr "قابل للتطبيق ل"
+
 #. Label of a Tab Break field in DocType 'Inventory Dimension'
 #: stock/doctype/inventory_dimension/inventory_dimension.json
 msgctxt "Inventory Dimension"
@@ -7387,6 +7503,12 @@
 msgid "Apply Recursion Over (As Per Transaction UOM)"
 msgstr ""
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Apply Recursion Over (As Per Transaction UOM)"
+msgstr ""
+
 #. Label of a Table field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -7502,7 +7624,7 @@
 msgid "Appointment Confirmation"
 msgstr "تأكيد الموعد"
 
-#: www/book_appointment/index.js:229
+#: www/book_appointment/index.js:237
 msgid "Appointment Created Successfully"
 msgstr ""
 
@@ -7567,11 +7689,11 @@
 msgid "Are you sure you want to clear all demo data?"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:325
+#: public/js/bom_configurator/bom_configurator.bundle.js:363
 msgid "Are you sure you want to delete this Item?"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.js:70
+#: accounts/doctype/subscription/subscription.js:69
 msgid "Are you sure you want to restart this subscription?"
 msgstr ""
 
@@ -7591,13 +7713,13 @@
 msgid "Arrival Quantity"
 msgstr "كمية الوصول"
 
-#: stock/report/serial_no_ledger/serial_no_ledger.js:58
+#: 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:31
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:30
 msgid "As On Date"
 msgstr "كما هو بتاريخ"
 
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:16
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:15
 msgid "As on Date"
 msgstr ""
 
@@ -7620,20 +7742,24 @@
 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}."
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:195
+#: stock/doctype/stock_settings/stock_settings.py:198
 msgid "As there are negative stock, you can not enable {0}."
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:209
+#: stock/doctype/stock_settings/stock_settings.py:212
 msgid "As there are reserved stock, you cannot disable {0}."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1600
+#: manufacturing/doctype/production_plan/production_plan.py:915
+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
 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
 msgstr "نظرًا لوجود مواد خام كافية ، فإن طلب المواد ليس مطلوبًا للمستودع {0}."
 
-#: stock/doctype/stock_settings/stock_settings.py:164
-#: stock/doctype/stock_settings/stock_settings.py:178
+#: stock/doctype/stock_settings/stock_settings.py:167
+#: stock/doctype/stock_settings/stock_settings.py:181
 msgid "As {0} is enabled, you can not enable {1}."
 msgstr ""
 
@@ -7644,13 +7770,13 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/account_balance/account_balance.js:26
+#: accounts/report/account_balance/account_balance.js:25
 #: 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
 #: assets/doctype/asset/asset.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:177
+#: stock/doctype/purchase_receipt/purchase_receipt.js:200
 msgid "Asset"
 msgstr "الأصول"
 
@@ -7800,7 +7926,7 @@
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:37
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:355
 #: assets/doctype/asset_category/asset_category.json
-#: assets/report/fixed_asset_register/fixed_asset_register.js:24
+#: assets/report/fixed_asset_register/fixed_asset_register.js:23
 #: assets/report/fixed_asset_register/fixed_asset_register.py:418
 msgid "Asset Category"
 msgstr "فئة الأصول"
@@ -7897,8 +8023,8 @@
 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:898
-#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:944
+#: 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
 msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
 msgstr ""
@@ -7911,7 +8037,7 @@
 msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:181
+#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:183
 msgid "Asset Depreciation Schedules created:<br>{0}<br><br>Please check, edit if needed, and submit the Asset."
 msgstr ""
 
@@ -8006,7 +8132,7 @@
 
 #. Name of a DocType
 #: assets/doctype/asset_movement/asset_movement.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:184
+#: stock/doctype/purchase_receipt/purchase_receipt.js:211
 msgid "Asset Movement"
 msgstr "حركة الأصول"
 
@@ -8021,7 +8147,7 @@
 msgid "Asset Movement Item"
 msgstr "بند حركة الأصول"
 
-#: assets/doctype/asset/asset.py:901
+#: assets/doctype/asset/asset.py:905
 msgid "Asset Movement record {0} created"
 msgstr "تم إنشاء سجل حركة الأصول {0}\\n<br>\\nAsset Movement record {0} created"
 
@@ -8097,7 +8223,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:91
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:127
-#: accounts/report/account_balance/account_balance.js:39
+#: accounts/report/account_balance/account_balance.js:38
 msgid "Asset Received But Not Billed"
 msgstr "أصل مستلم ولكن غير فاتورة"
 
@@ -8207,35 +8333,35 @@
 msgid "Asset Value Analytics"
 msgstr "تحليلات قيمة الأصول"
 
-#: assets/doctype/asset/asset.py:172
+#: assets/doctype/asset/asset.py:174
 msgid "Asset cancelled"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:506
+#: assets/doctype/asset/asset.py:508
 msgid "Asset cannot be cancelled, as it is already {0}"
 msgstr "لا يمكن إلغاء الأصل، لانه بالفعل {0}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:687
+#: assets/doctype/asset_capitalization/asset_capitalization.py:693
 msgid "Asset capitalized after Asset Capitalization {0} was submitted"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:194
+#: assets/doctype/asset/asset.py:196
 msgid "Asset created"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:633
+#: assets/doctype/asset_capitalization/asset_capitalization.py:639
 msgid "Asset created after Asset Capitalization {0} was submitted"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1156
+#: assets/doctype/asset/asset.py:1160
 msgid "Asset created after being split from Asset {0}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:695
+#: assets/doctype/asset_capitalization/asset_capitalization.py:701
 msgid "Asset decapitalized after Asset Capitalization {0} was submitted"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:197
+#: assets/doctype/asset/asset.py:199
 msgid "Asset deleted"
 msgstr ""
 
@@ -8251,31 +8377,31 @@
 msgid "Asset received at Location {0} and issued to Employee {1}"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:509
+#: assets/doctype/asset/depreciation.py:507
 msgid "Asset restored"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:703
+#: assets/doctype/asset_capitalization/asset_capitalization.py:709
 msgid "Asset restored after Asset Capitalization {0} was cancelled"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1320
+#: accounts/doctype/sales_invoice/sales_invoice.py:1331
 msgid "Asset returned"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:483
+#: assets/doctype/asset/depreciation.py:481
 msgid "Asset scrapped"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:485
+#: assets/doctype/asset/depreciation.py:483
 msgid "Asset scrapped via Journal Entry {0}"
 msgstr "ألغت الأصول عن طريق قيد اليومية {0}\\n<br>\\n Asset scrapped via Journal Entry {0}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1365
 msgid "Asset sold"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:160
+#: assets/doctype/asset/asset.py:161
 msgid "Asset submitted"
 msgstr ""
 
@@ -8283,7 +8409,7 @@
 msgid "Asset transferred to Location {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1080
+#: assets/doctype/asset/asset.py:1084
 msgid "Asset updated after being split into Asset {0}"
 msgstr ""
 
@@ -8299,11 +8425,11 @@
 msgid "Asset {0} cannot be received at a location and given to an employee in a single movement"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:449
+#: assets/doctype/asset/depreciation.py:447
 msgid "Asset {0} cannot be scrapped, as it is already {1}"
 msgstr "لا يمكن إلغاء الأصل {0} ، كما هو بالفعل {1}\\n<br>\\nAsset {0} cannot be scrapped, as it is already {1}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:237
+#: assets/doctype/asset_capitalization/asset_capitalization.py:243
 msgid "Asset {0} does not belong to Item {1}"
 msgstr ""
 
@@ -8319,20 +8445,20 @@
 msgid "Asset {0} does not belongs to the location {1}"
 msgstr "الأصل {0} لا ينتمي إلى الموقع {1}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:759
-#: assets/doctype/asset_capitalization/asset_capitalization.py:859
+#: assets/doctype/asset_capitalization/asset_capitalization.py:765
+#: assets/doctype/asset_capitalization/asset_capitalization.py:865
 msgid "Asset {0} does not exist"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:639
+#: assets/doctype/asset_capitalization/asset_capitalization.py:645
 msgid "Asset {0} has been created. Please set the depreciation details if any and submit it."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:661
+#: assets/doctype/asset_capitalization/asset_capitalization.py:667
 msgid "Asset {0} has been updated. Please set the depreciation details if any and submit it."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:446
+#: assets/doctype/asset/depreciation.py:444
 msgid "Asset {0} must be submitted"
 msgstr "الاصل {0} يجب تقديمه"
 
@@ -8374,7 +8500,7 @@
 msgid "Assets"
 msgstr "الأصول"
 
-#: controllers/buying_controller.py:732
+#: controllers/buying_controller.py:757
 msgid "Assets not created for {0}. You will have to create asset manually."
 msgstr "لم يتم إنشاء الأصول لـ {0}. سيكون عليك إنشاء الأصل يدويًا."
 
@@ -8383,11 +8509,11 @@
 msgid "Assets, Depreciations, Repairs, and more."
 msgstr ""
 
-#: controllers/buying_controller.py:720
+#: controllers/buying_controller.py:745
 msgid "Asset{} {assets_link} created for {}"
 msgstr "الأصل {} {assets_link} الذي تم إنشاؤه لـ {}"
 
-#: manufacturing/doctype/job_card/job_card.js:249
+#: manufacturing/doctype/job_card/job_card.js:281
 msgid "Assign Job to Employee"
 msgstr ""
 
@@ -8409,9 +8535,9 @@
 msgid "Assign to Name"
 msgstr "تعيين للاسم"
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:33
-#: support/report/issue_analytics/issue_analytics.js:82
-#: support/report/issue_summary/issue_summary.js:70
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:32
+#: support/report/issue_analytics/issue_analytics.js:81
+#: support/report/issue_summary/issue_summary.js:69
 msgid "Assigned To"
 msgstr "كلف إلى"
 
@@ -8425,7 +8551,7 @@
 msgid "Assignment Conditions"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1011
+#: assets/doctype/asset/asset.py:1015
 msgid "At least one asset has to be selected."
 msgstr ""
 
@@ -8438,7 +8564,7 @@
 msgstr ""
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:405
-#: accounts/doctype/sales_invoice/sales_invoice.py:509
+#: accounts/doctype/sales_invoice/sales_invoice.py:522
 msgid "At least one mode of payment is required for POS invoice."
 msgstr "يلزم وضع واحد نمط واحد للدفع لفاتورة نقطة البيع.\\n<br>\\nAt least one mode of payment is required for POS invoice."
 
@@ -8450,7 +8576,7 @@
 msgid "At least one of the Selling or Buying must be selected"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:643
+#: stock/doctype/stock_entry/stock_entry.py:598
 msgid "At least one warehouse is mandatory"
 msgstr ""
 
@@ -8458,22 +8584,26 @@
 msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}"
 msgstr "في الصف # {0}: لا يمكن أن يكون معرف التسلسل {1} أقل من معرف تسلسل الصف السابق {2}"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:582
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
 msgid "At row {0}: Batch No is mandatory for Item {1}"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:574
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:569
 msgid "At row {0}: Serial No is mandatory for Item {1}"
 msgstr ""
 
+#: controllers/stock_controller.py:301
+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 ""
+
 #. Description of the 'File to Rename' (Attach) field in DocType 'Rename Tool'
 #: utilities/doctype/rename_tool/rename_tool.json
 msgctxt "Rename Tool"
 msgid "Attach .csv file with two columns, one for the old name and one for the new name"
 msgstr "إرفاق ملف csv مع عمودين، واحدة للاسم القديم واحدة للاسم الجديد"
 
-#: public/js/utils/serial_no_batch_selector.js:246
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:66
+#: public/js/utils/serial_no_batch_selector.js:250
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:69
 msgid "Attach CSV File"
 msgstr ""
 
@@ -8489,7 +8619,7 @@
 msgid "Attachment"
 msgstr "مرفق"
 
-#: templates/pages/order.html:125 templates/pages/projects.html:83
+#: templates/pages/order.html:137 templates/pages/projects.html:83
 msgid "Attachments"
 msgstr "المرفقات"
 
@@ -8669,7 +8799,7 @@
 msgid "Auto Email Report"
 msgstr "ارسال التقارير عبر البريد الالكتروني الياً"
 
-#: public/js/utils/serial_no_batch_selector.js:316
+#: public/js/utils/serial_no_batch_selector.js:322
 msgid "Auto Fetch"
 msgstr "الجلب التلقائي"
 
@@ -8685,7 +8815,7 @@
 msgid "Auto Material Request"
 msgstr "طلب مواد تلقائي"
 
-#: stock/reorder_item.py:242
+#: stock/reorder_item.py:327
 msgid "Auto Material Requests Generated"
 msgstr "إنشاء طلب مواد تلقائي"
 
@@ -8709,7 +8839,7 @@
 msgid "Auto Opt In (For all customers)"
 msgstr "الاشتراك التلقائي (لجميع العملاء)"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:67
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:61
 msgid "Auto Reconcile"
 msgstr ""
 
@@ -8719,7 +8849,7 @@
 msgid "Auto Reconcile Payments"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:414
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:413
 msgid "Auto Reconciliation"
 msgstr ""
 
@@ -8843,7 +8973,7 @@
 msgid "Auto re-order"
 msgstr "إعادة ترتيب تلقائي"
 
-#: public/js/controllers/buying.js:295 public/js/utils/sales_common.js:362
+#: public/js/controllers/buying.js:290 public/js/utils/sales_common.js:403
 msgid "Auto repeat document updated"
 msgstr "تكرار تلقائي للمستندات المحدثة"
 
@@ -8928,7 +9058,7 @@
 msgstr "متاح للاستخدام تاريخ"
 
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:82
-#: public/js/utils.js:522 stock/report/stock_ageing/stock_ageing.py:156
+#: public/js/utils.js:579 stock/report/stock_ageing/stock_ageing.py:156
 msgid "Available Qty"
 msgstr "الكمية المتاحة"
 
@@ -9019,15 +9149,15 @@
 msgid "Available Stock for Packing Items"
 msgstr "المخزون المتاج للأصناف المعبأة"
 
-#: assets/doctype/asset/asset.py:270
+#: assets/doctype/asset/asset.py:272
 msgid "Available for use date is required"
 msgstr "مطلوب تاريخ متاح للاستخدام"
 
-#: stock/doctype/stock_entry/stock_entry.py:772
+#: stock/doctype/stock_entry/stock_entry.py:727
 msgid "Available quantity is {0}, you need {1}"
 msgstr "الكمية المتاحة هي {0} ، تحتاج إلى {1}"
 
-#: stock/dashboard/item_dashboard.js:239
+#: stock/dashboard/item_dashboard.js:247
 msgid "Available {0}"
 msgstr "متاح {0}"
 
@@ -9037,13 +9167,13 @@
 msgid "Available-for-use Date"
 msgstr "التاريخ المتاح للاستخدام"
 
-#: assets/doctype/asset/asset.py:355
+#: assets/doctype/asset/asset.py:357
 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:477
+#: stock/report/stock_balance/stock_balance.py:485
 msgid "Average Age"
 msgstr "متوسط العمر"
 
@@ -9083,7 +9213,7 @@
 msgid "Avg Rate"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:197
+#: stock/report/stock_ledger/stock_ledger.py:270
 msgid "Avg Rate (Balance Stock)"
 msgstr ""
 
@@ -9126,14 +9256,14 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/bom/bom.json manufacturing/doctype/bom/bom_tree.js:8
-#: manufacturing/report/bom_explorer/bom_explorer.js:9
+#: manufacturing/report/bom_explorer/bom_explorer.js:8
 #: manufacturing/report/bom_explorer/bom_explorer.py:56
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:9
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:8
 #: manufacturing/report/bom_stock_report/bom_stock_report.js:5
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
-#: selling/doctype/sales_order/sales_order.js:810
-#: stock/doctype/material_request/material_request.js:243
-#: stock/doctype/stock_entry/stock_entry.js:545
+#: 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/report/bom_search/bom_search.py:38
 msgid "BOM"
 msgstr "قائمة مكونات المواد"
@@ -9204,7 +9334,7 @@
 msgid "BOM 1"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1348
+#: manufacturing/doctype/bom/bom.py:1347
 msgid "BOM 1 {0} and BOM 2 {1} should not be same"
 msgstr "يجب ألا يكون BOM 1 {0} و BOM 2 {1} متطابقين"
 
@@ -9286,7 +9416,7 @@
 msgid "BOM Explosion Item"
 msgstr "قائمة المواد للصنف المفصص"
 
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:21
+#: manufacturing/report/bom_operations_time/bom_operations_time.js:20
 #: manufacturing/report/bom_operations_time/bom_operations_time.py:101
 msgid "BOM ID"
 msgstr "معرف BOM"
@@ -9307,7 +9437,7 @@
 msgid "BOM Level"
 msgstr ""
 
-#: manufacturing/report/bom_variance_report/bom_variance_report.js:9
+#: manufacturing/report/bom_variance_report/bom_variance_report.js:8
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:31
 msgid "BOM No"
 msgstr "رقم قائمة مكونات المواد"
@@ -9418,6 +9548,7 @@
 #. Name of a report
 #. Label of a Link in the Manufacturing Workspace
 #. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:1
 #: manufacturing/report/bom_stock_report/bom_stock_report.json
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "BOM Stock Report"
@@ -9438,7 +9569,7 @@
 msgid "BOM Update Batch"
 msgstr ""
 
-#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:82
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:84
 msgid "BOM Update Initiated"
 msgstr ""
 
@@ -9458,6 +9589,11 @@
 msgid "BOM Update Tool"
 msgstr "أداة تحديث بوم"
 
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_log/bom_update_log.json
+msgid "BOM Update Tool Log with job status maintained"
+msgstr ""
+
 #: manufacturing/doctype/bom_update_log/bom_update_log.py:99
 msgid "BOM Updation already in progress. Please wait until {0} is complete."
 msgstr ""
@@ -9481,12 +9617,12 @@
 msgid "BOM Website Operation"
 msgstr "عملية الموقع الالكتروني بقائمة المواد"
 
-#: stock/doctype/stock_entry/stock_entry.js:1000
+#: stock/doctype/stock_entry/stock_entry.js:1145
 msgid "BOM and Manufacturing Quantity are required"
 msgstr "مطلوب، قائمة مكونات المواد و كمية التصنيع"
 
-#: stock/doctype/material_request/material_request.js:264
-#: stock/doctype/stock_entry/stock_entry.js:581
+#: stock/doctype/material_request/material_request.js:332
+#: stock/doctype/stock_entry/stock_entry.js:669
 msgid "BOM does not contain any stock item"
 msgstr "فاتورة الموارد لا تحتوي على أي صنف مخزون"
 
@@ -9498,15 +9634,15 @@
 msgid "BOM recursion: {1} cannot be parent or child of {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1223
+#: manufacturing/doctype/bom/bom.py:1222
 msgid "BOM {0} does not belong to Item {1}"
 msgstr "قائمة المواد {0} لا تنتمي إلى الصنف {1}"
 
-#: manufacturing/doctype/bom/bom.py:1205
+#: manufacturing/doctype/bom/bom.py:1204
 msgid "BOM {0} must be active"
 msgstr "قائمة مكونات المواد {0} يجب أن تكون نشطة\\n<br>\\nBOM {0} must be active"
 
-#: manufacturing/doctype/bom/bom.py:1208
+#: manufacturing/doctype/bom/bom.py:1207
 msgid "BOM {0} must be submitted"
 msgstr "قائمة مكونات المواد {0} يجب أن تكون مسجلة\\n<br>\\nBOM {0} must be submitted"
 
@@ -9528,11 +9664,11 @@
 msgid "BOMs creation has been enqueued, kindly check the status after some time"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:323
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:334
 msgid "Backdated Stock Entry"
 msgstr "إدخال مخزون مؤرخ"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:15
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
 msgid "Backflush Raw Materials"
 msgstr "المواد الخام Backflush"
 
@@ -9562,10 +9698,11 @@
 msgstr "الموازنة"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:41
+#: accounts/report/general_ledger/general_ledger.html:32
 msgid "Balance (Dr - Cr)"
 msgstr "الرصيد (مدين - دائن)"
 
-#: accounts/report/general_ledger/general_ledger.py:584
+#: accounts/report/general_ledger/general_ledger.py:597
 msgid "Balance ({0})"
 msgstr "الرصيد ({0})"
 
@@ -9582,8 +9719,8 @@
 msgstr "التوازن في العملة الأساسية"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:82
-#: stock/report/stock_balance/stock_balance.py:405
-#: stock/report/stock_ledger/stock_ledger.py:153
+#: stock/report/stock_balance/stock_balance.py:413
+#: stock/report/stock_ledger/stock_ledger.py:226
 msgid "Balance Qty"
 msgstr "كمية الرصيد"
 
@@ -9591,10 +9728,6 @@
 msgid "Balance Qty (Stock)"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:259
-msgid "Balance Serial No"
-msgstr "الرقم التسلسلي للميزان"
-
 #. Name of a report
 #. Label of a Link in the Financial Reports Workspace
 #: accounts/report/balance_sheet/balance_sheet.json
@@ -9627,18 +9760,22 @@
 msgid "Balance Sheet Summary"
 msgstr ""
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:13
+msgid "Balance Stock Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "Balance Stock Value"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:412
-#: stock/report/stock_ledger/stock_ledger.py:217
+#: stock/report/stock_balance/stock_balance.py:420
+#: stock/report/stock_ledger/stock_ledger.py:290
 msgid "Balance Value"
 msgstr "قيمة الرصيد"
 
-#: accounts/doctype/gl_entry/gl_entry.py:355
+#: accounts/doctype/gl_entry/gl_entry.py:309
 msgid "Balance for Account {0} must always be {1}"
 msgstr "رصيد الحساب لـ {0} يجب ان يكون دائما {1}"
 
@@ -9650,7 +9787,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/bank/bank.json
-#: accounts/report/account_balance/account_balance.js:40
+#: accounts/report/account_balance/account_balance.js:39
 msgid "Bank"
 msgstr "مصرف"
 
@@ -9730,7 +9867,7 @@
 #: accounts/doctype/bank_account/bank_account.json
 #: 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:94
+#: buying/doctype/supplier/supplier.js:108
 #: setup/setup_wizard/operations/install_fixtures.py:492
 msgid "Bank Account"
 msgstr "حساب مصرفي"
@@ -9972,6 +10109,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:4
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Bank Reconciliation Statement"
@@ -10030,23 +10168,23 @@
 msgid "Bank Transaction Payments"
 msgstr "مدفوعات المعاملات المصرفية"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:496
+#: public/js/bank_reconciliation_tool/dialog_manager.js:485
 msgid "Bank Transaction {0} Matched"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:544
+#: public/js/bank_reconciliation_tool/dialog_manager.js:533
 msgid "Bank Transaction {0} added as Journal Entry"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:520
+#: public/js/bank_reconciliation_tool/dialog_manager.js:508
 msgid "Bank Transaction {0} added as Payment Entry"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:124
+#: accounts/doctype/bank_transaction/bank_transaction.py:127
 msgid "Bank Transaction {0} is already fully reconciled"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:563
+#: public/js/bank_reconciliation_tool/dialog_manager.js:553
 msgid "Bank Transaction {0} updated"
 msgstr ""
 
@@ -10054,15 +10192,15 @@
 msgid "Bank account cannot be named as {0}"
 msgstr "لا يمكن تسمية الحساب المصرفي باسم {0}"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:130
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:146
 msgid "Bank account {0} already exists and could not be created again"
 msgstr "الحساب المصرفي {0} موجود بالفعل ولا يمكن إنشاؤه مرة أخرى"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:134
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:153
 msgid "Bank accounts added"
 msgstr "الحسابات البنكية المضافة"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:297
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:313
 msgid "Bank transaction creation error"
 msgstr "خطأ في إنشاء معاملة البنك"
 
@@ -10087,7 +10225,7 @@
 msgid "Banking"
 msgstr "الخدمات المصرفية"
 
-#: public/js/utils/barcode_scanner.js:273
+#: public/js/utils/barcode_scanner.js:282
 msgid "Barcode"
 msgstr "الرمز الشريطي"
 
@@ -10214,7 +10352,7 @@
 msgid "Base Tax Withholding Net Total"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:239
 msgid "Base Total"
 msgstr ""
 
@@ -10242,18 +10380,18 @@
 msgid "Base URL"
 msgstr "الرابط الأساسي"
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:28
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:27
 #: accounts/report/profitability_analysis/profitability_analysis.js:16
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:9
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:45
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:39
-#: manufacturing/report/production_planning_report/production_planning_report.js:17
-#: manufacturing/report/work_order_summary/work_order_summary.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:8
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:44
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:38
+#: manufacturing/report/production_planning_report/production_planning_report.js:16
+#: manufacturing/report/work_order_summary/work_order_summary.js:15
 #: public/js/purchase_trends_filters.js:45 public/js/sales_trends_filters.js:20
-#: stock/report/delayed_item_report/delayed_item_report.js:55
-#: stock/report/delayed_order_report/delayed_order_report.js:55
-#: support/report/issue_analytics/issue_analytics.js:17
-#: support/report/issue_summary/issue_summary.js:17
+#: stock/report/delayed_item_report/delayed_item_report.js:54
+#: stock/report/delayed_order_report/delayed_order_report.js:54
+#: support/report/issue_analytics/issue_analytics.js:16
+#: support/report/issue_summary/issue_summary.js:16
 msgid "Based On"
 msgstr "وبناء على"
 
@@ -10269,18 +10407,18 @@
 msgid "Based On"
 msgstr "وبناء على"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:47
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:46
 msgid "Based On Data ( in years )"
 msgstr "على أساس البيانات (بالسنوات)"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:31
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:30
 msgid "Based On Document"
 msgstr "بناء على المستند"
 
-#: accounts/report/accounts_payable/accounts_payable.js:134
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:111
-#: accounts/report/accounts_receivable/accounts_receivable.js:156
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:137
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:114
+#: accounts/report/accounts_receivable/accounts_receivable.js:159
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:132
 msgid "Based On Payment Terms"
 msgstr "بناء على شروط الدفع"
 
@@ -10352,7 +10490,7 @@
 #: 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/stock_ledger/stock_ledger.py:239
+#: 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
 msgid "Batch"
@@ -10393,11 +10531,11 @@
 msgid "Batch Item Expiry Status"
 msgstr "حالة انتهاء صلاحية الدفعة الصنف"
 
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:88
+#: 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:2150
-#: public/js/utils/barcode_scanner.js:251
-#: public/js/utils/serial_no_batch_selector.js:367
+#: public/js/controllers/transaction.js:2193
+#: 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
@@ -10525,15 +10663,15 @@
 msgid "Batch No"
 msgstr "رقم دفعة"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:585
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:580
 msgid "Batch No is mandatory"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2118
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2137
 msgid "Batch No {0} does not exists"
 msgstr ""
 
-#: stock/utils.py:643
+#: stock/utils.py:638
 msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
 msgstr ""
 
@@ -10543,13 +10681,13 @@
 msgid "Batch No."
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Batch Nos"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1113
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1120
 msgid "Batch Nos are created successfully"
 msgstr ""
 
@@ -10569,7 +10707,7 @@
 msgid "Batch Quantity"
 msgstr "كمية الدفعة"
 
-#: manufacturing/doctype/work_order/work_order.js:256
+#: manufacturing/doctype/work_order/work_order.js:271
 msgid "Batch Size"
 msgstr "حجم الدفعة"
 
@@ -10609,7 +10747,7 @@
 msgid "Batch and Serial No"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:485
+#: manufacturing/doctype/work_order/work_order.py:496
 msgid "Batch not created for item {} since it does not have a batch series."
 msgstr ""
 
@@ -10617,12 +10755,12 @@
 msgid "Batch {0} and Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2345
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:272
+#: stock/doctype/stock_entry/stock_entry.py:2379
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:283
 msgid "Batch {0} of Item {1} has expired."
 msgstr "الدفعة {0} للعنصر {1} انتهت صلاحيتها\\n<br>\\nBatch {0} of Item {1} has expired."
 
-#: stock/doctype/stock_entry/stock_entry.py:2347
+#: stock/doctype/stock_entry/stock_entry.py:2381
 msgid "Batch {0} of Item {1} is disabled."
 msgstr "تم تعطيل الدفعة {0} من الصنف {1}."
 
@@ -10662,7 +10800,7 @@
 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:1061
+#: accounts/report/accounts_receivable/accounts_receivable.py:1069
 #: accounts/report/purchase_register/purchase_register.py:214
 msgid "Bill Date"
 msgstr "تاريخ الفاتورة"
@@ -10679,7 +10817,7 @@
 msgid "Bill Date"
 msgstr "تاريخ الفاتورة"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1060
+#: accounts/report/accounts_receivable/accounts_receivable.py:1068
 #: accounts/report/purchase_register/purchase_register.py:213
 msgid "Bill No"
 msgstr "رقم الفاتورة"
@@ -10704,11 +10842,11 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Manufacturing Workspace
-#: manufacturing/doctype/bom/bom.py:1089
+#: manufacturing/doctype/bom/bom.py:1088
 #: 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:533
+#: stock/doctype/stock_entry/stock_entry.js:599
 msgid "Bill of Materials"
 msgstr "فاتورة المواد"
 
@@ -11112,8 +11250,8 @@
 msgid "Blanket Order Rate"
 msgstr "بطالة سعر النظام"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:101
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:265
 msgid "Block Invoice"
 msgstr "حظر الفاتورة"
 
@@ -11252,7 +11390,7 @@
 msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
 msgstr ""
 
-#: accounts/general_ledger.py:685
+#: accounts/general_ledger.py:694
 msgid "Books have been closed till the period ending on {0}"
 msgstr ""
 
@@ -11318,11 +11456,11 @@
 #: accounts/report/gross_profit/gross_profit.py:243
 #: 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:41 public/js/stock_analytics.js:62
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:48
+#: public/js/stock_analytics.js:58 public/js/stock_analytics.js:93
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:47
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:61
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:100
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:101
 #: setup/doctype/brand/brand.json
 #: stock/report/item_price_stock/item_price_stock.py:25
 #: stock/report/item_prices/item_prices.py:53
@@ -11332,10 +11470,10 @@
 #: 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_analytics/stock_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:34
 #: stock/report/stock_analytics/stock_analytics.py:45
-#: stock/report/stock_ledger/stock_ledger.js:65
-#: stock/report/stock_ledger/stock_ledger.py:181
+#: 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
 #: stock/report/stock_projected_qty/stock_projected_qty.py:115
 msgid "Brand"
@@ -11494,16 +11632,16 @@
 msgid "Breakdown"
 msgstr "انهيار"
 
-#: manufacturing/doctype/bom/bom.js:103
+#: manufacturing/doctype/bom/bom.js:102
 msgid "Browse BOM"
 msgstr "تصفح قائمة المواد"
 
 #. Name of a DocType
 #: accounts/doctype/budget/budget.json
-#: accounts/doctype/cost_center/cost_center.js:44
-#: accounts/doctype/cost_center/cost_center_tree.js:42
-#: accounts/doctype/cost_center/cost_center_tree.js:46
-#: accounts/doctype/cost_center/cost_center_tree.js:50
+#: accounts/doctype/cost_center/cost_center.js:45
+#: accounts/doctype/cost_center/cost_center_tree.js:65
+#: accounts/doctype/cost_center/cost_center_tree.js:73
+#: 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
@@ -11527,7 +11665,7 @@
 msgid "Budget Accounts"
 msgstr "حسابات الميزانية"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:82
+#: accounts/report/budget_variance_report/budget_variance_report.js:80
 msgid "Budget Against"
 msgstr "الميزانية مقابل"
 
@@ -11549,17 +11687,17 @@
 msgid "Budget Detail"
 msgstr "تفاصيل الميزانية"
 
-#: accounts/doctype/budget/budget.py:278 accounts/doctype/budget/budget.py:280
+#: accounts/doctype/budget/budget.py:285 accounts/doctype/budget/budget.py:287
 msgid "Budget Exceeded"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center_tree.js:40
+#: accounts/doctype/cost_center/cost_center_tree.js:61
 msgid "Budget List"
 msgstr "قائمة الميزانية"
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/cost_center/cost_center_tree.js:48
+#: accounts/doctype/cost_center/cost_center_tree.js:77
 #: accounts/report/budget_variance_report/budget_variance_report.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Budget Variance Report"
@@ -11632,6 +11770,11 @@
 msgid "Buy"
 msgstr "الشراء"
 
+#. Description of a DocType
+#: selling/doctype/customer/customer.json
+msgid "Buyer of Goods and Services."
+msgstr ""
+
 #. Name of a Workspace
 #. Label of a Card Break in the Buying Workspace
 #: buying/workspace/buying/buying.json
@@ -11730,7 +11873,7 @@
 msgid "Buying must be checked, if Applicable For is selected as {0}"
 msgstr "يجب أن يتم التحقق الشراء، إذا تم تحديد مطبق للك {0}"
 
-#: buying/doctype/buying_settings/buying_settings.js:14
+#: buying/doctype/buying_settings/buying_settings.js:13
 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a <a href='https://docs.erpnext.com/docs/user/manual/en/setting-up/settings/naming-series' target='_blank'>Naming Series</a> choose the 'Naming Series' option."
 msgstr ""
 
@@ -11924,12 +12067,12 @@
 msgid "Call Routing"
 msgstr ""
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:57
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:58
 #: telephony/doctype/incoming_call_settings/incoming_call_settings.py:49
 msgid "Call Schedule Row {0}: To time slot should always be ahead of From time slot."
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:153
+#: public/js/call_popup/call_popup.js:164
 #: telephony/doctype/call_log/call_log.py:135
 msgid "Call Summary"
 msgstr "ملخص الاتصال"
@@ -11940,6 +12083,10 @@
 msgid "Call Summary"
 msgstr "ملخص الاتصال"
 
+#: public/js/call_popup/call_popup.js:186
+msgid "Call Summary Saved"
+msgstr ""
+
 #. Label of a Data field in DocType 'Telephony Call Type'
 #: telephony/doctype/telephony_call_type/telephony_call_type.json
 msgctxt "Telephony Call Type"
@@ -12086,7 +12233,7 @@
 msgid "Can be approved by {0}"
 msgstr "يمكن الموافقة عليها بواسطة {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:1451
+#: manufacturing/doctype/work_order/work_order.py:1465
 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
 msgstr ""
 
@@ -12114,20 +12261,24 @@
 msgid "Can not filter based on Voucher No, if grouped by Voucher"
 msgstr "لا يمكن الفلتره علي اساس (رقم الأيصال)، إذا تم وضعه في مجموعة على اساس (ايصال)"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1226
-#: accounts/doctype/payment_entry/payment_entry.py:2229
+#: accounts/doctype/journal_entry/journal_entry.py:1240
+#: accounts/doctype/payment_entry/payment_entry.py:2254
 msgid "Can only make payment against unbilled {0}"
 msgstr "يمكن إجراء دفعة فقط مقابل فاتورة غير مدفوعة {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1199
-#: controllers/accounts_controller.py:2500 public/js/controllers/accounts.js:90
+#: accounts/doctype/payment_entry/payment_entry.js:1438
+#: controllers/accounts_controller.py:2585 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 ""
 
-#: stock/doctype/stock_settings/stock_settings.py:133
+#: stock/doctype/stock_settings/stock_settings.py:136
 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method"
 msgstr ""
 
+#: templates/pages/task_info.html:24
+msgid "Cancel"
+msgstr "إلغاء"
+
 #. Label of a Check field in DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
 msgctxt "Subscription"
@@ -12158,8 +12309,8 @@
 msgid "Cancelation Date"
 msgstr "تاريخ الإلغاء"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:18
-#: stock/doctype/stock_entry/stock_entry_list.js:19
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:13
+#: stock/doctype/stock_entry/stock_entry_list.js:25
 msgid "Canceled"
 msgstr "ألغيت"
 
@@ -12176,11 +12327,12 @@
 msgstr "ألغيت"
 
 #: accounts/doctype/bank_transaction/bank_transaction_list.js:8
-#: accounts/doctype/payment_request/payment_request_list.js:20
+#: accounts/doctype/payment_request/payment_request_list.js:18
 #: accounts/doctype/subscription/subscription_list.js:14
 #: assets/doctype/asset_repair/asset_repair_list.js:9
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:11
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle_list.js:8
+#: templates/pages/task_info.html:77
 msgid "Cancelled"
 msgstr "ألغيت"
 
@@ -12435,6 +12587,13 @@
 msgid "Cancelled"
 msgstr "ألغيت"
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Cancelled"
+msgstr "ألغيت"
+
 #. Option for the 'Status' (Select) field in DocType 'Warranty Claim'
 #: support/doctype/warranty_claim/warranty_claim.json
 msgctxt "Warranty Claim"
@@ -12447,7 +12606,7 @@
 msgid "Cancelled"
 msgstr "ألغيت"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:76
+#: stock/doctype/delivery_trip/delivery_trip.js:89
 #: stock/doctype/delivery_trip/delivery_trip.py:189
 msgid "Cannot Calculate Arrival Time as Driver Address is Missing."
 msgstr "لا يمكن حساب وقت الوصول حيث أن عنوان برنامج التشغيل مفقود."
@@ -12457,7 +12616,7 @@
 msgid "Cannot Merge"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:105
+#: stock/doctype/delivery_trip/delivery_trip.js:122
 msgid "Cannot Optimize Route as Driver Address is Missing."
 msgstr "لا يمكن تحسين المسار لأن عنوان برنامج التشغيل مفقود."
 
@@ -12473,7 +12632,7 @@
 msgid "Cannot amend {0} {1}, please create a new one instead."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:257
+#: accounts/doctype/journal_entry/journal_entry.py:273
 msgid "Cannot apply TDS against multiple parties in one entry"
 msgstr ""
 
@@ -12481,23 +12640,23 @@
 msgid "Cannot be a fixed asset item as Stock Ledger is created."
 msgstr "لا يمكن أن يكون عنصر الأصول الثابتة كما يتم إنشاء دفتر الأستاذ."
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:222
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:217
 msgid "Cannot cancel as processing of cancelled documents is pending."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:641
+#: manufacturing/doctype/work_order/work_order.py:655
 msgid "Cannot cancel because submitted Stock Entry {0} exists"
 msgstr "لا يمكن الإلغاء لان هناك تدوينات مخزون مقدمة {0} موجوده"
 
-#: stock/stock_ledger.py:196
+#: stock/stock_ledger.py:198
 msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet."
 msgstr ""
 
-#: controllers/buying_controller.py:811
+#: controllers/buying_controller.py:836
 msgid "Cannot cancel this document as it is linked with submitted asset {0}. Please cancel it to continue."
 msgstr "لا يمكن إلغاء هذا المستند لأنه مرتبط بالأصل المقدم {0}. من فضلك قم بإلغائها للمتابعة."
 
-#: stock/doctype/stock_entry/stock_entry.py:365
+#: stock/doctype/stock_entry/stock_entry.py:320
 msgid "Cannot cancel transaction for Completed Work Order."
 msgstr "لا يمكن إلغاء المعاملة لأمر العمل المكتمل."
 
@@ -12509,7 +12668,7 @@
 msgid "Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."
 msgstr "لا يمكن تغيير تاريخ بدء السنه المالية وتاريخ انتهاء السنه المالية بمجرد حفظ السنه المالية.\\n<br>\\nCannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:66
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:70
 msgid "Cannot change Reference Document Type."
 msgstr ""
 
@@ -12521,7 +12680,7 @@
 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:209
+#: setup/doctype/company/company.py:208
 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."
 msgstr "لا يمكن تغيير العملة الافتراضية للشركة، لأن هناك معاملات موجودة. يجب إلغاء المعاملات لتغيير العملة الافتراضية."
 
@@ -12533,32 +12692,32 @@
 msgid "Cannot convert Cost Center to ledger as it has child nodes"
 msgstr "لا يمكن تحويل مركز التكلفة إلى حساب دفتر الأستاذ لانه مرتبط بعقدة فرعية"
 
-#: projects/doctype/task/task.js:48
+#: projects/doctype/task/task.js:50
 msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}."
 msgstr ""
 
-#: accounts/doctype/account/account.py:373
+#: accounts/doctype/account/account.py:392
 msgid "Cannot convert to Group because Account Type is selected."
 msgstr ""
 
-#: accounts/doctype/account/account.py:250
+#: accounts/doctype/account/account.py:269
 msgid "Cannot covert to Group because Account Type is selected."
 msgstr "لا يمكن تحويل الحساب إلى تصنيف مجموعة لأن نوع الحساب تم اختياره."
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:914
+#: stock/doctype/purchase_receipt/purchase_receipt.py:916
 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note_list.js:25
+#: stock/doctype/delivery_note/delivery_note_list.js:35
 msgid "Cannot create a Delivery Trip from Draft documents."
 msgstr "لا يمكن استحداث رحلة تسليم لمستند بحالة مسودة"
 
-#: selling/doctype/sales_order/sales_order.py:1576
-#: stock/doctype/pick_list/pick_list.py:104
+#: selling/doctype/sales_order/sales_order.py:1599
+#: stock/doctype/pick_list/pick_list.py:108
 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 ""
 
-#: accounts/general_ledger.py:127
+#: accounts/general_ledger.py:131
 msgid "Cannot create accounting entries against disabled accounts: {0}"
 msgstr ""
 
@@ -12579,32 +12738,40 @@
 msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
 msgstr "لا يمكن حذف الرقم التسلسلي {0}، لانه يتم استخدامها في قيود المخزون"
 
-#: selling/doctype/sales_order/sales_order.py:638
-#: selling/doctype/sales_order/sales_order.py:661
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:101
+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
 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
 msgstr "لا يمكن ضمان التسليم بواسطة Serial No حيث أن العنصر {0} مضاف مع وبدون ضمان التسليم بواسطة Serial No."
 
-#: public/js/utils/barcode_scanner.js:51
+#: public/js/utils/barcode_scanner.js:54
 msgid "Cannot find Item with this Barcode"
 msgstr "لا يمكن العثور على عنصر بهذا الرمز الشريطي"
 
-#: controllers/accounts_controller.py:3023
+#: controllers/accounts_controller.py:3114
 msgid "Cannot find {} for item {}. Please set the same in Item Master or Stock Settings."
 msgstr "لا يمكن العثور على {} للعنصر {}. يرجى تعيين نفس الشيء في إعدادات المخزون أو العنصر الرئيسي."
 
-#: controllers/accounts_controller.py:1774
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:506
+msgid "Cannot make any transactions until the deletion job is completed"
+msgstr ""
+
+#: controllers/accounts_controller.py:1863
 msgid "Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings"
 msgstr "لا يمكن زيادة حجم العنصر {0} في الصف {1} أكثر من {2}. للسماح بالإفراط في الفوترة ، يرجى تعيين بدل في إعدادات الحسابات"
 
-#: manufacturing/doctype/work_order/work_order.py:292
+#: manufacturing/doctype/work_order/work_order.py:296
 msgid "Cannot produce more Item {0} than Sales Order quantity {1}"
 msgstr "لا يمكن أن تنتج المزيد من البند {0} اكثر من كمية طلب المبيعات {1}"
 
-#: manufacturing/doctype/work_order/work_order.py:962
+#: manufacturing/doctype/work_order/work_order.py:976
 msgid "Cannot produce more item for {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:966
+#: manufacturing/doctype/work_order/work_order.py:980
 msgid "Cannot produce more than {0} items for {1}"
 msgstr ""
 
@@ -12612,8 +12779,8 @@
 msgid "Cannot receive from customer against negative outstanding"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1209
-#: controllers/accounts_controller.py:2515
+#: accounts/doctype/payment_entry/payment_entry.js:1455
+#: controllers/accounts_controller.py:2600
 #: public/js/controllers/accounts.js:100
 msgid "Cannot refer row number greater than or equal to current row number for this Charge type"
 msgstr "لا يمكن أن يشير رقم الصف أكبر من أو يساوي رقم الصف الحالي لهذا النوع المسؤول"
@@ -12622,14 +12789,14 @@
 msgid "Cannot retrieve link token for update. Check Error Log for more information"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:60
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:63
 msgid "Cannot retrieve link token. Check Error Log for more information"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1203
-#: accounts/doctype/payment_entry/payment_entry.js:1374
-#: accounts/doctype/payment_entry/payment_entry.py:1579
-#: controllers/accounts_controller.py:2505 public/js/controllers/accounts.js:94
+#: 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
 #: 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 "لا يمكن تحديد نوع التهمة باسم ' في الصف السابق المبلغ ' أو ' في السابق صف إجمالي \" ل لصف الأول"
@@ -12646,11 +12813,11 @@
 msgid "Cannot set multiple Item Defaults for a company."
 msgstr "لا يمكن تعيين عدة عناصر افتراضية لأي شركة."
 
-#: controllers/accounts_controller.py:3173
+#: controllers/accounts_controller.py:3264
 msgid "Cannot set quantity less than delivered quantity"
 msgstr "لا يمكن ضبط كمية أقل من الكمية المسلمة"
 
-#: controllers/accounts_controller.py:3178
+#: controllers/accounts_controller.py:3269
 msgid "Cannot set quantity less than received quantity"
 msgstr "لا يمكن تعيين كمية أقل من الكمية المستلمة"
 
@@ -12658,7 +12825,7 @@
 msgid "Cannot set the field <b>{0}</b> for copying in variants"
 msgstr "لا يمكن تعيين الحقل <b>{0}</b> للنسخ في المتغيرات"
 
-#: accounts/doctype/payment_entry/payment_entry.js:876
+#: accounts/doctype/payment_entry/payment_entry.js:1050
 msgid "Cannot {0} {1} {2} without any negative outstanding invoice"
 msgstr "{0} {1} {2} لا يمكن  من دون أي فاتورة قائمة سالبة"
 
@@ -12678,7 +12845,7 @@
 msgid "Capacity Planning"
 msgstr "القدرة على التخطيط"
 
-#: manufacturing/doctype/work_order/work_order.py:627
+#: manufacturing/doctype/work_order/work_order.py:641
 msgid "Capacity Planning Error, planned start time can not be same as end time"
 msgstr "خطأ في تخطيط السعة ، لا يمكن أن يكون وقت البدء المخطط له هو نفسه وقت الانتهاء"
 
@@ -12720,7 +12887,7 @@
 msgid "Capital Work In Progress Account"
 msgstr "حساب رأس المال قيد التنفيذ"
 
-#: accounts/report/account_balance/account_balance.js:43
+#: accounts/report/account_balance/account_balance.js:42
 msgid "Capital Work in Progress"
 msgstr "العمل الرأسمالي في التقدم"
 
@@ -12742,7 +12909,7 @@
 msgid "Capitalization Method"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:155
+#: assets/doctype/asset/asset.js:194
 msgid "Capitalize Asset"
 msgstr ""
 
@@ -12784,7 +12951,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:14
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:18
-#: accounts/report/account_balance/account_balance.js:41
+#: accounts/report/account_balance/account_balance.js:40
 #: setup/setup_wizard/operations/install_fixtures.py:208
 msgid "Cash"
 msgstr "نقد"
@@ -12848,7 +13015,7 @@
 msgid "Cash In Hand"
 msgstr "النقدية الحاضرة"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:322
 msgid "Cash or Bank Account is mandatory for making payment entry"
 msgstr "الحساب النقدي أو البنكي مطلوب لعمل مدخل بيع <br>Cash or Bank Account is mandatory for making payment entry"
 
@@ -12870,7 +13037,7 @@
 msgid "Cash/Bank Account"
 msgstr "حساب النقد / البنك"
 
-#: accounts/report/pos_register/pos_register.js:39
+#: accounts/report/pos_register/pos_register.js:38
 #: accounts/report/pos_register/pos_register.py:126
 #: accounts/report/pos_register/pos_register.py:200
 msgid "Cashier"
@@ -12932,7 +13099,7 @@
 msgid "Category-wise Asset Value"
 msgstr "قيمة الأصول حسب الفئة"
 
-#: buying/doctype/purchase_order/purchase_order.py:313
+#: buying/doctype/purchase_order/purchase_order.py:314
 #: buying/doctype/request_for_quotation/request_for_quotation.py:99
 msgid "Caution"
 msgstr "الحذر"
@@ -12977,7 +13144,7 @@
 msgid "Certificate Required"
 msgstr "الشهادة مطلوبة"
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "Change"
 msgstr "تغيير"
 
@@ -12993,7 +13160,7 @@
 msgid "Change Amount"
 msgstr "تغيير المبلغ"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:90
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:108
 msgid "Change Release Date"
 msgstr "تغيير تاريخ الإصدار"
 
@@ -13013,7 +13180,7 @@
 msgid "Change in Stock Value"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:885
+#: accounts/doctype/sales_invoice/sales_invoice.py:902
 msgid "Change the account type to Receivable or select a different account."
 msgstr "قم بتغيير نوع الحساب إلى &quot;ذمم مدينة&quot; أو حدد حسابًا مختلفًا."
 
@@ -13034,7 +13201,11 @@
 msgid "Changes"
 msgstr ""
 
-#: stock/doctype/item/item.js:235
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Changes in {0}"
+msgstr ""
+
+#: stock/doctype/item/item.js:277
 msgid "Changing Customer Group for the selected Customer is not allowed."
 msgstr "لا يسمح بتغيير مجموعة العملاء للعميل المحدد."
 
@@ -13044,12 +13215,12 @@
 msgid "Channel Partner"
 msgstr "شريك القناة"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1634
-#: controllers/accounts_controller.py:2568
+#: accounts/doctype/payment_entry/payment_entry.py:1653
+#: controllers/accounts_controller.py:2653
 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:42
+#: accounts/report/account_balance/account_balance.js:41
 msgid "Chargeable"
 msgstr "خاضع للرسوم"
 
@@ -13065,7 +13236,15 @@
 msgid "Charges Incurred"
 msgstr "الرسوم المتكبدة"
 
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges are updated in Purchase Receipt against each item"
+msgstr ""
+
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges will be distributed proportionately based on item qty or amount, as per your selection"
+msgstr ""
+
+#: selling/page/sales_funnel/sales_funnel.js:45
 msgid "Chart"
 msgstr "خريطة"
 
@@ -13093,10 +13272,10 @@
 msgid "Chart Tree"
 msgstr "شجرة الرسم البياني"
 
-#: accounts/doctype/account/account.js:75
+#: accounts/doctype/account/account.js:70
 #: accounts/doctype/account/account_tree.js:5
-#: accounts/doctype/cost_center/cost_center_tree.js:35
-#: public/js/setup_wizard.js:36 setup/doctype/company/company.js:92
+#: accounts/doctype/cost_center/cost_center_tree.js:52
+#: public/js/setup_wizard.js:37 setup/doctype/company/company.js:96
 msgid "Chart of Accounts"
 msgstr "الشجرة المحاسبية"
 
@@ -13132,7 +13311,7 @@
 msgid "Chart of Accounts Importer"
 msgstr "مخطط حسابات المستورد"
 
-#: accounts/doctype/account/account_tree.js:133
+#: accounts/doctype/account/account_tree.js:181
 #: accounts/doctype/cost_center/cost_center.js:41
 msgid "Chart of Cost Centers"
 msgstr "دليل مراكز التكلفة"
@@ -13143,7 +13322,7 @@
 msgid "Chart of Cost Centers"
 msgstr "دليل مراكز التكلفة"
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:65
+#: manufacturing/report/work_order_summary/work_order_summary.js:64
 msgid "Charts Based On"
 msgstr "الرسوم البيانية على أساس"
 
@@ -13221,7 +13400,12 @@
 msgid "Checking this will round off the tax amount to the nearest integer"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:252
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:148
+msgid "Checkout"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:250
 msgid "Checkout Order / Submit Order / New Order"
 msgstr "طلب الخروج / إرسال الطلب / طلب جديد"
 
@@ -13270,7 +13454,7 @@
 msgid "Cheque Width"
 msgstr "عرض الشيك"
 
-#: public/js/controllers/transaction.js:2061
+#: public/js/controllers/transaction.js:2104
 msgid "Cheque/Reference Date"
 msgstr "تاريخ الصك / السند المرجع"
 
@@ -13291,6 +13475,7 @@
 msgstr "رقم الصك / السند المرجع"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:131
+#: accounts/report/accounts_receivable/accounts_receivable.html:113
 msgid "Cheques Required"
 msgstr "الشيكات المطلوبة"
 
@@ -13308,7 +13493,7 @@
 msgid "Child Task exists for this Task. You can not delete this Task."
 msgstr "مهمة تابعة موجودة لهذه المهمة. لا يمكنك حذف هذه المهمة."
 
-#: stock/doctype/warehouse/warehouse_tree.js:17
+#: stock/doctype/warehouse/warehouse_tree.js:21
 msgid "Child nodes can be only created under 'Group' type nodes"
 msgstr "العقد التابعة يمكن أن تنشأ إلا في إطار 'مجموعة' نوع العُقد"
 
@@ -13327,7 +13512,7 @@
 msgid "Circular Reference Error"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:76
+#: public/js/utils/contact_address_quick_entry.js:79
 msgid "City"
 msgstr "مدينة"
 
@@ -13355,12 +13540,27 @@
 msgid "Class / Percentage"
 msgstr "الفئة / النسبة المئوية"
 
+#. Description of a DocType
+#: setup/doctype/territory/territory.json
+msgid "Classification of Customers by region"
+msgstr ""
+
 #. Label of a Text Editor field in DocType 'Bank Guarantee'
 #: accounts/doctype/bank_guarantee/bank_guarantee.json
 msgctxt "Bank Guarantee"
 msgid "Clauses and Conditions"
 msgstr "الشروط والأحكام"
 
+#: public/js/utils/demo.js:11
+msgid "Clear Demo Data"
+msgstr ""
+
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Clear Notifications"
+msgstr ""
+
 #. Label of a Button field in DocType 'Holiday List'
 #: setup/doctype/holiday_list/holiday_list.json
 msgctxt "Holiday List"
@@ -13368,7 +13568,9 @@
 msgstr "مسح الجدول"
 
 #: 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
+#: templates/form_grid/bank_reconciliation_grid.html:7
 msgid "Clearance Date"
 msgstr "تاريخ الاستحقاق"
 
@@ -13408,11 +13610,11 @@
 msgid "Clearance Date"
 msgstr "تاريخ الاستحقاق"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:115
+#: accounts/doctype/bank_clearance/bank_clearance.py:117
 msgid "Clearance Date not mentioned"
 msgstr "لم يتم ذكر تاريخ الاستحقاق"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:113
+#: accounts/doctype/bank_clearance/bank_clearance.py:115
 msgid "Clearance Date updated"
 msgstr "تم تحديث تاريخ التخليص\\n<br>\\nClearance Date updated"
 
@@ -13420,7 +13622,7 @@
 msgid "Clearing Demo Data..."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:535
+#: manufacturing/doctype/production_plan/production_plan.js:577
 msgid "Click on 'Get Finished Goods for Manufacture' to fetch the items from the above Sales Orders. Items only for which a BOM is present will be fetched."
 msgstr ""
 
@@ -13428,7 +13630,7 @@
 msgid "Click on Add to Holidays. This will populate the holidays table with all the dates that fall on the selected weekly off. Repeat the process for populating the dates for all your weekly holidays"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:530
+#: manufacturing/doctype/production_plan/production_plan.js:572
 msgid "Click on Get Sales Orders to fetch sales orders based on the above filters."
 msgstr ""
 
@@ -13443,6 +13645,10 @@
 msgid "Click on the link below to verify your email and confirm the appointment"
 msgstr "انقر على الرابط أدناه للتحقق من بريدك الإلكتروني وتأكيد الموعد"
 
+#: selling/page/point_of_sale/pos_item_cart.js:468
+msgid "Click to add email / phone"
+msgstr ""
+
 #. Option for the 'Lead Type' (Select) field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -13461,19 +13667,19 @@
 msgid "Client Secret"
 msgstr "سر العميل"
 
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order_list.js:30
-#: crm/doctype/opportunity/opportunity.js:108
-#: manufacturing/doctype/production_plan/production_plan.js:101
-#: manufacturing/doctype/work_order/work_order.js:559
-#: quality_management/doctype/quality_meeting/quality_meeting_list.js:8
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/doctype/sales_order/sales_order_list.js:45
-#: stock/doctype/delivery_note/delivery_note.js:209
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/doctype/issue/issue.js:17
+#: buying/doctype/purchase_order/purchase_order.js:327
+#: buying/doctype/purchase_order/purchase_order_list.js:49
+#: crm/doctype/opportunity/opportunity.js:118
+#: manufacturing/doctype/production_plan/production_plan.js:111
+#: manufacturing/doctype/work_order/work_order.js:589
+#: quality_management/doctype/quality_meeting/quality_meeting_list.js:7
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:588
+#: selling/doctype/sales_order/sales_order_list.js:58
+#: stock/doctype/delivery_note/delivery_note.js:248
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:112
+#: support/doctype/issue/issue.js:21
 msgid "Close"
 msgstr "أغلق"
 
@@ -13483,7 +13689,7 @@
 msgid "Close Issue After Days"
 msgstr "اغلاق المشكلة بعد ايام"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:67
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:69
 msgid "Close Loan"
 msgstr "إغلاق القرض"
 
@@ -13493,17 +13699,18 @@
 msgid "Close Replied Opportunity After Days"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:178
+#: selling/page/point_of_sale/pos_controller.js:200
 msgid "Close the POS"
 msgstr "أغلق POS"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:6
-#: selling/doctype/sales_order/sales_order_list.js:7
-#: stock/doctype/delivery_note/delivery_note_list.js:8
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:8
-#: support/report/issue_analytics/issue_analytics.js:59
-#: support/report/issue_summary/issue_summary.js:47
+#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: selling/doctype/sales_order/sales_order_list.js:18
+#: stock/doctype/delivery_note/delivery_note_list.js:18
+#: 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
+#: templates/pages/task_info.html:76
 msgid "Closed"
 msgstr "مغلق"
 
@@ -13610,11 +13817,11 @@
 msgid "Closed Documents"
 msgstr "وثائق مغلقة"
 
-#: manufacturing/doctype/work_order/work_order.py:1395
+#: manufacturing/doctype/work_order/work_order.py:1409
 msgid "Closed Work Order can not be stopped or Re-opened"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:420
+#: selling/doctype/sales_order/sales_order.py:423
 msgid "Closed order cannot be cancelled. Unclose to cancel."
 msgstr "الطلب المغلق لايمكن إلغاؤه. ازالة الاغلاق لكي تتمكن من الالغاء"
 
@@ -13719,7 +13926,7 @@
 msgid "Code"
 msgstr "رمز"
 
-#: public/js/setup_wizard.js:174
+#: public/js/setup_wizard.js:190
 msgid "Collapse All"
 msgstr "انهيار جميع"
 
@@ -13787,10 +13994,15 @@
 msgid "Column in Bank File"
 msgstr "العمود في ملف البنك"
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:389
+msgid "Column {0}"
+msgstr ""
+
 #: accounts/doctype/payment_terms_template/payment_terms_template.py:40
 msgid "Combined invoice portion must equal 100%"
 msgstr ""
 
+#: templates/pages/task_info.html:86
 #: utilities/report/youtube_interactions/youtube_interactions.py:28
 msgid "Comments"
 msgstr "تعليقات"
@@ -13942,7 +14154,7 @@
 msgid "Communication Medium Type"
 msgstr "الاتصالات المتوسطة النوع"
 
-#: setup/install.py:111
+#: setup/install.py:92
 msgid "Compact Item Print"
 msgstr "مدمجة البند طباعة"
 
@@ -13955,10 +14167,10 @@
 #. Name of a DocType
 #: accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js:8
 #: accounts/doctype/account/account_tree.js:12
-#: accounts/doctype/account/account_tree.js:149
-#: accounts/doctype/cost_center/cost_center_tree.js:8
-#: accounts/doctype/journal_entry/journal_entry.js:72
-#: accounts/report/account_balance/account_balance.js:9
+#: accounts/doctype/account/account_tree.js:212
+#: accounts/doctype/cost_center/cost_center_tree.js:9
+#: accounts/doctype/journal_entry/journal_entry.js:128
+#: accounts/report/account_balance/account_balance.js:8
 #: accounts/report/accounts_payable/accounts_payable.js:8
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:8
 #: accounts/report/accounts_receivable/accounts_receivable.js:10
@@ -13966,13 +14178,13 @@
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:8
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:8
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:8
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:8
-#: accounts/report/budget_variance_report/budget_variance_report.js:74
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:9
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:9
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:9
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:7
+#: accounts/report/budget_variance_report/budget_variance_report.js:72
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:8
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:8
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:8
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:80
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:9
+#: 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
@@ -13983,9 +14195,9 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:227
 #: 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/payment_ledger/payment_ledger.js:9
+#: 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:9
+#: accounts/report/pos_register/pos_register.js:8
 #: accounts/report/pos_register/pos_register.py:110
 #: accounts/report/profitability_analysis/profitability_analysis.js:8
 #: accounts/report/purchase_register/purchase_register.js:33
@@ -13993,78 +14205,79 @@
 #: accounts/report/sales_payment_summary/sales_payment_summary.js:22
 #: accounts/report/sales_register/sales_register.js:33
 #: accounts/report/share_ledger/share_ledger.py:58
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:9
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:9
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:9
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:8
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:8
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:8
 #: accounts/report/trial_balance/trial_balance.js:8
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:8
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:9
-#: assets/report/fixed_asset_register/fixed_asset_register.js:9
-#: buying/report/procurement_tracker/procurement_tracker.js:9
-#: buying/report/purchase_analytics/purchase_analytics.js:50
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:9
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:8
+#: assets/report/fixed_asset_register/fixed_asset_register.js:8
+#: 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/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:9
+#: 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/subcontract_order_summary/subcontract_order_summary.js:8
+#: 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:9
+#: crm/report/lead_details/lead_details.js:8
 #: crm/report/lead_details/lead_details.py:52
-#: crm/report/lost_opportunity/lost_opportunity.js:9
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:59
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:52
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:119
-#: manufacturing/doctype/bom_creator/bom_creator.js:52
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:9
-#: manufacturing/report/job_card_summary/job_card_summary.js:8
-#: manufacturing/report/process_loss_report/process_loss_report.js:8
-#: manufacturing/report/production_analytics/production_analytics.js:9
-#: manufacturing/report/production_planning_report/production_planning_report.js:9
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:8
-#: manufacturing/report/work_order_summary/work_order_summary.js:8
-#: projects/report/project_summary/project_summary.js:9
+#: crm/report/lost_opportunity/lost_opportunity.js:8
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:51
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:128
+#: manufacturing/doctype/bom_creator/bom_creator.js:51
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:2
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:8
+#: manufacturing/report/job_card_summary/job_card_summary.js:7
+#: manufacturing/report/process_loss_report/process_loss_report.js:7
+#: manufacturing/report/production_analytics/production_analytics.js:8
+#: manufacturing/report/production_planning_report/production_planning_report.js:8
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:7
+#: manufacturing/report/work_order_summary/work_order_summary.js:7
+#: projects/report/project_summary/project_summary.js:8
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:44
 #: public/js/financial_statements.js:153 public/js/purchase_trends_filters.js:8
-#: public/js/sales_trends_filters.js:55
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:28
+#: public/js/sales_trends_filters.js:51
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:27
 #: regional/report/irs_1099/irs_1099.js:8
-#: regional/report/uae_vat_201/uae_vat_201.js:9
-#: regional/report/vat_audit_report/vat_audit_report.js:9
-#: selling/page/point_of_sale/pos_controller.js:64
-#: selling/page/sales_funnel/sales_funnel.js:30
+#: regional/report/uae_vat_201/uae_vat_201.js:8
+#: regional/report/vat_audit_report/vat_audit_report.js:8
+#: selling/page/point_of_sale/pos_controller.js:72
+#: selling/page/sales_funnel/sales_funnel.js:33
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:16
 #: selling/report/customer_credit_balance/customer_credit_balance.js:8
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:9
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:8
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:114
 #: selling/report/lost_quotations/lost_quotations.js:8
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:9
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:8
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:46
-#: selling/report/sales_analytics/sales_analytics.js:50
-#: selling/report/sales_order_analysis/sales_order_analysis.js:9
+#: selling/report/sales_analytics/sales_analytics.js:57
+#: selling/report/sales_order_analysis/sales_order_analysis.js:8
 #: selling/report/sales_order_analysis/sales_order_analysis.py:343
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:35
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:9
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:34
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:9
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:33
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:8
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:33
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:8
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:9
-#: selling/report/territory_wise_sales/territory_wise_sales.js:17
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:8
+#: selling/report/territory_wise_sales/territory_wise_sales.js:18
 #: setup/doctype/company/company.json setup/doctype/company/company_tree.js:10
 #: setup/doctype/department/department_tree.js:10
 #: setup/doctype/employee/employee_tree.js:8
 #: stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.js:8
-#: stock/doctype/warehouse/warehouse_tree.js:10
+#: stock/doctype/warehouse/warehouse_tree.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:12
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:8
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:9
-#: stock/report/delayed_item_report/delayed_item_report.js:9
-#: stock/report/delayed_order_report/delayed_order_report.js:9
-#: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:8
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js: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_stock_value_report/incorrect_stock_value_report.js:8
-#: stock/report/item_shortage_report/item_shortage_report.js:9
+#: 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
 #: stock/report/product_bundle_balance/product_bundle_balance.py:115
 #: stock/report/reserved_stock/reserved_stock.js:8
@@ -14073,20 +14286,20 @@
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:73
 #: stock/report/serial_no_ledger/serial_no_ledger.py:37
 #: stock/report/stock_ageing/stock_ageing.js:8
-#: stock/report/stock_analytics/stock_analytics.js:42
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:8
+#: 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:466
+#: stock/report/stock_balance/stock_balance.py:474
 #: stock/report/stock_ledger/stock_ledger.js:8
-#: stock/report/stock_ledger/stock_ledger.py:268
+#: 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:9
-#: stock/report/total_stock_summary/total_stock_summary.js:18
+#: 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/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:9
-#: support/report/issue_analytics/issue_analytics.js:9
-#: support/report/issue_summary/issue_summary.js:9
+#: 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
 msgid "Company"
 msgstr "شركة"
 
@@ -14544,6 +14757,12 @@
 msgid "Company"
 msgstr "شركة"
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Company"
+msgstr "شركة"
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -14838,7 +15057,7 @@
 msgid "Company Abbreviation"
 msgstr "اختصار الشركة"
 
-#: public/js/setup_wizard.js:155
+#: public/js/setup_wizard.js:164
 msgid "Company Abbreviation cannot have more than 5 characters"
 msgstr "لا يمكن أن يحتوي اختصار الشركة على أكثر من 5 أحرف"
 
@@ -15022,7 +15241,7 @@
 msgid "Company Name as per Imported Tally Data"
 msgstr "اسم الشركة حسب بيانات Tally المستوردة"
 
-#: public/js/setup_wizard.js:63
+#: public/js/setup_wizard.js:67
 msgid "Company Name cannot be Company"
 msgstr "اسم الشركة لا يمكن أن تكون شركة"
 
@@ -15064,28 +15283,28 @@
 msgid "Company and Posting Date is mandatory"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2203
+#: accounts/doctype/sales_invoice/sales_invoice.py:2172
 msgid "Company currencies of both the companies should match for Inter Company Transactions."
 msgstr "يجب أن تتطابق عملات الشركة لكلتا الشركتين مع معاملات Inter Inter Company."
 
-#: stock/doctype/material_request/material_request.js:258
-#: stock/doctype/stock_entry/stock_entry.js:575
+#: stock/doctype/material_request/material_request.js:326
+#: stock/doctype/stock_entry/stock_entry.js:663
 msgid "Company field is required"
 msgstr "حقل الشركة مطلوب"
 
-#: accounts/doctype/bank_account/bank_account.py:58
+#: accounts/doctype/bank_account/bank_account.py:72
 msgid "Company is mandatory for company account"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:413
-msgid "Company is mandatory was generating invoice. Please set default company in Global Defaults."
+#: accounts/doctype/subscription/subscription.py:412
+msgid "Company is mandatory for generating an invoice. Please set a default company in Global Defaults."
 msgstr ""
 
-#: setup/doctype/company/company.js:161
+#: setup/doctype/company/company.js:191
 msgid "Company name not same"
 msgstr "اسم الشركة ليس مماثل\\n<br>\\nCompany name not same"
 
-#: assets/doctype/asset/asset.py:206
+#: assets/doctype/asset/asset.py:208
 msgid "Company of asset {0} and purchase document {1} doesn't matches."
 msgstr "شركة الأصل {0} ومستند الشراء {1} غير متطابقين."
 
@@ -15116,15 +15335,15 @@
 msgid "Company which internal supplier represents"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:80
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:85
 msgid "Company {0} already exists. Continuing will overwrite the Company and Chart of Accounts"
 msgstr "الشركة {0} موجودة بالفعل. سيؤدي الاستمرار إلى الكتابة فوق الشركة ومخطط الحسابات"
 
-#: accounts/doctype/account/account.py:443
+#: accounts/doctype/account/account.py:462
 msgid "Company {0} does not exist"
 msgstr "الشركة {0} غير موجودة"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:76
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:80
 msgid "Company {0} is added more than once"
 msgstr ""
 
@@ -15165,7 +15384,7 @@
 msgid "Competitor Name"
 msgstr ""
 
-#: public/js/utils/sales_common.js:417
+#: public/js/utils/sales_common.js:476
 msgid "Competitors"
 msgstr ""
 
@@ -15181,7 +15400,9 @@
 msgid "Competitors"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:61
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:67
+#: manufacturing/doctype/workstation/workstation_job_card.html:68
+#: public/js/projects/timer.js:32
 msgid "Complete"
 msgstr "أكمال"
 
@@ -15197,23 +15418,26 @@
 msgid "Complete"
 msgstr "أكمال"
 
-#: manufacturing/doctype/job_card/job_card.js:263
+#: manufacturing/doctype/job_card/job_card.js:296
 msgid "Complete Job"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Complete Order"
+msgstr ""
+
 #: accounts/doctype/subscription/subscription_list.js:8
 #: assets/doctype/asset_repair/asset_repair_list.js:7
-#: buying/doctype/purchase_order/purchase_order_list.js:24
+#: buying/doctype/purchase_order/purchase_order_list.js:43
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:9
 #: manufacturing/report/job_card_summary/job_card_summary.py:93
 #: manufacturing/report/work_order_summary/work_order_summary.py:151
 #: projects/doctype/timesheet/timesheet_list.js:13
 #: projects/report/project_summary/project_summary.py:95
-#: selling/doctype/sales_order/sales_order_list.js:12
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:9
-#: stock/doctype/delivery_note/delivery_note_list.js:14
+#: selling/doctype/sales_order/sales_order_list.js:23
+#: stock/doctype/delivery_note/delivery_note_list.js:24
 #: stock/doctype/material_request/material_request_list.js:13
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:25
 msgid "Completed"
 msgstr "أكتمل"
 
@@ -15472,11 +15696,12 @@
 msgid "Completed Qty"
 msgstr "الكمية المكتملة"
 
-#: manufacturing/doctype/work_order/work_order.py:885
+#: manufacturing/doctype/work_order/work_order.py:899
 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
 msgstr "لا يمكن أن تكون الكمية المكتملة أكبر من &quot;الكمية إلى التصنيع&quot;"
 
-#: manufacturing/doctype/job_card/job_card.js:277
+#: manufacturing/doctype/job_card/job_card.js:313
+#: manufacturing/doctype/workstation/workstation.js:199
 msgid "Completed Quantity"
 msgstr "الكمية المكتملة"
 
@@ -15611,7 +15836,7 @@
 msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained."
 msgstr ""
 
-#: buying/doctype/buying_settings/buying_settings.js:19
+#: buying/doctype/buying_settings/buying_settings.js:20
 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List."
 msgstr "تكوين قائمة الأسعار الافتراضية عند إنشاء معاملة شراء جديدة. سيتم جلب أسعار العناصر من قائمة الأسعار هذه."
 
@@ -15621,12 +15846,12 @@
 msgid "Confirmation Date"
 msgstr "تاريخ التأكيد"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:37
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:45
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:43
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:51
 msgid "Connect to Quickbooks"
 msgstr "الاتصال Quickbooks"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:59
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:65
 msgid "Connected to QuickBooks"
 msgstr "متصلة QuickBooks"
 
@@ -15636,7 +15861,7 @@
 msgid "Connected to QuickBooks"
 msgstr "متصلة QuickBooks"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:58
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:64
 msgid "Connecting to QuickBooks"
 msgstr "الاتصال QuickBooks"
 
@@ -15742,6 +15967,12 @@
 msgid "Connections"
 msgstr ""
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Connections"
+msgstr ""
+
 #: accounts/report/general_ledger/general_ledger.js:172
 msgid "Consider Accounting Dimensions"
 msgstr "ضع في اعتبارك أبعاد المحاسبة"
@@ -15758,6 +15989,12 @@
 msgid "Consider Minimum Order Qty"
 msgstr ""
 
+#. Label of a Check field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Consider Rejected Warehouses"
+msgstr ""
+
 #. Label of a Select field in DocType 'Purchase Taxes and Charges'
 #: accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
 msgctxt "Purchase Taxes and Charges"
@@ -15855,7 +16092,7 @@
 msgid "Consumed Amount"
 msgstr "القيمة المستهلكة"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:318
+#: assets/doctype/asset_capitalization/asset_capitalization.py:324
 msgid "Consumed Asset Items is mandatory for Decapitalization"
 msgstr ""
 
@@ -15926,7 +16163,7 @@
 msgid "Consumed Stock Items"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:321
+#: assets/doctype/asset_capitalization/asset_capitalization.py:327
 msgid "Consumed Stock Items or Consumed Asset Items is mandatory for Capitalization"
 msgstr ""
 
@@ -16461,9 +16698,9 @@
 msgid "Content Type"
 msgstr "نوع المحتوى"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
-#: public/js/controllers/transaction.js:2074
-#: selling/doctype/quotation/quotation.js:344
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:157
+#: public/js/controllers/transaction.js:2117
+#: selling/doctype/quotation/quotation.js:356
 msgid "Continue"
 msgstr "استمر"
 
@@ -16549,7 +16786,7 @@
 msgstr "شروط وأحكام العقد"
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:76
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:121
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:122
 msgid "Contribution %"
 msgstr ""
 
@@ -16560,10 +16797,14 @@
 msgstr ""
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:88
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:123
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
 msgid "Contribution Amount"
 msgstr "قيمة المساهمة"
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:124
+msgid "Contribution Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Team'
 #: selling/doctype/sales_team/sales_team.json
 msgctxt "Sales Team"
@@ -16582,7 +16823,7 @@
 msgid "Control Historical Stock Transactions"
 msgstr ""
 
-#: public/js/utils.js:684
+#: public/js/utils.js:749
 msgid "Conversion Factor"
 msgstr "معامل التحويل"
 
@@ -16682,7 +16923,7 @@
 msgid "Conversion Factor"
 msgstr "معامل التحويل"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:86
+#: manufacturing/doctype/bom_creator/bom_creator.js:85
 msgid "Conversion Rate"
 msgstr "معدل التحويل"
 
@@ -16708,7 +16949,7 @@
 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}"
 msgstr "معامل التحويل الافتراضي لوحدة القياس يجب أن يكون 1 في الصف {0}"
 
-#: controllers/accounts_controller.py:2384
+#: controllers/accounts_controller.py:2476
 msgid "Conversion rate cannot be 0 or 1"
 msgstr "لا يمكن أن يكون معدل التحويل 0 أو 1"
 
@@ -16718,12 +16959,12 @@
 msgid "Convert Item Description to Clean HTML in Transactions"
 msgstr ""
 
-#: accounts/doctype/account/account.js:106
-#: accounts/doctype/cost_center/cost_center.js:119
+#: accounts/doctype/account/account.js:107
+#: accounts/doctype/cost_center/cost_center.js:123
 msgid "Convert to Group"
 msgstr "تحويل إلى تصنيف (مجموعة)"
 
-#: stock/doctype/warehouse/warehouse.js:61
+#: stock/doctype/warehouse/warehouse.js:58
 msgctxt "Warehouse"
 msgid "Convert to Group"
 msgstr "تحويل إلى تصنيف (مجموعة)"
@@ -16732,17 +16973,17 @@
 msgid "Convert to Item Based Reposting"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.js:60
+#: stock/doctype/warehouse/warehouse.js:57
 msgctxt "Warehouse"
 msgid "Convert to Ledger"
 msgstr ""
 
-#: accounts/doctype/account/account.js:83
-#: accounts/doctype/cost_center/cost_center.js:116
+#: accounts/doctype/account/account.js:79
+#: accounts/doctype/cost_center/cost_center.js:121
 msgid "Convert to Non-Group"
 msgstr "تحويل الي تصنيف (غير المجموعه)"
 
-#: crm/report/lead_details/lead_details.js:41
+#: crm/report/lead_details/lead_details.js:40
 #: selling/page/sales_funnel/sales_funnel.py:58
 msgid "Converted"
 msgstr "تحويل"
@@ -16789,11 +17030,11 @@
 msgid "Corrective Action"
 msgstr "اجراء تصحيحي"
 
-#: manufacturing/doctype/job_card/job_card.js:146
+#: manufacturing/doctype/job_card/job_card.js:155
 msgid "Corrective Job Card"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:151
+#: manufacturing/doctype/job_card/job_card.js:162
 msgid "Corrective Operation"
 msgstr ""
 
@@ -16826,23 +17067,23 @@
 #: 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:1047
+#: accounts/report/accounts_receivable/accounts_receivable.py:1055
 #: 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:643
+#: accounts/report/general_ledger/general_ledger.py:656
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:300
 #: 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/trial_balance/trial_balance.js:49
-#: assets/report/fixed_asset_register/fixed_asset_register.js:30
+#: assets/report/fixed_asset_register/fixed_asset_register.js:29
 #: assets/report/fixed_asset_register/fixed_asset_register.py:461
-#: buying/report/procurement_tracker/procurement_tracker.js:16
+#: buying/report/procurement_tracker/procurement_tracker.js:15
 #: buying/report/procurement_tracker/procurement_tracker.py:32
-#: public/js/financial_statements.js:237
+#: public/js/financial_statements.js:246
 msgid "Cost Center"
 msgstr "مركز التكلفة"
 
@@ -17218,7 +17459,7 @@
 msgid "Cost Center Allocation Percentages"
 msgstr ""
 
-#: public/js/utils/sales_common.js:383
+#: public/js/utils/sales_common.js:435
 msgid "Cost Center For Item with Item Code {0} has been Changed to {1}"
 msgstr ""
 
@@ -17228,7 +17469,7 @@
 msgid "Cost Center Name"
 msgstr "اسم مركز تكلفة"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:25
+#: accounts/doctype/cost_center/cost_center_tree.js:38
 msgid "Cost Center Number"
 msgstr "رقم مركز التكلفة"
 
@@ -17247,8 +17488,8 @@
 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:1235
-#: stock/doctype/purchase_receipt/purchase_receipt.py:788
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1287
+#: stock/doctype/purchase_receipt/purchase_receipt.py:790
 msgid "Cost Center is required in row {0} in Taxes table for type {1}"
 msgstr "مركز التكلفة مطلوب في الصف {0} في جدول الضرائب للنوع {1}\\n<br>\\nCost Center is required in row {0} in Taxes table for type {1}"
 
@@ -17268,11 +17509,11 @@
 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:246
+#: assets/doctype/asset/asset.py:248
 msgid "Cost Center {} doesn't belong to Company {}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:253
+#: assets/doctype/asset/asset.py:255
 msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
 msgstr ""
 
@@ -17312,7 +17553,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:45
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:64
-#: accounts/report/account_balance/account_balance.js:44
+#: accounts/report/account_balance/account_balance.js:43
 msgid "Cost of Goods Sold"
 msgstr "تكلفة البضاعة المباعة"
 
@@ -17424,11 +17665,11 @@
 msgid "Could not auto update shifts. Shift with shift factor {0} needed."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:737
+#: stock/doctype/delivery_note/delivery_note.py:798
 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
 msgstr "تعذر إنشاء إشعار دائن تلقائيًا ، يُرجى إلغاء تحديد &quot;إشعار ائتمان الإصدار&quot; وإرساله مرة أخرى"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:339
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:355
 msgid "Could not detect the Company for updating Bank Accounts"
 msgstr ""
 
@@ -17450,10 +17691,6 @@
 msgid "Could not solve weighted score function. Make sure the formula is valid."
 msgstr "تعذر حل وظيفة النتيجة المرجحة. تأكد من أن الصيغة صالحة."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1030
-msgid "Could not update stock, invoice contains drop shipping item."
-msgstr "تعذر تحديث المخزون، الفاتورة تحتوي علي بند مبعد الشحن."
-
 #. Label of a Int field in DocType 'Shipment Parcel'
 #: stock/doctype/shipment_parcel/shipment_parcel.json
 msgctxt "Shipment Parcel"
@@ -17461,7 +17698,7 @@
 msgstr "عد"
 
 #: crm/report/lead_details/lead_details.py:63
-#: public/js/utils/contact_address_quick_entry.js:86
+#: public/js/utils/contact_address_quick_entry.js:89
 msgid "Country"
 msgstr "الدولة"
 
@@ -17560,6 +17797,12 @@
 msgid "Coupon Code"
 msgstr "رمز الكوبون"
 
+#. Label of a Link field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Coupon Code"
+msgstr "رمز الكوبون"
+
 #. Label of a Link field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
@@ -17590,147 +17833,149 @@
 msgid "Coupon Type"
 msgstr "نوع الكوبون"
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Cr"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:148
-#: accounts/doctype/account/account_tree.js:151
-#: accounts/doctype/dunning/dunning.js:54
-#: accounts/doctype/dunning/dunning.js:56
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:31
-#: accounts/doctype/journal_entry/journal_entry.js:85
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/pos_invoice/pos_invoice.js:51
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:97
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:103
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:114
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: accounts/doctype/account/account_tree.js:209
+#: accounts/doctype/account/account_tree.js:216
+#: accounts/doctype/dunning/dunning.js:55
+#: accounts/doctype/dunning/dunning.js:57
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:34
+#: accounts/doctype/journal_entry/journal_entry.js:139
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/pos_invoice/pos_invoice.js:55
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:127
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:189
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:609
-#: accounts/doctype/sales_invoice/sales_invoice.js:106
-#: accounts/doctype/sales_invoice/sales_invoice.js:108
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:134
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:225
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:654
+#: accounts/doctype/sales_invoice/sales_invoice.js:109
+#: accounts/doctype/sales_invoice/sales_invoice.js:110
 #: accounts/doctype/sales_invoice/sales_invoice.js:121
 #: accounts/doctype/sales_invoice/sales_invoice.js:122
-#: accounts/doctype/sales_invoice/sales_invoice.js:135
-#: accounts/doctype/sales_invoice/sales_invoice.js:142
-#: accounts/doctype/sales_invoice/sales_invoice.js:146
-#: accounts/doctype/sales_invoice/sales_invoice.js:157
-#: accounts/doctype/sales_invoice/sales_invoice.js:164
-#: accounts/doctype/sales_invoice/sales_invoice.js:184
-#: buying/doctype/purchase_order/purchase_order.js:94
-#: buying/doctype/purchase_order/purchase_order.js:310
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: buying/doctype/purchase_order/purchase_order.js:324
-#: buying/doctype/purchase_order/purchase_order.js:330
-#: buying/doctype/purchase_order/purchase_order.js:336
-#: buying/doctype/purchase_order/purchase_order.js:348
+#: accounts/doctype/sales_invoice/sales_invoice.js:136
+#: accounts/doctype/sales_invoice/sales_invoice.js:147
+#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:168
+#: 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/request_for_quotation/request_for_quotation.js:43
-#: buying/doctype/request_for_quotation/request_for_quotation.js:146
-#: buying/doctype/request_for_quotation/request_for_quotation.js:169
-#: buying/doctype/supplier/supplier.js:96
-#: buying/doctype/supplier/supplier.js:100
-#: buying/doctype/supplier_quotation/supplier_quotation.js:24
+#: 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:421
+#: 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
+#: buying/doctype/supplier/supplier.js:112
+#: buying/doctype/supplier/supplier.js:120
 #: buying/doctype/supplier_quotation/supplier_quotation.js:25
+#: buying/doctype/supplier_quotation/supplier_quotation.js:26
 #: buying/doctype/supplier_quotation/supplier_quotation.js:27
-#: crm/doctype/lead/lead.js:35 crm/doctype/lead/lead.js:38
+#: crm/doctype/lead/lead.js:31 crm/doctype/lead/lead.js:37
 #: crm/doctype/lead/lead.js:39 crm/doctype/lead/lead.js:41
-#: crm/doctype/lead/lead.js:220 crm/doctype/opportunity/opportunity.js:85
-#: crm/doctype/opportunity/opportunity.js:90
-#: crm/doctype/opportunity/opportunity.js:97
+#: crm/doctype/lead/lead.js:230 crm/doctype/opportunity/opportunity.js:85
+#: crm/doctype/opportunity/opportunity.js:93
 #: crm/doctype/opportunity/opportunity.js:103
-#: crm/doctype/prospect/prospect.js:12 crm/doctype/prospect/prospect.js:20
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:151
-#: manufacturing/doctype/blanket_order/blanket_order.js:31
-#: manufacturing/doctype/blanket_order/blanket_order.js:41
-#: manufacturing/doctype/blanket_order/blanket_order.js:53
-#: manufacturing/doctype/bom/bom.js:121 manufacturing/doctype/bom/bom.js:126
-#: manufacturing/doctype/bom/bom.js:132 manufacturing/doctype/bom/bom.js:135
-#: manufacturing/doctype/bom/bom.js:344
-#: manufacturing/doctype/bom_creator/bom_creator.js:93
-#: manufacturing/doctype/production_plan/production_plan.js:109
-#: manufacturing/doctype/production_plan/production_plan.js:115
-#: manufacturing/doctype/production_plan/production_plan.js:121
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/doctype/work_order/work_order.js:726
-#: projects/doctype/task/task_tree.js:77 public/js/communication.js:16
-#: public/js/communication.js:24 public/js/communication.js:30
-#: public/js/controllers/transaction.js:300
-#: public/js/controllers/transaction.js:301
-#: public/js/controllers/transaction.js:2188
-#: selling/doctype/customer/customer.js:165
-#: selling/doctype/quotation/quotation.js:119
-#: selling/doctype/quotation/quotation.js:129
-#: selling/doctype/sales_order/sales_order.js:548
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order.js:560
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order.js:570
-#: selling/doctype/sales_order/sales_order.js:571
-#: selling/doctype/sales_order/sales_order.js:576
-#: selling/doctype/sales_order/sales_order.js:581
-#: selling/doctype/sales_order/sales_order.js:582
-#: selling/doctype/sales_order/sales_order.js:587
-#: selling/doctype/sales_order/sales_order.js:599
-#: selling/doctype/sales_order/sales_order.js:605
-#: selling/doctype/sales_order/sales_order.js:606
-#: selling/doctype/sales_order/sales_order.js:608
-#: selling/doctype/sales_order/sales_order.js:739
-#: selling/doctype/sales_order/sales_order.js:847
-#: stock/doctype/delivery_note/delivery_note.js:89
-#: stock/doctype/delivery_note/delivery_note.js:90
-#: stock/doctype/delivery_note/delivery_note.js:104
-#: stock/doctype/delivery_note/delivery_note.js:167
-#: stock/doctype/delivery_note/delivery_note.js:172
-#: stock/doctype/delivery_note/delivery_note.js:176
-#: stock/doctype/delivery_note/delivery_note.js:181
-#: stock/doctype/delivery_note/delivery_note.js:190
-#: stock/doctype/delivery_note/delivery_note.js:196
-#: stock/doctype/delivery_note/delivery_note.js:223
-#: stock/doctype/item/item.js:105 stock/doctype/item/item.js:108
-#: stock/doctype/item/item.js:112 stock/doctype/item/item.js:449
-#: stock/doctype/item/item.js:651
-#: stock/doctype/material_request/material_request.js:114
-#: stock/doctype/material_request/material_request.js:120
-#: stock/doctype/material_request/material_request.js:123
-#: stock/doctype/material_request/material_request.js:128
-#: stock/doctype/material_request/material_request.js:133
-#: stock/doctype/material_request/material_request.js:138
-#: stock/doctype/material_request/material_request.js:143
+#: crm/doctype/opportunity/opportunity.js:112
+#: crm/doctype/prospect/prospect.js:15 crm/doctype/prospect/prospect.js:27
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:159
+#: manufacturing/doctype/blanket_order/blanket_order.js:34
+#: manufacturing/doctype/blanket_order/blanket_order.js:48
+#: manufacturing/doctype/blanket_order/blanket_order.js:64
+#: manufacturing/doctype/bom/bom.js:123 manufacturing/doctype/bom/bom.js:132
+#: manufacturing/doctype/bom/bom.js:142 manufacturing/doctype/bom/bom.js:146
+#: manufacturing/doctype/bom/bom.js:360
+#: manufacturing/doctype/bom_creator/bom_creator.js:92
+#: manufacturing/doctype/plant_floor/plant_floor.js:240
+#: manufacturing/doctype/production_plan/production_plan.js:125
+#: manufacturing/doctype/production_plan/production_plan.js:139
+#: manufacturing/doctype/production_plan/production_plan.js:146
+#: manufacturing/doctype/work_order/work_order.js:301
+#: manufacturing/doctype/work_order/work_order.js:782
+#: projects/doctype/task/task_tree.js:81 public/js/communication.js:19
+#: 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
+#: selling/doctype/customer/customer.js:176
+#: selling/doctype/quotation/quotation.js:125
+#: selling/doctype/quotation/quotation.js:134
+#: selling/doctype/sales_order/sales_order.js:601
+#: selling/doctype/sales_order/sales_order.js:621
+#: selling/doctype/sales_order/sales_order.js:626
+#: selling/doctype/sales_order/sales_order.js:635
+#: selling/doctype/sales_order/sales_order.js:647
+#: selling/doctype/sales_order/sales_order.js:652
+#: selling/doctype/sales_order/sales_order.js:661
+#: selling/doctype/sales_order/sales_order.js:670
+#: selling/doctype/sales_order/sales_order.js:675
+#: selling/doctype/sales_order/sales_order.js:681
+#: selling/doctype/sales_order/sales_order.js:698
+#: selling/doctype/sales_order/sales_order.js:711
+#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:715
+#: selling/doctype/sales_order/sales_order.js:853
+#: selling/doctype/sales_order/sales_order.js:992
+#: stock/doctype/delivery_note/delivery_note.js:91
+#: stock/doctype/delivery_note/delivery_note.js:93
+#: stock/doctype/delivery_note/delivery_note.js:112
+#: stock/doctype/delivery_note/delivery_note.js:185
+#: stock/doctype/delivery_note/delivery_note.js:195
+#: stock/doctype/delivery_note/delivery_note.js:204
+#: stock/doctype/delivery_note/delivery_note.js:214
+#: stock/doctype/delivery_note/delivery_note.js:228
+#: stock/doctype/delivery_note/delivery_note.js:234
+#: stock/doctype/delivery_note/delivery_note.js:270
+#: stock/doctype/item/item.js:135 stock/doctype/item/item.js:142
+#: stock/doctype/item/item.js:150 stock/doctype/item/item.js:517
+#: stock/doctype/item/item.js:725
+#: stock/doctype/material_request/material_request.js:117
+#: stock/doctype/material_request/material_request.js:126
+#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:140
 #: stock/doctype/material_request/material_request.js:148
-#: stock/doctype/material_request/material_request.js:153
 #: stock/doctype/material_request/material_request.js:156
-#: stock/doctype/material_request/material_request.js:314
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/pick_list/pick_list.js:104
-#: stock/doctype/purchase_receipt/purchase_receipt.js:78
-#: stock/doctype/purchase_receipt/purchase_receipt.js:79
-#: stock/doctype/purchase_receipt/purchase_receipt.js:88
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
-#: stock/doctype/purchase_receipt/purchase_receipt.js:234
-#: stock/doctype/stock_entry/stock_entry.js:146
-#: stock/doctype/stock_entry/stock_entry.js:147
-#: stock/doctype/stock_entry/stock_entry.js:217
-#: stock/doctype/stock_entry/stock_entry.js:1065
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:159
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:193
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:63
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
+#: stock/doctype/material_request/material_request.js:164
+#: stock/doctype/material_request/material_request.js:172
+#: stock/doctype/material_request/material_request.js:180
+#: stock/doctype/material_request/material_request.js:184
+#: stock/doctype/material_request/material_request.js:384
+#: stock/doctype/pick_list/pick_list.js:112
+#: stock/doctype/pick_list/pick_list.js:118
+#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/purchase_receipt/purchase_receipt.js:85
+#: stock/doctype/purchase_receipt/purchase_receipt.js:97
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
+#: stock/doctype/purchase_receipt/purchase_receipt.js:263
+#: stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: 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
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:169
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:202
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:212
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:74
-#: support/doctype/issue/issue.js:27
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:88
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:90
+#: support/doctype/issue/issue.js:34
 msgid "Create"
 msgstr "انشاء"
 
-#: manufacturing/doctype/work_order/work_order.js:179
+#: manufacturing/doctype/work_order/work_order.js:190
 msgid "Create BOM"
 msgstr "إنشاء BOM"
 
@@ -17740,14 +17985,18 @@
 msgid "Create Chart Of Accounts Based On"
 msgstr "إنشاء دليل الحسابات استنادا إلى"
 
-#: stock/doctype/delivery_note/delivery_note_list.js:59
+#: stock/doctype/delivery_note/delivery_note_list.js:68
 msgid "Create Delivery Trip"
 msgstr "استحداث رحلة تسليم"
 
-#: assets/doctype/asset/asset.js:122
+#: assets/doctype/asset/asset.js:154
 msgid "Create Depreciation Entry"
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:316
+msgid "Create Document"
+msgstr ""
+
 #: utilities/activation.py:138
 msgid "Create Employee"
 msgstr "إنشاء موظف"
@@ -17766,15 +18015,15 @@
 msgid "Create Grouped Asset"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:48
+#: accounts/doctype/journal_entry/journal_entry.js:96
 msgid "Create Inter Company Journal Entry"
 msgstr "إنشاء Inter Journal Journal Entry"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:45
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:49
 msgid "Create Invoices"
 msgstr "إنشاء الفواتير"
 
-#: manufacturing/doctype/work_order/work_order.js:152
+#: manufacturing/doctype/work_order/work_order.js:159
 msgid "Create Job Card"
 msgstr "إنشاء بطاقة العمل"
 
@@ -17784,7 +18033,7 @@
 msgid "Create Job Card based on Batch Size"
 msgstr ""
 
-#: accounts/doctype/share_transfer/share_transfer.js:20
+#: accounts/doctype/share_transfer/share_transfer.js:18
 msgid "Create Journal Entry"
 msgstr "إنشاء إدخال دفتر اليومية"
 
@@ -17803,8 +18052,8 @@
 msgid "Create Ledger Entries for Change Amount"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:191
-#: selling/doctype/customer/customer.js:236
+#: buying/doctype/supplier/supplier.js:224
+#: selling/doctype/customer/customer.js:257
 msgid "Create Link"
 msgstr ""
 
@@ -17814,45 +18063,45 @@
 msgid "Create Missing Party"
 msgstr "إنشاء طرف مفقود"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:150
+#: manufacturing/doctype/bom_creator/bom_creator.js:146
 msgid "Create Multi-level BOM"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:119
+#: public/js/call_popup/call_popup.js:122
 msgid "Create New Contact"
 msgstr "إنشاء اتصال جديد"
 
-#: public/js/call_popup/call_popup.js:124
+#: public/js/call_popup/call_popup.js:128
 msgid "Create New Customer"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:129
+#: public/js/call_popup/call_popup.js:134
 msgid "Create New Lead"
 msgstr "إنشاء عميل محتمل"
 
 #. Title of an Onboarding Step
-#: crm/doctype/lead/lead.js:198
+#: crm/doctype/lead/lead.js:208
 #: crm/onboarding_step/create_opportunity/create_opportunity.json
 msgid "Create Opportunity"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:60
+#: selling/page/point_of_sale/pos_controller.js:67
 msgid "Create POS Opening Entry"
 msgstr "إنشاء مدخل فتح نقطة البيع"
 
-#: accounts/doctype/payment_order/payment_order.js:31
+#: accounts/doctype/payment_order/payment_order.js:39
 msgid "Create Payment Entries"
 msgstr "إنشاء إدخالات الدفع"
 
-#: accounts/doctype/payment_request/payment_request.js:46
+#: accounts/doctype/payment_request/payment_request.js:58
 msgid "Create Payment Entry"
 msgstr "إنشاء إدخال الدفع"
 
-#: manufacturing/doctype/work_order/work_order.js:588
+#: manufacturing/doctype/work_order/work_order.js:627
 msgid "Create Pick List"
 msgstr "إنشاء قائمة انتقاء"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Create Print Format"
 msgstr "إنشاء تنسيق طباعة"
 
@@ -17883,18 +18132,18 @@
 msgid "Create Receiver List"
 msgstr "إنشاء قائمة استقبال"
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:45
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:81
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:44
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:76
 msgid "Create Reposting Entries"
 msgstr ""
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:53
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:52
 msgid "Create Reposting Entry"
 msgstr ""
 
 #: projects/doctype/timesheet/timesheet.js:54
-#: projects/doctype/timesheet/timesheet.js:203
-#: projects/doctype/timesheet/timesheet.js:207
+#: projects/doctype/timesheet/timesheet.js:230
+#: projects/doctype/timesheet/timesheet.js:234
 msgid "Create Sales Invoice"
 msgstr "إنشاء فاتورة مبيعات"
 
@@ -17908,24 +18157,24 @@
 msgid "Create Sales Orders to help you plan your work and deliver on-time"
 msgstr "قم بإنشاء أوامر المبيعات لمساعدتك في تخطيط عملك وتقديمه في الوقت المحدد"
 
-#: stock/doctype/stock_entry/stock_entry.js:346
+#: stock/doctype/stock_entry/stock_entry.js:399
 msgid "Create Sample Retention Stock Entry"
 msgstr "إنشاء نموذج إدخال مخزون الاحتفاظ"
 
-#: public/js/utils/serial_no_batch_selector.js:220
+#: public/js/utils/serial_no_batch_selector.js:223
 msgid "Create Serial Nos"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:271
-#: stock/doctype/material_request/material_request.js:376
+#: stock/dashboard/item_dashboard.js:279
+#: stock/doctype/material_request/material_request.js:446
 msgid "Create Stock Entry"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:153
+#: buying/doctype/request_for_quotation/request_for_quotation.js:163
 msgid "Create Supplier Quotation"
 msgstr "إنشاء اقتباس مورد"
 
-#: setup/doctype/company/company.js:110
+#: setup/doctype/company/company.js:130
 msgid "Create Tax Template"
 msgstr "إنشاء قالب الضريبة"
 
@@ -17953,11 +18202,11 @@
 msgid "Create Users"
 msgstr "إنشاء المستخدمين"
 
-#: stock/doctype/item/item.js:647
+#: stock/doctype/item/item.js:721
 msgid "Create Variant"
 msgstr "إنشاء متغير"
 
-#: stock/doctype/item/item.js:495 stock/doctype/item/item.js:530
+#: stock/doctype/item/item.js:563 stock/doctype/item/item.js:597
 msgid "Create Variants"
 msgstr "إنشاء المتغيرات"
 
@@ -18064,7 +18313,7 @@
 msgid "Create an Item"
 msgstr ""
 
-#: stock/stock_ledger.py:1684
+#: stock/stock_ledger.py:1704
 msgid "Create an incoming stock transaction for the Item."
 msgstr "قم بإنشاء حركة مخزون واردة للصنف."
 
@@ -18121,7 +18370,7 @@
 msgid "Created {0} scorecards for {1} between:"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:126
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:140
 msgid "Creating Accounts..."
 msgstr "إنشاء حسابات ..."
 
@@ -18129,11 +18378,11 @@
 msgid "Creating Company and Importing Chart of Accounts"
 msgstr "إنشاء شركة واستيراد مخطط الحسابات"
 
-#: selling/doctype/sales_order/sales_order.js:912
+#: selling/doctype/sales_order/sales_order.js:1069
 msgid "Creating Delivery Note ..."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:137
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:143
 msgid "Creating Dimensions..."
 msgstr "إنشاء الأبعاد ..."
 
@@ -18141,34 +18390,34 @@
 msgid "Creating Packing Slip ..."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:1026
+#: selling/doctype/sales_order/sales_order.js:1194
 msgid "Creating Purchase Order ..."
 msgstr "إنشاء أمر شراء ..."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: buying/doctype/purchase_order/purchase_order.js:414
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:709
+#: buying/doctype/purchase_order/purchase_order.js:482
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:71
 msgid "Creating Purchase Receipt ..."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:81
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:146
+#: buying/doctype/purchase_order/purchase_order.js:85
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:155
 msgid "Creating Stock Entry"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:429
+#: buying/doctype/purchase_order/purchase_order.js:497
 msgid "Creating Subcontracting Order ..."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:226
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:247
 msgid "Creating Subcontracting Receipt ..."
 msgstr ""
 
-#: setup/doctype/employee/employee.js:85
+#: setup/doctype/employee/employee.js:87
 msgid "Creating User..."
 msgstr ""
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:52
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:56
 msgid "Creating {0} Invoice"
 msgstr "إنشاء الفاتورة {0}"
 
@@ -18188,22 +18437,24 @@
 msgid "Creation Document No"
 msgstr "إنشاء وثيقة رقم"
 
-#: utilities/bulk_transaction.py:173
+#: utilities/bulk_transaction.py:185
 msgid "Creation of <b><a href='/app/{0}'>{1}(s)</a></b> successful"
 msgstr ""
 
-#: utilities/bulk_transaction.py:190
+#: utilities/bulk_transaction.py:202
 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:181
+#: utilities/bulk_transaction.py:193
 msgid "Creation of {0} partially successful.\n"
 "\t\t\t\tCheck <b><a href=\"/app/bulk-transaction-log\">Bulk Transaction Log</a></b>"
 msgstr ""
 
 #: 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/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
@@ -18225,15 +18476,15 @@
 msgid "Credit"
 msgstr "دائن"
 
-#: accounts/report/general_ledger/general_ledger.py:601
+#: accounts/report/general_ledger/general_ledger.py:614
 msgid "Credit (Transaction)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:578
+#: accounts/report/general_ledger/general_ledger.py:591
 msgid "Credit ({0})"
 msgstr "الائتمان ({0})"
 
-#: accounts/doctype/journal_entry/journal_entry.js:536
+#: accounts/doctype/journal_entry/journal_entry.js:593
 msgid "Credit Account"
 msgstr "حساب دائن"
 
@@ -18301,6 +18552,7 @@
 msgstr "الائتمان أيام"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:49
+#: accounts/report/accounts_receivable/accounts_receivable.html:36
 #: selling/report/customer_credit_balance/customer_credit_balance.py:65
 msgid "Credit Limit"
 msgstr "الحد الائتماني"
@@ -18335,7 +18587,7 @@
 msgid "Credit Limit"
 msgstr "الحد الائتماني"
 
-#: selling/doctype/customer/customer.py:546
+#: selling/doctype/customer/customer.py:558
 msgid "Credit Limit Crossed"
 msgstr ""
 
@@ -18376,7 +18628,8 @@
 msgstr "أشهر الائتمان"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:173
-#: accounts/report/accounts_receivable/accounts_receivable.py:1070
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1078
 #: controllers/sales_and_purchase_return.py:328
 #: setup/setup_wizard/operations/install_fixtures.py:256
 #: stock/doctype/delivery_note/delivery_note.js:84
@@ -18403,10 +18656,11 @@
 msgstr "إشعار دائن"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:200
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Credit Note Amount"
 msgstr "ملاحظة الائتمان المبلغ"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:254
+#: accounts/doctype/sales_invoice/sales_invoice.py:259
 msgid "Credit Note Issued"
 msgstr "الائتمان مذكرة صادرة"
 
@@ -18422,7 +18676,14 @@
 msgid "Credit Note Issued"
 msgstr "الائتمان مذكرة صادرة"
 
-#: stock/doctype/delivery_note/delivery_note.py:734
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+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
 msgid "Credit Note {0} has been created automatically"
 msgstr "تم إنشاء ملاحظة الائتمان {0} تلقائيًا"
 
@@ -18438,16 +18699,16 @@
 msgid "Credit in Company Currency"
 msgstr "المدين في عملة الشركة"
 
-#: selling/doctype/customer/customer.py:512
-#: selling/doctype/customer/customer.py:566
+#: selling/doctype/customer/customer.py:524
+#: selling/doctype/customer/customer.py:579
 msgid "Credit limit has been crossed for customer {0} ({1}/{2})"
 msgstr "تم تجاوز حد الائتمان للعميل {0} ({1} / {2})"
 
-#: selling/doctype/customer/customer.py:328
+#: selling/doctype/customer/customer.py:340
 msgid "Credit limit is already defined for the Company {0}"
 msgstr "تم تحديد حد الائتمان بالفعل للشركة {0}"
 
-#: selling/doctype/customer/customer.py:565
+#: selling/doctype/customer/customer.py:578
 msgid "Credit limit reached for customer {0}"
 msgstr "تم بلوغ حد الائتمان للعميل {0}"
 
@@ -18516,25 +18777,31 @@
 msgid "Criteria weights must add up to 100%"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/website_item_group/website_item_group.json
+msgid "Cross Listing of Item in multiple groups"
+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 "عتبة المعاملة التراكمية"
 
-#: accounts/doctype/account/account_tree.js:121
+#: accounts/doctype/account/account_tree.js:166
 #: accounts/report/account_balance/account_balance.py:28
-#: accounts/report/accounts_receivable/accounts_receivable.py:1079
+#: 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/consolidated_financial_statement/consolidated_financial_statement.js:94
+#: 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/financial_statements.html:29
 #: accounts/report/financial_statements.py:631
 #: 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:644
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:650
 #: accounts/report/payment_ledger/payment_ledger.py:213
 #: accounts/report/profitability_analysis/profitability_analysis.py:175
 #: accounts/report/purchase_register/purchase_register.py:229
@@ -18543,12 +18810,12 @@
 #: 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
-#: manufacturing/doctype/bom_creator/bom_creator.js:77
-#: public/js/financial_statements.js:231 public/js/utils/unreconcile.js:63
+#: 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
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:72
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:85
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:137
 msgid "Currency"
 msgstr "العملة"
 
@@ -18836,12 +19103,12 @@
 msgid "Currency and Price List"
 msgstr "العملة وقائمة الأسعار"
 
-#: accounts/doctype/account/account.py:295
+#: accounts/doctype/account/account.py:314
 msgid "Currency can not be changed after making entries using some other currency"
 msgstr "لا يمكن تغيير العملة بعد إجراء إدخالات باستخدام بعض العملات الأخرى"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1360
-#: accounts/doctype/payment_entry/payment_entry.py:1422 accounts/utils.py:2091
+#: accounts/doctype/payment_entry/payment_entry.py:1379
+#: accounts/doctype/payment_entry/payment_entry.py:1441 accounts/utils.py:2059
 msgid "Currency for {0} must be {1}"
 msgstr "العملة ل {0} يجب أن تكون {1} \\n<br>\\nCurrency for {0} must be {1}"
 
@@ -19054,57 +19321,57 @@
 
 #. Name of a DocType
 #. Name of a role
-#: accounts/doctype/sales_invoice/sales_invoice.js:265
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
+#: 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/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:45
+#: 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/sales_register/sales_register.js:21
 #: accounts/report/sales_register/sales_register.py:185
-#: buying/doctype/supplier/supplier.js:162 crm/doctype/lead/lead.js:35
-#: crm/doctype/opportunity/opportunity.js:94 crm/doctype/prospect/prospect.js:7
+#: 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
-#: projects/doctype/timesheet/timesheet.js:195
+#: projects/doctype/timesheet/timesheet.js:222
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:45
-#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:42
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:22
+#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:39
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:21
 #: selling/doctype/customer/customer.json
 #: selling/doctype/sales_order/sales_order_calendar.js:18
-#: selling/page/point_of_sale/pos_item_cart.js:309
+#: selling/page/point_of_sale/pos_item_cart.js:307
 #: 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:8
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:7
 #: selling/report/inactive_customers/inactive_customers.py:78
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:48
+#: 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:38
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:37
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:19
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:41
 #: selling/report/sales_order_analysis/sales_order_analysis.py:230
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:42
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:40
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:32
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:54
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:53
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:32
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:42
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:40
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:53
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:53
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:64
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:65
 #: setup/doctype/customer_group/customer_group.json
 #: setup/doctype/territory/territory.json
-#: stock/doctype/delivery_note/delivery_note.js:359
-#: stock/doctype/stock_entry/stock_entry.js:300
-#: stock/report/delayed_item_report/delayed_item_report.js:37
+#: stock/doctype/delivery_note/delivery_note.js:405
+#: stock/doctype/stock_entry/stock_entry.js:342
+#: stock/report/delayed_item_report/delayed_item_report.js:36
 #: stock/report/delayed_item_report/delayed_item_report.py:117
-#: stock/report/delayed_order_report/delayed_order_report.js:37
+#: stock/report/delayed_order_report/delayed_order_report.js:36
 #: stock/report/delayed_order_report/delayed_order_report.py:46
-#: support/report/issue_analytics/issue_analytics.js:70
+#: support/report/issue_analytics/issue_analytics.js:69
 #: support/report/issue_analytics/issue_analytics.py:37
-#: support/report/issue_summary/issue_summary.js:58
+#: support/report/issue_summary/issue_summary.js:57
 #: support/report/issue_summary/issue_summary.py:34
 msgid "Customer"
 msgstr "العميل"
@@ -19473,7 +19740,7 @@
 msgid "Customer Code"
 msgstr "رمز العميل"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1027
+#: accounts/report/accounts_receivable/accounts_receivable.py:1035
 msgid "Customer Contact"
 msgstr "معلومات اتصال العميل"
 
@@ -19553,11 +19820,11 @@
 msgstr "ملاحظات العميل"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:118
-#: accounts/report/accounts_receivable/accounts_receivable.py:1097
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:99
+#: accounts/report/accounts_receivable/accounts_receivable.js:121
+#: accounts/report/accounts_receivable/accounts_receivable.py:1105
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:102
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:188
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
+#: 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/item_wise_sales_register/item_wise_sales_register.py:208
@@ -19566,10 +19833,10 @@
 #: public/js/sales_trends_filters.js:26
 #: selling/report/inactive_customers/inactive_customers.py:81
 #: 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:31
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:30
 #: setup/doctype/customer_group/customer_group.json
-#: stock/report/delayed_item_report/delayed_item_report.js:43
-#: stock/report/delayed_order_report/delayed_order_report.js:43
+#: stock/report/delayed_item_report/delayed_item_report.js:42
+#: stock/report/delayed_order_report/delayed_order_report.js:42
 msgid "Customer Group"
 msgstr "مجموعة العميل"
 
@@ -19732,7 +19999,7 @@
 msgid "Customer Group Name"
 msgstr "أسم فئة العميل"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1197
+#: accounts/report/accounts_receivable/accounts_receivable.py:1205
 msgid "Customer Group: {0} does not exist"
 msgstr ""
 
@@ -19753,11 +20020,12 @@
 msgid "Customer Items"
 msgstr "منتجات العميل"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1088
+#: accounts/report/accounts_receivable/accounts_receivable.py:1096
 msgid "Customer LPO"
 msgstr "العميل لبو"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:182
+#: accounts/report/accounts_receivable/accounts_receivable.html:152
 msgid "Customer LPO No."
 msgstr "العميل لبو رقم"
 
@@ -19774,9 +20042,9 @@
 msgid "Customer Mobile No"
 msgstr "رقم محمول العميل"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1034
+#: accounts/report/accounts_receivable/accounts_receivable.py:1042
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:92
+#: 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
@@ -19928,7 +20196,7 @@
 msgid "Customer PO Details"
 msgstr "تفاصيل طلب شراء العميل"
 
-#: public/js/utils/contact_address_quick_entry.js:92
+#: public/js/utils/contact_address_quick_entry.js:95
 msgid "Customer POS Id"
 msgstr "الرقم التعريفي لنقاط البيع للعملاء"
 
@@ -19975,7 +20243,7 @@
 msgid "Customer Provided"
 msgstr "العملاء المقدمة"
 
-#: setup/doctype/company/company.py:359
+#: setup/doctype/company/company.py:358
 msgid "Customer Service"
 msgstr "خدمة العملاء"
 
@@ -20003,7 +20271,7 @@
 msgid "Customer Warehouse (Optional)"
 msgstr "مستودع العميل (اختياري)"
 
-#: selling/page/point_of_sale/pos_item_cart.js:924
+#: selling/page/point_of_sale/pos_item_cart.js:956
 msgid "Customer contact updated successfully."
 msgstr "تم تحديث جهة اتصال العميل بنجاح."
 
@@ -20026,9 +20294,9 @@
 msgid "Customer required for 'Customerwise Discount'"
 msgstr "الزبون مطلوب للخصم المعني بالزبائن"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:986
-#: selling/doctype/sales_order/sales_order.py:335
-#: stock/doctype/delivery_note/delivery_note.py:354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1003
+#: selling/doctype/sales_order/sales_order.py:338
+#: stock/doctype/delivery_note/delivery_note.py:408
 msgid "Customer {0} does not belong to project {1}"
 msgstr "العميل {0} لا ينتمي الى المشروع {1}\\n<br>\\nCustomer {0} does not belong to project {1}"
 
@@ -20190,7 +20458,7 @@
 msgid "DUNN-.MM.-.YY.-"
 msgstr "DUNN-.MM .-. YY.-"
 
-#: public/js/stock_analytics.js:51
+#: public/js/stock_analytics.js:81
 msgid "Daily"
 msgstr "يوميا"
 
@@ -20299,7 +20567,7 @@
 msgid "Dashboard"
 msgstr "لوحة القيادة"
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:15
 msgid "Data Based On"
 msgstr ""
 
@@ -20320,17 +20588,19 @@
 msgid "Data exported from Tally that consists of the Chart of Accounts, Customers, Suppliers, Addresses, Items and UOMs"
 msgstr "البيانات المصدرة من Tally والتي تتكون من مخطط الحسابات والعملاء والموردين والعناوين والعناصر ووحدات القياس"
 
-#: accounts/doctype/journal_entry/journal_entry.js:542
+#: accounts/doctype/journal_entry/journal_entry.js:603
 #: 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:16
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:37
+#: accounts/report/account_balance/account_balance.js:15
+#: accounts/report/accounts_receivable/accounts_receivable.html:132
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:38
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:26
+#: accounts/report/general_ledger/general_ledger.html:27
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:26
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:22
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:38
-#: accounts/report/share_balance/share_balance.js:10
-#: accounts/report/share_ledger/share_ledger.js:10
+#: 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
@@ -20338,12 +20608,12 @@
 #: 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
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:19
-#: public/js/bank_reconciliation_tool/data_table_manager.js:40
+#: public/js/bank_reconciliation_tool/data_table_manager.js:39
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:34
 #: selling/report/sales_order_analysis/sales_order_analysis.py:220
 #: stock/report/product_bundle_balance/product_bundle_balance.js:8
 #: stock/report/reserved_stock/reserved_stock.py:89
-#: stock/report/stock_ledger/stock_ledger.py:107
+#: stock/report/stock_ledger/stock_ledger.py:180
 #: support/report/first_response_time_for_issues/first_response_time_for_issues.py:11
 #: support/report/support_hour_distribution/support_hour_distribution.py:68
 msgid "Date"
@@ -20523,7 +20793,7 @@
 msgid "Date "
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:98
+#: assets/report/fixed_asset_register/fixed_asset_register.js:97
 msgid "Date Based On"
 msgstr "تاريخ بناء على"
 
@@ -20560,7 +20830,7 @@
 msgid "Date of Commencement"
 msgstr "تاريخ البدء"
 
-#: setup/doctype/company/company.js:70
+#: setup/doctype/company/company.js:69
 msgid "Date of Commencement should be greater than Date of Incorporation"
 msgstr "يجب أن يكون تاريخ البدء أكبر من تاريخ التأسيس"
 
@@ -20588,7 +20858,7 @@
 msgid "Date of Joining"
 msgstr "تاريخ الالتحاق بالعمل"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:265
 msgid "Date of Transaction"
 msgstr "تاريخ المعاملة"
 
@@ -20693,7 +20963,7 @@
 msgid "Days Since Last Order"
 msgstr "أيام منذ آخر طلب"
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:35
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:34
 msgid "Days Since Last order"
 msgstr "الأيام منذ آخر طلب"
 
@@ -20726,12 +20996,14 @@
 msgid "Dear"
 msgstr "العزيز"
 
-#: stock/reorder_item.py:285
+#: stock/reorder_item.py:370
 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/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
@@ -20753,15 +21025,15 @@
 msgid "Debit"
 msgstr "مدين"
 
-#: accounts/report/general_ledger/general_ledger.py:594
+#: accounts/report/general_ledger/general_ledger.py:607
 msgid "Debit (Transaction)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:572
+#: accounts/report/general_ledger/general_ledger.py:585
 msgid "Debit ({0})"
 msgstr "مدين ({0})"
 
-#: accounts/doctype/journal_entry/journal_entry.js:530
+#: accounts/doctype/journal_entry/journal_entry.js:583
 msgid "Debit Account"
 msgstr "حساب مدين"
 
@@ -20796,10 +21068,11 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:175
-#: accounts/report/accounts_receivable/accounts_receivable.py:1073
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1081
 #: controllers/sales_and_purchase_return.py:332
 #: setup/setup_wizard/operations/install_fixtures.py:257
-#: stock/doctype/purchase_receipt/purchase_receipt.js:73
+#: stock/doctype/purchase_receipt/purchase_receipt.js:76
 msgid "Debit Note"
 msgstr "إشعار مدين"
 
@@ -20817,6 +21090,7 @@
 msgstr "إشعار مدين"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:202
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Debit Note Amount"
 msgstr "مبلغ إشعار المدين"
 
@@ -20826,6 +21100,13 @@
 msgid "Debit Note Issued"
 msgstr "تم اصدار إشعار الخصم"
 
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Debit Note will update it's own outstanding amount, even if \"Return Against\" is specified."
+msgstr ""
+
 #. Label of a Link field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -20838,11 +21119,11 @@
 msgid "Debit To"
 msgstr "الخصم ل"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
 msgid "Debit To is required"
 msgstr "مدين الى مطلوب"
 
-#: accounts/general_ledger.py:465
+#: accounts/general_ledger.py:474
 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
 msgstr "المدين و الدائن غير متساوي ل {0} # {1}. الفرق هو {2}."
 
@@ -20882,7 +21163,7 @@
 msgid "Decapitalized"
 msgstr ""
 
-#: public/js/utils/sales_common.js:444
+#: public/js/utils/sales_common.js:503
 msgid "Declare Lost"
 msgstr "أعلن فقدت"
 
@@ -21014,15 +21295,15 @@
 msgid "Default BOM ({0}) must be active for this item or its template"
 msgstr "يجب أن تكون قائمة المواد الافتراضية ({0}) نشطة لهذا الصنف أو قوالبه"
 
-#: manufacturing/doctype/work_order/work_order.py:1234
+#: manufacturing/doctype/work_order/work_order.py:1248
 msgid "Default BOM for {0} not found"
 msgstr "فاتورة المواد ل {0} غير موجودة\\n<br>\\nDefault BOM for {0} not found"
 
-#: controllers/accounts_controller.py:3216
+#: controllers/accounts_controller.py:3307
 msgid "Default BOM not found for FG Item {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1231
+#: manufacturing/doctype/work_order/work_order.py:1245
 msgid "Default BOM not found for Item {0} and Project {1}"
 msgstr "لم يتم العثور على قائمة المواد الافتراضية للمادة {0} والمشروع {1}"
 
@@ -21480,11 +21761,11 @@
 msgid "Default Unit of Measure"
 msgstr "وحدة القياس الافتراضية"
 
-#: stock/doctype/item/item.py:1233
+#: stock/doctype/item/item.py:1234
 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:1216
+#: stock/doctype/item/item.py:1217
 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 "لا يمكن تغيير وحدة القياس الافتراضية للبند {0} مباشرة لأنك قمت بالفعل ببعض المعاملات (المعاملة) مع UOM أخرى. ستحتاج إلى إنشاء عنصر جديد لاستخدام واجهة مستخدم افتراضية مختلفة.\\n<br>\\nDefault 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."
 
@@ -21571,7 +21852,12 @@
 msgid "Default account will be automatically updated in POS Invoice when this mode is selected."
 msgstr "سيتم تحديث الحساب الافتراضي تلقائيا في فاتورة نقاط البيع عند تحديد هذا الوضع."
 
-#: setup/doctype/company/company.js:133
+#. Description of a DocType
+#: stock/doctype/stock_settings/stock_settings.json
+msgid "Default settings for your stock-related transactions"
+msgstr ""
+
+#: setup/doctype/company/company.js:160
 msgid "Default tax templates for sales, purchase and items are created."
 msgstr ""
 
@@ -21752,7 +22038,7 @@
 msgid "Delayed Tasks Summary"
 msgstr ""
 
-#: setup/doctype/company/company.js:176
+#: setup/doctype/company/company.js:207
 msgid "Delete"
 msgstr "حذف"
 
@@ -21762,21 +22048,39 @@
 msgid "Delete Accounting and Stock Ledger Entries on deletion of Transaction"
 msgstr ""
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Bins"
+msgstr ""
+
 #. Label of a Check field in DocType 'Repost Accounting Ledger'
 #: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
 msgctxt "Repost Accounting Ledger"
 msgid "Delete Cancelled Ledger Entries"
 msgstr ""
 
-#: stock/doctype/inventory_dimension/inventory_dimension.js:50
+#: stock/doctype/inventory_dimension/inventory_dimension.js:66
 msgid "Delete Dimension"
 msgstr ""
 
-#: setup/doctype/company/company.js:117
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Leads and Addresses"
+msgstr ""
+
+#: setup/doctype/company/company.js:141
 msgid "Delete Transactions"
 msgstr ""
 
-#: setup/doctype/company/company.js:176
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Transactions"
+msgstr ""
+
+#: setup/doctype/company/company.js:206
 msgid "Delete all the Transactions for this Company"
 msgstr "حذف كل المعاملات المتعلقة بالشركة\\n<br>\\nDelete all the Transactions for this Company"
 
@@ -21786,12 +22090,16 @@
 msgid "Deleted Documents"
 msgstr "المستندات المحذوفة"
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:489
+msgid "Deletion in Progress!"
+msgstr ""
+
 #: regional/__init__.py:14
 msgid "Deletion is not permitted for country {0}"
 msgstr "الحذف غير مسموح به في البلد {0}"
 
-#: buying/doctype/purchase_order/purchase_order.js:297
-#: buying/doctype/purchase_order/purchase_order_list.js:10
+#: 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
 msgid "Delivered"
@@ -21904,7 +22212,7 @@
 msgid "Delivery"
 msgstr "تسليم"
 
-#: public/js/utils.js:678
+#: public/js/utils.js:742 selling/doctype/sales_order/sales_order.js:1012
 #: selling/report/sales_order_analysis/sales_order_analysis.py:321
 msgid "Delivery Date"
 msgstr "تاريخ التسليم"
@@ -21937,17 +22245,17 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:281
-#: accounts/doctype/sales_invoice/sales_invoice_list.js:27
+#: 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
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order_list.js:57
+#: selling/doctype/sales_order/sales_order.js:619
+#: selling/doctype/sales_order/sales_order_list.js:70
 #: stock/doctype/delivery_note/delivery_note.json
-#: stock/doctype/delivery_trip/delivery_trip.js:51
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/delivery_trip/delivery_trip.js:52
+#: stock/doctype/pick_list/pick_list.js:110
+#: stock/doctype/purchase_receipt/purchase_receipt.js:90
 msgid "Delivery Note"
 msgstr "إشعار التسليم"
 
@@ -22063,16 +22371,16 @@
 msgid "Delivery Note Trends"
 msgstr "توجهات إشعارات التسليم"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1148
+#: accounts/doctype/sales_invoice/sales_invoice.py:1155
 msgid "Delivery Note {0} is not submitted"
 msgstr "لم يتم اعتماد ملاحظه التسليم {0}\\n<br>\\nDelivery Note {0} is not submitted"
 
-#: stock/doctype/pick_list/pick_list.py:885
+#: stock/doctype/pick_list/pick_list.py:1005
 msgid "Delivery Note(s) created for the Pick List"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1092
-#: stock/doctype/delivery_trip/delivery_trip.js:67
+#: accounts/report/accounts_receivable/accounts_receivable.py:1100
+#: stock/doctype/delivery_trip/delivery_trip.js:72
 msgid "Delivery Notes"
 msgstr "مذكرات التسليم"
 
@@ -22119,7 +22427,7 @@
 msgstr "التسليم إلى"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:180
+#: stock/doctype/delivery_note/delivery_note.js:210
 #: stock/doctype/delivery_trip/delivery_trip.json
 msgid "Delivery Trip"
 msgstr "رحلة التسليم"
@@ -22151,7 +22459,7 @@
 msgid "Delivery to"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:351
+#: selling/doctype/sales_order/sales_order.py:354
 msgid "Delivery warehouse required for stock item {0}"
 msgstr "مستودع التسليم مطلوب للبند المستودعي {0}\\n<br>\\nDelivery warehouse required for stock item {0}"
 
@@ -22270,7 +22578,7 @@
 msgid "Depends on Tasks"
 msgstr "تعتمد على المهام"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:61
+#: public/js/bank_reconciliation_tool/data_table_manager.js:60
 msgid "Deposit"
 msgstr ""
 
@@ -22312,7 +22620,7 @@
 
 #: 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:45
+#: accounts/report/account_balance/account_balance.js:44
 #: accounts/report/cash_flow/cash_flow.py:129
 msgid "Depreciation"
 msgstr "إهلاك"
@@ -22331,7 +22639,7 @@
 msgstr "إهلاك"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:149
-#: assets/doctype/asset/asset.js:241
+#: assets/doctype/asset/asset.js:276
 msgid "Depreciation Amount"
 msgstr "قيمة الإهلاك"
 
@@ -22394,7 +22702,7 @@
 msgid "Depreciation Expense Account"
 msgstr "حساب نفقات الاهلاك"
 
-#: assets/doctype/asset/depreciation.py:390
+#: assets/doctype/asset/depreciation.py:388
 msgid "Depreciation Expense Account should be an Income or Expense Account."
 msgstr ""
 
@@ -22428,19 +22736,19 @@
 msgid "Depreciation Posting Date"
 msgstr "تاريخ ترحيل الإهلاك"
 
-#: assets/doctype/asset/asset.js:661
+#: assets/doctype/asset/asset.js:780
 msgid "Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:491
+#: assets/doctype/asset/asset.py:493
 msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
 msgstr "صف الإهلاك {0}: يجب أن تكون القيمة المتوقعة بعد العمر الافتراضي أكبر من أو تساوي {1}"
 
-#: assets/doctype/asset/asset.py:460
+#: assets/doctype/asset/asset.py:462
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date"
 msgstr "صف الإهلاك {0}: لا يمكن أن يكون تاريخ الاستهلاك التالي قبل تاريخ المتاح للاستخدام"
 
-#: assets/doctype/asset/asset.py:451
+#: assets/doctype/asset/asset.py:453
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date"
 msgstr "صف الإهلاك {0}: لا يمكن أن يكون تاريخ الاستهلاك قبل تاريخ الشراء"
 
@@ -22475,7 +22783,7 @@
 msgid "Depreciation Schedule View"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:347
+#: assets/doctype/asset/asset.py:349
 msgid "Depreciation cannot be calculated for fully depreciated assets"
 msgstr ""
 
@@ -22485,12 +22793,15 @@
 #: 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
+#: manufacturing/doctype/bom/bom_item_preview.html:12
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:58
+#: 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:56
-#: public/js/controllers/transaction.js:2138
-#: selling/doctype/quotation/quotation.js:279
+#: public/js/bank_reconciliation_tool/data_table_manager.js:55
+#: public/js/controllers/transaction.js:2181
+#: 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
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:26
@@ -22501,7 +22812,7 @@
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:59
 #: stock/report/product_bundle_balance/product_bundle_balance.py:112
 #: stock/report/stock_ageing/stock_ageing.py:126
-#: stock/report/stock_ledger/stock_ledger.py:187
+#: 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
@@ -23067,7 +23378,7 @@
 msgid "Desk User"
 msgstr ""
 
-#: public/js/utils/sales_common.js:423
+#: public/js/utils/sales_common.js:482
 msgid "Detailed Reason"
 msgstr "سبب مفصل"
 
@@ -23083,6 +23394,10 @@
 msgid "Detailed Reason"
 msgstr "سبب مفصل"
 
+#: templates/pages/task_info.html:49
+msgid "Details"
+msgstr "تفاصيل"
+
 #. Label of a Long Text field in DocType 'Appointment'
 #: crm/doctype/appointment/appointment.json
 msgctxt "Appointment"
@@ -23143,6 +23458,12 @@
 msgid "Details"
 msgstr "تفاصيل"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Details"
+msgstr "تفاصيل"
+
 #. Label of a Select field in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
 msgctxt "Accounts Settings"
@@ -23156,7 +23477,7 @@
 msgstr "ديزل"
 
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:175
-#: public/js/bank_reconciliation_tool/number_card.js:31
+#: 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
 msgid "Difference"
@@ -23186,7 +23507,7 @@
 msgid "Difference (Dr - Cr)"
 msgstr "الفرق ( المدين -  الدائن )"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:287
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:294
 msgid "Difference Account"
 msgstr "حساب الفرق"
 
@@ -23215,15 +23536,15 @@
 msgid "Difference Account"
 msgstr "حساب الفرق"
 
-#: stock/doctype/stock_entry/stock_entry.py:573
+#: stock/doctype/stock_entry/stock_entry.py:528
 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:714
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:768
 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"
 msgstr "حساب الفرق يجب أن يكون حساب الأصول / حساب نوع الالتزام، حيث يعتبر تسوية المخزون بمثابة مدخل افتتاح\\n<br>\\nDifference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:301
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:309
 msgid "Difference Amount"
 msgstr "مقدار الفرق"
 
@@ -23287,7 +23608,7 @@
 msgid "Difference Value"
 msgstr "قيمة الفرق"
 
-#: stock/doctype/delivery_note/delivery_note.js:366
+#: stock/doctype/delivery_note/delivery_note.js:414
 msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
 msgstr ""
 
@@ -23307,7 +23628,7 @@
 msgid "Dimension Details"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:94
+#: accounts/report/budget_variance_report/budget_variance_report.js:92
 msgid "Dimension Filter"
 msgstr "مرشح البعد"
 
@@ -23477,7 +23798,7 @@
 msgstr ""
 
 #: selling/report/customer_credit_balance/customer_credit_balance.py:70
-#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:8
+#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:16
 #: stock/doctype/putaway_rule/putaway_rule_list.js:5
 msgid "Disabled"
 msgstr "معطل"
@@ -23626,19 +23947,19 @@
 msgid "Disabled"
 msgstr "معطل"
 
-#: accounts/general_ledger.py:128
+#: accounts/general_ledger.py:132
 msgid "Disabled Account Selected"
 msgstr ""
 
-#: stock/utils.py:454
+#: stock/utils.py:449
 msgid "Disabled Warehouse {0} cannot be used for this transaction."
 msgstr ""
 
-#: controllers/accounts_controller.py:550
+#: controllers/accounts_controller.py:594
 msgid "Disabled pricing rules since this {} is an internal transfer"
 msgstr ""
 
-#: controllers/accounts_controller.py:564
+#: controllers/accounts_controller.py:608
 msgid "Disabled tax included prices since this {} is an internal transfer"
 msgstr ""
 
@@ -23653,11 +23974,11 @@
 msgid "Disables auto-fetching of existing quantity"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:62
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:64
 msgid "Disburse Loan"
 msgstr "صرف القرض"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:12
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
 msgid "Disbursed"
 msgstr "مصروف"
 
@@ -23667,7 +23988,8 @@
 msgid "Disbursed"
 msgstr "مصروف"
 
-#: selling/page/point_of_sale/pos_item_cart.js:380
+#: selling/page/point_of_sale/pos_item_cart.js:387
+#: templates/form_grid/item_grid.html:71
 msgid "Discount"
 msgstr "خصم"
 
@@ -23933,7 +24255,7 @@
 msgid "Discount and Margin"
 msgstr "الخصم والهامش"
 
-#: selling/page/point_of_sale/pos_item_cart.js:761
+#: selling/page/point_of_sale/pos_item_cart.js:791
 msgid "Discount cannot be greater than 100%"
 msgstr ""
 
@@ -23941,7 +24263,7 @@
 msgid "Discount must be less than 100"
 msgstr "يجب أن يكون الخصم أقل من 100"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2532
+#: accounts/doctype/payment_entry/payment_entry.py:2561
 msgid "Discount of {} applied as per Payment Term"
 msgstr ""
 
@@ -24027,7 +24349,7 @@
 msgid "Dislikes"
 msgstr "يكره"
 
-#: setup/doctype/company/company.py:353
+#: setup/doctype/company/company.py:352
 msgid "Dispatch"
 msgstr "ارسال"
 
@@ -24135,6 +24457,11 @@
 msgid "Distinct Item and Warehouse"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/serial_no/serial_no.json
+msgid "Distinct unit of an Item"
+msgstr ""
+
 #. Label of a Select field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
@@ -24181,7 +24508,7 @@
 msgid "Divorced"
 msgstr "مطلق"
 
-#: crm/report/lead_details/lead_details.js:42
+#: crm/report/lead_details/lead_details.js:41
 msgid "Do Not Contact"
 msgstr "عدم الاتصال"
 
@@ -24203,6 +24530,12 @@
 msgid "Do Not Explode"
 msgstr ""
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Do Not Update Serial / Batch on Creation of Auto Bundle"
+msgstr ""
+
 #. Description of the 'Hide Currency Symbol' (Select) field in DocType 'Global
 #. Defaults'
 #: setup/doctype/global_defaults/global_defaults.json
@@ -24216,29 +24549,49 @@
 msgid "Do not update variants on save"
 msgstr "لا تقم بتحديث المتغيرات عند الحفظ"
 
-#: assets/doctype/asset/asset.js:683
+#: assets/doctype/asset/asset.js:800
 msgid "Do you really want to restore this scrapped asset?"
 msgstr "هل تريد حقا  استعادة هذه الأصول المخردة ؟"
 
-#: assets/doctype/asset/asset.js:669
+#: assets/doctype/asset/asset.js:788
 msgid "Do you really want to scrap this asset?"
 msgstr "هل تريد حقا  تخريد هذه الأصول؟"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:134
+#: public/js/controllers/transaction.js:978
+msgid "Do you want to clear the selected {0}?"
+msgstr ""
+
+#: stock/doctype/delivery_trip/delivery_trip.js:155
 msgid "Do you want to notify all the customers by email?"
 msgstr "هل تريد أن تخطر جميع العملاء عن طريق البريد الإلكتروني؟"
 
-#: manufacturing/doctype/production_plan/production_plan.js:196
+#: manufacturing/doctype/production_plan/production_plan.js:221
 msgid "Do you want to submit the material request"
 msgstr "هل ترغب في تقديم طلب المواد"
 
+#. Label of a Data field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocField"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "DocType"
+msgstr ""
+
+#. Label of a Link field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocType"
+msgstr ""
+
 #. Label of a Link field in DocType 'Transaction Deletion Record Item'
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgctxt "Transaction Deletion Record Item"
 msgid "DocType"
 msgstr ""
 
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:45
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:69
 msgid "DocTypes should not be added manually to the 'Excluded DocTypes' table. You are only allowed to remove entries from it."
 msgstr ""
 
@@ -24257,9 +24610,9 @@
 msgstr "DOCTYPE"
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:141
-#: manufacturing/report/production_planning_report/production_planning_report.js:43
+#: manufacturing/report/production_planning_report/production_planning_report.js:42
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:102
-#: public/js/bank_reconciliation_tool/dialog_manager.js:104
+#: public/js/bank_reconciliation_tool/dialog_manager.js:111
 msgid "Document Name"
 msgstr "اسم المستند"
 
@@ -24277,15 +24630,15 @@
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:134
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:100
-#: public/js/bank_reconciliation_tool/dialog_manager.js:99
-#: public/js/bank_reconciliation_tool/dialog_manager.js:182
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:16
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:15
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:23
+#: public/js/bank_reconciliation_tool/dialog_manager.js:106
+#: public/js/bank_reconciliation_tool/dialog_manager.js:186
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:14
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:22
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:14
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:14
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:22
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:14
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:23
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:22
 msgid "Document Type"
 msgstr "نوع الوثيقة"
 
@@ -24331,11 +24684,11 @@
 msgid "Document Type "
 msgstr "نوع الوثيقة"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:56
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:60
 msgid "Document Type already used as a dimension"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.js:64
+#: accounts/doctype/bank_transaction/bank_transaction.js:59
 msgid "Document {0} successfully uncleared"
 msgstr "تم حذف المستند {0} بنجاح"
 
@@ -24345,7 +24698,7 @@
 msgid "Documents"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:200
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:202
 msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
 msgstr ""
 
@@ -24382,7 +24735,13 @@
 #: 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
-#: public/js/utils/crm_activities.js:211
+#: public/js/utils/crm_activities.js:212
+msgid "Done"
+msgstr ""
+
+#. Label of a Check field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
 msgid "Done"
 msgstr ""
 
@@ -24418,8 +24777,8 @@
 msgid "Double Declining Balance"
 msgstr "اهلاك تناقصي"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:84
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:93
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:27
 msgid "Download"
 msgstr "تحميل"
 
@@ -24428,7 +24787,7 @@
 msgid "Download Backups"
 msgstr "تحميل النسخ الاحتياطية"
 
-#: public/js/utils/serial_no_batch_selector.js:237
+#: public/js/utils/serial_no_batch_selector.js:241
 msgid "Download CSV Template"
 msgstr ""
 
@@ -24444,11 +24803,11 @@
 msgid "Download Materials Request Plan Section"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:60
+#: buying/doctype/request_for_quotation/request_for_quotation.js:70
 msgid "Download PDF"
 msgstr "تحميل PDF"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:31
 msgid "Download Template"
 msgstr "تحميل الوثيقة"
 
@@ -24504,18 +24863,17 @@
 msgid "Downtime Reason"
 msgstr "سبب التوقف"
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Dr"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:6
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:5
 #: accounts/doctype/payment_request/payment_request_list.js:5
-#: assets/doctype/asset/asset_list.js:35
+#: assets/doctype/asset/asset_list.js:25
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:5
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:7
-#: stock/doctype/stock_entry/stock_entry_list.js:10
+#: stock/doctype/stock_entry/stock_entry_list.js:18
 msgid "Draft"
 msgstr "مشروع"
 
@@ -24712,13 +25070,6 @@
 msgid "Draft"
 msgstr "مشروع"
 
-#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
-#. Record'
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-msgctxt "Transaction Deletion Record"
-msgid "Draft"
-msgstr "مشروع"
-
 #. Option for the 'Status' (Select) field in DocType 'Work Order'
 #: manufacturing/doctype/work_order/work_order.json
 msgctxt "Work Order"
@@ -24817,7 +25168,7 @@
 msgid "Due / Reference Date cannot be after {0}"
 msgstr "تاريخ الاستحقاق أو المرجع لا يمكن أن يكون بعد {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.js:649
+#: accounts/doctype/payment_entry/payment_entry.js:795
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:40
 msgid "Due Date"
 msgstr "بسبب تاريخ"
@@ -24899,14 +25250,14 @@
 msgid "Due Date cannot be before Posting / Supplier Invoice Date"
 msgstr "تاريخ الاستحقاق لا يمكن أن يسبق تاريخ الترحيل/ فاتورة المورد"
 
-#: controllers/accounts_controller.py:576
+#: controllers/accounts_controller.py:628
 msgid "Due Date is mandatory"
 msgstr "(تاريخ الاستحقاق) إلزامي"
 
 #. Name of a DocType
 #. Label of a Card Break in the Receivables Workspace
 #: accounts/doctype/dunning/dunning.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:164
 #: accounts/workspace/receivables/receivables.json
 msgid "Dunning"
 msgstr "إنذار بالدفع"
@@ -24983,7 +25334,7 @@
 msgid "Dunning Type"
 msgstr "نوع الطلب"
 
-#: stock/doctype/item/item.js:135 stock/doctype/putaway_rule/putaway_rule.py:55
+#: stock/doctype/item/item.js:178 stock/doctype/putaway_rule/putaway_rule.py:55
 msgid "Duplicate"
 msgstr "مكررة"
 
@@ -24999,7 +25350,7 @@
 msgid "Duplicate Entry. Please check Authorization Rule {0}"
 msgstr "إدخال مكرر. يرجى التحقق من قاعدة التخويل {0}"
 
-#: assets/doctype/asset/asset.py:301
+#: assets/doctype/asset/asset.py:303
 msgid "Duplicate Finance Book"
 msgstr ""
 
@@ -25012,7 +25363,7 @@
 msgid "Duplicate POS Invoices found"
 msgstr ""
 
-#: projects/doctype/project/project.js:67
+#: projects/doctype/project/project.js:74
 msgid "Duplicate Project with Tasks"
 msgstr "مشروع مكرر مع المهام"
 
@@ -25028,7 +25379,7 @@
 msgid "Duplicate item group found in the item group table"
 msgstr "تم العثور علي مجموعه عناصر مكرره في جدول مجموعه الأصناف\\n<br>\\nDuplicate item group found in the item group table"
 
-#: projects/doctype/project/project.js:146
+#: projects/doctype/project/project.js:174
 msgid "Duplicate project has been created"
 msgstr "تم إنشاء مشروع مكرر"
 
@@ -25129,7 +25480,7 @@
 msgid "Earliest"
 msgstr "أولا"
 
-#: stock/report/stock_balance/stock_balance.py:478
+#: stock/report/stock_balance/stock_balance.py:486
 msgid "Earliest Age"
 msgstr "أقدم عمر"
 
@@ -25143,6 +25494,14 @@
 msgid "Edit"
 msgstr "تصحيح"
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.html:37
+msgid "Edit Capacity"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Edit Cart"
+msgstr ""
+
 #: public/js/utils/serial_no_batch_selector.js:30
 msgid "Edit Full Form"
 msgstr ""
@@ -25151,11 +25510,11 @@
 msgid "Edit Not Allowed"
 msgstr "تحرير غير مسموح به"
 
-#: public/js/utils/crm_activities.js:182
+#: public/js/utils/crm_activities.js:184
 msgid "Edit Note"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.js:370
+#: stock/doctype/delivery_note/delivery_note.js:418
 msgid "Edit Posting Date and Time"
 msgstr "تحرير تاريخ النشر والوقت"
 
@@ -25213,15 +25572,15 @@
 msgid "Edit Posting Date and Time"
 msgstr "تحرير تاريخ النشر والوقت"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:366
+#: public/js/bom_configurator/bom_configurator.bundle.js:405
 msgid "Edit Qty"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:238
+#: selling/page/point_of_sale/pos_past_order_summary.js:247
 msgid "Edit Receipt"
 msgstr "تحرير الإيصال"
 
-#: selling/page/point_of_sale/pos_item_cart.js:717
+#: selling/page/point_of_sale/pos_item_cart.js:745
 msgid "Editing {0} is not allowed as per POS Profile settings"
 msgstr ""
 
@@ -25237,7 +25596,7 @@
 msgid "Educational Qualification"
 msgstr "المؤهلات العلمية"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
 msgid "Either 'Selling' or 'Buying' must be selected"
 msgstr ""
 
@@ -25291,9 +25650,9 @@
 msgid "Electronic Invoice Register"
 msgstr "تسجيل الفاتورة الإلكترونية"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:231
+#: 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:874
+#: selling/page/point_of_sale/pos_item_cart.js:904
 msgid "Email"
 msgstr "البريد الإلكتروني"
 
@@ -25447,7 +25806,7 @@
 msgid "Email Group"
 msgstr "البريد الإلكتروني المجموعة"
 
-#: public/js/utils/contact_address_quick_entry.js:39
+#: public/js/utils/contact_address_quick_entry.js:42
 msgid "Email Id"
 msgstr "البريد الإلكتروني"
 
@@ -25475,7 +25834,7 @@
 msgid "Email Sent"
 msgstr "إرسال البريد الإلكتروني"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:289
+#: buying/doctype/request_for_quotation/request_for_quotation.py:313
 msgid "Email Sent to Supplier {0}"
 msgstr "تم إرسال بريد إلكتروني إلى المورد {0}"
 
@@ -25503,15 +25862,15 @@
 msgid "Email Template"
 msgstr "قالب البريد الإلكتروني"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:269
+#: selling/page/point_of_sale/pos_past_order_summary.js:278
 msgid "Email not sent to {0} (unsubscribed / disabled)"
 msgstr "البريد الإلكتروني لا يرسل إلى {0} (غير مشترك / غيرمفعل)"
 
-#: stock/doctype/shipment/shipment.js:153
+#: stock/doctype/shipment/shipment.js:174
 msgid "Email or Phone/Mobile of the Contact are mandatory to continue."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:273
+#: selling/page/point_of_sale/pos_past_order_summary.js:283
 msgid "Email sent successfully."
 msgstr "تم إرسال البريد الإلكتروني بنجاح."
 
@@ -25561,7 +25920,7 @@
 #: projects/doctype/timesheet/timesheet_calendar.js:28
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:27
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:10
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:50
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:45
 #: quality_management/doctype/non_conformance/non_conformance.json
 #: setup/doctype/company/company.json setup/doctype/employee/employee.json
 #: setup/doctype/sales_person/sales_person_tree.js:7
@@ -25764,7 +26123,7 @@
 msgid "Empty"
 msgstr "فارغة"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1042
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1044
 msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
 msgstr ""
 
@@ -25802,6 +26161,12 @@
 msgid "Enable Common Party Accounting"
 msgstr ""
 
+#. Label of a Check field in DocType 'Selling Settings'
+#: selling/doctype/selling_settings/selling_settings.json
+msgctxt "Selling Settings"
+msgid "Enable Cut-Off Date on Bulk Delivery Note Creation"
+msgstr ""
+
 #. Label of a Check field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
@@ -25874,6 +26239,13 @@
 msgid "Enable YouTube Tracking"
 msgstr "تمكين تتبع يوتيوب"
 
+#. Description of the 'Consider Rejected Warehouses' (Check) field in DocType
+#. 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Enable it if users want to consider rejected materials to dispatch."
+msgstr ""
+
 #: support/doctype/service_level_agreement/service_level_agreement.js:34
 msgid "Enable to apply SLA on every {0}"
 msgstr ""
@@ -25953,14 +26325,14 @@
 msgid "Encashment Date"
 msgstr "تاريخ التحصيل"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:41
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:41
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:49
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:49
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:23
-#: accounts/report/payment_ledger/payment_ledger.js:24
-#: assets/report/fixed_asset_register/fixed_asset_register.js:75
+#: accounts/report/payment_ledger/payment_ledger.js:23
+#: assets/report/fixed_asset_register/fixed_asset_register.js:74
 #: projects/report/project_summary/project_summary.py:74
-#: public/js/financial_statements.js:191 public/js/setup_wizard.js:42
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:24
+#: public/js/financial_statements.js:200 public/js/setup_wizard.js:44
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:23
 #: templates/pages/projects.html:47
 msgid "End Date"
 msgstr "نهاية التاريخ"
@@ -26029,6 +26401,10 @@
 msgid "End Date cannot be before Start Date."
 msgstr "لا يمكن أن يكون تاريخ الانتهاء قبل تاريخ البدء."
 
+#: manufacturing/doctype/workstation/workstation.js:206
+msgid "End Time"
+msgstr "وقت الانتهاء"
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -26053,15 +26429,15 @@
 msgid "End Time"
 msgstr "وقت الانتهاء"
 
-#: stock/doctype/stock_entry/stock_entry.js:241
+#: stock/doctype/stock_entry/stock_entry.js:268
 msgid "End Transit"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
 #: accounts/report/financial_ratios/financial_ratios.js:25
-#: assets/report/fixed_asset_register/fixed_asset_register.js:90
-#: public/js/financial_statements.js:206
+#: assets/report/fixed_asset_register/fixed_asset_register.js:89
+#: public/js/financial_statements.js:215
 msgid "End Year"
 msgstr "نهاية السنة"
 
@@ -26069,7 +26445,7 @@
 msgid "End Year cannot be before Start Year"
 msgstr "نهاية العام لا يمكن أن يكون قبل بداية العام"
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:43
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:48
 #: accounts/doctype/process_deferred_accounting/process_deferred_accounting.py:37
 msgid "End date cannot be before start date"
 msgstr "لا يمكن أن يكون تاريخ الانتهاء قبل تاريخ البدء"
@@ -26093,6 +26469,8 @@
 msgid "End of the current subscription period"
 msgstr ""
 
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:13
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:23
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:31
 msgid "Enough Parts to Build"
 msgstr "يكفي لبناء أجزاء"
@@ -26107,27 +26485,29 @@
 msgid "Enter API key in Google Settings."
 msgstr "أدخل مفتاح API في إعدادات Google."
 
-#: setup/doctype/employee/employee.js:102
+#: setup/doctype/employee/employee.js:103
 msgid "Enter First and Last name of Employee, based on Which Full Name will be updated. IN transactions, it will be Full Name which will be fetched."
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:208
+#: public/js/utils/serial_no_batch_selector.js:211
 msgid "Enter Serial Nos"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:313
+#: stock/doctype/material_request/material_request.js:383
 msgid "Enter Supplier"
 msgstr "أدخل المورد"
 
-#: manufacturing/doctype/job_card/job_card.js:280
+#: manufacturing/doctype/job_card/job_card.js:320
+#: manufacturing/doctype/workstation/workstation.js:189
+#: manufacturing/doctype/workstation/workstation.js:236
 msgid "Enter Value"
 msgstr "أدخل القيمة"
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:91
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:96
 msgid "Enter Visit Details"
 msgstr ""
 
-#: manufacturing/doctype/routing/routing.js:77
+#: manufacturing/doctype/routing/routing.js:78
 msgid "Enter a name for Routing."
 msgstr ""
 
@@ -26139,31 +26519,31 @@
 msgid "Enter a name for this Holiday List."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:499
+#: selling/page/point_of_sale/pos_payment.js:527
 msgid "Enter amount to be redeemed."
 msgstr "أدخل المبلغ المراد استرداده."
 
-#: stock/doctype/item/item.js:804
+#: stock/doctype/item/item.js:882
 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:877
+#: selling/page/point_of_sale/pos_item_cart.js:907
 msgid "Enter customer's email"
 msgstr "أدخل البريد الإلكتروني الخاص بالعميل"
 
-#: selling/page/point_of_sale/pos_item_cart.js:882
+#: selling/page/point_of_sale/pos_item_cart.js:913
 msgid "Enter customer's phone number"
 msgstr "أدخل رقم هاتف العميل"
 
-#: assets/doctype/asset/asset.py:345
+#: assets/doctype/asset/asset.py:347
 msgid "Enter depreciation details"
 msgstr "أدخل تفاصيل الاستهلاك"
 
-#: selling/page/point_of_sale/pos_item_cart.js:382
+#: selling/page/point_of_sale/pos_item_cart.js:389
 msgid "Enter discount percentage."
 msgstr "أدخل نسبة الخصم."
 
-#: public/js/utils/serial_no_batch_selector.js:211
+#: public/js/utils/serial_no_batch_selector.js:214
 msgid "Enter each serial no in a new line"
 msgstr ""
 
@@ -26177,7 +26557,7 @@
 msgid "Enter the Bank Guarantee Number before submitting."
 msgstr ""
 
-#: manufacturing/doctype/routing/routing.js:82
+#: manufacturing/doctype/routing/routing.js:83
 msgid "Enter the Operation, the table will fetch the Operation details like Hourly Rate, Workstation automatically.\n\n"
 " After that, set the Operation Time in minutes and the table will calculate the Operation Costs based on the Hourly Rate and Operation Time."
 msgstr ""
@@ -26190,19 +26570,19 @@
 msgid "Enter the name of the bank or lending institution before submitting."
 msgstr ""
 
-#: stock/doctype/item/item.js:824
+#: stock/doctype/item/item.js:908
 msgid "Enter the opening stock units."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:730
+#: manufacturing/doctype/bom/bom.js:761
 msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:817
+#: manufacturing/doctype/work_order/work_order.js:878
 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:392
+#: selling/page/point_of_sale/pos_payment.js:411
 msgid "Enter {0} amount."
 msgstr "أدخل مبلغ {0}."
 
@@ -26217,7 +26597,7 @@
 msgid "Entity"
 msgstr "كيان"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:203
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:123
 msgid "Entity Type"
 msgstr "نوع الكيان"
@@ -26242,8 +26622,8 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:102
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:150
-#: accounts/report/account_balance/account_balance.js:30
-#: accounts/report/account_balance/account_balance.js:46
+#: accounts/report/account_balance/account_balance.js:29
+#: accounts/report/account_balance/account_balance.js:45
 #: accounts/report/balance_sheet/balance_sheet.py:242
 #: setup/setup_wizard/operations/install_fixtures.py:259
 msgid "Equity"
@@ -26268,8 +26648,8 @@
 msgid "Equity/Liability Account"
 msgstr "حساب الأسهم / المسؤولية"
 
-#: accounts/doctype/payment_request/payment_request.py:410
-#: manufacturing/doctype/job_card/job_card.py:773
+#: 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
 msgid "Error"
 msgstr "خطأ"
@@ -26334,6 +26714,16 @@
 msgid "Error Log"
 msgstr "سجل الأخطاء"
 
+#. Label of a Long Text field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Error Log"
+msgstr "سجل الأخطاء"
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+msgid "Error Message"
+msgstr "رسالة خطأ"
+
 #. Label of a Text field in DocType 'Period Closing Voucher'
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgctxt "Period Closing Voucher"
@@ -26356,7 +26746,7 @@
 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:406
+#: assets/doctype/asset/depreciation.py:404
 msgid "Error while posting depreciation entries"
 msgstr ""
 
@@ -26364,11 +26754,15 @@
 msgid "Error while processing deferred accounting for {0}"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:389
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:404
 msgid "Error while reposting item valuation"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:720
+#: templates/includes/footer/footer_extension.html:29
+msgid "Error: Not a valid id?"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.js:883
 msgid "Error: {0} is mandatory field"
 msgstr "الخطأ: {0} هو حقل إلزامي"
 
@@ -26436,7 +26830,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 "مثال: ABCD. #####. إذا تم ضبط المسلسل ولم يتم ذكر رقم الدفعة في المعاملات ، فسيتم إنشاء رقم الدفعة تلقائيًا استنادًا إلى هذه السلسلة. إذا كنت تريد دائمًا الإشارة صراحة إلى Batch No لهذا العنصر ، فاترك هذا فارغًا. ملاحظة: سيأخذ هذا الإعداد الأولوية على بادئة Naming Series في إعدادات المخزون."
 
-#: stock/stock_ledger.py:1976
+#: stock/stock_ledger.py:1983
 msgid "Example: Serial No {0} reserved in {1}."
 msgstr ""
 
@@ -26446,11 +26840,11 @@
 msgid "Exception Budget Approver Role"
 msgstr "دور الموافقة على الموازنة الاستثنائية"
 
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:56
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:55
 msgid "Excess Materials Consumed"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:869
+#: manufacturing/doctype/job_card/job_card.py:876
 msgid "Excess Transfer"
 msgstr ""
 
@@ -26474,7 +26868,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:517
+#: setup/doctype/company/company.py:516
 msgid "Exchange Gain/Loss"
 msgstr "أرباح / خسائر الناتجة عن صرف العملة"
 
@@ -26496,8 +26890,8 @@
 msgid "Exchange Gain/Loss"
 msgstr "أرباح / خسائر الناتجة عن صرف العملة"
 
-#: controllers/accounts_controller.py:1313
-#: controllers/accounts_controller.py:1394
+#: controllers/accounts_controller.py:1382
+#: controllers/accounts_controller.py:1463
 msgid "Exchange Gain/Loss amount has been booked through {0}"
 msgstr ""
 
@@ -26681,7 +27075,7 @@
 msgid "Excise Entry"
 msgstr "الدخول المكوس"
 
-#: stock/doctype/stock_entry/stock_entry.js:1060
+#: stock/doctype/stock_entry/stock_entry.js:1213
 msgid "Excise Invoice"
 msgstr "المكوس الفاتورة"
 
@@ -26730,9 +27124,9 @@
 msgid "Exit Interview Held On"
 msgstr "أجريت مقابلة الخروج"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:138
-#: public/js/bom_configurator/bom_configurator.bundle.js:179
-#: public/js/setup_wizard.js:168
+#: public/js/bom_configurator/bom_configurator.bundle.js:140
+#: public/js/bom_configurator/bom_configurator.bundle.js:183
+#: public/js/setup_wizard.js:181
 msgid "Expand All"
 msgstr "توسيع الكل"
 
@@ -26790,11 +27184,13 @@
 msgid "Expected Delivery Date"
 msgstr "تاريخ التسليم المتوقع"
 
-#: selling/doctype/sales_order/sales_order.py:316
+#: selling/doctype/sales_order/sales_order.py:319
 msgid "Expected Delivery Date should be after Sales Order Date"
 msgstr "يجب أن يكون تاريخ التسليم المتوقع بعد تاريخ أمر المبيعات"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:44
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:104
+#: templates/pages/task_info.html:64
 msgid "Expected End Date"
 msgstr "تاريخ الإنتهاء المتوقع"
 
@@ -26820,7 +27216,7 @@
 msgid "Expected End Date should be less than or equal to parent task's Expected End Date {0}."
 msgstr ""
 
-#: public/js/projects/timer.js:12
+#: public/js/projects/timer.js:16
 msgid "Expected Hrs"
 msgstr "الساعات المتوقعة"
 
@@ -26830,7 +27226,9 @@
 msgid "Expected Hrs"
 msgstr "الساعات المتوقعة"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:40
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:98
+#: templates/pages/task_info.html:59
 msgid "Expected Start Date"
 msgstr "تاريخ البدأ المتوقع"
 
@@ -26880,8 +27278,8 @@
 msgid "Expected Value After Useful Life"
 msgstr "القيمة المتوقعة بعد حياة مفيدة"
 
-#: accounts/report/account_balance/account_balance.js:29
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:81
+#: 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/profitability_analysis/profitability_analysis.py:189
 msgid "Expense"
@@ -26912,11 +27310,11 @@
 msgid "Expense"
 msgstr "نفقة"
 
-#: controllers/stock_controller.py:359
+#: controllers/stock_controller.py:541
 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
 msgstr "حساب نفقات / قروق ({0}) يجب ان يكون حساب ارباح و خسائر"
 
-#: accounts/report/account_balance/account_balance.js:47
+#: accounts/report/account_balance/account_balance.js:46
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:248
 msgid "Expense Account"
 msgstr "حساب النفقات"
@@ -26999,7 +27397,7 @@
 msgid "Expense Account"
 msgstr "حساب النفقات"
 
-#: controllers/stock_controller.py:339
+#: controllers/stock_controller.py:521
 msgid "Expense Account Missing"
 msgstr "حساب المصاريف مفقود"
 
@@ -27016,13 +27414,13 @@
 msgid "Expense Head"
 msgstr "عنوان المصروف"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:510
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:528
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:514
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:532
 msgid "Expense Head Changed"
 msgstr "تغيير رأس المصاريف"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:552
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:556
 msgid "Expense account is mandatory for item {0}"
 msgstr "اجباري حساب النفقات للصنف {0}"
 
@@ -27033,7 +27431,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:46
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:65
-#: accounts/report/account_balance/account_balance.js:48
+#: accounts/report/account_balance/account_balance.js:49
 msgid "Expenses Included In Asset Valuation"
 msgstr "النفقات المدرجة في تقييم الأصول"
 
@@ -27045,7 +27443,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:49
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:69
-#: accounts/report/account_balance/account_balance.js:49
+#: accounts/report/account_balance/account_balance.js:51
 msgid "Expenses Included In Valuation"
 msgstr "المصروفات متضمنة في تقييم السعر"
 
@@ -27056,8 +27454,8 @@
 msgstr "المصروفات متضمنة في تقييم السعر"
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:9
-#: selling/doctype/quotation/quotation_list.js:35
-#: stock/doctype/batch/batch_list.js:9 stock/doctype/item/item_list.js:10
+#: selling/doctype/quotation/quotation_list.js:34
+#: stock/doctype/batch/batch_list.js:13 stock/doctype/item/item_list.js:18
 msgid "Expired"
 msgstr "انتهى"
 
@@ -27079,7 +27477,7 @@
 msgid "Expired"
 msgstr "انتهى"
 
-#: stock/doctype/stock_entry/stock_entry.js:316
+#: stock/doctype/stock_entry/stock_entry.js:362
 msgid "Expired Batches"
 msgstr "دفعات منتهية الصلاحية"
 
@@ -27149,11 +27547,11 @@
 msgid "Export Data"
 msgstr "تصدير البيانات"
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:35
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:34
 msgid "Export E-Invoices"
 msgstr "تصدير الفواتير الإلكترونية"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:106
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:93
 msgid "Export Errored Rows"
 msgstr "تصدير الصفوف الخطأ"
 
@@ -27245,7 +27643,7 @@
 msgid "FIFO Stock Queue (qty, rate)"
 msgstr ""
 
-#. Label of a Text field in DocType 'Stock Ledger Entry'
+#. Label of a Long Text field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "FIFO Stock Queue (qty, rate)"
@@ -27257,7 +27655,8 @@
 msgid "FIFO/LIFO Queue"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:62
+#: 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
 msgid "Failed"
 msgstr "باءت بالفشل"
@@ -27370,7 +27769,14 @@
 msgid "Failed"
 msgstr "باءت بالفشل"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:9
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Failed"
+msgstr "باءت بالفشل"
+
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:17
 msgid "Failed Entries"
 msgstr ""
 
@@ -27405,11 +27811,11 @@
 msgid "Failed to setup defaults"
 msgstr "فشل في إعداد الإعدادات الافتراضية"
 
-#: setup/doctype/company/company.py:699
+#: setup/doctype/company/company.py:698
 msgid "Failed to setup defaults for country {0}. Please contact support."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Failure"
 msgstr "بالفشل"
 
@@ -27425,6 +27831,10 @@
 msgid "Failure Description"
 msgstr ""
 
+#: accounts/doctype/payment_request/payment_request.js:29
+msgid "Failure: {0}"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -27486,7 +27896,7 @@
 msgid "Fees"
 msgstr "رسوم"
 
-#: public/js/utils/serial_no_batch_selector.js:332
+#: public/js/utils/serial_no_batch_selector.js:338
 msgid "Fetch Based On"
 msgstr ""
 
@@ -27496,7 +27906,7 @@
 msgid "Fetch Customers"
 msgstr "جلب العملاء"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:50
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:56
 msgid "Fetch Data"
 msgstr "ابحث عن المعلومة"
 
@@ -27504,7 +27914,7 @@
 msgid "Fetch Items from Warehouse"
 msgstr "جلب العناصر من المستودع"
 
-#: accounts/doctype/dunning/dunning.js:60
+#: accounts/doctype/dunning/dunning.js:61
 msgid "Fetch Overdue Payments"
 msgstr ""
 
@@ -27512,8 +27922,8 @@
 msgid "Fetch Subscription Updates"
 msgstr "جلب تحديثات الاشتراك"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:952
-#: accounts/doctype/sales_invoice/sales_invoice.js:954
+#: accounts/doctype/sales_invoice/sales_invoice.js:1028
+#: accounts/doctype/sales_invoice/sales_invoice.js:1030
 msgid "Fetch Timesheet"
 msgstr ""
 
@@ -27523,8 +27933,8 @@
 msgid "Fetch Value From"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:252
-#: stock/doctype/stock_entry/stock_entry.js:554
+#: stock/doctype/material_request/material_request.js:318
+#: stock/doctype/stock_entry/stock_entry.js:640
 msgid "Fetch exploded BOM (including sub-assemblies)"
 msgstr "جلب BOM انفجرت (بما في ذلك المجالس الفرعية)"
 
@@ -27535,11 +27945,20 @@
 msgid "Fetch items based on Default Supplier."
 msgstr "جلب العناصر على أساس المورد الافتراضي."
 
-#: accounts/doctype/dunning/dunning.js:131
-#: public/js/controllers/transaction.js:1083
+#: accounts/doctype/dunning/dunning.js:135
+#: public/js/controllers/transaction.js:1138
 msgid "Fetching exchange rates ..."
 msgstr ""
 
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:72
+msgid "Fetching..."
+msgstr ""
+
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:106
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Field"
+msgstr "حقل"
+
 #. Label of a Select field in DocType 'POS Search Fields'
 #: accounts/doctype/pos_search_fields/pos_search_fields.json
 msgctxt "POS Search Fields"
@@ -27613,8 +28032,8 @@
 msgid "File to Rename"
 msgstr "إعادة تسمية الملف"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:17
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:17
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:16
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:16
 #: public/js/financial_statements.js:167
 msgid "Filter Based On"
 msgstr "عامل التصفية على أساس"
@@ -27625,7 +28044,7 @@
 msgid "Filter Duration (Months)"
 msgstr "مدة الفلتر (شهور)"
 
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:46
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:45
 msgid "Filter Total Zero Qty"
 msgstr "تصفية مجموع صفر الكمية"
 
@@ -27651,8 +28070,8 @@
 msgid "Filter on Payment"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:696
-#: public/js/bank_reconciliation_tool/dialog_manager.js:192
+#: accounts/doctype/payment_entry/payment_entry.js:858
+#: public/js/bank_reconciliation_tool/dialog_manager.js:196
 msgid "Filters"
 msgstr "فلاتر"
 
@@ -27711,13 +28130,13 @@
 #: accounts/report/accounts_receivable/accounts_receivable.js:24
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:56
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:48
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:32
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:52
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:104
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:31
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:51
 #: accounts/report/general_ledger/general_ledger.js:16
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:32
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:31
 #: accounts/report/trial_balance/trial_balance.js:70
-#: assets/report/fixed_asset_register/fixed_asset_register.js:49
+#: assets/report/fixed_asset_register/fixed_asset_register.js:48
 #: public/js/financial_statements.js:161
 msgid "Finance Book"
 msgstr "كتاب المالية"
@@ -27843,14 +28262,14 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Financial Reports Workspace
-#: accounts/doctype/account/account_tree.js:158
+#: accounts/doctype/account/account_tree.js:234
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/workspace/financial_reports/financial_reports.json
 #: public/js/financial_statements.js:129
 msgid "Financial Statements"
 msgstr "البيانات المالية"
 
-#: public/js/setup_wizard.js:40
+#: public/js/setup_wizard.js:42
 msgid "Financial Year Begins On"
 msgstr ""
 
@@ -27861,13 +28280,13 @@
 msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) "
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:627
-#: manufacturing/doctype/work_order/work_order.js:642
-#: manufacturing/doctype/work_order/work_order.js:651
+#: manufacturing/doctype/work_order/work_order.js:675
+#: manufacturing/doctype/work_order/work_order.js:690
+#: manufacturing/doctype/work_order/work_order.js:699
 msgid "Finish"
 msgstr "إنهاء"
 
-#: buying/doctype/purchase_order/purchase_order.js:176
+#: buying/doctype/purchase_order/purchase_order.js:182
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:43
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:119
 msgid "Finished Good"
@@ -27903,7 +28322,7 @@
 msgid "Finished Good BOM"
 msgstr ""
 
-#: public/js/utils.js:698
+#: public/js/utils.js:768
 msgid "Finished Good Item"
 msgstr ""
 
@@ -27917,7 +28336,7 @@
 msgid "Finished Good Item Code"
 msgstr "انتهى رمز السلعة جيدة"
 
-#: public/js/utils.js:715
+#: public/js/utils.js:786
 msgid "Finished Good Item Qty"
 msgstr ""
 
@@ -27927,15 +28346,15 @@
 msgid "Finished Good Item Quantity"
 msgstr ""
 
-#: controllers/accounts_controller.py:3204
+#: controllers/accounts_controller.py:3295
 msgid "Finished Good Item is not specified for service item {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:3219
+#: controllers/accounts_controller.py:3310
 msgid "Finished Good Item {0} Qty can not be zero"
 msgstr ""
 
-#: controllers/accounts_controller.py:3213
+#: controllers/accounts_controller.py:3304
 msgid "Finished Good Item {0} must be a sub-contracted item"
 msgstr ""
 
@@ -27979,15 +28398,15 @@
 msgid "Finished Good {0} must be a sub-contracted item."
 msgstr ""
 
-#: setup/doctype/company/company.py:262
+#: setup/doctype/company/company.py:261
 msgid "Finished Goods"
 msgstr "السلع تامة الصنع"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:25
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
 msgid "Finished Goods Warehouse"
 msgstr "مستودع البضائع الجاهزة"
 
-#: stock/doctype/stock_entry/stock_entry.py:1264
+#: stock/doctype/stock_entry/stock_entry.py:1273
 msgid "Finished Item {0} does not match with Work Order {1}"
 msgstr ""
 
@@ -28074,16 +28493,17 @@
 
 #. Name of a DocType
 #: accounts/doctype/fiscal_year/fiscal_year.json
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:17
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:1
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:16
 #: accounts/report/profitability_analysis/profitability_analysis.js:38
 #: accounts/report/trial_balance/trial_balance.js:16
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:16
-#: manufacturing/report/job_card_summary/job_card_summary.js:17
-#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:48
+#: manufacturing/report/job_card_summary/job_card_summary.js:16
+#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:44
 #: regional/report/irs_1099/irs_1099.js:17
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:16
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:16
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:15
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:15
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:15
 msgid "Fiscal Year"
 msgstr "السنة المالية"
 
@@ -28161,7 +28581,7 @@
 msgid "Fixed"
 msgstr "ثابت"
 
-#: accounts/report/account_balance/account_balance.js:50
+#: accounts/report/account_balance/account_balance.js:52
 msgid "Fixed Asset"
 msgstr "الأصول الثابتة"
 
@@ -28235,11 +28655,23 @@
 msgid "Fleet Manager"
 msgstr "مدير قافلة المركبات"
 
-#: selling/page/point_of_sale/pos_item_selector.js:303
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor"
+msgstr ""
+
+#. Label of a Data field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor Name"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_selector.js:300
 msgid "Focus on Item Group filter"
 msgstr "التركيز على عامل تصفية مجموعة العناصر"
 
-#: selling/page/point_of_sale/pos_item_selector.js:294
+#: selling/page/point_of_sale/pos_item_selector.js:291
 msgid "Focus on search input"
 msgstr "ركز على إدخال البحث"
 
@@ -28259,15 +28691,15 @@
 msgid "Following Material Requests have been raised automatically based on Item's re-order level"
 msgstr "تم رفع طلبات المواد التالية تلقائيا بناء على مستوى اعادة الطلب للبنود"
 
-#: selling/doctype/customer/customer.py:740
+#: selling/doctype/customer/customer.py:751
 msgid "Following fields are mandatory to create address:"
 msgstr "الحقول التالية إلزامية لإنشاء العنوان:"
 
-#: controllers/buying_controller.py:906
+#: controllers/buying_controller.py:932
 msgid "Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr "لم يتم وضع علامة على البند {0} التالي كعنصر {1}. يمكنك تمكينها كـ عنصر {1} من العنصر الرئيسي الخاص بها"
 
-#: controllers/buying_controller.py:902
+#: controllers/buying_controller.py:928
 msgid "Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr "العناصر التالية {0} غير مميزة كعنصر {1}. يمكنك تمكينها كـ عنصر {1} من العنصر الرئيسي الخاص بها"
 
@@ -28275,7 +28707,7 @@
 msgid "For"
 msgstr "لأجل"
 
-#: public/js/utils/sales_common.js:274
+#: public/js/utils/sales_common.js:309
 msgid "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table."
 msgstr "لبنود حزمة المنتج والمستودع والرقم المتسلسل ورقم الدفعة ستأخذ بعين الاعتبار من جدول قائمة التغليف. اذا كان للمستودع ورقم الدفعة نفس  البند من بنود التغليف لأي بند من حزمة المنتج. هذه القيم يمكن ادخالها في جدول البند الرئيسي. والقيم سيتم نسخها الى جدول قائمة التغليف."
 
@@ -28291,11 +28723,16 @@
 msgid "For Company"
 msgstr "للشركة"
 
-#: stock/doctype/material_request/material_request.js:293
+#: stock/doctype/material_request/material_request.js:361
 msgid "For Default Supplier (Optional)"
 msgstr "للمورد الافتراضي (اختياري)"
 
-#: controllers/stock_controller.py:770
+#: manufacturing/doctype/plant_floor/plant_floor.js:159
+#: manufacturing/doctype/plant_floor/plant_floor.js:183
+msgid "For Item"
+msgstr ""
+
+#: controllers/stock_controller.py:953
 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
 msgstr ""
 
@@ -28305,7 +28742,7 @@
 msgid "For Job Card"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:160
+#: manufacturing/doctype/job_card/job_card.js:175
 msgid "For Operation"
 msgstr ""
 
@@ -28330,23 +28767,28 @@
 msgid "For Production"
 msgstr "للإنتاج"
 
-#: stock/doctype/stock_entry/stock_entry.py:657
+#: stock/doctype/stock_entry/stock_entry.py:612
 msgid "For Quantity (Manufactured Qty) is mandatory"
 msgstr "للكمية (الكمية المصنعة) إلزامية\\n<br>\\nFor Quantity (Manufactured Qty) is mandatory"
 
+#: controllers/accounts_controller.py:1070
+msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}"
+msgstr ""
+
 #. Label of a Check field in DocType 'Currency Exchange'
 #: setup/doctype/currency_exchange/currency_exchange.json
 msgctxt "Currency Exchange"
 msgid "For Selling"
 msgstr "للبيع"
 
-#: accounts/doctype/payment_order/payment_order.js:98
+#: accounts/doctype/payment_order/payment_order.js:106
 msgid "For Supplier"
 msgstr "للمورد"
 
-#: manufacturing/doctype/production_plan/production_plan.js:331
-#: selling/doctype/sales_order/sales_order.js:808
-#: stock/doctype/material_request/material_request.js:247
+#: manufacturing/doctype/production_plan/production_plan.js:358
+#: selling/doctype/sales_order/sales_order.js:933
+#: stock/doctype/material_request/material_request.js:310
+#: templates/form_grid/material_request_grid.html:36
 msgid "For Warehouse"
 msgstr "لمستودع"
 
@@ -28356,11 +28798,11 @@
 msgid "For Warehouse"
 msgstr "لمستودع"
 
-#: manufacturing/doctype/work_order/work_order.py:427
+#: manufacturing/doctype/work_order/work_order.py:438
 msgid "For Warehouse is required before Submit"
 msgstr "مستودع (الى) مطلوب قبل التسجيل\\n<br>\\nFor Warehouse is required before Submit"
 
-#: public/js/utils/serial_no_batch_selector.js:116
+#: public/js/utils/serial_no_batch_selector.js:119
 msgid "For Work Order"
 msgstr ""
 
@@ -28402,15 +28844,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:384
+#: stock/doctype/stock_entry/stock_entry.py:339
 msgid "For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry"
 msgstr "بالنسبة لبطاقة المهمة {0} ، يمكنك فقط إدخال إدخال نوع الأسهم &quot;نقل المواد للصناعة&quot;"
 
-#: manufacturing/doctype/work_order/work_order.py:1523
+#: manufacturing/doctype/work_order/work_order.py:1537
 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1302
+#: stock/doctype/stock_entry/stock_entry.py:1311
 msgid "For quantity {0} should not be greater than allowed quantity {1}"
 msgstr ""
 
@@ -28420,12 +28862,12 @@
 msgid "For reference"
 msgstr "للرجوع إليها"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1229
+#: accounts/doctype/payment_entry/payment_entry.js:1477
 #: public/js/controllers/accounts.js:182
 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:1498
+#: manufacturing/doctype/production_plan/production_plan.py:1520
 msgid "For row {0}: Enter Planned Qty"
 msgstr "بالنسبة إلى الصف {0}: أدخل الكمية المخطط لها"
 
@@ -28433,6 +28875,11 @@
 msgid "For the 'Apply Rule On Other' condition the field {0} is mandatory"
 msgstr "بالنسبة لشرط &quot;تطبيق القاعدة على أخرى&quot; ، يكون الحقل {0} إلزاميًا"
 
+#. Description of a DocType
+#: stock/doctype/item_customer_detail/item_customer_detail.json
+msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes"
+msgstr ""
+
 #. Label of a shortcut in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "Forecasting"
@@ -28615,7 +29062,7 @@
 msgid "Friday"
 msgstr "الجمعة"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:957
+#: accounts/doctype/sales_invoice/sales_invoice.js:1033
 #: templates/pages/projects.html:67
 msgid "From"
 msgstr "من"
@@ -28667,13 +29114,13 @@
 msgid "From Customer"
 msgstr "من العملاء"
 
-#: accounts/doctype/payment_entry/payment_entry.js:645
-#: accounts/doctype/payment_entry/payment_entry.js:650
+#: accounts/doctype/payment_entry/payment_entry.js:789
+#: accounts/doctype/payment_entry/payment_entry.js:796
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:16
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:16
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:8
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:16
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:38
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:15
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:37
 #: accounts/report/financial_ratios/financial_ratios.js:41
 #: accounts/report/general_ledger/general_ledger.js:22
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -28681,77 +29128,77 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:8
 #: 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:17
+#: accounts/report/pos_register/pos_register.js:16
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:8
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:16
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:47
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:47
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:15
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:46
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:46
 #: accounts/report/trial_balance/trial_balance.js:37
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:37
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:15
-#: buying/report/procurement_tracker/procurement_tracker.js:28
-#: buying/report/purchase_analytics/purchase_analytics.js:36
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:18
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:18
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:16
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:23
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:23
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:14
+#: buying/report/procurement_tracker/procurement_tracker.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:35
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:17
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:17
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:15
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:22
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:22
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:16
 #: crm/report/campaign_efficiency/campaign_efficiency.js:7
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:9
-#: crm/report/lead_conversion_time/lead_conversion_time.js:9
-#: crm/report/lead_details/lead_details.js:17
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:8
+#: crm/report/lead_conversion_time/lead_conversion_time.js:8
+#: crm/report/lead_details/lead_details.js:16
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:7
-#: crm/report/lost_opportunity/lost_opportunity.js:17
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:23
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:16
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:16
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:17
-#: manufacturing/report/process_loss_report/process_loss_report.js:30
-#: manufacturing/report/production_analytics/production_analytics.js:17
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:8
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:16
+#: crm/report/lost_opportunity/lost_opportunity.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:22
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:15
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:15
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:16
+#: manufacturing/report/process_loss_report/process_loss_report.js:29
+#: manufacturing/report/production_analytics/production_analytics.js:16
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:7
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:15
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:8
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:9
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:8
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:28
-#: public/js/stock_analytics.js:47
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:9
-#: regional/report/uae_vat_201/uae_vat_201.js:17
-#: regional/report/vat_audit_report/vat_audit_report.js:17
-#: selling/page/sales_funnel/sales_funnel.js:39
+#: public/js/stock_analytics.js:74
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:8
+#: regional/report/uae_vat_201/uae_vat_201.js:16
+#: regional/report/vat_audit_report/vat_audit_report.js:16
+#: selling/page/sales_funnel/sales_funnel.js:43
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:24
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:18
-#: selling/report/sales_analytics/sales_analytics.js:36
-#: selling/report/sales_order_analysis/sales_order_analysis.js:18
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:22
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:23
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:17
+#: selling/report/sales_analytics/sales_analytics.js:43
+#: selling/report/sales_order_analysis/sales_order_analysis.js:17
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:21
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:21
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:21
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:21
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:8
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:16
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:17
-#: stock/report/delayed_item_report/delayed_item_report.js:17
-#: stock/report/delayed_order_report/delayed_order_report.js:17
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:21
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:31
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:15
+#: stock/report/delayed_item_report/delayed_item_report.js:16
+#: stock/report/delayed_order_report/delayed_order_report.js:16
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:20
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:30
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:8
 #: stock/report/reserved_stock/reserved_stock.js:16
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:16
-#: stock/report/stock_analytics/stock_analytics.js:63
+#: stock/report/stock_analytics/stock_analytics.js:62
 #: stock/report/stock_balance/stock_balance.js:16
 #: stock/report/stock_ledger/stock_ledger.js:16
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:15
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:9
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:9
-#: support/report/issue_analytics/issue_analytics.js:25
-#: support/report/issue_summary/issue_summary.js:25
-#: support/report/support_hour_distribution/support_hour_distribution.js:8
-#: utilities/report/youtube_interactions/youtube_interactions.js:9
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:8
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:8
+#: support/report/issue_analytics/issue_analytics.js:24
+#: support/report/issue_summary/issue_summary.js:24
+#: support/report/support_hour_distribution/support_hour_distribution.js:7
+#: utilities/report/youtube_interactions/youtube_interactions.js:8
 msgid "From Date"
 msgstr "من تاريخ"
 
@@ -28857,7 +29304,7 @@
 msgid "From Date"
 msgstr "من تاريخ"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:41
+#: accounts/doctype/bank_clearance/bank_clearance.py:43
 msgid "From Date and To Date are Mandatory"
 msgstr "من تاريخ وتاريخ إلزامي"
 
@@ -28903,7 +29350,7 @@
 msgid "From Delivery Date"
 msgstr ""
 
-#: selling/doctype/installation_note/installation_note.js:58
+#: selling/doctype/installation_note/installation_note.js:59
 msgid "From Delivery Note"
 msgstr "من اشعار التسليم"
 
@@ -28913,7 +29360,7 @@
 msgid "From Doctype"
 msgstr ""
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:80
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:78
 msgid "From Due Date"
 msgstr ""
 
@@ -28923,7 +29370,7 @@
 msgid "From Employee"
 msgstr "من الموظف"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:45
+#: accounts/report/budget_variance_report/budget_variance_report.js:43
 msgid "From Fiscal Year"
 msgstr "من السنة المالية"
 
@@ -28987,8 +29434,8 @@
 msgid "From Payment Date"
 msgstr ""
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:37
-#: manufacturing/report/work_order_summary/work_order_summary.js:23
+#: manufacturing/report/job_card_summary/job_card_summary.js:36
+#: manufacturing/report/work_order_summary/work_order_summary.js:22
 msgid "From Posting Date"
 msgstr "من تاريخ النشر"
 
@@ -29034,6 +29481,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:91
 #: manufacturing/report/job_card_summary/job_card_summary.py:179
+#: templates/pages/timelog_info.html:31
 msgid "From Time"
 msgstr "من وقت"
 
@@ -29119,7 +29567,7 @@
 msgid "From Voucher Detail No"
 msgstr ""
 
-#: stock/report/reserved_stock/reserved_stock.js:106
+#: stock/report/reserved_stock/reserved_stock.js:103
 #: stock/report/reserved_stock/reserved_stock.py:164
 msgid "From Voucher No"
 msgstr ""
@@ -29130,7 +29578,7 @@
 msgid "From Voucher No"
 msgstr ""
 
-#: stock/report/reserved_stock/reserved_stock.js:95
+#: stock/report/reserved_stock/reserved_stock.js:92
 #: stock/report/reserved_stock/reserved_stock.py:158
 msgid "From Voucher Type"
 msgstr ""
@@ -29181,7 +29629,7 @@
 msgid "From and To dates are required"
 msgstr ""
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:47
+#: manufacturing/doctype/blanket_order/blanket_order.py:48
 msgid "From date cannot be greater than To date"
 msgstr "(من تاريخ) لا يمكن أن يكون أكبر (الي التاريخ)"
 
@@ -29369,30 +29817,33 @@
 msgid "Furniture and Fixtures"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/account/account_tree.js:138
 msgid "Further accounts can be made under Groups, but entries can be made against non-Groups"
 msgstr "يمكن إنشاء المزيد من الحسابات تحت المجموعة، لكن إدخالات القيود يمكن ان تكون فقط مقابل  حسابات فردية و ليست مجموعة"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:24
+#: accounts/doctype/cost_center/cost_center_tree.js:31
 msgid "Further cost centers can be made under Groups but entries can be made against non-Groups"
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person_tree.js:10
+#: setup/doctype/sales_person/sales_person_tree.js:15
 msgid "Further nodes can be only created under 'Group' type nodes"
 msgstr "العقد الإضافية التي يمكن أن تنشأ إلا في ظل العقد نوع ' المجموعة '"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:185
-#: accounts/report/accounts_receivable/accounts_receivable.py:1084
+#: 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
 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.py:1083
+#: accounts/report/accounts_receivable/accounts_receivable.html:154
+#: accounts/report/accounts_receivable/accounts_receivable.py:1091
 msgid "Future Payment Ref"
 msgstr "الدفع في المستقبل المرجع"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:120
+#: accounts/report/accounts_receivable/accounts_receivable.html:102
 msgid "Future Payments"
 msgstr "المدفوعات المستقبلية"
 
@@ -29408,7 +29859,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/gl_entry/gl_entry.json
-#: accounts/report/general_ledger/general_ledger.py:557
+#: accounts/report/general_ledger/general_ledger.py:570
 msgid "GL Entry"
 msgstr "GL الدخول"
 
@@ -29469,11 +29920,11 @@
 
 #: 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:525
+#: setup/doctype/company/company.py:524
 msgid "Gain/Loss on Asset Disposal"
 msgstr "الربح / الخسارة عند التخلص من الأصول"
 
-#: projects/doctype/project/project.js:79
+#: projects/doctype/project/project.js:93
 msgid "Gantt Chart"
 msgstr "مخطط جانت"
 
@@ -29509,7 +29960,7 @@
 #. Name of a report
 #. Label of a shortcut in the Accounting Workspace
 #. Label of a Link in the Financial Reports Workspace
-#: accounts/doctype/account/account.js:95
+#: accounts/doctype/account/account.js:93
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/report/general_ledger/general_ledger.json
 #: accounts/workspace/accounting/accounting.json
@@ -29530,7 +29981,7 @@
 msgid "General Ledger"
 msgstr "دفتر الأستاذ العام"
 
-#: stock/doctype/warehouse/warehouse.js:74
+#: stock/doctype/warehouse/warehouse.js:68
 msgctxt "Warehouse"
 msgid "General Ledger"
 msgstr "دفتر الأستاذ العام"
@@ -29550,7 +30001,7 @@
 msgid "Generate Closing Stock Balance"
 msgstr ""
 
-#: public/js/setup_wizard.js:46
+#: public/js/setup_wizard.js:48
 msgid "Generate Demo Data for Exploration"
 msgstr ""
 
@@ -29576,6 +30027,11 @@
 msgid "Generate Schedule"
 msgstr "إنشاء جدول"
 
+#. Description of a DocType
+#: stock/doctype/packing_slip/packing_slip.json
+msgid "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight."
+msgstr ""
+
 #. Label of a Check field in DocType 'Bisect Nodes'
 #: accounts/doctype/bisect_nodes/bisect_nodes.json
 msgctxt "Bisect Nodes"
@@ -29622,7 +30078,7 @@
 msgid "Get Current Stock"
 msgstr "الحصول على المخزون الحالي"
 
-#: selling/doctype/customer/customer.js:168
+#: selling/doctype/customer/customer.js:180
 msgid "Get Customer Group Details"
 msgstr ""
 
@@ -29638,12 +30094,12 @@
 msgid "Get Finished Goods for Manufacture"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:55
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:157
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:57
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:159
 msgid "Get Invoices"
 msgstr "الحصول على الفواتير"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:102
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:104
 msgid "Get Invoices based on Filters"
 msgstr "الحصول على الفواتير على أساس المرشحات"
 
@@ -29653,11 +30109,11 @@
 msgid "Get Item Locations"
 msgstr "الحصول على مواقع البند"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:351
-#: manufacturing/doctype/production_plan/production_plan.js:342
-#: stock/doctype/pick_list/pick_list.js:161
-#: stock/doctype/pick_list/pick_list.js:202
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: buying/doctype/request_for_quotation/request_for_quotation.js:377
+#: manufacturing/doctype/production_plan/production_plan.js:369
+#: stock/doctype/pick_list/pick_list.js:193
+#: stock/doctype/pick_list/pick_list.js:236
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:163
 msgid "Get Items"
 msgstr "احصل على البنود"
 
@@ -29667,37 +30123,37 @@
 msgid "Get Items"
 msgstr "احصل على البنود"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:147
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:165
-#: accounts/doctype/sales_invoice/sales_invoice.js:252
-#: accounts/doctype/sales_invoice/sales_invoice.js:276
-#: accounts/doctype/sales_invoice/sales_invoice.js:304
-#: buying/doctype/purchase_order/purchase_order.js:456
-#: buying/doctype/purchase_order/purchase_order.js:473
-#: buying/doctype/request_for_quotation/request_for_quotation.js:315
-#: buying/doctype/request_for_quotation/request_for_quotation.js:334
-#: buying/doctype/request_for_quotation/request_for_quotation.js:375
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:195
+#: 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/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
 #: buying/doctype/supplier_quotation/supplier_quotation.js:49
-#: buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:78
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:96
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:112
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:132
-#: public/js/controllers/buying.js:267
-#: selling/doctype/quotation/quotation.js:160
-#: selling/doctype/sales_order/sales_order.js:132
-#: selling/doctype/sales_order/sales_order.js:643
-#: stock/doctype/delivery_note/delivery_note.js:160
-#: stock/doctype/material_request/material_request.js:100
-#: stock/doctype/material_request/material_request.js:162
-#: stock/doctype/purchase_receipt/purchase_receipt.js:130
-#: stock/doctype/purchase_receipt/purchase_receipt.js:217
-#: stock/doctype/stock_entry/stock_entry.js:275
-#: stock/doctype/stock_entry/stock_entry.js:312
-#: stock/doctype/stock_entry/stock_entry.js:336
-#: stock/doctype/stock_entry/stock_entry.js:387
-#: stock/doctype/stock_entry/stock_entry.js:535
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
+#: buying/doctype/supplier_quotation/supplier_quotation.js:82
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:80
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:100
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:119
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:142
+#: public/js/controllers/buying.js:262
+#: selling/doctype/quotation/quotation.js:167
+#: selling/doctype/sales_order/sales_order.js:158
+#: selling/doctype/sales_order/sales_order.js:743
+#: stock/doctype/delivery_note/delivery_note.js:173
+#: stock/doctype/material_request/material_request.js:101
+#: stock/doctype/material_request/material_request.js:192
+#: stock/doctype/purchase_receipt/purchase_receipt.js:145
+#: stock/doctype/purchase_receipt/purchase_receipt.js:249
+#: 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:119
 msgid "Get Items From"
 msgstr "الحصول على البنود من"
 
@@ -29713,13 +30169,13 @@
 msgid "Get Items From Purchase Receipts"
 msgstr "الحصول على أصناف من إيصالات الشراء"
 
-#: stock/doctype/material_request/material_request.js:241
-#: stock/doctype/stock_entry/stock_entry.js:555
-#: stock/doctype/stock_entry/stock_entry.js:568
+#: stock/doctype/material_request/material_request.js:295
+#: stock/doctype/stock_entry/stock_entry.js:643
+#: stock/doctype/stock_entry/stock_entry.js:656
 msgid "Get Items from BOM"
 msgstr "تنزيل الاصناف من BOM"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:348
+#: buying/doctype/request_for_quotation/request_for_quotation.js:374
 msgid "Get Items from Material Requests against this Supplier"
 msgstr "الحصول على عناصر من طلبات المواد ضد هذا المورد"
 
@@ -29729,7 +30185,7 @@
 msgid "Get Items from Open Material Requests"
 msgstr "الحصول على عناصر من طلبات فتح المواد"
 
-#: public/js/controllers/buying.js:507
+#: public/js/controllers/buying.js:504
 msgid "Get Items from Product Bundle"
 msgstr "الحصول على أصناف من حزمة المنتج"
 
@@ -29763,18 +30219,24 @@
 msgid "Get Outstanding Orders"
 msgstr ""
 
+#: accounts/doctype/bank_clearance/bank_clearance.js:38
 #: accounts/doctype/bank_clearance/bank_clearance.js:40
-#: accounts/doctype/bank_clearance/bank_clearance.js:44
-#: accounts/doctype/bank_clearance/bank_clearance.js:56
-#: accounts/doctype/bank_clearance/bank_clearance.js:75
+#: accounts/doctype/bank_clearance/bank_clearance.js:52
+#: accounts/doctype/bank_clearance/bank_clearance.js:71
 msgid "Get Payment Entries"
 msgstr "الحصول على مدخلات الدفع"
 
-#: accounts/doctype/payment_order/payment_order.js:20
-#: accounts/doctype/payment_order/payment_order.js:24
+#: accounts/doctype/payment_order/payment_order.js:23
+#: accounts/doctype/payment_order/payment_order.js:31
 msgid "Get Payments from"
 msgstr "احصل على المدفوعات من"
 
+#. Label of a Check field in DocType 'Manufacturing Settings'
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+msgctxt "Manufacturing Settings"
+msgid "Get Raw Materials Cost from Consumption Entry"
+msgstr ""
+
 #. Label of a Button field in DocType 'Production Plan'
 #: manufacturing/doctype/production_plan/production_plan.json
 msgctxt "Production Plan"
@@ -29805,7 +30267,7 @@
 msgid "Get Started Sections"
 msgstr "تبدأ الأقسام"
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:432
 msgid "Get Stock"
 msgstr ""
 
@@ -29815,29 +30277,29 @@
 msgid "Get Sub Assembly Items"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:102
+#: buying/doctype/supplier/supplier.js:124
 msgid "Get Supplier Group Details"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:384
-#: buying/doctype/request_for_quotation/request_for_quotation.js:402
+#: buying/doctype/request_for_quotation/request_for_quotation.js:416
+#: buying/doctype/request_for_quotation/request_for_quotation.js:436
 msgid "Get Suppliers"
 msgstr "الحصول على الموردين"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:405
+#: buying/doctype/request_for_quotation/request_for_quotation.js:440
 msgid "Get Suppliers By"
 msgstr "الحصول على الموردين من قبل"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:989
+#: accounts/doctype/sales_invoice/sales_invoice.js:1065
 msgid "Get Timesheets"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:81
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:84
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:77
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:80
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:87
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:94
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:75
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:81
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:91
 msgid "Get Unreconciled Entries"
 msgstr "الحصول على مدخلات لم تتم تسويتها"
 
@@ -29845,11 +30307,11 @@
 msgid "Get Updates"
 msgstr "الحصول على التحديثات"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:65
+#: stock/doctype/delivery_trip/delivery_trip.js:68
 msgid "Get stops from"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:125
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:149
 msgid "Getting Scrap Items"
 msgstr ""
 
@@ -29866,6 +30328,13 @@
 msgid "Give free item for every N quantity"
 msgstr ""
 
+#. Description of the 'Recurse Every (As Per Transaction UOM)' (Float) field in
+#. DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Give free item for every N quantity"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/global_defaults/global_defaults.json
 msgid "Global Defaults"
@@ -29882,7 +30351,7 @@
 msgid "Go back"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:113
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:97
 msgid "Go to {0} List"
 msgstr "انتقل إلى قائمة {0}"
 
@@ -29921,16 +30390,16 @@
 msgid "Goods"
 msgstr ""
 
-#: setup/doctype/company/company.py:263
-#: stock/doctype/stock_entry/stock_entry_list.js:14
+#: setup/doctype/company/company.py:262
+#: stock/doctype/stock_entry/stock_entry_list.js:21
 msgid "Goods In Transit"
 msgstr "البضائع في العبور"
 
-#: stock/doctype/stock_entry/stock_entry_list.js:17
+#: stock/doctype/stock_entry/stock_entry_list.js:23
 msgid "Goods Transferred"
 msgstr "نقل البضائع"
 
-#: stock/doctype/stock_entry/stock_entry.py:1618
+#: stock/doctype/stock_entry/stock_entry.py:1627
 msgid "Goods are already received against the outward entry {0}"
 msgstr "تم استلام البضائع بالفعل مقابل الإدخال الخارجي {0}"
 
@@ -29954,7 +30423,12 @@
 #: accounts/report/pos_register/pos_register.py:207
 #: 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:253
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:251
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:154
+#: selling/page/point_of_sale/pos_payment.js:590
 #: templates/includes/order/order_taxes.html:105 templates/pages/rfq.html:58
 msgid "Grand Total"
 msgstr "المجموع الإجمالي"
@@ -30176,7 +30650,7 @@
 msgid "Grant Commission"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:654
+#: accounts/doctype/payment_entry/payment_entry.js:802
 msgid "Greater Than Amount"
 msgstr "أكبر من المبلغ"
 
@@ -30285,11 +30759,11 @@
 msgid "Gross Purchase Amount"
 msgstr "اجمالي مبلغ المشتريات"
 
-#: assets/doctype/asset/asset.py:317
+#: assets/doctype/asset/asset.py:319
 msgid "Gross Purchase Amount is mandatory"
 msgstr "مبلغ الشراء الإجمالي إلزامي\\n<br>\\nGross Purchase Amount is mandatory"
 
-#: assets/doctype/asset/asset.py:362
+#: assets/doctype/asset/asset.py:364
 msgid "Gross Purchase Amount should be <b>equal</b> to purchase amount of one single Asset."
 msgstr ""
 
@@ -30318,11 +30792,11 @@
 #: accounts/report/gross_profit/gross_profit.js:36
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:52
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:58
-#: assets/report/fixed_asset_register/fixed_asset_register.js:36
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
+#: assets/report/fixed_asset_register/fixed_asset_register.js:35
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:41
 #: public/js/purchase_trends_filters.js:61 public/js/sales_trends_filters.js:37
 #: selling/report/lost_quotations/lost_quotations.js:33
-#: stock/report/total_stock_summary/total_stock_summary.js:9
+#: stock/report/total_stock_summary/total_stock_summary.js:8
 msgid "Group By"
 msgstr "مجموعة من"
 
@@ -30332,15 +30806,15 @@
 msgid "Group By"
 msgstr "مجموعة من"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:151
+#: accounts/report/accounts_receivable/accounts_receivable.js:154
 msgid "Group By Customer"
 msgstr "المجموعة حسب العميل"
 
-#: accounts/report/accounts_payable/accounts_payable.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:132
 msgid "Group By Supplier"
 msgstr "المجموعة حسب المورد"
 
-#: setup/doctype/sales_person/sales_person_tree.js:9
+#: setup/doctype/sales_person/sales_person_tree.js:14
 msgid "Group Node"
 msgstr "عقدة المجموعة"
 
@@ -30350,12 +30824,12 @@
 msgid "Group Same Items"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:112
+#: stock/doctype/stock_settings/stock_settings.py:115
 msgid "Group Warehouses cannot be used in transactions. Please change the value of {0}"
 msgstr "لا يمكن استخدام مستودعات المجموعة في المعاملات. يرجى تغيير قيمة {0}"
 
 #: accounts/report/general_ledger/general_ledger.js:115
-#: accounts/report/pos_register/pos_register.js:57
+#: accounts/report/pos_register/pos_register.js:56
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:78
 msgid "Group by"
 msgstr "المجموعة حسب"
@@ -30364,34 +30838,34 @@
 msgid "Group by Account"
 msgstr "مجموعة بواسطة حساب"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:82
 msgid "Group by Item"
 msgstr "تجميع حسب البند"
 
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:62
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:61
 msgid "Group by Material Request"
 msgstr "تجميع حسب طلب المواد"
 
 #: accounts/report/general_ledger/general_ledger.js:132
-#: accounts/report/payment_ledger/payment_ledger.js:83
+#: accounts/report/payment_ledger/payment_ledger.js:82
 msgid "Group by Party"
 msgstr "مجموعة حسب الحزب"
 
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:71
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:70
 msgid "Group by Purchase Order"
 msgstr "تجميع حسب أمر الشراء"
 
-#: selling/report/sales_order_analysis/sales_order_analysis.js:73
+#: selling/report/sales_order_analysis/sales_order_analysis.js:72
 msgid "Group by Sales Order"
 msgstr "التجميع حسب طلب المبيعات"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:81
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:84
 msgid "Group by Supplier"
 msgstr "تجميع حسب المورد"
 
-#: accounts/report/accounts_payable/accounts_payable.js:159
-#: accounts/report/accounts_receivable/accounts_receivable.js:191
+#: accounts/report/accounts_payable/accounts_payable.js:162
+#: accounts/report/accounts_receivable/accounts_receivable.js:194
 #: accounts/report/general_ledger/general_ledger.js:120
 msgid "Group by Voucher"
 msgstr "المجموعة بواسطة قسيمة"
@@ -30414,7 +30888,7 @@
 msgid "Group by Voucher (Consolidated)"
 msgstr "مجموعة بواسطة قسيمة (الموحدة)"
 
-#: stock/utils.py:448
+#: stock/utils.py:443
 msgid "Group node warehouse is not allowed to select for transactions"
 msgstr "لا يسمح مستودع عقدة مجموعة لتحديد للمعاملات"
 
@@ -30476,8 +30950,8 @@
 msgid "Groups"
 msgstr "مجموعات"
 
-#: accounts/report/balance_sheet/balance_sheet.js:18
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:18
+#: accounts/report/balance_sheet/balance_sheet.js:14
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
 msgid "Growth View"
 msgstr ""
 
@@ -30523,14 +30997,14 @@
 msgid "Half Yearly"
 msgstr "نصف سنوي"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:66
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:69
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
-#: public/js/financial_statements.js:219
+#: accounts/report/budget_variance_report/budget_variance_report.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
+#: public/js/financial_statements.js:228
 #: public/js/purchase_trends_filters.js:21 public/js/sales_trends_filters.js:13
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
 msgid "Half-Yearly"
 msgstr "نصف سنوية"
 
@@ -30689,6 +31163,11 @@
 msgid "Have Default Naming Series for Batch ID?"
 msgstr ""
 
+#. Description of a DocType
+#: accounts/doctype/account/account.json
+msgid "Heads (or groups) against which Accounting Entries are made and balances are maintained."
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -30713,7 +31192,7 @@
 msgid "Height (cm)"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:412
+#: assets/doctype/asset/depreciation.py:410
 msgid "Hello,"
 msgstr ""
 
@@ -30747,11 +31226,16 @@
 msgid "Help Text"
 msgstr "نص المساعدة"
 
-#: assets/doctype/asset/depreciation.py:419
+#. Description of a DocType
+#: accounts/doctype/monthly_distribution/monthly_distribution.json
+msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
+msgstr ""
+
+#: assets/doctype/asset/depreciation.py:417
 msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
 msgstr ""
 
-#: stock/stock_ledger.py:1669
+#: stock/stock_ledger.py:1689
 msgid "Here are the options to proceed:"
 msgstr ""
 
@@ -30768,15 +31252,15 @@
 msgid "Here you can maintain height, weight, allergies, medical concerns etc"
 msgstr "هنا يمكنك ادراج تفاصيل عن الحالة الصحية مثل الطول والوزن، الحساسية، المخاوف الطبية"
 
-#: setup/doctype/employee/employee.js:122
+#: setup/doctype/employee/employee.js:129
 msgid "Here, you can select a senior of this Employee. Based on this, Organization Chart will be populated."
 msgstr ""
 
-#: setup/doctype/holiday_list/holiday_list.js:75
+#: setup/doctype/holiday_list/holiday_list.js:77
 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:391
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:406
 msgid "Hi,"
 msgstr ""
 
@@ -30838,12 +31322,12 @@
 msgid "History In Company"
 msgstr "الحركة التاريخيه في الشركة"
 
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: selling/doctype/sales_order/sales_order.js:539
+#: buying/doctype/purchase_order/purchase_order.js:315
+#: selling/doctype/sales_order/sales_order.js:582
 msgid "Hold"
 msgstr "معلق"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
 msgid "Hold Invoice"
 msgstr "عقد الفاتورة"
 
@@ -30949,6 +31433,13 @@
 msgstr "باستمرار"
 
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:31
+#: templates/pages/timelog_info.html:37
+msgid "Hours"
+msgstr "ساعات"
+
+#. Label of a Float field in DocType 'Workstation Working Hour'
+#: manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
+msgctxt "Workstation Working Hour"
 msgid "Hours"
 msgstr "ساعات"
 
@@ -30987,7 +31478,7 @@
 msgid "Hrs"
 msgstr "ساعات"
 
-#: setup/doctype/company/company.py:365
+#: setup/doctype/company/company.py:364
 msgid "Human Resources"
 msgstr "الموارد البشرية"
 
@@ -31025,8 +31516,8 @@
 msgid "IBAN"
 msgstr "رقم الحساب البنكي"
 
-#: accounts/doctype/bank_account/bank_account.py:84
-#: accounts/doctype/bank_account/bank_account.py:87
+#: accounts/doctype/bank_account/bank_account.py:98
+#: accounts/doctype/bank_account/bank_account.py:101
 msgid "IBAN is not valid"
 msgstr "رقم الحساب المصرفي الدولي غير صالح"
 
@@ -31101,6 +31592,12 @@
 msgid "Identifying Decision Makers"
 msgstr "تحديد صناع القرار"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Idle"
+msgstr ""
+
 #. Description of the 'Book Deferred Entries Based On' (Select) field in
 #. DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31108,6 +31605,10 @@
 msgid "If \"Months\" is selected, a fixed amount will be booked as deferred revenue or expense for each month irrespective of the number of days in a month. It will be prorated if deferred revenue or expense is not booked for an entire month"
 msgstr "إذا تم تحديد &quot;الأشهر&quot; ، فسيتم حجز مبلغ ثابت كإيرادات أو مصروفات مؤجلة لكل شهر بغض النظر عن عدد الأيام في الشهر. سيتم تقسيمها إذا لم يتم حجز الإيرادات أو المصاريف المؤجلة لمدة شهر كامل"
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)"
+msgstr ""
+
 #. Description of the 'Cost Center' (Link) field in DocType 'Journal Entry
 #. Account'
 #: accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -31115,7 +31616,7 @@
 msgid "If Income or Expense"
 msgstr "إذا دخل أو مصروف"
 
-#: manufacturing/doctype/operation/operation.js:30
+#: manufacturing/doctype/operation/operation.js:32
 msgid "If an operation is divided into sub operations, they can be added here."
 msgstr ""
 
@@ -31172,7 +31673,7 @@
 msgid "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 msgstr "إذا كانت محددة، سيتم النظر في مقدار ضريبة كمدرجة بالفعل في قيم الطباعة / مقدار الطباعة"
 
-#: public/js/setup_wizard.js:48
+#: public/js/setup_wizard.js:50
 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later."
 msgstr ""
 
@@ -31218,6 +31719,14 @@
 msgid "If enabled, all files attached to this document will be attached to each email"
 msgstr ""
 
+#. Description of the 'Do Not Update Serial / Batch on Creation of Auto Bundle'
+#. (Check) field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "If enabled, do not update serial / batch values in the stock transactions on creation of auto Serial \n"
+" / Batch Bundle. "
+msgstr ""
+
 #. Description of the 'Create Ledger Entries for Change Amount' (Check) field
 #. in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31258,7 +31767,7 @@
 msgid "If more than one package of the same type (for print)"
 msgstr "إذا كان أكثر من حزمة واحدة من نفس النوع (للطباعة)"
 
-#: stock/stock_ledger.py:1679
+#: stock/stock_ledger.py:1699
 msgid "If not, you can Cancel / Submit this entry"
 msgstr ""
 
@@ -31276,7 +31785,7 @@
 msgid "If subcontracted to a vendor"
 msgstr "إذا الباطن للبائع"
 
-#: manufacturing/doctype/work_order/work_order.js:842
+#: manufacturing/doctype/work_order/work_order.js:911
 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."
 msgstr ""
 
@@ -31286,11 +31795,11 @@
 msgid "If the account is frozen, entries are allowed to restricted users."
 msgstr "إذا الحساب مجمد، يسمح بالدخول إلى المستخدمين المحددين."
 
-#: stock/stock_ledger.py:1672
+#: stock/stock_ledger.py:1692
 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 "إذا كان العنصر يتعامل كعنصر سعر تقييم صفري في هذا الإدخال ، فالرجاء تمكين &quot;السماح بمعدل تقييم صفري&quot; في جدول العناصر {0}."
 
-#: manufacturing/doctype/work_order/work_order.js:857
+#: manufacturing/doctype/work_order/work_order.js:930
 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
 msgstr ""
 
@@ -31336,7 +31845,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:638
+#: accounts/doctype/payment_entry/payment_entry.py:647
 msgid "If this is undesirable please cancel the corresponding Payment Entry."
 msgstr ""
 
@@ -31346,23 +31855,34 @@
 msgid "If this item has variants, then it cannot be selected in sales orders etc."
 msgstr "إذا كان هذا البند لديها بدائل، فإنه لا يمكن اختيارها في أوامر البيع الخ"
 
-#: buying/doctype/buying_settings/buying_settings.js:24
+#: buying/doctype/buying_settings/buying_settings.js:27
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master."
 msgstr "إذا تم تكوين هذا الخيار &quot;نعم&quot; ، سيمنعك ERPNext من إنشاء فاتورة شراء أو إيصال دون إنشاء أمر شراء أولاً. يمكن تجاوز هذا التكوين لمورد معين عن طريق تمكين مربع الاختيار &quot;السماح بإنشاء فاتورة الشراء بدون أمر شراء&quot; في مدير المورد."
 
-#: buying/doctype/buying_settings/buying_settings.js:29
+#: buying/doctype/buying_settings/buying_settings.js:34
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master."
 msgstr "إذا تم تكوين هذا الخيار &quot;نعم&quot; ، سيمنعك ERPNext من إنشاء فاتورة شراء دون إنشاء إيصال شراء أولاً. يمكن تجاوز هذا التكوين لمورد معين عن طريق تمكين مربع الاختيار &quot;السماح بإنشاء فاتورة الشراء بدون إيصال شراء&quot; في مدير المورد."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:11
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
 msgid "If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured."
 msgstr "إذا تم تحديده ، يمكن استخدام مواد متعددة لطلب عمل واحد. يكون هذا مفيدًا إذا تم تصنيع منتج أو أكثر من المنتجات التي تستغرق وقتًا طويلاً."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:36
 msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
 msgstr "إذا تم تحديدها ، فسيتم تحديث تكلفة قائمة مكونات الصنف تلقائيًا استنادًا إلى معدل التقييم / سعر قائمة الأسعار / معدل الشراء الأخير للمواد الخام."
 
-#: stock/doctype/item/item.js:814
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
+msgstr ""
+
+#. Description of the 'Is Rejected Warehouse' (Check) field in DocType
+#. 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "If yes, then this warehouse will be used to store rejected materials"
+msgstr ""
+
+#: stock/doctype/item/item.js:894
 msgid "If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item."
 msgstr ""
 
@@ -31373,7 +31893,11 @@
 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:1605
+#: manufacturing/doctype/production_plan/production_plan.py:920
+msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.py:1625
 msgid "If you still want to proceed, please enable {0}."
 msgstr ""
 
@@ -31440,17 +31964,21 @@
 msgid "Ignore Empty Stock"
 msgstr ""
 
+#: accounts/report/general_ledger/general_ledger.js:209
+msgid "Ignore Exchange Rate Revaluation Journals"
+msgstr ""
+
 #. Label of a Check field in DocType 'Process Statement Of Accounts'
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 msgctxt "Process Statement Of Accounts"
 msgid "Ignore Exchange Rate Revaluation Journals"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:800
+#: selling/doctype/sales_order/sales_order.js:916
 msgid "Ignore Existing Ordered Qty"
 msgstr "تجاهل الكمية الموجودة المطلوبة"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1597
+#: manufacturing/doctype/production_plan/production_plan.py:1617
 msgid "Ignore Existing Projected Quantity"
 msgstr "تجاهل الكمية الموجودة المتوقعة"
 
@@ -31514,7 +32042,7 @@
 msgid "Ignore Pricing Rule"
 msgstr "تجاهل (قاعدة التسعير)"
 
-#: selling/page/point_of_sale/pos_payment.js:187
+#: selling/page/point_of_sale/pos_payment.js:188
 msgid "Ignore Pricing Rule is enabled. Cannot apply coupon code."
 msgstr ""
 
@@ -31837,10 +32365,15 @@
 msgid "Image View"
 msgstr "عرض الصورة"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:118
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:132
 msgid "Import"
 msgstr "استيراد"
 
+#. Description of a DocType
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json
+msgid "Import Chart of Accounts from a csv file"
+msgstr ""
+
 #. Label of a Link in the Home Workspace
 #. Label of a Link in the Settings Workspace
 #: setup/workspace/home/home.json setup/workspace/settings/settings.json
@@ -31853,7 +32386,7 @@
 msgid "Import Data from Spreadsheet"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:66
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:71
 msgid "Import Day Book Data"
 msgstr "استيراد بيانات دفتر اليوم"
 
@@ -31893,7 +32426,7 @@
 msgid "Import Log Preview"
 msgstr "استيراد سجل معاينة"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:54
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:59
 msgid "Import Master Data"
 msgstr "استيراد البيانات الرئيسية"
 
@@ -31903,11 +32436,11 @@
 msgid "Import Preview"
 msgstr "استيراد معاينة"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:61
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
 msgid "Import Progress"
 msgstr "استيراد التقدم"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:130
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:144
 msgid "Import Successful"
 msgstr "استيراد ناجح"
 
@@ -31928,8 +32461,8 @@
 msgid "Import Type"
 msgstr "نوع الاستيراد"
 
-#: public/js/utils/serial_no_batch_selector.js:197
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:77
+#: public/js/utils/serial_no_batch_selector.js:200
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:80
 msgid "Import Using CSV file"
 msgstr ""
 
@@ -31945,7 +32478,7 @@
 msgid "Import from Google Sheets"
 msgstr "استيراد من جداول بيانات Google"
 
-#: stock/doctype/item_price/item_price.js:27
+#: stock/doctype/item_price/item_price.js:29
 msgid "Import in Bulk"
 msgstr "استيراد بكميات كبيرة"
 
@@ -31957,7 +32490,7 @@
 msgid "Importing Parties and Addresses"
 msgstr "استيراد الأطراف والعناوين"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:47
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:45
 msgid "Importing {0} of {1}, {2}"
 msgstr "استيراد {0} من {1} ، {2}"
 
@@ -31968,7 +32501,7 @@
 msgid "In House"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:20
+#: assets/doctype/asset/asset_list.js:15
 msgid "In Maintenance"
 msgstr "في الصيانة"
 
@@ -31996,8 +32529,8 @@
 msgid "In Minutes"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:149
-#: accounts/report/accounts_receivable/accounts_receivable.js:181
+#: accounts/report/accounts_payable/accounts_payable.js:152
+#: accounts/report/accounts_receivable/accounts_receivable.js:184
 msgid "In Party Currency"
 msgstr ""
 
@@ -32044,10 +32577,10 @@
 msgid "In Production"
 msgstr "في الانتاج"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:65
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:52
 #: accounts/doctype/ledger_merge/ledger_merge.js:19
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:36
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:60
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:40
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:66
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:7
 msgid "In Progress"
 msgstr "في تَقَدم"
@@ -32108,11 +32641,17 @@
 msgstr "في تَقَدم"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:80
-#: stock/report/stock_balance/stock_balance.py:433
-#: stock/report/stock_ledger/stock_ledger.py:139
+#: stock/report/stock_balance/stock_balance.py:441
+#: stock/report/stock_ledger/stock_ledger.py:212
 msgid "In Qty"
 msgstr "كمية قادمة"
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "In Stock"
+msgstr ""
+
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:12
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:22
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:30
 msgid "In Stock Qty"
 msgstr "في سوق الأسهم الكمية"
@@ -32134,15 +32673,15 @@
 msgid "In Transit"
 msgstr "في مرحلة انتقالية"
 
-#: stock/doctype/material_request/material_request.js:375
+#: stock/doctype/material_request/material_request.js:445
 msgid "In Transit Transfer"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:344
+#: stock/doctype/material_request/material_request.js:414
 msgid "In Transit Warehouse"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:439
+#: stock/report/stock_balance/stock_balance.py:447
 msgid "In Value"
 msgstr "القيمة القادمة"
 
@@ -32327,7 +32866,7 @@
 msgid "In minutes"
 msgstr "في دقائق"
 
-#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:7
+#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:8
 msgid "In row {0} of Appointment Booking Slots: \"To Time\" must be later than \"From Time\"."
 msgstr ""
 
@@ -32342,7 +32881,11 @@
 msgid "In the case of 'Use Multi-Level BOM' in a work order, if the user wishes to add sub-assembly costs to Finished Goods items without using a job card as well the scrap items, then this option needs to be enable."
 msgstr ""
 
-#: stock/doctype/item/item.js:839
+#: accounts/doctype/loyalty_program/loyalty_program.js:12
+msgid "In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent"
+msgstr ""
+
+#: stock/doctype/item/item.js:927
 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc."
 msgstr ""
 
@@ -32378,6 +32921,12 @@
 msgid "Inactive Sales Items"
 msgstr "عناصر المبيعات غير النشطة"
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Inactive Status"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:93
 msgid "Incentives"
 msgstr "الحوافز"
@@ -32388,7 +32937,7 @@
 msgid "Incentives"
 msgstr "الحوافز"
 
-#: accounts/report/payment_ledger/payment_ledger.js:77
+#: accounts/report/payment_ledger/payment_ledger.js:76
 msgid "Include Account Currency"
 msgstr ""
 
@@ -32399,27 +32948,27 @@
 msgstr "قم بتضمين ملخص الشيخوخة"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:54
-#: assets/report/fixed_asset_register/fixed_asset_register.js:55
+#: assets/report/fixed_asset_register/fixed_asset_register.js:54
 msgid "Include Default FB Assets"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:34
-#: accounts/report/cash_flow/cash_flow.js:20
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:107
+#: accounts/report/balance_sheet/balance_sheet.js:29
+#: 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/trial_balance/trial_balance.js:98
+#: accounts/report/trial_balance/trial_balance.js:104
 msgid "Include Default FB Entries"
 msgstr "تضمين إدخالات دفتر افتراضي"
 
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:60
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:55
 msgid "Include Disabled"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:85
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:88
 msgid "Include Expired"
 msgstr "تشمل منتهية الصلاحية"
 
-#: selling/doctype/sales_order/sales_order.js:798
+#: selling/doctype/sales_order/sales_order.js:912
 msgid "Include Exploded Items"
 msgstr "تشمل البنود المستبعدة"
 
@@ -32489,7 +33038,7 @@
 msgid "Include Non Stock Items"
 msgstr "تشمل الاصناف الغير مخزنية"
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:44
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:45
 msgid "Include POS Transactions"
 msgstr "تشمل معاملات نقطه البيع"
 
@@ -32523,7 +33072,7 @@
 msgid "Include Safety Stock in Required Qty Calculation"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:88
+#: manufacturing/report/production_planning_report/production_planning_report.js:87
 msgid "Include Sub-assembly Raw Materials"
 msgstr "قم بتضمين المواد الخام التجميعية الفرعية"
 
@@ -32533,12 +33082,12 @@
 msgid "Include Subcontracted Items"
 msgstr "تضمين العناصر من الباطن"
 
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:57
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
 msgid "Include Timesheets in Draft Status"
 msgstr ""
 
 #: stock/report/stock_balance/stock_balance.js:84
-#: stock/report/stock_ledger/stock_ledger.js:82
+#: stock/report/stock_ledger/stock_ledger.js:90
 #: stock/report/stock_projected_qty/stock_projected_qty.js:51
 msgid "Include UOM"
 msgstr "تضمين UOM"
@@ -32569,10 +33118,10 @@
 
 #: 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:28
+#: accounts/report/account_balance/account_balance.js:27
 #: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:172
 #: accounts/report/profitability_analysis/profitability_analysis.py:182
-#: public/js/financial_statements.js:35
+#: public/js/financial_statements.js:36
 msgid "Income"
 msgstr "الإيرادات"
 
@@ -32595,7 +33144,7 @@
 msgid "Income"
 msgstr "الإيرادات"
 
-#: accounts/report/account_balance/account_balance.js:51
+#: 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
 msgid "Income Account"
@@ -32668,7 +33217,7 @@
 msgstr ""
 
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:163
-#: stock/report/stock_ledger/stock_ledger.py:189
+#: 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
 msgid "Incoming Rate"
@@ -32692,12 +33241,6 @@
 msgid "Incoming Rate"
 msgstr "معدل الواردة"
 
-#. Label of a Float field in DocType 'Serial and Batch Entry'
-#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
-msgctxt "Serial and Batch Entry"
-msgid "Incoming Rate"
-msgstr "معدل الواردة"
-
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
@@ -32719,16 +33262,16 @@
 msgid "Incorrect Balance Qty After Transaction"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:710
+#: controllers/subcontracting_controller.py:714
 msgid "Incorrect Batch Consumed"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:278
+#: assets/doctype/asset/asset.py:280
 #: assets/doctype/asset_value_adjustment/asset_value_adjustment.py:74
 msgid "Incorrect Date"
 msgstr "تاريخ غير صحيح"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:99
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:120
 msgid "Incorrect Invoice"
 msgstr ""
 
@@ -32741,12 +33284,16 @@
 msgid "Incorrect Payment Type"
 msgstr ""
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+msgid "Incorrect Reference Document (Purchase Receipt Item)"
+msgstr ""
+
 #. Name of a report
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.json
 msgid "Incorrect Serial No Valuation"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:723
+#: controllers/subcontracting_controller.py:727
 msgid "Incorrect Serial Number Consumed"
 msgstr ""
 
@@ -32755,15 +33302,15 @@
 msgid "Incorrect Stock Value Report"
 msgstr ""
 
-#: stock/serial_batch_bundle.py:95
+#: stock/serial_batch_bundle.py:96
 msgid "Incorrect Type of Transaction"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:115
+#: stock/doctype/stock_settings/stock_settings.py:118
 msgid "Incorrect Warehouse"
 msgstr "مستودع غير صحيح"
 
-#: accounts/general_ledger.py:47
+#: accounts/general_ledger.py:51
 msgid "Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction."
 msgstr "تم العثور على عدد غير صحيح من إدخالات دفتر الأستاذ العام. ربما تكون قد حددت حسابا خاطئا في المعاملة."
 
@@ -32914,11 +33461,11 @@
 msgid "Individual"
 msgstr "فرد"
 
-#: accounts/doctype/gl_entry/gl_entry.py:336
+#: accounts/doctype/gl_entry/gl_entry.py:290
 msgid "Individual GL Entry cannot be cancelled."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:326
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:337
 msgid "Individual Stock Ledger Entry cannot be cancelled."
 msgstr ""
 
@@ -32963,7 +33510,13 @@
 msgid "Initial Email Notification Sent"
 msgstr "تم إرسال إشعار البريد الإلكتروني المبدئي"
 
-#: accounts/doctype/payment_request/payment_request_list.js:11
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Initialize Summary Table"
+msgstr ""
+
+#: accounts/doctype/payment_request/payment_request_list.js:10
 msgid "Initiated"
 msgstr "بدأت"
 
@@ -32994,7 +33547,7 @@
 msgid "Insert New Records"
 msgstr "أدخل سجلات جديدة"
 
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:34
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:33
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:109
 msgid "Inspected By"
 msgstr "تفتيش من قبل"
@@ -33005,11 +33558,11 @@
 msgid "Inspected By"
 msgstr "تفتيش من قبل"
 
-#: controllers/stock_controller.py:666
+#: controllers/stock_controller.py:849
 msgid "Inspection Rejected"
 msgstr ""
 
-#: controllers/stock_controller.py:636 controllers/stock_controller.py:638
+#: controllers/stock_controller.py:819 controllers/stock_controller.py:821
 msgid "Inspection Required"
 msgstr "التفتيش مطلوب"
 
@@ -33031,7 +33584,7 @@
 msgid "Inspection Required before Purchase"
 msgstr "التفتيش المطلوبة قبل الشراء"
 
-#: controllers/stock_controller.py:653
+#: controllers/stock_controller.py:836
 msgid "Inspection Submission"
 msgstr ""
 
@@ -33053,7 +33606,7 @@
 
 #. Name of a DocType
 #: selling/doctype/installation_note/installation_note.json
-#: stock/doctype/delivery_note/delivery_note.js:171
+#: stock/doctype/delivery_note/delivery_note.js:191
 msgid "Installation Note"
 msgstr "ملاحظة التثبيت"
 
@@ -33070,7 +33623,7 @@
 msgid "Installation Note Item"
 msgstr "ملاحظة تثبيت الإغلاق"
 
-#: stock/doctype/delivery_note/delivery_note.py:688
+#: stock/doctype/delivery_note/delivery_note.py:749
 msgid "Installation Note {0} has already been submitted"
 msgstr "مذكرة التسليم {0} ارسلت\\n<br>\\nInstallation Note {0} has already been submitted"
 
@@ -33135,19 +33688,19 @@
 msgid "Insufficient Capacity"
 msgstr ""
 
-#: controllers/accounts_controller.py:3130
-#: controllers/accounts_controller.py:3154
+#: controllers/accounts_controller.py:3221
+#: controllers/accounts_controller.py:3245
 msgid "Insufficient Permissions"
 msgstr "أذونات غير كافية"
 
-#: stock/doctype/pick_list/pick_list.py:705
-#: stock/doctype/stock_entry/stock_entry.py:776
-#: stock/serial_batch_bundle.py:880 stock/stock_ledger.py:1369
-#: stock/stock_ledger.py:1840
+#: stock/doctype/pick_list/pick_list.py:776
+#: stock/doctype/stock_entry/stock_entry.py:731
+#: stock/serial_batch_bundle.py:899 stock/stock_ledger.py:1395
+#: stock/stock_ledger.py:1847
 msgid "Insufficient Stock"
 msgstr "المالية غير كافية"
 
-#: stock/stock_ledger.py:1855
+#: stock/stock_ledger.py:1862
 msgid "Insufficient Stock for Batch"
 msgstr ""
 
@@ -33288,11 +33841,11 @@
 msgid "Interest"
 msgstr "فائدة"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2339
+#: accounts/doctype/payment_entry/payment_entry.py:2364
 msgid "Interest and/or dunning fee"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:40
+#: crm/report/lead_details/lead_details.js:39
 msgid "Interested"
 msgstr "مهتم"
 
@@ -33316,11 +33869,11 @@
 msgid "Internal Customer for company {0} already exists"
 msgstr ""
 
-#: controllers/accounts_controller.py:533
+#: controllers/accounts_controller.py:577
 msgid "Internal Sale or Delivery Reference missing."
 msgstr ""
 
-#: controllers/accounts_controller.py:535
+#: controllers/accounts_controller.py:579
 msgid "Internal Sales Reference Missing"
 msgstr ""
 
@@ -33369,7 +33922,7 @@
 msgid "Internal Transfer"
 msgstr "نقل داخلي"
 
-#: controllers/accounts_controller.py:544
+#: controllers/accounts_controller.py:588
 msgid "Internal Transfer Reference Missing"
 msgstr ""
 
@@ -33383,7 +33936,7 @@
 msgid "Internal Work History"
 msgstr "سجل العمل الداخلي"
 
-#: controllers/stock_controller.py:735
+#: controllers/stock_controller.py:918
 msgid "Internal transfers can only be done in company's default currency"
 msgstr ""
 
@@ -33418,14 +33971,14 @@
 msgid "Invalid"
 msgstr "غير صالحة"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:377
-#: accounts/doctype/sales_invoice/sales_invoice.py:876
-#: accounts/doctype/sales_invoice/sales_invoice.py:886
+#: 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:2531
-#: controllers/accounts_controller.py:2537
+#: controllers/accounts_controller.py:2616
+#: controllers/accounts_controller.py:2622
 msgid "Invalid Account"
 msgstr "حساب غير صالح"
 
@@ -33433,7 +33986,7 @@
 msgid "Invalid Attribute"
 msgstr "خاصية غير صالحة"
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 msgid "Invalid Auto Repeat Date"
 msgstr ""
 
@@ -33441,7 +33994,7 @@
 msgid "Invalid Barcode. There is no Item attached to this barcode."
 msgstr "الباركود غير صالح. لا يوجد عنصر مرفق بهذا الرمز الشريطي."
 
-#: public/js/controllers/transaction.js:2360
+#: public/js/controllers/transaction.js:2413
 msgid "Invalid Blanket Order for the selected Customer and Item"
 msgstr "طلب فارغ غير صالح للعميل والعنصر المحدد"
 
@@ -33449,12 +34002,12 @@
 msgid "Invalid Child Procedure"
 msgstr "إجراء الطفل غير صالح"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1977
+#: accounts/doctype/sales_invoice/sales_invoice.py:1946
 msgid "Invalid Company for Inter Company Transaction."
 msgstr "شركة غير صالحة للمعاملات بين الشركات."
 
-#: assets/doctype/asset/asset.py:249 assets/doctype/asset/asset.py:256
-#: controllers/accounts_controller.py:2552
+#: assets/doctype/asset/asset.py:251 assets/doctype/asset/asset.py:258
+#: controllers/accounts_controller.py:2637
 msgid "Invalid Cost Center"
 msgstr ""
 
@@ -33462,11 +34015,11 @@
 msgid "Invalid Credentials"
 msgstr "بيانات الاعتماد غير صالحة"
 
-#: selling/doctype/sales_order/sales_order.py:318
+#: selling/doctype/sales_order/sales_order.py:321
 msgid "Invalid Delivery Date"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:88
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
 msgid "Invalid Document"
 msgstr ""
 
@@ -33479,7 +34032,7 @@
 msgid "Invalid Formula"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:367
+#: assets/doctype/asset/asset.py:369
 msgid "Invalid Gross Purchase Amount"
 msgstr "مبلغ الشراء الإجمالي غير صالح"
 
@@ -33491,12 +34044,12 @@
 msgid "Invalid Item"
 msgstr "عنصر غير صالح"
 
-#: stock/doctype/item/item.py:1371
+#: stock/doctype/item/item.py:1372
 msgid "Invalid Item Defaults"
 msgstr ""
 
 #: accounts/doctype/pos_closing_entry/pos_closing_entry.py:59
-#: accounts/general_ledger.py:677
+#: accounts/general_ledger.py:686
 msgid "Invalid Opening Entry"
 msgstr "إدخال فتح غير صالح"
 
@@ -33504,11 +34057,11 @@
 msgid "Invalid POS Invoices"
 msgstr "فواتير نقاط البيع غير صالحة"
 
-#: accounts/doctype/account/account.py:320
+#: accounts/doctype/account/account.py:339
 msgid "Invalid Parent Account"
 msgstr "حساب الوالد غير صالح"
 
-#: public/js/controllers/buying.js:338
+#: public/js/controllers/buying.js:333
 msgid "Invalid Part Number"
 msgstr "رقم الجزء غير صالح"
 
@@ -33528,24 +34081,24 @@
 msgid "Invalid Process Loss Configuration"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:599
+#: accounts/doctype/payment_entry/payment_entry.py:608
 msgid "Invalid Purchase Invoice"
 msgstr ""
 
-#: controllers/accounts_controller.py:3169
+#: controllers/accounts_controller.py:3260
 msgid "Invalid Qty"
 msgstr ""
 
-#: controllers/accounts_controller.py:1021
+#: controllers/accounts_controller.py:1085
 msgid "Invalid Quantity"
 msgstr "كمية غير صحيحة"
 
-#: assets/doctype/asset/asset.py:411 assets/doctype/asset/asset.py:417
-#: assets/doctype/asset/asset.py:444
+#: assets/doctype/asset/asset.py:413 assets/doctype/asset/asset.py:419
+#: assets/doctype/asset/asset.py:446
 msgid "Invalid Schedule"
 msgstr ""
 
-#: controllers/selling_controller.py:225
+#: controllers/selling_controller.py:226
 msgid "Invalid Selling Price"
 msgstr "سعر البيع غير صالح"
 
@@ -33578,22 +34131,21 @@
 msgid "Invalid reference {0} {1}"
 msgstr "مرجع غير صالح {0} {1}"
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:101
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:102
 msgid "Invalid result key. Response:"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:229
-#: accounts/doctype/gl_entry/gl_entry.py:239
 #: 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
 msgid "Invalid value {0} for {1} against account {2}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:569
+#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:642
 msgid "Invalid {0}"
 msgstr "غير صالح {0}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1975
+#: accounts/doctype/sales_invoice/sales_invoice.py:1944
 msgid "Invalid {0} for Inter Company Transaction."
 msgstr "غير صالح {0} للمعاملات بين الشركات."
 
@@ -33613,7 +34165,7 @@
 msgid "Inventory Dimension"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:147
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:157
 msgid "Inventory Dimension Negative Stock"
 msgstr ""
 
@@ -33671,7 +34223,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/invoice_discounting/invoice_discounting.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:144
+#: accounts/doctype/sales_invoice/sales_invoice.js:151
 msgid "Invoice Discounting"
 msgstr "خصم الفواتير"
 
@@ -33682,7 +34234,7 @@
 msgid "Invoice Discounting"
 msgstr "خصم الفواتير"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1065
+#: accounts/report/accounts_receivable/accounts_receivable.py:1073
 msgid "Invoice Grand Total"
 msgstr "الفاتورة الكبرى المجموع"
 
@@ -33759,7 +34311,8 @@
 msgid "Invoice Status"
 msgstr "حالة الفاتورة"
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:7
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:85
 msgid "Invoice Type"
 msgstr "نوع الفاتورة"
 
@@ -33794,7 +34347,7 @@
 msgid "Invoice Type"
 msgstr "نوع الفاتورة"
 
-#: projects/doctype/timesheet/timesheet.py:376
+#: projects/doctype/timesheet/timesheet.py:386
 msgid "Invoice already created for all billing hours"
 msgstr "الفاتورة التي تم إنشاؤها بالفعل لجميع ساعات الفوترة"
 
@@ -33804,12 +34357,13 @@
 msgid "Invoice and Billing"
 msgstr ""
 
-#: projects/doctype/timesheet/timesheet.py:373
+#: projects/doctype/timesheet/timesheet.py:383
 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.py:1067
+#: 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
 msgid "Invoiced Amount"
@@ -33819,7 +34373,7 @@
 msgid "Invoiced Qty"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2028
+#: accounts/doctype/sales_invoice/sales_invoice.py:1997
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
 msgid "Invoices"
 msgstr "الفواتير"
@@ -33901,7 +34455,7 @@
 msgid "Is Account Payable"
 msgstr "هل هو حساب دائن"
 
-#: projects/report/project_summary/project_summary.js:17
+#: projects/report/project_summary/project_summary.js:16
 msgid "Is Active"
 msgstr "نشط"
 
@@ -33960,7 +34514,7 @@
 msgid "Is Advance"
 msgstr "هل مقدم"
 
-#: selling/doctype/quotation/quotation.js:294
+#: selling/doctype/quotation/quotation.js:306
 msgid "Is Alternative"
 msgstr ""
 
@@ -34268,9 +34822,9 @@
 msgid "Is Fully Depreciated"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:110
-#: accounts/doctype/cost_center/cost_center_tree.js:23
-#: stock/doctype/warehouse/warehouse_tree.js:16
+#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/cost_center/cost_center_tree.js:30
+#: stock/doctype/warehouse/warehouse_tree.js:20
 msgid "Is Group"
 msgstr "هل مجموعة"
 
@@ -34544,7 +35098,13 @@
 msgid "Is Rejected"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.js:64
+#. Label of a Check field in DocType 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "Is Rejected Warehouse"
+msgstr ""
+
+#: accounts/report/pos_register/pos_register.js:63
 #: accounts/report/pos_register/pos_register.py:226
 msgid "Is Return"
 msgstr "مرتجع؟"
@@ -34694,7 +35254,7 @@
 msgstr "هل هذه الضريبة متضمنة في الاسعار الأساسية؟"
 
 #. Name of a DocType
-#: assets/doctype/asset/asset_list.js:26 public/js/communication.js:12
+#: assets/doctype/asset/asset_list.js:19 public/js/communication.js:13
 #: support/doctype/issue/issue.json
 msgid "Issue"
 msgstr "المشكلات"
@@ -34759,15 +35319,15 @@
 msgid "Issue Date"
 msgstr "تاريخ القضية"
 
-#: stock/doctype/material_request/material_request.js:127
+#: stock/doctype/material_request/material_request.js:138
 msgid "Issue Material"
 msgstr "قضية المواد"
 
 #. Name of a DocType
 #: support/doctype/issue_priority/issue_priority.json
-#: support/report/issue_analytics/issue_analytics.js:64
+#: support/report/issue_analytics/issue_analytics.js:63
 #: support/report/issue_analytics/issue_analytics.py:64
-#: support/report/issue_summary/issue_summary.js:52
+#: support/report/issue_summary/issue_summary.js:51
 #: support/report/issue_summary/issue_summary.py:61
 msgid "Issue Priority"
 msgstr "أولوية الإصدار"
@@ -34815,7 +35375,7 @@
 msgid "Issue a debit note with 0 qty against an existing Sales Invoice"
 msgstr ""
 
-#: stock/doctype/material_request/material_request_list.js:29
+#: stock/doctype/material_request/material_request_list.js:33
 msgid "Issued"
 msgstr "نشر"
 
@@ -34867,70 +35427,79 @@
 msgid "It can take upto few hours for accurate stock values to be visible after merging items."
 msgstr ""
 
-#: public/js/controllers/transaction.js:1839
+#: public/js/controllers/transaction.js:1882
 msgid "It is needed to fetch Item Details."
 msgstr "هناك حاجة لجلب تفاصيل البند."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:135
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:156
 msgid "It's not possible to distribute charges equally when total amount is zero, please set 'Distribute Charges Based On' as 'Quantity'"
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:16
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:15
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:32
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:22
 #: buying/report/procurement_tracker/procurement_tracker.py:60
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:50
+#: 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:1018
+#: controllers/taxes_and_totals.py:1019
+#: 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_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:67
-#: manufacturing/report/process_loss_report/process_loss_report.js:16
+#: 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
-#: public/js/bom_configurator/bom_configurator.bundle.js:202
-#: public/js/bom_configurator/bom_configurator.bundle.js:270
+#: 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
 #: public/js/purchase_trends_filters.js:48
-#: public/js/purchase_trends_filters.js:65 public/js/sales_trends_filters.js:23
-#: public/js/sales_trends_filters.js:41 public/js/stock_analytics.js:61
-#: selling/doctype/sales_order/sales_order.js:977
-#: selling/report/customer_wise_item_price/customer_wise_item_price.js:15
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:37
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:63
-#: stock/dashboard/item_dashboard.js:208 stock/doctype/item/item.json
+#: public/js/purchase_trends_filters.js:63 public/js/sales_trends_filters.js:23
+#: public/js/sales_trends_filters.js:39 public/js/stock_analytics.js:92
+#: selling/doctype/sales_order/sales_order.js:1139
+#: selling/page/point_of_sale/pos_item_cart.js:46
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:14
+#: 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/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
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:24
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:32
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:74
-#: stock/report/item_price_stock/item_price_stock.js:9
+#: stock/report/item_price_stock/item_price_stock.js:8
 #: 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:11
+#: stock/report/item_variant_details/item_variant_details.js:10
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55
 #: 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:33
+#: stock/report/reserved_stock/reserved_stock.js:30
 #: stock/report/reserved_stock/reserved_stock.py:103
 #: 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:16
+#: stock/report/stock_analytics/stock_analytics.js:15
 #: stock/report/stock_analytics/stock_analytics.py:30
 #: stock/report/stock_balance/stock_balance.js:39
-#: stock/report/stock_balance/stock_balance.py:361
+#: stock/report/stock_balance/stock_balance.py:369
 #: stock/report/stock_ledger/stock_ledger.js:42
-#: stock/report/stock_ledger/stock_ledger.py:109
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:32
+#: 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 templates/generators/bom.html:19
-#: templates/pages/material_request_info.html:42 templates/pages/order.html:83
+#: templates/emails/reorder_item.html:8
+#: templates/form_grid/material_request_grid.html:6
+#: templates/form_grid/stock_entry_grid.html:8 templates/generators/bom.html:19
+#: templates/pages/material_request_info.html:42 templates/pages/order.html:95
 msgid "Item"
 msgstr "السلعة"
 
@@ -35124,6 +35693,10 @@
 msgid "Item Barcode"
 msgstr "باركود الصنف"
 
+#: selling/page/point_of_sale/pos_item_cart.js:46
+msgid "Item Cart"
+msgstr ""
+
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:69
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:36
 #: accounts/report/gross_profit/gross_profit.py:224
@@ -35133,40 +35706,41 @@
 #: 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/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:9
+#: 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/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:76
+#: 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/quality_inspection_summary/quality_inspection_summary.js:28
+#: 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:187
-#: public/js/controllers/transaction.js:2112 public/js/utils.js:459
-#: public/js/utils.js:606 selling/doctype/quotation/quotation.js:268
-#: selling/doctype/sales_order/sales_order.js:291
-#: selling/doctype/sales_order/sales_order.js:392
-#: selling/doctype/sales_order/sales_order.js:682
-#: selling/doctype/sales_order/sales_order.js:806
+#: 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
+#: selling/doctype/sales_order/sales_order.js:318
+#: selling/doctype/sales_order/sales_order.js:422
+#: selling/doctype/sales_order/sales_order.js:784
+#: selling/doctype/sales_order/sales_order.js:926
 #: selling/report/customer_wise_item_price/customer_wise_item_price.py:29
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:27
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:19
 #: selling/report/sales_order_analysis/sales_order_analysis.py:241
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:86
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:16
+#: 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:8
+#: 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/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:8
+#: stock/report/serial_no_ledger/serial_no_ledger.js:7
 #: stock/report/stock_ageing/stock_ageing.py:119
 #: 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
@@ -35558,7 +36132,7 @@
 msgid "Item Code"
 msgstr "رمز السلعة"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:61
+#: manufacturing/doctype/bom_creator/bom_creator.js:60
 msgid "Item Code (Final Product)"
 msgstr ""
 
@@ -35566,12 +36140,12 @@
 msgid "Item Code cannot be changed for Serial No."
 msgstr "لا يمكن تغيير رمز السلعة للرقم التسلسلي"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:444
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:448
 msgid "Item Code required at Row No {0}"
 msgstr "رمز العنصر المطلوب في الصف رقم {0}\\n<br>\\nItem Code required at Row No {0}"
 
-#: selling/page/point_of_sale/pos_controller.js:672
-#: selling/page/point_of_sale/pos_item_details.js:251
+#: selling/page/point_of_sale/pos_controller.js:704
+#: selling/page/point_of_sale/pos_item_details.js:262
 msgid "Item Code: {0} is not available under warehouse {1}."
 msgstr "رمز العنصر: {0} غير متوفر ضمن المستودع {1}."
 
@@ -35639,6 +36213,10 @@
 msgid "Item Description"
 msgstr "وصف الصنف"
 
+#: selling/page/point_of_sale/pos_item_details.js:28
+msgid "Item Details"
+msgstr "بيانات الصنف"
+
 #. Label of a Section Break field in DocType 'Production Plan Sub Assembly
 #. Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -35647,9 +36225,9 @@
 msgstr "بيانات الصنف"
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:43
+#: accounts/report/gross_profit/gross_profit.js:44
 #: accounts/report/gross_profit/gross_profit.py:237
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:22
+#: 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
@@ -35657,36 +36235,38 @@
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:181
 #: accounts/report/purchase_register/purchase_register.js:58
 #: accounts/report/sales_register/sales_register.js:70
+#: manufacturing/doctype/plant_floor/plant_floor.js:100
+#: manufacturing/doctype/workstation/workstation_job_card.html:94
 #: public/js/purchase_trends_filters.js:49 public/js/sales_trends_filters.js:24
-#: selling/page/point_of_sale/pos_item_selector.js:159
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:31
+#: selling/page/point_of_sale/pos_item_selector.js:156
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:30
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:35
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:55
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:54
 #: selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:89
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:42
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:41
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:54
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:41
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:93
+#: 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/delayed_item_report/delayed_item_report.js:49
-#: stock/report/delayed_order_report/delayed_order_report.js:49
+#: 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/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_analytics/stock_analytics.js:9
+#: stock/report/stock_analytics/stock_analytics.js:8
 #: stock/report/stock_analytics/stock_analytics.py:39
 #: stock/report/stock_balance/stock_balance.js:32
-#: stock/report/stock_balance/stock_balance.py:369
+#: stock/report/stock_balance/stock_balance.py:377
 #: stock/report/stock_ledger/stock_ledger.js:53
-#: stock/report/stock_ledger/stock_ledger.py:174
+#: stock/report/stock_ledger/stock_ledger.py:247
 #: stock/report/stock_projected_qty/stock_projected_qty.js:39
 #: stock/report/stock_projected_qty/stock_projected_qty.py:108
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:25
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:24
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:94
 msgid "Item Group"
 msgstr "مجموعة الصنف"
@@ -35906,7 +36486,7 @@
 msgid "Item Group Name"
 msgstr "اسم مجموعة السلعة"
 
-#: setup/doctype/item_group/item_group.js:65
+#: setup/doctype/item_group/item_group.js:82
 msgid "Item Group Tree"
 msgstr "شجرة فئات البنود"
 
@@ -35972,7 +36552,8 @@
 #: 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
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:95
+#: 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
@@ -35981,7 +36562,7 @@
 #: manufacturing/report/production_planning_report/production_planning_report.py:356
 #: 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:2118
+#: public/js/controllers/transaction.js:2161
 #: 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
@@ -35995,8 +36576,8 @@
 #: 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:367
-#: stock/report/stock_ledger/stock_ledger.py:115
+#: stock/report/stock_balance/stock_balance.py:375
+#: 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
@@ -36379,15 +36960,15 @@
 msgid "Item Price Stock"
 msgstr "سعر صنف المخزون"
 
-#: stock/get_item_details.py:878
+#: stock/get_item_details.py:889
 msgid "Item Price added for {0} in Price List {1}"
 msgstr "تم اضافتة سعر الصنف لـ {0} في قائمة الأسعار {1}"
 
-#: stock/doctype/item_price/item_price.py:142
+#: stock/doctype/item_price/item_price.py:136
 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:862
+#: stock/get_item_details.py:873
 msgid "Item Price updated for {0} in Price List {1}"
 msgstr "سعر الصنف محدث ل{0} في قائمة الأسعار {1}"
 
@@ -36431,7 +37012,7 @@
 msgid "Item Reorder"
 msgstr "البند إعادة ترتيب"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:130
 msgid "Item Row {0}: {1} {2} does not exist in above '{1}' table"
 msgstr "صنف الصف {0}: {1} {2} غير موجود في جدول &#39;{1}&#39; أعلاه"
 
@@ -36645,7 +37226,7 @@
 msgstr "الصنف تفاصيل متغير"
 
 #. Name of a DocType
-#: stock/doctype/item/item.js:94
+#: stock/doctype/item/item.js:114
 #: stock/doctype/item_variant_settings/item_variant_settings.json
 msgid "Item Variant Settings"
 msgstr "إعدادات متنوع السلعة"
@@ -36656,7 +37237,7 @@
 msgid "Item Variant Settings"
 msgstr "إعدادات متنوع السلعة"
 
-#: stock/doctype/item/item.js:667
+#: stock/doctype/item/item.js:744
 msgid "Item Variant {0} already exists with same attributes"
 msgstr "متغير الصنف {0} موجود بالفعل مع نفس الخصائص"
 
@@ -36751,7 +37332,7 @@
 msgid "Item and Warranty Details"
 msgstr "البند والضمان تفاصيل"
 
-#: stock/doctype/stock_entry/stock_entry.py:2325
+#: stock/doctype/stock_entry/stock_entry.py:2359
 msgid "Item for row {0} does not match Material Request"
 msgstr "عنصر الصف {0} لا يتطابق مع طلب المواد"
 
@@ -36759,16 +37340,16 @@
 msgid "Item has variants."
 msgstr "البند لديه متغيرات."
 
-#: selling/page/point_of_sale/pos_item_details.js:110
+#: selling/page/point_of_sale/pos_item_details.js:108
 msgid "Item is removed since no serial / batch no selected."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:105
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:126
 msgid "Item must be added using 'Get Items from Purchase Receipts' button"
 msgstr "الصنف يجب اضافته مستخدما  مفتاح \"احصل علي الأصناف من المشتريات المستلمة \""
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: selling/doctype/sales_order/sales_order.js:984
+#: selling/doctype/sales_order/sales_order.js:1146
 msgid "Item name"
 msgstr "اسم السلعة"
 
@@ -36778,11 +37359,11 @@
 msgid "Item operation"
 msgstr "عملية الصنف"
 
-#: controllers/accounts_controller.py:3196
+#: controllers/accounts_controller.py:3287
 msgid "Item qty can not be updated as raw materials are already processed."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:857
+#: stock/doctype/stock_entry/stock_entry.py:813
 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
 msgstr ""
 
@@ -36792,7 +37373,11 @@
 msgid "Item to be manufactured or repacked"
 msgstr "الصنف الذي سيتم تصنيعه أو إعادة تعبئته"
 
-#: stock/utils.py:564
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Item valuation rate is recalculated considering landed cost voucher amount"
+msgstr ""
+
+#: stock/utils.py:559
 msgid "Item valuation reposting in progress. Report might show incorrect item valuation."
 msgstr ""
 
@@ -36804,11 +37389,11 @@
 msgid "Item {0} cannot be added as a sub-assembly of itself"
 msgstr ""
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:146
+#: manufacturing/doctype/blanket_order/blanket_order.py:189
 msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:231 stock/doctype/item/item.py:603
+#: assets/doctype/asset/asset.py:233 stock/doctype/item/item.py:603
 msgid "Item {0} does not exist"
 msgstr "العنصر {0} غير موجود\\n<br>\\nItem {0} does not exist"
 
@@ -36816,7 +37401,7 @@
 msgid "Item {0} does not exist in the system or has expired"
 msgstr "الصنف{0} غير موجود في النظام أو انتهت صلاحيته"
 
-#: controllers/selling_controller.py:655
+#: controllers/selling_controller.py:679
 msgid "Item {0} entered multiple times."
 msgstr ""
 
@@ -36824,11 +37409,11 @@
 msgid "Item {0} has already been returned"
 msgstr "تمت إرجاع الصنف{0} من قبل"
 
-#: assets/doctype/asset/asset.py:233
+#: assets/doctype/asset/asset.py:235
 msgid "Item {0} has been disabled"
 msgstr "الصنف{0} تم تعطيله"
 
-#: selling/doctype/sales_order/sales_order.py:645
+#: selling/doctype/sales_order/sales_order.py:651
 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No"
 msgstr ""
 
@@ -36836,7 +37421,7 @@
 msgid "Item {0} has reached its end of life on {1}"
 msgstr "الصنف{0} قد وصل إلى نهاية عمره في {1}"
 
-#: stock/stock_ledger.py:111
+#: stock/stock_ledger.py:113
 msgid "Item {0} ignored since it is not a stock item"
 msgstr "تم تجاهل الصنف {0} لأنه ليس بند مخزون"
 
@@ -36860,43 +37445,43 @@
 msgid "Item {0} is not a stock Item"
 msgstr "العنصر {0} ليس عنصر مخزون\\n<br>\\nItem {0} is not a stock Item"
 
-#: stock/doctype/stock_entry/stock_entry.py:1538
+#: stock/doctype/stock_entry/stock_entry.py:1547
 msgid "Item {0} is not active or end of life has been reached"
 msgstr "البند {0} غير نشط أو تم التوصل إلى نهاية الحياة"
 
-#: assets/doctype/asset/asset.py:235
+#: assets/doctype/asset/asset.py:237
 msgid "Item {0} must be a Fixed Asset Item"
 msgstr "البند {0} يجب أن يكون بند أصول ثابتة"
 
-#: stock/get_item_details.py:228
+#: stock/get_item_details.py:233
 msgid "Item {0} must be a Non-Stock Item"
 msgstr ""
 
-#: stock/get_item_details.py:225
+#: stock/get_item_details.py:230
 msgid "Item {0} must be a Sub-contracted Item"
 msgstr "البند {0} يجب أن يكون عنصر التعاقد الفرعي"
 
-#: assets/doctype/asset/asset.py:237
+#: assets/doctype/asset/asset.py:239
 msgid "Item {0} must be a non-stock item"
 msgstr "الصنف {0} يجب ألا يكون صنف مخزن <br>Item {0} must be a non-stock item"
 
-#: stock/doctype/stock_entry/stock_entry.py:1086
+#: stock/doctype/stock_entry/stock_entry.py:1095
 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}"
 msgstr ""
 
-#: stock/doctype/item_price/item_price.py:57
+#: stock/doctype/item_price/item_price.py:56
 msgid "Item {0} not found."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:342
+#: buying/doctype/purchase_order/purchase_order.py:343
 msgid "Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item)."
 msgstr "البند {0} الكمية المطلوبة {1} لا يمكن أن تكون أقل من الحد الأدنى للطلب {2} (المحددة في البند)."
 
-#: manufacturing/doctype/production_plan/production_plan.js:418
+#: manufacturing/doctype/production_plan/production_plan.js:453
 msgid "Item {0}: {1} qty produced. "
 msgstr "العنصر {0}: {1} الكمية المنتجة."
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1131
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1190
 msgid "Item {} does not exist."
 msgstr ""
 
@@ -36942,9 +37527,12 @@
 msgid "Item: {0} does not exist in the system"
 msgstr "الصنف: {0} غير موجود في النظام"
 
-#: public/js/utils.js:442 setup/doctype/item_group/item_group.js:70
-#: stock/doctype/delivery_note/delivery_note.js:364
-#: templates/generators/bom.html:38 templates/pages/rfq.html:37
+#: public/js/utils.js:489
+#: 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
+#: templates/form_grid/item_grid.html:6 templates/generators/bom.html:38
+#: templates/pages/rfq.html:37
 msgid "Items"
 msgstr "الاصناف"
 
@@ -37115,8 +37703,8 @@
 msgid "Items Filter"
 msgstr "تصفية الاصناف"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1462
-#: selling/doctype/sales_order/sales_order.js:1018
+#: manufacturing/doctype/production_plan/production_plan.py:1484
+#: selling/doctype/sales_order/sales_order.js:1182
 msgid "Items Required"
 msgstr "العناصر المطلوبة"
 
@@ -37132,15 +37720,15 @@
 msgid "Items and Pricing"
 msgstr "السلع والتسعيرات"
 
-#: controllers/accounts_controller.py:3416
+#: controllers/accounts_controller.py:3507
 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:824
+#: selling/doctype/sales_order/sales_order.js:962
 msgid "Items for Raw Material Request"
 msgstr "عناصر لطلب المواد الخام"
 
-#: stock/doctype/stock_entry/stock_entry.py:853
+#: stock/doctype/stock_entry/stock_entry.py:809
 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}"
 msgstr ""
 
@@ -37150,7 +37738,7 @@
 msgid "Items to Be Repost"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1461
+#: manufacturing/doctype/production_plan/production_plan.py:1483
 msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
 msgstr "العناصر المطلوب تصنيعها لسحب المواد الخام المرتبطة بها."
 
@@ -37159,11 +37747,11 @@
 msgid "Items to Order and Receive"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:252
+#: selling/doctype/sales_order/sales_order.js:278
 msgid "Items to Reserve"
 msgstr ""
 
-#. Description of the 'Parent Warehouse' (Link) field in DocType 'Pick List'
+#. Description of the 'Warehouse' (Link) field in DocType 'Pick List'
 #: stock/doctype/pick_list/pick_list.json
 msgctxt "Pick List"
 msgid "Items under this warehouse will be suggested"
@@ -37188,11 +37776,18 @@
 msgid "JAN"
 msgstr ""
 
+#. Label of a Int field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Capacity"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/job_card/job_card.json
-#: manufacturing/doctype/job_card/job_card.py:765
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:28
+#: manufacturing/doctype/job_card/job_card.py:772
+#: 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
 msgid "Job Card"
 msgstr "بطاقة عمل"
@@ -37296,11 +37891,17 @@
 msgid "Job Card Time Log"
 msgstr "سجل وقت بطاقة العمل"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:94
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Cards"
+msgstr ""
+
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:95
 msgid "Job Paused"
 msgstr ""
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:54
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:53
 msgid "Job Started"
 msgstr "بدأ العمل"
 
@@ -37322,11 +37923,11 @@
 msgid "Job Title"
 msgstr "المسمى الوظيفي"
 
-#: manufacturing/doctype/work_order/work_order.py:1562
+#: manufacturing/doctype/work_order/work_order.py:1576
 msgid "Job card {0} created"
 msgstr "تم إنشاء بطاقة العمل {0}"
 
-#: utilities/bulk_transaction.py:48
+#: utilities/bulk_transaction.py:52
 msgid "Job: {0} has been triggered for processing failed transactions"
 msgstr ""
 
@@ -37340,19 +37941,20 @@
 msgid "Joining"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:29
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:30
 msgid "Journal Entries"
 msgstr ""
 
-#: accounts/utils.py:866
+#: accounts/utils.py:875
 msgid "Journal Entries {0} are un-linked"
 msgstr "إدخالات قيد اليومية {0} غير مترابطة"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:146
+#: accounts/doctype/account/account_tree.js:205
 #: accounts/doctype/journal_entry/journal_entry.json
 #: accounts/print_format/journal_auditing_voucher/journal_auditing_voucher.html:10
-#: assets/doctype/asset/asset.js:246 assets/doctype/asset/asset.js:249
+#: assets/doctype/asset/asset.js:282 assets/doctype/asset/asset.js:291
+#: templates/form_grid/bank_reconciliation_grid.html:3
 msgid "Journal Entry"
 msgstr "القيود اليومية"
 
@@ -37437,7 +38039,7 @@
 msgid "Journal Entry Type"
 msgstr "نوع إدخال دفتر اليومية"
 
-#: accounts/doctype/journal_entry/journal_entry.py:471
+#: accounts/doctype/journal_entry/journal_entry.py:487
 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset."
 msgstr ""
 
@@ -37447,11 +38049,11 @@
 msgid "Journal Entry for Scrap"
 msgstr "قيد دفتر يومية للتخريد"
 
-#: accounts/doctype/journal_entry/journal_entry.py:232
+#: accounts/doctype/journal_entry/journal_entry.py:248
 msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:597
+#: accounts/doctype/journal_entry/journal_entry.py:624
 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
 msgstr "قيد دفتر اليومية {0} ليس لديه حساب {1} أو قد تم مطابقته مسبقا مع إيصال أخرى"
 
@@ -37461,14 +38063,19 @@
 msgid "Journals"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:95
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:99
 msgid "Journals have been created"
 msgstr ""
 
-#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:104
 msgid "Kanban Board"
 msgstr "لوح كانبان"
 
+#. Description of a DocType
+#: crm/doctype/campaign/campaign.json
+msgid "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. "
+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"
@@ -37489,11 +38096,11 @@
 msgid "Key Reports"
 msgstr "التقارير الرئيسية"
 
-#: manufacturing/doctype/job_card/job_card.py:768
+#: manufacturing/doctype/job_card/job_card.py:775
 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}."
 msgstr ""
 
-#: public/js/utils/party.js:221
+#: public/js/utils/party.js:264
 msgid "Kindly select the company first"
 msgstr "يرجى اختيار الشركة أولا"
 
@@ -37633,7 +38240,7 @@
 msgid "Last Name"
 msgstr "اسم العائلة"
 
-#: stock/doctype/shipment/shipment.js:247
+#: stock/doctype/shipment/shipment.js:275
 msgid "Last Name, Email or Phone/Mobile of the user are mandatory to continue."
 msgstr ""
 
@@ -37676,7 +38283,7 @@
 msgid "Last Purchase Rate"
 msgstr "آخر سعر الشراء"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:313
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:324
 msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
 msgstr "كانت آخر معاملة مخزون للبند {0} تحت المستودع {1} في {2}."
 
@@ -37688,7 +38295,7 @@
 msgid "Latest"
 msgstr "اخير"
 
-#: stock/report/stock_balance/stock_balance.py:479
+#: stock/report/stock_balance/stock_balance.py:487
 msgid "Latest Age"
 msgstr "مرحلة متأخرة"
 
@@ -37705,11 +38312,11 @@
 msgstr "خط العرض"
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:34
+#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:33
 #: crm/report/lead_details/lead_details.py:18
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:8
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:28
-#: public/js/communication.js:20
+#: public/js/communication.js:25
 msgid "Lead"
 msgstr "مبادرة البيع"
 
@@ -37974,9 +38581,9 @@
 msgid "Leave blank to use the standard Delivery Note format"
 msgstr "اتركه فارغًا لاستخدام تنسيق &quot;ملاحظة التسليم&quot; القياسي"
 
-#: accounts/doctype/journal_entry/journal_entry.js:18
-#: accounts/doctype/payment_entry/payment_entry.js:265
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:24
+#: accounts/doctype/journal_entry/journal_entry.js:54
+#: accounts/doctype/payment_entry/payment_entry.js:343
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:25
 msgid "Ledger"
 msgstr ""
 
@@ -38019,10 +38626,15 @@
 msgid "Left Index"
 msgstr "الفهرس الأيسر"
 
-#: setup/doctype/company/company.py:389
+#: setup/doctype/company/company.py:388
 msgid "Legal"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/company/company.json
+msgid "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization."
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:59
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:84
 msgid "Legal Expenses"
@@ -38048,7 +38660,7 @@
 msgid "Length (cm)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:657
+#: accounts/doctype/payment_entry/payment_entry.js:807
 msgid "Less Than Amount"
 msgstr "أقل من المبلغ"
 
@@ -38369,7 +38981,7 @@
 msgid "Liabilities"
 msgstr "المطلوبات"
 
-#: accounts/report/account_balance/account_balance.js:27
+#: accounts/report/account_balance/account_balance.js:26
 msgid "Liability"
 msgstr "الخصوم"
 
@@ -38466,20 +39078,20 @@
 msgid "Link existing Quality Procedure."
 msgstr "ربط إجراءات الجودة الحالية."
 
-#: buying/doctype/purchase_order/purchase_order.js:487
+#: buying/doctype/purchase_order/purchase_order.js:564
 msgid "Link to Material Request"
 msgstr "رابط لطلب المواد"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:378
-#: buying/doctype/supplier_quotation/supplier_quotation.js:52
+#: buying/doctype/request_for_quotation/request_for_quotation.js:407
+#: buying/doctype/supplier_quotation/supplier_quotation.js:54
 msgid "Link to Material Requests"
 msgstr "رابط لطلبات المواد"
 
-#: buying/doctype/supplier/supplier.js:107
+#: buying/doctype/supplier/supplier.js:133
 msgid "Link with Customer"
 msgstr ""
 
-#: selling/doctype/customer/customer.js:173
+#: selling/doctype/customer/customer.js:189
 msgid "Link with Supplier"
 msgstr ""
 
@@ -38504,16 +39116,16 @@
 msgid "Linked with submitted documents"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:185
-#: selling/doctype/customer/customer.js:230
+#: buying/doctype/supplier/supplier.js:218
+#: selling/doctype/customer/customer.js:251
 msgid "Linking Failed"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:184
+#: buying/doctype/supplier/supplier.js:217
 msgid "Linking to Customer Failed. Please try again."
 msgstr ""
 
-#: selling/doctype/customer/customer.js:229
+#: selling/doctype/customer/customer.js:250
 msgid "Linking to Supplier Failed. Please try again."
 msgstr ""
 
@@ -38535,7 +39147,7 @@
 msgid "Load All Criteria"
 msgstr "تحميل جميع المعايير"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:298
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:276
 msgid "Loading import file..."
 msgstr "جارٍ تحميل ملف الاستيراد ..."
 
@@ -38644,6 +39256,11 @@
 msgid "Log Entries"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/item_price/item_price.json
+msgid "Log the selling and buying rate of an Item"
+msgstr ""
+
 #. Label of a Attach Image field in DocType 'Manufacturer'
 #: stock/doctype/manufacturer/manufacturer.json
 msgctxt "Manufacturer"
@@ -38669,7 +39286,7 @@
 msgstr "خط الطول"
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:7
-#: selling/doctype/quotation/quotation_list.js:33
+#: selling/doctype/quotation/quotation_list.js:32
 msgid "Lost"
 msgstr "مفقود"
 
@@ -38696,7 +39313,7 @@
 msgid "Lost Opportunity"
 msgstr "فرصة ضائعة"
 
-#: crm/report/lead_details/lead_details.js:39
+#: crm/report/lead_details/lead_details.js:38
 msgid "Lost Quotation"
 msgstr "تسعيرة خسر"
 
@@ -38716,7 +39333,7 @@
 msgid "Lost Quotations %"
 msgstr ""
 
-#: crm/report/lost_opportunity/lost_opportunity.js:31
+#: crm/report/lost_opportunity/lost_opportunity.js:30
 #: selling/report/lost_quotations/lost_quotations.py:24
 msgid "Lost Reason"
 msgstr "فقد السبب"
@@ -38733,7 +39350,7 @@
 msgstr "تفاصيل السبب المفقود"
 
 #: crm/report/lost_opportunity/lost_opportunity.py:49
-#: public/js/utils/sales_common.js:410
+#: public/js/utils/sales_common.js:466
 msgid "Lost Reasons"
 msgstr "أسباب ضائعة"
 
@@ -38751,7 +39368,7 @@
 msgid "Lost Reasons"
 msgstr "أسباب ضائعة"
 
-#: crm/doctype/opportunity/opportunity.js:29
+#: crm/doctype/opportunity/opportunity.js:28
 msgid "Lost Reasons are required in case opportunity is Lost."
 msgstr ""
 
@@ -38829,7 +39446,7 @@
 msgid "Loyalty Point Entry Redemption"
 msgstr "نقطة الولاء دخول الفداء"
 
-#: selling/page/point_of_sale/pos_item_cart.js:891
+#: selling/page/point_of_sale/pos_item_cart.js:924
 msgid "Loyalty Points"
 msgstr "نقاط الولاء"
 
@@ -38876,14 +39493,18 @@
 msgid "Loyalty Points Redemption"
 msgstr "نقاط الولاء الفداء"
 
-#: public/js/utils.js:109
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+msgid "Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned."
+msgstr ""
+
+#: public/js/utils.js:136
 msgid "Loyalty Points: {0}"
 msgstr "نقاط الولاء: {0}"
 
 #. Name of a DocType
 #: accounts/doctype/loyalty_program/loyalty_program.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:1041
-#: selling/page/point_of_sale/pos_item_cart.js:885
+#: accounts/doctype/sales_invoice/sales_invoice.js:1117
+#: selling/page/point_of_sale/pos_item_cart.js:917
 msgid "Loyalty Program"
 msgstr "برنامج الولاء"
 
@@ -39066,11 +39687,16 @@
 msgid "MFG-WO-.YYYY.-"
 msgstr "مبدعين-WO-.YYYY.-"
 
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:22
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:23
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:78
+#: public/js/plant_floor_visual/visual_plant.js:86
 msgid "Machine"
 msgstr "آلة"
 
+#: public/js/plant_floor_visual/visual_plant.js:70
+msgid "Machine Type"
+msgstr ""
+
 #. Option for the 'Stop Reason' (Select) field in DocType 'Downtime Entry'
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 msgctxt "Downtime Entry"
@@ -39083,8 +39709,8 @@
 msgid "Machine operator errors"
 msgstr "أخطاء مشغل الآلة"
 
-#: setup/doctype/company/company.py:563 setup/doctype/company/company.py:578
-#: setup/doctype/company/company.py:579 setup/doctype/company/company.py:580
+#: setup/doctype/company/company.py:562 setup/doctype/company/company.py:577
+#: setup/doctype/company/company.py:578 setup/doctype/company/company.py:579
 msgid "Main"
 msgstr "رئيسي"
 
@@ -39098,7 +39724,7 @@
 msgid "Main Cost Center {0} cannot be entered in the child table"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:102
+#: assets/doctype/asset/asset.js:118
 msgid "Maintain Asset"
 msgstr ""
 
@@ -39155,6 +39781,12 @@
 msgid "Maintenance"
 msgstr "الصيانة"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Maintenance"
+msgstr "الصيانة"
+
 #. Label of a Date field in DocType 'Maintenance Visit'
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
 msgctxt "Maintenance Visit"
@@ -39167,7 +39799,7 @@
 msgid "Maintenance Details"
 msgstr ""
 
-#: assets/doctype/asset_maintenance/asset_maintenance.js:43
+#: assets/doctype/asset_maintenance/asset_maintenance.js:41
 msgid "Maintenance Log"
 msgstr "سجل الصيانة"
 
@@ -39214,10 +39846,10 @@
 msgstr "صلاحية الصيانة"
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:162
+#: accounts/doctype/sales_invoice/sales_invoice.js:175
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.json
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:78
-#: selling/doctype/sales_order/sales_order.js:582
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
+#: selling/doctype/sales_order/sales_order.js:673
 msgid "Maintenance Schedule"
 msgstr "جدول الصيانة"
 
@@ -39360,10 +39992,10 @@
 msgstr "عضو الصيانة"
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:83
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:87
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
-#: selling/doctype/sales_order/sales_order.js:581
-#: support/doctype/warranty_claim/warranty_claim.js:50
+#: selling/doctype/sales_order/sales_order.js:668
+#: support/doctype/warranty_claim/warranty_claim.js:47
 msgid "Maintenance Visit"
 msgstr "زيارة صيانة"
 
@@ -39396,16 +40028,16 @@
 msgid "Major/Optional Subjects"
 msgstr "المواد الرئيسية والاختيارية التي تم دراستها"
 
-#: accounts/doctype/journal_entry/journal_entry.js:51
-#: manufacturing/doctype/job_card/job_card.js:174
+#: accounts/doctype/journal_entry/journal_entry.js:100
+#: manufacturing/doctype/job_card/job_card.js:196
 msgid "Make"
 msgstr "سنة الصنع"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:56
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:54
 msgid "Make "
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:39
+#: assets/doctype/asset/asset_list.js:29
 msgid "Make Asset Movement"
 msgstr ""
 
@@ -39435,7 +40067,7 @@
 msgid "Make Quotation"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:335
 msgid "Make Return Entry"
 msgstr ""
 
@@ -39451,7 +40083,7 @@
 msgid "Make Serial No / Batch from Work Order"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
+#: stock/doctype/purchase_receipt/purchase_receipt.js:261
 msgid "Make Stock Entry"
 msgstr "جعل دخول الأسهم"
 
@@ -39459,20 +40091,20 @@
 msgid "Make project from a template."
 msgstr "جعل المشروع من قالب."
 
-#: stock/doctype/item/item.js:502
+#: stock/doctype/item/item.js:569
 msgid "Make {0} Variant"
 msgstr ""
 
-#: stock/doctype/item/item.js:504
+#: stock/doctype/item/item.js:571
 msgid "Make {0} Variants"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:85 assets/doctype/asset/asset.js:89
-#: assets/doctype/asset/asset.js:93 assets/doctype/asset/asset.js:98
-#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:109
-#: assets/doctype/asset/asset.js:113 assets/doctype/asset/asset.js:118
-#: assets/doctype/asset/asset.js:124 assets/doctype/asset/asset.js:136
-#: setup/doctype/company/company.js:112 setup/doctype/company/company.js:119
+#: assets/doctype/asset/asset.js:88 assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:112
+#: assets/doctype/asset/asset.js:122 assets/doctype/asset/asset.js:131
+#: assets/doctype/asset/asset.js:139 assets/doctype/asset/asset.js:148
+#: assets/doctype/asset/asset.js:158 assets/doctype/asset/asset.js:174
+#: setup/doctype/company/company.js:134 setup/doctype/company/company.js:145
 msgid "Manage"
 msgstr ""
 
@@ -39496,22 +40128,22 @@
 msgid "Manage your orders"
 msgstr "إدارة طلباتك"
 
-#: setup/doctype/company/company.py:371
+#: setup/doctype/company/company.py:370
 msgid "Management"
 msgstr "الإدارة"
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
-#: manufacturing/doctype/bom/bom.js:71 manufacturing/doctype/bom/bom.js:482
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: 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
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484 public/js/utils/party.js:273
-#: stock/doctype/delivery_note/delivery_note.js:138
-#: stock/doctype/purchase_receipt/purchase_receipt.js:113
-#: stock/doctype/purchase_receipt/purchase_receipt.js:198
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
+#: public/js/controllers/transaction.js:2537 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:99
 msgid "Mandatory"
 msgstr "إلزامي"
 
@@ -39537,7 +40169,7 @@
 msgid "Mandatory Depends On"
 msgstr "إلزامي يعتمد على"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
 msgid "Mandatory Field"
 msgstr ""
 
@@ -39557,11 +40189,11 @@
 msgid "Mandatory Missing"
 msgstr "إلزامي مفقود"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:587
 msgid "Mandatory Purchase Order"
 msgstr "أمر شراء إلزامي"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
 msgid "Mandatory Purchase Receipt"
 msgstr "إيصال الشراء الإلزامي"
 
@@ -39629,7 +40261,7 @@
 msgid "Manual Inspection"
 msgstr ""
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:34
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:36
 msgid "Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again"
 msgstr "لا يمكن إنشاء الإدخال اليدوي! قم بتعطيل الإدخال التلقائي للمحاسبة المؤجلة في إعدادات الحسابات وحاول مرة أخرى"
 
@@ -39725,7 +40357,7 @@
 msgid "Manufacture against Material Request"
 msgstr "تصنيع ضد طلب مواد"
 
-#: stock/doctype/material_request/material_request_list.js:33
+#: stock/doctype/material_request/material_request_list.js:37
 msgid "Manufactured"
 msgstr "المصنعة"
 
@@ -39857,10 +40489,15 @@
 msgid "Manufacturer Part Number"
 msgstr "رقم قطعة المُصَنِّع"
 
-#: public/js/controllers/buying.js:337
+#: public/js/controllers/buying.js:332
 msgid "Manufacturer Part Number <b>{0}</b> is invalid"
 msgstr "رقم جزء الشركة المصنعة <b>{0}</b> غير صالح"
 
+#. Description of a DocType
+#: stock/doctype/manufacturer/manufacturer.json
+msgid "Manufacturers used in Items"
+msgstr ""
+
 #. Name of a Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: selling/doctype/sales_order/sales_order_dashboard.py:26
@@ -39907,7 +40544,7 @@
 msgid "Manufacturing Manager"
 msgstr "مدير التصنيع"
 
-#: stock/doctype/stock_entry/stock_entry.py:1689
+#: stock/doctype/stock_entry/stock_entry.py:1698
 msgid "Manufacturing Quantity is mandatory"
 msgstr "كمية التصنيع إلزامية\\n<br>\\nManufacturing Quantity is mandatory"
 
@@ -39971,15 +40608,15 @@
 msgid "Manufacturing module is all set up!"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:148
+#: stock/doctype/purchase_receipt/purchase_receipt.js:168
 msgid "Mapping Purchase Receipt ..."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:98
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:97
 msgid "Mapping Subcontracting Order ..."
 msgstr ""
 
-#: public/js/utils.js:843
+#: public/js/utils.js:913
 msgid "Mapping {0} ..."
 msgstr ""
 
@@ -40115,7 +40752,7 @@
 msgid "Margin Type"
 msgstr "نوع الهامش"
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:19
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:15
 msgid "Margin View"
 msgstr ""
 
@@ -40125,6 +40762,15 @@
 msgid "Marital Status"
 msgstr "الحالة الإجتماعية"
 
+#: public/js/templates/crm_activities.html:39
+#: public/js/templates/crm_activities.html:82
+msgid "Mark As Closed"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:323
+msgid "Mark as unresolved"
+msgstr ""
+
 #. Name of a DocType
 #: crm/doctype/market_segment/market_segment.json
 msgid "Market Segment"
@@ -40160,7 +40806,7 @@
 msgid "Market Segment"
 msgstr "سوق القطاع"
 
-#: setup/doctype/company/company.py:323
+#: setup/doctype/company/company.py:322
 msgid "Marketing"
 msgstr "التسويق"
 
@@ -40200,7 +40846,7 @@
 msgid "Material"
 msgstr "مواد"
 
-#: manufacturing/doctype/work_order/work_order.js:613
+#: manufacturing/doctype/work_order/work_order.js:655
 msgid "Material Consumption"
 msgstr "اهلاك المواد"
 
@@ -40216,7 +40862,7 @@
 msgid "Material Consumption for Manufacture"
 msgstr "اهلاك المواد للتصنيع"
 
-#: stock/doctype/stock_entry/stock_entry.js:420
+#: stock/doctype/stock_entry/stock_entry.js:480
 msgid "Material Consumption is not set in Manufacturing Settings."
 msgstr "لم يتم تعيين اهلاك المواد في إعدادات التصنيع."
 
@@ -40258,7 +40904,7 @@
 msgid "Material Issue"
 msgstr "صرف مواد"
 
-#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:146
 msgid "Material Receipt"
 msgstr "أستلام مواد"
 
@@ -40275,20 +40921,21 @@
 msgstr "أستلام مواد"
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:435
-#: buying/doctype/request_for_quotation/request_for_quotation.js:297
-#: buying/doctype/supplier_quotation/supplier_quotation.js:31
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:34
+#: buying/doctype/purchase_order/purchase_order.js:504
+#: 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
-#: manufacturing/doctype/job_card/job_card.js:57
-#: manufacturing/doctype/production_plan/production_plan.js:113
-#: selling/doctype/sales_order/sales_order.js:570
+#: 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/stock_entry/stock_entry.js:192
-#: stock/doctype/stock_entry/stock_entry.js:277
+#: stock/doctype/stock_entry/stock_entry.js:210
+#: stock/doctype/stock_entry/stock_entry.js:313
 msgid "Material Request"
 msgstr "طلب مواد"
 
@@ -40506,13 +41153,17 @@
 msgid "Material Request Planning"
 msgstr "تخطيط طلب المواد"
 
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:1
+msgid "Material Request Type"
+msgstr "نوع طلب المواد"
+
 #. Label of a Select field in DocType 'Item Reorder'
 #: stock/doctype/item_reorder/item_reorder.json
 msgctxt "Item Reorder"
 msgid "Material Request Type"
 msgstr "نوع طلب المواد"
 
-#: selling/doctype/sales_order/sales_order.py:1521
+#: selling/doctype/sales_order/sales_order.py:1544
 msgid "Material Request not created, as quantity for Raw Materials already available."
 msgstr "لم يتم إنشاء طلب المواد ، ككمية للمواد الخام المتاحة بالفعل."
 
@@ -40527,11 +41178,11 @@
 msgid "Material Request used to make this Stock Entry"
 msgstr "طلب المواد المستخدمة لانشاء الحركة المخزنية"
 
-#: controllers/subcontracting_controller.py:974
+#: controllers/subcontracting_controller.py:979
 msgid "Material Request {0} is cancelled or stopped"
 msgstr "طلب المواد {0} تم إلغاؤه أو إيقافه"
 
-#: selling/doctype/sales_order/sales_order.js:839
+#: selling/doctype/sales_order/sales_order.js:978
 msgid "Material Request {0} submitted."
 msgstr "تم تقديم طلب المواد {0}."
 
@@ -40547,7 +41198,7 @@
 msgid "Material Requests"
 msgstr "طلبات المواد"
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Material Requests Required"
 msgstr "طلبات المواد المطلوبة"
 
@@ -40558,12 +41209,12 @@
 msgid "Material Requests for which Supplier Quotations are not created"
 msgstr "طلبات المواد التي لم ينشأ لها عروض أسعار من الموردين"
 
-#: stock/doctype/stock_entry/stock_entry_list.js:7
+#: stock/doctype/stock_entry/stock_entry_list.js:13
 msgid "Material Returned from WIP"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:67
-#: stock/doctype/material_request/material_request.js:119
+#: manufacturing/doctype/job_card/job_card.js:64
+#: stock/doctype/material_request/material_request.js:124
 msgid "Material Transfer"
 msgstr "نقل المواد"
 
@@ -40604,7 +41255,7 @@
 msgid "Material Transfer"
 msgstr "نقل المواد"
 
-#: stock/doctype/material_request/material_request.js:122
+#: stock/doctype/material_request/material_request.js:130
 msgid "Material Transfer (In Transit)"
 msgstr ""
 
@@ -40658,8 +41309,8 @@
 msgid "Material Transferred for Subcontract"
 msgstr "المواد المنقولة للعقود من الباطن"
 
-#: buying/doctype/purchase_order/purchase_order.js:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:360
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:206
 msgid "Material to Supplier"
 msgstr "مواد للمورد"
 
@@ -40669,11 +41320,11 @@
 msgid "Materials Required (Exploded)"
 msgstr "المواد المطلوبة (مفصصة)"
 
-#: controllers/subcontracting_controller.py:1164
+#: controllers/subcontracting_controller.py:1169
 msgid "Materials are already received against the {0} {1}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:636
+#: manufacturing/doctype/job_card/job_card.py:643
 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}"
 msgstr ""
 
@@ -40753,8 +41404,8 @@
 msgid "Max discount allowed for item: {0} is {1}%"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:715
-#: stock/doctype/pick_list/pick_list.js:147
+#: manufacturing/doctype/work_order/work_order.js:768
+#: stock/doctype/pick_list/pick_list.js:176
 msgid "Max: {0}"
 msgstr "الحد الأقصى: {0}"
 
@@ -40776,11 +41427,11 @@
 msgid "Maximum Payment Amount"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2842
+#: stock/doctype/stock_entry/stock_entry.py:2878
 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
 msgstr "الحد الأقصى للعينات - {0} يمكن الاحتفاظ بالدفعة {1} والبند {2}."
 
-#: stock/doctype/stock_entry/stock_entry.py:2833
+#: stock/doctype/stock_entry/stock_entry.py:2869
 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
 msgstr "الحد الأقصى للعينات - {0} تم الاحتفاظ به مسبقا للدفعة {1} و العنصر {2} في الدفعة {3}."
 
@@ -40802,11 +41453,11 @@
 msgid "Maximum Value"
 msgstr ""
 
-#: controllers/selling_controller.py:194
+#: controllers/selling_controller.py:195
 msgid "Maximum discount for Item {0} is {1}%"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:94
+#: public/js/utils/barcode_scanner.js:99
 msgid "Maximum quantity scanned for item {0}."
 msgstr ""
 
@@ -40844,7 +41495,7 @@
 msgid "Meeting"
 msgstr "لقاء"
 
-#: stock/stock_ledger.py:1685
+#: stock/stock_ledger.py:1705
 msgid "Mention Valuation Rate in the Item master."
 msgstr "اذكر معدل التقييم في مدير السلعة."
 
@@ -40872,11 +41523,11 @@
 msgid "Mention if non-standard receivable account applicable"
 msgstr "أذكر إذا كان حساب المدينين المطبق ليس حساب المدينين الافتراضي"
 
-#: accounts/doctype/account/account.js:151
+#: accounts/doctype/account/account.js:152
 msgid "Merge"
 msgstr "دمج"
 
-#: accounts/doctype/account/account.js:51
+#: accounts/doctype/account/account.js:46
 msgid "Merge Account"
 msgstr "دمج الحساب"
 
@@ -40896,15 +41547,15 @@
 msgid "Merge Similar Account Heads"
 msgstr ""
 
-#: public/js/utils.js:873
+#: public/js/utils.js:943
 msgid "Merge taxes from multiple documents"
 msgstr ""
 
-#: accounts/doctype/account/account.js:123
+#: accounts/doctype/account/account.js:124
 msgid "Merge with Existing Account"
 msgstr "دمج مع حساب موجود"
 
-#: accounts/doctype/cost_center/cost_center.js:66
+#: accounts/doctype/cost_center/cost_center.js:68
 msgid "Merge with existing"
 msgstr "دمج مع الحالي"
 
@@ -40914,7 +41565,7 @@
 msgid "Merged"
 msgstr ""
 
-#: accounts/doctype/account/account.py:546
+#: accounts/doctype/account/account.py:565
 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency"
 msgstr ""
 
@@ -40922,6 +41573,10 @@
 msgid "Merging {0} of {1}"
 msgstr ""
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Message"
+msgstr "رسالة"
+
 #. Label of a Text field in DocType 'Payment Request'
 #: accounts/doctype/payment_request/payment_request.json
 msgctxt "Payment Request"
@@ -40952,7 +41607,7 @@
 msgid "Message Examples"
 msgstr "أمثلة رسالة"
 
-#: accounts/doctype/payment_request/payment_request.js:38
+#: accounts/doctype/payment_request/payment_request.js:47
 #: setup/doctype/email_digest/email_digest.js:26
 msgid "Message Sent"
 msgstr "تم ارسال الرسالة"
@@ -40981,6 +41636,10 @@
 msgid "Messages greater than 160 characters will be split into multiple messages"
 msgstr "سيتم تقسيم الرسائل التي تزيد عن 160 حرفا إلى رسائل متعددة"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Meta Data"
+msgstr ""
+
 #: setup/setup_wizard/operations/install_fixtures.py:263
 #: setup/setup_wizard/operations/install_fixtures.py:379
 msgid "Middle Income"
@@ -41147,32 +41806,32 @@
 msgid "Mismatch"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1132
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1191
 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:548
-#: accounts/doctype/sales_invoice/sales_invoice.py:2044
-#: accounts/doctype/sales_invoice/sales_invoice.py:2602
+#: 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
 msgid "Missing Account"
 msgstr "حساب مفقود"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1403
+#: accounts/doctype/sales_invoice/sales_invoice.py:1414
 msgid "Missing Asset"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:179 assets/doctype/asset/asset.py:265
+#: accounts/doctype/gl_entry/gl_entry.py:169 assets/doctype/asset/asset.py:267
 msgid "Missing Cost Center"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:309
+#: assets/doctype/asset/asset.py:311
 msgid "Missing Finance Book"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1280
+#: stock/doctype/stock_entry/stock_entry.py:1289
 msgid "Missing Finished Good"
 msgstr ""
 
@@ -41192,7 +41851,7 @@
 msgid "Missing Serial No Bundle"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:743
+#: selling/doctype/customer/customer.py:754
 msgid "Missing Values Required"
 msgstr "قيم مفقودة مطلوبة"
 
@@ -41200,12 +41859,12 @@
 msgid "Missing Warehouse"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:132
+#: stock/doctype/delivery_trip/delivery_trip.js:153
 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:979
+#: manufacturing/doctype/work_order/work_order.py:993
 msgid "Missing value"
 msgstr ""
 
@@ -41345,7 +42004,7 @@
 msgid "Mobile No"
 msgstr "رقم الجوال"
 
-#: public/js/utils/contact_address_quick_entry.js:48
+#: public/js/utils/contact_address_quick_entry.js:51
 msgid "Mobile Number"
 msgstr "رقم الهاتف المحمول"
 
@@ -41358,7 +42017,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/mode_of_payment/mode_of_payment.json
-#: accounts/doctype/payment_order/payment_order.js:109
+#: accounts/doctype/payment_order/payment_order.js:124
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:40
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:47
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:35
@@ -41598,21 +42257,21 @@
 msgid "Month(s) after the end of the invoice month"
 msgstr "شهر (أشهر) بعد نهاية شهر الفاتورة"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:67
+#: 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
-#: buying/report/purchase_analytics/purchase_analytics.js:62
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
-#: manufacturing/report/production_analytics/production_analytics.js:35
-#: public/js/financial_statements.js:217
+#: 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
+#: public/js/financial_statements.js:226
 #: public/js/purchase_trends_filters.js:19 public/js/sales_trends_filters.js:11
-#: public/js/stock_analytics.js:53
-#: selling/report/sales_analytics/sales_analytics.js:62
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
-#: stock/report/stock_analytics/stock_analytics.js:81
-#: support/report/issue_analytics/issue_analytics.js:43
+#: public/js/stock_analytics.js:83
+#: selling/report/sales_analytics/sales_analytics.js:69
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:32
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:32
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:32
+#: stock/report/stock_analytics/stock_analytics.js:80
+#: support/report/issue_analytics/issue_analytics.js:42
 msgid "Monthly"
 msgstr "شهريا"
 
@@ -41662,7 +42321,7 @@
 msgstr "أوامر العمل المكتملة شهريًا"
 
 #. Name of a DocType
-#: accounts/doctype/cost_center/cost_center_tree.js:44
+#: accounts/doctype/cost_center/cost_center_tree.js:69
 #: accounts/doctype/monthly_distribution/monthly_distribution.json
 msgid "Monthly Distribution"
 msgstr "التوزيع الشهري"
@@ -41908,14 +42567,20 @@
 msgid "More columns found than expected. Please compare the uploaded file with standard template"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:111 stock/doctype/batch/batch_dashboard.py:10
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:58
+#: stock/dashboard/item_dashboard_list.html:52 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:128 stock/doctype/batch/batch_dashboard.py:10
 msgid "Move"
 msgstr "حرك"
 
-#: stock/dashboard/item_dashboard.js:205
+#: stock/dashboard/item_dashboard.js:212
 msgid "Move Item"
 msgstr "حرك بند"
 
+#: manufacturing/doctype/plant_floor/plant_floor.js:211
+msgid "Move Stock"
+msgstr ""
+
 #: templates/includes/macros.html:169
 msgid "Move to Cart"
 msgstr ""
@@ -41958,11 +42623,11 @@
 msgid "Multi Currency"
 msgstr "متعدد العملات"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:42
+#: manufacturing/doctype/bom_creator/bom_creator.js:41
 msgid "Multi-level BOM Creator"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:369
+#: selling/doctype/customer/customer.py:381
 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually."
 msgstr ""
 
@@ -41977,7 +42642,7 @@
 msgid "Multiple Tier Program"
 msgstr "برنامج متعدد الطبقات"
 
-#: stock/doctype/item/item.js:106
+#: stock/doctype/item/item.js:138
 msgid "Multiple Variants"
 msgstr "متغيرات متعددة"
 
@@ -41985,11 +42650,11 @@
 msgid "Multiple Warehouse Accounts"
 msgstr ""
 
-#: controllers/accounts_controller.py:899
+#: controllers/accounts_controller.py:951
 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
 msgstr "يوجد سنوات مالية متعددة لنفس التاريخ {0}. الرجاء تحديد الشركة لهذه السنة المالية\\n<br>\\nMultiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
 
-#: stock/doctype/stock_entry/stock_entry.py:1287
+#: stock/doctype/stock_entry/stock_entry.py:1296
 msgid "Multiple items cannot be marked as finished item"
 msgstr ""
 
@@ -42026,9 +42691,9 @@
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.py:86
 #: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:357
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:29
-#: manufacturing/doctype/bom_creator/bom_creator.js:45
-#: public/js/utils/serial_no_batch_selector.js:404
-#: selling/doctype/quotation/quotation.js:261
+#: manufacturing/doctype/bom_creator/bom_creator.js:44
+#: public/js/utils/serial_no_batch_selector.js:413
+#: selling/doctype/quotation/quotation.js:273
 msgid "Name"
 msgstr "اسم"
 
@@ -42086,7 +42751,7 @@
 msgid "Name of Beneficiary"
 msgstr "اسم المستفيد"
 
-#: accounts/doctype/account/account_tree.js:107
+#: accounts/doctype/account/account_tree.js:124
 msgid "Name of new Account. Note: Please don't create accounts for Customers and Suppliers"
 msgstr "اسم الحساب الجديد. ملاحظة: الرجاء عدم إنشاء حسابات للزبائن والموردين"
 
@@ -42265,11 +42930,11 @@
 msgid "Needs Analysis"
 msgstr "تحليل الاحتياجات"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:431
 msgid "Negative Quantity is not allowed"
 msgstr "الكمية السلبية غير مسموح بها\\n<br>\\nnegative Quantity is not allowed"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:381
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:435
 msgid "Negative Valuation Rate is not allowed"
 msgstr "معدل التقييم السلبي غير مسموح به\\n<br>\\nNegative Valuation Rate is not allowed"
 
@@ -42566,6 +43231,10 @@
 #: 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
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:124
 #: templates/includes/order/order_taxes.html:5
 msgid "Net Total"
 msgstr "صافي المجموع"
@@ -42753,15 +43422,15 @@
 msgid "Net Weight UOM"
 msgstr "الوزن الصافي لوحدة القياس"
 
-#: controllers/accounts_controller.py:1210
+#: controllers/accounts_controller.py:1277
 msgid "Net total calculation precision loss"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:164
+#: accounts/doctype/account/account_tree.js:241
 msgid "New"
 msgstr "جديد"
 
-#: accounts/doctype/account/account_tree.js:106
+#: accounts/doctype/account/account_tree.js:122
 msgid "New Account Name"
 msgstr "اسم الحساب الجديد"
 
@@ -42775,7 +43444,7 @@
 msgid "New Assets (This Year)"
 msgstr "الأصول الجديدة (هذا العام)"
 
-#: manufacturing/doctype/bom/bom_tree.js:56
+#: manufacturing/doctype/bom/bom_tree.js:55
 msgid "New BOM"
 msgstr "قائمة مواد جديدة"
 
@@ -42803,21 +43472,21 @@
 msgid "New Balance In Base Currency"
 msgstr "توازن جديد بالعملة الأساسية"
 
-#: stock/doctype/batch/batch.js:127
+#: stock/doctype/batch/batch.js:146
 msgid "New Batch ID (Optional)"
 msgstr "معرف الدفعة الجديد (اختياري)"
 
-#: stock/doctype/batch/batch.js:121
+#: stock/doctype/batch/batch.js:140
 msgid "New Batch Qty"
 msgstr "جديد دفعة الكمية"
 
-#: accounts/doctype/account/account_tree.js:100
-#: accounts/doctype/cost_center/cost_center_tree.js:16
+#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/cost_center/cost_center_tree.js:18
 #: setup/doctype/company/company_tree.js:23
 msgid "New Company"
 msgstr "شركة جديدة"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:22
+#: accounts/doctype/cost_center/cost_center_tree.js:26
 msgid "New Cost Center Name"
 msgstr "اسم مركز تكلفة جديد"
 
@@ -42837,7 +43506,8 @@
 msgid "New Employee"
 msgstr "موظف جديد"
 
-#: public/js/utils/crm_activities.js:81
+#: public/js/templates/crm_activities.html:14
+#: public/js/utils/crm_activities.js:85
 msgid "New Event"
 msgstr "حدث جديد"
 
@@ -42863,6 +43533,10 @@
 msgid "New Location"
 msgstr "موقع جديد"
 
+#: public/js/templates/crm_notes.html:7
+msgid "New Note"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
@@ -42897,7 +43571,7 @@
 msgid "New Sales Orders"
 msgstr "طلب مبيعات جديد"
 
-#: setup/doctype/sales_person/sales_person_tree.js:5
+#: setup/doctype/sales_person/sales_person_tree.js:3
 msgid "New Sales Person Name"
 msgstr "اسم شخص المبيعات الجديد"
 
@@ -42905,15 +43579,16 @@
 msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
 msgstr "المسلسل الجديد غير ممكن للمستودع . يجب ان يكون المستودع مجهز من حركة المخزون او المشتريات المستلمة"
 
-#: public/js/utils/crm_activities.js:63
+#: public/js/templates/crm_activities.html:8
+#: public/js/utils/crm_activities.js:67
 msgid "New Task"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:112
+#: manufacturing/doctype/bom/bom.js:111
 msgid "New Version"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse_tree.js:15
+#: stock/doctype/warehouse/warehouse_tree.js:16
 msgid "New Warehouse Name"
 msgstr "اسم المخزن الجديد"
 
@@ -42923,10 +43598,14 @@
 msgid "New Workplace"
 msgstr "مكان العمل الجديد"
 
-#: selling/doctype/customer/customer.py:338
+#: selling/doctype/customer/customer.py:350
 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}"
 msgstr "حد الائتمان الجديد أقل من المبلغ المستحق الحالي للعميل. حد الائتمان يجب أن يكون على الأقل {0}\\n<br>\\nNew credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}"
 
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:3
+msgid "New fiscal year created :- "
+msgstr ""
+
 #. Description of the 'Generate New Invoices Past Due Date' (Check) field in
 #. DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
@@ -42934,7 +43613,7 @@
 msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
 msgstr "سيتم إنشاء فواتير جديدة وفقًا للجدول الزمني حتى إذا كانت الفواتير الحالية غير مدفوعة أو تجاوز تاريخ الاستحقاق"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:218
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:255
 msgid "New release date should be in the future"
 msgstr "يجب أن يكون تاريخ الإصدار الجديد في المستقبل"
 
@@ -42942,7 +43621,7 @@
 msgid "New task"
 msgstr "مهمة جديدة"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:211
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:213
 msgid "New {0} pricing rules are created"
 msgstr "يتم إنشاء قواعد تسعير جديدة {0}"
 
@@ -43084,7 +43763,7 @@
 msgid "No Account matched these filters: {}"
 msgstr "لا يوجد حساب مطابق لهذه الفلاتر: {}"
 
-#: quality_management/doctype/quality_review/quality_review_list.js:6
+#: quality_management/doctype/quality_review/quality_review_list.js:5
 msgid "No Action"
 msgstr "لا رد فعل"
 
@@ -43094,44 +43773,52 @@
 msgid "No Answer"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2146
+#: accounts/doctype/sales_invoice/sales_invoice.py:2115
 msgid "No Customer found for Inter Company Transactions which represents company {0}"
 msgstr "لم يتم العثور على زبون للمعاملات بين الشركات التي تمثل الشركة {0}"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:118
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:362
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:115
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:350
 msgid "No Customers found with selected options."
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:48
+#: selling/page/sales_funnel/sales_funnel.js:59
 msgid "No Data"
 msgstr "لا توجد بيانات"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:122
+#: stock/doctype/delivery_trip/delivery_trip.js:143
 msgid "No Delivery Note selected for Customer {}"
 msgstr "لم يتم تحديد ملاحظة التسليم للعميل {}"
 
-#: stock/get_item_details.py:199
+#: stock/get_item_details.py:204
 msgid "No Item with Barcode {0}"
 msgstr "أي عنصر مع الباركود {0}"
 
-#: stock/get_item_details.py:203
+#: stock/get_item_details.py:208
 msgid "No Item with Serial No {0}"
 msgstr "أي عنصر مع المسلسل لا {0}"
 
-#: controllers/subcontracting_controller.py:1084
+#: controllers/subcontracting_controller.py:1089
 msgid "No Items selected for transfer."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:668
+#: selling/doctype/sales_order/sales_order.js:769
 msgid "No Items with Bill of Materials to Manufacture"
 msgstr "لا توجد بنود في قائمة المواد للتصنيع"
 
-#: selling/doctype/sales_order/sales_order.js:782
+#: selling/doctype/sales_order/sales_order.js:898
 msgid "No Items with Bill of Materials."
 msgstr "لا توجد عناصر مع جدول المواد."
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:213
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:15
+msgid "No Matching Bank Transactions Found"
+msgstr ""
+
+#: public/js/templates/crm_notes.html:44
+msgid "No Notes"
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:219
 msgid "No Outstanding Invoices found for this party"
 msgstr ""
 
@@ -43139,28 +43826,32 @@
 msgid "No POS Profile found. Please create a New POS Profile first"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1420
-#: accounts/doctype/journal_entry/journal_entry.py:1486
-#: accounts/doctype/journal_entry/journal_entry.py:1509
-#: stock/doctype/item/item.py:1332
+#: 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
 msgid "No Permission"
 msgstr "لا يوجد تصريح"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:23
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:38
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:22
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:39
 msgid "No Records for these settings."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
-#: accounts/doctype/sales_invoice/sales_invoice.py:949
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:337
+#: accounts/doctype/sales_invoice/sales_invoice.py:966
 msgid "No Remarks"
 msgstr "لا ملاحظات"
 
-#: stock/dashboard/item_dashboard.js:147
+#: stock/dashboard/item_dashboard.js:150
 msgid "No Stock Available Currently"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2130
+#: public/js/templates/call_link.html:30
+msgid "No Summary"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.py:2099
 msgid "No Supplier found for Inter Company Transactions which represents company {0}"
 msgstr "لم يتم العثور على مورد للمعاملات بين الشركات التي تمثل الشركة {0}"
 
@@ -43172,32 +43863,32 @@
 msgid "No Terms"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:211
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:216
 msgid "No Unreconciled Invoices and Payments found for this party and account"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:215
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:221
 msgid "No Unreconciled Payments found for this party"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:682
+#: manufacturing/doctype/production_plan/production_plan.py:691
 msgid "No Work Orders were created"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:727
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:606
+#: stock/doctype/purchase_receipt/purchase_receipt.py:726
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:607
 msgid "No accounting entries for the following warehouses"
 msgstr "لا القيود المحاسبية للمستودعات التالية"
 
-#: selling/doctype/sales_order/sales_order.py:651
+#: selling/doctype/sales_order/sales_order.py:657
 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured"
 msgstr "لم يتم العثور على BOM نشط للعنصر {0}. لا يمكن ضمان التسليم عن طريق الرقم التسلسلي"
 
-#: stock/doctype/item_variant_settings/item_variant_settings.js:31
+#: stock/doctype/item_variant_settings/item_variant_settings.js:46
 msgid "No additional fields available"
 msgstr ""
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:429
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:417
 msgid "No billing email found for customer: {0}"
 msgstr ""
 
@@ -43205,7 +43896,7 @@
 msgid "No contacts with email IDs found."
 msgstr "لم يتم العثور على جهات اتصال مع معرفات البريد الإلكتروني."
 
-#: selling/page/sales_funnel/sales_funnel.js:115
+#: selling/page/sales_funnel/sales_funnel.js:130
 msgid "No data for this period"
 msgstr "لا بيانات لهذه الفترة"
 
@@ -43213,7 +43904,7 @@
 msgid "No data found. Seems like you uploaded a blank file"
 msgstr ""
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:38
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:37
 msgid "No data to export"
 msgstr "لا توجد بيانات للتصدير"
 
@@ -43225,11 +43916,15 @@
 msgid "No employee was scheduled for call popup"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1064
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:486
+msgid "No failed logs"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.js:1289
 msgid "No gain or loss in the exchange rate"
 msgstr "لا مكسب أو خسارة في سعر الصرف"
 
-#: controllers/subcontracting_controller.py:1005
+#: controllers/subcontracting_controller.py:1010
 msgid "No item available for transfer."
 msgstr ""
 
@@ -43242,30 +43937,40 @@
 msgid "No items are available in the sales order {0} for production"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_selector.js:320
+#: selling/page/point_of_sale/pos_item_selector.js:317
 msgid "No items found. Scan barcode again."
 msgstr "لم يتم العثور على العناصر. امسح الباركود ضوئيًا مرة أخرى."
 
+#: selling/page/point_of_sale/pos_item_cart.js:76
+msgid "No items in cart"
+msgstr ""
+
 #: setup/doctype/email_digest/email_digest.py:168
 msgid "No items to be received are overdue"
 msgstr "لا توجد عناصر يتم استلامها متأخرة"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:424
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:423
 msgid "No matches occurred via auto reconciliation"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:879
+#: manufacturing/doctype/production_plan/production_plan.py:888
 msgid "No material request created"
 msgstr "لم يتم إنشاء طلب مادي"
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:198
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:199
 msgid "No more children on Left"
 msgstr ""
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:212
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:213
 msgid "No more children on Right"
 msgstr ""
 
+#. Label of a Int field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "No of Docs"
+msgstr ""
+
 #. Label of a Select field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -43317,6 +44022,14 @@
 msgid "No of Visits"
 msgstr "لا الزيارات"
 
+#: public/js/templates/crm_activities.html:104
+msgid "No open event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:57
+msgid "No open task"
+msgstr ""
+
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:315
 msgid "No outstanding invoices found"
 msgstr "لم يتم العثور على فواتير معلقة"
@@ -43325,15 +44038,15 @@
 msgid "No outstanding invoices require exchange rate revaluation"
 msgstr "لا تتطلب الفواتير المستحقة إعادة تقييم سعر الصرف"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1801
+#: accounts/doctype/payment_entry/payment_entry.py:1820
 msgid "No outstanding {0} found for the {1} {2} which qualify the filters you have specified."
 msgstr ""
 
-#: public/js/controllers/buying.js:439
+#: public/js/controllers/buying.js:436
 msgid "No pending Material Requests found to link for the given items."
 msgstr "لم يتم العثور على طلبات المواد المعلقة للربط للعناصر المحددة."
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:436
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:424
 msgid "No primary email found for customer: {0}"
 msgstr ""
 
@@ -43347,15 +44060,15 @@
 msgid "No record found"
 msgstr "لم يتم العثور على أي سجل"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:677
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:687
 msgid "No records found in Allocation table"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:579
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:584
 msgid "No records found in the Invoices table"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:582
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:587
 msgid "No records found in the Payments table"
 msgstr ""
 
@@ -43366,7 +44079,7 @@
 msgid "No stock transactions can be created or modified before this date."
 msgstr ""
 
-#: controllers/accounts_controller.py:2435
+#: controllers/accounts_controller.py:2520
 msgid "No updates pending for reposting"
 msgstr ""
 
@@ -43374,15 +44087,15 @@
 msgid "No values"
 msgstr "لا توجد قيم"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:340
 msgid "No {0} Accounts found for this company."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2197
+#: accounts/doctype/sales_invoice/sales_invoice.py:2166
 msgid "No {0} found for Inter Company Transactions."
 msgstr "لم يتم العثور على {0} معاملات Inter Company."
 
-#: assets/doctype/asset/asset.js:239
+#: assets/doctype/asset/asset.js:274
 msgid "No."
 msgstr ""
 
@@ -43392,7 +44105,7 @@
 msgid "No. of Employees"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.js:42
+#: manufacturing/doctype/workstation/workstation.js:66
 msgid "No. of parallel job cards which can be allowed on this workstation. Example: 2 would mean this workstation can process production for two Work Orders at a time."
 msgstr ""
 
@@ -43418,7 +44131,7 @@
 msgid "Non Profit"
 msgstr "غير ربحية"
 
-#: manufacturing/doctype/bom/bom.py:1305
+#: manufacturing/doctype/bom/bom.py:1304
 msgid "Non stock items"
 msgstr "البنود غير الأسهم"
 
@@ -43429,7 +44142,7 @@
 msgid "None"
 msgstr "لا شيء"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:315
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:369
 msgid "None of the items have any change in quantity or value."
 msgstr "لا يوجد أي من البنود لديها أي تغيير في كمية أو قيمة.\\n<br>\\nNone of the items have any change in quantity or value."
 
@@ -43442,11 +44155,11 @@
 
 #: 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:525
-#: assets/doctype/asset/asset.js:530 assets/doctype/asset/asset.js:547
+#: accounts/doctype/sales_invoice/sales_invoice.py:538
+#: assets/doctype/asset/asset.js:603 assets/doctype/asset/asset.js:620
 #: controllers/buying_controller.py:206
 #: selling/doctype/product_bundle/product_bundle.py:71
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:48
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:72
 msgid "Not Allowed"
 msgstr "غير مسموح"
 
@@ -43462,8 +44175,8 @@
 msgid "Not Applicable"
 msgstr "لا ينطبق"
 
-#: selling/page/point_of_sale/pos_controller.js:671
-#: selling/page/point_of_sale/pos_controller.js:694
+#: selling/page/point_of_sale/pos_controller.js:703
+#: selling/page/point_of_sale/pos_controller.js:732
 msgid "Not Available"
 msgstr "غير متوفرة"
 
@@ -43486,8 +44199,8 @@
 msgid "Not Initiated"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:744
-#: templates/pages/material_request_info.py:21 templates/pages/order.py:32
+#: buying/doctype/purchase_order/purchase_order.py:747
+#: templates/pages/material_request_info.py:21 templates/pages/order.py:34
 #: templates/pages/rfq.py:48
 msgid "Not Permitted"
 msgstr "لا يسمح"
@@ -43507,7 +44220,7 @@
 msgstr "غير محدد"
 
 #: manufacturing/doctype/production_plan/production_plan_list.js:7
-#: manufacturing/doctype/work_order/work_order_list.js:7
+#: manufacturing/doctype/work_order/work_order_list.js:15
 #: stock/doctype/material_request/material_request_list.js:9
 msgid "Not Started"
 msgstr "لم تبدأ"
@@ -43539,11 +44252,11 @@
 msgid "Not allow to set alternative item for the item {0}"
 msgstr "لا تسمح بتعيين عنصر بديل للعنصر {0}"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:48
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:52
 msgid "Not allowed to create accounting dimension for {0}"
 msgstr "غير مسموح بإنشاء بعد محاسبي لـ {0}"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:254
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:265
 msgid "Not allowed to update stock transactions older than {0}"
 msgstr "غير مسموح بتحديث معاملات الأسهم الأقدم من {0}\\n<br>\\nNot allowed to update stock transactions older than {0}"
 
@@ -43551,31 +44264,37 @@
 msgid "Not authorized since {0} exceeds limits"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:445
+#: accounts/doctype/gl_entry/gl_entry.py:399
 msgid "Not authorized to edit frozen Account {0}"
 msgstr "غير مصرح له بتحرير الحساب المجمد {0}\\n<br>\\nNot authorized to edit frozen Account {0}"
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "Not in Stock"
+msgstr ""
+
 #: templates/includes/products_as_grid.html:20
 msgid "Not in stock"
 msgstr "ليس في الأسهم"
 
-#: buying/doctype/purchase_order/purchase_order.py:667
-#: manufacturing/doctype/work_order/work_order.py:1256
-#: manufacturing/doctype/work_order/work_order.py:1390
-#: manufacturing/doctype/work_order/work_order.py:1440
-#: selling/doctype/sales_order/sales_order.py:755
-#: selling/doctype/sales_order/sales_order.py:1504
+#: 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
 msgid "Not permitted"
 msgstr "غير مسموح به"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:240
+#: 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:1607
-#: public/js/controllers/buying.js:440 selling/doctype/customer/customer.py:125
-#: selling/doctype/sales_order/sales_order.js:957
-#: stock/doctype/item/item.js:426 stock/doctype/item/item.py:539
-#: stock/doctype/stock_entry/stock_entry.py:1288
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:732
+#: 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
+#: 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
+#: templates/pages/timelog_info.html:43
 msgid "Note"
 msgstr "ملاحظات"
 
@@ -43612,15 +44331,15 @@
 msgid "Note: Email will not be sent to disabled users"
 msgstr "ملاحظة: لن يتم إرسال الايميل إلى المستخدم الغير نشط"
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:53
+#: manufacturing/doctype/blanket_order/blanket_order.py:91
 msgid "Note: Item {0} added multiple times"
 msgstr "ملاحظة: تمت إضافة العنصر {0} عدة مرات"
 
-#: controllers/accounts_controller.py:450
+#: controllers/accounts_controller.py:494
 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
 msgstr "ملاحظة : لن يتم إنشاء تدوين المدفوعات نظرا لأن \" حساب النقد او المصرف\" لم يتم تحديده"
 
-#: accounts/doctype/cost_center/cost_center.js:32
+#: accounts/doctype/cost_center/cost_center.js:30
 msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups."
 msgstr "ملاحظة: مركز التكلفة هذا هو مجموعة. لا يمكن إجراء القيود المحاسبية مقابل المجموعات."
 
@@ -43628,10 +44347,12 @@
 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:895
+#: accounts/doctype/journal_entry/journal_entry.py:922
 msgid "Note: {0}"
 msgstr "ملاحظة : {0}"
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
 #: www/book_appointment/index.html:55
 msgid "Notes"
 msgstr "ملاحظات"
@@ -43823,12 +44544,6 @@
 msgid "Number of Depreciations Booked"
 msgstr "عدد الاهلاكات المستنفده مسبقا"
 
-#. Label of a Data field in DocType 'Transaction Deletion Record Item'
-#: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
-msgctxt "Transaction Deletion Record Item"
-msgid "Number of Docs"
-msgstr ""
-
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:14
 msgid "Number of Interaction"
 msgstr "عدد مرات التفاعل"
@@ -43863,11 +44578,11 @@
 msgid "Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days"
 msgstr "عدد الفواصل الزمنية للحقل الفاصل على سبيل المثال ، إذا كانت الفاصل الزمني هو &quot;أيام&quot; وعدد الفوترة للفوترة هو 3 ، فسيتم إنشاء الفواتير كل 3 أيام"
 
-#: accounts/doctype/account/account_tree.js:109
+#: accounts/doctype/account/account_tree.js:132
 msgid "Number of new Account, it will be included in the account name as a prefix"
 msgstr "عدد الحساب الجديد، سيتم تضمينه في اسم الحساب كبادئة"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:26
+#: accounts/doctype/cost_center/cost_center_tree.js:39
 msgid "Number of new Cost Center, it will be included in the cost center name as a prefix"
 msgstr "عدد مركز التكلفة الجديد ، سيتم إدراجه في اسم مركز التكلفة كبادئة"
 
@@ -43942,6 +44657,12 @@
 msgid "Odometer Value (Last)"
 msgstr "قراءة عداد المسافات (الأخيرة)"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Off"
+msgstr "إيقاف"
+
 #. Label of a Date field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -43969,7 +44690,7 @@
 msgid "Offsetting Account"
 msgstr ""
 
-#: accounts/general_ledger.py:77
+#: accounts/general_ledger.py:81
 msgid "Offsetting for Accounting Dimension"
 msgstr ""
 
@@ -44019,11 +44740,11 @@
 msgid "On Converting Opportunity"
 msgstr "حول تحويل الفرص"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:31
-#: buying/doctype/purchase_order/purchase_order_list.js:8
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:27
+#: buying/doctype/purchase_order/purchase_order_list.js:17
 #: buying/doctype/supplier/supplier_list.js:5
-#: selling/doctype/sales_order/sales_order_list.js:10
-#: support/report/issue_summary/issue_summary.js:45
+#: 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
 msgid "On Hold"
 msgstr ""
@@ -44140,10 +44861,17 @@
 msgid "On Track"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:540
+#: manufacturing/doctype/production_plan/production_plan.js:584
 msgid "On expanding a row in the Items to Manufacture table, you'll see an option to 'Include Exploded Items'. Ticking this includes raw materials of the sub-assembly items in the production process."
 msgstr ""
 
+#. Description of the 'Use Serial / Batch Fields' (Check) field in DocType
+#. 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "On submission of the stock transaction, system will auto create the Serial and Batch Bundle based on the Serial No / Batch fields."
+msgstr ""
+
 #: setup/default_energy_point_rules.py:43
 msgid "On {0} Creation"
 msgstr "في {0} الإنشاء"
@@ -44160,10 +44888,14 @@
 msgid "Once set, this invoice will be on hold till the set date"
 msgstr "بمجرد تعيينها ، ستكون هذه الفاتورة قيد الانتظار حتى التاريخ المحدد"
 
-#: manufacturing/doctype/work_order/work_order.js:560
+#: manufacturing/doctype/work_order/work_order.js:591
 msgid "Once the Work Order is Closed. It can't be resumed."
 msgstr ""
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:16
+msgid "One customer can be part of only single Loyalty Program."
+msgstr ""
+
 #: manufacturing/dashboard_fixtures.py:228
 msgid "Ongoing Job Cards"
 msgstr "بطاقات العمل الجارية"
@@ -44190,11 +44922,11 @@
 msgid "Only Include Allocated Payments"
 msgstr ""
 
-#: accounts/doctype/account/account.py:134
+#: accounts/doctype/account/account.py:135
 msgid "Only Parent can be of type {0}"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:44
+#: assets/report/fixed_asset_register/fixed_asset_register.js:43
 msgid "Only existing assets"
 msgstr ""
 
@@ -44214,6 +44946,10 @@
 msgid "Only one Subcontracting Order can be created against a Purchase Order, cancel the existing Subcontracting Order to create a new one."
 msgstr ""
 
+#: stock/doctype/stock_entry/stock_entry.py:898
+msgid "Only one {0} entry can be created against the Work Order {1}"
+msgstr ""
+
 #. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
 #: accounts/doctype/pos_profile/pos_profile.json
 msgctxt "POS Profile"
@@ -44238,13 +44974,14 @@
 msgid "Only {0} are supported"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:35
+#: crm/report/lead_details/lead_details.js:34
 #: manufacturing/report/job_card_summary/job_card_summary.py:92
 #: quality_management/doctype/quality_meeting/quality_meeting_list.js:5
-#: selling/doctype/quotation/quotation_list.js:27
-#: support/report/issue_analytics/issue_analytics.js:56
-#: support/report/issue_summary/issue_summary.js:43
+#: 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
+#: templates/pages/task_info.html:72
 msgid "Open"
 msgstr "فتح"
 
@@ -44375,11 +45112,27 @@
 msgid "Open Activities HTML"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:114
+#: manufacturing/doctype/bom/bom_item_preview.html:21
+msgid "Open BOM {0}"
+msgstr ""
+
+#: public/js/templates/call_link.html:11
+msgid "Open Call Log"
+msgstr ""
+
+#: public/js/call_popup/call_popup.js:116
 msgid "Open Contact"
 msgstr "فتح الاتصال"
 
-#: selling/page/point_of_sale/pos_controller.js:172
+#: public/js/templates/crm_activities.html:76
+msgid "Open Event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:63
+msgid "Open Events"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_controller.js:189
 msgid "Open Form View"
 msgstr "افتح طريقة عرض النموذج"
 
@@ -44393,6 +45146,11 @@
 msgid "Open Issues "
 msgstr "القضايا المفتوحة"
 
+#: manufacturing/doctype/bom/bom_item_preview.html:25
+#: manufacturing/doctype/work_order/work_order_preview.html:28
+msgid "Open Item {0}"
+msgstr ""
+
 #: setup/doctype/email_digest/templates/default.html:154
 msgid "Open Notifications"
 msgstr "فتح الإشعارات"
@@ -44428,6 +45186,14 @@
 msgid "Open Sales Orders"
 msgstr ""
 
+#: public/js/templates/crm_activities.html:33
+msgid "Open Task"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:21
+msgid "Open Tasks"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
@@ -44438,6 +45204,10 @@
 msgid "Open To Do "
 msgstr "فتح قائمة المهام"
 
+#: manufacturing/doctype/work_order/work_order_preview.html:24
+msgid "Open Work Order {0}"
+msgstr ""
+
 #. Name of a report
 #: manufacturing/report/open_work_orders/open_work_orders.json
 msgid "Open Work Orders"
@@ -44448,7 +45218,7 @@
 msgstr "افتح تذكرة جديدة"
 
 #: accounts/report/general_ledger/general_ledger.py:56
-#: public/js/stock_analytics.js:64
+#: public/js/stock_analytics.js:97
 msgid "Opening"
 msgstr "افتتاحي"
 
@@ -44486,7 +45256,7 @@
 msgid "Opening Accumulated Depreciation"
 msgstr "الاهلاك التراكمي الافتتاحي"
 
-#: assets/doctype/asset/asset.py:428
+#: assets/doctype/asset/asset.py:430
 msgid "Opening Accumulated Depreciation must be less than or equal to {0}"
 msgstr ""
 
@@ -44536,7 +45306,7 @@
 msgid "Opening Entry"
 msgstr "فتح مدخل"
 
-#: accounts/general_ledger.py:676
+#: accounts/general_ledger.py:685
 msgid "Opening Entry can not be created after Period Closing Voucher is created."
 msgstr ""
 
@@ -44545,7 +45315,7 @@
 msgstr "جاري إنشاء الفاتورة الافتتاحية"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/account/account_tree.js:189
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
 msgid "Opening Invoice Creation Tool"
 msgstr "أداة إنشاء فاتورة افتتاحية"
@@ -44566,12 +45336,16 @@
 msgid "Opening Invoice Item"
 msgstr "فتح الفاتورة البند"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:125
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:8
+msgid "Opening Invoices"
+msgstr ""
+
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:128
 msgid "Opening Invoices Summary"
 msgstr "ملخص الفواتير الافتتاحية"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:79
-#: stock/report/stock_balance/stock_balance.py:419
+#: stock/report/stock_balance/stock_balance.py:427
 msgid "Opening Qty"
 msgstr "الكمية الافتتاحية"
 
@@ -44597,7 +45371,7 @@
 msgid "Opening Time"
 msgstr "يفتح من الساعة"
 
-#: stock/report/stock_balance/stock_balance.py:426
+#: stock/report/stock_balance/stock_balance.py:434
 msgid "Opening Value"
 msgstr "القيمة الافتتاحية"
 
@@ -44606,7 +45380,7 @@
 msgid "Opening and Closing"
 msgstr "افتتاح واختتام"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:30
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:31
 msgid "Opening {0} Invoices created"
 msgstr ""
 
@@ -44638,7 +45412,7 @@
 msgid "Operating Cost Per BOM Quantity"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1321
+#: manufacturing/doctype/bom/bom.py:1320
 msgid "Operating Cost as per Work Order / BOM"
 msgstr "تكلفة التشغيل حسب أمر العمل / BOM"
 
@@ -44662,14 +45436,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/bom/bom.js:319
+#: manufacturing/doctype/bom/bom.js:332
 #: manufacturing/doctype/operation/operation.json
-#: manufacturing/doctype/work_order/work_order.js:225
+#: manufacturing/doctype/work_order/work_order.js:240
 #: 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:48
+#: 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/job_card_summary/job_card_summary.js:79
+#: manufacturing/report/job_card_summary/job_card_summary.js:78
 #: manufacturing/report/job_card_summary/job_card_summary.py:167
 msgid "Operation"
 msgstr "عملية"
@@ -44764,7 +45538,7 @@
 msgid "Operation ID"
 msgstr "معرف العملية"
 
-#: manufacturing/doctype/work_order/work_order.js:239
+#: manufacturing/doctype/work_order/work_order.js:254
 msgid "Operation Id"
 msgstr "معرف العملية"
 
@@ -44792,7 +45566,7 @@
 msgid "Operation Time "
 msgstr "وقت العملية"
 
-#: manufacturing/doctype/work_order/work_order.py:985
+#: manufacturing/doctype/work_order/work_order.py:999
 msgid "Operation Time must be greater than 0 for Operation {0}"
 msgstr "زمن العملية يجب أن يكون أكبر من 0 للعملية {0}\\n<br>\\nOperation Time must be greater than 0 for Operation {0}"
 
@@ -44809,20 +45583,20 @@
 msgid "Operation time does not depend on quantity to produce"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:215
+#: manufacturing/doctype/job_card/job_card.js:238
 msgid "Operation {0} added multiple times in the work order {1}"
 msgstr "تمت إضافة العملية {0} عدة مرات في أمر العمل {1}"
 
-#: manufacturing/doctype/job_card/job_card.py:975
+#: manufacturing/doctype/job_card/job_card.py:990
 msgid "Operation {0} does not belong to the work order {1}"
 msgstr "العملية {0} لا تنتمي إلى أمر العمل {1}"
 
-#: manufacturing/doctype/workstation/workstation.py:179
+#: manufacturing/doctype/workstation/workstation.py:335
 msgid "Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations"
 msgstr "العملية {0} أطول من أي ساعات عمل متاحة في محطة العمل {1}، قسم العملية إلى عمليات متعددة"
 
-#: manufacturing/doctype/work_order/work_order.js:220
-#: setup/doctype/company/company.py:341 templates/generators/bom.html:61
+#: manufacturing/doctype/work_order/work_order.js:235
+#: setup/doctype/company/company.py:340 templates/generators/bom.html:61
 msgid "Operations"
 msgstr "العمليات"
 
@@ -44852,6 +45626,7 @@
 msgid "Operations cannot be left blank"
 msgstr "لا يمكن ترك (العمليات) فارغة"
 
+#: manufacturing/doctype/workstation/workstation.js:165
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:85
 msgid "Operator"
 msgstr "المشغل أو العامل"
@@ -44883,17 +45658,17 @@
 msgid "Opportunities"
 msgstr "الفرص"
 
-#: selling/page/sales_funnel/sales_funnel.js:43
+#: selling/page/sales_funnel/sales_funnel.js:48
 msgid "Opportunities by lead source"
 msgstr "الفرص من خلال المصدر الرئيسي"
 
 #. Name of a DocType
-#: buying/doctype/request_for_quotation/request_for_quotation.js:318
-#: crm/doctype/lead/lead.js:36 crm/doctype/opportunity/opportunity.json
-#: crm/doctype/prospect/prospect.js:15
-#: crm/report/lead_details/lead_details.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: crm/doctype/lead/lead.js:33 crm/doctype/opportunity/opportunity.json
+#: crm/doctype/prospect/prospect.js:20
+#: crm/report/lead_details/lead_details.js:36
 #: crm/report/lost_opportunity/lost_opportunity.py:17
-#: public/js/communication.js:26 selling/doctype/quotation/quotation.js:133
+#: public/js/communication.js:35 selling/doctype/quotation/quotation.js:139
 msgid "Opportunity"
 msgstr "فرصة"
 
@@ -44962,7 +45737,7 @@
 msgid "Opportunity Date"
 msgstr "تاريخ الفرصة"
 
-#: crm/report/lost_opportunity/lost_opportunity.js:43
+#: crm/report/lost_opportunity/lost_opportunity.js:42
 #: crm/report/lost_opportunity/lost_opportunity.py:24
 msgid "Opportunity From"
 msgstr "فرصة من"
@@ -45007,7 +45782,7 @@
 msgstr "فرصة سبب ضياع التفاصيل"
 
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:32
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:55
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:57
 msgid "Opportunity Owner"
 msgstr ""
 
@@ -45017,8 +45792,8 @@
 msgid "Opportunity Owner"
 msgstr ""
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:47
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:59
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:45
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:58
 msgid "Opportunity Source"
 msgstr ""
 
@@ -45035,9 +45810,9 @@
 #. Name of a DocType
 #: crm/doctype/opportunity_type/opportunity_type.json
 #: crm/report/lost_opportunity/lost_opportunity.py:44
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:53
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:51
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:48
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:65
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:64
 msgid "Opportunity Type"
 msgstr "نوع الفرصة"
 
@@ -45053,7 +45828,7 @@
 msgid "Opportunity Value"
 msgstr ""
 
-#: public/js/communication.js:86
+#: public/js/communication.js:102
 msgid "Opportunity {0} created"
 msgstr "تم إنشاء الفرصة {0}"
 
@@ -45063,11 +45838,11 @@
 msgid "Optimize Route"
 msgstr "تحسين الطريق"
 
-#: accounts/doctype/account/account_tree.js:122
+#: accounts/doctype/account/account_tree.js:168
 msgid "Optional. Sets company's default currency, if not specified."
 msgstr "اختياري. تحديد العملة الافتراضية للشركة، إذا لم يتم تحديدها."
 
-#: accounts/doctype/account/account_tree.js:117
+#: accounts/doctype/account/account_tree.js:155
 msgid "Optional. This setting will be used to filter in various transactions."
 msgstr "اختياري . سيتم استخدام هذا الإعداد لفلترت المعاملات المختلفة."
 
@@ -45095,7 +45870,7 @@
 msgid "Order Amount"
 msgstr "كمية الطلب"
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:81
+#: manufacturing/report/production_planning_report/production_planning_report.js:80
 msgid "Order By"
 msgstr "ترتيب حسب"
 
@@ -45140,9 +45915,13 @@
 msgid "Order Status"
 msgstr ""
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:30
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:8
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:8
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:4
+msgid "Order Summary"
+msgstr ""
+
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:29
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:7
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:7
 msgid "Order Type"
 msgstr "نوع الطلب"
 
@@ -45175,8 +45954,8 @@
 msgstr ""
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:5
-#: selling/doctype/quotation/quotation_list.js:31
-#: stock/doctype/material_request/material_request_list.js:25
+#: selling/doctype/quotation/quotation_list.js:30
+#: stock/doctype/material_request/material_request_list.js:29
 msgid "Ordered"
 msgstr "تم طلبه"
 
@@ -45229,6 +46008,10 @@
 msgid "Ordered Qty"
 msgstr "أمرت الكمية"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Ordered Qty: Quantity ordered for purchase, but not received."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:102
 msgid "Ordered Quantity"
 msgstr "الكمية التي تم طلبها"
@@ -45241,7 +46024,7 @@
 
 #: buying/doctype/supplier/supplier_dashboard.py:14
 #: selling/doctype/customer/customer_dashboard.py:21
-#: selling/doctype/sales_order/sales_order.py:745
+#: selling/doctype/sales_order/sales_order.py:751
 #: setup/doctype/company/company_dashboard.py:23
 msgid "Orders"
 msgstr "أوامر"
@@ -45373,12 +46156,12 @@
 msgstr "اعدادات اخرى"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:81
-#: stock/report/stock_balance/stock_balance.py:441
-#: stock/report/stock_ledger/stock_ledger.py:146
+#: stock/report/stock_balance/stock_balance.py:449
+#: stock/report/stock_ledger/stock_ledger.py:219
 msgid "Out Qty"
 msgstr "كمية خارجة"
 
-#: stock/report/stock_balance/stock_balance.py:447
+#: stock/report/stock_balance/stock_balance.py:455
 msgid "Out Value"
 msgstr "القيمة الخارجه"
 
@@ -45395,7 +46178,7 @@
 msgid "Out of AMC"
 msgstr "من AMC"
 
-#: assets/doctype/asset/asset_list.js:23
+#: assets/doctype/asset/asset_list.js:17
 msgid "Out of Order"
 msgstr "خارج عن السيطرة"
 
@@ -45405,7 +46188,7 @@
 msgid "Out of Order"
 msgstr "خارج عن السيطرة"
 
-#: stock/doctype/pick_list/pick_list.py:386
+#: stock/doctype/pick_list/pick_list.py:426
 msgid "Out of Stock"
 msgstr "إنتهى من المخزن"
 
@@ -45476,9 +46259,10 @@
 msgid "Outstanding"
 msgstr "معلقة"
 
-#: accounts/doctype/payment_entry/payment_entry.js:653
+#: 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.py:1074
+#: 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/purchase_register/purchase_register.py:289
 #: accounts/report/sales_register/sales_register.py:317
@@ -45535,7 +46319,7 @@
 msgid "Outstanding Cheques and Deposits to clear"
 msgstr "الشيكات و الإيداعات المعلقة لتوضيح او للمقاصة"
 
-#: accounts/doctype/gl_entry/gl_entry.py:422
+#: accounts/doctype/gl_entry/gl_entry.py:376
 msgid "Outstanding for {0} cannot be less than zero ({1})"
 msgstr "غير المسددة ل {0} لا يمكن أن يكون أقل من الصفر ( {1} )"
 
@@ -45584,7 +46368,7 @@
 msgid "Over Delivery/Receipt Allowance (%)"
 msgstr ""
 
-#: controllers/stock_controller.py:896
+#: controllers/stock_controller.py:1082
 msgid "Over Receipt"
 msgstr ""
 
@@ -45608,13 +46392,14 @@
 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role."
 msgstr ""
 
-#: controllers/accounts_controller.py:1713
+#: controllers/accounts_controller.py:1802
 msgid "Overbilling of {} ignored because you have {} role."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:261
+#: accounts/doctype/sales_invoice/sales_invoice.py:266
 #: projects/report/project_summary/project_summary.py:94
-#: selling/doctype/sales_order/sales_order_list.js:18
+#: selling/doctype/sales_order/sales_order_list.js:29
+#: templates/pages/task_info.html:75
 msgid "Overdue"
 msgstr "تأخير"
 
@@ -45824,11 +46609,11 @@
 msgid "POS Closing Entry Taxes"
 msgstr "ضرائب الدخول الختامية لنقاط البيع"
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:30
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:31
 msgid "POS Closing Failed"
 msgstr ""
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:54
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:55
 msgid "POS Closing failed while running in a background process. You can resolve the {0} and retry the process again."
 msgstr ""
 
@@ -45975,10 +46760,10 @@
 
 #. Name of a DocType
 #: accounts/doctype/pos_profile/pos_profile.json
-#: accounts/report/pos_register/pos_register.js:33
+#: accounts/report/pos_register/pos_register.js:32
 #: accounts/report/pos_register/pos_register.py:120
 #: accounts/report/pos_register/pos_register.py:193
-#: selling/page/point_of_sale/pos_controller.js:68
+#: selling/page/point_of_sale/pos_controller.js:80
 msgid "POS Profile"
 msgstr "الملف الشخصي لنقطة البيع"
 
@@ -46015,7 +46800,7 @@
 msgid "POS Profile doesn't matches {}"
 msgstr "الملف الشخصي لنقطة البيع لا يتطابق مع {}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1119
+#: accounts/doctype/sales_invoice/sales_invoice.py:1135
 msgid "POS Profile required to make POS Entry"
 msgstr "ملف نقطة البيع مطلوب للقيام بإدخال خاص بنقطة البيع"
 
@@ -46066,7 +46851,7 @@
 msgid "POS Transactions"
 msgstr "معاملات نقاط البيع"
 
-#: selling/page/point_of_sale/pos_controller.js:363
+#: selling/page/point_of_sale/pos_controller.js:392
 msgid "POS invoice {0} created successfully"
 msgstr ""
 
@@ -46139,7 +46924,7 @@
 msgid "Package Weight Details"
 msgstr "تفاصيل وزن الحزمة"
 
-#: stock/doctype/delivery_note/delivery_note_list.js:65
+#: stock/doctype/delivery_note/delivery_note_list.js:74
 msgid "Packaging Slip From Delivery Note"
 msgstr ""
 
@@ -46172,7 +46957,7 @@
 msgid "Packed Items"
 msgstr "عناصر معبأة"
 
-#: controllers/stock_controller.py:739
+#: controllers/stock_controller.py:922
 msgid "Packed Items cannot be transferred internally"
 msgstr ""
 
@@ -46213,7 +46998,7 @@
 msgstr "قائمة التعبئة"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:186
+#: stock/doctype/delivery_note/delivery_note.js:221
 #: stock/doctype/packing_slip/packing_slip.json
 msgid "Packing Slip"
 msgstr "قائمة بمحتويات الشحنة"
@@ -46229,7 +47014,7 @@
 msgid "Packing Slip Item"
 msgstr "مادة كشف التعبئة"
 
-#: stock/doctype/delivery_note/delivery_note.py:704
+#: stock/doctype/delivery_note/delivery_note.py:765
 msgid "Packing Slip(s) cancelled"
 msgstr "تم إلغاء قائمة الشحنة"
 
@@ -46339,8 +47124,8 @@
 msgid "Page {0} of {1}"
 msgstr "الصفحة {0} من {1}"
 
-#: accounts/doctype/payment_request/payment_request_list.js:17
-#: accounts/doctype/sales_invoice/sales_invoice.py:267
+#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/sales_invoice/sales_invoice.py:272
 msgid "Paid"
 msgstr "مدفوع"
 
@@ -46369,10 +47154,12 @@
 msgstr "مدفوع"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:170
-#: accounts/report/accounts_receivable/accounts_receivable.py:1068
+#: 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
+#: 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"
 msgstr "المبلغ المدفوع"
@@ -46449,7 +47236,7 @@
 msgid "Paid Amount After Tax (Company Currency)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:881
+#: accounts/doctype/payment_entry/payment_entry.js:1059
 msgid "Paid Amount cannot be greater than total negative outstanding amount {0}"
 msgstr "المبلغ المدفوع لا يمكن أن يكون أكبر من إجمالي المبلغ القائم السالب {0}"
 
@@ -46471,8 +47258,8 @@
 msgid "Paid To Account Type"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:324
-#: accounts/doctype/sales_invoice/sales_invoice.py:994
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:328
+#: accounts/doctype/sales_invoice/sales_invoice.py:1011
 msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
 msgstr "المبلغ المدفوع + المبلغ المشطوب لا يمكن ان يكون أكبر من المجموع الكلي\\n<br>\\nPaid amount + Write Off Amount can not be greater than Grand Total"
 
@@ -46616,7 +47403,7 @@
 msgid "Parent Company"
 msgstr "الشركة الام"
 
-#: setup/doctype/company/company.py:460
+#: setup/doctype/company/company.py:459
 msgid "Parent Company must be a group company"
 msgstr "يجب أن تكون الشركة الأم شركة مجموعة"
 
@@ -46726,12 +47513,6 @@
 msgid "Parent Warehouse"
 msgstr "المستودع الأصل"
 
-#. Label of a Link field in DocType 'Pick List'
-#: stock/doctype/pick_list/pick_list.json
-msgctxt "Pick List"
-msgid "Parent Warehouse"
-msgstr "المستودع الأصل"
-
 #. Label of a Link field in DocType 'Warehouse'
 #: stock/doctype/warehouse/warehouse.json
 msgctxt "Warehouse"
@@ -46744,7 +47525,7 @@
 msgid "Partial Material Transferred"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1043
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1045
 msgid "Partial Stock Reservation"
 msgstr ""
 
@@ -46787,7 +47568,7 @@
 msgid "Partially Delivered"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:8
+#: assets/doctype/asset/asset_list.js:7
 msgid "Partially Depreciated"
 msgstr "استهلكت جزئيا"
 
@@ -46803,7 +47584,7 @@
 msgid "Partially Fulfilled"
 msgstr "تمت جزئيا"
 
-#: selling/doctype/quotation/quotation_list.js:29
+#: selling/doctype/quotation/quotation_list.js:28
 msgid "Partially Ordered"
 msgstr "طلبت جزئيًا"
 
@@ -46819,7 +47600,7 @@
 msgid "Partially Ordered"
 msgstr "طلبت جزئيًا"
 
-#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/payment_request/payment_request_list.js:12
 msgid "Partially Paid"
 msgstr "مدفوعاً جزئياً"
 
@@ -46843,7 +47624,7 @@
 msgid "Partially Paid"
 msgstr "مدفوعاً جزئياً"
 
-#: stock/doctype/material_request/material_request_list.js:21
+#: stock/doctype/material_request/material_request_list.js:25
 msgid "Partially Received"
 msgstr "تلقى جزئيا"
 
@@ -46889,7 +47670,7 @@
 msgid "Parties"
 msgstr "حفلات"
 
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:14
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:23
 msgid "Partly Billed"
 msgstr "تم فوترتها جزئيا"
 
@@ -46947,30 +47728,38 @@
 msgid "Partnership"
 msgstr ""
 
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Parts Per Hour"
+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
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:193
 #: accounts/doctype/tax_category/tax_category_dashboard.py:11
-#: accounts/report/accounts_payable/accounts_payable.js:109
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:86
-#: accounts/report/accounts_receivable/accounts_receivable.js:54
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:86
+#: accounts/report/accounts_payable/accounts_payable.js:112
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:89
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.js:74
-#: accounts/report/general_ledger/general_ledger.py:633
-#: accounts/report/payment_ledger/payment_ledger.js:52
+#: accounts/report/general_ledger/general_ledger.py:646
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:92
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:27
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:27
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:26
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:26
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:57
-#: crm/report/lost_opportunity/lost_opportunity.js:56
+#: crm/report/lost_opportunity/lost_opportunity.js:55
 #: crm/report/lost_opportunity/lost_opportunity.py:31
-#: public/js/bank_reconciliation_tool/data_table_manager.js:51
-#: public/js/bank_reconciliation_tool/dialog_manager.js:128
+#: public/js/bank_reconciliation_tool/data_table_manager.js:50
+#: public/js/bank_reconciliation_tool/dialog_manager.js:135
 msgid "Party"
 msgstr "الطرف المعني"
 
@@ -47112,16 +47901,10 @@
 msgid "Party Account No. (Bank Statement)"
 msgstr ""
 
-#: controllers/accounts_controller.py:1983
+#: controllers/accounts_controller.py:2075
 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same"
 msgstr ""
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Party Balance"
-msgstr "ميزان الحزب"
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47164,13 +47947,19 @@
 msgid "Party Information"
 msgstr "معلومات الحزب"
 
+#. Label of a Data field in DocType 'Blanket Order Item'
+#: manufacturing/doctype/blanket_order_item/blanket_order_item.json
+msgctxt "Blanket Order Item"
+msgid "Party Item Code"
+msgstr ""
+
 #. Name of a DocType
 #: accounts/doctype/party_link/party_link.json
 msgid "Party Link"
 msgstr ""
 
 #: accounts/report/general_ledger/general_ledger.js:109
-#: selling/report/address_and_contacts/address_and_contacts.js:23
+#: selling/report/address_and_contacts/address_and_contacts.js:22
 msgid "Party Name"
 msgstr "اسم الطرف"
 
@@ -47223,16 +48012,16 @@
 #: 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/general_ledger/general_ledger.js:65
-#: accounts/report/general_ledger/general_ledger.py:632
-#: accounts/report/payment_ledger/payment_ledger.js:42
+#: accounts/report/general_ledger/general_ledger.py:645
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:16
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:16
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:15
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:15
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:49
-#: public/js/bank_reconciliation_tool/data_table_manager.js:46
-#: selling/report/address_and_contacts/address_and_contacts.js:10
+#: public/js/bank_reconciliation_tool/data_table_manager.js:45
+#: selling/report/address_and_contacts/address_and_contacts.js:9
 #: setup/doctype/party_type/party_type.json
 msgid "Party Type"
 msgstr "نوع الطرف"
@@ -47337,7 +48126,7 @@
 msgid "Party Type and Party is mandatory for {0} account"
 msgstr "نوع الطرف والحزب إلزامي لحساب {0}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:162
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:161
 msgid "Party Type and Party is required for Receivable / Payable account {0}"
 msgstr ""
 
@@ -47351,7 +48140,7 @@
 msgid "Party User"
 msgstr "مستخدم الحزب"
 
-#: accounts/doctype/payment_entry/payment_entry.js:308
+#: accounts/doctype/payment_entry/payment_entry.js:390
 msgid "Party can only be one of {0}"
 msgstr ""
 
@@ -47405,7 +48194,7 @@
 msgid "Path"
 msgstr "مسار"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:84
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:85
 msgid "Pause"
 msgstr "وقفة"
 
@@ -47415,7 +48204,7 @@
 msgid "Pause"
 msgstr "وقفة"
 
-#: manufacturing/doctype/job_card/job_card.js:259
+#: manufacturing/doctype/job_card/job_card.js:292
 msgid "Pause Job"
 msgstr ""
 
@@ -47438,6 +48227,10 @@
 msgid "Paused"
 msgstr ""
 
+#: templates/pages/order.html:43
+msgid "Pay"
+msgstr "دفع"
+
 #. Option for the 'Payment Type' (Select) field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47450,7 +48243,7 @@
 msgid "Pay To / Recd From"
 msgstr "دفع إلى / من Recd"
 
-#: accounts/report/account_balance/account_balance.js:52
+#: accounts/report/account_balance/account_balance.js:54
 msgid "Payable"
 msgstr "واجب الدفع"
 
@@ -47499,15 +48292,15 @@
 
 #: accounts/doctype/dunning/dunning.js:51
 #: accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:110
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:65
-#: accounts/doctype/sales_invoice/sales_invoice.js:104
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:52
+#: 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:31
-#: buying/doctype/purchase_order/purchase_order.js:328
+#: accounts/doctype/sales_invoice/sales_invoice_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:385
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:20
-#: selling/doctype/sales_order/sales_order.js:606
+#: selling/doctype/sales_order/sales_order.js:713
 #: selling/doctype/sales_order/sales_order_dashboard.py:28
 msgid "Payment"
 msgstr "دفع"
@@ -47615,15 +48408,16 @@
 msgid "Payment Entries"
 msgstr "ادخال دفعات"
 
-#: accounts/utils.py:937
+#: accounts/utils.py:946
 msgid "Payment Entries {0} are un-linked"
 msgstr "تدوين مدفوعات {0} غير مترابطة"
 
 #. Name of a DocType
 #: accounts/doctype/payment_entry/payment_entry.json
-#: accounts/doctype/payment_order/payment_order.js:22
+#: accounts/doctype/payment_order/payment_order.js:27
 #: accounts/print_format/bank_and_cash_payment_voucher/bank_and_cash_payment_voucher.html:12
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.py:29
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:11
 msgid "Payment Entry"
 msgstr "تدوينات المدفوعات"
 
@@ -47676,23 +48470,24 @@
 msgid "Payment Entry Reference"
 msgstr "دفع الدخول المرجعي"
 
-#: accounts/doctype/payment_request/payment_request.py:410
+#: accounts/doctype/payment_request/payment_request.py:413
 msgid "Payment Entry already exists"
 msgstr "تدوين المدفوعات موجود بالفعل"
 
-#: accounts/utils.py:604
+#: accounts/utils.py:613
 msgid "Payment Entry has been modified after you pulled it. Please pull it again."
 msgstr "تم تعديل تدوين مدفوعات بعد سحبه. يرجى سحبه مرة أخرى."
 
-#: accounts/doctype/payment_request/payment_request.py:568
+#: accounts/doctype/payment_request/payment_request.py:111
+#: accounts/doctype/payment_request/payment_request.py:460
 msgid "Payment Entry is already created"
 msgstr "تدوين المدفوعات تم انشاؤه بالفعل"
 
-#: controllers/accounts_controller.py:1164
+#: controllers/accounts_controller.py:1231
 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:261
+#: selling/page/point_of_sale/pos_payment.js:271
 msgid "Payment Failed"
 msgstr "عملية الدفع فشلت"
 
@@ -47743,7 +48538,7 @@
 msgid "Payment Gateway Account"
 msgstr "دفع حساب البوابة"
 
-#: accounts/utils.py:1227
+#: accounts/utils.py:1196
 msgid "Payment Gateway Account not created, please create one manually."
 msgstr "حساب بوابة الدفع لم يتم انشاءه، يرجى إنشاء واحد يدويا."
 
@@ -47773,9 +48568,10 @@
 msgid "Payment Limit"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.js:51
+#: accounts/report/pos_register/pos_register.js:50
 #: accounts/report/pos_register/pos_register.py:129
 #: accounts/report/pos_register/pos_register.py:221
+#: selling/page/point_of_sale/pos_payment.js:19
 msgid "Payment Method"
 msgstr "طريقة الدفع او السداد"
 
@@ -47867,7 +48663,7 @@
 msgid "Payment Receipt Note"
 msgstr "إشعار إيصال الدفع"
 
-#: selling/page/point_of_sale/pos_payment.js:248
+#: selling/page/point_of_sale/pos_payment.js:252
 msgid "Payment Received"
 msgstr "تم استلام الدفعة"
 
@@ -47900,7 +48696,7 @@
 msgid "Payment Reconciliation Invoice"
 msgstr "دفع فاتورة المصالحة"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:120
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:123
 msgid "Payment Reconciliation Job: {0} is running for this party. Can't reconcile now."
 msgstr ""
 
@@ -47928,12 +48724,12 @@
 msgstr "المراجع الدفع"
 
 #. Name of a DocType
-#: accounts/doctype/payment_order/payment_order.js:18
+#: accounts/doctype/payment_order/payment_order.js:19
 #: accounts/doctype/payment_request/payment_request.json
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:125
-#: accounts/doctype/sales_invoice/sales_invoice.js:140
-#: buying/doctype/purchase_order/purchase_order.js:335
-#: selling/doctype/sales_order/sales_order.js:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:145
+#: accounts/doctype/sales_invoice/sales_invoice.js:143
+#: buying/doctype/purchase_order/purchase_order.js:393
+#: selling/doctype/sales_order/sales_order.js:709
 msgid "Payment Request"
 msgstr "طلب الدفع من قبل المورد"
 
@@ -47962,15 +48758,15 @@
 msgid "Payment Request Type"
 msgstr "نوع طلب الدفع"
 
-#: accounts/doctype/payment_request/payment_request.py:502
+#: accounts/doctype/payment_request/payment_request.py:507
 msgid "Payment Request for {0}"
 msgstr "طلب الدفع ل {0}"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:268
+#: accounts/doctype/pos_invoice/pos_invoice.js:289
 msgid "Payment Request took too long to respond. Please try requesting for payment again."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:450
+#: accounts/doctype/payment_request/payment_request.py:453
 msgid "Payment Requests cannot be created against: {0}"
 msgstr ""
 
@@ -48021,13 +48817,9 @@
 msgid "Payment Schedule"
 msgstr "جدول الدفع"
 
-#: public/js/controllers/transaction.js:925
-msgid "Payment Schedule Table"
-msgstr ""
-
 #. Name of a DocType
 #: accounts/doctype/payment_term/payment_term.json
-#: accounts/report/accounts_receivable/accounts_receivable.py:1064
+#: accounts/report/accounts_receivable/accounts_receivable.py:1072
 #: accounts/report/gross_profit/gross_profit.py:348
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
 msgid "Payment Term"
@@ -48070,6 +48862,7 @@
 msgstr "اسم مصطلح الدفع"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:44
+#: accounts/report/accounts_receivable/accounts_receivable.html:31
 msgid "Payment Terms"
 msgstr "شروط الدفع"
 
@@ -48123,11 +48916,11 @@
 #. Name of a DocType
 #: accounts/doctype/payment_terms_template/payment_terms_template.json
 #: accounts/report/accounts_payable/accounts_payable.js:93
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:99
-#: accounts/report/accounts_receivable/accounts_receivable.js:127
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:105
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:62
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:62
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:102
+#: accounts/report/accounts_receivable/accounts_receivable.js:130
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:108
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:61
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:61
 msgid "Payment Terms Template"
 msgstr "نموذج شروط الدفع"
 
@@ -48195,15 +48988,15 @@
 msgid "Payment Type"
 msgstr "نوع الدفع"
 
-#: accounts/doctype/payment_entry/payment_entry.py:501
+#: accounts/doctype/payment_entry/payment_entry.py:510
 msgid "Payment Type must be one of Receive, Pay and Internal Transfer"
 msgstr "نوع الدفع يجب أن يكون إما استلام , دفع أو مناقلة داخلية\\n<br>\\nPayment Type must be one of Receive, Pay and Internal Transfer"
 
-#: accounts/utils.py:927
+#: accounts/utils.py:936
 msgid "Payment Unlink Error"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:764
+#: accounts/doctype/journal_entry/journal_entry.py:791
 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
 msgstr "الدفعة مقابل {0} {1} لا يمكن أن تكون أكبر من المبلغ القائم {2}"
 
@@ -48215,12 +49008,12 @@
 msgid "Payment methods are mandatory. Please add at least one payment method."
 msgstr "طرق الدفع إلزامية. الرجاء إضافة طريقة دفع واحدة على الأقل."
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:277
-#: selling/page/point_of_sale/pos_payment.js:252
+#: accounts/doctype/pos_invoice/pos_invoice.js:301
+#: selling/page/point_of_sale/pos_payment.js:259
 msgid "Payment of {0} received successfully."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:257
+#: selling/page/point_of_sale/pos_payment.js:266
 msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
 msgstr ""
 
@@ -48228,11 +49021,11 @@
 msgid "Payment related to {0} is not completed"
 msgstr "الدفع المتعلق بـ {0} لم يكتمل"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:259
+#: accounts/doctype/pos_invoice/pos_invoice.js:278
 msgid "Payment request failed"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:713
+#: accounts/doctype/payment_entry/payment_entry.py:722
 msgid "Payment term {0} not used in {1}"
 msgstr ""
 
@@ -48247,6 +49040,7 @@
 #: accounts/workspace/receivables/receivables.json
 #: buying/doctype/supplier/supplier_dashboard.py:15
 #: selling/doctype/customer/customer_dashboard.py:22
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Payments"
 msgstr "المدفوعات"
 
@@ -48311,11 +49105,11 @@
 msgstr "قسيمة الدفع"
 
 #: assets/doctype/asset_repair/asset_repair_list.js:5
-#: buying/doctype/request_for_quotation/request_for_quotation.py:314
+#: buying/doctype/request_for_quotation/request_for_quotation.py:338
 #: 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
-#: templates/pages/order.html:56
+#: templates/pages/order.html:68
 msgid "Pending"
 msgstr "معلق"
 
@@ -48393,9 +49187,9 @@
 msgstr "في انتظار المبلغ"
 
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:218
-#: manufacturing/doctype/work_order/work_order.js:244
+#: 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:991
+#: selling/doctype/sales_order/sales_order.js:1153
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
 msgid "Pending Qty"
 msgstr "الكمية التي قيد الانتظار"
@@ -48411,6 +49205,10 @@
 msgid "Pending Quantity"
 msgstr "في انتظار الكمية"
 
+#: templates/pages/task_info.html:74
+msgid "Pending Review"
+msgstr "في انتظار المراجعة"
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -48432,7 +49230,7 @@
 msgid "Pending activities for today"
 msgstr "الأنشطة في انتظار لهذا اليوم"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:224
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:219
 msgid "Pending processing"
 msgstr ""
 
@@ -48585,25 +49383,25 @@
 msgid "Perception Analysis"
 msgstr "تحليل التصور"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:61
+#: accounts/report/budget_variance_report/budget_variance_report.js:59
 #: public/js/purchase_trends_filters.js:16 public/js/sales_trends_filters.js:8
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:30
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:30
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:30
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:29
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:29
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:29
 msgid "Period"
 msgstr "فترة"
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:61
+#: assets/report/fixed_asset_register/fixed_asset_register.js:60
 msgid "Period Based On"
 msgstr "الفترة على أساس"
 
-#: accounts/general_ledger.py:690
+#: accounts/general_ledger.py:699
 msgid "Period Closed"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.js:82
-msgid "Period Closing Entry"
-msgstr "قيد إغلاق الفترة/المدة"
+#: accounts/report/trial_balance/trial_balance.js:88
+msgid "Period Closing Entry For Current Period"
+msgstr ""
 
 #. Label of a Section Break field in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -48612,7 +49410,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:141
+#: accounts/doctype/account/account_tree.js:197
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgid "Period Closing Voucher"
 msgstr "قيد إغلاق الفترة"
@@ -48699,10 +49497,10 @@
 msgid "Period_from_date"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:72
 #: accounts/report/financial_ratios/financial_ratios.js:33
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:55
-#: public/js/financial_statements.js:214
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:54
+#: public/js/financial_statements.js:223
 msgid "Periodicity"
 msgstr "دورية"
 
@@ -48837,7 +49635,7 @@
 msgid "Phone No"
 msgstr "رقم الهاتف"
 
-#: selling/page/point_of_sale/pos_item_cart.js:880
+#: selling/page/point_of_sale/pos_item_cart.js:911
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
@@ -48847,13 +49645,13 @@
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
-#: public/js/utils.js:64
+#: public/js/utils.js:78
 msgid "Pick Batch No"
 msgstr ""
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:548
-#: stock/doctype/material_request/material_request.js:113
+#: selling/doctype/sales_order/sales_order.js:599
+#: stock/doctype/material_request/material_request.js:115
 #: stock/doctype/pick_list/pick_list.json
 msgid "Pick List"
 msgstr "قائمة الانتقاء"
@@ -48883,7 +49681,7 @@
 msgid "Pick List"
 msgstr "قائمة الانتقاء"
 
-#: stock/doctype/pick_list/pick_list.py:116
+#: stock/doctype/pick_list/pick_list.py:120
 msgid "Pick List Incomplete"
 msgstr ""
 
@@ -48964,7 +49762,7 @@
 msgid "Pickup Date"
 msgstr ""
 
-#: stock/doctype/shipment/shipment.js:364
+#: stock/doctype/shipment/shipment.js:398
 msgid "Pickup Date cannot be before this day"
 msgstr ""
 
@@ -48998,7 +49796,7 @@
 msgid "Pickup to"
 msgstr ""
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:9
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:8
 msgid "Pipeline By"
 msgstr ""
 
@@ -49026,16 +49824,16 @@
 msgid "Plaid Environment"
 msgstr "بيئة منقوشة"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:136
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:160
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:152
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:176
 msgid "Plaid Link Failed"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:238
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:254
 msgid "Plaid Link Refresh Required"
 msgstr ""
 
-#: accounts/doctype/bank/bank.js:121
+#: accounts/doctype/bank/bank.js:131
 msgid "Plaid Link Updated"
 msgstr ""
 
@@ -49056,7 +49854,7 @@
 msgid "Plaid Settings"
 msgstr "إعدادات منقوشة"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:211
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:227
 msgid "Plaid transactions sync error"
 msgstr "خطأ في مزامنة المعاملات المنقوشة"
 
@@ -49157,6 +49955,10 @@
 msgid "Planned Qty"
 msgstr "المخطط الكمية"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:109
 msgid "Planned Quantity"
 msgstr "المخطط الكمية"
@@ -49212,12 +50014,36 @@
 msgid "Plans"
 msgstr "خطط"
 
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Plant Dashboard"
+msgstr ""
+
+#. Name of a DocType
+#: manufacturing/doctype/plant_floor/plant_floor.json
+#: public/js/plant_floor_visual/visual_plant.js:53
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/workspace/manufacturing/manufacturing.json
+msgctxt "Plant Floor"
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Plant Floor"
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:30
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:43
 msgid "Plants and Machineries"
 msgstr "وحدات التصنيع  والآلات"
 
-#: stock/doctype/pick_list/pick_list.py:383
+#: stock/doctype/pick_list/pick_list.py:423
 msgid "Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List."
 msgstr "يرجى إعادة تخزين العناصر وتحديث قائمة الاختيار للمتابعة. للتوقف ، قم بإلغاء قائمة الاختيار."
 
@@ -49225,17 +50051,17 @@
 msgid "Please Select a Company"
 msgstr "الرجاء تحديد شركة"
 
-#: selling/page/sales_funnel/sales_funnel.js:94
+#: selling/page/sales_funnel/sales_funnel.js:109
 msgid "Please Select a Company."
 msgstr "الرجاء تحديد شركة."
 
-#: stock/doctype/delivery_note/delivery_note.js:139
+#: stock/doctype/delivery_note/delivery_note.js:151
 msgid "Please Select a Customer"
 msgstr "الرجاء تحديد عميل"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:114
-#: stock/doctype/purchase_receipt/purchase_receipt.js:199
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:82
+#: stock/doctype/purchase_receipt/purchase_receipt.js:128
+#: stock/doctype/purchase_receipt/purchase_receipt.js:230
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
 msgid "Please Select a Supplier"
 msgstr "الرجاء تحديد مورد"
 
@@ -49243,7 +50069,7 @@
 msgid "Please Set Supplier Group in Buying Settings."
 msgstr "يرجى تعيين مجموعة الموردين في إعدادات الشراء."
 
-#: accounts/doctype/payment_entry/payment_entry.js:1071
+#: accounts/doctype/payment_entry/payment_entry.js:1297
 msgid "Please Specify Account"
 msgstr ""
 
@@ -49251,7 +50077,7 @@
 msgid "Please add 'Supplier' role to user {0}."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:87
+#: selling/page/point_of_sale/pos_controller.js:101
 msgid "Please add Mode of payments and opening balance details."
 msgstr "الرجاء إضافة طريقة الدفع وتفاصيل الرصيد الافتتاحي."
 
@@ -49267,7 +50093,7 @@
 msgid "Please add a Temporary Opening account in Chart of Accounts"
 msgstr "الرجاء إضافة حساب فتح مؤقت في مخطط الحسابات"
 
-#: public/js/utils/serial_no_batch_selector.js:535
+#: public/js/utils/serial_no_batch_selector.js:542
 msgid "Please add atleast one Serial No / Batch No"
 msgstr ""
 
@@ -49275,11 +50101,11 @@
 msgid "Please add the Bank Account column"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:168
+#: accounts/doctype/account/account_tree.js:246
 msgid "Please add the account to root level Company - {0}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:215
+#: accounts/doctype/account/account.py:234
 msgid "Please add the account to root level Company - {}"
 msgstr "الرجاء إضافة الحساب إلى شركة على مستوى الجذر - {}"
 
@@ -49287,28 +50113,28 @@
 msgid "Please add {1} role to user {0}."
 msgstr ""
 
-#: controllers/stock_controller.py:909
+#: controllers/stock_controller.py:1095
 msgid "Please adjust the qty or edit {0} to proceed."
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:121
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:124
 msgid "Please attach CSV file"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2735
+#: accounts/doctype/sales_invoice/sales_invoice.py:2704
 msgid "Please cancel and amend the Payment Entry"
 msgstr ""
 
-#: accounts/utils.py:926
+#: accounts/utils.py:935
 msgid "Please cancel payment entry manually first"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:337
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:327
+#: accounts/doctype/gl_entry/gl_entry.py:291
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:338
 msgid "Please cancel related transaction."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:836
+#: accounts/doctype/journal_entry/journal_entry.py:863
 msgid "Please check Multi Currency option to allow accounts with other currency"
 msgstr "يرجى اختيار الخيار عملات متعددة للسماح بحسابات مع عملة أخرى"
 
@@ -49316,11 +50142,11 @@
 msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:71
+#: manufacturing/doctype/bom/bom.js:70
 msgid "Please check either with operations or FG Based Operating Cost."
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:397
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:412
 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again."
 msgstr ""
 
@@ -49328,14 +50154,10 @@
 msgid "Please check your Plaid client ID and secret values"
 msgstr "يرجى التحقق من معرّف عميل Plaid والقيم السرية"
 
-#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:227
+#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:235
 msgid "Please check your email to confirm the appointment"
 msgstr ""
 
-#: public/js/controllers/transaction.js:917
-msgid "Please clear the"
-msgstr ""
-
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:377
 msgid "Please click on 'Generate Schedule'"
 msgstr "الرجاء انقر على \"إنشاء الجدول الزمني\""
@@ -49348,19 +50170,19 @@
 msgid "Please click on 'Generate Schedule' to get schedule"
 msgstr "الرجاء الضغط علي ' إنشاء الجدول ' للحصول علي جدول\\n<br>\\nPlease click on 'Generate Schedule' to get schedule"
 
-#: selling/doctype/customer/customer.py:538
+#: selling/doctype/customer/customer.py:550
 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:321
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:332
 msgid "Please contact any of the following users to {} this transaction."
 msgstr ""
 
-#: selling/doctype/customer/customer.py:531
+#: selling/doctype/customer/customer.py:543
 msgid "Please contact your administrator to extend the credit limits for {0}."
 msgstr ""
 
-#: accounts/doctype/account/account.py:317
+#: accounts/doctype/account/account.py:336
 msgid "Please convert the parent account in corresponding child company to a group account."
 msgstr "الرجاء تحويل الحساب الرئيسي في الشركة الفرعية المقابلة إلى حساب مجموعة."
 
@@ -49368,19 +50190,19 @@
 msgid "Please create Customer from Lead {0}."
 msgstr "الرجاء إنشاء عميل من العميل المحتمل {0}."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:96
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:117
 msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:67
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:71
 msgid "Please create a new Accounting Dimension if required."
 msgstr ""
 
-#: controllers/accounts_controller.py:534
+#: controllers/accounts_controller.py:578
 msgid "Please create purchase from internal sale or delivery document itself"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:327
+#: assets/doctype/asset/asset.py:329
 msgid "Please create purchase receipt or purchase invoice for the item {0}"
 msgstr "الرجاء إنشاء إيصال شراء أو فاتورة شراء للعنصر {0}"
 
@@ -49388,7 +50210,7 @@
 msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:366
+#: assets/doctype/asset/asset.py:368
 msgid "Please do not book expense of multiple assets against one single Asset."
 msgstr ""
 
@@ -49404,8 +50226,12 @@
 msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses"
 msgstr "يرجى تمكين Applicable على أمر الشراء والتطبيق على المصروفات الفعلية للحجز"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:135
-#: public/js/utils/serial_no_batch_selector.js:289
+#: stock/doctype/pick_list/pick_list.py:143
+msgid "Please enable Use Old Serial / Batch Fields to make_bundle"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:145
+#: public/js/utils/serial_no_batch_selector.js:295
 #: regional/report/electronic_invoice_register/electronic_invoice_register.js:49
 msgid "Please enable pop-ups"
 msgstr "يرجى تمكين النوافذ المنبثقة"
@@ -49414,32 +50240,32 @@
 msgid "Please enable {0} in the {1}."
 msgstr ""
 
-#: controllers/selling_controller.py:657
+#: controllers/selling_controller.py:681
 msgid "Please enable {} in {} to allow same item in multiple rows"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:871
+#: accounts/doctype/sales_invoice/sales_invoice.py:888
 msgid "Please ensure {} account is a Balance Sheet account."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:366
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:370
 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:374
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:378
 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:880
+#: accounts/doctype/sales_invoice/sales_invoice.py:897
 msgid "Please ensure {} account {} is a Receivable account."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:563
+#: stock/doctype/stock_entry/stock_entry.py:518
 msgid "Please enter <b>Difference Account</b> or set default <b>Stock Adjustment Account</b> for company {0}"
 msgstr "الرجاء إدخال <b>حساب الفرق</b> أو تعيين <b>حساب تسوية المخزون</b> الافتراضي للشركة {0}"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:430
-#: accounts/doctype/sales_invoice/sales_invoice.py:1024
+#: accounts/doctype/sales_invoice/sales_invoice.py:1046
 msgid "Please enter Account for Change Amount"
 msgstr "الرجاء إدخال الحساب لمبلغ التغيير\\n<br> \\nPlease enter Account for Change Amount"
 
@@ -49447,32 +50273,32 @@
 msgid "Please enter Approving Role or Approving User"
 msgstr "الرجاء إدخال صلاحية المخول بالتصديق أو المستخدم المخول بالتصديق"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:697
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:751
 msgid "Please enter Cost Center"
 msgstr "يرجى إدخال مركز التكلفة\\n<br>\\nPlease enter Cost Center"
 
-#: selling/doctype/sales_order/sales_order.py:322
+#: selling/doctype/sales_order/sales_order.py:325
 msgid "Please enter Delivery Date"
 msgstr "الرجاء إدخال تاريخ التسليم"
 
-#: setup/doctype/sales_person/sales_person_tree.js:8
+#: setup/doctype/sales_person/sales_person_tree.js:9
 msgid "Please enter Employee Id of this sales person"
 msgstr "الرجاء إدخال معرف الموظف الخاص بشخص المبيعات هذا"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:708
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:762
 msgid "Please enter Expense Account"
 msgstr "الرجاء إدخال حساب النفقات\\n<br>\\nPlease enter Expense Account"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.js:87
-#: stock/doctype/stock_entry/stock_entry.js:82
+#: assets/doctype/asset_capitalization/asset_capitalization.js:89
+#: stock/doctype/stock_entry/stock_entry.js:87
 msgid "Please enter Item Code to get Batch Number"
 msgstr "الرجاء إدخال رمز العنصر للحصول على رقم الدفعة\\n<br>\\nPlease enter Item Code to get Batch Number"
 
-#: public/js/controllers/transaction.js:2236
+#: public/js/controllers/transaction.js:2289
 msgid "Please enter Item Code to get batch no"
 msgstr "الرجاء إدخال كود البند للحصول على رقم الدفعة"
 
-#: manufacturing/doctype/production_plan/production_plan.js:67
+#: manufacturing/doctype/production_plan/production_plan.js:66
 msgid "Please enter Item first"
 msgstr "الرجاء إدخال البند أولا"
 
@@ -49484,27 +50310,27 @@
 msgid "Please enter Planned Qty for Item {0} at row {1}"
 msgstr "الرجاء إدخال الكمية المخططة للبند {0} في الصف {1}"
 
-#: setup/doctype/employee/employee.js:76
+#: setup/doctype/employee/employee.js:78
 msgid "Please enter Preferred Contact Email"
 msgstr "الرجاء إدخال البريد الكتروني المفضل للاتصال\\n<br>\\nPlease enter Preferred Contact Email"
 
-#: manufacturing/doctype/work_order/work_order.js:71
+#: manufacturing/doctype/work_order/work_order.js:73
 msgid "Please enter Production Item first"
 msgstr "الرجاء إدخال بند الإنتاج أولا"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:74
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:76
 msgid "Please enter Purchase Receipt first"
 msgstr "الرجاء إدخال إيصال الشراء أولا\\n<br>\\nPlease enter Purchase Receipt first"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:77
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:98
 msgid "Please enter Receipt Document"
 msgstr "الرجاء إدخال مستند الاستلام\\n<br>\\nPlease enter Receipt Document"
 
-#: accounts/doctype/journal_entry/journal_entry.py:901
+#: accounts/doctype/journal_entry/journal_entry.py:928
 msgid "Please enter Reference date"
 msgstr "الرجاء إدخال تاريخ المرجع\\n<br>\\nPlease enter Reference date"
 
-#: controllers/buying_controller.py:851
+#: controllers/buying_controller.py:877
 msgid "Please enter Reqd by Date"
 msgstr "الرجاء إدخال ريد حسب التاريخ"
 
@@ -49512,7 +50338,7 @@
 msgid "Please enter Root Type for account- {0}"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:258
+#: public/js/utils/serial_no_batch_selector.js:262
 msgid "Please enter Serial Nos"
 msgstr ""
 
@@ -49524,7 +50350,7 @@
 msgid "Please enter Stock Items consumed during the Repair."
 msgstr ""
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:29
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:30
 msgid "Please enter Warehouse and Date"
 msgstr "الرجاء إدخال المستودع والتاريخ"
 
@@ -49532,20 +50358,20 @@
 msgid "Please enter Warehouse from which Stock Items consumed during the Repair were taken."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
-#: accounts/doctype/sales_invoice/sales_invoice.py:1020
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:613
+#: accounts/doctype/sales_invoice/sales_invoice.py:1042
 msgid "Please enter Write Off Account"
 msgstr "الرجاء إدخال حساب الشطب"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:23
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:26
 msgid "Please enter company first"
 msgstr "الرجاء إدخال الشركة أولا\\n<br>\\nPlease enter company first"
 
-#: accounts/doctype/cost_center/cost_center.js:109
+#: accounts/doctype/cost_center/cost_center.js:114
 msgid "Please enter company name first"
 msgstr "الرجاء إدخال اسم الشركة اولاً"
 
-#: controllers/accounts_controller.py:2378
+#: controllers/accounts_controller.py:2470
 msgid "Please enter default currency in Company Master"
 msgstr "الرجاء إدخال العملة الافتراضية في شركة الرئيسية"
 
@@ -49553,7 +50379,7 @@
 msgid "Please enter message before sending"
 msgstr "الرجاء إدخال الرسالة قبل الإرسال"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:247
+#: accounts/doctype/pos_invoice/pos_invoice.js:266
 msgid "Please enter mobile number first."
 msgstr ""
 
@@ -49561,7 +50387,7 @@
 msgid "Please enter parent cost center"
 msgstr "الرجاء إدخال مركز تكلفة الأب"
 
-#: public/js/utils/barcode_scanner.js:160
+#: public/js/utils/barcode_scanner.js:165
 msgid "Please enter quantity for item {0}"
 msgstr ""
 
@@ -49569,11 +50395,11 @@
 msgid "Please enter relieving date."
 msgstr "من فضلك ادخل تاريخ ترك العمل."
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:125
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:128
 msgid "Please enter serial nos"
 msgstr ""
 
-#: setup/doctype/company/company.js:155
+#: setup/doctype/company/company.js:183
 msgid "Please enter the company name to confirm"
 msgstr "الرجاء إدخال اسم الشركة للتأكيد"
 
@@ -49581,19 +50407,23 @@
 msgid "Please enter the phone number first"
 msgstr "الرجاء إدخال رقم الهاتف أولاً"
 
-#: public/js/setup_wizard.js:83
+#: public/js/setup_wizard.js:87
 msgid "Please enter valid Financial Year Start and End Dates"
 msgstr "الرجاء إدخال تاريخ بداية السنة المالية وتاريخ النهاية"
 
+#: templates/includes/footer/footer_extension.html:37
+msgid "Please enter valid email address"
+msgstr ""
+
 #: setup/doctype/employee/employee.py:225
 msgid "Please enter {0}"
 msgstr "الرجاء إدخال {0}"
 
-#: public/js/utils/party.js:273
+#: public/js/utils/party.js:317
 msgid "Please enter {0} first"
 msgstr "الرجاء إدخال {0} أولاً"
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Please fill the Material Requests table"
 msgstr "يرجى ملء جدول طلبات المواد"
 
@@ -49601,11 +50431,11 @@
 msgid "Please fill the Sales Orders table"
 msgstr "يرجى ملء جدول أوامر المبيعات"
 
-#: stock/doctype/shipment/shipment.js:248
+#: stock/doctype/shipment/shipment.js:277
 msgid "Please first set Last Name, Email and Phone for the user"
 msgstr ""
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:92
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:94
 msgid "Please fix overlapping time slots for {0}"
 msgstr ""
 
@@ -49617,6 +50447,10 @@
 msgid "Please import accounts against parent company or enable {} in company master."
 msgstr ""
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:175
+msgid "Please keep one Applicable Charges, when 'Distribute Charges Based On' is 'Distribute Manually'. For more charges, please create another Landed Cost Voucher."
+msgstr ""
+
 #: setup/doctype/employee/employee.py:184
 msgid "Please make sure the employees above report to another Active employee."
 msgstr "يرجى التأكد من أن الموظفين أعلاه يقدمون تقارير إلى موظف نشط آخر."
@@ -49625,19 +50459,19 @@
 msgid "Please make sure the file you are using has 'Parent Account' column present in the header."
 msgstr ""
 
-#: setup/doctype/company/company.js:157
+#: setup/doctype/company/company.js:185
 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone."
 msgstr "يرجى التأكد من أنك تريد حقا حذف جميع المعاملات لهذه الشركة. ستبقى بياناتك الرئيسية (الماستر) كما هيا. لا يمكن التراجع عن هذا الإجراء."
 
-#: stock/doctype/item/item.js:425
+#: stock/doctype/item/item.js:493
 msgid "Please mention 'Weight UOM' along with Weight."
 msgstr ""
 
-#: accounts/general_ledger.py:555
+#: accounts/general_ledger.py:564
 msgid "Please mention Round Off Account in Company"
 msgstr "يرجى ذكر حساب التقريب في الشركة"
 
-#: accounts/general_ledger.py:558
+#: accounts/general_ledger.py:567
 msgid "Please mention Round Off Cost Center in Company"
 msgstr "يرجى ذكر مركز التكلفة الخاص بالتقريب في الشركة"
 
@@ -49653,16 +50487,16 @@
 msgid "Please pull items from Delivery Note"
 msgstr "الرجاء سحب البنود من مذكرة التسليم\\n<br>\\nPlease pull items from Delivery Note"
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:444
 msgid "Please rectify and try again."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:237
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:253
 msgid "Please refresh or reset the Plaid linking of the Bank {}."
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:12
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:29
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
 msgid "Please save before proceeding."
 msgstr ""
 
@@ -49670,16 +50504,16 @@
 msgid "Please save first"
 msgstr "يرجى حفظ أولا"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:70
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:79
 msgid "Please select <b>Template Type</b> to download template"
 msgstr "يرجى تحديد <b>نوع</b> القالب لتنزيل القالب"
 
-#: controllers/taxes_and_totals.py:651
+#: controllers/taxes_and_totals.py:652
 #: public/js/controllers/taxes_and_totals.js:688
 msgid "Please select Apply Discount On"
 msgstr "الرجاء اختيار (تطبيق تخفيض على)"
 
-#: selling/doctype/sales_order/sales_order.py:1469
+#: selling/doctype/sales_order/sales_order.py:1492
 msgid "Please select BOM against item {0}"
 msgstr "الرجاء اختيار بوم ضد العنصر {0}"
 
@@ -49691,25 +50525,26 @@
 msgid "Please select BOM in BOM field for Item {0}"
 msgstr "يرجى تحديد قائمة المواد في الحقل (قائمة المواد) للبند {0}"
 
-#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:12
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:13
 msgid "Please select Category first"
 msgstr "الرجاء تحديد التصنيف أولا\\n<br>\\nPlease select Category first"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1195
+#: accounts/doctype/payment_entry/payment_entry.js:1429
 #: public/js/controllers/accounts.js:86 public/js/controllers/accounts.js:124
 msgid "Please select Charge Type first"
 msgstr "يرجى تحديد نوع الرسوم أولا"
 
-#: accounts/doctype/journal_entry/journal_entry.js:401
+#: accounts/doctype/journal_entry/journal_entry.js:443
 msgid "Please select Company"
 msgstr "الرجاء اختيار شركة \\n<br>\\nPlease select Company"
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:135
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:141
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:75
 msgid "Please select Company and Posting Date to getting entries"
 msgstr "يرجى تحديد الشركة وتاريخ النشر للحصول على إدخالات"
 
-#: accounts/doctype/journal_entry/journal_entry.js:606
+#: accounts/doctype/journal_entry/journal_entry.js:688
+#: manufacturing/doctype/plant_floor/plant_floor.js:12
 msgid "Please select Company first"
 msgstr "الرجاء تحديد الشركة أولا\\n<br>\\nPlease select Company first"
 
@@ -49717,12 +50552,12 @@
 msgid "Please select Completion Date for Completed Asset Maintenance Log"
 msgstr "يرجى تحديد تاريخ الانتهاء لاستكمال سجل صيانة الأصول"
 
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:116
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:84
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:125
 msgid "Please select Customer first"
 msgstr "يرجى اختيار العميل أولا"
 
-#: setup/doctype/company/company.py:407
+#: setup/doctype/company/company.py:406
 msgid "Please select Existing Company for creating Chart of Accounts"
 msgstr "الرجاء اختيار الشركة الحالية لإنشاء دليل الحسابات"
 
@@ -49730,7 +50565,7 @@
 msgid "Please select Finished Good Item for Service Item {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:531 assets/doctype/asset/asset.js:548
+#: assets/doctype/asset/asset.js:604 assets/doctype/asset/asset.js:621
 msgid "Please select Item Code first"
 msgstr "يرجى اختيار رمز البند أولاً"
 
@@ -49739,18 +50574,18 @@
 msgstr "يرجى تحديد حالة الصيانة على أنها اكتملت أو أزل تاريخ الاكتمال"
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:52
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:33
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:33
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:32
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:32
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:63
-#: selling/report/address_and_contacts/address_and_contacts.js:28
+#: selling/report/address_and_contacts/address_and_contacts.js:27
 msgid "Please select Party Type first"
 msgstr "يرجى تحديد نوع الطرف أولا"
 
-#: accounts/doctype/payment_entry/payment_entry.js:342
+#: accounts/doctype/payment_entry/payment_entry.js:429
 msgid "Please select Posting Date before selecting Party"
 msgstr "الرجاء تجديد تاريخ النشر قبل تحديد المستفيد\\n<br>\\nPlease select Posting Date before selecting Party"
 
-#: accounts/doctype/journal_entry/journal_entry.js:607
+#: accounts/doctype/journal_entry/journal_entry.js:689
 msgid "Please select Posting Date first"
 msgstr "الرجاء تحديد تاريخ النشر أولا\\n<br>\\nPlease select Posting Date first"
 
@@ -49758,7 +50593,7 @@
 msgid "Please select Price List"
 msgstr "الرجاء اختيار قائمة الأسعار\\n<br>\\nPlease select Price List"
 
-#: selling/doctype/sales_order/sales_order.py:1471
+#: selling/doctype/sales_order/sales_order.py:1494
 msgid "Please select Qty against item {0}"
 msgstr "الرجاء اختيار الكمية ضد العنصر {0}"
 
@@ -49774,15 +50609,15 @@
 msgid "Please select Start Date and End Date for Item {0}"
 msgstr "الرجاء تحديد تاريخ البدء وتاريخ الانتهاء للبند {0}"
 
-#: stock/doctype/stock_entry/stock_entry.py:1202
+#: stock/doctype/stock_entry/stock_entry.py:1211
 msgid "Please select Subcontracting Order instead of Purchase Order {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2288
+#: controllers/accounts_controller.py:2380
 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1229
+#: manufacturing/doctype/bom/bom.py:1228
 msgid "Please select a BOM"
 msgstr "يرجى تحديد بوم"
 
@@ -49790,10 +50625,10 @@
 msgid "Please select a Company"
 msgstr "الرجاء اختيار الشركة"
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: manufacturing/doctype/bom/bom.js:482 manufacturing/doctype/bom/bom.py:245
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: manufacturing/doctype/bom/bom.js:499 manufacturing/doctype/bom/bom.py:245
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484
+#: public/js/controllers/transaction.js:2537
 msgid "Please select a Company first."
 msgstr "الرجاء تحديد شركة أولاً."
 
@@ -49809,11 +50644,15 @@
 msgid "Please select a Subcontracting Purchase Order."
 msgstr ""
 
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
+#: buying/doctype/supplier_quotation/supplier_quotation.js:65
 msgid "Please select a Supplier"
 msgstr "الرجاء اختيار مورد"
 
-#: manufacturing/doctype/job_card/job_card.py:1063
+#: public/js/utils/serial_no_batch_selector.js:546
+msgid "Please select a Warehouse"
+msgstr ""
+
+#: manufacturing/doctype/job_card/job_card.py:1084
 msgid "Please select a Work Order first."
 msgstr ""
 
@@ -49825,11 +50664,11 @@
 msgid "Please select a customer for fetching payments."
 msgstr ""
 
-#: www/book_appointment/index.js:63
+#: www/book_appointment/index.js:67
 msgid "Please select a date"
 msgstr ""
 
-#: www/book_appointment/index.js:48
+#: www/book_appointment/index.js:52
 msgid "Please select a date and time"
 msgstr ""
 
@@ -49837,11 +50676,11 @@
 msgid "Please select a default mode of payment"
 msgstr "الرجاء تحديد طريقة الدفع الافتراضية"
 
-#: selling/page/point_of_sale/pos_item_cart.js:753
+#: selling/page/point_of_sale/pos_item_cart.js:783
 msgid "Please select a field to edit from numpad"
 msgstr "الرجاء تحديد حقل لتعديله من المفكرة"
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:68
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:67
 msgid "Please select a row to create a Reposting Entry"
 msgstr ""
 
@@ -49857,11 +50696,11 @@
 msgid "Please select a valid Purchase Order that is configured for Subcontracting."
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:220
+#: selling/doctype/quotation/quotation.js:229
 msgid "Please select a value for {0} quotation_to {1}"
 msgstr "يرجى اختيار قيمة ل {0} عرض مسعر إلى {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1570
+#: accounts/doctype/journal_entry/journal_entry.py:1574
 msgid "Please select correct account"
 msgstr "يرجى اختيارالحساب الصحيح"
 
@@ -49878,12 +50717,12 @@
 msgid "Please select item code"
 msgstr "الرجاء تحديد رمز البند\\n<br>\\nPlease select item code"
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:71
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:69
 msgid "Please select only one row to create a Reposting Entry"
 msgstr ""
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:60
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:96
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:59
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:91
 msgid "Please select rows to create Reposting Entries"
 msgstr ""
 
@@ -49891,7 +50730,7 @@
 msgid "Please select the Company"
 msgstr "يرجى تحديد الشركة"
 
-#: accounts/doctype/loyalty_program/loyalty_program.js:57
+#: accounts/doctype/loyalty_program/loyalty_program.js:65
 msgid "Please select the Multiple Tier Program type for more than one collection rules."
 msgstr "يرجى تحديد نوع البرنامج متعدد الطبقات لأكثر من قواعد مجموعة واحدة."
 
@@ -49902,7 +50741,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:21
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:21
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:42
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:53
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:54
 msgid "Please select the document type first"
 msgstr "يرجى تحديد نوع الوثيقة أولاً"
 
@@ -49918,25 +50757,25 @@
 msgid "Please select weekly off day"
 msgstr "الرجاء اختيار يوم العطلة الاسبوعي"
 
-#: public/js/utils.js:891
+#: public/js/utils.js:961
 msgid "Please select {0}"
 msgstr "الرجاء اختيار {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.js:991
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:575
+#: 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
 msgid "Please select {0} first"
 msgstr "الرجاء تحديد {0} أولا\\n<br>\\nPlease select {0} first"
 
-#: public/js/controllers/transaction.js:76
+#: public/js/controllers/transaction.js:77
 msgid "Please set 'Apply Additional Discount On'"
 msgstr "يرجى تحديد 'تطبيق خصم إضافي على'"
 
-#: assets/doctype/asset/depreciation.py:790
+#: assets/doctype/asset/depreciation.py:788
 msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
 msgstr "يرجى تحديد \"مركز تكلفة اهلاك الأصول\" للشركة {0}"
 
-#: assets/doctype/asset/depreciation.py:787
+#: assets/doctype/asset/depreciation.py:785
 msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
 msgstr "يرجى تحديد \"احساب لربح / الخسارة عند التخلص من الأصول\" للشركة {0}"
 
@@ -49944,6 +50783,10 @@
 msgid "Please set Account"
 msgstr ""
 
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
+msgid "Please set Account for Change Amount"
+msgstr ""
+
 #: stock/__init__.py:88
 msgid "Please set Account in Warehouse {0} or Default Inventory Account in Company {1}"
 msgstr "يرجى تعيين Account in Warehouse {0} أو Account Inventory Account in Company {1}"
@@ -49954,23 +50797,23 @@
 
 #: accounts/doctype/ledger_merge/ledger_merge.js:23
 #: accounts/doctype/ledger_merge/ledger_merge.js:34
-#: accounts/doctype/pos_profile/pos_profile.js:27
-#: accounts/doctype/pos_profile/pos_profile.js:50
-#: accounts/doctype/pos_profile/pos_profile.js:64
-#: accounts/doctype/pos_profile/pos_profile.js:78
-#: accounts/doctype/pos_profile/pos_profile.js:91
-#: accounts/doctype/sales_invoice/sales_invoice.js:707
-#: accounts/doctype/sales_invoice/sales_invoice.js:721
-#: selling/doctype/quotation/quotation.js:28
-#: selling/doctype/sales_order/sales_order.js:28
+#: accounts/doctype/pos_profile/pos_profile.js:25
+#: accounts/doctype/pos_profile/pos_profile.js:48
+#: accounts/doctype/pos_profile/pos_profile.js:62
+#: accounts/doctype/pos_profile/pos_profile.js:76
+#: accounts/doctype/pos_profile/pos_profile.js:89
+#: accounts/doctype/sales_invoice/sales_invoice.js:763
+#: accounts/doctype/sales_invoice/sales_invoice.js:777
+#: selling/doctype/quotation/quotation.js:29
+#: selling/doctype/sales_order/sales_order.js:31
 msgid "Please set Company"
 msgstr "يرجى تعيين الشركة"
 
-#: assets/doctype/asset/depreciation.py:372
+#: assets/doctype/asset/depreciation.py:370
 msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
 msgstr "يرجى تحديد الحسابات المتعلقة بالاهلاك في فئة الأصول {0} أو الشركة {1}"
 
-#: stock/doctype/shipment/shipment.js:154
+#: stock/doctype/shipment/shipment.js:176
 msgid "Please set Email/Phone for the contact"
 msgstr ""
 
@@ -49984,11 +50827,11 @@
 msgid "Please set Fiscal Code for the public administration '%s'"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:547
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:551
 msgid "Please set Fixed Asset Account in {} against {}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:435
+#: assets/doctype/asset/asset.py:437
 msgid "Please set Number of Depreciations Booked"
 msgstr "الرجاء تعيين عدد الاهلاكات المستنفده مسبقا"
 
@@ -50018,11 +50861,11 @@
 msgid "Please set a Company"
 msgstr "الرجاء تعيين شركة"
 
-#: assets/doctype/asset/asset.py:262
+#: assets/doctype/asset/asset.py:264
 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:1260
+#: selling/doctype/sales_order/sales_order.py:1283
 msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
 msgstr "يرجى تعيين مورد مقابل العناصر التي يجب مراعاتها في أمر الشراء."
 
@@ -50034,7 +50877,7 @@
 msgid "Please set a default Holiday List for Employee {0} or Company {1}"
 msgstr "يرجى تعيين قائمة العطل الافتراضية للموظف {0} أو الشركة {1}\\n<br>\\nPlease set a default Holiday List for Employee {0} or Company {1}"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:991
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1019
 msgid "Please set account in Warehouse {0}"
 msgstr "يرجى تعيين الحساب في مستودع {0}"
 
@@ -50043,7 +50886,7 @@
 msgid "Please set an Address on the Company '%s'"
 msgstr ""
 
-#: controllers/stock_controller.py:334
+#: controllers/stock_controller.py:516
 msgid "Please set an Expense Account in the Items table"
 msgstr ""
 
@@ -50055,23 +50898,23 @@
 msgid "Please set at least one row in the Taxes and Charges Table"
 msgstr "يرجى ضبط صف واحد على الأقل في جدول الضرائب والرسوم"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2041
+#: accounts/doctype/sales_invoice/sales_invoice.py:2010
 msgid "Please set default Cash or Bank account in Mode of Payment {0}"
 msgstr "الرجاء تحديد الحساب البنكي أو النقدي الافتراضي في نوع الدفع\\n<br>\\nPlease set default Cash or Bank account in Mode of Payment {0}"
 
 #: 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:2599
+#: accounts/doctype/sales_invoice/sales_invoice.py:2568
 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:2601
+#: accounts/doctype/sales_invoice/sales_invoice.py:2570
 msgid "Please set default Cash or Bank account in Mode of Payments {}"
 msgstr "الرجاء تعيين حساب نقدي أو مصرفي افتراضي في طريقة الدفع {}"
 
-#: accounts/utils.py:2086
+#: accounts/utils.py:2054
 msgid "Please set default Exchange Gain/Loss Account in Company {}"
 msgstr ""
 
@@ -50083,11 +50926,11 @@
 msgid "Please set default UOM in Stock Settings"
 msgstr "يرجى تعيين الافتراضي UOM في إعدادات الأسهم"
 
-#: controllers/stock_controller.py:204
+#: controllers/stock_controller.py:386
 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:946
+#: accounts/utils.py:955
 msgid "Please set default {0} in Company {1}"
 msgstr "يرجى تعيين {0} الافتراضي للشركة {1}"
 
@@ -50104,11 +50947,11 @@
 msgid "Please set filters"
 msgstr "يرجى تعيين المرشحات"
 
-#: controllers/accounts_controller.py:1896
+#: controllers/accounts_controller.py:1988
 msgid "Please set one of the following:"
 msgstr ""
 
-#: public/js/controllers/transaction.js:1967
+#: public/js/controllers/transaction.js:2010
 msgid "Please set recurring after saving"
 msgstr "يرجى تحديد (تكرار) بعد الحفظ"
 
@@ -50120,7 +50963,7 @@
 msgid "Please set the Default Cost Center in {0} company."
 msgstr "يرجى تعيين مركز التكلفة الافتراضي في الشركة {0}."
 
-#: manufacturing/doctype/work_order/work_order.js:487
+#: manufacturing/doctype/work_order/work_order.js:512
 msgid "Please set the Item Code first"
 msgstr "يرجى تعيين رمز العنصر أولا"
 
@@ -50128,7 +50971,7 @@
 msgid "Please set the Payment Schedule"
 msgstr "يرجى ضبط جدول الدفع"
 
-#: accounts/doctype/gl_entry/gl_entry.py:175
+#: accounts/doctype/gl_entry/gl_entry.py:165
 msgid "Please set the cost center field in {0} or setup a default Cost Center for the Company."
 msgstr ""
 
@@ -50136,8 +50979,8 @@
 msgid "Please set up the Campaign Schedule in the Campaign {0}"
 msgstr "يرجى إعداد جدول الحملة في الحملة {0}"
 
-#: public/js/queries.js:39 public/js/queries.js:49 public/js/queries.js:66
-#: public/js/queries.js:95 stock/report/reserved_stock/reserved_stock.py:26
+#: public/js/queries.js:32 public/js/queries.js:44 public/js/queries.js:64
+#: public/js/queries.js:96 stock/report/reserved_stock/reserved_stock.py:26
 msgid "Please set {0}"
 msgstr "الرجاء تعيين {0}"
 
@@ -50153,34 +50996,34 @@
 msgid "Please set {0} in BOM Creator {1}"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:95
-msgid "Please setup a default bank account for company {0}"
-msgstr "يرجى إعداد حساب بنكي افتراضي للشركة {0}"
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:97
+msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
+msgstr ""
 
-#: assets/doctype/asset/depreciation.py:424
+#: assets/doctype/asset/depreciation.py:422
 msgid "Please share this email with your support team so that they can find and fix the issue."
 msgstr ""
 
-#: public/js/controllers/transaction.js:1837
+#: public/js/controllers/transaction.js:1880
 msgid "Please specify"
 msgstr "رجاء حدد"
 
-#: stock/get_item_details.py:210
+#: stock/get_item_details.py:215
 msgid "Please specify Company"
 msgstr "يرجى تحديد شركة"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:81
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:380
-#: accounts/doctype/sales_invoice/sales_invoice.js:452
+#: accounts/doctype/pos_invoice/pos_invoice.js:88
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:420
+#: accounts/doctype/sales_invoice/sales_invoice.js:501
 msgid "Please specify Company to proceed"
 msgstr "الرجاء تحديد الشركة للمضى قدما\\n<br>\\nPlease specify Company to proceed"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1206
-#: controllers/accounts_controller.py:2511 public/js/controllers/accounts.js:97
+#: accounts/doctype/payment_entry/payment_entry.js:1452
+#: controllers/accounts_controller.py:2596 public/js/controllers/accounts.js:97
 msgid "Please specify a valid Row ID for row {0} in table {1}"
 msgstr "يرجى تحديد هوية الصف صالحة لصف {0} في الجدول {1}"
 
-#: public/js/queries.js:104
+#: public/js/queries.js:106
 msgid "Please specify a {0}"
 msgstr ""
 
@@ -50188,7 +51031,7 @@
 msgid "Please specify at least one attribute in the Attributes table"
 msgstr "يرجى تحديد خاصية واحدة على الأقل في جدول (الخاصيات)"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:372
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:426
 msgid "Please specify either Quantity or Valuation Rate or both"
 msgstr "يرجى تحديد الكمية أو التقييم إما قيم أو كليهما"
 
@@ -50196,11 +51039,11 @@
 msgid "Please specify from/to range"
 msgstr "يرجى التحديد من / إلى النطاق\\n<br>\\nPlease specify from/to range"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:35
+#: buying/doctype/request_for_quotation/request_for_quotation.js:37
 msgid "Please supply the specified items at the best possible rates"
 msgstr "يرجى تزويدنا بالبنود المحددة بأفضل الأسعار الممكنة"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:223
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:218
 msgid "Please try again in an hour."
 msgstr ""
 
@@ -50257,7 +51100,7 @@
 msgid "Portrait"
 msgstr "صورة"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:337
+#: buying/doctype/request_for_quotation/request_for_quotation.js:362
 msgid "Possible Supplier"
 msgstr "مورد محتمل"
 
@@ -50324,17 +51167,18 @@
 msgid "Postal Expenses"
 msgstr "نفقات بريدية"
 
-#: accounts/doctype/payment_entry/payment_entry.js:644
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: 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/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:563
+#: 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/item_wise_sales_register/item_wise_sales_register.py:200
@@ -50349,7 +51193,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:45
 #: 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:84
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:89
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:129
@@ -50359,6 +51203,7 @@
 #: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
 #: 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
 msgid "Posting Date"
 msgstr "تاريخ الترحيل"
 
@@ -50543,11 +51388,17 @@
 msgid "Posting Date cannot be future date"
 msgstr "لا يمكن أن يكون تاريخ النشر تاريخا مستقبلا\\n<br>\\nPosting Date cannot be future date"
 
+#. Label of a Datetime field in DocType 'Stock Ledger Entry'
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+msgctxt "Stock Ledger Entry"
+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
-#: stock/report/serial_no_ledger/serial_no_ledger.js:64
+#: 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_ledger_invariant_check/stock_ledger_invariant_check.py:126
@@ -50645,7 +51496,7 @@
 msgid "Posting Time"
 msgstr "نشر التوقيت"
 
-#: stock/doctype/stock_entry/stock_entry.py:1641
+#: stock/doctype/stock_entry/stock_entry.py:1650
 msgid "Posting date and posting time is mandatory"
 msgstr "تاريخ النشر و وقت النشر الزامي\\n<br>\\nPosting date and posting time is mandatory"
 
@@ -50653,6 +51504,11 @@
 msgid "Posting timestamp must be after {0}"
 msgstr "الطابع الزمني للترحيل يجب أن يكون بعد {0}"
 
+#. Description of a DocType
+#: crm/doctype/opportunity/opportunity.json
+msgid "Potential Sales Deal"
+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
@@ -50751,7 +51607,7 @@
 msgid "Preventive Maintenance"
 msgstr "الصيانة الوقائية"
 
-#: public/js/utils/ledger_preview.js:20 public/js/utils/ledger_preview.js:40
+#: public/js/utils/ledger_preview.js:28 public/js/utils/ledger_preview.js:57
 msgid "Preview"
 msgstr "معاينة"
 
@@ -50767,7 +51623,7 @@
 msgid "Preview"
 msgstr "معاينة"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:205
+#: buying/doctype/request_for_quotation/request_for_quotation.js:223
 msgid "Preview Email"
 msgstr "معاينة البريد الإلكتروني"
 
@@ -50788,7 +51644,7 @@
 msgid "Previous Work Experience"
 msgstr "خبرة العمل السابق"
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:152
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:153
 msgid "Previous Year is not closed, please close it first"
 msgstr ""
 
@@ -50999,7 +51855,7 @@
 msgid "Price List Currency"
 msgstr "قائمة الأسعار العملات"
 
-#: stock/get_item_details.py:1029
+#: stock/get_item_details.py:1040
 msgid "Price List Currency not selected"
 msgstr "قائمة أسعار العملات غير محددة"
 
@@ -51087,6 +51943,12 @@
 msgid "Price List Rate"
 msgstr "سعر السلعة حسب قائمة الأسعار"
 
+#. Label of a Currency field in DocType 'Material Request Item'
+#: stock/doctype/material_request_item/material_request_item.json
+msgctxt "Material Request Item"
+msgid "Price List Rate"
+msgstr "سعر السلعة حسب قائمة الأسعار"
+
 #. Label of a Currency field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
@@ -51207,7 +52069,7 @@
 msgid "Price Per Unit ({0})"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:553
+#: selling/page/point_of_sale/pos_controller.js:581
 msgid "Price is not set for the item."
 msgstr ""
 
@@ -51221,7 +52083,7 @@
 msgid "Price or Product Discount"
 msgstr "السعر أو خصم المنتج"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:145
 msgid "Price or product discount slabs are required"
 msgstr "ألواح سعر الخصم أو المنتج مطلوبة"
 
@@ -51237,7 +52099,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/pricing_rule/pricing_rule.json
-#: buying/doctype/supplier/supplier.js:98
+#: buying/doctype/supplier/supplier.js:116
 msgid "Pricing Rule"
 msgstr "قاعدة التسعير"
 
@@ -51354,7 +52216,7 @@
 msgid "Pricing Rule Item Group"
 msgstr "مجموعة قاعدة التسعير"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:208
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:210
 msgid "Pricing Rule {0} is updated"
 msgstr "يتم تحديث قاعدة التسعير {0}"
 
@@ -51478,7 +52340,7 @@
 msgid "Primary Address"
 msgstr "عنوان أساسي"
 
-#: public/js/utils/contact_address_quick_entry.js:54
+#: public/js/utils/contact_address_quick_entry.js:57
 msgid "Primary Address Details"
 msgstr "تفاصيل العنوان الرئيسي"
 
@@ -51500,7 +52362,7 @@
 msgid "Primary Contact"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:35
+#: public/js/utils/contact_address_quick_entry.js:38
 msgid "Primary Contact Details"
 msgstr "تفاصيل الاتصال الأساسية"
 
@@ -51529,7 +52391,7 @@
 msgid "Primary Settings"
 msgstr "الإعدادات الأولية"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:69
+#: selling/page/point_of_sale/pos_past_order_summary.js:67
 #: templates/pages/material_request_info.html:15 templates/pages/order.html:33
 msgid "Print"
 msgstr "طباعة"
@@ -51770,7 +52632,7 @@
 msgid "Print Preferences"
 msgstr "تفضيلات الطباعة"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:223
+#: selling/page/point_of_sale/pos_past_order_summary.js:231
 msgid "Print Receipt"
 msgstr "اطبع الايصال"
 
@@ -51835,7 +52697,7 @@
 msgid "Print Style"
 msgstr "الطباعة ستايل"
 
-#: setup/install.py:118
+#: setup/install.py:99
 msgid "Print UOM after Quantity"
 msgstr "اطبع UOM بعد الكمية"
 
@@ -51850,15 +52712,16 @@
 msgid "Print and Stationery"
 msgstr "طباعة وقرطاسية"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:73
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:75
 msgid "Print settings updated in respective print format"
 msgstr "تم تحديث إعدادات الطباعة في تنسيق الطباعة الخاصة\\n<br>\\nPrint settings updated in respective print format"
 
-#: setup/install.py:125
+#: setup/install.py:106
 msgid "Print taxes with zero amount"
 msgstr "طباعة الضرائب مع مبلغ صفر"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:364
+#: accounts/report/accounts_receivable/accounts_receivable.html:285
 msgid "Printed On "
 msgstr "طبع على"
 
@@ -51939,9 +52802,10 @@
 msgid "Priorities"
 msgstr "أولويات"
 
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:19
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:18
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:93
-#: projects/report/project_summary/project_summary.js:37
+#: projects/report/project_summary/project_summary.js:36
+#: templates/pages/task_info.html:54
 msgid "Priority"
 msgstr "أفضلية"
 
@@ -52029,6 +52893,12 @@
 msgid "Problem"
 msgstr "مشكلة"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Problem"
+msgstr "مشكلة"
+
 #. Label of a Link field in DocType 'Non Conformance'
 #: quality_management/doctype/non_conformance/non_conformance.json
 msgctxt "Non Conformance"
@@ -52053,7 +52923,7 @@
 msgid "Procedure"
 msgstr "إجراء"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:70
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:75
 msgid "Process Day Book Data"
 msgstr "عملية دفتر اليوم البيانات"
 
@@ -52139,7 +53009,7 @@
 msgid "Process Loss Value"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:58
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:63
 msgid "Process Master Data"
 msgstr "معالجة البيانات الرئيسية"
 
@@ -52191,6 +53061,12 @@
 msgid "Process Subscription"
 msgstr ""
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Process in Single Transaction"
+msgstr ""
+
 #. Label of a Long Text field in DocType 'BOM Update Log'
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 msgctxt "BOM Update Log"
@@ -52221,7 +53097,7 @@
 msgid "Processing Party Addresses"
 msgstr "معالجة عناوين الحزب"
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:115
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:122
 msgid "Processing Sales! Please Wait..."
 msgstr ""
 
@@ -52294,7 +53170,7 @@
 msgstr "المنتج"
 
 #. Name of a DocType
-#: public/js/controllers/buying.js:265 public/js/controllers/buying.js:511
+#: public/js/controllers/buying.js:260 public/js/controllers/buying.js:508
 #: selling/doctype/product_bundle/product_bundle.json
 msgid "Product Bundle"
 msgstr "حزم المنتجات"
@@ -52398,7 +53274,13 @@
 
 #. Label of a Card Break in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
-#: setup/doctype/company/company.py:347
+#: setup/doctype/company/company.py:346
+msgid "Production"
+msgstr "الإنتاج"
+
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
 msgid "Production"
 msgstr "الإنتاج"
 
@@ -52409,18 +53291,18 @@
 msgid "Production Analytics"
 msgstr "تحليلات إنتاج"
 
-#. Label of a Int field in DocType 'Workstation'
+#. Label of a Section Break field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Production Capacity"
 msgstr "السعة الإنتاجية"
 
 #: manufacturing/doctype/work_order/work_order_calendar.js:38
-#: manufacturing/report/job_card_summary/job_card_summary.js:65
+#: manufacturing/report/job_card_summary/job_card_summary.js:64
 #: manufacturing/report/job_card_summary/job_card_summary.py:152
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:43
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:42
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:113
-#: manufacturing/report/work_order_summary/work_order_summary.js:51
+#: manufacturing/report/work_order_summary/work_order_summary.js:50
 #: manufacturing/report/work_order_summary/work_order_summary.py:208
 msgid "Production Item"
 msgstr "بند انتاج"
@@ -52445,7 +53327,7 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/production_plan/production_plan.json
-#: manufacturing/report/production_plan_summary/production_plan_summary.js:9
+#: manufacturing/report/production_plan_summary/production_plan_summary.js:8
 msgid "Production Plan"
 msgstr "خطة الإنتاج"
 
@@ -52652,7 +53534,7 @@
 msgid "Profitability Analysis"
 msgstr "تحليل الربحية"
 
-#: templates/pages/projects.html:25
+#: projects/doctype/task/task_list.js:52 templates/pages/projects.html:25
 msgid "Progress"
 msgstr "تقدم"
 
@@ -52672,10 +53554,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:973
+#: 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:634
+#: 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
@@ -52683,30 +53565,31 @@
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:73
 #: accounts/report/sales_register/sales_register.py:228
 #: accounts/report/trial_balance/trial_balance.js:64
-#: buying/report/procurement_tracker/procurement_tracker.js:22
+#: 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:34
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:33
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:182
 #: projects/doctype/project/project.json
 #: projects/doctype/project/project_dashboard.py:11
 #: projects/doctype/task/task_calendar.js:19
-#: projects/doctype/task/task_tree.js:11
+#: projects/doctype/task/task_list.js:45 projects/doctype/task/task_tree.js:11
 #: projects/doctype/timesheet/timesheet_calendar.js:22
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:34
 #: projects/report/project_summary/project_summary.py:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:19
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:51
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:25
-#: public/js/financial_statements.js:247 public/js/projects/timer.js:10
+#: public/js/financial_statements.js:256 public/js/projects/timer.js:14
 #: public/js/purchase_trends_filters.js:52 public/js/sales_trends_filters.js:28
-#: selling/doctype/sales_order/sales_order.js:587
+#: selling/doctype/sales_order/sales_order.js:681
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:94
-#: stock/report/reserved_stock/reserved_stock.js:139
+#: stock/report/reserved_stock/reserved_stock.js:130
 #: stock/report/reserved_stock/reserved_stock.py:184
-#: stock/report/stock_ledger/stock_ledger.js:76
-#: stock/report/stock_ledger/stock_ledger.py:261
-#: support/report/issue_analytics/issue_analytics.js:76
-#: support/report/issue_summary/issue_summary.js:64
+#: stock/report/stock_ledger/stock_ledger.js:84
+#: stock/report/stock_ledger/stock_ledger.py:333
+#: support/report/issue_analytics/issue_analytics.js:75
+#: support/report/issue_summary/issue_summary.js:63
+#: templates/pages/task_info.html:39 templates/pages/timelog_info.html:22
 msgid "Project"
 msgstr "مشروع"
 
@@ -52771,6 +53654,12 @@
 msgid "Project"
 msgstr "مشروع"
 
+#. Label of a Link field in DocType 'Installation Note'
+#: selling/doctype/installation_note/installation_note.json
+msgctxt "Installation Note"
+msgid "Project"
+msgstr "مشروع"
+
 #. Label of a Link field in DocType 'Issue'
 #: support/doctype/issue/issue.json
 msgctxt "Issue"
@@ -53076,7 +53965,7 @@
 
 #. Name of a DocType
 #: projects/doctype/project_type/project_type.json
-#: projects/report/project_summary/project_summary.js:31
+#: projects/report/project_summary/project_summary.js:30
 msgid "Project Type"
 msgstr "نوع المشروع"
 
@@ -53152,6 +54041,8 @@
 msgid "Project-wise data is not available for Quotation"
 msgstr "البيانات الخاصة بالمشروع غير متوفرة للعرض المسعر"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:46
+#: stock/dashboard/item_dashboard_list.html:37
 #: stock/report/item_shortage_report/item_shortage_report.py:73
 #: stock/report/stock_projected_qty/stock_projected_qty.py:199
 #: templates/emails/reorder_item.html:12
@@ -53204,6 +54095,10 @@
 msgid "Projected Quantity"
 msgstr "الكمية المتوقعة"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Projected Quantity Formula"
+msgstr ""
+
 #: stock/page/stock_balance/stock_balance.js:51
 msgid "Projected qty"
 msgstr "الكمية المتوقعة"
@@ -53334,7 +54229,7 @@
 msgstr "بنسبة كذا"
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:61
+#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:62
 #: crm/doctype/prospect/prospect.json
 msgid "Prospect"
 msgstr ""
@@ -53429,7 +54324,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:335
+#: setup/doctype/company/company.py:334
 msgid "Purchase"
 msgstr "الشراء"
 
@@ -53522,15 +54417,15 @@
 #. Name of a DocType
 #: 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:23
+#: 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:323
-#: buying/doctype/purchase_order/purchase_order_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:378
+#: 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:110
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:22
-#: stock/doctype/stock_entry/stock_entry.js:262
+#: stock/doctype/purchase_receipt/purchase_receipt.js:123
+#: stock/doctype/purchase_receipt/purchase_receipt.js:268
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:30
+#: stock/doctype/stock_entry/stock_entry.js:294
 msgid "Purchase Invoice"
 msgstr "فاتورة شراء"
 
@@ -53653,16 +54548,16 @@
 msgid "Purchase Invoice Trends"
 msgstr "اتجهات فاتورة الشراء"
 
-#: assets/doctype/asset/asset.py:213
+#: assets/doctype/asset/asset.py:215
 msgid "Purchase Invoice cannot be made against an existing asset {0}"
 msgstr "لا يمكن إجراء فاتورة الشراء مقابل أصل موجود {0}"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:389
-#: stock/doctype/purchase_receipt/purchase_receipt.py:403
+#: stock/doctype/purchase_receipt/purchase_receipt.py:390
+#: stock/doctype/purchase_receipt/purchase_receipt.py:404
 msgid "Purchase Invoice {0} is already submitted"
 msgstr "فاتورة الشراء {0} تم ترحيلها من قبل"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1769
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1828
 msgid "Purchase Invoices"
 msgstr "فواتير الشراء"
 
@@ -53680,6 +54575,7 @@
 #: setup/doctype/supplier_group/supplier_group.json stock/doctype/bin/bin.json
 #: stock/doctype/material_request/material_request.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgid "Purchase Manager"
 msgstr "مدير المشتريات"
@@ -53694,21 +54590,21 @@
 msgstr "المدير الرئيسي للمشتريات"
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:131
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:155
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:234
 #: accounts/report/purchase_register/purchase_register.py:216
 #: buying/doctype/purchase_order/purchase_order.json
-#: buying/doctype/supplier_quotation/supplier_quotation.js:23
+#: 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:41
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:40
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:167
-#: controllers/buying_controller.py:624
-#: manufacturing/doctype/blanket_order/blanket_order.js:45
-#: selling/doctype/sales_order/sales_order.js:112
-#: selling/doctype/sales_order/sales_order.js:576
-#: stock/doctype/material_request/material_request.js:137
-#: stock/doctype/purchase_receipt/purchase_receipt.js:194
+#: controllers/buying_controller.py:649
+#: manufacturing/doctype/blanket_order/blanket_order.js:54
+#: selling/doctype/sales_order/sales_order.js:136
+#: selling/doctype/sales_order/sales_order.js:659
+#: stock/doctype/material_request/material_request.js:154
+#: stock/doctype/purchase_receipt/purchase_receipt.js:225
 msgid "Purchase Order"
 msgstr "أمر الشراء"
 
@@ -53879,7 +54775,7 @@
 msgid "Purchase Order Item Supplied"
 msgstr "الأصناف المزوده بامر الشراء"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:684
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:685
 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}"
 msgstr ""
 
@@ -53893,11 +54789,11 @@
 msgid "Purchase Order Pricing Rule"
 msgstr "قاعدة تسعير أمر الشراء"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:579
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
 msgid "Purchase Order Required"
 msgstr "أمر الشراء مطلوب"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:576
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:580
 msgid "Purchase Order Required for item {}"
 msgstr "طلب الشراء مطلوب للعنصر {}"
 
@@ -53909,7 +54805,7 @@
 msgid "Purchase Order Trends"
 msgstr "اتجهات امر الشراء"
 
-#: selling/doctype/sales_order/sales_order.js:957
+#: selling/doctype/sales_order/sales_order.js:1115
 msgid "Purchase Order already created for all Sales Order items"
 msgstr "تم إنشاء أمر الشراء بالفعل لجميع بنود أوامر المبيعات"
 
@@ -53917,11 +54813,11 @@
 msgid "Purchase Order number required for Item {0}"
 msgstr "عدد طلب الشراء مطلوب للبند\\n<br>\\nPurchase Order number required for Item {0}"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:618
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:622
 msgid "Purchase Order {0} is not submitted"
 msgstr "طلب الشراء {0} يجب أن يعتمد\\n<br>\\nPurchase Order {0} is not submitted"
 
-#: buying/doctype/purchase_order/purchase_order.py:824
+#: buying/doctype/purchase_order/purchase_order.py:827
 msgid "Purchase Orders"
 msgstr "طلبات الشراء"
 
@@ -53931,7 +54827,7 @@
 msgid "Purchase Orders Items Overdue"
 msgstr "أوامر الشراء البنود المتأخرة"
 
-#: buying/doctype/purchase_order/purchase_order.py:301
+#: buying/doctype/purchase_order/purchase_order.py:302
 msgid "Purchase Orders are not allowed for {0} due to a scorecard standing of {1}."
 msgstr "لا يسمح بأوامر الشراء {0} بسبب وضع بطاقة النقاط {1}."
 
@@ -53947,7 +54843,7 @@
 msgid "Purchase Orders to Receive"
 msgstr "أوامر الشراء لتلقي"
 
-#: controllers/accounts_controller.py:1517
+#: controllers/accounts_controller.py:1606
 msgid "Purchase Orders {0} are un-linked"
 msgstr ""
 
@@ -53956,17 +54852,17 @@
 msgstr "قائمة أسعار الشراء"
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:607
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:613
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: 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/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:310
-#: buying/doctype/purchase_order/purchase_order_list.js:43
+#: buying/doctype/purchase_order/purchase_order.js:352
+#: buying/doctype/purchase_order/purchase_order_list.js:61
 #: stock/doctype/purchase_receipt/purchase_receipt.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:56
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:65
 msgid "Purchase Receipt"
 msgstr "إستلام المشتريات"
 
@@ -54083,11 +54979,11 @@
 msgid "Purchase Receipt No"
 msgstr "لا شراء استلام"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:601
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
 msgid "Purchase Receipt Required"
 msgstr "إيصال استلام المشتريات مطلوب"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:600
 msgid "Purchase Receipt Required for item {}"
 msgstr "إيصال الشراء مطلوب للعنصر {}"
 
@@ -54100,15 +54996,15 @@
 msgid "Purchase Receipt Trends"
 msgstr "شراء اتجاهات الإيصال"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:314
+#: stock/doctype/purchase_receipt/purchase_receipt.js:363
 msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
 msgstr "لا يحتوي إيصال الشراء على أي عنصر تم تمكين الاحتفاظ عينة به."
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:702
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:703
 msgid "Purchase Receipt {0} created."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:628
 msgid "Purchase Receipt {0} is not submitted"
 msgstr "إيصال استلام المشتريات {0} لم يتم تقديمه"
 
@@ -54125,11 +55021,11 @@
 msgid "Purchase Register"
 msgstr "سجل شراء"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
 msgid "Purchase Return"
 msgstr "شراء العودة"
 
-#: setup/doctype/company/company.js:104
+#: setup/doctype/company/company.js:118
 msgid "Purchase Tax Template"
 msgstr "قالب الضرائب على المشتريات"
 
@@ -54246,6 +55142,7 @@
 #: stock/doctype/price_list/price_list.json
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -54311,7 +55208,7 @@
 msgid "Purple"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:287
+#: stock/doctype/stock_entry/stock_entry.js:329
 msgid "Purpose"
 msgstr "غرض"
 
@@ -54351,7 +55248,7 @@
 msgid "Purpose"
 msgstr "غرض"
 
-#: stock/doctype/stock_entry/stock_entry.py:380
+#: stock/doctype/stock_entry/stock_entry.py:335
 msgid "Purpose must be one of {0}"
 msgstr "الهدف يجب ان يكون واحد ل {0}\\n<br>\\nPurpose must be one of {0}"
 
@@ -54392,18 +55289,21 @@
 #: controllers/trends.py:240 controllers/trends.py:252
 #: controllers/trends.py:257
 #: manufacturing/report/bom_explorer/bom_explorer.py:57
-#: public/js/bom_configurator/bom_configurator.bundle.js:203
-#: public/js/bom_configurator/bom_configurator.bundle.js:266
-#: public/js/bom_configurator/bom_configurator.bundle.js:271
-#: public/js/bom_configurator/bom_configurator.bundle.js:344
-#: public/js/utils.js:660 selling/doctype/sales_order/sales_order.js:315
-#: selling/doctype/sales_order/sales_order.js:410
-#: selling/doctype/sales_order/sales_order.js:698
-#: selling/doctype/sales_order/sales_order.js:815
+#: 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
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:106
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:166
 #: 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
+#: templates/form_grid/stock_entry_grid.html:10
 #: templates/generators/bom.html:50 templates/pages/rfq.html:40
 msgid "Qty"
 msgstr "الكمية"
@@ -54550,7 +55450,7 @@
 msgid "Qty"
 msgstr "الكمية"
 
-#: templates/pages/order.html:167
+#: templates/pages/order.html:179
 msgid "Qty "
 msgstr ""
 
@@ -54600,7 +55500,7 @@
 msgid "Qty Per Unit"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:237
+#: manufacturing/doctype/bom/bom.js:256
 #: manufacturing/report/process_loss_report/process_loss_report.py:83
 msgid "Qty To Manufacture"
 msgstr "الكمية للتصنيع"
@@ -54691,7 +55591,14 @@
 msgid "Qty for which recursion isn't applicable."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:713
+#. Description of the 'Apply Recursion Over (As Per Transaction UOM)' (Float)
+#. field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Qty for which recursion isn't applicable."
+msgstr ""
+
+#: manufacturing/doctype/work_order/work_order.js:766
 msgid "Qty for {0}"
 msgstr "الكمية ل {0}"
 
@@ -54711,7 +55618,7 @@
 msgid "Qty in Stock UOM"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.js:145
+#: stock/doctype/pick_list/pick_list.js:174
 msgid "Qty of Finished Goods Item"
 msgstr "الكمية من السلع تامة الصنع"
 
@@ -54721,7 +55628,7 @@
 msgid "Qty of Finished Goods Item"
 msgstr "الكمية من السلع تامة الصنع"
 
-#: stock/doctype/pick_list/pick_list.py:430
+#: stock/doctype/pick_list/pick_list.py:470
 msgid "Qty of Finished Goods Item should be greater than 0."
 msgstr ""
 
@@ -54751,11 +55658,12 @@
 msgid "Qty to Deliver"
 msgstr "الكمية للتسليم"
 
-#: public/js/utils/serial_no_batch_selector.js:321
+#: public/js/utils/serial_no_batch_selector.js:327
 msgid "Qty to Fetch"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:668
+#: manufacturing/doctype/job_card/job_card.py:675
+#: manufacturing/doctype/workstation/workstation_job_card.html:56
 msgid "Qty to Manufacture"
 msgstr "الكمية للتصنيع"
 
@@ -54936,7 +55844,7 @@
 msgstr "هدف جودة الهدف"
 
 #. Name of a DocType
-#: manufacturing/doctype/bom/bom.js:130
+#: manufacturing/doctype/bom/bom.js:138
 #: stock/doctype/quality_inspection/quality_inspection.json
 msgid "Quality Inspection"
 msgstr "فحص الجودة"
@@ -55096,12 +56004,12 @@
 msgid "Quality Inspection Template Name"
 msgstr "قالب فحص الجودة اسم"
 
-#: public/js/controllers/transaction.js:298
-#: stock/doctype/stock_entry/stock_entry.js:143
+#: public/js/controllers/transaction.js:324
+#: stock/doctype/stock_entry/stock_entry.js:157
 msgid "Quality Inspection(s)"
 msgstr ""
 
-#: setup/doctype/company/company.py:377
+#: setup/doctype/company/company.py:376
 msgid "Quality Management"
 msgstr "إدارة الجودة"
 
@@ -55200,23 +56108,26 @@
 
 #: 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:29
+#: buying/report/purchase_analytics/purchase_analytics.js:28
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:215
-#: manufacturing/doctype/bom/bom.js:306
-#: manufacturing/doctype/bom_creator/bom_creator.js:69
-#: public/js/controllers/buying.js:518 public/js/stock_analytics.js:37
-#: public/js/utils/serial_no_batch_selector.js:393
+#: 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/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
-#: selling/report/sales_analytics/sales_analytics.js:29
+#: selling/report/sales_analytics/sales_analytics.js:36
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:67
-#: stock/dashboard/item_dashboard.js:236
-#: stock/doctype/material_request/material_request.js:249
-#: stock/doctype/stock_entry/stock_entry.js:551
+#: stock/dashboard/item_dashboard.js:244
+#: stock/doctype/material_request/material_request.js:314
+#: stock/doctype/stock_entry/stock_entry.js:636
 #: 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:28
+#: stock/report/stock_analytics/stock_analytics.js:27
 #: templates/emails/reorder_item.html:10 templates/generators/bom.html:30
-#: templates/pages/material_request_info.html:48 templates/pages/order.html:86
+#: templates/pages/material_request_info.html:48 templates/pages/order.html:98
 msgid "Quantity"
 msgstr "كمية"
 
@@ -55455,16 +56366,20 @@
 msgid "Quantity and Warehouse"
 msgstr "الكمية والنماذج"
 
-#: stock/doctype/stock_entry/stock_entry.py:1270
+#: stock/doctype/stock_entry/stock_entry.py:1279
 msgid "Quantity in row {0} ({1}) must be same as manufactured quantity {2}"
 msgstr "الكمية في سطر {0} ({1}) يجب ان تكون نفس الكمية المصنعة{2}\\n<br>\\nQuantity in row {0} ({1}) must be same as manufactured quantity {2}"
 
-#: stock/dashboard/item_dashboard.js:273
+#: manufacturing/doctype/plant_floor/plant_floor.js:246
+msgid "Quantity is required"
+msgstr ""
+
+#: stock/dashboard/item_dashboard.js:281
 msgid "Quantity must be greater than zero, and less or equal to {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:721
-#: stock/doctype/pick_list/pick_list.js:152
+#: manufacturing/doctype/work_order/work_order.js:775
+#: stock/doctype/pick_list/pick_list.js:182
 msgid "Quantity must not be more than {0}"
 msgstr "الكمية يجب ألا تكون أكثر من {0}"
 
@@ -55479,26 +56394,27 @@
 msgstr "الكمية مطلوبة للبند {0} في الصف {1}\\n<br>\\nQuantity required for Item {0} in row {1}"
 
 #: manufacturing/doctype/bom/bom.py:568
+#: manufacturing/doctype/workstation/workstation.js:216
 msgid "Quantity should be greater than 0"
 msgstr "الكمية يجب أن تكون أبر من 0\\n<br>\\nQuantity should be greater than 0"
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:22
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:21
 msgid "Quantity to Make"
 msgstr "كمية لجعل"
 
-#: manufacturing/doctype/work_order/work_order.js:249
+#: manufacturing/doctype/work_order/work_order.js:264
 msgid "Quantity to Manufacture"
 msgstr "كمية لتصنيع"
 
-#: manufacturing/doctype/work_order/work_order.py:1516
+#: manufacturing/doctype/work_order/work_order.py:1530
 msgid "Quantity to Manufacture can not be zero for the operation {0}"
 msgstr "لا يمكن أن تكون الكمية للتصنيع صفراً للتشغيل {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:934
+#: manufacturing/doctype/work_order/work_order.py:948
 msgid "Quantity to Manufacture must be greater than 0."
 msgstr "\"الكمية لتصنيع\" يجب أن تكون أكبر من 0."
 
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:21
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:24
 msgid "Quantity to Produce"
 msgstr "كمية لإنتاج"
 
@@ -55506,7 +56422,7 @@
 msgid "Quantity to Produce should be greater than zero."
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:227
+#: public/js/utils/barcode_scanner.js:236
 msgid "Quantity to Scan"
 msgstr ""
 
@@ -55515,20 +56431,20 @@
 msgid "Quarter {0} {1}"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:65
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:68
-#: buying/report/purchase_analytics/purchase_analytics.js:63
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
-#: manufacturing/report/production_analytics/production_analytics.js:36
-#: public/js/financial_statements.js:218
+#: accounts/report/budget_variance_report/budget_variance_report.js:63
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:76
+#: buying/report/purchase_analytics/purchase_analytics.js:62
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
+#: manufacturing/report/production_analytics/production_analytics.js:35
+#: public/js/financial_statements.js:227
 #: public/js/purchase_trends_filters.js:20 public/js/sales_trends_filters.js:12
-#: public/js/stock_analytics.js:54
-#: selling/report/sales_analytics/sales_analytics.js:63
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
-#: stock/report/stock_analytics/stock_analytics.js:82
-#: support/report/issue_analytics/issue_analytics.js:44
+#: public/js/stock_analytics.js:84
+#: selling/report/sales_analytics/sales_analytics.js:70
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
+#: stock/report/stock_analytics/stock_analytics.js:81
+#: support/report/issue_analytics/issue_analytics.js:43
 msgid "Quarterly"
 msgstr "فصلي"
 
@@ -55616,11 +56532,18 @@
 msgid "Queued"
 msgstr "قائمة الانتظار"
 
-#: accounts/doctype/journal_entry/journal_entry.js:39
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Queued"
+msgstr "قائمة الانتظار"
+
+#: accounts/doctype/journal_entry/journal_entry.js:82
 msgid "Quick Entry"
 msgstr "إدخال سريع"
 
-#: accounts/doctype/journal_entry/journal_entry.js:527
+#: accounts/doctype/journal_entry/journal_entry.js:577
 msgid "Quick Journal Entry"
 msgstr "قيد دفتر يومية سريع"
 
@@ -55657,13 +56580,14 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:257
-#: buying/doctype/supplier_quotation/supplier_quotation.js:26
-#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:100
-#: crm/report/lead_details/lead_details.js:38
-#: manufacturing/doctype/blanket_order/blanket_order.js:33
+#: accounts/doctype/sales_invoice/sales_invoice.js:287
+#: buying/doctype/supplier_quotation/supplier_quotation.js:27
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
+#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:108
+#: crm/report/lead_details/lead_details.js:37
+#: manufacturing/doctype/blanket_order/blanket_order.js:38
 #: selling/doctype/quotation/quotation.json
-#: selling/doctype/sales_order/sales_order.js:613
+#: selling/doctype/sales_order/sales_order.js:721
 msgid "Quotation"
 msgstr "عرض أسعار"
 
@@ -55771,11 +56695,11 @@
 msgid "Quotation Trends"
 msgstr "مؤشرات المناقصة"
 
-#: selling/doctype/sales_order/sales_order.py:383
+#: selling/doctype/sales_order/sales_order.py:386
 msgid "Quotation {0} is cancelled"
 msgstr "العرض المسعر {0} تم إلغائه"
 
-#: selling/doctype/sales_order/sales_order.py:300
+#: selling/doctype/sales_order/sales_order.py:303
 msgid "Quotation {0} not of type {1}"
 msgstr "عرض مسعر {0} ليس من النوع {1}"
 
@@ -55831,13 +56755,13 @@
 msgid "Random"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:58
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:26
-#: manufacturing/report/production_analytics/production_analytics.js:31
-#: public/js/stock_analytics.js:49
-#: selling/report/sales_analytics/sales_analytics.js:58
-#: stock/report/stock_analytics/stock_analytics.js:77
-#: support/report/issue_analytics/issue_analytics.js:39
+#: buying/report/purchase_analytics/purchase_analytics.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:25
+#: manufacturing/report/production_analytics/production_analytics.js:30
+#: public/js/stock_analytics.js:78
+#: selling/report/sales_analytics/sales_analytics.js:65
+#: stock/report/stock_analytics/stock_analytics.js:76
+#: support/report/issue_analytics/issue_analytics.js:38
 msgid "Range"
 msgstr "نطاق"
 
@@ -55857,12 +56781,13 @@
 #: 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:669
+#: accounts/report/share_ledger/share_ledger.py:56 public/js/utils.js:732
 #: 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:243
+#: stock/dashboard/item_dashboard.js:251
 #: stock/report/delayed_item_report/delayed_item_report.py:151
-#: templates/pages/order.html:89 templates/pages/rfq.html:43
+#: templates/form_grid/item_grid.html:8 templates/pages/order.html:101
+#: templates/pages/rfq.html:43
 msgid "Rate"
 msgstr "سعر السلعة المفردة"
 
@@ -56472,6 +57397,7 @@
 msgstr ""
 
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:52
+#: public/js/bom_configurator/bom_configurator.bundle.js:118
 #: setup/setup_wizard/operations/install_fixtures.py:46
 #: setup/setup_wizard/operations/install_fixtures.py:167
 msgid "Raw Material"
@@ -56541,12 +57467,13 @@
 msgid "Raw Material Value"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:66
+#: manufacturing/report/production_planning_report/production_planning_report.js:65
 msgid "Raw Material Warehouse"
 msgstr "مستودع المواد الخام"
 
-#: manufacturing/doctype/bom/bom.js:274
-#: public/js/bom_configurator/bom_configurator.bundle.js:268
+#: manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/workstation/workstation_job_card.html:76
+#: public/js/bom_configurator/bom_configurator.bundle.js:289
 msgid "Raw Materials"
 msgstr "مواد أولية"
 
@@ -56632,12 +57559,12 @@
 msgid "Raw Materials cannot be blank."
 msgstr "لا يمكن ترك المواد الخام فارغة."
 
-#: buying/doctype/purchase_order/purchase_order.js:304
-#: manufacturing/doctype/production_plan/production_plan.js:97
-#: manufacturing/doctype/work_order/work_order.js:574
-#: selling/doctype/sales_order/sales_order.js:526
-#: selling/doctype/sales_order/sales_order_list.js:49
-#: stock/doctype/material_request/material_request.js:166
+#: buying/doctype/purchase_order/purchase_order.js:342
+#: manufacturing/doctype/production_plan/production_plan.js:103
+#: manufacturing/doctype/work_order/work_order.js:610
+#: selling/doctype/sales_order/sales_order.js:563
+#: selling/doctype/sales_order/sales_order_list.js:62
+#: stock/doctype/material_request/material_request.js:197
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 msgid "Re-open"
 msgstr "اعادة فتح"
@@ -56654,7 +57581,7 @@
 msgid "Re-order Qty"
 msgstr "إعادة ترتيب الكميه"
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:226
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:227
 msgid "Reached Root"
 msgstr ""
 
@@ -56741,11 +57668,11 @@
 msgid "Readings"
 msgstr "قراءات"
 
-#: support/doctype/issue/issue.js:44
+#: support/doctype/issue/issue.js:51
 msgid "Reason"
 msgstr "سبب"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:242
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:279
 msgid "Reason For Putting On Hold"
 msgstr "سبب لوضع في الانتظار"
 
@@ -56755,8 +57682,14 @@
 msgid "Reason For Putting On Hold"
 msgstr "سبب لوضع في الانتظار"
 
-#: buying/doctype/purchase_order/purchase_order.js:565
-#: selling/doctype/sales_order/sales_order.js:1112
+#. Label of a Data field in DocType 'Payment Request'
+#: accounts/doctype/payment_request/payment_request.json
+msgctxt "Payment Request"
+msgid "Reason for Failure"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:661
+#: selling/doctype/sales_order/sales_order.js:1274
 msgid "Reason for Hold"
 msgstr "سبب الانتظار"
 
@@ -56766,11 +57699,11 @@
 msgid "Reason for Leaving"
 msgstr "سبب ترك العمل"
 
-#: selling/doctype/sales_order/sales_order.js:1127
+#: selling/doctype/sales_order/sales_order.js:1289
 msgid "Reason for hold:"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:144
+#: manufacturing/doctype/bom_creator/bom_creator.js:140
 msgid "Rebuild Tree"
 msgstr ""
 
@@ -56784,11 +57717,11 @@
 msgid "Recalculate Incoming/Outgoing Rate"
 msgstr ""
 
-#: projects/doctype/project/project.js:104
+#: projects/doctype/project/project.js:128
 msgid "Recalculating Purchase Cost against this Project..."
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:29
+#: assets/doctype/asset/asset_list.js:21
 msgid "Receipt"
 msgstr "إيصال"
 
@@ -56834,7 +57767,7 @@
 msgid "Receipt Document Type"
 msgstr "استلام نوع الوثيقة"
 
-#: accounts/report/account_balance/account_balance.js:53
+#: accounts/report/account_balance/account_balance.js:55
 msgid "Receivable"
 msgstr "مستحق"
 
@@ -56863,7 +57796,7 @@
 msgid "Receivable / Payable Account"
 msgstr "القبض / حساب الدائنة"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:67
+#: 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
@@ -56897,10 +57830,10 @@
 msgid "Receive"
 msgstr "تسلم"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:297
+#: buying/doctype/request_for_quotation/request_for_quotation.py:321
 #: buying/doctype/supplier_quotation/supplier_quotation.py:175
-#: stock/doctype/material_request/material_request_list.js:23
-#: stock/doctype/material_request/material_request_list.js:31
+#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:35
 msgid "Received"
 msgstr "تلقيت"
 
@@ -56941,7 +57874,7 @@
 msgid "Received Amount After Tax (Company Currency)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:891
+#: accounts/doctype/payment_entry/payment_entry.py:900
 msgid "Received Amount cannot be greater than Paid Amount"
 msgstr ""
 
@@ -57015,6 +57948,7 @@
 msgstr ""
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:50
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:9
 msgid "Received Quantity"
 msgstr "الكمية المستلمة"
 
@@ -57030,7 +57964,7 @@
 msgid "Received Quantity"
 msgstr "الكمية المستلمة"
 
-#: stock/doctype/stock_entry/stock_entry.js:250
+#: stock/doctype/stock_entry/stock_entry.js:278
 msgid "Received Stock Entries"
 msgstr "تلقى إدخالات الأسهم"
 
@@ -57063,6 +57997,10 @@
 msgid "Receiving"
 msgstr "يستلم"
 
+#: selling/page/point_of_sale/pos_past_order_list.js:17
+msgid "Recent Orders"
+msgstr ""
+
 #. Label of a Dynamic Link field in DocType 'Email Campaign'
 #: crm/doctype/email_campaign/email_campaign.json
 msgctxt "Email Campaign"
@@ -57093,8 +58031,8 @@
 msgid "Recipients"
 msgstr "المستلمين"
 
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:89
 #: accounts/doctype/payment_reconciliation/payment_reconciliation.js:90
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:93
 msgid "Reconcile"
 msgstr "توفيق"
 
@@ -57104,11 +58042,11 @@
 msgid "Reconcile"
 msgstr "توفيق"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:325
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:341
 msgid "Reconcile Entries"
 msgstr "التوفيق بين المدخلات"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:217
+#: public/js/bank_reconciliation_tool/dialog_manager.js:221
 msgid "Reconcile the Bank Transaction"
 msgstr ""
 
@@ -57185,6 +58123,12 @@
 msgid "Recurse Every (As Per Transaction UOM)"
 msgstr ""
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Recurse Every (As Per Transaction UOM)"
+msgstr ""
+
 #: accounts/doctype/pricing_rule/pricing_rule.py:232
 msgid "Recurse Over Qty cannot be less than 0"
 msgstr ""
@@ -57213,7 +58157,7 @@
 msgid "Redeem Against"
 msgstr "استبدال مقابل"
 
-#: selling/page/point_of_sale/pos_payment.js:497
+#: selling/page/point_of_sale/pos_payment.js:525
 msgid "Redeem Loyalty Points"
 msgstr "استبدل نقاط الولاء"
 
@@ -57294,7 +58238,12 @@
 #: accounts/doctype/promotional_scheme/promotional_scheme_dashboard.py:7
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:22
 #: accounts/doctype/sales_invoice/sales_invoice_dashboard.py:34
+#: accounts/report/accounts_receivable/accounts_receivable.html:136
+#: 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/general_ledger/general_ledger.html:28
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:22
 #: buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:15
 #: manufacturing/doctype/job_card/job_card_dashboard.py:10
@@ -57448,11 +58397,12 @@
 msgid "Reference"
 msgstr "مرجع"
 
-#: accounts/doctype/journal_entry/journal_entry.py:899
+#: accounts/doctype/journal_entry/journal_entry.py:926
 msgid "Reference #{0} dated {1}"
 msgstr "المرجع # {0} بتاريخ {1}"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:112
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:27
+#: public/js/bank_reconciliation_tool/dialog_manager.js:119
 msgid "Reference Date"
 msgstr "المرجع تاريخ"
 
@@ -57462,7 +58412,7 @@
 msgid "Reference Date"
 msgstr "المرجع تاريخ"
 
-#: public/js/controllers/transaction.js:2073
+#: public/js/controllers/transaction.js:2116
 msgid "Reference Date for Early Payment Discount"
 msgstr ""
 
@@ -57484,7 +58434,7 @@
 msgid "Reference Doctype"
 msgstr "مرجع Doctype"
 
-#: accounts/doctype/payment_entry/payment_entry.py:555
+#: accounts/doctype/payment_entry/payment_entry.py:564
 msgid "Reference Doctype must be one of {0}"
 msgstr "المستند المرجع يجب أن يكون واحد من {0}\\n<br>\\nReference Doctype must be one of {0}"
 
@@ -57653,24 +58603,30 @@
 msgid "Reference Name"
 msgstr "اسم الإشارة"
 
-#: accounts/doctype/journal_entry/journal_entry.py:532
+#. Label of a Data field in DocType 'Sales Invoice Payment'
+#: accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
+msgctxt "Sales Invoice Payment"
+msgid "Reference No"
+msgstr ""
+
+#: accounts/doctype/journal_entry/journal_entry.py:548
 msgid "Reference No & Reference Date is required for {0}"
 msgstr "رقم المرجع وتاريخه مطلوبان ل {0}\\n<br>\\nReference No &amp; Reference Date is required for {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1087
+#: accounts/doctype/payment_entry/payment_entry.py:1096
 msgid "Reference No and Reference Date is mandatory for Bank transaction"
 msgstr "رقم المرجع و تاريخ المرجع إلزامي للمعاملة المصرفية"
 
-#: accounts/doctype/journal_entry/journal_entry.py:537
+#: accounts/doctype/journal_entry/journal_entry.py:553
 msgid "Reference No is mandatory if you entered Reference Date"
 msgstr "رقم المرجع إلزامي اذا أدخلت تاريخ المرجع\\n<br>\\nReference No is mandatory if you entered Reference Date"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
 msgid "Reference No."
 msgstr "رقم المرجع."
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:88
-#: public/js/bank_reconciliation_tool/dialog_manager.js:123
+#: public/js/bank_reconciliation_tool/data_table_manager.js:83
+#: public/js/bank_reconciliation_tool/dialog_manager.js:130
 msgid "Reference Number"
 msgstr "رقم الارتباط"
 
@@ -57846,7 +58802,15 @@
 msgid "References"
 msgstr "المراجع"
 
-#: accounts/doctype/payment_entry/payment_entry.py:631
+#: stock/doctype/delivery_note/delivery_note.py:395
+msgid "References to Sales Invoices are Incomplete"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:371
+msgid "References to Sales Orders are Incomplete"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.py:640
 msgid "References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount."
 msgstr ""
 
@@ -57862,7 +58826,8 @@
 msgid "Referral Sales Partner"
 msgstr "شريك مبيعات الإحالة"
 
-#: selling/page/sales_funnel/sales_funnel.js:44
+#: public/js/plant_floor_visual/visual_plant.js:151
+#: selling/page/sales_funnel/sales_funnel.js:51
 msgid "Refresh"
 msgstr "تحديث"
 
@@ -57872,7 +58837,7 @@
 msgid "Refresh Google Sheet"
 msgstr "قم بتحديث ورقة Google"
 
-#: accounts/doctype/bank/bank.js:22
+#: accounts/doctype/bank/bank.js:21
 msgid "Refresh Plaid Link"
 msgstr ""
 
@@ -57882,7 +58847,7 @@
 msgid "Refresh Token"
 msgstr "تحديث رمز"
 
-#: stock/reorder_item.py:303
+#: stock/reorder_item.py:388
 msgid "Regards,"
 msgstr "مع تحياتي،"
 
@@ -58024,8 +58989,8 @@
 msgid "Relation"
 msgstr "علاقة"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:234
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:278
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:271
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:315
 msgid "Release Date"
 msgstr "تاريخ النشر"
 
@@ -58041,7 +59006,7 @@
 msgid "Release Date"
 msgstr "تاريخ النشر"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:314
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
 msgid "Release date must be in the future"
 msgstr "يجب أن يكون تاريخ الإصدار في المستقبل"
 
@@ -58051,17 +59016,18 @@
 msgid "Relieving Date"
 msgstr "تاريخ المغادرة"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:118
+#: public/js/bank_reconciliation_tool/dialog_manager.js:125
 msgid "Remaining"
 msgstr "المتبقية"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:186
-#: accounts/report/accounts_receivable/accounts_receivable.py:1085
+#: 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
 msgid "Remaining Balance"
 msgstr "الرصيد المتبقي"
 
-#: selling/page/point_of_sale/pos_payment.js:350
+#: selling/page/point_of_sale/pos_payment.js:367
 msgid "Remark"
 msgstr "كلام"
 
@@ -58084,8 +59050,14 @@
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:240
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:311
 #: accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:11
-#: accounts/report/accounts_receivable/accounts_receivable.py:1117
-#: accounts/report/general_ledger/general_ledger.py:661
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.html:29
+#: accounts/report/general_ledger/general_ledger.html:51
+#: accounts/report/general_ledger/general_ledger.py:674
 #: 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
@@ -58208,11 +59180,15 @@
 msgid "Remarks Column Length"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:323
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Remove item if charges is not applicable to that item"
+msgstr ""
+
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
 msgid "Removed items with no change in quantity or value."
 msgstr "العناصر إزالتها مع أي تغيير في كمية أو قيمة."
 
-#: utilities/doctype/rename_tool/rename_tool.js:25
+#: utilities/doctype/rename_tool/rename_tool.js:24
 msgid "Rename"
 msgstr "إعادة تسمية"
 
@@ -58229,7 +59205,7 @@
 msgid "Rename Log"
 msgstr "إعادة تسمية الدخول"
 
-#: accounts/doctype/account/account.py:502
+#: accounts/doctype/account/account.py:521
 msgid "Rename Not Allowed"
 msgstr "إعادة تسمية غير مسموح به"
 
@@ -58238,7 +59214,7 @@
 msgid "Rename Tool"
 msgstr "إعادة تسمية أداة"
 
-#: accounts/doctype/account/account.py:494
+#: accounts/doctype/account/account.py:513
 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch."
 msgstr "يُسمح بإعادة تسميته فقط عبر الشركة الأم {0} ، لتجنب عدم التطابق."
 
@@ -58261,11 +59237,11 @@
 msgid "Rented"
 msgstr "مؤجر"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:34
-#: crm/doctype/opportunity/opportunity.js:113
-#: stock/doctype/delivery_note/delivery_note.js:228
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: support/doctype/issue/issue.js:30
+#: buying/doctype/purchase_order/purchase_order_list.js:53
+#: crm/doctype/opportunity/opportunity.js:123
+#: stock/doctype/delivery_note/delivery_note.js:277
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: support/doctype/issue/issue.js:37
 msgid "Reopen"
 msgstr "إعادة فتح"
 
@@ -58302,7 +59278,7 @@
 msgid "Repair"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:107
+#: assets/doctype/asset/asset.js:127
 msgid "Repair Asset"
 msgstr ""
 
@@ -58350,9 +59326,15 @@
 msgid "Replace BOM"
 msgstr "استبدال بوم"
 
-#: crm/report/lead_details/lead_details.js:36
-#: support/report/issue_analytics/issue_analytics.js:57
-#: support/report/issue_summary/issue_summary.js:44
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.json
+msgid "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM.\n"
+"It also updates latest price in all the BOMs."
+msgstr ""
+
+#: 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
 msgid "Replied"
 msgstr "رد"
@@ -58381,7 +59363,7 @@
 msgid "Replied"
 msgstr "رد"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:86
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:110
 msgid "Report"
 msgstr "تقرير"
 
@@ -58401,7 +59383,7 @@
 msgid "Report Date"
 msgstr "تقرير تاريخ"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:213
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:192
 msgid "Report Error"
 msgstr ""
 
@@ -58417,12 +59399,12 @@
 msgid "Report Type"
 msgstr "نوع التقرير"
 
-#: accounts/doctype/account/account.py:395
+#: accounts/doctype/account/account.py:414
 msgid "Report Type is mandatory"
 msgstr "نوع التقرير إلزامي\\n<br>\\nReport Type is mandatory"
 
-#: accounts/report/balance_sheet/balance_sheet.js:17
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:17
+#: accounts/report/balance_sheet/balance_sheet.js:13
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:13
 msgid "Report View"
 msgstr ""
 
@@ -58456,8 +59438,9 @@
 msgid "Reports to"
 msgstr "إرسال التقارير إلى"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:70
-#: accounts/doctype/sales_invoice/sales_invoice.js:73
+#: accounts/doctype/journal_entry/journal_entry.js:34
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:87
+#: accounts/doctype/sales_invoice/sales_invoice.js:78
 msgid "Repost Accounting Entries"
 msgstr ""
 
@@ -58502,6 +59485,12 @@
 msgid "Repost Payment Ledger Items"
 msgstr ""
 
+#. Label of a Check field in DocType 'Journal Entry'
+#: accounts/doctype/journal_entry/journal_entry.json
+msgctxt "Journal Entry"
+msgid "Repost Required"
+msgstr ""
+
 #. Label of a Check field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
@@ -58520,11 +59509,11 @@
 msgid "Repost Status"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:137
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:138
 msgid "Repost has started in the background"
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:38
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:40
 msgid "Repost in background"
 msgstr ""
 
@@ -58532,7 +59521,7 @@
 msgid "Repost started in the background"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:105
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:115
 msgid "Reposting Completed {0}%"
 msgstr ""
 
@@ -58548,7 +59537,7 @@
 msgid "Reposting Info"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:113
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:123
 msgid "Reposting Progress"
 msgstr ""
 
@@ -58557,16 +59546,17 @@
 msgid "Reposting entries created: {0}"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:89
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:99
 msgid "Reposting has been started in the background."
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:47
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:49
 msgid "Reposting in the background."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:76
-#: accounts/doctype/sales_invoice/sales_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:39
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/sales_invoice/sales_invoice.js:83
 msgid "Reposting..."
 msgstr ""
 
@@ -58624,11 +59614,20 @@
 msgid "Represents Company"
 msgstr "يمثل الشركة"
 
-#: public/js/utils.js:678
+#. Description of a DocType
+#: accounts/doctype/fiscal_year/fiscal_year.json
+msgid "Represents a Financial Year. All accounting entries and other major transactions are tracked against the Fiscal Year."
+msgstr ""
+
+#: templates/form_grid/material_request_grid.html:25
+msgid "Reqd By Date"
+msgstr ""
+
+#: public/js/utils.js:742
 msgid "Reqd by date"
 msgstr "مطلوب بالتاريخ"
 
-#: crm/doctype/opportunity/opportunity.js:87
+#: crm/doctype/opportunity/opportunity.js:89
 msgid "Request For Quotation"
 msgstr "طلب عرض أسعار"
 
@@ -58638,7 +59637,7 @@
 msgid "Request Parameters"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:269
+#: accounts/doctype/pos_invoice/pos_invoice.js:292
 msgid "Request Timeout"
 msgstr ""
 
@@ -58662,11 +59661,11 @@
 
 #. Name of a DocType
 #: buying/doctype/request_for_quotation/request_for_quotation.json
-#: buying/doctype/request_for_quotation/request_for_quotation.py:346
-#: buying/doctype/supplier_quotation/supplier_quotation.js:57
+#: buying/doctype/request_for_quotation/request_for_quotation.py:370
+#: 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
-#: stock/doctype/material_request/material_request.js:142
+#: stock/doctype/material_request/material_request.js:162
 msgid "Request for Quotation"
 msgstr "طلب للحصول على الاقتباس"
 
@@ -58704,7 +59703,7 @@
 msgid "Request for Quotation Supplier"
 msgstr "طلب تسعيرة مزود"
 
-#: selling/doctype/sales_order/sales_order.js:571
+#: selling/doctype/sales_order/sales_order.js:650
 msgid "Request for Raw Materials"
 msgstr "طلب المواد الخام"
 
@@ -58760,6 +59759,10 @@
 msgid "Requested Qty"
 msgstr "الكمية المطلبة"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Requested Qty: Quantity requested for purchase, but not ordered."
+msgstr ""
+
 #: buying/report/procurement_tracker/procurement_tracker.py:46
 msgid "Requesting Site"
 msgstr "طلب موقع"
@@ -58846,8 +59849,15 @@
 msgid "Required Items"
 msgstr "الأصناف المطلوبة"
 
+#: templates/form_grid/material_request_grid.html:7
+msgid "Required On"
+msgstr ""
+
 #: 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_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
@@ -58924,7 +59934,7 @@
 msgid "Research"
 msgstr "ابحاث"
 
-#: setup/doctype/company/company.py:383
+#: setup/doctype/company/company.py:382
 msgid "Research & Development"
 msgstr "البحث و التطوير"
 
@@ -58956,11 +59966,11 @@
 msgid "Reselect, if the chosen contact is edited after save"
 msgstr "إعادة تحديد، إذا تم تحرير جهة الاتصال التي تم اختيارها بعد حفظ"
 
-#: accounts/doctype/payment_request/payment_request.js:30
+#: accounts/doctype/payment_request/payment_request.js:39
 msgid "Resend Payment Email"
 msgstr "إعادة إرسال الدفعة عبر البريد الإلكتروني"
 
-#: stock/report/reserved_stock/reserved_stock.js:121
+#: stock/report/reserved_stock/reserved_stock.js:118
 msgid "Reservation Based On"
 msgstr ""
 
@@ -58970,12 +59980,12 @@
 msgid "Reservation Based On"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: stock/doctype/pick_list/pick_list.js:110
+#: selling/doctype/sales_order/sales_order.js:80
+#: stock/doctype/pick_list/pick_list.js:126
 msgid "Reserve"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:322
+#: selling/doctype/sales_order/sales_order.js:347
 msgid "Reserve Stock"
 msgstr ""
 
@@ -59009,6 +60019,8 @@
 msgid "Reserved"
 msgstr "محجوز"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:29
+#: stock/dashboard/item_dashboard_list.html:20
 #: stock/report/reserved_stock/reserved_stock.py:124
 #: stock/report/stock_projected_qty/stock_projected_qty.py:164
 msgid "Reserved Qty"
@@ -59048,16 +60060,28 @@
 msgid "Reserved Qty for Production Plan"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Production: Raw materials quantity to make manufacturing items."
+msgstr ""
+
 #. Label of a Float field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "Reserved Qty for Subcontract"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
+msgstr ""
+
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:497
 msgid "Reserved Qty should be greater than Delivered Qty."
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty: Quantity ordered for sale, but not delivered."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:116
 msgid "Reserved Quantity"
 msgstr "الكمية المحجوزة"
@@ -59066,16 +60090,18 @@
 msgid "Reserved Quantity for Production"
 msgstr "الكمية المحجوزة للإنتاج"
 
-#: stock/stock_ledger.py:1982
+#: stock/stock_ledger.py:1989
 msgid "Reserved Serial No."
 msgstr ""
 
 #. Name of a report
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:374
-#: stock/doctype/pick_list/pick_list.js:120
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:24
+#: selling/doctype/sales_order/sales_order.js:99
+#: selling/doctype/sales_order/sales_order.js:404
+#: 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:459 stock/stock_ledger.py:1962
+#: stock/report/stock_balance/stock_balance.py:467 stock/stock_ledger.py:1969
 msgid "Reserved Stock"
 msgstr ""
 
@@ -59085,7 +60111,7 @@
 msgid "Reserved Stock"
 msgstr ""
 
-#: stock/stock_ledger.py:2012
+#: stock/stock_ledger.py:2019
 msgid "Reserved Stock for Batch"
 msgstr ""
 
@@ -59117,21 +60143,27 @@
 msgid "Reserved for sub contracting"
 msgstr "محجوزة للتعاقد من الباطن"
 
-#: selling/doctype/sales_order/sales_order.js:335
-#: stock/doctype/pick_list/pick_list.js:237
+#: selling/doctype/sales_order/sales_order.js:360
+#: stock/doctype/pick_list/pick_list.js:271
 msgid "Reserving Stock..."
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:139
-#: support/doctype/issue/issue.js:48
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:155
+#: support/doctype/issue/issue.js:55
 msgid "Reset"
 msgstr "إعادة تعيين"
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Reset Company Default Values"
+msgstr ""
+
 #: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:19
 msgid "Reset Plaid Link"
 msgstr ""
 
-#: support/doctype/issue/issue.js:39
+#: support/doctype/issue/issue.js:46
 msgid "Reset Service Level Agreement"
 msgstr "إعادة ضبط اتفاقية مستوى الخدمة"
 
@@ -59141,7 +60173,7 @@
 msgid "Reset Service Level Agreement"
 msgstr "إعادة ضبط اتفاقية مستوى الخدمة"
 
-#: support/doctype/issue/issue.js:56
+#: support/doctype/issue/issue.js:63
 msgid "Resetting Service Level Agreement."
 msgstr "إعادة ضبط اتفاقية مستوى الخدمة."
 
@@ -59230,8 +60262,8 @@
 msgstr "حل"
 
 #: accounts/doctype/dunning/dunning_list.js:4
-#: support/report/issue_analytics/issue_analytics.js:58
-#: support/report/issue_summary/issue_summary.js:46
+#: support/report/issue_analytics/issue_analytics.js:57
+#: support/report/issue_summary/issue_summary.js:45
 #: support/report/issue_summary/issue_summary.py:366
 msgid "Resolved"
 msgstr "تم الحل"
@@ -59311,7 +60343,7 @@
 msgid "Rest Of The World"
 msgstr "باقي أنحاء العالم"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:72
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:82
 msgid "Restart"
 msgstr ""
 
@@ -59319,7 +60351,7 @@
 msgid "Restart Subscription"
 msgstr "إعادة تشغيل الاشتراك"
 
-#: assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:108
 msgid "Restore Asset"
 msgstr ""
 
@@ -59366,12 +60398,12 @@
 msgid "Result Title Field"
 msgstr "النتيجة عنوان الحقل"
 
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: selling/doctype/sales_order/sales_order.js:515
+#: buying/doctype/purchase_order/purchase_order.js:321
+#: selling/doctype/sales_order/sales_order.js:549
 msgid "Resume"
 msgstr "استئنف"
 
-#: manufacturing/doctype/job_card/job_card.js:255
+#: manufacturing/doctype/job_card/job_card.js:288
 msgid "Resume Job"
 msgstr ""
 
@@ -59398,11 +60430,11 @@
 msgid "Retained Earnings"
 msgstr "أرباح محتجزة"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: stock/doctype/purchase_receipt/purchase_receipt.js:274
 msgid "Retention Stock Entry"
 msgstr "الاحتفاظ الأسهم"
 
-#: stock/doctype/stock_entry/stock_entry.js:450
+#: stock/doctype/stock_entry/stock_entry.js:510
 msgid "Retention Stock Entry already created or Sample Quantity not provided"
 msgstr "الاحتفاظ الأسهم دخول بالفعل إنشاء أو عينة الكمية غير المقدمة"
 
@@ -59412,20 +60444,21 @@
 msgid "Retried"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:134
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 #: accounts/doctype/ledger_merge/ledger_merge.js:72
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:65
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:66
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
 msgid "Retry"
 msgstr "إعادة المحاولة"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:13
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:27
 msgid "Retry Failed Transactions"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/sales_invoice/sales_invoice.py:263
-#: stock/doctype/delivery_note/delivery_note_list.js:6
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:6
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/sales_invoice/sales_invoice.py:268
+#: stock/doctype/delivery_note/delivery_note_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:15
 msgid "Return"
 msgstr "عودة"
 
@@ -59453,11 +60486,11 @@
 msgid "Return"
 msgstr "عودة"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:120
+#: accounts/doctype/sales_invoice/sales_invoice.js:121
 msgid "Return / Credit Note"
 msgstr "ارجاع / اشعار دائن"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
 msgid "Return / Debit Note"
 msgstr "ارجاع / اشعار مدين"
 
@@ -59503,12 +60536,12 @@
 msgid "Return Against Subcontracting Receipt"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:194
+#: manufacturing/doctype/work_order/work_order.js:205
 msgid "Return Components"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note_list.js:10
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:10
+#: stock/doctype/delivery_note/delivery_note_list.js:20
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:19
 msgid "Return Issued"
 msgstr ""
 
@@ -59530,16 +60563,16 @@
 msgid "Return Issued"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:334
 msgid "Return Qty"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:265
+#: stock/doctype/purchase_receipt/purchase_receipt.js:310
 msgid "Return Qty from Rejected Warehouse"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:77
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:142
+#: buying/doctype/purchase_order/purchase_order.js:80
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:150
 msgid "Return of Components"
 msgstr ""
 
@@ -59619,7 +60652,7 @@
 msgid "Returned Qty in Stock UOM"
 msgstr ""
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:103
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:104
 msgid "Returned exchange rate is neither integer not float."
 msgstr ""
 
@@ -59637,14 +60670,14 @@
 msgid "Returns"
 msgstr "النتائج"
 
-#: accounts/report/accounts_payable/accounts_payable.js:154
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:116
-#: accounts/report/accounts_receivable/accounts_receivable.js:186
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:144
+#: accounts/report/accounts_payable/accounts_payable.js:157
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:119
+#: accounts/report/accounts_receivable/accounts_receivable.js:189
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:147
 msgid "Revaluation Journals"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
 msgid "Revenue"
 msgstr ""
 
@@ -59654,7 +60687,7 @@
 msgid "Reversal Of"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:33
+#: accounts/doctype/journal_entry/journal_entry.js:73
 msgid "Reverse Journal Entry"
 msgstr "عكس دخول المجلة"
 
@@ -59811,12 +60844,12 @@
 msgid "Root"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:41
+#: accounts/doctype/account/account_tree.js:47
 msgid "Root Company"
 msgstr "شركة الجذر"
 
-#: accounts/doctype/account/account_tree.js:112
-#: accounts/report/account_balance/account_balance.js:23
+#: accounts/doctype/account/account_tree.js:145
+#: accounts/report/account_balance/account_balance.js:22
 msgid "Root Type"
 msgstr "نوع الجذر"
 
@@ -59836,11 +60869,11 @@
 msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity"
 msgstr ""
 
-#: accounts/doctype/account/account.py:392
+#: accounts/doctype/account/account.py:411
 msgid "Root Type is mandatory"
 msgstr "نوع الجذر إلزامي\\n<br>\\nRoot Type is mandatory"
 
-#: accounts/doctype/account/account.py:195
+#: accounts/doctype/account/account.py:214
 msgid "Root cannot be edited."
 msgstr "الجذرلا يمكن تعديل."
 
@@ -59856,7 +60889,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:66
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:90
-#: accounts/report/account_balance/account_balance.js:54
+#: accounts/report/account_balance/account_balance.js:56
 msgid "Round Off"
 msgstr "تقريب"
 
@@ -60117,12 +61150,12 @@
 msgid "Rounding Loss Allowance"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:41
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:45
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:48
 msgid "Rounding Loss Allowance should be between 0 and 1"
 msgstr ""
 
-#: controllers/stock_controller.py:216 controllers/stock_controller.py:231
+#: controllers/stock_controller.py:398 controllers/stock_controller.py:413
 msgid "Rounding gain/loss Entry for Stock Transfer"
 msgstr ""
 
@@ -60163,11 +61196,11 @@
 msgid "Routing Name"
 msgstr "اسم التوجيه"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:428
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:482
 msgid "Row #"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:334
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:388
 msgid "Row # {0}:"
 msgstr ""
 
@@ -60184,12 +61217,12 @@
 msgstr "الصف رقم {0}: العنصر الذي تم إرجاعه {1} غير موجود في {2} {3}"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:439
-#: accounts/doctype/sales_invoice/sales_invoice.py:1715
+#: accounts/doctype/sales_invoice/sales_invoice.py:1684
 msgid "Row #{0} (Payment Table): Amount must be negative"
 msgstr "الصف # {0} (جدول الدفع): يجب أن يكون المبلغ سلبيًا"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:437
-#: accounts/doctype/sales_invoice/sales_invoice.py:1710
+#: accounts/doctype/sales_invoice/sales_invoice.py:1679
 msgid "Row #{0} (Payment Table): Amount must be positive"
 msgstr "الصف رقم {0} (جدول الدفع): يجب أن يكون المبلغ موجبا"
 
@@ -60206,7 +61239,7 @@
 msgstr ""
 
 #: controllers/subcontracting_controller.py:72
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:413
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:414
 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same"
 msgstr ""
 
@@ -60214,11 +61247,11 @@
 msgid "Row #{0}: Accepted Warehouse and Supplier Warehouse cannot be same"
 msgstr "الصف # {0}: لا يمكن أن يكون المستودع المقبوض ومستودع الموردين متماثلين"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:406
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:407
 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
 msgstr ""
 
-#: controllers/accounts_controller.py:887
+#: controllers/accounts_controller.py:939
 msgid "Row #{0}: Account {1} does not belong to company {2}"
 msgstr "الصف # {0}: الحساب {1} لا ينتمي إلى الشركة {2}"
 
@@ -60231,15 +61264,15 @@
 msgid "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:309
+#: assets/doctype/asset_capitalization/asset_capitalization.py:315
 msgid "Row #{0}: Amount must be a positive number"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:375
+#: accounts/doctype/sales_invoice/sales_invoice.py:386
 msgid "Row #{0}: Asset {1} cannot be submitted, it is already {2}"
 msgstr "الصف # {0}: الاصل {1} لا يمكن تقديمه ، لانه بالفعل {2}"
 
-#: buying/doctype/purchase_order/purchase_order.py:351
+#: buying/doctype/purchase_order/purchase_order.py:352
 msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
 msgstr ""
 
@@ -60247,27 +61280,27 @@
 msgid "Row #{0}: Batch No {1} is already selected."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:736
+#: accounts/doctype/payment_entry/payment_entry.py:745
 msgid "Row #{0}: Cannot allocate more than {1} against payment term {2}"
 msgstr ""
 
-#: controllers/accounts_controller.py:3064
+#: controllers/accounts_controller.py:3155
 msgid "Row #{0}: Cannot delete item {1} which has already been billed."
 msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تحرير فاتورة به بالفعل."
 
-#: controllers/accounts_controller.py:3038
+#: controllers/accounts_controller.py:3129
 msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
 msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تسليمه بالفعل"
 
-#: controllers/accounts_controller.py:3057
+#: controllers/accounts_controller.py:3148
 msgid "Row #{0}: Cannot delete item {1} which has already been received"
 msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم استلامه بالفعل"
 
-#: controllers/accounts_controller.py:3044
+#: controllers/accounts_controller.py:3135
 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
 msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تعيين ترتيب العمل إليه."
 
-#: controllers/accounts_controller.py:3050
+#: controllers/accounts_controller.py:3141
 msgid "Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order."
 msgstr "الصف # {0}: لا يمكن حذف العنصر {1} الذي تم تعيينه لأمر شراء العميل."
 
@@ -60275,11 +61308,11 @@
 msgid "Row #{0}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor"
 msgstr "الصف # {0}: لا يمكن اختيار Warehouse Supplier أثناء توريد المواد الخام إلى المقاول من الباطن"
 
-#: controllers/accounts_controller.py:3309
+#: controllers/accounts_controller.py:3400
 msgid "Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}."
 msgstr "الصف # {0}: لا يمكن تعيين &quot;معدل&quot; إذا كان المقدار أكبر من مبلغ الفاتورة للعنصر {1}."
 
-#: manufacturing/doctype/job_card/job_card.py:864
+#: manufacturing/doctype/job_card/job_card.py:871
 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
 msgstr ""
 
@@ -60287,31 +61320,31 @@
 msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
 msgstr "الصف رقم {0}: يجب ألا يكون العنصر الفرعي عبارة عن حزمة منتج. يرجى إزالة العنصر {1} وحفظه"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:97
+#: accounts/doctype/bank_clearance/bank_clearance.py:99
 msgid "Row #{0}: Clearance date {1} cannot be before Cheque Date {2}"
 msgstr "الصف # {0}: لا يمكن ان يكون تاريخ التخليص {1} قبل تاريخ الشيك\\n<br>\\nRow #{0}: Clearance date {1} cannot be before Cheque Date {2}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:286
+#: assets/doctype/asset_capitalization/asset_capitalization.py:292
 msgid "Row #{0}: Consumed Asset {1} cannot be Draft"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:288
+#: assets/doctype/asset_capitalization/asset_capitalization.py:294
 msgid "Row #{0}: Consumed Asset {1} cannot be cancelled"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:273
+#: assets/doctype/asset_capitalization/asset_capitalization.py:279
 msgid "Row #{0}: Consumed Asset {1} cannot be the same as the Target Asset"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:282
+#: assets/doctype/asset_capitalization/asset_capitalization.py:288
 msgid "Row #{0}: Consumed Asset {1} cannot be {2}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:292
+#: assets/doctype/asset_capitalization/asset_capitalization.py:298
 msgid "Row #{0}: Consumed Asset {1} does not belong to company {2}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:385
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:105
 msgid "Row #{0}: Cost Center {1} does not belong to company {2}"
 msgstr "الصف # {0}: مركز التكلفة {1} لا ينتمي لشركة {2}"
 
@@ -60323,7 +61356,7 @@
 msgid "Row #{0}: Dates overlapping with other row"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:375
+#: buying/doctype/purchase_order/purchase_order.py:376
 msgid "Row #{0}: Default BOM not found for FG Item {1}"
 msgstr ""
 
@@ -60331,35 +61364,35 @@
 msgid "Row #{0}: Duplicate entry in References {1} {2}"
 msgstr "الصف # {0}: إدخال مكرر في المراجع {1} {2}"
 
-#: selling/doctype/sales_order/sales_order.py:237
+#: selling/doctype/sales_order/sales_order.py:239
 msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
 msgstr "الصف # {0}: تاريخ التسليم المتوقع لا يمكن أن يكون قبل تاريخ أمر الشراء"
 
-#: controllers/stock_controller.py:336
+#: controllers/stock_controller.py:518
 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:378
+#: buying/doctype/purchase_order/purchase_order.py:379
 msgid "Row #{0}: Finished Good Item Qty can not be zero"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:362
+#: buying/doctype/purchase_order/purchase_order.py:363
 msgid "Row #{0}: Finished Good Item is not specified for service item {1}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:369
+#: buying/doctype/purchase_order/purchase_order.py:370
 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:394
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:395
 msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:571
+#: accounts/doctype/journal_entry/journal_entry.py:594
 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:577
+#: accounts/doctype/journal_entry/journal_entry.py:604
 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
 msgstr ""
 
@@ -60367,7 +61400,7 @@
 msgid "Row #{0}: From Date cannot be before To Date"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:489
+#: public/js/utils/barcode_scanner.js:394
 msgid "Row #{0}: Item added"
 msgstr "الصف # {0}: تمت إضافة العنصر"
 
@@ -60375,23 +61408,23 @@
 msgid "Row #{0}: Item {1} does not exist"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:949
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:951
 msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:491
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:545
 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it."
 msgstr "الصف # {0}: العنصر {1} ليس عنصرًا تسلسليًا / مُجمَّع. لا يمكن أن يكون له رقم مسلسل / لا دفعة ضده."
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:303
+#: assets/doctype/asset_capitalization/asset_capitalization.py:309
 msgid "Row #{0}: Item {1} is not a service item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:261
+#: assets/doctype/asset_capitalization/asset_capitalization.py:267
 msgid "Row #{0}: Item {1} is not a stock item"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:657
+#: accounts/doctype/payment_entry/payment_entry.py:666
 msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
 msgstr "الصف {1} : قيد اليومية {1} لا يحتوى على الحساب {2} أو بالفعل يوجد في قسيمة مقابلة أخرى\\n<br>\\nRow #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
 
@@ -60399,48 +61432,48 @@
 msgid "Row #{0}: Maximum Net Rate cannot be greater than Minimum Net Rate"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:535
+#: selling/doctype/sales_order/sales_order.py:541
 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
 msgstr "الصف رقم {0}: غير مسموح تغيير المورد لأن أمر الشراء موجود مسبقاً\\n<br>\\nRow #{0}: Not allowed to change Supplier as Purchase Order already exists"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1032
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1034
 msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:687
+#: stock/doctype/stock_entry/stock_entry.py:642
 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 "الصف # {0}: العملية {1} لم تكتمل لـ {2} الكمية من السلع تامة الصنع في أمر العمل {3}. يرجى تحديث حالة التشغيل عبر بطاقة العمل {4}."
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:93
+#: accounts/doctype/bank_clearance/bank_clearance.py:95
 msgid "Row #{0}: Payment document is required to complete the transaction"
 msgstr "الصف # {0}: مطلوب مستند الدفع لإكمال الاجراء النهائي\\n<br>\\nRow #{0}: Payment document is required to complete the transaction"
 
-#: manufacturing/doctype/production_plan/production_plan.py:892
+#: manufacturing/doctype/production_plan/production_plan.py:901
 msgid "Row #{0}: Please select Item Code in Assembly Items"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:895
+#: manufacturing/doctype/production_plan/production_plan.py:904
 msgid "Row #{0}: Please select the BOM No in Assembly Items"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:889
-msgid "Row #{0}: Please select the FG Warehouse in Assembly Items"
+#: manufacturing/doctype/production_plan/production_plan.py:898
+msgid "Row #{0}: Please select the Sub Assembly Warehouse"
 msgstr ""
 
 #: stock/doctype/item/item.py:487
 msgid "Row #{0}: Please set reorder quantity"
 msgstr "الصف # {0}: يرجى تعيين إعادة ترتيب الكمية\\n<br>\\nRow #{0}: Please set reorder quantity"
 
-#: controllers/accounts_controller.py:367
+#: controllers/accounts_controller.py:411
 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:487
+#: public/js/utils/barcode_scanner.js:392
 msgid "Row #{0}: Qty increased by {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:264
-#: assets/doctype/asset_capitalization/asset_capitalization.py:306
+#: assets/doctype/asset_capitalization/asset_capitalization.py:270
+#: assets/doctype/asset_capitalization/asset_capitalization.py:312
 msgid "Row #{0}: Qty must be a positive number"
 msgstr ""
 
@@ -60448,12 +61481,12 @@
 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:1018
-#: controllers/accounts_controller.py:3166
+#: controllers/accounts_controller.py:1082
+#: controllers/accounts_controller.py:3257
 msgid "Row #{0}: Quantity for Item {1} cannot be zero."
 msgstr "الصف # {0}: كمية البند {1} لا يمكن أن يكون صفرا"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1017
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1019
 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
 msgstr ""
 
@@ -60465,11 +61498,11 @@
 msgid "Row #{0}: Received Qty must be equal to Accepted + Rejected Qty for Item {1}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1016
+#: accounts/doctype/payment_entry/payment_entry.js:1234
 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry"
 msgstr "الصف {0} : نوع المستند المرجع يجب أن يكون واحدة من طلب شراء ,فاتورة شراء أو قيد يومبة\\n<br>\\nRow #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1008
+#: accounts/doctype/payment_entry/payment_entry.js:1220
 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning"
 msgstr "الصف # {0}: يجب أن يكون نوع المستند المرجعي أحد أوامر المبيعات أو فاتورة المبيعات أو إدخال دفتر اليومية أو المطالبة"
 
@@ -60477,7 +61510,7 @@
 msgid "Row #{0}: Rejected Qty can not be entered in Purchase Return"
 msgstr "الصف # {0}: لا يمكن إدخال الكمية المرفوضة في المشتريات الراجعة"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:387
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:388
 msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}."
 msgstr ""
 
@@ -60485,22 +61518,22 @@
 msgid "Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}"
 msgstr ""
 
-#: controllers/buying_controller.py:849
+#: controllers/buying_controller.py:875
 msgid "Row #{0}: Reqd by Date cannot be before Transaction Date"
 msgstr "الصف # {0}: ريد بي ديت لا يمكن أن يكون قبل تاريخ المعاملة"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:382
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:383
 msgid "Row #{0}: Scrap Item Qty cannot be zero"
 msgstr ""
 
-#: controllers/selling_controller.py:212
+#: controllers/selling_controller.py:213
 msgid "Row #{0}: Selling rate for item {1} is lower than its {2}.\n"
 "\t\t\t\t\tSelling {3} should be atleast {4}.<br><br>Alternatively,\n"
 "\t\t\t\t\tyou can disable selling price validation in {5} to bypass\n"
 "\t\t\t\t\tthis validation."
 msgstr ""
 
-#: controllers/stock_controller.py:97
+#: controllers/stock_controller.py:129
 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
 msgstr "الصف # {0}: الرقم التسلسلي {1} لا ينتمي إلى الدُفعة {2}"
 
@@ -60512,27 +61545,35 @@
 msgid "Row #{0}: Serial No {1} is already selected."
 msgstr ""
 
-#: controllers/accounts_controller.py:395
+#: controllers/accounts_controller.py:439
 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date"
 msgstr "الصف # {0}: لا يمكن أن يكون تاريخ انتهاء الخدمة قبل تاريخ ترحيل الفاتورة"
 
-#: controllers/accounts_controller.py:391
+#: controllers/accounts_controller.py:435
 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date"
 msgstr "الصف # {0}: لا يمكن أن يكون تاريخ بدء الخدمة أكبر من تاريخ انتهاء الخدمة"
 
-#: controllers/accounts_controller.py:387
+#: controllers/accounts_controller.py:431
 msgid "Row #{0}: Service Start and End Date is required for deferred accounting"
 msgstr "الصف # {0}: مطلوب بداية وتاريخ انتهاء الخدمة للمحاسبة المؤجلة"
 
-#: selling/doctype/sales_order/sales_order.py:391
+#: selling/doctype/sales_order/sales_order.py:394
 msgid "Row #{0}: Set Supplier for item {1}"
 msgstr "الصف # {0}: حدد المورد للبند {1}"
 
+#: manufacturing/doctype/workstation/workstation.py:80
+msgid "Row #{0}: Start Time and End Time are required"
+msgstr ""
+
+#: manufacturing/doctype/workstation/workstation.py:83
+msgid "Row #{0}: Start Time must be before End Time"
+msgstr ""
+
 #: stock/doctype/quality_inspection/quality_inspection.py:120
 msgid "Row #{0}: Status is mandatory"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:381
+#: accounts/doctype/journal_entry/journal_entry.py:397
 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
 msgstr "الصف # {0}: يجب أن تكون الحالة {1} بالنسبة لخصم الفاتورة {2}"
 
@@ -60540,19 +61581,19 @@
 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:962
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:964
 msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:975
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:977
 msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:989
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:991
 msgid "Row #{0}: Stock is already reserved for the Item {1}."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:605
+#: stock/doctype/delivery_note/delivery_note.py:666
 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
 msgstr ""
 
@@ -60560,19 +61601,19 @@
 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:1003
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1005
 msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
 msgstr ""
 
-#: controllers/stock_controller.py:110
+#: controllers/stock_controller.py:142
 msgid "Row #{0}: The batch {1} has already expired."
 msgstr "الصف رقم {0}: انتهت صلاحية الدفعة {1} بالفعل."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1687
-msgid "Row #{0}: The following Serial Nos are not present in Delivery Note {1}:"
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:150
+msgid "Row #{0}: The following serial numbers are not present in Delivery Note {1}:"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.py:116
+#: manufacturing/doctype/workstation/workstation.py:137
 msgid "Row #{0}: Timings conflicts with row {1}"
 msgstr "الصف # {0}: التوقيت يتعارض مع الصف {1}"
 
@@ -60580,15 +61621,11 @@
 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:1402
+#: accounts/doctype/sales_invoice/sales_invoice.py:1413
 msgid "Row #{0}: You must select an Asset for Item {1}."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1696
-msgid "Row #{0}: {1} Serial numbers required for Item {2}. You have provided {3}."
-msgstr ""
-
-#: controllers/buying_controller.py:483 public/js/controllers/buying.js:208
+#: controllers/buying_controller.py:483 public/js/controllers/buying.js:203
 msgid "Row #{0}: {1} can not be negative for item {2}"
 msgstr "الصف # {0}: {1} لا يمكن أن يكون سالبا للبند {2}"
 
@@ -60604,6 +61641,10 @@
 msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account."
 msgstr ""
 
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:161
+msgid "Row #{0}: {1} serial numbers are required for Item {2}. You have provided {3} serial numbers."
+msgstr ""
+
 #: buying/utils.py:106
 msgid "Row #{1}: Warehouse is mandatory for stock Item {0}"
 msgstr ""
@@ -60612,11 +61653,11 @@
 msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
 msgstr "الصف # {}: عملة {} - {} لا تطابق عملة الشركة."
 
-#: assets/doctype/asset/asset.py:275
+#: assets/doctype/asset/asset.py:277
 msgid "Row #{}: Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr "الصف رقم {}: يجب ألا يكون تاريخ ترحيل الإهلاك مساويًا لتاريخ المتاح للاستخدام."
 
-#: assets/doctype/asset/asset.py:308
+#: assets/doctype/asset/asset.py:310
 msgid "Row #{}: Finance Book should not be empty since you're using multiple."
 msgstr ""
 
@@ -60644,7 +61685,7 @@
 msgid "Row #{}: Please assign task to a member."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:300
+#: assets/doctype/asset/asset.py:302
 msgid "Row #{}: Please use a different Finance Book."
 msgstr ""
 
@@ -60660,7 +61701,7 @@
 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:83
+#: stock/doctype/pick_list/pick_list.py:87
 msgid "Row #{}: item {} has been picked already."
 msgstr ""
 
@@ -60672,39 +61713,47 @@
 msgid "Row #{}: {} {} does not exist."
 msgstr "الصف رقم {}: {} {} غير موجود."
 
-#: stock/doctype/item/item.py:1364
+#: stock/doctype/item/item.py:1365
 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:433
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:437
 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:599
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Row Number"
+msgstr ""
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:376
+msgid "Row {0}"
+msgstr ""
+
+#: manufacturing/doctype/job_card/job_card.py:606
 msgid "Row {0} : Operation is required against the raw material item {1}"
 msgstr "الصف {0}: العملية مطلوبة مقابل عنصر المادة الخام {1}"
 
-#: stock/doctype/pick_list/pick_list.py:113
+#: stock/doctype/pick_list/pick_list.py:117
 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1135
+#: stock/doctype/stock_entry/stock_entry.py:1144
 msgid "Row {0}# Item {1} cannot be transferred more than {2} against {3} {4}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1159
+#: stock/doctype/stock_entry/stock_entry.py:1168
 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:190
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:191
 msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:509
+#: accounts/doctype/journal_entry/journal_entry.py:525
 msgid "Row {0}: Account {1} and Party Type {2} have different account types"
 msgstr ""
 
-#: controllers/accounts_controller.py:2536
+#: controllers/accounts_controller.py:2621
 msgid "Row {0}: Account {1} is a Group Account"
 msgstr ""
 
@@ -60712,43 +61761,47 @@
 msgid "Row {0}: Activity Type is mandatory."
 msgstr "الصف {0}: نوع النشاط إلزامي."
 
-#: accounts/doctype/journal_entry/journal_entry.py:561
+#: accounts/doctype/journal_entry/journal_entry.py:577
 msgid "Row {0}: Advance against Customer must be credit"
 msgstr "الصف {0}:  الدفعة المقدمة مقابل الزبائن يجب أن تكون دائن"
 
-#: accounts/doctype/journal_entry/journal_entry.py:563
+#: accounts/doctype/journal_entry/journal_entry.py:579
 msgid "Row {0}: Advance against Supplier must be debit"
 msgstr "الصف {0}:المورد المقابل المتقدم يجب أن يكون مدين\\n<br>\\nRow {0}: Advance against Supplier must be debit"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:671
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:681
 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:663
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:673
 msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:763
+#: stock/doctype/stock_entry/stock_entry.py:884
+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
 msgid "Row {0}: Bill of Materials not found for the Item {1}"
 msgstr "صف {0}: من مواد مشروع القانون لم يتم العثور على هذا البند {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:796
+#: accounts/doctype/journal_entry/journal_entry.py:823
 msgid "Row {0}: Both Debit and Credit values cannot be zero"
 msgstr ""
 
-#: controllers/buying_controller.py:438 controllers/selling_controller.py:204
+#: controllers/buying_controller.py:438 controllers/selling_controller.py:205
 msgid "Row {0}: Conversion Factor is mandatory"
 msgstr "الصف {0}: معامل التحويل إلزامي"
 
-#: controllers/accounts_controller.py:2549
+#: controllers/accounts_controller.py:2634
 msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:116
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:137
 msgid "Row {0}: Cost center is required for an item {1}"
 msgstr "الصف {0}: مركز التكلفة مطلوب لعنصر {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:647
+#: accounts/doctype/journal_entry/journal_entry.py:674
 msgid "Row {0}: Credit entry can not be linked with a {1}"
 msgstr "صف {0}: لا يمكن ربط قيد دائن مع {1}"
 
@@ -60756,19 +61809,19 @@
 msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
 msgstr "الصف {0}: العملة للـ BOM #{1} يجب أن يساوي العملة المختارة {2}<br>Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:642
+#: accounts/doctype/journal_entry/journal_entry.py:669
 msgid "Row {0}: Debit entry can not be linked with a {1}"
 msgstr "الصف {0}: لا يمكن ربط قيد مدين مع {1}"
 
-#: controllers/selling_controller.py:679
+#: controllers/selling_controller.py:703
 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
 msgstr "الصف {0}: لا يمكن أن يكون مستودع التسليم ({1}) ومستودع العميل ({2}) متماثلين"
 
-#: assets/doctype/asset/asset.py:417
+#: assets/doctype/asset/asset.py:419
 msgid "Row {0}: Depreciation Start Date is required"
 msgstr "الصف {0}: تاريخ بداية الإهلاك مطلوب"
 
-#: controllers/accounts_controller.py:2209
+#: controllers/accounts_controller.py:2301
 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
 msgstr "الصف {0}: لا يمكن أن يكون تاريخ الاستحقاق في جدول شروط الدفع قبل تاريخ الترحيل"
 
@@ -60776,28 +61829,28 @@
 msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
 msgstr ""
 
-#: controllers/buying_controller.py:742
+#: controllers/buying_controller.py:767
 msgid "Row {0}: Enter location for the asset item {1}"
 msgstr "الصف {0}: أدخل الموقع لعنصر مادة العرض {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:886
-#: controllers/taxes_and_totals.py:1115
+#: accounts/doctype/journal_entry/journal_entry.py:913
+#: controllers/taxes_and_totals.py:1116
 msgid "Row {0}: Exchange Rate is mandatory"
 msgstr "الصف {0}: سعر صرف إلزامي"
 
-#: assets/doctype/asset/asset.py:408
+#: assets/doctype/asset/asset.py:410
 msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
 msgstr "الصف {0}: القيمة المتوقعة بعد أن تكون الحياة المفيدة أقل من إجمالي مبلغ الشراء"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:523
 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:482
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:486
 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 ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:505
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:509
 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
 msgstr ""
 
@@ -60814,7 +61867,7 @@
 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
 msgstr "الصف {0}: من وقت إلى وقت {1} يتداخل مع {2}"
 
-#: controllers/stock_controller.py:730
+#: controllers/stock_controller.py:913
 msgid "Row {0}: From Warehouse is mandatory for internal transfers"
 msgstr ""
 
@@ -60826,15 +61879,15 @@
 msgid "Row {0}: Hours value must be greater than zero."
 msgstr "صف {0}: يجب أن تكون قيمة الساعات أكبر من الصفر."
 
-#: accounts/doctype/journal_entry/journal_entry.py:665
+#: accounts/doctype/journal_entry/journal_entry.py:692
 msgid "Row {0}: Invalid reference {1}"
 msgstr "الصف {0}: مرجع غير صالحة {1}"
 
-#: controllers/taxes_and_totals.py:128
+#: controllers/taxes_and_totals.py:129
 msgid "Row {0}: Item Tax template updated as per validity and rate applied"
 msgstr ""
 
-#: controllers/buying_controller.py:400 controllers/selling_controller.py:479
+#: controllers/buying_controller.py:400 controllers/selling_controller.py:484
 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer"
 msgstr ""
 
@@ -60846,7 +61899,7 @@
 msgid "Row {0}: Item {1} must be a subcontracted item."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:661
+#: stock/doctype/delivery_note/delivery_note.py:722
 msgid "Row {0}: Packed Qty must be equal to {1} Qty."
 msgstr ""
 
@@ -60854,11 +61907,11 @@
 msgid "Row {0}: Packing Slip is already created for Item {1}."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:687
+#: accounts/doctype/journal_entry/journal_entry.py:714
 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
 msgstr "الصف {0}: حزب / حساب لا يتطابق مع {1} / {2} في {3} {4}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:500
+#: accounts/doctype/journal_entry/journal_entry.py:516
 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}"
 msgstr "الصف {0}: نوع الطرف المعني والطرف المعني مطلوب للحسابات المدينة / الدائنة {0}"
 
@@ -60866,11 +61919,11 @@
 msgid "Row {0}: Payment Term is mandatory"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:554
+#: accounts/doctype/journal_entry/journal_entry.py:570
 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
 msgstr "الصف {0}: الدفع لطلب الشراء/البيع يجب أن يكون دائما معلم كمتقدم\\n<br>\\nRow {0}: Payment against Sales/Purchase Order should always be marked as advance"
 
-#: accounts/doctype/journal_entry/journal_entry.py:547
+#: accounts/doctype/journal_entry/journal_entry.py:563
 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
 msgstr "الصف {0}: يرجى اختيار \"دفعة مقدمة\" مقابل الحساب {1} إذا كان هذا الادخال دفعة مقدمة."
 
@@ -60906,7 +61959,7 @@
 msgid "Row {0}: Project must be same as the one set in the Timesheet: {1}."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:114
 msgid "Row {0}: Purchase Invoice {1} has no stock impact."
 msgstr ""
 
@@ -60914,7 +61967,7 @@
 msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Row {0}: Qty in Stock UOM can not be zero."
 msgstr ""
 
@@ -60922,7 +61975,7 @@
 msgid "Row {0}: Qty must be greater than 0."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:762
+#: stock/doctype/stock_entry/stock_entry.py:717
 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})"
 msgstr "الصف {0}: الكمية غير متوفرة {4} في المستودع {1} في وقت نشر الإدخال ({2} {3})"
 
@@ -60930,15 +61983,15 @@
 msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1170
+#: stock/doctype/stock_entry/stock_entry.py:1179
 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
 msgstr "الصف {0}: العنصر المتعاقد عليه من الباطن إلزامي للمادة الخام {1}"
 
-#: controllers/stock_controller.py:721
+#: controllers/stock_controller.py:904
 msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:450
+#: stock/doctype/stock_entry/stock_entry.py:405
 msgid "Row {0}: The item {1}, quantity must be positive number"
 msgstr "الصف {0}: العنصر {1} ، يجب أن تكون الكمية رقمًا موجبًا"
 
@@ -60946,15 +61999,15 @@
 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:441
+#: assets/doctype/asset/asset.py:443
 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:401
+#: stock/doctype/stock_entry/stock_entry.py:356
 msgid "Row {0}: UOM Conversion Factor is mandatory"
 msgstr "الصف {0}: عامل تحويل UOM إلزامي\\n<br>\\nRow {0}: UOM Conversion Factor is mandatory"
 
-#: controllers/accounts_controller.py:786
+#: controllers/accounts_controller.py:838
 msgid "Row {0}: user has not applied the rule {1} on the item {2}"
 msgstr "الصف {0}: لم يطبق المستخدم القاعدة {1} على العنصر {2}"
 
@@ -60966,15 +62019,19 @@
 msgid "Row {0}: {1} must be greater than 0"
 msgstr "الصف {0}: يجب أن يكون {1} أكبر من 0"
 
-#: controllers/accounts_controller.py:511
+#: controllers/accounts_controller.py:555
 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:701
+#: accounts/doctype/journal_entry/journal_entry.py:728
 msgid "Row {0}: {1} {2} does not match with {3}"
 msgstr "الصف {0}: {1} {2} لا يتطابق مع {3}"
 
-#: controllers/accounts_controller.py:2528
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:87
+msgid "Row {0}: {2} Item {1} does not exist in {2} {3}"
+msgstr ""
+
+#: controllers/accounts_controller.py:2613
 msgid "Row {0}: {3} Account {1} does not belong to Company {2}"
 msgstr ""
 
@@ -60982,7 +62039,7 @@
 msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}."
 msgstr "الصف {1}: لا يمكن أن تكون الكمية ({0}) كسرًا. للسماح بذلك ، قم بتعطيل &#39;{2}&#39; في UOM {3}."
 
-#: controllers/buying_controller.py:726
+#: controllers/buying_controller.py:751
 msgid "Row {}: Asset Naming Series is mandatory for the auto creation for item {}"
 msgstr "الصف {}: سلسلة تسمية الأصول إلزامية للإنشاء التلقائي للعنصر {}"
 
@@ -60994,11 +62051,11 @@
 msgid "Row({0}): {1} is already discounted in {2}"
 msgstr "الصف ({0}): {1} مخصوم بالفعل في {2}"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:193
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:200
 msgid "Rows Added in {0}"
 msgstr "تمت إضافة الصفوف في {0}"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:194
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:201
 msgid "Rows Removed in {0}"
 msgstr "تمت إزالة الصفوف في {0}"
 
@@ -61009,15 +62066,15 @@
 msgid "Rows with Same Account heads will be merged on Ledger"
 msgstr ""
 
-#: controllers/accounts_controller.py:2218
+#: controllers/accounts_controller.py:2310
 msgid "Rows with duplicate due dates in other rows were found: {0}"
 msgstr "تم العثور على صفوف ذات تواريخ استحقاق مكررة في صفوف أخرى: {0}"
 
-#: accounts/doctype/journal_entry/journal_entry.js:61
+#: accounts/doctype/journal_entry/journal_entry.js:115
 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually."
 msgstr ""
 
-#: controllers/accounts_controller.py:211
+#: controllers/accounts_controller.py:221
 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry."
 msgstr ""
 
@@ -61045,6 +62102,12 @@
 msgid "Rule Description"
 msgstr "وصف القاعدة"
 
+#. Description of the 'Job Capacity' (Int) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Run parallel job cards in a workstation"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Process Payment
 #. Reconciliation'
 #: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
@@ -61059,6 +62122,13 @@
 msgid "Running"
 msgstr ""
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Running"
+msgstr ""
+
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:28
 msgid "S.O. No."
 msgstr "S.O. رقم"
@@ -61123,7 +62193,7 @@
 msgid "SLA Paused On"
 msgstr ""
 
-#: public/js/utils.js:1015
+#: public/js/utils.js:1098
 msgid "SLA is on hold since {0}"
 msgstr "اتفاقية مستوى الخدمة معلقة منذ {0}"
 
@@ -61162,6 +62232,10 @@
 msgid "SO Qty"
 msgstr "كمية طلبات الشراء"
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:107
+msgid "SO Total Qty"
+msgstr ""
+
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:16
 msgid "STATEMENTS OF ACCOUNTS"
 msgstr ""
@@ -61256,7 +62330,7 @@
 #: 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:329 setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:328 setup/doctype/company/company.py:491
 #: setup/doctype/company/company_dashboard.py:9
 #: setup/doctype/sales_person/sales_person_dashboard.py:12
 #: setup/setup_wizard/operations/install_fixtures.py:250
@@ -61294,7 +62368,7 @@
 msgid "Sales"
 msgstr "مبيعات"
 
-#: setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:491
 msgid "Sales Account"
 msgstr "حساب مبيعات"
 
@@ -61328,7 +62402,7 @@
 #. Label of a Link in the CRM Workspace
 #. Label of a Link in the Selling Workspace
 #: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:7
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: selling/page/sales_funnel/sales_funnel.js:46
 #: selling/workspace/selling/selling.json
 msgid "Sales Funnel"
 msgstr "هرم المبيعات"
@@ -61339,11 +62413,11 @@
 #: accounts/report/gross_profit/gross_profit.js:30
 #: accounts/report/gross_profit/gross_profit.py:199
 #: accounts/report/gross_profit/gross_profit.py:206
-#: selling/doctype/quotation/quotation_list.js:20
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order_list.js:53
-#: stock/doctype/delivery_note/delivery_note.js:222
-#: stock/doctype/delivery_note/delivery_note_list.js:61
+#: selling/doctype/quotation/quotation_list.js:19
+#: selling/doctype/sales_order/sales_order.js:633
+#: selling/doctype/sales_order/sales_order_list.js:66
+#: stock/doctype/delivery_note/delivery_note.js:266
+#: stock/doctype/delivery_note/delivery_note_list.js:70
 msgid "Sales Invoice"
 msgstr "فاتورة مبيعات"
 
@@ -61493,11 +62567,11 @@
 msgid "Sales Invoice Trends"
 msgstr "اتجاهات فاتورة المبيعات"
 
-#: stock/doctype/delivery_note/delivery_note.py:679
+#: stock/doctype/delivery_note/delivery_note.py:740
 msgid "Sales Invoice {0} has already been submitted"
 msgstr "سبق أن تم ترحيل فاتورة المبيعات {0}"
 
-#: selling/doctype/sales_order/sales_order.py:472
+#: selling/doctype/sales_order/sales_order.py:475
 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order"
 msgstr ""
 
@@ -61531,6 +62605,7 @@
 #: setup/doctype/sales_person/sales_person.json
 #: setup/doctype/territory/territory.json stock/doctype/bin/bin.json
 #: stock/doctype/packing_slip/packing_slip.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 msgid "Sales Manager"
 msgstr "مدير المبيعات"
 
@@ -61560,36 +62635,36 @@
 msgid "Sales Monthly History"
 msgstr "التاريخ الشهري للمبيعات"
 
-#: selling/page/sales_funnel/sales_funnel.js:129
+#: selling/page/sales_funnel/sales_funnel.js:144
 msgid "Sales Opportunities by Source"
 msgstr ""
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: accounts/doctype/sales_invoice/sales_invoice.js:236
+#: 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:421
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:64
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:113
-#: manufacturing/doctype/blanket_order/blanket_order.js:23
+#: controllers/selling_controller.py:422
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:65
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:122
+#: manufacturing/doctype/blanket_order/blanket_order.js:24
 #: manufacturing/doctype/work_order/work_order_calendar.js:32
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:127
 #: manufacturing/report/work_order_summary/work_order_summary.py:217
-#: selling/doctype/quotation/quotation.js:117
+#: selling/doctype/quotation/quotation.js:125
 #: selling/doctype/quotation/quotation_dashboard.py:11
-#: selling/doctype/quotation/quotation_list.js:16
+#: selling/doctype/quotation/quotation_list.js:15
 #: selling/doctype/sales_order/sales_order.json
 #: selling/onboarding_step/sales_order/sales_order.json
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:59
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13
-#: selling/report/sales_order_analysis/sales_order_analysis.js:34
+#: selling/report/sales_order_analysis/sales_order_analysis.js:33
 #: selling/report/sales_order_analysis/sales_order_analysis.py:222
-#: stock/doctype/delivery_note/delivery_note.js:134
-#: stock/doctype/material_request/material_request.js:161
-#: stock/report/delayed_item_report/delayed_item_report.js:31
+#: stock/doctype/delivery_note/delivery_note.js:146
+#: stock/doctype/material_request/material_request.js:190
+#: stock/report/delayed_item_report/delayed_item_report.js:30
 #: stock/report/delayed_item_report/delayed_item_report.py:155
-#: stock/report/delayed_order_report/delayed_order_report.js:31
+#: stock/report/delayed_order_report/delayed_order_report.js:30
 #: stock/report/delayed_order_report/delayed_order_report.py:74
 msgid "Sales Order"
 msgstr "طلب المبيعات"
@@ -61740,8 +62815,8 @@
 msgstr "تاريخ طلب المبيعات"
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:260
-#: selling/doctype/sales_order/sales_order.js:704
+#: selling/doctype/sales_order/sales_order.js:286
+#: selling/doctype/sales_order/sales_order.js:809
 #: selling/doctype/sales_order_item/sales_order_item.json
 msgid "Sales Order Item"
 msgstr "مواد طلب المبيعات"
@@ -61830,11 +62905,11 @@
 msgid "Sales Order required for Item {0}"
 msgstr "طلب البيع مطلوب للبند {0}\\n<br>\\nSales Order required for Item {0}"
 
-#: selling/doctype/sales_order/sales_order.py:258
+#: selling/doctype/sales_order/sales_order.py:261
 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:1142
+#: accounts/doctype/sales_invoice/sales_invoice.py:1149
 msgid "Sales Order {0} is not submitted"
 msgstr "لا يتم اعتماد أمر التوريد {0}\\n<br>\\nSales Order {0} is not submitted"
 
@@ -61842,12 +62917,12 @@
 msgid "Sales Order {0} is not valid"
 msgstr "أمر البيع {0} غير موجود\\n<br>\\nSales Order {0} is not valid"
 
-#: controllers/selling_controller.py:402
+#: controllers/selling_controller.py:403
 #: manufacturing/doctype/work_order/work_order.py:223
 msgid "Sales Order {0} is {1}"
 msgstr "طلب المبيعات {0} هو {1}"
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:42
 msgid "Sales Orders"
 msgstr "أوامر البيع"
 
@@ -61875,14 +62950,14 @@
 msgstr "أوامر المبيعات لتقديم"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:133
-#: accounts/report/accounts_receivable/accounts_receivable.py:1106
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:117
+#: accounts/report/accounts_receivable/accounts_receivable.js:136
+#: accounts/report/accounts_receivable/accounts_receivable.py:1114
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:197
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:74
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:10
+#: 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
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:9
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:8
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:71
 #: setup/doctype/sales_partner/sales_partner.json
 msgid "Sales Partner"
@@ -62025,17 +63100,18 @@
 
 #. Name of a DocType
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:155
-#: accounts/report/accounts_receivable/accounts_receivable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.py:1103
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:123
+#: 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_summary/accounts_receivable_summary.js:126
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:194
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
-#: accounts/report/gross_profit/gross_profit.js:49
+#: 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
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:10
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:115
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:116
 #: setup/doctype/sales_person/sales_person.json
 msgid "Sales Person"
 msgstr "مندوب مبيعات"
@@ -62111,7 +63187,7 @@
 msgstr "ملخص المبيعات بناء على رجل المبيعات"
 
 #. Label of a Card Break in the CRM Workspace
-#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:42
+#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:47
 msgid "Sales Pipeline"
 msgstr "خط أنابيب المبيعات"
 
@@ -62122,7 +63198,7 @@
 msgid "Sales Pipeline Analytics"
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:131
+#: selling/page/sales_funnel/sales_funnel.js:146
 msgid "Sales Pipeline by Stage"
 msgstr ""
 
@@ -62138,14 +63214,14 @@
 msgstr "سجل مبيعات"
 
 #: accounts/report/gross_profit/gross_profit.py:777
-#: stock/doctype/delivery_note/delivery_note.js:175
+#: stock/doctype/delivery_note/delivery_note.js:200
 msgid "Sales Return"
 msgstr "مبيعات المعاده"
 
 #. Name of a DocType
 #: crm/doctype/sales_stage/sales_stage.json
 #: crm/report/lost_opportunity/lost_opportunity.py:51
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:59
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:61
 msgid "Sales Stage"
 msgstr "مرحلة المبيعات"
 
@@ -62165,7 +63241,7 @@
 msgid "Sales Summary"
 msgstr "ملخص المبيعات"
 
-#: setup/doctype/company/company.js:98
+#: setup/doctype/company/company.js:106
 msgid "Sales Tax Template"
 msgstr "قالب ضريبة المبيعات"
 
@@ -62352,6 +63428,7 @@
 #: stock/doctype/delivery_note/delivery_note.json stock/doctype/item/item.json
 #: stock/doctype/packing_slip/packing_slip.json
 #: stock/doctype/price_list/price_list.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
@@ -62411,7 +63488,7 @@
 msgid "Same Item"
 msgstr "نفس البند"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:350
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:404
 msgid "Same item and warehouse combination already entered."
 msgstr ""
 
@@ -62442,7 +63519,7 @@
 msgstr "مستودع الاحتفاظ بالعينات"
 
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: public/js/controllers/transaction.js:2131
+#: public/js/controllers/transaction.js:2174
 msgid "Sample Size"
 msgstr "حجم العينة"
 
@@ -62452,11 +63529,11 @@
 msgid "Sample Size"
 msgstr "حجم العينة"
 
-#: stock/doctype/stock_entry/stock_entry.py:2824
+#: stock/doctype/stock_entry/stock_entry.py:2860
 msgid "Sample quantity {0} cannot be more than received quantity {1}"
 msgstr "كمية العينة {0} لا يمكن أن تكون أكثر من الكمية المستلمة {1}"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:7
 msgid "Sanctioned"
 msgstr "مقرر"
 
@@ -62525,16 +63602,16 @@
 msgid "Saturday"
 msgstr "السبت"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:139
-#: accounts/doctype/journal_entry/journal_entry.js:550
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:118
+#: accounts/doctype/journal_entry/journal_entry.js:619
 #: accounts/doctype/ledger_merge/ledger_merge.js:75
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:252
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:288
-#: public/js/call_popup/call_popup.js:157
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:289
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:325
+#: public/js/call_popup/call_popup.js:169
 msgid "Save"
 msgstr "حفظ"
 
-#: selling/page/point_of_sale/pos_controller.js:176
+#: selling/page/point_of_sale/pos_controller.js:198
 msgid "Save as Draft"
 msgstr "حفظ كمسودة"
 
@@ -62547,7 +63624,7 @@
 msgid "Savings"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:206
+#: public/js/utils/barcode_scanner.js:215
 msgid "Scan Barcode"
 msgstr "مسح الباركود"
 
@@ -62623,7 +63700,7 @@
 msgid "Scan Barcode"
 msgstr "مسح الباركود"
 
-#: public/js/utils/serial_no_batch_selector.js:151
+#: public/js/utils/serial_no_batch_selector.js:154
 msgid "Scan Batch No"
 msgstr ""
 
@@ -62639,11 +63716,11 @@
 msgid "Scan Mode"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:136
+#: public/js/utils/serial_no_batch_selector.js:139
 msgid "Scan Serial No"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:172
+#: public/js/utils/barcode_scanner.js:179
 msgid "Scan barcode for item {0}"
 msgstr ""
 
@@ -62657,7 +63734,7 @@
 msgid "Scanned Cheque"
 msgstr "الممسوحة ضوئيا شيك"
 
-#: public/js/utils/barcode_scanner.js:238
+#: public/js/utils/barcode_scanner.js:247
 msgid "Scanned Quantity"
 msgstr ""
 
@@ -62667,7 +63744,7 @@
 msgid "Schedule"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:240
+#: assets/doctype/asset/asset.js:275
 msgid "Schedule Date"
 msgstr "جدول التسجيل"
 
@@ -62702,7 +63779,7 @@
 msgid "Scheduled"
 msgstr "من المقرر"
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:111
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:118
 msgid "Scheduled Date"
 msgstr "المقرر تاريخ"
 
@@ -62730,7 +63807,7 @@
 msgid "Scheduled Time Logs"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: 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
@@ -62749,7 +63826,7 @@
 msgid "Scheduler is inactive. Cannot enqueue job."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:232
 msgid "Scheduler is inactive. Cannot import data."
 msgstr "المجدول غير نشط. لا يمكن استيراد البيانات."
@@ -62831,7 +63908,7 @@
 msgid "Scrap & Process Loss"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:87
+#: assets/doctype/asset/asset.js:92
 msgid "Scrap Asset"
 msgstr ""
 
@@ -62885,7 +63962,7 @@
 msgid "Scrap Warehouse"
 msgstr "الخردة مستودع"
 
-#: assets/doctype/asset/asset_list.js:17
+#: assets/doctype/asset/asset_list.js:13
 msgid "Scrapped"
 msgstr "ألغت"
 
@@ -62895,7 +63972,7 @@
 msgid "Scrapped"
 msgstr "ألغت"
 
-#: selling/page/point_of_sale/pos_item_selector.js:150
+#: selling/page/point_of_sale/pos_item_selector.js:147
 #: selling/page/point_of_sale/pos_past_order_list.js:51
 #: templates/pages/help.html:14
 msgid "Search"
@@ -62918,7 +63995,7 @@
 msgid "Search Term Param Name"
 msgstr "Search Param Name"
 
-#: selling/page/point_of_sale/pos_item_cart.js:312
+#: selling/page/point_of_sale/pos_item_cart.js:310
 msgid "Search by customer name, phone, email."
 msgstr "البحث عن طريق اسم العميل ، الهاتف ، البريد الإلكتروني."
 
@@ -62926,7 +64003,7 @@
 msgid "Search by invoice id or customer name"
 msgstr "البحث عن طريق معرف الفاتورة أو اسم العميل"
 
-#: selling/page/point_of_sale/pos_item_selector.js:152
+#: selling/page/point_of_sale/pos_item_selector.js:149
 msgid "Search by item code, serial number or barcode"
 msgstr ""
 
@@ -62948,7 +64025,7 @@
 msgid "Secondary Role"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:172
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:117
 msgid "Section Code"
 msgstr "كود القسم"
@@ -62971,8 +64048,13 @@
 msgid "See all open tickets"
 msgstr "شاهد جميع التذاكر المفتوحة"
 
-#: buying/doctype/purchase_order/purchase_order.js:180
-#: selling/doctype/sales_order/sales_order.js:888
+#: stock/report/stock_ledger/stock_ledger.js:104
+msgid "Segregate Serial / Batch Bundle"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:186
+#: selling/doctype/sales_order/sales_order.js:1043
+#: selling/doctype/sales_order/sales_order_list.js:85
 msgid "Select"
 msgstr "حدد"
 
@@ -62980,33 +64062,33 @@
 msgid "Select Accounting Dimension."
 msgstr ""
 
-#: public/js/utils.js:440
+#: public/js/utils.js:487
 msgid "Select Alternate Item"
 msgstr "اختر البند البديل"
 
-#: selling/doctype/quotation/quotation.js:312
+#: selling/doctype/quotation/quotation.js:324
 msgid "Select Alternative Items for Sales Order"
 msgstr ""
 
-#: stock/doctype/item/item.js:518
+#: stock/doctype/item/item.js:585
 msgid "Select Attribute Values"
 msgstr "حدد قيم السمات"
 
-#: selling/doctype/sales_order/sales_order.js:689
+#: selling/doctype/sales_order/sales_order.js:792
 msgid "Select BOM"
 msgstr "حدد مكتب الإدارة"
 
-#: selling/doctype/sales_order/sales_order.js:678
+#: selling/doctype/sales_order/sales_order.js:779
 msgid "Select BOM and Qty for Production"
 msgstr "اختر فاتورة المواد و الكمية للانتاج"
 
-#: selling/doctype/sales_order/sales_order.js:803
+#: selling/doctype/sales_order/sales_order.js:921
 msgid "Select BOM, Qty and For Warehouse"
 msgstr "اختر قائمة المواد، الكمية، وإلى المخزن"
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: selling/page/point_of_sale/pos_item_details.js:212
+#: stock/doctype/pick_list/pick_list.js:352
 msgid "Select Batch No"
 msgstr ""
 
@@ -63022,15 +64104,15 @@
 msgid "Select Billing Address"
 msgstr "اختر عنوان الفواتير"
 
-#: public/js/stock_analytics.js:42
+#: public/js/stock_analytics.js:61
 msgid "Select Brand..."
 msgstr "اختر الماركة ..."
 
-#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/journal_entry/journal_entry.js:123
 msgid "Select Company"
 msgstr "حدد الشركة"
 
-#: manufacturing/doctype/job_card/job_card.js:173
+#: manufacturing/doctype/job_card/job_card.js:193
 msgid "Select Corrective Operation"
 msgstr ""
 
@@ -63040,24 +64122,24 @@
 msgid "Select Customers By"
 msgstr "حدد العملاء حسب"
 
-#: setup/doctype/employee/employee.js:112
+#: setup/doctype/employee/employee.js:115
 msgid "Select Date of Birth. This will validate Employees age and prevent hiring of under-age staff."
 msgstr ""
 
-#: setup/doctype/employee/employee.js:117
+#: setup/doctype/employee/employee.js:122
 msgid "Select Date of joining. It will have impact on the first salary calculation, Leave allocation on pro-rata bases."
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:111
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:131
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:114
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:138
 msgid "Select Default Supplier"
 msgstr "حدد الافتراضي مزود"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:252
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:256
 msgid "Select Difference Account"
 msgstr "حدد حساب الفرق"
 
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:58
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:57
 msgid "Select Dimension"
 msgstr ""
 
@@ -63067,27 +64149,27 @@
 msgid "Select DocType"
 msgstr "حدد نوع المستند"
 
-#: manufacturing/doctype/job_card/job_card.js:246
+#: manufacturing/doctype/job_card/job_card.js:274
 msgid "Select Employees"
 msgstr "حدد الموظفين"
 
-#: buying/doctype/purchase_order/purchase_order.js:170
+#: buying/doctype/purchase_order/purchase_order.js:176
 msgid "Select Finished Good"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:962
+#: selling/doctype/sales_order/sales_order.js:1122
 msgid "Select Items"
 msgstr "اختيار العناصر"
 
-#: selling/doctype/sales_order/sales_order.js:861
+#: selling/doctype/sales_order/sales_order.js:1008
 msgid "Select Items based on Delivery Date"
 msgstr "حدد العناصر بناءً على تاريخ التسليم"
 
-#: public/js/controllers/transaction.js:2159
+#: public/js/controllers/transaction.js:2202
 msgid "Select Items for Quality Inspection"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:820
 msgid "Select Items to Manufacture"
 msgstr "حدد العناصر لتصنيع"
 
@@ -63097,27 +64179,31 @@
 msgid "Select Items to Manufacture"
 msgstr "حدد العناصر لتصنيع"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1038
-#: selling/page/point_of_sale/pos_item_cart.js:888
+#: selling/doctype/sales_order/sales_order_list.js:76
+msgid "Select Items up to Delivery Date"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.js:1114
+#: selling/page/point_of_sale/pos_item_cart.js:920
 msgid "Select Loyalty Program"
 msgstr "اختر برنامج الولاء"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: buying/doctype/request_for_quotation/request_for_quotation.js:366
 msgid "Select Possible Supplier"
 msgstr "اختار المورد المحتمل"
 
-#: manufacturing/doctype/work_order/work_order.js:726
-#: stock/doctype/pick_list/pick_list.js:161
+#: manufacturing/doctype/work_order/work_order.js:781
+#: stock/doctype/pick_list/pick_list.js:192
 msgid "Select Quantity"
 msgstr "إختيار الكمية"
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: 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:328 stock/doctype/pick_list/pick_list.js:321
+#: public/js/utils/sales_common.js:364 stock/doctype/pick_list/pick_list.js:355
 msgid "Select Serial and Batch"
 msgstr ""
 
@@ -63145,40 +64231,40 @@
 msgid "Select Supplier Address"
 msgstr "حدد مزود العناوين"
 
-#: stock/doctype/batch/batch.js:110
+#: stock/doctype/batch/batch.js:127
 msgid "Select Target Warehouse"
 msgstr "حدد مستودع الهدف"
 
-#: www/book_appointment/index.js:69
+#: www/book_appointment/index.js:73
 msgid "Select Time"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:14
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
+#: accounts/report/balance_sheet/balance_sheet.js:10
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:10
 msgid "Select View"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:248
+#: public/js/bank_reconciliation_tool/dialog_manager.js:251
 msgid "Select Vouchers to Match"
 msgstr ""
 
-#: public/js/stock_analytics.js:46
+#: public/js/stock_analytics.js:72
 msgid "Select Warehouse..."
 msgstr "حدد مستودع ..."
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:431
 msgid "Select Warehouses to get Stock for Materials Planning"
 msgstr ""
 
-#: public/js/communication.js:67
+#: public/js/communication.js:80
 msgid "Select a Company"
 msgstr "حدد شركة"
 
-#: setup/doctype/employee/employee.js:107
+#: setup/doctype/employee/employee.js:110
 msgid "Select a Company this Employee belongs to."
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:160
+#: buying/doctype/supplier/supplier.js:188
 msgid "Select a Customer"
 msgstr ""
 
@@ -63186,19 +64272,19 @@
 msgid "Select a Default Priority."
 msgstr "حدد أولوية افتراضية."
 
-#: selling/doctype/customer/customer.js:205
+#: selling/doctype/customer/customer.js:221
 msgid "Select a Supplier"
 msgstr "حدد المورد"
 
-#: stock/doctype/material_request/material_request.js:297
+#: stock/doctype/material_request/material_request.js:365
 msgid "Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only."
 msgstr "حدد موردًا من الموردين الافتراضيين للعناصر أدناه. عند التحديد ، سيتم إجراء طلب الشراء مقابل العناصر التي تنتمي إلى المورد المحدد فقط."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:156
 msgid "Select a company"
 msgstr "اختر شركة"
 
-#: stock/doctype/item/item.js:809
+#: stock/doctype/item/item.js:889
 msgid "Select an Item Group."
 msgstr ""
 
@@ -63206,15 +64292,19 @@
 msgid "Select an account to print in account currency"
 msgstr "حدد حسابا للطباعة بعملة الحساب"
 
-#: selling/doctype/quotation/quotation.js:327
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
+msgid "Select an invoice to load summary data"
+msgstr ""
+
+#: selling/doctype/quotation/quotation.js:339
 msgid "Select an item from each set to be used in the Sales Order."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
-msgid "Select change amount account"
-msgstr "تحديد تغيير حساب المبلغ\\n<br>\\nSelect change amount account"
+#: stock/doctype/item/item.js:590
+msgid "Select at least one value from each of the attributes."
+msgstr ""
 
-#: public/js/utils/party.js:305
+#: public/js/utils/party.js:352
 msgid "Select company first"
 msgstr "اختر الشركة أولا"
 
@@ -63225,15 +64315,15 @@
 msgid "Select company name first."
 msgstr "حدد اسم الشركة الأول."
 
-#: controllers/accounts_controller.py:2394
+#: controllers/accounts_controller.py:2486
 msgid "Select finance book for the item {0} at row {1}"
 msgstr "حدد دفتر تمويل للعنصر {0} في الصف {1}"
 
-#: selling/page/point_of_sale/pos_item_selector.js:162
+#: selling/page/point_of_sale/pos_item_selector.js:159
 msgid "Select item group"
 msgstr "حدد مجموعة العناصر"
 
-#: manufacturing/doctype/bom/bom.js:293
+#: manufacturing/doctype/bom/bom.js:306
 msgid "Select template item"
 msgstr "حدد عنصر القالب"
 
@@ -63247,16 +64337,16 @@
 msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:807
+#: manufacturing/doctype/work_order/work_order.js:866
 msgid "Select the Item to be manufactured."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:725
+#: manufacturing/doctype/bom/bom.js:754
 msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:294
-#: manufacturing/doctype/production_plan/production_plan.js:305
+#: manufacturing/doctype/production_plan/production_plan.js:319
+#: manufacturing/doctype/production_plan/production_plan.js:332
 msgid "Select the Warehouse"
 msgstr ""
 
@@ -63268,15 +64358,15 @@
 msgid "Select the date and your timezone"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:740
+#: manufacturing/doctype/bom/bom.js:773
 msgid "Select the raw materials (Items) required to manufacture the Item"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:338
+#: manufacturing/doctype/bom/bom.js:353
 msgid "Select variant item code for the template item {0}"
 msgstr "حدد رمز عنصر متغير لعنصر النموذج {0}"
 
-#: manufacturing/doctype/production_plan/production_plan.js:525
+#: manufacturing/doctype/production_plan/production_plan.js:565
 msgid "Select whether to get items from a Sales Order or a Material Request. For now select <b>Sales Order</b>.\n"
 " A Production Plan can also be created manually where you can select the Items to manufacture."
 msgstr ""
@@ -63296,7 +64386,7 @@
 msgid "Selected POS Opening Entry should be open."
 msgstr "يجب أن يكون الإدخال الافتتاحي المحدد لنقاط البيع مفتوحًا."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2192
+#: accounts/doctype/sales_invoice/sales_invoice.py:2161
 msgid "Selected Price List should have buying and selling fields checked."
 msgstr "قائمة الأسعار المختارة يجب أن يكون لديها حقول بيع وشراء محددة."
 
@@ -63310,7 +64400,7 @@
 msgid "Selected date is"
 msgstr ""
 
-#: public/js/bulk_transaction_processing.js:26
+#: public/js/bulk_transaction_processing.js:34
 msgid "Selected document must be in submitted state"
 msgstr ""
 
@@ -63325,7 +64415,7 @@
 msgid "Sell"
 msgstr "باع"
 
-#: assets/doctype/asset/asset.js:91
+#: assets/doctype/asset/asset.js:100
 msgid "Sell Asset"
 msgstr ""
 
@@ -63455,7 +64545,7 @@
 msgid "Send Emails"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:46
+#: buying/doctype/request_for_quotation/request_for_quotation.js:53
 msgid "Send Emails to Suppliers"
 msgstr "إرسال رسائل البريد الإلكتروني إلى الموردين"
 
@@ -63463,7 +64553,7 @@
 msgid "Send Now"
 msgstr "أرسل الآن"
 
-#: public/js/controllers/transaction.js:440
+#: public/js/controllers/transaction.js:479
 msgid "Send SMS"
 msgstr "SMS أرسل رسالة"
 
@@ -63485,6 +64575,11 @@
 msgid "Send To Primary Contact"
 msgstr "أرسل إلى جهة الاتصال الأساسية"
 
+#. Description of a DocType
+#: setup/doctype/email_digest/email_digest.json
+msgid "Send regular summary reports via Email."
+msgstr ""
+
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
@@ -63515,7 +64610,7 @@
 msgid "Sender"
 msgstr "مرسل"
 
-#: accounts/doctype/payment_request/payment_request.js:35
+#: accounts/doctype/payment_request/payment_request.js:44
 msgid "Sending"
 msgstr "إرسال"
 
@@ -63537,7 +64632,7 @@
 msgid "Sequence ID"
 msgstr "معرف التسلسل"
 
-#: manufacturing/doctype/work_order/work_order.js:262
+#: manufacturing/doctype/work_order/work_order.js:277
 msgid "Sequence Id"
 msgstr ""
 
@@ -63588,26 +64683,26 @@
 msgid "Serial / Batch No"
 msgstr ""
 
-#: public/js/utils.js:124
+#: public/js/utils.js:153
 msgid "Serial / Batch Nos"
 msgstr ""
 
 #. Name of a DocType
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:73
+#: 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:2144
-#: public/js/utils/serial_no_batch_selector.js:350
+#: public/js/controllers/transaction.js:2187
+#: 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/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_no_ledger/serial_no_ledger.js:39
+#: 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:246
+#: stock/report/stock_ledger/stock_ledger.py:319
 msgid "Serial No"
 msgstr "رقم المسلسل"
 
-#. Label of a Small Text field in DocType 'Asset Capitalization Stock Item'
+#. Label of a Text field in DocType 'Asset Capitalization Stock Item'
 #: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
 msgctxt "Asset Capitalization Stock Item"
 msgid "Serial No"
@@ -63655,7 +64750,7 @@
 msgid "Serial No"
 msgstr "رقم المسلسل"
 
-#. Label of a Small Text field in DocType 'POS Invoice Item'
+#. Label of a Text field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
 msgid "Serial No"
@@ -63691,7 +64786,7 @@
 msgid "Serial No"
 msgstr "رقم المسلسل"
 
-#. Label of a Small Text field in DocType 'Sales Invoice Item'
+#. Label of a Text field in DocType 'Sales Invoice Item'
 #: accounts/doctype/sales_invoice_item/sales_invoice_item.json
 msgctxt "Sales Invoice Item"
 msgid "Serial No"
@@ -63712,7 +64807,7 @@
 msgid "Serial No"
 msgstr "رقم المسلسل"
 
-#. Label of a Small Text field in DocType 'Stock Entry Detail'
+#. Label of a Text field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
 msgid "Serial No"
@@ -63807,7 +64902,7 @@
 msgid "Serial No and Batch for Finished Good"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:572
 msgid "Serial No is mandatory"
 msgstr ""
 
@@ -63815,11 +64910,11 @@
 msgid "Serial No is mandatory for Item {0}"
 msgstr "رقم المسلسل إلزامي القطعة ل {0}"
 
-#: public/js/utils/serial_no_batch_selector.js:480
+#: public/js/utils/serial_no_batch_selector.js:488
 msgid "Serial No {0} already exists"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:311
+#: public/js/utils/barcode_scanner.js:321
 msgid "Serial No {0} already scanned"
 msgstr ""
 
@@ -63836,16 +64931,11 @@
 msgid "Serial No {0} does not exist"
 msgstr "الرقم المتسلسل {0} غير موجود\\n<br>\\nSerial No {0} does not exist"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2112
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2131
 msgid "Serial No {0} does not exists"
 msgstr ""
 
 #: public/js/utils/barcode_scanner.js:402
-msgid "Serial No {0} has already scanned."
-msgstr ""
-
-#: public/js/utils/barcode_scanner.js:499
-#: public/js/utils/barcode_scanner.js:506
 msgid "Serial No {0} is already added"
 msgstr ""
 
@@ -63861,23 +64951,23 @@
 msgid "Serial No {0} not found"
 msgstr "لم يتم العثور علي الرقم التسلسلي {0}\\n<br>\\nSerial No {0} not found"
 
-#: selling/page/point_of_sale/pos_controller.js:695
+#: selling/page/point_of_sale/pos_controller.js:734
 msgid "Serial No: {0} has already been transacted into another POS Invoice."
 msgstr "الرقم التسلسلي: تم بالفعل معاملة {0} في فاتورة نقطة بيع أخرى."
 
-#: public/js/utils/barcode_scanner.js:262
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/barcode_scanner.js:271
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Serial Nos"
 msgstr ""
 
 #: public/js/utils/serial_no_batch_selector.js:20
-#: public/js/utils/serial_no_batch_selector.js:183
+#: public/js/utils/serial_no_batch_selector.js:185
 msgid "Serial Nos / Batch Nos"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1692
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:157
 msgid "Serial Nos Mismatch"
 msgstr ""
 
@@ -63887,11 +64977,11 @@
 msgid "Serial Nos and Batches"
 msgstr "الرقم التسلسلي ودفعات"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1074
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1081
 msgid "Serial Nos are created successfully"
 msgstr ""
 
-#: stock/stock_ledger.py:1972
+#: stock/stock_ledger.py:1979
 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
 msgstr ""
 
@@ -63917,7 +65007,7 @@
 #. Name of a DocType
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:80
-#: stock/report/stock_ledger/stock_ledger.py:253
+#: stock/report/stock_ledger/stock_ledger.py:326
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:154
 msgid "Serial and Batch Bundle"
 msgstr ""
@@ -64012,14 +65102,18 @@
 msgid "Serial and Batch Bundle"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1253
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1260
 msgid "Serial and Batch Bundle created"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1295
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1309
 msgid "Serial and Batch Bundle updated"
 msgstr ""
 
+#: controllers/stock_controller.py:82
+msgid "Serial and Batch Bundle {0} is already used in {1} {2}."
+msgstr ""
+
 #. Label of a Section Break field in DocType 'Subcontracting Receipt Item'
 #: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
 msgctxt "Subcontracting Receipt Item"
@@ -64043,7 +65137,7 @@
 msgid "Serial and Batch No"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:51
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:49
 msgid "Serial and Batch Nos"
 msgstr ""
 
@@ -64071,11 +65165,11 @@
 msgid "Serial and Batch Summary"
 msgstr ""
 
-#: stock/utils.py:427
+#: stock/utils.py:422
 msgid "Serial number {0} entered more than once"
 msgstr "الرقم التسلسلي {0} دخلت أكثر من مرة"
 
-#: accounts/doctype/journal_entry/journal_entry.js:545
+#: accounts/doctype/journal_entry/journal_entry.js:611
 msgid "Series"
 msgstr "سلسلة التسمية"
 
@@ -64533,7 +65627,7 @@
 msgid "Service Level Agreement has been changed to {0}."
 msgstr "تم تغيير اتفاقية مستوى الخدمة إلى {0}."
 
-#: support/doctype/issue/issue.js:67
+#: support/doctype/issue/issue.js:77
 msgid "Service Level Agreement was reset."
 msgstr "تمت إعادة ضبط اتفاقية مستوى الخدمة."
 
@@ -64614,11 +65708,11 @@
 msgid "Service Stop Date"
 msgstr "تاريخ توقف الخدمة"
 
-#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1239
+#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1298
 msgid "Service Stop Date cannot be after Service End Date"
 msgstr "لا يمكن أن يكون تاريخ إيقاف الخدمة بعد تاريخ انتهاء الخدمة"
 
-#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1236
+#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1295
 msgid "Service Stop Date cannot be before Service Start Date"
 msgstr "لا يمكن أن يكون تاريخ إيقاف الخدمة قبل تاريخ بدء الخدمة"
 
@@ -64651,7 +65745,7 @@
 msgid "Set Basic Rate Manually"
 msgstr "قم بتعيين السعر الأساسي يدويًا"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:150
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:157
 msgid "Set Default Supplier"
 msgstr ""
 
@@ -64692,11 +65786,11 @@
 msgid "Set Landed Cost Based on Purchase Invoice Rate"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1050
+#: accounts/doctype/sales_invoice/sales_invoice.js:1126
 msgid "Set Loyalty Program"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:272
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:309
 msgid "Set New Release Date"
 msgstr "تعيين تاريخ الإصدار الجديد"
 
@@ -64712,27 +65806,31 @@
 msgid "Set Operating Cost Based On BOM Quantity"
 msgstr ""
 
+#: buying/doctype/request_for_quotation/request_for_quotation.py:264
+msgid "Set Password"
+msgstr "تعيين كلمة المرور"
+
 #. Label of a Check field in DocType 'POS Opening Entry'
 #: accounts/doctype/pos_opening_entry/pos_opening_entry.json
 msgctxt "POS Opening Entry"
 msgid "Set Posting Date"
 msgstr "حدد تاريخ النشر"
 
-#: manufacturing/doctype/bom/bom.js:767
+#: manufacturing/doctype/bom/bom.js:800
 msgid "Set Process Loss Item Quantity"
 msgstr ""
 
-#: projects/doctype/project/project.js:116
-#: projects/doctype/project/project.js:118
-#: projects/doctype/project/project.js:132
+#: projects/doctype/project/project.js:140
+#: projects/doctype/project/project.js:143
+#: projects/doctype/project/project.js:157
 msgid "Set Project Status"
 msgstr ""
 
-#: projects/doctype/project/project.js:154
+#: projects/doctype/project/project.js:182
 msgid "Set Project and all Tasks to status {0}?"
 msgstr "عيّن Project وجميع المهام إلى الحالة {0}؟"
 
-#: manufacturing/doctype/bom/bom.js:768
+#: manufacturing/doctype/bom/bom.js:801
 msgid "Set Quantity"
 msgstr "ضبط الكمية"
 
@@ -64812,7 +65910,7 @@
 msgid "Set Valuation Rate Based on Source Warehouse"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:184
+#: selling/doctype/sales_order/sales_order.js:207
 msgid "Set Warehouse"
 msgstr ""
 
@@ -64821,25 +65919,25 @@
 msgid "Set as Closed"
 msgstr "على النحو مغلق"
 
-#: projects/doctype/task/task_list.js:12
+#: projects/doctype/task/task_list.js:20
 msgid "Set as Completed"
 msgstr "تعيين كـ مكتمل"
 
-#: public/js/utils/sales_common.js:406
-#: selling/doctype/quotation/quotation.js:124
+#: public/js/utils/sales_common.js:462
+#: selling/doctype/quotation/quotation.js:129
 msgid "Set as Lost"
 msgstr "على النحو المفقودة"
 
 #: crm/doctype/opportunity/opportunity_list.js:13
-#: projects/doctype/task/task_list.js:8 support/doctype/issue/issue_list.js:8
+#: projects/doctype/task/task_list.js:16 support/doctype/issue/issue_list.js:8
 msgid "Set as Open"
 msgstr "على النحو المفتوحة"
 
-#: setup/doctype/company/company.py:419
+#: setup/doctype/company/company.py:418
 msgid "Set default inventory account for perpetual inventory"
 msgstr "تعيين حساب المخزون الافتراضي للمخزون الدائم"
 
-#: setup/doctype/company/company.py:429
+#: setup/doctype/company/company.py:428
 msgid "Set default {0} account for non stock items"
 msgstr ""
 
@@ -64850,7 +65948,7 @@
 msgid "Set fieldname from which you want to fetch the data from the parent form."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:757
+#: manufacturing/doctype/bom/bom.js:790
 msgid "Set quantity of process loss item:"
 msgstr ""
 
@@ -64867,7 +65965,7 @@
 msgid "Set targets Item Group-wise for this Sales Person."
 msgstr "تحديد أهداف المجموعة السلعة الحكيم لهذا الشخص المبيعات."
 
-#: manufacturing/doctype/work_order/work_order.js:852
+#: manufacturing/doctype/work_order/work_order.js:923
 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
 msgstr ""
 
@@ -64889,15 +65987,15 @@
 msgid "Set up your Warehouse"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:672
+#: assets/doctype/asset/asset.py:674
 msgid "Set {0} in asset category {1} for company {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:953
+#: assets/doctype/asset/asset.py:957
 msgid "Set {0} in asset category {1} or company {2}"
 msgstr "تعيين {0} في فئة الأصول {1} أو الشركة {2}"
 
-#: assets/doctype/asset/asset.py:949
+#: assets/doctype/asset/asset.py:953
 msgid "Set {0} in company {1}"
 msgstr "قم بتعيين {0} في الشركة {1}"
 
@@ -64978,7 +66076,7 @@
 msgstr "تأسيس شركة"
 
 #: manufacturing/doctype/bom/bom.py:956
-#: manufacturing/doctype/work_order/work_order.py:978
+#: manufacturing/doctype/work_order/work_order.py:992
 msgid "Setting {} is required"
 msgstr ""
 
@@ -65011,7 +66109,13 @@
 msgid "Settings"
 msgstr "إعدادات"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:15
+#. Description of a DocType
+#: crm/doctype/crm_settings/crm_settings.json
+#: selling/doctype/selling_settings/selling_settings.json
+msgid "Settings for Selling Module"
+msgstr ""
+
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:11
 msgid "Settled"
 msgstr "تسوية"
 
@@ -65027,6 +66131,12 @@
 msgid "Settled"
 msgstr "تسوية"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Setup"
+msgstr "الإعدادات"
+
 #. Title of an Onboarding Step
 #: setup/onboarding_step/letterhead/letterhead.json
 msgid "Setup Your Letterhead"
@@ -65045,7 +66155,7 @@
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
 #: accounts/doctype/share_balance/share_balance.json
-#: accounts/doctype/shareholder/shareholder.js:22
+#: accounts/doctype/shareholder/shareholder.js:21
 #: accounts/report/share_balance/share_balance.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Balance"
@@ -65060,7 +66170,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/shareholder/shareholder.js:28
+#: accounts/doctype/shareholder/shareholder.js:27
 #: accounts/report/share_ledger/share_ledger.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Ledger"
@@ -65104,9 +66214,9 @@
 
 #. Name of a DocType
 #: accounts/doctype/shareholder/shareholder.json
-#: accounts/report/share_balance/share_balance.js:17
+#: accounts/report/share_balance/share_balance.js:16
 #: accounts/report/share_balance/share_balance.py:57
-#: accounts/report/share_ledger/share_ledger.js:17
+#: accounts/report/share_ledger/share_ledger.js:16
 #: accounts/report/share_ledger/share_ledger.py:51
 msgid "Shareholder"
 msgstr "المساهم"
@@ -65123,7 +66233,7 @@
 msgid "Shelf Life In Days"
 msgstr "العمر الافتراضي في الأيام"
 
-#: assets/doctype/asset/asset.js:247
+#: assets/doctype/asset/asset.js:288
 msgid "Shift"
 msgstr ""
 
@@ -65146,7 +66256,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:166
+#: stock/doctype/delivery_note/delivery_note.js:181
 #: stock/doctype/shipment/shipment.json
 msgid "Shipment"
 msgstr ""
@@ -65214,7 +66324,7 @@
 msgid "Shipment details"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:846
+#: stock/doctype/delivery_note/delivery_note.py:907
 msgid "Shipments"
 msgstr "شحنات"
 
@@ -65562,31 +66672,35 @@
 msgid "Show Cancelled Entries"
 msgstr "إظهار الإدخالات الملغاة"
 
-#: templates/pages/projects.js:64
+#: templates/pages/projects.js:61
 msgid "Show Completed"
 msgstr "عرض مكتمل"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:107
+#: accounts/report/budget_variance_report/budget_variance_report.js:105
 msgid "Show Cumulative Amount"
 msgstr "إظهار المبلغ التراكمي"
 
-#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:17
+#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:16
 msgid "Show Disabled Warehouses"
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:306
+msgid "Show Document"
+msgstr "عرض المستند"
+
 #. Label of a Check field in DocType 'Bank Statement Import'
 #: accounts/doctype/bank_statement_import/bank_statement_import.json
 msgctxt "Bank Statement Import"
 msgid "Show Failed Logs"
 msgstr "إظهار السجلات الفاشلة"
 
-#: accounts/report/accounts_payable/accounts_payable.js:144
-#: accounts/report/accounts_receivable/accounts_receivable.js:161
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:134
+#: accounts/report/accounts_payable/accounts_payable.js:147
+#: accounts/report/accounts_receivable/accounts_receivable.js:164
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:137
 msgid "Show Future Payments"
 msgstr "إظهار المدفوعات المستقبلية"
 
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:139
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:142
 msgid "Show GL Balance"
 msgstr ""
 
@@ -65619,7 +66733,7 @@
 msgid "Show Ledger View"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:166
+#: accounts/report/accounts_receivable/accounts_receivable.js:169
 msgid "Show Linked Delivery Notes"
 msgstr "إظهار ملاحظات التسليم المرتبطة"
 
@@ -65633,7 +66747,7 @@
 msgid "Show Net Values in Party Account"
 msgstr ""
 
-#: templates/pages/projects.js:66
+#: templates/pages/projects.js:63
 msgid "Show Open"
 msgstr "عرض مفتوح"
 
@@ -65667,18 +66781,18 @@
 msgid "Show Preview"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.js:176
+#: accounts/report/accounts_payable/accounts_payable.js:142
+#: accounts/report/accounts_receivable/accounts_receivable.js:179
 #: accounts/report/general_ledger/general_ledger.js:204
 msgid "Show Remarks"
 msgstr ""
 
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:66
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:65
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:65
 msgid "Show Return Entries"
 msgstr "إظهار إرجاع الإدخالات"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:171
+#: accounts/report/accounts_receivable/accounts_receivable.js:174
 msgid "Show Sales Person"
 msgstr "عرض شخص المبيعات"
 
@@ -65692,11 +66806,16 @@
 msgid "Show Taxes as Table in Print"
 msgstr ""
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:456
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:296
+msgid "Show Traceback"
+msgstr ""
+
 #: stock/report/stock_balance/stock_balance.js:90
 msgid "Show Variant Attributes"
 msgstr "عرض سمات متغير"
 
-#: stock/doctype/item/item.js:90
+#: stock/doctype/item/item.js:106
 msgid "Show Variants"
 msgstr "اظهار المتغيرات"
 
@@ -65704,8 +66823,8 @@
 msgid "Show Warehouse-wise Stock"
 msgstr "عرض المستودع الحكيمة"
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:29
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:17
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:28
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:19
 msgid "Show exploded view"
 msgstr "عرض عرض انفجرت"
 
@@ -65715,7 +66834,7 @@
 msgid "Show in Website"
 msgstr "عرض في الموقع"
 
-#: accounts/report/trial_balance/trial_balance.js:104
+#: accounts/report/trial_balance/trial_balance.js:110
 msgid "Show net values in opening and closing columns"
 msgstr ""
 
@@ -65723,30 +66842,30 @@
 msgid "Show only POS"
 msgstr "إظهار نقاط البيع فقط"
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:108
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:106
 msgid "Show only the Immediate Upcoming Term"
 msgstr ""
 
-#: stock/utils.py:588
+#: stock/utils.py:583
 msgid "Show pending entries"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.js:93
+#: accounts/report/trial_balance/trial_balance.js:99
 msgid "Show unclosed fiscal year's P&L balances"
 msgstr "تظهر P &amp; L أرصدة السنة المالية غير مغلق ل"
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:96
 msgid "Show with upcoming revenue/expense"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:113
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:137
 #: accounts/report/profitability_analysis/profitability_analysis.js:71
-#: accounts/report/trial_balance/trial_balance.js:88
+#: accounts/report/trial_balance/trial_balance.js:94
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:85
 msgid "Show zero values"
 msgstr "إظهار القيم صفر"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.js:30
+#: accounts/doctype/accounting_dimension/accounting_dimension.js:35
 msgid "Show {0}"
 msgstr "عرض {0}"
 
@@ -65830,7 +66949,7 @@
 msgid "Simultaneous"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:551
+#: stock/doctype/stock_entry/stock_entry.py:506
 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 ""
 
@@ -65853,7 +66972,7 @@
 msgid "Single Transaction Threshold"
 msgstr "عتبة معاملة واحدة"
 
-#: stock/doctype/item/item.js:103
+#: stock/doctype/item/item.js:131
 msgid "Single Variant"
 msgstr "متغير واحد"
 
@@ -65889,7 +67008,7 @@
 msgid "Skipping Tax Withholding Category {0} as there is no associated account set for Company {1} in it."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:49
 msgid "Skipping {0} of {1}, {2}"
 msgstr ""
 
@@ -65903,7 +67022,7 @@
 msgid "Small"
 msgstr "صغير"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:68
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:67
 msgid "Smoothing Constant"
 msgstr "تجانس ثابت"
 
@@ -65912,7 +67031,7 @@
 msgid "Software"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:11
+#: assets/doctype/asset/asset_list.js:9
 msgid "Sold"
 msgstr "تم البيع"
 
@@ -65922,24 +67041,29 @@
 msgid "Sold"
 msgstr "تم البيع"
 
-#: www/book_appointment/index.js:239
+#: selling/page/point_of_sale/pos_past_order_summary.js:80
+msgid "Sold by"
+msgstr ""
+
+#: www/book_appointment/index.js:248
 msgid "Something went wrong please try again"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:747
+#: accounts/doctype/pricing_rule/utils.py:746
 msgid "Sorry, this coupon code is no longer valid"
 msgstr "عذرا ، رمز القسيمة هذا لم يعد صالحًا"
 
-#: accounts/doctype/pricing_rule/utils.py:745
+#: accounts/doctype/pricing_rule/utils.py:744
 msgid "Sorry, this coupon code's validity has expired"
 msgstr "عذرا ، لقد انتهت صلاحية رمز القسيمة"
 
-#: accounts/doctype/pricing_rule/utils.py:742
+#: accounts/doctype/pricing_rule/utils.py:741
 msgid "Sorry, this coupon code's validity has not started"
 msgstr "عذرًا ، لم تبدأ صلاحية رمز القسيمة"
 
 #: crm/report/lead_details/lead_details.py:40
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:38
+#: templates/form_grid/stock_entry_grid.html:29
 msgid "Source"
 msgstr "المصدر"
 
@@ -66045,10 +67169,10 @@
 msgid "Source Type"
 msgstr "نوع المصدر"
 
-#: manufacturing/doctype/bom/bom.js:313
+#: manufacturing/doctype/bom/bom.js:326
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:126
-#: stock/dashboard/item_dashboard.js:215
-#: stock/doctype/stock_entry/stock_entry.js:547
+#: stock/dashboard/item_dashboard.js:223
+#: stock/doctype/stock_entry/stock_entry.js:627
 msgid "Source Warehouse"
 msgstr "مصدر مستودع"
 
@@ -66123,11 +67247,11 @@
 msgid "Source and Target Location cannot be same"
 msgstr "لا يمكن أن يكون المصدر و الموقع الهدف نفسه"
 
-#: stock/doctype/stock_entry/stock_entry.py:640
+#: stock/doctype/stock_entry/stock_entry.py:595
 msgid "Source and target warehouse cannot be same for row {0}"
 msgstr "المصدر والمستودع المستهدف لا يمكن أن يكون نفس الصف {0}\\n<br>\\nSource and target warehouse cannot be same for row {0}"
 
-#: stock/dashboard/item_dashboard.js:278
+#: stock/dashboard/item_dashboard.js:286
 msgid "Source and target warehouse must be different"
 msgstr "ويجب أن تكون مصدر ومستودع الهدف مختلفة"
 
@@ -66136,8 +67260,8 @@
 msgid "Source of Funds (Liabilities)"
 msgstr "(مصدر الأموال  (الخصوم"
 
-#: stock/doctype/stock_entry/stock_entry.py:617
-#: stock/doctype/stock_entry/stock_entry.py:634
+#: stock/doctype/stock_entry/stock_entry.py:572
+#: stock/doctype/stock_entry/stock_entry.py:589
 msgid "Source warehouse is mandatory for row {0}"
 msgstr "مستودع المصدر إلزامي للصف {0}\\n<br>\\nSource warehouse is mandatory for row {0}"
 
@@ -66175,16 +67299,26 @@
 msgid "Spacer"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:467 stock/doctype/batch/batch.js:143
-#: support/doctype/issue/issue.js:100
+#. Description of a DocType
+#: setup/doctype/currency_exchange/currency_exchange.json
+msgid "Specify Exchange Rate to convert one currency into another"
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/shipping_rule/shipping_rule.json
+msgid "Specify conditions to calculate shipping amount"
+msgstr ""
+
+#: assets/doctype/asset/asset.js:540 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:162 support/doctype/issue/issue.js:112
 msgid "Split"
 msgstr "انشق، مزق"
 
-#: assets/doctype/asset/asset.js:111 assets/doctype/asset/asset.js:451
+#: assets/doctype/asset/asset.js:135 assets/doctype/asset/asset.js:524
 msgid "Split Asset"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:142
+#: stock/doctype/batch/batch.js:161
 msgid "Split Batch"
 msgstr "تقسيم دفعة"
 
@@ -66201,19 +67335,19 @@
 msgid "Split From"
 msgstr ""
 
-#: support/doctype/issue/issue.js:90
+#: support/doctype/issue/issue.js:100
 msgid "Split Issue"
 msgstr "تقسيم القضية"
 
-#: assets/doctype/asset/asset.js:457
+#: assets/doctype/asset/asset.js:530
 msgid "Split Qty"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1050
+#: assets/doctype/asset/asset.py:1054
 msgid "Split qty cannot be grater than or equal to asset qty"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1827
+#: accounts/doctype/payment_entry/payment_entry.py:1846
 msgid "Splitting {0} {1} into {2} rows as per Payment Terms"
 msgstr ""
 
@@ -66276,11 +67410,26 @@
 msgid "Standard Template"
 msgstr "قالب قياسي"
 
+#. Description of a DocType
+#: setup/doctype/terms_and_conditions/terms_and_conditions.json
+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
 msgid "Standard rated supplies in {0}"
 msgstr ""
 
+#. Description of a DocType
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Purchase Transactions. This template can contain a list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\", etc."
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Sales Transactions. This template can contain a list of tax heads and also other expense/income heads like \"Shipping\", \"Insurance\", \"Handling\" etc."
+msgstr ""
+
 #. Label of a Link field in DocType 'Supplier Scorecard Scoring Standing'
 #: buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
 msgctxt "Supplier Scorecard Scoring Standing"
@@ -66293,23 +67442,25 @@
 msgid "Standing Name"
 msgstr "اسم الدائمة"
 
-#: manufacturing/doctype/work_order/work_order.js:591
+#: manufacturing/doctype/work_order/work_order.js:630
+#: manufacturing/doctype/workstation/workstation_job_card.html:67
+#: public/js/projects/timer.js:32
 msgid "Start"
 msgstr "بداية"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:44
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:43
 msgid "Start / Resume"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:34
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:34
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:42
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:42
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:16
-#: accounts/report/payment_ledger/payment_ledger.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:68
+#: accounts/report/payment_ledger/payment_ledger.js:16
+#: assets/report/fixed_asset_register/fixed_asset_register.js:67
 #: projects/report/project_summary/project_summary.py:70
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
-#: public/js/financial_statements.js:184
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:17
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:47
+#: public/js/financial_statements.js:193
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:16
 msgid "Start Date"
 msgstr "تاريخ البدء"
 
@@ -66383,11 +67534,16 @@
 msgid "Start Date cannot be before the current date"
 msgstr "لا يمكن أن يكون تاريخ البدء قبل التاريخ الحالي"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:133
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
+msgid "Start Deletion"
+msgstr ""
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 msgid "Start Import"
 msgstr "بدء الاستيراد"
 
-#: manufacturing/doctype/job_card/job_card.js:244
+#: manufacturing/doctype/job_card/job_card.js:269
+#: manufacturing/doctype/workstation/workstation.js:190
 msgid "Start Job"
 msgstr ""
 
@@ -66395,10 +67551,14 @@
 msgid "Start Merge"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:85
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:95
 msgid "Start Reposting"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation.js:159
+msgid "Start Time"
+msgstr "بداية الوقت"
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -66427,11 +67587,11 @@
 msgid "Start Time can't be greater than or equal to End Time for {0}."
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:48
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:48
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:56
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
 #: accounts/report/financial_ratios/financial_ratios.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:82
-#: public/js/financial_statements.js:198
+#: assets/report/fixed_asset_register/fixed_asset_register.js:81
+#: public/js/financial_statements.js:207
 msgid "Start Year"
 msgstr "بداية السنة"
 
@@ -66465,7 +67625,7 @@
 msgid "Started Time"
 msgstr "وقت البدء"
 
-#: utilities/bulk_transaction.py:19
+#: utilities/bulk_transaction.py:22
 msgid "Started a background job to create {1} {0}"
 msgstr ""
 
@@ -66482,7 +67642,7 @@
 msgstr "بدءا من موقف من أعلى الحافة"
 
 #: crm/report/lead_details/lead_details.py:59
-#: public/js/utils/contact_address_quick_entry.js:81
+#: public/js/utils/contact_address_quick_entry.js:84
 msgid "State"
 msgstr "حالة"
 
@@ -66510,68 +67670,76 @@
 msgid "Statement Import Log"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:17
+#: accounts/report/general_ledger/general_ledger.html:1
+msgid "Statement of Account"
+msgstr ""
+
+#: 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
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order.js:298
-#: buying/doctype/purchase_order/purchase_order.js:300
-#: buying/doctype/purchase_order/purchase_order.js:304
+#: buying/doctype/purchase_order/purchase_order.js:317
+#: buying/doctype/purchase_order/purchase_order.js:323
+#: buying/doctype/purchase_order/purchase_order.js:329
+#: buying/doctype/purchase_order/purchase_order.js:335
+#: buying/doctype/purchase_order/purchase_order.js:337
+#: 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:53
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:52
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:173
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:134
-#: crm/report/lead_details/lead_details.js:31
+#: crm/report/lead_details/lead_details.js:30
 #: crm/report/lead_details/lead_details.py:25
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:34
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:39
-#: manufacturing/doctype/production_plan/production_plan.js:99
-#: manufacturing/doctype/production_plan/production_plan.js:103
-#: manufacturing/doctype/production_plan/production_plan.js:431
-#: manufacturing/doctype/work_order/work_order.js:352
-#: manufacturing/doctype/work_order/work_order.js:389
-#: manufacturing/doctype/work_order/work_order.js:565
-#: manufacturing/doctype/work_order/work_order.js:572
-#: manufacturing/doctype/work_order/work_order.js:576
-#: manufacturing/report/job_card_summary/job_card_summary.js:51
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:32
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:38
+#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:115
+#: manufacturing/doctype/production_plan/production_plan.js:466
+#: manufacturing/doctype/work_order/work_order.js:371
+#: manufacturing/doctype/work_order/work_order.js:407
+#: manufacturing/doctype/work_order/work_order.js:595
+#: manufacturing/doctype/work_order/work_order.js:606
+#: manufacturing/doctype/work_order/work_order.js:614
+#: 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/production_analytics/production_analytics.py:19
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:22
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:21
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:80
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:50
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:49
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:111
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:138
-#: manufacturing/report/work_order_summary/work_order_summary.js:37
+#: manufacturing/report/work_order_summary/work_order_summary.js:36
 #: manufacturing/report/work_order_summary/work_order_summary.py:202
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:35
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:25
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:24
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:92
-#: projects/report/project_summary/project_summary.js:24
+#: projects/report/project_summary/project_summary.js:23
 #: projects/report/project_summary/project_summary.py:58
-#: selling/doctype/sales_order/sales_order.js:517
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:528
-#: selling/doctype/sales_order/sales_order.js:539
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:90
+#: public/js/plant_floor_visual/visual_plant.js:111
+#: selling/doctype/sales_order/sales_order.js:553
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:567
+#: selling/doctype/sales_order/sales_order.js:584
+#: selling/doctype/sales_order/sales_order.js:590
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:88
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:68
-#: selling/report/sales_order_analysis/sales_order_analysis.js:55
+#: selling/report/sales_order_analysis/sales_order_analysis.js:54
 #: selling/report/sales_order_analysis/sales_order_analysis.py:228
-#: stock/doctype/delivery_note/delivery_note.js:210
-#: stock/doctype/delivery_note/delivery_note.js:229
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: stock/report/reserved_stock/reserved_stock.js:127
+#: stock/doctype/delivery_note/delivery_note.js:252
+#: stock/doctype/delivery_note/delivery_note.js:281
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: stock/report/reserved_stock/reserved_stock.js:124
 #: stock/report/reserved_stock/reserved_stock.py:178
 #: stock/report/serial_no_ledger/serial_no_ledger.py:51
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/report/issue_analytics/issue_analytics.js:52
-#: support/report/issue_summary/issue_summary.js:39
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:114
+#: support/report/issue_analytics/issue_analytics.js:51
+#: support/report/issue_summary/issue_summary.js:38
 #: templates/pages/projects.html:24 templates/pages/projects.html:46
-#: templates/pages/projects.html:66
+#: templates/pages/projects.html:66 templates/pages/task_info.html:69
+#: templates/pages/timelog_info.html:40
 msgid "Status"
 msgstr "الحالة"
 
@@ -67039,12 +68207,24 @@
 msgid "Status"
 msgstr "الحالة"
 
+#. Label of a Select field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status"
+msgstr "الحالة"
+
 #. Label of a Section Break field in DocType 'Service Level Agreement'
 #: support/doctype/service_level_agreement/service_level_agreement.json
 msgctxt "Service Level Agreement"
 msgid "Status Details"
 msgstr ""
 
+#. Label of a Section Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status Illustration"
+msgstr ""
+
 #: projects/doctype/project/project.py:719
 msgid "Status must be Cancelled or Completed"
 msgstr "يجب إلغاء الحالة أو إكمالها"
@@ -67066,7 +68246,7 @@
 #. Label of a Card Break in the Home Workspace
 #. Name of a Workspace
 #: accounts/doctype/item_tax_template/item_tax_template_dashboard.py:11
-#: accounts/report/account_balance/account_balance.js:55
+#: accounts/report/account_balance/account_balance.js:57
 #: manufacturing/doctype/bom/bom_dashboard.py:14 setup/workspace/home/home.json
 #: stock/doctype/material_request/material_request_dashboard.py:17
 #: stock/workspace/stock/stock.json
@@ -67093,8 +68273,8 @@
 
 #: 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:1187
-#: accounts/report/account_balance/account_balance.js:56
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1239
+#: accounts/report/account_balance/account_balance.js:58
 msgid "Stock Adjustment"
 msgstr "تسوية المخزون"
 
@@ -67118,7 +68298,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: public/js/stock_analytics.js:8
+#: public/js/stock_analytics.js:7
 #: stock/report/stock_analytics/stock_analytics.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Analytics"
@@ -67136,7 +68316,7 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:52
+#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:49
 #: stock/report/stock_balance/stock_balance.json
 #: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py:107
 #: stock/workspace/stock/stock.json
@@ -67149,10 +68329,14 @@
 msgid "Stock Balance"
 msgstr "رصيد المخزون"
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:16
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:15
 msgid "Stock Balance Report"
 msgstr "تقرير رصيد المخزون"
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:10
+msgid "Stock Capacity"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Stock Settings'
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
@@ -67183,12 +68367,12 @@
 msgid "Stock Details"
 msgstr "تفاصيل المخزون"
 
-#: stock/doctype/stock_entry/stock_entry.py:730
+#: stock/doctype/stock_entry/stock_entry.py:685
 msgid "Stock Entries already created for Work Order {0}: {1}"
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/pick_list/pick_list.js:104
+#: stock/doctype/pick_list/pick_list.js:116
 #: stock/doctype/stock_entry/stock_entry.json
 msgid "Stock Entry"
 msgstr "قيد مخزون"
@@ -67249,15 +68433,15 @@
 msgid "Stock Entry Type"
 msgstr "نوع إدخال الأسهم"
 
-#: stock/doctype/pick_list/pick_list.py:1020
+#: stock/doctype/pick_list/pick_list.py:1140
 msgid "Stock Entry has been already created against this Pick List"
 msgstr "تم إنشاء إدخال الأسهم بالفعل مقابل قائمة الاختيار هذه"
 
-#: stock/doctype/batch/batch.js:104
+#: stock/doctype/batch/batch.js:115
 msgid "Stock Entry {0} created"
 msgstr "الأسهم الدخول {0} خلق"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1140
+#: accounts/doctype/journal_entry/journal_entry.py:1167
 msgid "Stock Entry {0} is not submitted"
 msgstr "الحركة المخزنية {0} غير مسجلة"
 
@@ -67292,14 +68476,18 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: public/js/controllers/stock_controller.js:54
-#: public/js/utils/ledger_preview.js:27 stock/doctype/item/item.js:64
+#: public/js/controllers/stock_controller.js:66
+#: public/js/utils/ledger_preview.js:37 stock/doctype/item/item.js:68
 #: stock/doctype/item/item_dashboard.py:8
 #: stock/report/stock_ledger/stock_ledger.json stock/workspace/stock/stock.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:32
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:33
 msgid "Stock Ledger"
 msgstr "سجل المخزن"
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts"
+msgstr ""
+
 #. 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
@@ -67328,7 +68516,7 @@
 msgid "Stock Ledger report contains every submitted stock transaction. You can use filter to narrow down ledger entries."
 msgstr ""
 
-#: stock/doctype/batch/batch.js:50 stock/doctype/item/item.js:403
+#: stock/doctype/batch/batch.js:58 stock/doctype/item/item.js:467
 msgid "Stock Levels"
 msgstr "مستوى المخزون"
 
@@ -67367,6 +68555,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_reconciliation/stock_reconciliation.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
@@ -67385,7 +68574,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: stock/doctype/item/item.js:70
+#: stock/doctype/item/item.js:78
 #: stock/report/stock_projected_qty/stock_projected_qty.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Projected Qty"
@@ -67434,7 +68623,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:90
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:123
-#: accounts/report/account_balance/account_balance.js:57
+#: accounts/report/account_balance/account_balance.js:59
 msgid "Stock Received But Not Billed"
 msgstr "المخزون المتلقي ولكن غير مفوتر"
 
@@ -67485,20 +68674,20 @@
 msgid "Stock Reposting Settings"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: selling/doctype/sales_order/sales_order.js:74
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:178
-#: stock/doctype/pick_list/pick_list.js:110
-#: stock/doctype/pick_list/pick_list.js:119
-#: stock/doctype/pick_list/pick_list.js:120
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:467
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:965
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:978
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:992
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1006
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1020
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1037
+#: selling/doctype/sales_order/sales_order.js:82
+#: selling/doctype/sales_order/sales_order.js:92
+#: selling/doctype/sales_order/sales_order.js:101
+#: selling/doctype/sales_order/sales_order.js:201
+#: 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_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
 msgid "Stock Reservation"
 msgstr ""
 
@@ -67508,18 +68697,18 @@
 msgid "Stock Reservation"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1144
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1146
 msgid "Stock Reservation Entries Cancelled"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1096
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1098
 msgid "Stock Reservation Entries Created"
 msgstr ""
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:383
+#: selling/doctype/sales_order/sales_order.js:413
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: stock/report/reserved_stock/reserved_stock.js:56
+#: stock/report/reserved_stock/reserved_stock.js:53
 #: stock/report/reserved_stock/reserved_stock.py:171
 msgid "Stock Reservation Entry"
 msgstr ""
@@ -67532,7 +68721,7 @@
 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:614
+#: stock/doctype/delivery_note/delivery_note.py:675
 msgid "Stock Reservation Warehouse Mismatch"
 msgstr ""
 
@@ -67552,7 +68741,7 @@
 msgid "Stock Reserved Qty (in Stock UOM)"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1498
+#: stock/doctype/stock_entry/stock_entry.py:1507
 msgid "Stock Return"
 msgstr ""
 
@@ -67580,6 +68769,13 @@
 msgid "Stock Summary"
 msgstr "ملخص الأوراق المالية"
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Stock Summary"
+msgstr "ملخص الأوراق المالية"
+
 #. Label of a Card Break in the Stock Workspace
 #: stock/workspace/stock/stock.json
 msgid "Stock Transactions"
@@ -67597,8 +68793,8 @@
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:232
 #: 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:398
-#: stock/report/stock_ledger/stock_ledger.py:117
+#: stock/report/stock_balance/stock_balance.py:406
+#: stock/report/stock_ledger/stock_ledger.py:190
 msgid "Stock UOM"
 msgstr "وحدة قياس السهم"
 
@@ -67776,7 +68972,7 @@
 msgid "Stock UOM Quantity"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:368
+#: selling/doctype/sales_order/sales_order.js:398
 msgid "Stock Unreservation"
 msgstr ""
 
@@ -67843,6 +69039,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -67883,27 +69080,31 @@
 msgid "Stock cannot be reserved in group warehouse {0}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:908
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:910
 msgid "Stock cannot be reserved in the group warehouse {0}."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1011
-msgid "Stock cannot be updated against Delivery Note {0}"
-msgstr "لا يمكن تحديث المخزون مقابل ملاحظه التسليم {0}\\n<br>\\nStock cannot be updated against Delivery Note {0}"
-
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:673
 msgid "Stock cannot be updated against Purchase Receipt {0}"
 msgstr "لا يمكن تحديث المخزون مقابل إيصال الشراء {0}\\n<br>\\nStock cannot be updated against Purchase Receipt {0}"
 
+#: accounts/doctype/sales_invoice/sales_invoice.py:1032
+msgid "Stock cannot be updated against the following Delivery Notes: {0}"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.py:1055
+msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
+msgstr ""
+
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:229
 msgid "Stock not available for Item {0} in Warehouse {1}."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:679
+#: selling/page/point_of_sale/pos_controller.js:714
 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:241
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:252
 msgid "Stock transactions before {0} are frozen"
 msgstr "يتم تجميد المعاملات المخزنية قبل {0}"
 
@@ -67921,12 +69122,12 @@
 msgid "Stock will be reserved on submission of <b>Purchase Receipt</b> created against Material Receipt for Sales Order."
 msgstr ""
 
-#: stock/utils.py:579
+#: stock/utils.py:574
 msgid "Stock/Accounts can not be frozen as processing of backdated entries is going on. Please try again later."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:570
-#: stock/doctype/material_request/material_request.js:107
+#: manufacturing/doctype/work_order/work_order.js:602
+#: stock/doctype/material_request/material_request.js:109
 msgid "Stop"
 msgstr ""
 
@@ -68002,11 +69203,11 @@
 msgid "Stopped"
 msgstr "توقف"
 
-#: manufacturing/doctype/work_order/work_order.py:631
+#: manufacturing/doctype/work_order/work_order.py:645
 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
 msgstr "لا يمكن إلغاء طلب العمل المتوقف ، قم بإلغاء إيقافه أولاً للإلغاء"
 
-#: setup/doctype/company/company.py:260
+#: 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
@@ -68043,7 +69244,12 @@
 msgid "Sub Assemblies & Raw Materials"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:264
+#: public/js/bom_configurator/bom_configurator.bundle.js:129
+#: public/js/bom_configurator/bom_configurator.bundle.js:159
+msgid "Sub Assembly"
+msgstr ""
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:271
 msgid "Sub Assembly Item"
 msgstr ""
 
@@ -68115,7 +69321,7 @@
 msgid "Subcontract BOM"
 msgstr ""
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:37
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:36
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:128
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:22
 #: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:22
@@ -68127,7 +69333,7 @@
 msgid "Subcontract Order Summary"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:68
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
 msgid "Subcontract Return"
 msgstr ""
 
@@ -68163,10 +69369,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: controllers/subcontracting_controller.py:806
+#: buying/doctype/purchase_order/purchase_order.js:369
+#: controllers/subcontracting_controller.py:810
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:78
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:95
 msgid "Subcontracting Order"
 msgstr ""
 
@@ -68216,7 +69422,7 @@
 msgid "Subcontracting Order Supplied Item"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:861
+#: buying/doctype/purchase_order/purchase_order.py:864
 msgid "Subcontracting Order {0} created."
 msgstr ""
 
@@ -68227,7 +69433,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:200
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Subcontracting Receipt"
 msgstr ""
@@ -68279,10 +69485,10 @@
 msgid "Subdivision"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:219
-#: projects/doctype/task/task_tree.js:62
+#: buying/doctype/request_for_quotation/request_for_quotation.js:237
+#: projects/doctype/task/task_tree.js:65
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:91
-#: support/doctype/issue/issue.js:96
+#: support/doctype/issue/issue.js:106 templates/pages/task_info.html:44
 msgid "Subject"
 msgstr "موضوع"
 
@@ -68334,15 +69540,16 @@
 msgid "Subject"
 msgstr "موضوع"
 
-#: accounts/doctype/payment_order/payment_order.js:120
-#: public/js/payment/payments.js:28
-#: selling/page/point_of_sale/pos_controller.js:101
-#: www/book_appointment/index.html:59
+#: accounts/doctype/payment_order/payment_order.js:137
+#: manufacturing/doctype/workstation/workstation.js:237
+#: public/js/payment/payments.js:30
+#: selling/page/point_of_sale/pos_controller.js:119
+#: templates/pages/task_info.html:101 www/book_appointment/index.html:59
 msgid "Submit"
 msgstr "تسجيل"
 
-#: buying/doctype/purchase_order/purchase_order.py:857
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:698
+#: buying/doctype/purchase_order/purchase_order.py:860
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:699
 msgid "Submit Action Failed"
 msgstr ""
 
@@ -68370,14 +69577,18 @@
 msgid "Submit Journal Entries"
 msgstr "إرسال إدخالات دفتر اليومية"
 
-#: manufacturing/doctype/work_order/work_order.js:135
+#: manufacturing/doctype/work_order/work_order.js:139
 msgid "Submit this Work Order for further processing."
 msgstr "أرسل طلب العمل هذا لمزيد من المعالجة."
 
-#: assets/doctype/asset/asset_list.js:32
+#: buying/doctype/request_for_quotation/request_for_quotation.py:265
+msgid "Submit your Quotation"
+msgstr ""
+
+#: assets/doctype/asset/asset_list.js:23
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:15
-#: stock/doctype/stock_entry/stock_entry_list.js:21
-#: templates/pages/material_request_info.html:24 templates/pages/order.html:58
+#: stock/doctype/stock_entry/stock_entry_list.js:27
+#: templates/pages/material_request_info.html:24 templates/pages/order.html:70
 msgid "Submitted"
 msgstr "مسجلة"
 
@@ -68641,11 +69852,11 @@
 msgid "Succeeded"
 msgstr ""
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:6
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:7
 msgid "Succeeded Entries"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Success"
 msgstr "نجاح"
 
@@ -68680,11 +69891,11 @@
 msgid "Successful"
 msgstr "ناجح"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:538
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:543
 msgid "Successfully Reconciled"
 msgstr "تمت التسوية بنجاح\\n<br>\\nSuccessfully Reconciled"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:164
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:171
 msgid "Successfully Set Supplier"
 msgstr "بنجاح تعيين المورد"
 
@@ -68692,31 +69903,31 @@
 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:468
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:430
 msgid "Successfully imported {0}"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:182
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:161
 msgid "Successfully imported {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:166
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:145
 msgid "Successfully imported {0} record."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:178
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:157
 msgid "Successfully imported {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:165
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:144
 msgid "Successfully imported {0} records."
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:177
+#: buying/doctype/supplier/supplier.js:210
 msgid "Successfully linked to Customer"
 msgstr ""
 
-#: selling/doctype/customer/customer.js:222
+#: selling/doctype/customer/customer.js:243
 msgid "Successfully linked to Supplier"
 msgstr ""
 
@@ -68724,23 +69935,23 @@
 msgid "Successfully merged {0} out of {1}."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:478
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:438
 msgid "Successfully updated {0}"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:193
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:172
 msgid "Successfully updated {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:171
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:150
 msgid "Successfully updated {0} record."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:189
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:168
 msgid "Successfully updated {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:170
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:149
 msgid "Successfully updated {0} records."
 msgstr ""
 
@@ -68870,30 +70081,30 @@
 
 #. Name of a DocType
 #. Label of a Card Break in the Buying Workspace
-#: accounts/doctype/payment_order/payment_order.js:100
+#: accounts/doctype/payment_order/payment_order.js:110
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:61
 #: 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/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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:38
-#: buying/doctype/request_for_quotation/request_for_quotation.js:156
-#: buying/doctype/request_for_quotation/request_for_quotation.js:208
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:167
+#: 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/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:16
+#: 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:16
+#: 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/workspace/buying/buying.json public/js/purchase_trends_filters.js:50
-#: public/js/purchase_trends_filters.js:66
+#: public/js/purchase_trends_filters.js:63
 #: regional/report/irs_1099/irs_1099.py:79
-#: selling/doctype/customer/customer.js:207
-#: selling/doctype/sales_order/sales_order.js:1005
+#: 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
 msgid "Supplier"
 msgstr "المورد"
@@ -69199,15 +70410,15 @@
 msgstr "تفاصيل المورد"
 
 #. Name of a DocType
-#: accounts/report/accounts_payable/accounts_payable.js:122
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:105
-#: accounts/report/accounts_receivable/accounts_receivable.py:1110
+#: 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/purchase_register/purchase_register.js:27
 #: accounts/report/purchase_register/purchase_register.py:186
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:56
-#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: 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
@@ -69289,7 +70500,7 @@
 msgid "Supplier Invoice"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:216
 msgid "Supplier Invoice Date"
 msgstr "المورد فاتورة التسجيل"
 
@@ -69299,13 +70510,14 @@
 msgid "Supplier Invoice Date"
 msgstr "المورد فاتورة التسجيل"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1550
 msgid "Supplier Invoice Date cannot be greater than Posting Date"
 msgstr "تاريخ فاتورة المورد لا يمكن أن تكون أكبر من تاريخ الإنشاء<br> Supplier Invoice Date cannot be greater than Posting Date"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
-#: accounts/report/general_ledger/general_ledger.py:656
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: 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
 msgid "Supplier Invoice No"
 msgstr "رقم فاتورة المورد"
 
@@ -69321,7 +70533,7 @@
 msgid "Supplier Invoice No"
 msgstr "رقم فاتورة المورد"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1575
 msgid "Supplier Invoice No exists in Purchase Invoice {0}"
 msgstr "المورد فاتورة لا يوجد في شراء الفاتورة {0}"
 
@@ -69351,12 +70563,12 @@
 msgid "Supplier Ledger Summary"
 msgstr "ملخص دفتر الأستاذ"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1041
+#: accounts/report/accounts_receivable/accounts_receivable.py:1049
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
 #: 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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:74
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:73
 msgid "Supplier Name"
 msgstr "اسم المورد"
 
@@ -69486,14 +70698,14 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:458
-#: buying/doctype/request_for_quotation/request_for_quotation.js:42
+#: buying/doctype/purchase_order/purchase_order.js:529
+#: 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
-#: crm/doctype/opportunity/opportunity.js:82
-#: stock/doctype/material_request/material_request.js:147
+#: crm/doctype/opportunity/opportunity.js:81
+#: stock/doctype/material_request/material_request.js:170
 msgid "Supplier Quotation"
 msgstr "التسعيرة من المورد"
 
@@ -69545,7 +70757,7 @@
 msgid "Supplier Quotation Item"
 msgstr "المورد اقتباس الإغلاق"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:409
+#: buying/doctype/request_for_quotation/request_for_quotation.py:433
 msgid "Supplier Quotation {0} Created"
 msgstr "تم إنشاء عرض أسعار المورد {0}"
 
@@ -69673,6 +70885,11 @@
 msgid "Supplier delivers to Customer"
 msgstr "المورد يسلم للعميل"
 
+#. Description of a DocType
+#: buying/doctype/supplier/supplier.json
+msgid "Supplier of Goods or Services."
+msgstr ""
+
 #: buying/doctype/supplier_quotation/supplier_quotation.py:167
 msgid "Supplier {0} not found in {1}"
 msgstr "المورد {0} غير موجود في {1}"
@@ -69763,7 +70980,7 @@
 msgid "Suspended"
 msgstr "معلق"
 
-#: selling/page/point_of_sale/pos_payment.js:308
+#: selling/page/point_of_sale/pos_payment.js:325
 msgid "Switch Between Payment Modes"
 msgstr "التبديل بين طرق الدفع"
 
@@ -69859,6 +71076,7 @@
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 #: manufacturing/doctype/job_card/job_card.json
+#: manufacturing/doctype/plant_floor/plant_floor.json
 #: projects/doctype/activity_type/activity_type.json
 #: projects/doctype/project_template/project_template.json
 #: projects/doctype/project_type/project_type.json
@@ -69946,7 +71164,7 @@
 msgid "System will fetch all the entries if limit value is zero."
 msgstr "سيقوم النظام بجلب كل الإدخالات إذا كانت قيمة الحد صفرا."
 
-#: controllers/accounts_controller.py:1673
+#: controllers/accounts_controller.py:1762
 msgid "System will not check over billing since amount for Item {0} in {1} is zero"
 msgstr ""
 
@@ -69957,11 +71175,19 @@
 msgid "System will notify to increase or decrease quantity or amount "
 msgstr "سيُعلم النظام بزيادة أو تقليل الكمية أو الكمية"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TCS Amount"
+msgstr ""
+
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TCS Rate %"
 msgstr ""
 
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TDS Amount"
+msgstr ""
+
 #. Name of a report
 #: accounts/report/tds_computation_summary/tds_computation_summary.json
 msgid "TDS Computation Summary"
@@ -69971,7 +71197,7 @@
 msgid "TDS Payable"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TDS Rate %"
 msgstr ""
@@ -69982,7 +71208,12 @@
 msgid "TS-.YYYY.-"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:427
+#. Description of a DocType
+#: stock/doctype/item_website_specification/item_website_specification.json
+msgid "Table for Item that will be shown in Web Site"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:466
 msgid "Tag"
 msgstr "بطاقة شعار"
 
@@ -70024,10 +71255,14 @@
 msgid "Tally Migration"
 msgstr "تالي الهجرة"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:32
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:34
 msgid "Tally Migration Error"
 msgstr ""
 
+#: templates/form_grid/stock_entry_grid.html:36
+msgid "Target"
+msgstr "الهدف"
+
 #. Label of a Data field in DocType 'Quality Goal Objective'
 #: quality_management/doctype/quality_goal_objective/quality_goal_objective.json
 msgctxt "Quality Goal Objective"
@@ -70062,23 +71297,23 @@
 msgid "Target Asset Location"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:248
+#: assets/doctype/asset_capitalization/asset_capitalization.py:254
 msgid "Target Asset {0} cannot be cancelled"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:246
+#: assets/doctype/asset_capitalization/asset_capitalization.py:252
 msgid "Target Asset {0} cannot be submitted"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:242
+#: assets/doctype/asset_capitalization/asset_capitalization.py:248
 msgid "Target Asset {0} cannot be {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:252
+#: assets/doctype/asset_capitalization/asset_capitalization.py:258
 msgid "Target Asset {0} does not belong to company {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:233
+#: assets/doctype/asset_capitalization/asset_capitalization.py:239
 msgid "Target Asset {0} needs to be composite asset"
 msgstr ""
 
@@ -70158,15 +71393,15 @@
 msgid "Target Item Name"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:203
+#: assets/doctype/asset_capitalization/asset_capitalization.py:209
 msgid "Target Item {0} is neither a Fixed Asset nor a Stock Item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:207
+#: assets/doctype/asset_capitalization/asset_capitalization.py:213
 msgid "Target Item {0} must be a Fixed Asset item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:209
+#: assets/doctype/asset_capitalization/asset_capitalization.py:215
 msgid "Target Item {0} must be a Stock Item"
 msgstr ""
 
@@ -70188,9 +71423,9 @@
 msgid "Target Location or To Employee is required while receiving Asset {0}"
 msgstr "الموقع المستهدف أو الموظف مطلوب أثناء استلام الأصول {0}"
 
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:42
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:42
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:42
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:41
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:41
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:41
 msgid "Target On"
 msgstr "الهدف في"
 
@@ -70206,7 +71441,7 @@
 msgid "Target Qty"
 msgstr "الهدف الكمية"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:214
+#: assets/doctype/asset_capitalization/asset_capitalization.py:220
 msgid "Target Qty must be a positive number"
 msgstr ""
 
@@ -70216,8 +71451,8 @@
 msgid "Target Serial No"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:222
-#: stock/doctype/stock_entry/stock_entry.js:549
+#: stock/dashboard/item_dashboard.js:230
+#: stock/doctype/stock_entry/stock_entry.js:633
 msgid "Target Warehouse"
 msgstr "المخزن المستهدف"
 
@@ -70276,16 +71511,16 @@
 msgid "Target Warehouse Address"
 msgstr "عنوان المستودع المستهدف"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:224
+#: assets/doctype/asset_capitalization/asset_capitalization.py:230
 msgid "Target Warehouse is mandatory for Decapitalization"
 msgstr ""
 
-#: controllers/selling_controller.py:685
+#: controllers/selling_controller.py:709
 msgid "Target Warehouse is set for some items but the customer is not an internal customer."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:623
-#: stock/doctype/stock_entry/stock_entry.py:630
+#: stock/doctype/stock_entry/stock_entry.py:578
+#: stock/doctype/stock_entry/stock_entry.py:585
 msgid "Target warehouse is mandatory for row {0}"
 msgstr "المستودع المستهدف إلزامي للصف {0}\\n<br>\\nTarget warehouse is mandatory for row {0}"
 
@@ -70317,8 +71552,8 @@
 #: projects/doctype/task/task.json projects/doctype/task/task_tree.js:17
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:33
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:90
-#: public/js/projects/timer.js:11 support/doctype/issue/issue.js:22
-#: templates/pages/projects.html:56
+#: public/js/projects/timer.js:15 support/doctype/issue/issue.js:27
+#: templates/pages/projects.html:56 templates/pages/timelog_info.html:28
 msgid "Task"
 msgstr "مهمة"
 
@@ -70426,6 +71661,12 @@
 msgid "Tasks"
 msgstr "المهام"
 
+#. Label of a Section Break field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Tasks"
+msgstr "المهام"
+
 #: projects/report/project_summary/project_summary.py:62
 msgid "Tasks Completed"
 msgstr "اكتملت المهام"
@@ -70434,7 +71675,7 @@
 msgid "Tasks Overdue"
 msgstr "المهام المتأخرة"
 
-#: accounts/report/account_balance/account_balance.js:58
+#: accounts/report/account_balance/account_balance.js:60
 msgid "Tax"
 msgstr "ضريبة"
 
@@ -70474,7 +71715,6 @@
 msgid "Tax Account"
 msgstr "حساب الضرائب"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:247
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:137
 msgid "Tax Amount"
 msgstr ""
@@ -70697,11 +71937,11 @@
 msgid "Tax ID"
 msgstr "الرقم الضريبي"
 
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:86
+#: 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/supplier_ledger_summary/supplier_ledger_summary.js:68
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:67
 msgid "Tax Id"
 msgstr "الرقم الضريبي"
 
@@ -70736,6 +71976,8 @@
 msgstr "الرقم الضريبي"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:32
+#: accounts/report/accounts_receivable/accounts_receivable.html:19
+#: accounts/report/general_ledger/general_ledger.html:14
 msgid "Tax Id: "
 msgstr "الرقم الضريبي:"
 
@@ -70744,7 +71986,7 @@
 msgid "Tax Masters"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:119
+#: accounts/doctype/account/account_tree.js:160
 msgid "Tax Rate"
 msgstr "معدل الضريبة"
 
@@ -70958,7 +72200,7 @@
 msgid "Tax will be withheld only for amount exceeding the cumulative threshold"
 msgstr ""
 
-#: controllers/taxes_and_totals.py:1018
+#: controllers/taxes_and_totals.py:1019
 msgid "Taxable Amount"
 msgstr "المبلغ الخاضع للضريبة"
 
@@ -71113,55 +72355,55 @@
 msgid "Taxes and Charges Added (Company Currency)"
 msgstr "الضرائب والرسوم المضافة (عملة الشركة)"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "حساب الضرائب والرسوم"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "حساب الضرائب والرسوم"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "حساب الضرائب والرسوم"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "حساب الضرائب والرسوم"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "حساب الضرائب والرسوم"
 
-#. Label of a Long Text field in DocType 'Quotation'
+#. Label of a Text Editor field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Taxes and Charges Calculation"
 msgstr "حساب الضرائب والرسوم"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "حساب الضرائب والرسوم"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "حساب الضرائب والرسوم"
 
-#. Label of a Long Text field in DocType 'Supplier Quotation'
+#. Label of a Markdown Editor field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Taxes and Charges Calculation"
@@ -71237,7 +72479,7 @@
 msgid "Telephony Call Type"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:12
+#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:20
 msgid "Template"
 msgstr "قالب"
 
@@ -71253,11 +72495,11 @@
 msgid "Template"
 msgstr "قالب"
 
-#: manufacturing/doctype/bom/bom.js:279
+#: manufacturing/doctype/bom/bom.js:292
 msgid "Template Item"
 msgstr "عنصر القالب"
 
-#: stock/get_item_details.py:219
+#: stock/get_item_details.py:224
 msgid "Template Item Selected"
 msgstr ""
 
@@ -71297,11 +72539,11 @@
 msgid "Template Warnings"
 msgstr "تحذيرات القالب"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:38
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:29
 msgid "Temporarily on Hold"
 msgstr "مؤقت في الانتظار"
 
-#: accounts/report/account_balance/account_balance.js:59
+#: accounts/report/account_balance/account_balance.js:61
 msgid "Temporary"
 msgstr "مؤقت"
 
@@ -71568,34 +72810,34 @@
 msgstr "قالب الشروط والأحكام"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:145
-#: accounts/report/accounts_receivable/accounts_receivable.py:1094
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1102
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
+#: 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/inactive_sales_items/inactive_sales_items.js:9
+#: 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
-#: crm/report/lead_details/lead_details.js:47
+#: crm/report/lead_details/lead_details.js:46
 #: crm/report/lead_details/lead_details.py:34
-#: crm/report/lost_opportunity/lost_opportunity.js:37
+#: 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/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:48
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:46
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:39
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:60
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:59
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:39
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:48
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:46
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:60
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:59
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:71
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:72
 #: selling/report/territory_wise_sales/territory_wise_sales.py:22
 #: setup/doctype/territory/territory.json
 msgid "Territory"
@@ -71774,7 +73016,7 @@
 msgid "The 'From Package No.' field must neither be empty nor it's value less than 1."
 msgstr "و &quot;من حزمة رقم&quot; يجب ألا يكون الحقل فارغا ولا قيمة أقل من 1."
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:331
+#: buying/doctype/request_for_quotation/request_for_quotation.py:355
 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings."
 msgstr "تم تعطيل الوصول إلى طلب عرض الأسعار من البوابة. للسماح بالوصول ، قم بتمكينه في إعدادات البوابة."
 
@@ -71820,7 +73062,7 @@
 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:176
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:177
 msgid "The GL Entries will be processed in the background, it can take a few minutes."
 msgstr ""
 
@@ -71828,7 +73070,7 @@
 msgid "The Loyalty Program isn't valid for the selected company"
 msgstr "برنامج الولاء غير صالح للشركة المختارة"
 
-#: accounts/doctype/payment_request/payment_request.py:747
+#: accounts/doctype/payment_request/payment_request.py:750
 msgid "The Payment Request {0} is already paid, cannot process payment twice"
 msgstr ""
 
@@ -71836,11 +73078,11 @@
 msgid "The Payment Term at row {0} is possibly a duplicate."
 msgstr "قد يكون مصطلح الدفع في الصف {0} مكررا."
 
-#: stock/doctype/pick_list/pick_list.py:132
+#: stock/doctype/pick_list/pick_list.py:167
 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:1761
+#: stock/doctype/stock_entry/stock_entry.py:1770
 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
 msgstr ""
 
@@ -71849,7 +73091,7 @@
 msgid "The Selling Module is all set up!"
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:17
 msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing. <br><br> When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field."
 msgstr "يُعرف إدخال المخزون من نوع &quot;التصنيع&quot; باسم التدفق الرجعي. تُعرف المواد الخام التي يتم استهلاكها لتصنيع السلع التامة الصنع بالتدفق العكسي.<br><br> عند إنشاء إدخال التصنيع ، يتم إجراء مسح تلقائي لعناصر المواد الخام استنادًا إلى قائمة مكونات الصنف الخاصة بصنف الإنتاج. إذا كنت تريد إعادة تسريح أصناف المواد الخام استنادًا إلى إدخال نقل المواد الذي تم إجراؤه مقابل طلب العمل هذا بدلاً من ذلك ، فيمكنك تعيينه ضمن هذا الحقل."
 
@@ -71872,7 +73114,7 @@
 msgid "The accounts are set by the system automatically but do confirm these defaults"
 msgstr "يتم تعيين الحسابات بواسطة النظام تلقائيًا ولكنها تؤكد هذه الإعدادات الافتراضية"
 
-#: accounts/doctype/payment_request/payment_request.py:144
+#: accounts/doctype/payment_request/payment_request.py:147
 msgid "The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document."
 msgstr "يختلف مبلغ {0} المحدد في طلب الدفع هذا عن المبلغ المحسوب لجميع خطط الدفع: {1}. تأكد من صحة ذلك قبل إرسال المستند."
 
@@ -71880,7 +73122,7 @@
 msgid "The currency of invoice {} ({}) is different from the currency of this dunning ({})."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:812
+#: manufacturing/doctype/work_order/work_order.js:871
 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM."
 msgstr ""
 
@@ -71917,7 +73159,7 @@
 msgid "The following Items, having Putaway Rules, could not be accomodated:"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:414
+#: assets/doctype/asset/depreciation.py:412
 msgid "The following assets have failed to automatically post depreciation entries: {0}"
 msgstr ""
 
@@ -71929,7 +73171,7 @@
 msgid "The following employees are currently still reporting to {0}:"
 msgstr "لا يزال الموظفون التالي ذكرهم يتبعون حاليًا {0}:"
 
-#: stock/doctype/material_request/material_request.py:773
+#: stock/doctype/material_request/material_request.py:785
 msgid "The following {0} were created: {1}"
 msgstr "تم إنشاء {0} التالية: {1}"
 
@@ -71975,7 +73217,7 @@
 msgid "The parent account {0} does not exists in the uploaded template"
 msgstr "الحساب الأصل {0} غير موجود في القالب الذي تم تحميله"
 
-#: accounts/doctype/payment_request/payment_request.py:133
+#: accounts/doctype/payment_request/payment_request.py:136
 msgid "The payment gateway account in plan {0} is different from the payment gateway account in this payment request"
 msgstr "يختلف حساب بوابة الدفع في الخطة {0} عن حساب بوابة الدفع في طلب الدفع هذا"
 
@@ -72000,15 +73242,15 @@
 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:742
+#: public/js/utils.js:814
 msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.js:116
+#: stock/doctype/pick_list/pick_list.js:137
 msgid "The reserved stock will be released. Are you certain you wish to proceed?"
 msgstr ""
 
-#: accounts/doctype/account/account.py:198
+#: accounts/doctype/account/account.py:217
 msgid "The root account {0} must be a group"
 msgstr "يجب أن يكون حساب الجذر {0} مجموعة"
 
@@ -72024,7 +73266,7 @@
 msgid "The selected item cannot have Batch"
 msgstr "العنصر المحدد لا يمكن أن يكون دفعة"
 
-#: assets/doctype/asset/asset.js:570
+#: assets/doctype/asset/asset.js:643
 msgid "The selected {0} does not contain the selected Asset Item."
 msgstr ""
 
@@ -72048,7 +73290,7 @@
 msgid "The shares don't exist with the {0}"
 msgstr "الأسهم غير موجودة مع {0}"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:461
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:515
 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 ""
 
@@ -72056,24 +73298,16 @@
 msgid "The sync has started in the background, please check the {0} list for new records."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:155
 #: accounts/doctype/journal_entry/journal_entry.py:162
+#: accounts/doctype/journal_entry/journal_entry.py:169
 msgid "The task has been enqueued as a background job."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:244
-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 Entry and revert to the Draft stage"
-msgstr ""
-
-#: stock/doctype/stock_entry/stock_entry.py:255
-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 Entry and revert to the Submitted stage"
-msgstr ""
-
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:754
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:808
 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:765
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:819
 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 ""
 
@@ -72100,31 +73334,31 @@
 msgid "The value {0} is already assigned to an existing Item {1}."
 msgstr "تم تعيين القيمة {0} بالفعل لعنصر موجود {1}."
 
-#: manufacturing/doctype/work_order/work_order.js:832
+#: manufacturing/doctype/work_order/work_order.js:899
 msgid "The warehouse where you store finished Items before they are shipped."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:827
+#: manufacturing/doctype/work_order/work_order.js:892
 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:837
+#: manufacturing/doctype/work_order/work_order.js:904
 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:671
+#: manufacturing/doctype/job_card/job_card.py:678
 msgid "The {0} ({1}) must be equal to {2} ({3})"
 msgstr "يجب أن يكون {0} ({1}) مساويًا لـ {2} ({3})"
 
-#: stock/doctype/material_request/material_request.py:779
+#: stock/doctype/material_request/material_request.py:791
 msgid "The {0} {1} created successfully"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:762
+#: manufacturing/doctype/job_card/job_card.py:769
 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:501
+#: assets/doctype/asset/asset.py:503
 msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
 msgstr "هناك صيانة نشطة أو إصلاحات ضد الأصل. يجب عليك إكمالها جميعًا قبل إلغاء الأصل."
 
@@ -72132,19 +73366,27 @@
 msgid "There are inconsistencies between the rate, no of shares and the amount calculated"
 msgstr "هناك تناقضات بين المعدل، لا من الأسهم والمبلغ المحسوب"
 
-#: utilities/bulk_transaction.py:41
+#: accounts/doctype/account/account.py:202
+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
 msgid "There are no Failed transactions"
 msgstr ""
 
-#: www/book_appointment/index.js:89
+#: setup/demo.py:108
+msgid "There are no active Fiscal Years for which Demo Data can be generated."
+msgstr ""
+
+#: www/book_appointment/index.js:95
 msgid "There are no slots available on this date"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:245
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:273
 msgid "There are only {0} asset created or linked to {1}. Please create or link {2} Assets with respective document."
 msgstr ""
 
-#: stock/doctype/item/item.js:829
+#: stock/doctype/item/item.js:913
 msgid "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit <a href='https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/item-valuation-fifo-and-moving-average' target='_blank'>Item Valuation, FIFO and Moving Average.</a>"
 msgstr ""
 
@@ -72152,6 +73394,10 @@
 msgid "There aren't any item variants for the selected item"
 msgstr ""
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:10
+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
 msgid "There can only be 1 Account per Company in {0} {1}"
 msgstr "يمكن أن يكون هناك سوى 1 في حساب الشركة في {0} {1}"
@@ -72176,36 +73422,36 @@
 msgid "There is nothing to edit."
 msgstr "لا يوجد شيء لتحريره"
 
-#: stock/doctype/stock_entry/stock_entry.py:1279
+#: stock/doctype/stock_entry/stock_entry.py:1288
 msgid "There must be atleast 1 Finished Good in this Stock Entry"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:135
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:151
 msgid "There was an error creating Bank Account while linking with Plaid."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:205
+#: selling/page/point_of_sale/pos_controller.js:228
 msgid "There was an error saving the document."
 msgstr "حدث خطأ أثناء حفظ المستند."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:236
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:252
 msgid "There was an error syncing transactions."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:157
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:173
 msgid "There was an error updating Bank Account {} while linking with Plaid."
 msgstr ""
 
-#: accounts/doctype/bank/bank.js:113
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:109
+#: accounts/doctype/bank/bank.js:115
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:114
 msgid "There was an issue connecting to Plaid's authentication server. Check browser console for more information"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:279
+#: selling/page/point_of_sale/pos_past_order_summary.js:289
 msgid "There were errors while sending email. Please try again."
 msgstr "كانت هناك أخطاء أثناء إرسال البريد الإلكتروني. يرجى المحاولة مرة أخرى."
 
-#: accounts/utils.py:924
+#: accounts/utils.py:933
 msgid "There were issues unlinking payment entry {0}."
 msgstr ""
 
@@ -72216,11 +73462,11 @@
 msgid "This Account has '0' balance in either Base Currency or Account Currency"
 msgstr ""
 
-#: stock/doctype/item/item.js:88
+#: stock/doctype/item/item.js:99
 msgid "This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set"
 msgstr "هذا البند هو قالب ولا يمكن استخدامها في المعاملات المالية. سيتم نسخ سمات البند أكثر في المتغيرات ما لم يتم تعيين \"لا نسخ '"
 
-#: stock/doctype/item/item.js:118
+#: stock/doctype/item/item.js:158
 msgid "This Item is a Variant of {0} (Template)."
 msgstr "هذا العنصر هو متغير {0} (قالب)."
 
@@ -72228,11 +73474,11 @@
 msgid "This Month's Summary"
 msgstr "ملخص هذا الشهر"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:26
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
 msgid "This Warehouse will be auto-updated in the Target Warehouse field of Work Order."
 msgstr "سيتم تحديث هذا المستودع تلقائيًا في حقل &quot;المستودع الهدف&quot; الخاص بأمر العمل."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:21
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:24
 msgid "This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Orders."
 msgstr "سيتم تحديث هذا المستودع تلقائيًا في حقل &quot;مستودع العمل قيد التقدم&quot; الخاص بأوامر العمل."
 
@@ -72256,7 +73502,7 @@
 msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
 msgstr "هذه الوثيقة هي على حد كتبها {0} {1} لمادة {4}. وجعل لكم آخر {3} ضد نفسه {2}؟"
 
-#: stock/doctype/delivery_note/delivery_note.js:360
+#: stock/doctype/delivery_note/delivery_note.js:406
 msgid "This field is used to set the 'Customer'."
 msgstr ""
 
@@ -72267,7 +73513,7 @@
 msgid "This filter will be applied to Journal Entry."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:158
+#: manufacturing/doctype/bom/bom.js:171
 msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
 msgstr ""
 
@@ -72296,7 +73542,7 @@
 msgid "This is a location where scraped materials are stored."
 msgstr "هذا هو الموقع حيث يتم تخزين المواد كشط."
 
-#: accounts/doctype/account/account.js:40
+#: accounts/doctype/account/account.js:36
 msgid "This is a root account and cannot be edited."
 msgstr ".هذا حساب جذري و لايمكن تعديله"
 
@@ -72308,11 +73554,11 @@
 msgid "This is a root department and cannot be edited."
 msgstr "هذا هو قسم الجذر ولا يمكن تحريره."
 
-#: setup/doctype/item_group/item_group.js:81
+#: setup/doctype/item_group/item_group.js:98
 msgid "This is a root item group and cannot be edited."
 msgstr "هذه هي مجموعة البند الجذرية والتي لا يمكن تحريرها."
 
-#: setup/doctype/sales_person/sales_person.js:36
+#: setup/doctype/sales_person/sales_person.js:46
 msgid "This is a root sales person and cannot be edited."
 msgstr "هذا هو الشخص المبيعات الجذرية والتي لا يمكن تحريرها."
 
@@ -72344,19 +73590,19 @@
 msgid "This is based on transactions against this Supplier. See timeline below for details"
 msgstr "ويستند هذا على المعاملات مقابل هذا المورد. انظر الجدول الزمني أدناه للاطلاع على التفاصيل"
 
-#: stock/doctype/stock_settings/stock_settings.js:24
+#: stock/doctype/stock_settings/stock_settings.js:26
 msgid "This is considered dangerous from accounting point of view."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:529
 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
 msgstr "يتم إجراء ذلك للتعامل مع محاسبة الحالات التي يتم فيها إنشاء إيصال الشراء بعد فاتورة الشراء"
 
-#: manufacturing/doctype/work_order/work_order.js:822
+#: manufacturing/doctype/work_order/work_order.js:885
 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox."
 msgstr ""
 
-#: stock/doctype/item/item.js:819
+#: stock/doctype/item/item.js:901
 msgid "This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked."
 msgstr ""
 
@@ -72364,7 +73610,7 @@
 msgid "This item filter has already been applied for the {0}"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.js:371
+#: stock/doctype/delivery_note/delivery_note.js:419
 msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
 msgstr ""
 
@@ -72372,7 +73618,7 @@
 msgid "This schedule was created when Asset {0} was adjusted through Asset Value Adjustment {1}."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:516
+#: assets/doctype/asset_capitalization/asset_capitalization.py:522
 msgid "This schedule was created when Asset {0} was consumed through Asset Capitalization {1}."
 msgstr ""
 
@@ -72380,27 +73626,27 @@
 msgid "This schedule was created when Asset {0} was repaired through Asset Repair {1}."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:674
+#: assets/doctype/asset_capitalization/asset_capitalization.py:680
 msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:496
+#: assets/doctype/asset/depreciation.py:494
 msgid "This schedule was created when Asset {0} was restored."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1325
+#: accounts/doctype/sales_invoice/sales_invoice.py:1336
 msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:454
+#: assets/doctype/asset/depreciation.py:452
 msgid "This schedule was created when Asset {0} was scrapped."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1336
+#: accounts/doctype/sales_invoice/sales_invoice.py:1347
 msgid "This schedule was created when Asset {0} was sold through Sales Invoice {1}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1117
+#: assets/doctype/asset/asset.py:1121
 msgid "This schedule was created when Asset {0} was updated after being split into new Asset {1}."
 msgstr ""
 
@@ -72416,7 +73662,7 @@
 msgid "This schedule was created when Asset {0}'s shifts were adjusted through Asset Shift Allocation {1}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1180
+#: assets/doctype/asset/asset.py:1184
 msgid "This schedule was created when new Asset {0} was split from Asset {1}."
 msgstr ""
 
@@ -72427,10 +73673,15 @@
 msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
 msgstr "يسمح هذا القسم للمستخدم بتعيين النص الأساسي ونص الإغلاق لحرف المطالبة لنوع المطالبة بناءً على اللغة ، والتي يمكن استخدامها في الطباعة."
 
-#: stock/doctype/delivery_note/delivery_note.js:365
+#: stock/doctype/delivery_note/delivery_note.js:412
 msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses."
+msgstr ""
+
 #. Description of the 'Abbreviation' (Data) field in DocType 'Item Attribute
 #. Value'
 #: stock/doctype/item_attribute_value/item_attribute_value.json
@@ -72445,7 +73696,7 @@
 msgid "This will restrict user access to other employee records"
 msgstr "سيؤدي هذا إلى تقييد وصول المستخدم لسجلات الموظفين الأخرى"
 
-#: controllers/selling_controller.py:686
+#: controllers/selling_controller.py:710
 msgid "This {} will be treated as material transfer."
 msgstr ""
 
@@ -72671,7 +73922,7 @@
 msgid "Time in mins."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:654
+#: manufacturing/doctype/job_card/job_card.py:661
 msgid "Time logs are required for {0} {1}"
 msgstr "سجلات الوقت مطلوبة لـ {0} {1}"
 
@@ -72689,11 +73940,12 @@
 msgid "Timeline"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:31
 #: public/js/projects/timer.js:5
 msgid "Timer"
 msgstr "مؤقت"
 
-#: public/js/projects/timer.js:142
+#: public/js/projects/timer.js:149
 msgid "Timer exceeded the given hours."
 msgstr "الموقت تجاوزت الساعات المعطاة."
 
@@ -72735,11 +73987,11 @@
 msgid "Timesheet for tasks."
 msgstr "الجدول الزمني للمهام."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:756
+#: accounts/doctype/sales_invoice/sales_invoice.py:773
 msgid "Timesheet {0} is already completed or cancelled"
 msgstr "الجدول الزمني {0} بالفعل منتهي أو ملغى"
 
-#: projects/doctype/timesheet/timesheet.py:520 templates/pages/projects.html:59
+#: projects/doctype/timesheet/timesheet.py:530 templates/pages/projects.html:59
 msgid "Timesheets"
 msgstr "الجداول الزمنية"
 
@@ -72938,7 +74190,7 @@
 msgid "Title"
 msgstr "اللقب"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:967
+#: accounts/doctype/sales_invoice/sales_invoice.js:1043
 #: templates/pages/projects.html:68
 msgid "To"
 msgstr "إلى"
@@ -72961,15 +74213,15 @@
 msgid "To"
 msgstr "إلى"
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "To Be Paid"
 msgstr "لكي تدفع"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:36
-#: selling/doctype/sales_order/sales_order_list.js:39
-#: stock/doctype/delivery_note/delivery_note_list.js:12
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:12
+#: buying/doctype/purchase_order/purchase_order_list.js:37
+#: selling/doctype/sales_order/sales_order_list.js:50
+#: selling/doctype/sales_order/sales_order_list.js:52
+#: stock/doctype/delivery_note/delivery_note_list.js:22
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:21
 msgid "To Bill"
 msgstr "على فاتورة"
 
@@ -73010,13 +74262,13 @@
 msgid "To Currency"
 msgstr "إلى العملات"
 
-#: accounts/doctype/payment_entry/payment_entry.js:648
-#: accounts/doctype/payment_entry/payment_entry.js:652
+#: accounts/doctype/payment_entry/payment_entry.js:794
+#: accounts/doctype/payment_entry/payment_entry.js:798
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:23
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:23
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:15
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:24
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:45
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:23
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:44
 #: accounts/report/financial_ratios/financial_ratios.js:48
 #: accounts/report/general_ledger/general_ledger.js:30
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -73024,76 +74276,76 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:15
 #: 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:25
+#: accounts/report/pos_register/pos_register.js:24
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:15
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:24
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:55
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:55
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:23
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:54
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:54
 #: accounts/report/trial_balance/trial_balance.js:43
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:43
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:22
-#: buying/report/procurement_tracker/procurement_tracker.js:34
-#: buying/report/purchase_analytics/purchase_analytics.js:43
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:26
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:26
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:23
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:30
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:30
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:21
+#: buying/report/procurement_tracker/procurement_tracker.js:33
+#: buying/report/purchase_analytics/purchase_analytics.js:42
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:25
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:25
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:22
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:29
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:29
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:24
 #: crm/report/campaign_efficiency/campaign_efficiency.js:13
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:16
-#: crm/report/lead_conversion_time/lead_conversion_time.js:16
-#: crm/report/lead_details/lead_details.js:24
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:15
+#: crm/report/lead_conversion_time/lead_conversion_time.js:15
+#: crm/report/lead_details/lead_details.js:23
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:13
-#: crm/report/lost_opportunity/lost_opportunity.js:24
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:29
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:21
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:22
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:15
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:24
-#: manufacturing/report/process_loss_report/process_loss_report.js:37
-#: manufacturing/report/production_analytics/production_analytics.js:24
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:15
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:24
+#: crm/report/lost_opportunity/lost_opportunity.js:23
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:27
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:20
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:23
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:16
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:36
+#: manufacturing/report/production_analytics/production_analytics.js:23
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:14
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:23
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:14
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:14
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:37
-#: public/js/stock_analytics.js:48
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:16
-#: regional/report/uae_vat_201/uae_vat_201.js:24
-#: regional/report/vat_audit_report/vat_audit_report.js:25
-#: selling/page/sales_funnel/sales_funnel.js:40
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:13
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:34
+#: public/js/stock_analytics.js:75
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:15
+#: regional/report/uae_vat_201/uae_vat_201.js:23
+#: regional/report/vat_audit_report/vat_audit_report.js:24
+#: selling/page/sales_funnel/sales_funnel.js:44
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:31
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:26
-#: selling/report/sales_analytics/sales_analytics.js:43
-#: selling/report/sales_order_analysis/sales_order_analysis.js:26
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:29
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:28
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:29
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:25
+#: selling/report/sales_analytics/sales_analytics.js:50
+#: selling/report/sales_order_analysis/sales_order_analysis.js:25
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:27
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:27
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:27
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:27
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:16
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:24
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:24
-#: stock/report/delayed_item_report/delayed_item_report.js:24
-#: stock/report/delayed_order_report/delayed_order_report.js:24
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:28
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:22
+#: stock/report/delayed_item_report/delayed_item_report.js:23
+#: stock/report/delayed_order_report/delayed_order_report.js:23
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:27
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:14
-#: stock/report/reserved_stock/reserved_stock.js:26
+#: stock/report/reserved_stock/reserved_stock.js:23
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:22
-#: stock/report/stock_analytics/stock_analytics.js:70
+#: stock/report/stock_analytics/stock_analytics.js:69
 #: stock/report/stock_balance/stock_balance.js:24
 #: stock/report/stock_ledger/stock_ledger.js:23
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:22
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:17
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:16
-#: support/report/issue_analytics/issue_analytics.js:32
-#: support/report/issue_summary/issue_summary.js:32
-#: support/report/support_hour_distribution/support_hour_distribution.js:15
-#: utilities/report/youtube_interactions/youtube_interactions.js:15
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:16
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:15
+#: support/report/issue_analytics/issue_analytics.js:31
+#: support/report/issue_summary/issue_summary.js:31
+#: support/report/support_hour_distribution/support_hour_distribution.js:14
+#: utilities/report/youtube_interactions/youtube_interactions.js:14
 msgid "To Date"
 msgstr "إلى تاريخ"
 
@@ -73199,7 +74451,7 @@
 msgid "To Date"
 msgstr "إلى تاريخ"
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 #: setup/doctype/holiday_list/holiday_list.py:115
 msgid "To Date cannot be before From Date"
 msgstr "(الى تاريخ) لا يمكن ان يكون قبل (من تاريخ)"
@@ -73228,8 +74480,8 @@
 msgid "To Datetime"
 msgstr "إلى التاريخ والوقت"
 
-#: selling/doctype/sales_order/sales_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:30
+#: selling/doctype/sales_order/sales_order_list.js:32
+#: selling/doctype/sales_order/sales_order_list.js:42
 msgid "To Deliver"
 msgstr "لتسليم"
 
@@ -73246,7 +74498,7 @@
 msgid "To Deliver"
 msgstr "لتسليم"
 
-#: selling/doctype/sales_order/sales_order_list.js:26
+#: selling/doctype/sales_order/sales_order_list.js:36
 msgid "To Deliver and Bill"
 msgstr "للتسليم و الفوترة"
 
@@ -73275,7 +74527,7 @@
 msgid "To Doctype"
 msgstr ""
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:85
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:83
 msgid "To Due Date"
 msgstr ""
 
@@ -73285,7 +74537,7 @@
 msgid "To Employee"
 msgstr "إلى الموظف"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:53
+#: accounts/report/budget_variance_report/budget_variance_report.js:51
 msgid "To Fiscal Year"
 msgstr "إلى السنة المالية"
 
@@ -73325,8 +74577,8 @@
 msgid "To Package No."
 msgstr "لحزم رقم"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:12
-#: selling/doctype/sales_order/sales_order_list.js:14
+#: buying/doctype/purchase_order/purchase_order_list.js:21
+#: selling/doctype/sales_order/sales_order_list.js:25
 msgid "To Pay"
 msgstr ""
 
@@ -73348,8 +74600,8 @@
 msgid "To Payment Date"
 msgstr ""
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:44
-#: manufacturing/report/work_order_summary/work_order_summary.js:30
+#: manufacturing/report/job_card_summary/job_card_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:29
 msgid "To Posting Date"
 msgstr "إلى تاريخ الإرسال"
 
@@ -73365,7 +74617,7 @@
 msgid "To Range"
 msgstr "تتراوح"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:18
+#: buying/doctype/purchase_order/purchase_order_list.js:30
 msgid "To Receive"
 msgstr "للأستلام"
 
@@ -73375,7 +74627,7 @@
 msgid "To Receive"
 msgstr "للأستلام"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: buying/doctype/purchase_order/purchase_order_list.js:25
 msgid "To Receive and Bill"
 msgstr "للأستلام و الفوترة"
 
@@ -73411,6 +74663,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:92
 #: manufacturing/report/job_card_summary/job_card_summary.py:180
+#: templates/pages/timelog_info.html:34
 msgid "To Time"
 msgstr "إلى وقت"
 
@@ -73492,7 +74745,8 @@
 msgid "To Value"
 msgstr "إلى القيمة"
 
-#: stock/doctype/batch/batch.js:83
+#: manufacturing/doctype/plant_floor/plant_floor.js:196
+#: stock/doctype/batch/batch.js:93
 msgid "To Warehouse"
 msgstr "لمستودع"
 
@@ -73502,11 +74756,11 @@
 msgid "To Warehouse (Optional)"
 msgstr "إلى مستودع (اختياري)"
 
-#: manufacturing/doctype/bom/bom.js:735
+#: manufacturing/doctype/bom/bom.js:768
 msgid "To add Operations tick the 'With Operations' checkbox."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:550
+#: manufacturing/doctype/production_plan/production_plan.js:598
 msgid "To add subcontracted Item's raw materials if include exploded items is disabled."
 msgstr ""
 
@@ -73531,11 +74785,11 @@
 msgid "To be Delivered to Customer"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:521
+#: accounts/doctype/sales_invoice/sales_invoice.py:534
 msgid "To cancel a {} you need to cancel the POS Closing Entry {}."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:99
+#: accounts/doctype/payment_request/payment_request.py:100
 msgid "To create a Payment Request reference document is required"
 msgstr "لإنشاء مستند مرجع طلب الدفع مطلوب"
 
@@ -73547,12 +74801,12 @@
 msgid "To enable Capital Work in Progress Accounting,"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:545
+#: manufacturing/doctype/production_plan/production_plan.js:591
 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:1625
-#: controllers/accounts_controller.py:2559
+#: accounts/doctype/payment_entry/payment_entry.py:1644
+#: controllers/accounts_controller.py:2644
 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
 msgstr "ل تشمل الضريبة في الصف {0} في معدل الإغلاق ، {1} ويجب أيضا تضمين الضرائب في الصفوف"
 
@@ -73560,7 +74814,7 @@
 msgid "To merge, following properties must be same for both items"
 msgstr "لدمج ، يجب أن يكون نفس الخصائص التالية ل كلا البندين"
 
-#: accounts/doctype/account/account.py:498
+#: accounts/doctype/account/account.py:517
 msgid "To overrule this, enable '{0}' in company {1}"
 msgstr "لإلغاء هذا ، قم بتمكين &quot;{0}&quot; في الشركة {1}"
 
@@ -73568,11 +74822,11 @@
 msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
 msgstr "للاستمرار في تعديل قيمة السمة هذه ، قم بتمكين {0} في إعدادات متغير العنصر."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:578
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:582
 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:598
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:602
 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
 msgstr ""
 
@@ -73582,12 +74836,12 @@
 msgstr ""
 
 #: accounts/report/financial_statements.py:576
-#: accounts/report/general_ledger/general_ledger.py:273
+#: accounts/report/general_ledger/general_ledger.py:286
 #: accounts/report/trial_balance/trial_balance.py:278
 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:174
+#: selling/page/point_of_sale/pos_controller.js:192
 msgid "Toggle Recent Orders"
 msgstr "تبديل الطلبات الأخيرة"
 
@@ -73597,16 +74851,20 @@
 msgid "Token Endpoint"
 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:485
-#: buying/doctype/purchase_order/purchase_order.js:541
-#: buying/doctype/request_for_quotation/request_for_quotation.js:57
-#: buying/doctype/request_for_quotation/request_for_quotation.js:143
-#: buying/doctype/request_for_quotation/request_for_quotation.js:381
-#: buying/doctype/request_for_quotation/request_for_quotation.js:387
-#: buying/doctype/supplier_quotation/supplier_quotation.js:55
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:116
+#: buying/doctype/purchase_order/purchase_order.js:560
+#: buying/doctype/purchase_order/purchase_order.js:636
+#: 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
+#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: buying/doctype/supplier_quotation/supplier_quotation.js:58
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:121
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: stock/workspace/stock/stock.json
 msgid "Tools"
@@ -73621,10 +74879,13 @@
 #: 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/general_ledger/general_ledger.py:56
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:636
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:642
 #: accounts/report/profitability_analysis/profitability_analysis.py:93
 #: accounts/report/profitability_analysis/profitability_analysis.py:98
 #: accounts/report/trial_balance/trial_balance.py:344
@@ -73820,6 +75081,11 @@
 msgid "Total Achieved"
 msgstr "الإجمالي المحقق"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Active Items"
+msgstr ""
+
 #: accounts/report/budget_variance_report/budget_variance_report.py:125
 msgid "Total Actual"
 msgstr "الإجمالي الفعلي"
@@ -73878,7 +75144,7 @@
 msgid "Total Allocations"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:233
 #: 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
@@ -73922,7 +75188,7 @@
 msgid "Total Amount in Words"
 msgstr "إجمالي المبلغ بالنص"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:181
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:209
 msgid "Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges"
 msgstr "مجموع الرسوم المطبقة في شراء طاولة إيصال عناصر يجب أن يكون نفس مجموع الضرائب والرسوم"
 
@@ -74038,7 +75304,7 @@
 msgid "Total Commission"
 msgstr "مجموع العمولة"
 
-#: manufacturing/doctype/job_card/job_card.py:667
+#: manufacturing/doctype/job_card/job_card.py:674
 #: manufacturing/report/job_card_summary/job_card_summary.py:174
 msgid "Total Completed Qty"
 msgstr "إجمالي الكمية المكتملة"
@@ -74055,11 +75321,11 @@
 msgid "Total Consumed Material Cost (via Stock Entry)"
 msgstr "إجمالي تكلفة المواد المستهلكة (عبر إدخال المخزون)"
 
-#: setup/doctype/sales_person/sales_person.js:12
+#: setup/doctype/sales_person/sales_person.js:17
 msgid "Total Contribution Amount Against Invoices: {0}"
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person.js:9
+#: setup/doctype/sales_person/sales_person.js:10
 msgid "Total Contribution Amount Against Orders: {0}"
 msgstr ""
 
@@ -74105,7 +75371,7 @@
 msgid "Total Credit"
 msgstr "إجمالي الائتمان"
 
-#: accounts/doctype/journal_entry/journal_entry.py:225
+#: accounts/doctype/journal_entry/journal_entry.py:241
 msgid "Total Credit/ Debit Amount should be same as linked Journal Entry"
 msgstr "يجب أن يكون إجمالي مبلغ الائتمان / المدين هو نفسه المرتبطة بإدخال المجلة"
 
@@ -74115,7 +75381,7 @@
 msgid "Total Debit"
 msgstr "مجموع الخصم"
 
-#: accounts/doctype/journal_entry/journal_entry.py:802
+#: accounts/doctype/journal_entry/journal_entry.py:829
 msgid "Total Debit must be equal to Total Credit. The difference is {0}"
 msgstr "يجب أن يكون إجمالي الخصم يساوي إجمالي الائتمان ."
 
@@ -74185,6 +75451,16 @@
 msgid "Total Income This Year"
 msgstr "إجمالي الدخل هذا العام"
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
@@ -74198,6 +75474,7 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:196
+#: accounts/report/accounts_receivable/accounts_receivable.html:160
 msgid "Total Invoiced Amount"
 msgstr "إجمالي مبلغ الفاتورة"
 
@@ -74205,6 +75482,10 @@
 msgid "Total Issues"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Total Items"
+msgstr ""
+
 #: accounts/report/balance_sheet/balance_sheet.py:208
 msgid "Total Liability"
 msgstr ""
@@ -74313,7 +75594,7 @@
 msgid "Total Order Value"
 msgstr "مجموع قيمة الطلب"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:629
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:635
 msgid "Total Other Charges"
 msgstr ""
 
@@ -74321,13 +75602,25 @@
 msgid "Total Outgoing"
 msgstr "مجموع المنتهية ولايته"
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Total Outgoing Value (Consumption)"
 msgstr ""
 
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:9
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:97
+#: accounts/report/accounts_receivable/accounts_receivable.html:79
 msgid "Total Outstanding"
 msgstr "إجمالي المعلقة"
 
@@ -74338,18 +75631,20 @@
 msgstr "إجمالي المعلقة"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:205
+#: accounts/report/accounts_receivable/accounts_receivable.html:163
 msgid "Total Outstanding Amount"
 msgstr "إجمالي المبلغ المستحق"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:197
+#: accounts/report/accounts_receivable/accounts_receivable.html:161
 msgid "Total Paid Amount"
 msgstr "إجمالي المبلغ المدفوع"
 
-#: controllers/accounts_controller.py:2266
+#: controllers/accounts_controller.py:2358
 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
 msgstr "يجب أن يكون إجمالي مبلغ الدفع في جدول الدفع مساويا للمجموع الكبير / المستدير"
 
-#: accounts/doctype/payment_request/payment_request.py:112
+#: accounts/doctype/payment_request/payment_request.py:115
 msgid "Total Payment Request amount cannot be greater than {0} amount"
 msgstr "لا يمكن أن يكون إجمالي مبلغ طلب الدفع أكبر من {0} المبلغ"
 
@@ -74381,7 +75676,7 @@
 msgid "Total Purchase Cost (via Purchase Invoice)"
 msgstr "مجموع تكلفة الشراء (عن طريق شراء الفاتورة)"
 
-#: projects/doctype/project/project.js:107
+#: projects/doctype/project/project.js:131
 msgid "Total Purchase Cost has been updated"
 msgstr ""
 
@@ -74397,6 +75692,8 @@
 msgstr "إجمالي الكمية"
 
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:23
+#: selling/page/point_of_sale/pos_item_cart.js:520
+#: selling/page/point_of_sale/pos_item_cart.js:524
 msgid "Total Quantity"
 msgstr "الكمية الإجمالية"
 
@@ -74507,6 +75804,11 @@
 msgid "Total Stock Summary"
 msgstr "ملخص إجمالي المخزون"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Stock Value"
+msgstr ""
+
 #. Label of a Float field in DocType 'Purchase Order Item Supplied'
 #: buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
 msgctxt "Purchase Order Item Supplied"
@@ -74529,7 +75831,7 @@
 msgid "Total Tasks"
 msgstr "إجمالي المهام"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:622
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:628
 #: accounts/report/purchase_register/purchase_register.py:263
 msgid "Total Tax"
 msgstr "مجموع الضرائب"
@@ -74670,7 +75972,7 @@
 msgid "Total Time in Mins"
 msgstr "إجمالي الوقت بالدقائق"
 
-#: public/js/utils.js:105
+#: public/js/utils.js:129
 msgid "Total Unpaid: {0}"
 msgstr "عدد غير مدفوع: {0}"
 
@@ -74701,6 +76003,11 @@
 msgid "Total Views"
 msgstr ""
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Warehouses"
+msgstr ""
+
 #. Label of a Float field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
 msgctxt "Delivery Note Item"
@@ -74761,20 +76068,34 @@
 msgid "Total Working Hours"
 msgstr "مجموع ساعات العمل"
 
-#: controllers/accounts_controller.py:1838
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Total Working Hours"
+msgstr "مجموع ساعات العمل"
+
+#: controllers/accounts_controller.py:1930
 msgid "Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})"
 msgstr "مجموع مقدما ({0}) ضد النظام {1} لا يمكن أن يكون أكبر من المجموع الكلي ({2})"
 
-#: controllers/selling_controller.py:186
+#: controllers/selling_controller.py:187
 msgid "Total allocated percentage for sales team should be 100"
 msgstr "مجموع النسبة المئوية المخصصة ل فريق المبيعات يجب أن يكون 100"
 
+#: manufacturing/doctype/workstation/workstation.py:229
+msgid "Total completed quantity: {0}"
+msgstr ""
+
 #: selling/doctype/customer/customer.py:157
 msgid "Total contribution percentage should be equal to 100"
 msgstr "يجب أن تكون نسبة المساهمة الإجمالية مساوية 100"
 
+#: projects/doctype/project/project_dashboard.html:2
+msgid "Total hours: {0}"
+msgstr ""
+
 #: accounts/doctype/pos_invoice/pos_invoice.py:444
-#: accounts/doctype/sales_invoice/sales_invoice.py:505
+#: accounts/doctype/sales_invoice/sales_invoice.py:518
 msgid "Total payments amount can't be greater than {}"
 msgstr "لا يمكن أن يكون إجمالي المدفوعات أكبر من {}"
 
@@ -74789,7 +76110,7 @@
 msgid "Total {0} ({1})"
 msgstr "إجمالي {0} ({1})"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:162
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:190
 msgid "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'"
 msgstr "إجمالي {0} لجميع العناصر هو صفر، قد يكون عليك تغيير 'توزيع الرسوم على أساس'\\n<br>\\nTotal {0} for all items is zero, may be you should change 'Distribute Charges Based On'"
 
@@ -74802,6 +76123,7 @@
 msgstr "إجمالي (الكمية)"
 
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.py:88
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Totals"
 msgstr "المجاميع"
 
@@ -74886,6 +76208,11 @@
 msgid "Track Service Level Agreement"
 msgstr "تتبع اتفاقية مستوى الخدمة"
 
+#. Description of a DocType
+#: accounts/doctype/cost_center/cost_center.json
+msgid "Track separate Income and Expense for product verticals or divisions."
+msgstr ""
+
 #. Label of a Select field in DocType 'Shipment'
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
@@ -74904,7 +76231,7 @@
 msgid "Tracking URL"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: manufacturing/doctype/workstation/workstation_dashboard.py:10
 msgid "Transaction"
 msgstr "حركة"
@@ -74946,7 +76273,7 @@
 msgstr "عملية العملات"
 
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:66
-#: selling/report/territory_wise_sales/territory_wise_sales.js:11
+#: selling/report/territory_wise_sales/territory_wise_sales.js:9
 msgid "Transaction Date"
 msgstr "تاريخ المعاملة"
 
@@ -74986,12 +76313,21 @@
 msgid "Transaction Date"
 msgstr "تاريخ المعاملة"
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:490
+msgid "Transaction Deletion Document: {0} is running for this Company. {1}"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
 msgid "Transaction Deletion Record"
 msgstr ""
 
 #. Name of a DocType
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgid "Transaction Deletion Record Details"
+msgstr ""
+
+#. Name of a DocType
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgid "Transaction Deletion Record Item"
 msgstr ""
@@ -75032,7 +76368,7 @@
 msgid "Transaction Settings"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:256
 msgid "Transaction Type"
 msgstr "نوع المعاملة"
 
@@ -75042,7 +76378,7 @@
 msgid "Transaction Type"
 msgstr "نوع المعاملة"
 
-#: accounts/doctype/payment_request/payment_request.py:122
+#: accounts/doctype/payment_request/payment_request.py:125
 msgid "Transaction currency must be same as Payment Gateway currency"
 msgstr "يجب أن تكون العملة المعاملة نفس العملة بوابة الدفع"
 
@@ -75050,15 +76386,15 @@
 msgid "Transaction currency: {0} cannot be different from Bank Account({1}) currency: {2}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:647
+#: manufacturing/doctype/job_card/job_card.py:654
 msgid "Transaction not allowed against stopped Work Order {0}"
 msgstr "المعاملة غير مسموح بها في مقابل أمر العمل المتوقف {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1112
+#: accounts/doctype/payment_entry/payment_entry.py:1121
 msgid "Transaction reference no {0} dated {1}"
 msgstr "إشارة عملية لا {0} بتاريخ {1}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: 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
@@ -75073,12 +76409,12 @@
 msgid "Transactions Annual History"
 msgstr "المعاملات السنوية التاريخ"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:107
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:117
 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:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:364
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:208
 msgid "Transfer"
 msgstr "نقل"
 
@@ -75107,11 +76443,11 @@
 msgid "Transfer"
 msgstr "نقل"
 
-#: assets/doctype/asset/asset.js:83
+#: assets/doctype/asset/asset.js:84
 msgid "Transfer Asset"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:318
+#: manufacturing/doctype/production_plan/production_plan.js:345
 msgid "Transfer From Warehouses"
 msgstr ""
 
@@ -75127,7 +76463,7 @@
 msgid "Transfer Material Against"
 msgstr "نقل المواد ضد"
 
-#: manufacturing/doctype/production_plan/production_plan.js:313
+#: manufacturing/doctype/production_plan/production_plan.js:340
 msgid "Transfer Materials For Warehouse {0}"
 msgstr "نقل المواد للمستودع {0}"
 
@@ -75147,7 +76483,7 @@
 msgid "Transfer Type"
 msgstr "نوع النقل"
 
-#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:31
 msgid "Transferred"
 msgstr "نقل"
 
@@ -75157,6 +76493,7 @@
 msgid "Transferred"
 msgstr "نقل"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:96
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:131
 msgid "Transferred Qty"
 msgstr "نقل الكمية"
@@ -75193,7 +76530,7 @@
 msgid "Transit"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:371
+#: stock/doctype/stock_entry/stock_entry.js:425
 msgid "Transit Entry"
 msgstr ""
 
@@ -75274,8 +76611,8 @@
 msgid "Tree Details"
 msgstr "تفاصيل شجرة"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:9
-#: selling/report/sales_analytics/sales_analytics.js:9
+#: buying/report/purchase_analytics/purchase_analytics.js:8
+#: selling/report/sales_analytics/sales_analytics.js:8
 msgid "Tree Type"
 msgstr "نوع الشجرة"
 
@@ -75555,10 +76892,11 @@
 #: 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
+#: 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:63 public/js/utils.js:632
-#: selling/doctype/sales_order/sales_order.js:999
+#: public/js/stock_analytics.js:94 public/js/utils.js:693
+#: 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
 #: setup/doctype/uom/uom.json
@@ -75889,7 +77227,7 @@
 msgid "UOM Conversion Factor"
 msgstr "عامل تحويل وحدة القياس"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1248
+#: manufacturing/doctype/production_plan/production_plan.py:1270
 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
 msgstr "معامل تحويل UOM ({0} -&gt; {1}) غير موجود للعنصر: {2}"
 
@@ -75903,7 +77241,7 @@
 msgid "UOM Name"
 msgstr "اسم وحدة القايس"
 
-#: stock/doctype/stock_entry/stock_entry.py:2773
+#: stock/doctype/stock_entry/stock_entry.py:2809
 msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
 msgstr ""
 
@@ -75947,7 +77285,7 @@
 msgid "URL can only be a string"
 msgstr "يمكن أن يكون عنوان URL عبارة عن سلسلة فقط"
 
-#: public/js/utils/unreconcile.js:20
+#: public/js/utils/unreconcile.js:24
 msgid "UnReconcile"
 msgstr ""
 
@@ -75959,15 +77297,15 @@
 msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100"
 msgstr "تعذر العثور على النتيجة بدءا من {0}. يجب أن يكون لديك درجات دائمة تغطي 0 إلى 100"
 
-#: manufacturing/doctype/work_order/work_order.py:603
-msgid "Unable to find the time slot in the next {0} days for the operation {1}."
-msgstr "يتعذر العثور على الفاصل الزمني في الأيام {0} التالية للعملية {1}."
+#: manufacturing/doctype/work_order/work_order.py:613
+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
 msgid "Unable to find variable:"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:79
+#: public/js/bank_reconciliation_tool/data_table_manager.js:74
 msgid "Unallocated Amount"
 msgstr "المبلغ غير المخصصة"
 
@@ -75987,7 +77325,7 @@
 msgid "Unassigned Qty"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:115
 msgid "Unblock Invoice"
 msgstr "الافراج عن الفاتورة"
 
@@ -76036,7 +77374,7 @@
 msgid "Under Warranty"
 msgstr "تحت الضمان"
 
-#: manufacturing/doctype/workstation/workstation.js:52
+#: manufacturing/doctype/workstation/workstation.js:78
 msgid "Under Working Hours table, you can add start and end times for a Workstation. For example, a Workstation may be active from 9 am to 1 pm, then 2 pm to 5 pm. You can also specify the working hours based on shifts. While scheduling a Work Order, the system will check for the availability of the Workstation based on the working hours specified."
 msgstr ""
 
@@ -76067,11 +77405,12 @@
 msgid "Units of Measure"
 msgstr "وحدات القياس"
 
-#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:12
+#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:10
+#: projects/doctype/project/project_dashboard.html:7
 msgid "Unknown"
 msgstr "غير معروف"
 
-#: public/js/call_popup/call_popup.js:109
+#: public/js/call_popup/call_popup.js:110
 msgid "Unknown Caller"
 msgstr "غير معروف المتصل"
 
@@ -76087,7 +77426,7 @@
 msgid "Unlink Payment on Cancellation of Invoice"
 msgstr "إلغاء ربط الدفع على إلغاء الفاتورة"
 
-#: accounts/doctype/bank_account/bank_account.js:34
+#: accounts/doctype/bank_account/bank_account.js:33
 msgid "Unlink external integrations"
 msgstr "إلغاء ربط التكامل الخارجي"
 
@@ -76097,7 +77436,7 @@
 msgid "Unlinked"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:258
+#: accounts/doctype/sales_invoice/sales_invoice.py:263
 #: accounts/doctype/subscription/subscription_list.js:12
 msgid "Unpaid"
 msgstr "غير مدفوع"
@@ -76231,20 +77570,24 @@
 msgid "Unreconciled Entries"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:74
-#: stock/doctype/pick_list/pick_list.js:114
+#: selling/doctype/sales_order/sales_order.js:90
+#: stock/doctype/pick_list/pick_list.js:134
 msgid "Unreserve"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:418
+#: selling/doctype/sales_order/sales_order.js:448
 msgid "Unreserve Stock"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:430
-#: stock/doctype/pick_list/pick_list.js:252
+#: selling/doctype/sales_order/sales_order.js:460
+#: stock/doctype/pick_list/pick_list.js:286
 msgid "Unreserving Stock..."
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Unresolve"
+msgstr ""
+
 #: accounts/doctype/dunning/dunning_list.js:6
 msgid "Unresolved"
 msgstr "لم تحل"
@@ -76296,6 +77639,7 @@
 msgstr "إلغاء اشتراكك"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:37
+#: accounts/report/accounts_receivable/accounts_receivable.html:24
 msgid "Until"
 msgstr "حتى"
 
@@ -76323,22 +77667,23 @@
 msgid "Upcoming Calendar Events "
 msgstr "أحداث التقويم القادمة"
 
-#: accounts/doctype/account/account.js:210
-#: accounts/doctype/cost_center/cost_center.js:102
-#: public/js/bom_configurator/bom_configurator.bundle.js:367
-#: public/js/utils.js:551 public/js/utils.js:767
-#: public/js/utils/barcode_scanner.js:176
+#: 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/barcode_scanner.js:183
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:164
+#: templates/pages/task_info.html:22
 msgid "Update"
 msgstr "تحديث"
 
-#: accounts/doctype/account/account.js:58
+#: accounts/doctype/account/account.js:53
 msgid "Update Account Name / Number"
 msgstr "تحديث اسم / رقم الحساب"
 
-#: accounts/doctype/account/account.js:158
+#: accounts/doctype/account/account.js:159
 msgid "Update Account Number / Name"
 msgstr "تحديث رقم الحساب / الاسم"
 
@@ -76384,7 +77729,7 @@
 msgid "Update Auto Repeat Reference"
 msgstr "تحديث السيارات تكرار المرجع"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:35
 msgid "Update BOM Cost Automatically"
 msgstr "تحديث بوم التكلفة تلقائيا"
 
@@ -76413,6 +77758,18 @@
 msgid "Update Billed Amount in Delivery Note"
 msgstr ""
 
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Order"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Receipt"
+msgstr ""
+
 #. Label of a Check field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -76425,9 +77782,9 @@
 msgid "Update Billed Amount in Sales Order"
 msgstr "تحديث مبلغ فاتورة في أمر المبيعات"
 
-#: accounts/doctype/bank_clearance/bank_clearance.js:57
-#: accounts/doctype/bank_clearance/bank_clearance.js:71
-#: accounts/doctype/bank_clearance/bank_clearance.js:76
+#: accounts/doctype/bank_clearance/bank_clearance.js:53
+#: accounts/doctype/bank_clearance/bank_clearance.js:67
+#: accounts/doctype/bank_clearance/bank_clearance.js:72
 msgid "Update Clearance Date"
 msgstr "تحديث تاريخ التخليص"
 
@@ -76437,7 +77794,7 @@
 msgid "Update Consumed Material Cost In Project"
 msgstr "تحديث تكلفة المواد المستهلكة في المشروع"
 
-#: manufacturing/doctype/bom/bom.js:100
+#: manufacturing/doctype/bom/bom.js:99
 msgid "Update Cost"
 msgstr "تحديث التكلفة"
 
@@ -76453,12 +77810,12 @@
 msgid "Update Cost"
 msgstr "تحديث التكلفة"
 
-#: accounts/doctype/cost_center/cost_center.js:21
-#: accounts/doctype/cost_center/cost_center.js:50
+#: accounts/doctype/cost_center/cost_center.js:19
+#: accounts/doctype/cost_center/cost_center.js:52
 msgid "Update Cost Center Name / Number"
 msgstr "تحديث اسم / رقم مركز التكلفة"
 
-#: stock/doctype/pick_list/pick_list.js:99
+#: stock/doctype/pick_list/pick_list.js:104
 msgid "Update Current Stock"
 msgstr "تحديث المخزون الحالي"
 
@@ -76475,12 +77832,24 @@
 msgid "Update Existing Records"
 msgstr "تحديث السجلات الموجودة"
 
-#: buying/doctype/purchase_order/purchase_order.js:275 public/js/utils.js:721
-#: selling/doctype/sales_order/sales_order.js:56
+#: buying/doctype/purchase_order/purchase_order.js:301 public/js/utils.js:793
+#: selling/doctype/sales_order/sales_order.js:63
 msgid "Update Items"
 msgstr "تحديث العناصر"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Update Print Format"
 msgstr "تحديث تنسيق الطباعة"
 
@@ -76490,7 +77859,7 @@
 msgid "Update Rate and Availability"
 msgstr "معدل التحديث والتوفر"
 
-#: buying/doctype/purchase_order/purchase_order.js:475
+#: buying/doctype/purchase_order/purchase_order.js:549
 msgid "Update Rate as per Last Purchase"
 msgstr ""
 
@@ -76523,7 +77892,7 @@
 msgid "Update Stock Opening Balance"
 msgstr ""
 
-#: projects/doctype/project/project.js:71
+#: projects/doctype/project/project.js:82
 msgid "Update Total Purchase Cost"
 msgstr ""
 
@@ -76545,7 +77914,7 @@
 msgid "Update latest price in all BOMs"
 msgstr "تحديث آخر الأسعار في جميع بومس"
 
-#: assets/doctype/asset/asset.py:338
+#: assets/doctype/asset/asset.py:340
 msgid "Update stock must be enabled for the purchase invoice {0}"
 msgstr ""
 
@@ -76565,19 +77934,19 @@
 msgid "Updating Opening Balances"
 msgstr ""
 
-#: stock/doctype/item/item.py:1348
+#: stock/doctype/item/item.py:1349
 msgid "Updating Variants..."
 msgstr "جارٍ تحديث المتغيرات ..."
 
-#: manufacturing/doctype/work_order/work_order.js:788
+#: manufacturing/doctype/work_order/work_order.js:847
 msgid "Updating Work Order status"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:48
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:46
 msgid "Updating {0} of {1}, {2}"
 msgstr "تحديث {0} من {1} ، {2}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:44
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:43
 msgid "Upload Bank Statement"
 msgstr ""
 
@@ -76598,7 +77967,7 @@
 msgid "Urgent"
 msgstr "عاجل"
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:37
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:36
 msgid "Use 'Repost in background' button to trigger background job. Job can only be triggered when document is in Queued or Failed status."
 msgstr ""
 
@@ -76634,6 +78003,12 @@
 msgid "Use Google Maps Direction API to optimize route"
 msgstr "استخدم Google Maps Direction API لتحسين المسار"
 
+#. Label of a Check field in DocType 'Currency Exchange Settings'
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
+msgctxt "Currency Exchange Settings"
+msgid "Use HTTP Protocol"
+msgstr ""
+
 #. Label of a Check field in DocType 'Stock Reposting Settings'
 #: stock/doctype/stock_reposting_settings/stock_reposting_settings.json
 msgctxt "Stock Reposting Settings"
@@ -76652,6 +78027,84 @@
 msgid "Use Multi-Level BOM"
 msgstr "استخدام متعدد المستويات BOM"
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Use Serial / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Asset Capitalization Stock Item'
+#: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
+msgctxt "Asset Capitalization Stock Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Delivery Note Item'
+#: stock/doctype/delivery_note_item/delivery_note_item.json
+msgctxt "Delivery Note Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'POS Invoice Item'
+#: accounts/doctype/pos_invoice_item/pos_invoice_item.json
+msgctxt "POS Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Packed Item'
+#: stock/doctype/packed_item/packed_item.json
+msgctxt "Packed Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Pick List Item'
+#: stock/doctype/pick_list_item/pick_list_item.json
+msgctxt "Pick List Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice Item'
+#: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+msgctxt "Purchase Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Receipt Item'
+#: stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+msgctxt "Purchase Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice Item'
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.json
+msgctxt "Sales Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Entry Detail'
+#: stock/doctype/stock_entry_detail/stock_entry_detail.json
+msgctxt "Stock Entry Detail"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Reconciliation Item'
+#: stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+msgctxt "Stock Reconciliation Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Item'
+#: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgctxt "Subcontracting Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Supplied Item'
+#: subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
+msgctxt "Subcontracting Receipt Supplied Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
 #. Label of a Check field in DocType 'Buying Settings'
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
@@ -76764,7 +78217,7 @@
 msgid "User ID not set for Employee {0}"
 msgstr "هوية المستخدم لم يتم تعيين موظف ل {0}"
 
-#: accounts/doctype/journal_entry/journal_entry.js:544
+#: accounts/doctype/journal_entry/journal_entry.js:607
 msgid "User Remark"
 msgstr "ملاحظة المستخدم"
 
@@ -76883,10 +78336,12 @@
 msgid "VAT Audit Report"
 msgstr ""
 
+#: regional/report/uae_vat_201/uae_vat_201.html:47
 #: regional/report/uae_vat_201/uae_vat_201.py:115
 msgid "VAT on Expenses and All Other Inputs"
 msgstr ""
 
+#: regional/report/uae_vat_201/uae_vat_201.html:15
 #: regional/report/uae_vat_201/uae_vat_201.py:45
 msgid "VAT on Sales and All Other Outputs"
 msgstr ""
@@ -76939,10 +78394,6 @@
 msgid "Valid From"
 msgstr "صالح من تاريخ"
 
-#: stock/doctype/item_price/item_price.py:62
-msgid "Valid From Date must be lesser than Valid Up To Date."
-msgstr ""
-
 #: regional/doctype/lower_deduction_certificate/lower_deduction_certificate.py:45
 msgid "Valid From date not in Fiscal Year {0}"
 msgstr "تاريخ صالح ليس في السنة المالية {0}"
@@ -76952,7 +78403,7 @@
 msgstr ""
 
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:265
-#: templates/pages/order.html:47
+#: templates/pages/order.html:59
 msgid "Valid Till"
 msgstr "صالح حتى"
 
@@ -77096,7 +78547,7 @@
 msgstr "تقييم"
 
 #: stock/report/stock_balance/stock_balance.js:76
-#: stock/report/stock_ledger/stock_ledger.js:88
+#: stock/report/stock_ledger/stock_ledger.js:96
 msgid "Valuation Field Type"
 msgstr ""
 
@@ -77113,8 +78564,8 @@
 #: accounts/report/gross_profit/gross_profit.py:266
 #: 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:449
-#: stock/report/stock_ledger/stock_ledger.py:207
+#: stock/report/stock_balance/stock_balance.py:457
+#: stock/report/stock_ledger/stock_ledger.py:280
 msgid "Valuation Rate"
 msgstr "سعر التقييم"
 
@@ -77179,6 +78630,12 @@
 msgid "Valuation Rate"
 msgstr "سعر التقييم"
 
+#. Label of a Float field in DocType 'Serial and Batch Entry'
+#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
+msgctxt "Serial and Batch Entry"
+msgid "Valuation Rate"
+msgstr "سعر التقييم"
+
 #. Label of a Currency field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
@@ -77201,11 +78658,11 @@
 msgid "Valuation Rate (In / Out)"
 msgstr ""
 
-#: stock/stock_ledger.py:1688
+#: stock/stock_ledger.py:1708
 msgid "Valuation Rate Missing"
 msgstr "معدل التقييم مفقود"
 
-#: stock/stock_ledger.py:1666
+#: stock/stock_ledger.py:1686
 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
 msgstr "معدل التقييم للعنصر {0} ، مطلوب لإجراء إدخالات محاسبية لـ {1} {2}."
 
@@ -77213,7 +78670,7 @@
 msgid "Valuation Rate is mandatory if Opening Stock entered"
 msgstr "معدل التقييم إلزامي إذا ادخلت قيمة مبدئية للمخزون\\n<br>\\nValuation Rate is mandatory if Opening Stock entered"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:514
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:568
 msgid "Valuation Rate required for Item {0} at row {1}"
 msgstr "معدل التقييم مطلوب للبند {0} في الصف {1}"
 
@@ -77224,12 +78681,12 @@
 msgid "Valuation and Total"
 msgstr "التقييم والمجموع"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:731
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:785
 msgid "Valuation rate for customer provided items has been set to zero."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1649
-#: controllers/accounts_controller.py:2583
+#: accounts/doctype/payment_entry/payment_entry.py:1668
+#: controllers/accounts_controller.py:2668
 msgid "Valuation type charges can not be marked as Inclusive"
 msgstr "لا يمكن تحديد رسوم نوع التقييم على أنها شاملة"
 
@@ -77237,10 +78694,10 @@
 msgid "Valuation type charges can not marked as Inclusive"
 msgstr "لا يمكن وضع علامة على رسوم التقييم على انها شاملة"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:28
-#: public/js/stock_analytics.js:37
-#: selling/report/sales_analytics/sales_analytics.js:28
-#: stock/report/stock_analytics/stock_analytics.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:27
+#: public/js/stock_analytics.js:49
+#: selling/report/sales_analytics/sales_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:26
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:95
 msgid "Value"
 msgstr "القيمة"
@@ -77303,7 +78760,7 @@
 msgid "Value Based Inspection"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:224
+#: stock/report/stock_ledger/stock_ledger.py:297
 msgid "Value Change"
 msgstr "قيمة التغير"
 
@@ -77313,9 +78770,9 @@
 msgid "Value Details"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:25
-#: selling/report/sales_analytics/sales_analytics.js:25
-#: stock/report/stock_analytics/stock_analytics.js:24
+#: buying/report/purchase_analytics/purchase_analytics.js:24
+#: selling/report/sales_analytics/sales_analytics.js:32
+#: stock/report/stock_analytics/stock_analytics.js:23
 msgid "Value Or Qty"
 msgstr "القيمة أو الكمية"
 
@@ -77337,11 +78794,11 @@
 msgid "Value of goods cannot be 0"
 msgstr ""
 
-#: public/js/stock_analytics.js:36
+#: public/js/stock_analytics.js:46
 msgid "Value or Qty"
 msgstr "القيمة أو الكمية"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:120
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:121
 msgid "Values Changed"
 msgstr "القيم التي تم تغييرها"
 
@@ -77372,7 +78829,7 @@
 msgid "Variance ({})"
 msgstr "التباين ({})"
 
-#: stock/doctype/item/item.js:110 stock/doctype/item/item_list.js:14
+#: stock/doctype/item/item.js:146 stock/doctype/item/item_list.js:22
 #: stock/report/item_variant_details/item_variant_details.py:74
 msgid "Variant"
 msgstr "مختلف"
@@ -77381,13 +78838,17 @@
 msgid "Variant Attribute Error"
 msgstr "خطأ في سمة المتغير"
 
+#: public/js/templates/item_quick_entry.html:1
+msgid "Variant Attributes"
+msgstr "سمات متفاوتة"
+
 #. Label of a Table field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
 msgid "Variant Attributes"
 msgstr "سمات متفاوتة"
 
-#: manufacturing/doctype/bom/bom.js:124
+#: manufacturing/doctype/bom/bom.js:128
 msgid "Variant BOM"
 msgstr "المتغير BOM"
 
@@ -77401,7 +78862,7 @@
 msgid "Variant Based On cannot be changed"
 msgstr "لا يمكن تغيير المتغير بناءً على"
 
-#: stock/doctype/item/item.js:98
+#: stock/doctype/item/item.js:122
 msgid "Variant Details Report"
 msgstr "تفاصيل تقرير التقرير"
 
@@ -77410,7 +78871,7 @@
 msgid "Variant Field"
 msgstr "الحقل البديل"
 
-#: manufacturing/doctype/bom/bom.js:219 manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/bom/bom.js:238 manufacturing/doctype/bom/bom.js:300
 msgid "Variant Item"
 msgstr "عنصر متغير"
 
@@ -77430,7 +78891,7 @@
 msgid "Variant Of"
 msgstr "البديل من"
 
-#: stock/doctype/item/item.js:543
+#: stock/doctype/item/item.js:610
 msgid "Variant creation has been queued."
 msgstr "وقد وضعت قائمة الانتظار في قائمة الانتظار."
 
@@ -77529,37 +78990,37 @@
 msgid "Video Settings"
 msgstr "اعدادات الفيديو"
 
-#: accounts/doctype/account/account.js:79
+#: accounts/doctype/account/account.js:74
 #: accounts/doctype/account/account.js:103
-#: accounts/doctype/account/account_tree.js:135
-#: accounts/doctype/account/account_tree.js:139
-#: accounts/doctype/account/account_tree.js:143
-#: accounts/doctype/cost_center/cost_center_tree.js:37
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:202
-#: accounts/doctype/journal_entry/journal_entry.js:29
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:619
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:8
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:11
-#: buying/doctype/supplier/supplier.js:88
-#: buying/doctype/supplier/supplier.js:92
-#: manufacturing/doctype/production_plan/production_plan.js:94
-#: projects/doctype/project/project.js:84
-#: projects/doctype/project/project.js:92
-#: public/js/controllers/stock_controller.js:64
-#: public/js/controllers/stock_controller.js:83 public/js/utils.js:133
-#: selling/doctype/customer/customer.js:157
-#: selling/doctype/customer/customer.js:162 setup/doctype/company/company.js:88
-#: setup/doctype/company/company.js:94 setup/doctype/company/company.js:100
-#: setup/doctype/company/company.js:106
-#: stock/doctype/delivery_trip/delivery_trip.js:71
-#: stock/doctype/item/item.js:63 stock/doctype/item/item.js:69
-#: stock/doctype/item/item.js:75 stock/doctype/item/item.js:92
-#: stock/doctype/item/item.js:96 stock/doctype/item/item.js:100
-#: stock/doctype/purchase_receipt/purchase_receipt.js:182
-#: stock/doctype/purchase_receipt/purchase_receipt.js:189
-#: stock/doctype/stock_entry/stock_entry.js:257
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:41
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:53
+#: accounts/doctype/account/account_tree.js:185
+#: accounts/doctype/account/account_tree.js:193
+#: accounts/doctype/account/account_tree.js:201
+#: accounts/doctype/cost_center/cost_center_tree.js:56
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:205
+#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:668
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
+#: buying/doctype/supplier/supplier.js:93
+#: buying/doctype/supplier/supplier.js:104
+#: manufacturing/doctype/production_plan/production_plan.js:98
+#: projects/doctype/project/project.js:100
+#: projects/doctype/project/project.js:117
+#: public/js/controllers/stock_controller.js:76
+#: public/js/controllers/stock_controller.js:95 public/js/utils.js:164
+#: selling/doctype/customer/customer.js:160
+#: selling/doctype/customer/customer.js:172 setup/doctype/company/company.js:90
+#: setup/doctype/company/company.js:100 setup/doctype/company/company.js:112
+#: setup/doctype/company/company.js:124
+#: stock/doctype/delivery_trip/delivery_trip.js:83
+#: stock/doctype/item/item.js:65 stock/doctype/item/item.js:75
+#: stock/doctype/item/item.js:85 stock/doctype/item/item.js:110
+#: stock/doctype/item/item.js:118 stock/doctype/item/item.js:126
+#: stock/doctype/purchase_receipt/purchase_receipt.js:207
+#: stock/doctype/purchase_receipt/purchase_receipt.js:218
+#: stock/doctype/stock_entry/stock_entry.js:287
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:44
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:60
 msgid "View"
 msgstr ""
 
@@ -77567,7 +79028,7 @@
 msgid "View BOM Update Log"
 msgstr ""
 
-#: public/js/setup_wizard.js:39
+#: public/js/setup_wizard.js:41
 msgid "View Chart of Accounts"
 msgstr "عرض الرسم البياني للحسابات"
 
@@ -77577,24 +79038,24 @@
 msgid "View Cost Center Tree"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:158
+#: accounts/doctype/payment_entry/payment_entry.js:183
 msgid "View Exchange Gain/Loss Journals"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:128
+#: assets/doctype/asset/asset.js:164
 #: assets/doctype/asset_repair/asset_repair.js:47
 msgid "View General Ledger"
 msgstr ""
 
-#: crm/doctype/campaign/campaign.js:11
+#: crm/doctype/campaign/campaign.js:15
 msgid "View Leads"
 msgstr "مشاهدة العملاء المحتملون"
 
-#: accounts/doctype/account/account_tree.js:193 stock/doctype/batch/batch.js:18
+#: accounts/doctype/account/account_tree.js:278 stock/doctype/batch/batch.js:18
 msgid "View Ledger"
 msgstr "عرض القيود"
 
-#: stock/doctype/serial_no/serial_no.js:29
+#: stock/doctype/serial_no/serial_no.js:28
 msgid "View Ledgers"
 msgstr ""
 
@@ -77617,6 +79078,10 @@
 msgid "View attachments"
 msgstr "عرض المرفقات"
 
+#: public/js/call_popup/call_popup.js:186
+msgid "View call log"
+msgstr ""
+
 #: utilities/report/youtube_interactions/youtube_interactions.py:25
 msgid "Views"
 msgstr ""
@@ -77666,9 +79131,9 @@
 msgid "Voucher"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.js:71
-#: stock/report/stock_ledger/stock_ledger.py:160
-#: stock/report/stock_ledger/stock_ledger.py:232
+#: stock/report/stock_ledger/stock_ledger.js:79
+#: stock/report/stock_ledger/stock_ledger.py:233
+#: stock/report/stock_ledger/stock_ledger.py:305
 msgid "Voucher #"
 msgstr "سند #"
 
@@ -77708,21 +79173,21 @@
 msgid "Voucher Name"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:273
-#: accounts/report/accounts_receivable/accounts_receivable.py:1050
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: accounts/report/accounts_receivable/accounts_receivable.py:1058
 #: 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_ledger/general_ledger.js:49
-#: accounts/report/general_ledger/general_ledger.py:625
-#: accounts/report/payment_ledger/payment_ledger.js:65
+#: accounts/report/general_ledger/general_ledger.py:638
+#: 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:61
+#: 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/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/reserved_stock/reserved_stock.js:80
+#: 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
@@ -77797,7 +79262,7 @@
 msgid "Voucher Qty"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:619
+#: accounts/report/general_ledger/general_ledger.py:632
 msgid "Voucher Subtype"
 msgstr ""
 
@@ -77807,25 +79272,25 @@
 msgid "Voucher Subtype"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1048
+#: 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:617
+#: accounts/report/general_ledger/general_ledger.py:630
 #: 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/voucher_wise_balance/voucher_wise_balance.py:17
-#: public/js/utils/unreconcile.js:60
+#: 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/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/reserved_stock/reserved_stock.js:68
+#: 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_ledger/stock_ledger.py:230
+#: 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
 msgid "Voucher Type"
@@ -77897,11 +79362,11 @@
 msgid "Voucher Type"
 msgstr "نوع السند"
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:177
+#: accounts/doctype/bank_transaction/bank_transaction.py:180
 msgid "Voucher {0} is over-allocated by {1}"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:249
+#: accounts/doctype/bank_transaction/bank_transaction.py:252
 msgid "Voucher {0} value is broken: {1}"
 msgstr ""
 
@@ -77990,12 +79455,12 @@
 msgid "Wages per hour"
 msgstr "الأجور في الساعة"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:251
+#: accounts/doctype/pos_invoice/pos_invoice.js:270
 msgid "Waiting for payment..."
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:55
+#: accounts/report/gross_profit/gross_profit.js:56
 #: accounts/report/gross_profit/gross_profit.py:251
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
 #: accounts/report/purchase_register/purchase_register.js:52
@@ -78003,58 +79468,62 @@
 #: 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
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:16
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:11
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:82
+#: 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/work_order_stock_report/work_order_stock_report.js:9
-#: public/js/stock_analytics.js:45 public/js/utils.js:498
-#: public/js/utils/serial_no_batch_selector.js:90
-#: selling/doctype/sales_order/sales_order.js:300
-#: selling/doctype/sales_order/sales_order.js:401
-#: selling/report/sales_order_analysis/sales_order_analysis.js:49
+#: 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/utils/serial_no_batch_selector.js:94
+#: selling/doctype/sales_order/sales_order.js:327
+#: selling/doctype/sales_order/sales_order.js:431
+#: selling/report/sales_order_analysis/sales_order_analysis.js:48
 #: selling/report/sales_order_analysis/sales_order_analysis.py:334
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:78
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:79
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:256
 #: stock/doctype/warehouse/warehouse.json
 #: stock/page/stock_balance/stock_balance.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:22
+#: 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/item_price_stock/item_price_stock.py:27
-#: stock/report/item_shortage_report/item_shortage_report.js:18
+#: stock/report/item_shortage_report/item_shortage_report.js:17
 #: stock/report/item_shortage_report/item_shortage_report.py:81
 #: stock/report/product_bundle_balance/product_bundle_balance.js:42
 #: stock/report/product_bundle_balance/product_bundle_balance.py:89
-#: stock/report/reserved_stock/reserved_stock.js:44
+#: stock/report/reserved_stock/reserved_stock.js:41
 #: stock/report/reserved_stock/reserved_stock.py:96
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:140
-#: stock/report/serial_no_ledger/serial_no_ledger.js:22
+#: 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_analytics/stock_analytics.js:50
+#: stock/report/stock_analytics/stock_analytics.js:49
 #: stock/report/stock_balance/stock_balance.js:51
-#: stock/report/stock_balance/stock_balance.py:376
+#: stock/report/stock_balance/stock_balance.py:384
 #: stock/report/stock_ledger/stock_ledger.js:30
-#: stock/report/stock_ledger/stock_ledger.py:167
+#: stock/report/stock_ledger/stock_ledger.py:240
 #: stock/report/stock_ledger_variance/stock_ledger_variance.js:38
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:55
 #: 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:17
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:39
+#: 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
+#: templates/form_grid/material_request_grid.html:8
+#: templates/form_grid/stock_entry_grid.html:9
 msgid "Warehouse"
 msgstr "المستودعات"
 
@@ -78112,12 +79581,24 @@
 msgid "Warehouse"
 msgstr "المستودعات"
 
+#. Label of a Link field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Warehouse"
+msgstr "المستودعات"
+
 #. Label of a Link field in DocType 'Pick List Item'
 #: stock/doctype/pick_list_item/pick_list_item.json
 msgctxt "Pick List Item"
 msgid "Warehouse"
 msgstr "المستودعات"
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Warehouse"
+msgstr "المستودعات"
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -78252,6 +79733,12 @@
 msgid "Warehouse"
 msgstr "المستودعات"
 
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Warehouse"
+msgstr "المستودعات"
+
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:4
 msgid "Warehouse Capacity Summary"
 msgstr ""
@@ -78377,12 +79864,12 @@
 msgid "Warehouse not found against the account {0}"
 msgstr "لم يتم العثور على المستودع مقابل الحساب {0}"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:367
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:421
 msgid "Warehouse not found in the system"
 msgstr "لم يتم العثور على المستودع في النظام"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1005
-#: stock/doctype/delivery_note/delivery_note.py:362
+#: accounts/doctype/sales_invoice/sales_invoice.py:1022
+#: stock/doctype/delivery_note/delivery_note.py:416
 msgid "Warehouse required for stock Item {0}"
 msgstr "مستودع الأسهم المطلوبة لل تفاصيل {0}"
 
@@ -78404,11 +79891,11 @@
 msgid "Warehouse {0} does not belong to Company {1}."
 msgstr ""
 
-#: stock/utils.py:441
+#: stock/utils.py:436
 msgid "Warehouse {0} does not belong to company {1}"
 msgstr "مستودع {0} لا تنتمي إلى شركة {1}"
 
-#: controllers/stock_controller.py:244
+#: controllers/stock_controller.py:426
 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 ""
 
@@ -78420,7 +79907,7 @@
 msgid "Warehouse: {0} does not belong to {1}"
 msgstr "المستودع: {0} لا ينتمي إلى {1}"
 
-#: manufacturing/doctype/production_plan/production_plan.js:379
+#: manufacturing/doctype/production_plan/production_plan.js:407
 msgid "Warehouses"
 msgstr "المستودعات"
 
@@ -78530,9 +80017,9 @@
 msgid "Warn for new Request for Quotations"
 msgstr "تحذير لطلب جديد للاقتباسات"
 
-#: accounts/doctype/payment_entry/payment_entry.py:639
-#: controllers/accounts_controller.py:1676
-#: stock/doctype/delivery_trip/delivery_trip.js:123
+#: accounts/doctype/payment_entry/payment_entry.py:648
+#: controllers/accounts_controller.py:1765
+#: stock/doctype/delivery_trip/delivery_trip.js:144
 #: utilities/transaction_base.py:122
 msgid "Warning"
 msgstr "تحذير"
@@ -78545,15 +80032,15 @@
 msgid "Warning!"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1146
+#: accounts/doctype/journal_entry/journal_entry.py:1173
 msgid "Warning: Another {0} # {1} exists against stock entry {2}"
 msgstr "تحذير: {0} أخر # {1} موجود في مدخل المخزن {2}\\n<br>\\nWarning: Another {0} # {1} exists against stock entry {2}"
 
-#: stock/doctype/material_request/material_request.js:415
+#: stock/doctype/material_request/material_request.js:484
 msgid "Warning: Material Requested Qty is less than Minimum Order Qty"
 msgstr "تحذير : كمية المواد المطلوبة  هي أقل من الحد الأدنى للطلب الكمية"
 
-#: selling/doctype/sales_order/sales_order.py:252
+#: selling/doctype/sales_order/sales_order.py:254
 msgid "Warning: Sales Order {0} already exists against Customer's Purchase Order {1}"
 msgstr "تحذير: أمر البيع {0} موجود مسبقاً لأمر الشراء الخاص بالعميل {1}\\n<br>\\nWarning: Sales Order {0} already exists against Customer's Purchase Order {1}"
 
@@ -78575,7 +80062,7 @@
 msgstr "الضمان / AMC الحالة"
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:97
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:103
 #: support/doctype/warranty_claim/warranty_claim.json
 msgid "Warranty Claim"
 msgstr "مطالبة بالضمان"
@@ -78615,6 +80102,10 @@
 msgid "Watch Video"
 msgstr "شاهد الفيديو"
 
+#: controllers/accounts_controller.py:232
+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 ""
+
 #: www/support/index.html:7
 msgid "We're here to help!"
 msgstr "نحن هنا للمساعدة!"
@@ -78824,12 +80315,12 @@
 msgid "Weekday"
 msgstr "يوم من أيام الأسبوع"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:34
-#: public/js/stock_analytics.js:52
-#: selling/report/sales_analytics/sales_analytics.js:61
-#: stock/report/stock_analytics/stock_analytics.js:80
-#: support/report/issue_analytics/issue_analytics.js:42
+#: buying/report/purchase_analytics/purchase_analytics.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:33
+#: public/js/stock_analytics.js:82
+#: selling/report/sales_analytics/sales_analytics.js:68
+#: stock/report/stock_analytics/stock_analytics.js:79
+#: support/report/issue_analytics/issue_analytics.js:41
 msgid "Weekly"
 msgstr "الأسبوعية"
 
@@ -79086,15 +80577,22 @@
 msgid "Wheels"
 msgstr "عجلات"
 
-#: stock/doctype/item/item.js:834
+#. Description of the 'Sub Assembly Warehouse' (Link) field in DocType
+#. 'Production Plan'
+#: manufacturing/doctype/production_plan/production_plan.json
+msgctxt "Production Plan"
+msgid "When a parent warehouse is chosen, the system conducts stock checks against the associated child warehouses"
+msgstr ""
+
+#: stock/doctype/item/item.js:920
 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:313
+#: accounts/doctype/account/account.py:332
 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account."
 msgstr "أثناء إنشاء حساب الشركة الفرعية {0} ، تم العثور على الحساب الرئيسي {1} كحساب دفتر أستاذ."
 
-#: accounts/doctype/account/account.py:303
+#: accounts/doctype/account/account.py:322
 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA"
 msgstr "أثناء إنشاء حساب Child Company {0} ، لم يتم العثور على الحساب الرئيسي {1}. الرجاء إنشاء الحساب الرئيسي في شهادة توثيق البرامج المقابلة"
 
@@ -79157,7 +80655,11 @@
 msgid "With Operations"
 msgstr "مع عمليات"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:70
+#: accounts/report/trial_balance/trial_balance.js:82
+msgid "With Period Closing Entry For Opening Balances"
+msgstr ""
+
+#: public/js/bank_reconciliation_tool/data_table_manager.js:67
 msgid "Withdrawal"
 msgstr ""
 
@@ -79173,7 +80675,7 @@
 msgid "Work Done"
 msgstr "العمل المنجز"
 
-#: setup/doctype/company/company.py:261
+#: setup/doctype/company/company.py:260
 msgid "Work In Progress"
 msgstr "التقدم في العمل"
 
@@ -79195,7 +80697,7 @@
 msgid "Work In Progress"
 msgstr "التقدم في العمل"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:20
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:23
 msgid "Work In Progress Warehouse"
 msgstr "مستودع قيد الإنجاز"
 
@@ -79203,19 +80705,20 @@
 #. Title of an Onboarding Step
 #: manufacturing/doctype/bom/bom.js:119
 #: manufacturing/doctype/work_order/work_order.json
+#: manufacturing/doctype/workstation/workstation_job_card.html:26
 #: manufacturing/onboarding_step/work_order/work_order.json
-#: manufacturing/report/bom_variance_report/bom_variance_report.js: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:42
+#: 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/job_card_summary/job_card_summary.py:145
-#: manufacturing/report/process_loss_report/process_loss_report.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:22
 #: manufacturing/report/process_loss_report/process_loss_report.py:68
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:30
+#: 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:560
-#: stock/doctype/material_request/material_request.js:152
-#: stock/doctype/material_request/material_request.py:779
+#: selling/doctype/sales_order/sales_order.js:624
+#: stock/doctype/material_request/material_request.js:178
+#: stock/doctype/material_request/material_request.py:791
 #: templates/pages/material_request_info.html:45
 msgid "Work Order"
 msgstr "أمر العمل"
@@ -79266,7 +80769,7 @@
 msgid "Work Order"
 msgstr "أمر العمل"
 
-#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:121
 msgid "Work Order / Subcontract PO"
 msgstr ""
 
@@ -79313,33 +80816,33 @@
 msgid "Work Order Summary"
 msgstr "ملخص أمر العمل"
 
-#: stock/doctype/material_request/material_request.py:784
+#: stock/doctype/material_request/material_request.py:796
 msgid "Work Order cannot be created for following reason: <br> {0}"
 msgstr "لا يمكن إنشاء أمر العمل للسبب التالي:<br> {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:927
+#: manufacturing/doctype/work_order/work_order.py:941
 msgid "Work Order cannot be raised against a Item Template"
 msgstr "لا يمكن رفع أمر العمل مقابل قالب العنصر"
 
-#: manufacturing/doctype/work_order/work_order.py:1399
-#: manufacturing/doctype/work_order/work_order.py:1458
+#: manufacturing/doctype/work_order/work_order.py:1413
+#: manufacturing/doctype/work_order/work_order.py:1472
 msgid "Work Order has been {0}"
 msgstr "تم عمل الطلب {0}"
 
-#: selling/doctype/sales_order/sales_order.js:667
+#: selling/doctype/sales_order/sales_order.js:768
 msgid "Work Order not created"
 msgstr "أمر العمل لم يتم إنشاؤه"
 
-#: stock/doctype/stock_entry/stock_entry.py:679
+#: stock/doctype/stock_entry/stock_entry.py:634
 msgid "Work Order {0}: Job Card not found for the operation {1}"
 msgstr "أمر العمل {0}: لم يتم العثور على بطاقة المهمة للعملية {1}"
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:57
-#: stock/doctype/material_request/material_request.py:774
+#: manufacturing/report/job_card_summary/job_card_summary.js:56
+#: stock/doctype/material_request/material_request.py:786
 msgid "Work Orders"
 msgstr "طلبات العمل"
 
-#: selling/doctype/sales_order/sales_order.js:731
+#: selling/doctype/sales_order/sales_order.js:844
 msgid "Work Orders Created: {0}"
 msgstr "أوامر العمل التي تم إنشاؤها: {0}"
 
@@ -79366,7 +80869,7 @@
 msgid "Work-in-Progress Warehouse"
 msgstr "مستودع العمل قيد التنفيذ"
 
-#: manufacturing/doctype/work_order/work_order.py:425
+#: manufacturing/doctype/work_order/work_order.py:436
 msgid "Work-in-Progress Warehouse is required before Submit"
 msgstr "مستودع أعمال جارية مطلوب قبل التسجيل\\n<br>\\nWork-in-Progress Warehouse is required before Submit"
 
@@ -79403,6 +80906,10 @@
 msgid "Workflow State"
 msgstr "حالة سير العمل"
 
+#: templates/pages/task_info.html:73
+msgid "Working"
+msgstr "عامل"
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -79429,14 +80936,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/work_order/work_order.js:232
+#: manufacturing/doctype/work_order/work_order.js:247
 #: manufacturing/doctype/workstation/workstation.json
 #: manufacturing/onboarding_step/workstation/workstation.json
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:36
+#: 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:61
+#: 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/job_card_summary/job_card_summary.js:73
+#: 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
 msgid "Workstation"
@@ -79478,12 +80985,24 @@
 msgid "Workstation / Machine"
 msgstr "محطة العمل / الآلة"
 
+#. Label of a HTML field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Dashboard"
+msgstr ""
+
 #. Label of a Data field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Workstation Name"
 msgstr "اسم محطة العمل"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Status"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/workstation_type/workstation_type.json
 msgid "Workstation Type"
@@ -79526,17 +81045,23 @@
 msgid "Workstation Working Hour"
 msgstr "محطة العمل ساعة العمل"
 
-#: manufacturing/doctype/workstation/workstation.py:199
+#: manufacturing/doctype/workstation/workstation.py:355
 msgid "Workstation is closed on the following dates as per Holiday List: {0}"
 msgstr "محطة العمل مغلقة في التواريخ التالية وفقا لقائمة العطل: {0}\\n<br>\\nWorkstation is closed on the following dates as per Holiday List: {0}"
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Workstations"
+msgstr ""
+
 #: setup/setup_wizard/setup_wizard.py:16 setup/setup_wizard/setup_wizard.py:41
 msgid "Wrapping up"
 msgstr "تغليف"
 
 #: 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:510
+#: setup/doctype/company/company.py:509
 msgid "Write Off"
 msgstr "لا تصلح"
 
@@ -79727,7 +81252,7 @@
 msgid "Wrong Company"
 msgstr ""
 
-#: setup/doctype/company/company.js:172
+#: setup/doctype/company/company.js:202
 msgid "Wrong Password"
 msgstr "كلمة مرور خاطئة\\n<br>\\nWrong Password"
 
@@ -79786,20 +81311,20 @@
 msgid "Year start date or end date is overlapping with {0}. To avoid please set company"
 msgstr "تاريخ البدء أو تاريخ الانتهاء العام يتداخل مع {0}. لتجنب ذلك الرجاء تعيين الشركة\\n<br>\\nYear start date or end date is overlapping with {0}. To avoid please set company"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:67
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:70
-#: buying/report/purchase_analytics/purchase_analytics.js:64
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:37
-#: public/js/financial_statements.js:220
+#: accounts/report/budget_variance_report/budget_variance_report.js:65
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:78
+#: buying/report/purchase_analytics/purchase_analytics.js:63
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:36
+#: public/js/financial_statements.js:229
 #: public/js/purchase_trends_filters.js:22 public/js/sales_trends_filters.js:14
-#: public/js/stock_analytics.js:55
-#: selling/report/sales_analytics/sales_analytics.js:64
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:36
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:36
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:36
-#: stock/report/stock_analytics/stock_analytics.js:83
-#: support/report/issue_analytics/issue_analytics.js:45
+#: public/js/stock_analytics.js:85
+#: selling/report/sales_analytics/sales_analytics.js:71
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: stock/report/stock_analytics/stock_analytics.js:82
+#: support/report/issue_analytics/issue_analytics.js:44
 msgid "Yearly"
 msgstr "سنويا"
 
@@ -79932,23 +81457,23 @@
 msgid "Yes"
 msgstr "نعم"
 
-#: controllers/accounts_controller.py:3151
+#: controllers/accounts_controller.py:3242
 msgid "You are not allowed to update as per the conditions set in {} Workflow."
 msgstr "غير مسموح لك بالتحديث وفقًا للشروط المحددة في {} سير العمل."
 
-#: accounts/general_ledger.py:665
+#: accounts/general_ledger.py:674
 msgid "You are not authorized to add or update entries before {0}"
 msgstr "غير مصرح لك باضافه إدخالات أو تحديثها قبل {0}\\n<br>\\nYou are not authorized to add or update entries before {0}"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:317
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
 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:263
+#: accounts/doctype/account/account.py:282
 msgid "You are not authorized to set Frozen value"
 msgstr ".أنت غير مخول لتغيير القيم المجمدة"
 
-#: stock/doctype/pick_list/pick_list.py:307
+#: stock/doctype/pick_list/pick_list.py:347
 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 ""
 
@@ -79964,7 +81489,7 @@
 msgid "You can also set default CWIP account in Company {}"
 msgstr "يمكنك أيضًا تعيين حساب CWIP الافتراضي في الشركة {}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:873
+#: accounts/doctype/sales_invoice/sales_invoice.py:890
 msgid "You can change the parent account to a Balance Sheet account or select a different account."
 msgstr "يمكنك تغيير الحساب الرئيسي إلى حساب الميزانية العمومية أو تحديد حساب مختلف."
 
@@ -79972,7 +81497,7 @@
 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:583
+#: accounts/doctype/journal_entry/journal_entry.py:610
 msgid "You can not enter current voucher in 'Against Journal Entry' column"
 msgstr "لا يمكنك إدخال القسيمة الحالية في عمود 'قيد اليومية المقابل'.\\n<br>\\nYou can not enter current voucher in 'Against Journal Entry' column"
 
@@ -79980,8 +81505,8 @@
 msgid "You can only have Plans with the same billing cycle in a Subscription"
 msgstr "يمكنك فقط الحصول على خطط مع دورة الفواتير نفسها في الاشتراك"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:239
-#: accounts/doctype/sales_invoice/sales_invoice.js:847
+#: accounts/doctype/pos_invoice/pos_invoice.js:258
+#: accounts/doctype/sales_invoice/sales_invoice.js:915
 msgid "You can only redeem max {0} points in this order."
 msgstr "لا يمكنك استرداد سوى {0} نقاط كحد أقصى بهذا الترتيب."
 
@@ -79989,11 +81514,11 @@
 msgid "You can only select one mode of payment as default"
 msgstr "يمكنك تحديد طريقة دفع واحدة فقط كطريقة افتراضية"
 
-#: selling/page/point_of_sale/pos_payment.js:478
+#: selling/page/point_of_sale/pos_payment.js:506
 msgid "You can redeem upto {0}."
 msgstr "يمكنك استرداد ما يصل إلى {0}."
 
-#: manufacturing/doctype/workstation/workstation.js:37
+#: manufacturing/doctype/workstation/workstation.js:59
 msgid "You can set it as a machine name or operation type. For example, stiching machine 12"
 msgstr ""
 
@@ -80002,7 +81527,7 @@
 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:1027
+#: manufacturing/doctype/job_card/job_card.py:1042
 msgid "You can't make any changes to Job Card since Work Order is closed."
 msgstr ""
 
@@ -80010,7 +81535,7 @@
 msgid "You can't redeem Loyalty Points having more value than the Rounded Total."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:532
+#: manufacturing/doctype/bom/bom.js:549
 msgid "You cannot change the rate if BOM is mentioned against any Item."
 msgstr ""
 
@@ -80018,15 +81543,15 @@
 msgid "You cannot create a {0} within the closed Accounting Period {1}"
 msgstr ""
 
-#: accounts/general_ledger.py:155
+#: accounts/general_ledger.py:159
 msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
 msgstr "لا يمكنك إنشاء أو إلغاء أي قيود محاسبية في فترة المحاسبة المغلقة {0}"
 
-#: accounts/general_ledger.py:689
+#: accounts/general_ledger.py:698
 msgid "You cannot create/amend any accounting entries till this date."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:809
+#: accounts/doctype/journal_entry/journal_entry.py:836
 msgid "You cannot credit and debit same account at the same time"
 msgstr "لا يمكن إعطاء الحساب قيمة مدين وقيمة دائن في نفس الوقت"
 
@@ -80038,7 +81563,7 @@
 msgid "You cannot edit root node."
 msgstr "لا يمكنك تحرير عقدة الجذر."
 
-#: selling/page/point_of_sale/pos_payment.js:507
+#: selling/page/point_of_sale/pos_payment.js:536
 msgid "You cannot redeem more than {0}."
 msgstr "لا يمكنك استرداد أكثر من {0}."
 
@@ -80050,15 +81575,15 @@
 msgid "You cannot restart a Subscription that is not cancelled."
 msgstr "لا يمكنك إعادة تشغيل اشتراك غير ملغى."
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:210
 msgid "You cannot submit empty order."
 msgstr "لا يمكنك تقديم طلب فارغ."
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:209
 msgid "You cannot submit the order without payment."
 msgstr "لا يمكنك تقديم الطلب بدون دفع."
 
-#: controllers/accounts_controller.py:3127
+#: controllers/accounts_controller.py:3218
 msgid "You do not have permissions to {} items in a {}."
 msgstr "ليس لديك أذونات لـ {} من العناصر في {}."
 
@@ -80066,7 +81591,7 @@
 msgid "You don't have enough Loyalty Points to redeem"
 msgstr "ليس لديك ما يكفي من نقاط الولاء لاستردادها"
 
-#: selling/page/point_of_sale/pos_payment.js:474
+#: selling/page/point_of_sale/pos_payment.js:499
 msgid "You don't have enough points to redeem."
 msgstr "ليس لديك ما يكفي من النقاط لاستردادها."
 
@@ -80074,7 +81599,7 @@
 msgid "You had {} errors while creating opening invoices. Check {} for more details"
 msgstr "كان لديك {} من الأخطاء أثناء إنشاء الفواتير الافتتاحية. تحقق من {} لمزيد من التفاصيل"
 
-#: public/js/utils.js:822
+#: public/js/utils.js:893
 msgid "You have already selected items from {0} {1}"
 msgstr "لقد حددت العناصر من {0} {1}"
 
@@ -80082,7 +81607,7 @@
 msgid "You have been invited to collaborate on the project: {0}"
 msgstr "لقد وجهت الدعوة إلى التعاون في هذا المشروع: {0}"
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:442
 msgid "You have entered a duplicate Delivery Note on Row"
 msgstr ""
 
@@ -80094,11 +81619,11 @@
 msgid "You haven't created a {0} yet"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:196
+#: selling/page/point_of_sale/pos_controller.js:218
 msgid "You must add atleast one item to save it as draft."
 msgstr "يجب إضافة عنصر واحد على الأقل لحفظه كمسودة."
 
-#: selling/page/point_of_sale/pos_controller.js:598
+#: selling/page/point_of_sale/pos_controller.js:626
 msgid "You must select a customer before adding an item."
 msgstr "يجب عليك تحديد عميل قبل إضافة عنصر."
 
@@ -80163,7 +81688,7 @@
 msgid "Youtube Statistics"
 msgstr "إحصاءات يوتيوب"
 
-#: public/js/utils/contact_address_quick_entry.js:68
+#: public/js/utils/contact_address_quick_entry.js:71
 msgid "ZIP Code"
 msgstr "الرمز البريدي"
 
@@ -80177,7 +81702,7 @@
 msgid "Zero Rated"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Zero quantity"
 msgstr ""
 
@@ -80187,7 +81712,7 @@
 msgid "Zip File"
 msgstr "ملف مضغوط"
 
-#: stock/reorder_item.py:283
+#: stock/reorder_item.py:368
 msgid "[Important] [ERPNext] Auto Reorder Errors"
 msgstr "[هام] [ERPNext] إعادة ترتيب الأخطاء تلقائيًا"
 
@@ -80195,16 +81720,20 @@
 msgid "`Allow Negative rates for Items`"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:89
+#: stock/doctype/stock_settings/stock_settings.py:92
 #, python-format
 msgid "`Freeze Stocks Older Than` should be smaller than %d days."
 msgstr ""
 
+#: stock/stock_ledger.py:1700
+msgid "after"
+msgstr ""
+
 #: accounts/doctype/shipping_rule/shipping_rule.py:204
 msgid "and"
 msgstr "و"
 
-#: manufacturing/doctype/bom/bom.js:759
+#: manufacturing/doctype/bom/bom.js:792
 msgid "as a percentage of finished item quantity"
 msgstr ""
 
@@ -80212,11 +81741,15 @@
 msgid "at"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:17
-#: selling/report/sales_analytics/sales_analytics.js:17
+#: buying/report/purchase_analytics/purchase_analytics.js:16
+#: selling/report/sales_analytics/sales_analytics.js:24
 msgid "based_on"
 msgstr "مرتكز على"
 
+#: public/js/utils/sales_common.js:256
+msgid "cannot be greater than 100"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgctxt "Production Plan Sub Assembly Item"
@@ -80230,8 +81763,12 @@
 msgid "development"
 msgstr "تطوير"
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "discount applied"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:46
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:57
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:58
 msgid "doc_type"
 msgstr ""
 
@@ -80260,6 +81797,10 @@
 msgid "exchangerate.host"
 msgstr ""
 
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:161
+msgid "fieldname"
+msgstr ""
+
 #. Option for the 'Service Provider' (Select) field in DocType 'Currency
 #. Exchange Settings'
 #: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
@@ -80267,13 +81808,21 @@
 msgid "frankfurter.app"
 msgstr ""
 
+#: templates/form_grid/item_grid.html:66 templates/form_grid/item_grid.html:80
+msgid "hidden"
+msgstr ""
+
+#: projects/doctype/project/project_dashboard.html:13
+msgid "hours"
+msgstr ""
+
 #. Label of a Attach Image field in DocType 'Batch'
 #: stock/doctype/batch/batch.json
 msgctxt "Batch"
 msgid "image"
 msgstr "صورة"
 
-#: accounts/doctype/budget/budget.py:253
+#: accounts/doctype/budget/budget.py:260
 msgid "is already"
 msgstr ""
 
@@ -80349,7 +81898,7 @@
 msgid "material_request_item"
 msgstr ""
 
-#: controllers/selling_controller.py:150
+#: controllers/selling_controller.py:151
 msgid "must be between 0 and 100"
 msgstr ""
 
@@ -80395,7 +81944,11 @@
 msgid "old_parent"
 msgstr ""
 
-#: controllers/accounts_controller.py:1033
+#: templates/pages/task_info.html:90
+msgid "on"
+msgstr ""
+
+#: controllers/accounts_controller.py:1097
 msgid "or"
 msgstr "أو"
 
@@ -80407,7 +81960,7 @@
 msgid "out of 5"
 msgstr ""
 
-#: public/js/utils.js:369
+#: public/js/utils.js:417
 msgid "payments app is not installed. Please install it from {0} or {1}"
 msgstr ""
 
@@ -80448,7 +82001,7 @@
 msgid "per hour"
 msgstr "كل ساعة"
 
-#: stock/stock_ledger.py:1681
+#: stock/stock_ledger.py:1701
 msgid "performing either one below:"
 msgstr ""
 
@@ -80476,7 +82029,7 @@
 msgid "ratings"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 msgid "received from"
 msgstr "مستلم من"
 
@@ -80553,10 +82106,6 @@
 msgid "sandbox"
 msgstr "رمل"
 
-#: public/js/controllers/transaction.js:920
-msgid "selected Payment Terms Template"
-msgstr ""
-
 #: accounts/doctype/subscription/subscription.py:711
 msgid "subscription is already cancelled."
 msgstr ""
@@ -80577,12 +82126,14 @@
 msgid "title"
 msgstr "عنوان"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 #: 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:2737
+#: accounts/doctype/sales_invoice/sales_invoice.py:2706
 msgid "to unallocate the amount of this Return Invoice before cancelling it."
 msgstr ""
 
@@ -80605,7 +82156,7 @@
 msgid "via BOM Update Tool"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:256
+#: accounts/doctype/budget/budget.py:263
 msgid "will be"
 msgstr ""
 
@@ -80618,7 +82169,7 @@
 msgid "{0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:878
+#: controllers/accounts_controller.py:930
 msgid "{0} '{1}' is disabled"
 msgstr "{0} '{1}' معطل"
 
@@ -80626,7 +82177,7 @@
 msgid "{0} '{1}' not in Fiscal Year {2}"
 msgstr "{0} '{1}' ليس في السنة المالية {2}"
 
-#: manufacturing/doctype/work_order/work_order.py:355
+#: manufacturing/doctype/work_order/work_order.py:366
 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
 msgstr "{0} ({1}) لا يمكن أن يكون أكبر من الكمية المخطط لها ({2}) في أمر العمل {3}"
 
@@ -80634,19 +82185,19 @@
 msgid "{0} - Above"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:253
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:281
 msgid "{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
 msgstr ""
 
-#: controllers/accounts_controller.py:1893
+#: controllers/accounts_controller.py:1985
 msgid "{0} Account not found against Customer {1}."
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:261
+#: accounts/doctype/budget/budget.py:268
 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It {5} exceed by {6}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:759
+#: accounts/doctype/pricing_rule/utils.py:758
 msgid "{0} Coupon used are {1}. Allowed quantity is exhausted"
 msgstr "{0} القسيمة المستخدمة هي {1}. الكمية المسموح بها مستنفدة"
 
@@ -80654,11 +82205,11 @@
 msgid "{0} Digest"
 msgstr "{0} الملخص"
 
-#: accounts/utils.py:1286
+#: accounts/utils.py:1255
 msgid "{0} Number {1} is already used in {2} {3}"
 msgstr "{0} الرقم {1} مستخدم بالفعل في {2} {3}"
 
-#: manufacturing/doctype/work_order/work_order.js:379
+#: manufacturing/doctype/work_order/work_order.js:397
 msgid "{0} Operations: {1}"
 msgstr "{0} العمليات: {1}"
 
@@ -80670,7 +82221,7 @@
 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
 msgstr "{0} يعتمد الاحتفاظ بالعينة على الدُفعة ، يُرجى تحديد &quot;رقم الدُفعة&quot; للاحتفاظ بعينة من العنصر"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:429
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:428
 msgid "{0} Transaction(s) Reconciled"
 msgstr ""
 
@@ -80678,23 +82229,23 @@
 msgid "{0} account is not of type {1}"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:447
+#: stock/doctype/purchase_receipt/purchase_receipt.py:448
 msgid "{0} account not found while submitting purchase receipt"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:930
+#: accounts/doctype/journal_entry/journal_entry.py:957
 msgid "{0} against Bill {1} dated {2}"
 msgstr "{0} مقابل الفاتورة {1} بتاريخ {2}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:939
+#: accounts/doctype/journal_entry/journal_entry.py:966
 msgid "{0} against Purchase Order {1}"
 msgstr "{0} مقابل أمر الشراء {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:906
+#: accounts/doctype/journal_entry/journal_entry.py:933
 msgid "{0} against Sales Invoice {1}"
 msgstr "{0} مقابل فاتورة المبيعات {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:913
+#: accounts/doctype/journal_entry/journal_entry.py:940
 msgid "{0} against Sales Order {1}"
 msgstr "{0} مقابل طلب مبيعات {1}"
 
@@ -80702,7 +82253,7 @@
 msgid "{0} already has a Parent Procedure {1}."
 msgstr "{0} يحتوي بالفعل على إجراء الأصل {1}."
 
-#: stock/doctype/delivery_note/delivery_note.py:610
+#: stock/doctype/delivery_note/delivery_note.py:671
 msgid "{0} and {1}"
 msgstr "{0} و {1}"
 
@@ -80723,16 +82274,16 @@
 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:783
-#: manufacturing/doctype/production_plan/production_plan.py:877
+#: manufacturing/doctype/production_plan/production_plan.py:792
+#: manufacturing/doctype/production_plan/production_plan.py:886
 msgid "{0} created"
 msgstr "{0} تم انشاؤه"
 
-#: setup/doctype/company/company.py:191
+#: setup/doctype/company/company.py:190
 msgid "{0} currency must be same as company's default currency. Please select another account."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:310
+#: buying/doctype/purchase_order/purchase_order.py:311
 msgid "{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution."
 msgstr "{0} لديها حاليا {1} بطاقة أداء بطاقة الموردين، ويجب إصدار أوامر الشراء إلى هذا المورد بحذر."
 
@@ -80764,7 +82315,11 @@
 msgid "{0} has been submitted successfully"
 msgstr "{0} تم التقديم بنجاح"
 
-#: controllers/accounts_controller.py:2212
+#: projects/doctype/project/project_dashboard.html:15
+msgid "{0} hours"
+msgstr ""
+
+#: controllers/accounts_controller.py:2304
 msgid "{0} in row {1}"
 msgstr "{0} في الحقل {1}"
 
@@ -80772,23 +82327,27 @@
 msgid "{0} is a mandatory Accounting Dimension. <br>Please set a value for {0} in Accounting Dimensions section."
 msgstr ""
 
-#: controllers/accounts_controller.py:162
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:189
+msgid "{0} is already running for {1}"
+msgstr ""
+
+#: controllers/accounts_controller.py:164
 msgid "{0} is blocked so this transaction cannot proceed"
 msgstr "تم حظر {0} حتى لا تتم متابعة هذه المعاملة"
 
 #: accounts/doctype/budget/budget.py:57
-#: accounts/doctype/payment_entry/payment_entry.py:542
+#: accounts/doctype/payment_entry/payment_entry.py:551
 #: accounts/report/general_ledger/general_ledger.py:62
 #: accounts/report/pos_register/pos_register.py:110 controllers/trends.py:50
 msgid "{0} is mandatory"
 msgstr "{0} إلزامي"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:975
+#: accounts/doctype/sales_invoice/sales_invoice.py:992
 msgid "{0} is mandatory for Item {1}"
 msgstr "{0} إلزامي للصنف {1}\\n<br>\\n{0} is mandatory for Item {1}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:220
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:101
+#: accounts/general_ledger.py:722
 msgid "{0} is mandatory for account {1}"
 msgstr ""
 
@@ -80796,7 +82355,7 @@
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
 msgstr "{0} إلزامي. ربما لم يتم إنشاء سجل صرف العملات من {1} إلى {2}"
 
-#: controllers/accounts_controller.py:2491
+#: controllers/accounts_controller.py:2576
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
 msgstr "{0} إلزامي. ربما لم يتم إنشاء سجل سعر صرف العملة ل{1} إلى {2}."
 
@@ -80808,7 +82367,7 @@
 msgid "{0} is not a group node. Please select a group node as parent cost center"
 msgstr "{0} ليست عقدة مجموعة. يرجى تحديد عقدة المجموعة كمركز تكلفة الأصل"
 
-#: stock/doctype/stock_entry/stock_entry.py:456
+#: stock/doctype/stock_entry/stock_entry.py:411
 msgid "{0} is not a stock Item"
 msgstr "{0} ليس من نوع المخزون"
 
@@ -80824,26 +82383,30 @@
 msgid "{0} is not enabled in {1}"
 msgstr "{0} غير ممكّن في {1}"
 
-#: stock/doctype/material_request/material_request.py:565
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197
+msgid "{0} is not running. Cannot trigger events for this Document"
+msgstr ""
+
+#: stock/doctype/material_request/material_request.py:566
 msgid "{0} is not the default supplier for any items."
 msgstr "{0} ليس المورد الافتراضي لأية عناصر."
 
-#: accounts/doctype/payment_entry/payment_entry.py:2300
+#: accounts/doctype/payment_entry/payment_entry.py:2325
 msgid "{0} is on hold till {1}"
 msgstr "{0} معلق حتى {1}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:131
+#: accounts/doctype/gl_entry/gl_entry.py:121
 #: accounts/doctype/pricing_rule/pricing_rule.py:165
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:182
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:193
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:118
 msgid "{0} is required"
 msgstr "{0} مطلوب"
 
-#: manufacturing/doctype/work_order/work_order.js:343
+#: manufacturing/doctype/work_order/work_order.js:362
 msgid "{0} items in progress"
 msgstr "{0} العنصر قيد الأستخدام"
 
-#: manufacturing/doctype/work_order/work_order.js:327
+#: manufacturing/doctype/work_order/work_order.js:346
 msgid "{0} items produced"
 msgstr "{0} عناصر منتجة"
 
@@ -80851,7 +82414,7 @@
 msgid "{0} must be negative in return document"
 msgstr "{0} يجب أن يكون سالبة في وثيقة الارجاع"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1988
+#: accounts/doctype/sales_invoice/sales_invoice.py:1957
 msgid "{0} not allowed to transact with {1}. Please change the Company."
 msgstr "{0} غير مسموح بالتعامل مع {1}. يرجى تغيير الشركة."
 
@@ -80867,60 +82430,60 @@
 msgid "{0} payment entries can not be filtered by {1}"
 msgstr "{0} لا يمكن فلترة المدفوعات المدخلة  {1}"
 
-#: controllers/stock_controller.py:899
+#: controllers/stock_controller.py:1085
 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:451
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:505
 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:702
+#: stock/doctype/pick_list/pick_list.py:773
 msgid "{0} units of Item {1} is not available."
 msgstr "{0} من وحدات العنصر {1} غير متوفرة."
 
-#: stock/doctype/pick_list/pick_list.py:718
+#: stock/doctype/pick_list/pick_list.py:789
 msgid "{0} units of Item {1} is picked in another Pick List."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:135
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:145
 msgid "{0} units of {1} are required in {2}{3}, on {4} {5} for {6} to complete the transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1340 stock/stock_ledger.py:1829
-#: stock/stock_ledger.py:1845
+#: stock/stock_ledger.py:1366 stock/stock_ledger.py:1836
+#: stock/stock_ledger.py:1852
 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
 msgstr "{0} وحدات من {1} لازمة ل {2} في {3} {4} ل {5} لإكمال هذه المعاملة."
 
-#: stock/stock_ledger.py:1955 stock/stock_ledger.py:2005
+#: stock/stock_ledger.py:1962 stock/stock_ledger.py:2012
 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1334
+#: stock/stock_ledger.py:1360
 msgid "{0} units of {1} needed in {2} to complete this transaction."
 msgstr "{0} وحدات من  {1} لازمة في {2} لإكمال هذه المعاملة."
 
-#: stock/utils.py:432
+#: stock/utils.py:427
 msgid "{0} valid serial nos for Item {1}"
 msgstr "{0} أرقام تسلسلية صالحة للبند {1}"
 
-#: stock/doctype/item/item.js:548
+#: stock/doctype/item/item.js:615
 msgid "{0} variants created."
 msgstr "تم إنشاء المتغيرات {0}."
 
-#: accounts/doctype/payment_term/payment_term.js:17
+#: accounts/doctype/payment_term/payment_term.js:19
 msgid "{0} will be given as discount."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:773
+#: manufacturing/doctype/job_card/job_card.py:780
 msgid "{0} {1}"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:203
+#: public/js/utils/serial_no_batch_selector.js:206
 msgid "{0} {1} Manually"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:433
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:432
 msgid "{0} {1} Partially Reconciled"
 msgstr ""
 
@@ -80932,9 +82495,9 @@
 msgid "{0} {1} created"
 msgstr "{0} {1} إنشاء"
 
-#: accounts/doctype/payment_entry/payment_entry.py:506
-#: accounts/doctype/payment_entry/payment_entry.py:562
-#: accounts/doctype/payment_entry/payment_entry.py:2065
+#: accounts/doctype/payment_entry/payment_entry.py:515
+#: accounts/doctype/payment_entry/payment_entry.py:571
+#: accounts/doctype/payment_entry/payment_entry.py:2084
 msgid "{0} {1} does not exist"
 msgstr "{0} {1} غير موجود\\n<br>\\n{0} {1} does not exist"
 
@@ -80950,8 +82513,8 @@
 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:449
-#: selling/doctype/sales_order/sales_order.py:481
+#: buying/doctype/purchase_order/purchase_order.py:450
+#: selling/doctype/sales_order/sales_order.py:484
 #: stock/doctype/material_request/material_request.py:198
 msgid "{0} {1} has been modified. Please refresh."
 msgstr "تم تعديل {0} {1}، يرجى تحديث الصفحة من المتصفح"
@@ -80964,12 +82527,12 @@
 msgid "{0} {1} is allocated twice in this Bank Transaction"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:591
+#: accounts/doctype/payment_entry/payment_entry.py:600
 msgid "{0} {1} is associated with {2}, but Party Account is {3}"
 msgstr "{0} {1} مرتبط ب {2}، ولكن حساب الطرف هو {3}"
 
-#: controllers/buying_controller.py:624 controllers/selling_controller.py:421
-#: controllers/subcontracting_controller.py:806
+#: controllers/buying_controller.py:649 controllers/selling_controller.py:422
+#: controllers/subcontracting_controller.py:810
 msgid "{0} {1} is cancelled or closed"
 msgstr "{0} {1} تم إلغائه أو مغلق"
 
@@ -80981,7 +82544,7 @@
 msgid "{0} {1} is cancelled so the action cannot be completed"
 msgstr "{0} {1} تم إلغاؤه لذلك لا يمكن إكمال الإجراء"
 
-#: accounts/doctype/journal_entry/journal_entry.py:725
+#: accounts/doctype/journal_entry/journal_entry.py:752
 msgid "{0} {1} is closed"
 msgstr "{0} {1} مغلقة"
 
@@ -80993,7 +82556,7 @@
 msgid "{0} {1} is frozen"
 msgstr "{0} {1} مجمد"
 
-#: accounts/doctype/journal_entry/journal_entry.py:722
+#: accounts/doctype/journal_entry/journal_entry.py:749
 msgid "{0} {1} is fully billed"
 msgstr "{0} {1} قدمت الفواتير بشكل كامل"
 
@@ -81001,7 +82564,7 @@
 msgid "{0} {1} is not active"
 msgstr "{0} {1} غير نشطة"
 
-#: accounts/doctype/payment_entry/payment_entry.py:569
+#: accounts/doctype/payment_entry/payment_entry.py:578
 msgid "{0} {1} is not associated with {2} {3}"
 msgstr "{0} {1} غير مرتبط {2} {3}"
 
@@ -81009,12 +82572,12 @@
 msgid "{0} {1} is not in any active Fiscal Year"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:719
-#: accounts/doctype/journal_entry/journal_entry.py:760
+#: accounts/doctype/journal_entry/journal_entry.py:746
+#: accounts/doctype/journal_entry/journal_entry.py:787
 msgid "{0} {1} is not submitted"
 msgstr "{0} {1} لم يتم تقديمه"
 
-#: accounts/doctype/payment_entry/payment_entry.py:598
+#: accounts/doctype/payment_entry/payment_entry.py:607
 msgid "{0} {1} is on hold"
 msgstr ""
 
@@ -81022,11 +82585,11 @@
 msgid "{0} {1} is {2}"
 msgstr "{0} {1} هو {2}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:603
+#: accounts/doctype/payment_entry/payment_entry.py:612
 msgid "{0} {1} must be submitted"
 msgstr "{0} {1} يجب أن يتم اعتماده\\n<br>\\n{0} {1} must be submitted"
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:213
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:215
 msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
 msgstr ""
 
@@ -81034,58 +82597,58 @@
 msgid "{0} {1} status is {2}"
 msgstr "{0} {1} الحالة {2}"
 
-#: public/js/utils/serial_no_batch_selector.js:189
+#: public/js/utils/serial_no_batch_selector.js:191
 msgid "{0} {1} via CSV File"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:254
+#: accounts/doctype/gl_entry/gl_entry.py:208
 msgid "{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry"
 msgstr "{0} {1}: نوع حساب \"الربح والخسارة\" {2} غير مسموح به في قيد افتتاحي"
 
-#: accounts/doctype/gl_entry/gl_entry.py:283
+#: accounts/doctype/gl_entry/gl_entry.py:237
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:87
 msgid "{0} {1}: Account {2} does not belong to Company {3}"
 msgstr "{0} {1}: الحساب {2} لا ينتمي إلى الشركة {3}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:271
+#: accounts/doctype/gl_entry/gl_entry.py:225
 #: 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:278
+#: accounts/doctype/gl_entry/gl_entry.py:232
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:82
 msgid "{0} {1}: Account {2} is inactive"
 msgstr "{0} {1}: الحساب {2} غير فعال \\n<br>\\n{0} {1}: Account {2} is inactive"
 
-#: accounts/doctype/gl_entry/gl_entry.py:322
+#: accounts/doctype/gl_entry/gl_entry.py:276
 msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
 msgstr "{0} {1}: قيد محاسبي ل {2} يمكن ان يتم فقط بالعملة : {3}"
 
-#: controllers/stock_controller.py:365
+#: controllers/stock_controller.py:547
 msgid "{0} {1}: Cost Center is mandatory for Item {2}"
 msgstr "{0} {1}: مركز التكلفة إلزامي للبند {2}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:171
+#: accounts/doctype/gl_entry/gl_entry.py:161
 msgid "{0} {1}: Cost Center is required for 'Profit and Loss' account {2}."
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:298
+#: accounts/doctype/gl_entry/gl_entry.py:252
 msgid "{0} {1}: Cost Center {2} does not belong to Company {3}"
 msgstr "{0} {1}: مركز التكلفة {2} لا ينتمي إلى الشركة {3}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:305
+#: accounts/doctype/gl_entry/gl_entry.py:259
 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:137
+#: accounts/doctype/gl_entry/gl_entry.py:127
 msgid "{0} {1}: Customer is required against Receivable account {2}"
 msgstr "{0} {1}: الزبون مطلوب بالمقابلة بالحساب المدين {2}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:159
+#: accounts/doctype/gl_entry/gl_entry.py:149
 msgid "{0} {1}: Either debit or credit amount is required for {2}"
 msgstr "{0} {1}: إما مبلغ دائن أو مدين مطلوب ل{2}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:143
+#: accounts/doctype/gl_entry/gl_entry.py:133
 msgid "{0} {1}: Supplier is required against Payable account {2}"
 msgstr "{0} {1}: المورد مطلوب لحساب الدفع {2}\\n<br> \\n{0} {1}: Supplier is required against Payable account {2}"
 
@@ -81110,7 +82673,7 @@
 msgid "{0}'s {1} cannot be after {2}'s Expected End Date."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:1009
+#: manufacturing/doctype/job_card/job_card.py:1024
 msgid "{0}, complete the operation {1} before the operation {2}."
 msgstr "{0} ، أكمل العملية {1} قبل العملية {2}."
 
@@ -81118,7 +82681,7 @@
 msgid "{0}: {1} does not exists"
 msgstr "{0}: {1} غير موجود"
 
-#: accounts/doctype/payment_entry/payment_entry.js:724
+#: accounts/doctype/payment_entry/payment_entry.js:889
 msgid "{0}: {1} must be less than {2}"
 msgstr "{0}: {1} يجب أن يكون أقل من {2}"
 
@@ -81126,11 +82689,11 @@
 msgid "{0}{1} Did you rename the item? Please contact Administrator / Tech support"
 msgstr "{0} {1} هل أعدت تسمية العنصر؟ يرجى الاتصال بالدعم الفني / المسؤول"
 
-#: controllers/stock_controller.py:1160
+#: controllers/stock_controller.py:1346
 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:1148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1156
 msgid "{range4}-Above"
 msgstr ""
 
@@ -81138,11 +82701,11 @@
 msgid "{}"
 msgstr ""
 
-#: controllers/buying_controller.py:712
+#: controllers/buying_controller.py:737
 msgid "{} Assets created for {}"
 msgstr "{} الأصول المنشأة لـ {}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1775
+#: accounts/doctype/sales_invoice/sales_invoice.py:1744
 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
 msgstr "لا يمكن إلغاء {} نظرًا لاسترداد نقاط الولاء المكتسبة. قم أولاً بإلغاء {} لا {}"
 
diff --git a/erpnext/locale/de.po b/erpnext/locale/de.po
index 813c307..7c48e6f 100644
--- a/erpnext/locale/de.po
+++ b/erpnext/locale/de.po
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: info@erpnext.com\n"
-"POT-Creation-Date: 2024-01-29 18:13+0053\n"
-"PO-Revision-Date: 2024-03-06 14:36\n"
+"POT-Creation-Date: 2024-03-24 09:35+0000\n"
+"PO-Revision-Date: 2024-03-26 12:46\n"
 "Last-Translator: info@erpnext.com\n"
 "Language-Team: German\n"
 "MIME-Version: 1.0\n"
@@ -18,21 +18,17 @@
 "X-Crowdin-File-ID: 46\n"
 "Language: de_DE\n"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:85
-msgid " "
-msgstr ""
-
 #. Label of a Column Break field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
 msgid "  "
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:76
+#: selling/doctype/quotation/quotation.js:77
 msgid " Address"
 msgstr " Adresse"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:612
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:618
 msgid " Amount"
 msgstr " Betrag"
 
@@ -42,29 +38,16 @@
 msgid " Is Child Table"
 msgstr " Ist Untertabelle"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:184
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:107
 #: selling/report/sales_analytics/sales_analytics.py:66
 msgid " Name"
 msgstr " Name"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:108
-msgid " Qty"
-msgstr " Menge"
-
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:603
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:609
 msgid " Rate"
 msgstr " Preis"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:116
-msgid " Raw Material"
-msgstr " Rohmaterial"
-
-#: public/js/bom_configurator/bom_configurator.bundle.js:127
-#: public/js/bom_configurator/bom_configurator.bundle.js:157
-msgid " Sub Assembly"
-msgstr " Unterbaugruppe"
-
 #: projects/doctype/project_update/project_update.py:110
 msgid " Summary"
 msgstr " Zusammenfassung"
@@ -81,6 +64,10 @@
 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item"
 msgstr "\"Ist Anlagevermögen\" kann nicht deaktiviert werden, da Anlagebuchung für den Artikel vorhanden"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "#"
+msgstr ""
+
 #. Description of the Onboarding Step 'Accounts Settings'
 #: accounts/onboarding_step/accounts_settings/accounts_settings.json
 msgid "# Account Settings\n\n"
@@ -580,7 +567,7 @@
 msgid "% Completed"
 msgstr "% abgeschlossen"
 
-#: manufacturing/doctype/bom/bom.js:755
+#: manufacturing/doctype/bom/bom.js:788
 #, python-format
 msgid "% Finished Item Quantity"
 msgstr "% fertige Artikelmenge"
@@ -592,6 +579,7 @@
 msgstr "% installiert"
 
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:70
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:16
 msgid "% Occupied"
 msgstr "% Besetzt"
 
@@ -681,11 +669,11 @@
 msgid "% of materials delivered against this Sales Order"
 msgstr "% der für diesen Kundenauftrag gelieferten Materialien"
 
-#: controllers/accounts_controller.py:1899
+#: controllers/accounts_controller.py:1991
 msgid "'Account' in the Accounting section of Customer {0}"
 msgstr "„Konto“ im Abschnitt „Buchhaltung“ von Kunde {0}"
 
-#: selling/doctype/sales_order/sales_order.py:263
+#: selling/doctype/sales_order/sales_order.py:266
 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'"
 msgstr "Mehrere Aufträge (je Kunde) mit derselben Bestellnummer erlauben"
 
@@ -693,7 +681,7 @@
 msgid "'Based On' and 'Group By' can not be same"
 msgstr "„Basierend auf“ und „Gruppieren nach“ dürfen nicht identisch sein"
 
-#: stock/report/product_bundle_balance/product_bundle_balance.py:232
+#: stock/report/product_bundle_balance/product_bundle_balance.py:230
 msgid "'Date' is required"
 msgstr "'Datum' ist erforderlich"
 
@@ -701,11 +689,11 @@
 msgid "'Days Since Last Order' must be greater than or equal to zero"
 msgstr "„Tage seit der letzten Bestellung“ muss größer oder gleich null sein"
 
-#: controllers/accounts_controller.py:1904
+#: controllers/accounts_controller.py:1996
 msgid "'Default {0} Account' in Company {1}"
 msgstr "'Standardkonto {0} ' in Unternehmen {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1048
+#: accounts/doctype/journal_entry/journal_entry.py:1075
 msgid "'Entries' cannot be empty"
 msgstr "\"Buchungen\" kann nicht leer sein"
 
@@ -723,10 +711,26 @@
 msgid "'Has Serial No' can not be 'Yes' for non-stock item"
 msgstr "„Hat Seriennummer“ kann für Artikel ohne Lagerhaltung nicht aktiviert werden"
 
-#: stock/report/stock_ledger/stock_ledger.py:436
+#: stock/report/stock_ledger/stock_ledger.py:538
 msgid "'Opening'"
 msgstr "\"Eröffnung\""
 
+#: stock/doctype/delivery_note/delivery_note.py:388
+msgid "'Sales Invoice Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:381
+msgid "'Sales Invoice' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:364
+msgid "'Sales Order Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:357
+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
@@ -735,16 +739,24 @@
 
 #: stock/doctype/packing_slip/packing_slip.py:96
 msgid "'To Package No.' cannot be less than 'From Package No.'"
-msgstr ""
+msgstr "„Bis Paket-Nr.' darf nicht kleiner als „Von Paket Nr.“ sein"
 
 #: controllers/sales_and_purchase_return.py:67
 msgid "'Update Stock' can not be checked because items are not delivered via {0}"
 msgstr "\"Lager aktualisieren\" kann nicht ausgewählt werden, da Artikel nicht über {0} geliefert wurden"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:369
+#: accounts/doctype/sales_invoice/sales_invoice.py:380
 msgid "'Update Stock' cannot be checked for fixed asset sale"
 msgstr "„Bestand aktualisieren“ kann für den Verkauf von Anlagevermögen nicht aktiviert werden"
 
+#: accounts/doctype/bank_account/bank_account.py:64
+msgid "'{0}' account is already used by {1}. Use another account."
+msgstr ""
+
+#: controllers/accounts_controller.py:392
+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/stock_ledger_invariant_check/stock_ledger_invariant_check.py:180
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:104
@@ -836,7 +848,7 @@
 msgid "* Will be calculated in the transaction."
 msgstr "* Wird in der Transaktion berechnet."
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:130
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:140
 msgid ", with the inventory {0}: {1}"
 msgstr ", mit dem Inventar {0}: {1}"
 
@@ -1083,7 +1095,7 @@
 msgid "<div class=\"text-muted text-center\">No Matching Bank Transactions Found</div>"
 msgstr "<div class=\"text-muted text-center\">Keine übereinstimmenden Banktransaktionen gefunden</div>"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:258
+#: public/js/bank_reconciliation_tool/dialog_manager.js:262
 msgid "<div class=\"text-muted text-center\">{0}</div>"
 msgstr "<div class=\"text-muted text-center\">{0}</div>"
 
@@ -1289,11 +1301,11 @@
 msgid "A BOM with name {0} already exists for item {1}."
 msgstr "Für Artikel {1} ist bereits eine Stückliste mit dem Namen {0} vorhanden."
 
-#: selling/doctype/customer/customer.py:297
+#: selling/doctype/customer/customer.py:309
 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group"
 msgstr "Eine Kundengruppe mit dem gleichen Namen existiert bereits. Bitte den Kundennamen ändern oder die Kundengruppe umbenennen"
 
-#: manufacturing/doctype/workstation/workstation.js:47
+#: manufacturing/doctype/workstation/workstation.js:73
 msgid "A Holiday List can be added to exclude counting these days for the Workstation."
 msgstr "Sie können eine Liste der arbeitsfreien Tage hinzufügen, um die Zählung dieser Tage für den Arbeitsplatz auszuschließen."
 
@@ -1305,7 +1317,17 @@
 msgid "A Packing Slip can only be created for Draft Delivery Note."
 msgstr "Ein Packzettel kann nur für Entwürfe von Lieferscheinen erstellt werden."
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:530
+#. Description of a DocType
+#: stock/doctype/price_list/price_list.json
+msgid "A Price List is a collection of Item Prices either Selling, Buying, or both"
+msgstr ""
+
+#. Description of a DocType
+#: stock/doctype/item/item.json
+msgid "A Product or a Service that is bought, sold or kept in stock."
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:535
 msgid "A Reconciliation Job {0} is running for the same filters. Cannot reconcile now"
 msgstr ""
 
@@ -1316,12 +1338,13 @@
 msgstr "Ein Kundenauftrag ist eine Bestätigung einer Bestellung Ihres Kunden. Er wird auch als Proforma-Rechnung bezeichnet.\n\n"
 "Der Kundenauftrag ist das Herzstück Ihrer Verkaufs- und Einkaufstransaktionen. Kundenaufträge sind mit Lieferscheinen, Ausgangsrechnungen, Materialanforderungen und Wartungstransaktionen verknüpft. Über den Kundenauftrag können Sie die Erfüllung des gesamten Geschäfts mit dem Kunden verfolgen."
 
-#: setup/doctype/company/company.py:937
-msgid "A Transaction Deletion Job is triggered for {0}"
+#: setup/doctype/company/company.py:916
+msgid "A Transaction Deletion Document: {0} is triggered for {0}"
 msgstr ""
 
-#: setup/doctype/company/company.py:914
-msgid "A Transaction Deletion Job: {0} is already running for {1}"
+#. Description of a DocType
+#: accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+msgid "A condition for a Shipping Rule"
 msgstr ""
 
 #. Description of the 'Send To Primary Contact' (Check) field in DocType
@@ -1339,6 +1362,11 @@
 msgid "A driver must be set to submit."
 msgstr "Ein Fahrer muss zum Buchen angegeben werden."
 
+#. Description of a DocType
+#: stock/doctype/warehouse/warehouse.json
+msgid "A logical Warehouse against which stock entries are made."
+msgstr ""
+
 #: templates/emails/confirm_appointment.html:2
 msgid "A new appointment has been created for you with {0}"
 msgstr "Es wurde ein neuer Termin für Sie bei {0} erstellt"
@@ -1347,6 +1375,11 @@
 msgid "A template with tax category {0} already exists. Only one template is allowed with each tax category"
 msgstr "Eine Vorlage mit der Steuerkategorie {0} existiert bereits. Für jede Steuerkategorie ist nur eine Vorlage zulässig"
 
+#. Description of a DocType
+#: setup/doctype/sales_partner/sales_partner.json
+msgid "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission."
+msgstr ""
+
 #. Option for the 'Blood Group' (Select) field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -1545,11 +1578,11 @@
 msgid "Abbreviation"
 msgstr "Abkürzung"
 
-#: setup/doctype/company/company.py:164
+#: setup/doctype/company/company.py:163
 msgid "Abbreviation already used for another company"
 msgstr "Abkürzung bereits für ein anderes Unternehmen verwendet"
 
-#: setup/doctype/company/company.py:159
+#: setup/doctype/company/company.py:158
 msgid "Abbreviation is mandatory"
 msgstr "Abkürzung ist zwingend erforderlich"
 
@@ -1563,15 +1596,15 @@
 msgid "About Us Settings"
 msgstr "Einstellungen zu \"Über uns\""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:39
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
 msgid "About {0} minute remaining"
 msgstr "Noch ungefähr {0} Minuten"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:40
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:38
 msgid "About {0} minutes remaining"
 msgstr "Noch ungefähr {0} Minuten"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:35
 msgid "About {0} seconds remaining"
 msgstr "Noch ungefähr {0} Sekunden"
 
@@ -1639,7 +1672,7 @@
 msgid "Accepted Qty in Stock UOM"
 msgstr "Angenommene Menge in Lagereinheit"
 
-#: public/js/controllers/transaction.js:2124
+#: public/js/controllers/transaction.js:2167
 msgid "Accepted Quantity"
 msgstr "Angenommene Menge"
 
@@ -1691,7 +1724,7 @@
 msgid "Access Key"
 msgstr "Zugriffsschlüssel"
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:48
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:49
 msgid "Access Key is required for Service Provider: {0}"
 msgstr "Zugangsschlüssel ist erforderlich für Dienstanbieter: {0}"
 
@@ -1713,13 +1746,13 @@
 #: 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_ledger/general_ledger.js:38
-#: accounts/report/general_ledger/general_ledger.py:565
-#: accounts/report/payment_ledger/payment_ledger.js:31
+#: accounts/report/general_ledger/general_ledger.py:578
+#: 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_for_party/trial_balance_for_party.js:70
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:16
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:16
+#: 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
 msgid "Account"
 msgstr "Konto"
 
@@ -1872,12 +1905,6 @@
 msgid "Account Balance"
 msgstr "Kontostand"
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Account Balance"
-msgstr "Kontostand"
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -2021,8 +2048,8 @@
 msgid "Account Manager"
 msgstr "Kundenbetreuer"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
-#: controllers/accounts_controller.py:1908
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
+#: controllers/accounts_controller.py:2000
 msgid "Account Missing"
 msgstr "Konto fehlt"
 
@@ -2050,11 +2077,11 @@
 msgid "Account Name"
 msgstr "Kontoname"
 
-#: accounts/doctype/account/account.py:306
+#: accounts/doctype/account/account.py:325
 msgid "Account Not Found"
 msgstr "Konto nicht gefunden"
 
-#: accounts/doctype/account/account_tree.js:108
+#: accounts/doctype/account/account_tree.js:131
 msgid "Account Number"
 msgstr "Kontonummer"
 
@@ -2064,7 +2091,7 @@
 msgid "Account Number"
 msgstr "Kontonummer"
 
-#: accounts/doctype/account/account.py:458
+#: accounts/doctype/account/account.py:477
 msgid "Account Number {0} already used in account {1}"
 msgstr "Die Kontonummer {0} wurde bereits im Konto {1} verwendet"
 
@@ -2102,8 +2129,8 @@
 msgid "Account Subtype"
 msgstr "Kontosubtyp"
 
-#: accounts/doctype/account/account_tree.js:115
-#: accounts/report/account_balance/account_balance.js:35
+#: accounts/doctype/account/account_tree.js:152
+#: accounts/report/account_balance/account_balance.js:34
 msgid "Account Type"
 msgstr "Kontotyp"
 
@@ -2147,11 +2174,11 @@
 msgid "Account Value"
 msgstr "Kontostand"
 
-#: accounts/doctype/account/account.py:279
+#: accounts/doctype/account/account.py:298
 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 msgstr "Der Kontostand ist bereits im Haben, daher können Sie „Saldo muss sein“ nicht auf „Soll“ setzen"
 
-#: accounts/doctype/account/account.py:273
+#: accounts/doctype/account/account.py:292
 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
 msgstr "Der Kontostand ist bereits im Soll, daher können Sie „Saldo muss sein“ nicht auf „Haben“ setzen"
 
@@ -2173,7 +2200,7 @@
 msgid "Account for Change Amount"
 msgstr "Konto für Wechselbetrag"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:44
+#: accounts/doctype/bank_clearance/bank_clearance.py:46
 msgid "Account is mandatory to get payment entries"
 msgstr "Konto ist obligatorisch, um Zahlungseingänge zu erhalten"
 
@@ -2181,28 +2208,28 @@
 msgid "Account is not set for the dashboard chart {0}"
 msgstr "Konto ist nicht für das Dashboard-Diagramm {0} festgelegt."
 
-#: assets/doctype/asset/asset.py:677
+#: assets/doctype/asset/asset.py:679
 msgid "Account not Found"
 msgstr "Konto nicht gefunden"
 
-#: accounts/doctype/account/account.py:360
+#: accounts/doctype/account/account.py:379
 msgid "Account with child nodes cannot be converted to ledger"
 msgstr "Ein Konto mit Unterknoten kann nicht in ein Kontoblatt umgewandelt werden"
 
-#: accounts/doctype/account/account.py:252
+#: accounts/doctype/account/account.py:271
 msgid "Account with child nodes cannot be set as ledger"
 msgstr "Konto mit untergeordneten Knoten kann nicht als Hauptbuch festgelegt werden"
 
-#: accounts/doctype/account/account.py:371
+#: accounts/doctype/account/account.py:390
 msgid "Account with existing transaction can not be converted to group."
 msgstr "Ein Konto mit bestehenden Transaktionen kann nicht in eine Gruppe umgewandelt werden"
 
-#: accounts/doctype/account/account.py:400
+#: accounts/doctype/account/account.py:419
 msgid "Account with existing transaction can not be deleted"
 msgstr "Ein Konto mit bestehenden Transaktionen kann nicht gelöscht werden"
 
-#: accounts/doctype/account/account.py:247
-#: accounts/doctype/account/account.py:362
+#: accounts/doctype/account/account.py:266
+#: accounts/doctype/account/account.py:381
 msgid "Account with existing transaction cannot be converted to ledger"
 msgstr "Ein Konto mit bestehenden Transaktionen kann nicht in ein Kontoblatt umgewandelt werden"
 
@@ -2210,7 +2237,7 @@
 msgid "Account {0} added multiple times"
 msgstr "Konto {0} mehrmals hinzugefügt"
 
-#: setup/doctype/company/company.py:187
+#: setup/doctype/company/company.py:186
 msgid "Account {0} does not belong to company: {1}"
 msgstr "Konto {0} gehört nicht zu Unternehmen {1}"
 
@@ -2218,7 +2245,7 @@
 msgid "Account {0} does not belongs to company {1}"
 msgstr "Konto {0} gehört nicht zu Unternehmen {1}"
 
-#: accounts/doctype/account/account.py:532
+#: accounts/doctype/account/account.py:551
 msgid "Account {0} does not exist"
 msgstr "Konto {0} existiert nicht"
 
@@ -2234,7 +2261,7 @@
 msgid "Account {0} does not match with Company {1} in Mode of Account: {2}"
 msgstr "Konto {0} stimmt nicht mit Unternehmen {1} im Rechnungsmodus überein: {2}"
 
-#: accounts/doctype/account/account.py:490
+#: accounts/doctype/account/account.py:509
 msgid "Account {0} exists in parent company {1}."
 msgstr "Konto {0} existiert in der Muttergesellschaft {1}."
 
@@ -2242,51 +2269,51 @@
 msgid "Account {0} has been entered multiple times"
 msgstr "Konto {0} wurde mehrmals eingegeben"
 
-#: accounts/doctype/account/account.py:344
+#: accounts/doctype/account/account.py:363
 msgid "Account {0} is added in the child company {1}"
 msgstr "Konto {0} wurde im Tochterunternehmen {1} hinzugefügt"
 
-#: accounts/doctype/gl_entry/gl_entry.py:443
+#: accounts/doctype/gl_entry/gl_entry.py:397
 msgid "Account {0} is frozen"
 msgstr "Konto {0} ist eingefroren"
 
-#: controllers/accounts_controller.py:1032
+#: controllers/accounts_controller.py:1096
 msgid "Account {0} is invalid. Account Currency must be {1}"
 msgstr "Konto {0} ist ungültig. Kontenwährung muss {1} sein"
 
-#: accounts/doctype/account/account.py:150
+#: accounts/doctype/account/account.py:151
 msgid "Account {0}: Parent account {1} can not be a ledger"
 msgstr "Konto {0}: Übergeordnetes Konto {1} kann kein Kontenblatt sein"
 
-#: accounts/doctype/account/account.py:156
+#: accounts/doctype/account/account.py:157
 msgid "Account {0}: Parent account {1} does not belong to company: {2}"
 msgstr "Konto {0}: Kontogruppe {1} gehört nicht zu Unternehmen {2}"
 
-#: accounts/doctype/account/account.py:144
+#: accounts/doctype/account/account.py:145
 msgid "Account {0}: Parent account {1} does not exist"
 msgstr "Konto {0}: Hauptkonto {1} existiert nicht"
 
-#: accounts/doctype/account/account.py:147
+#: accounts/doctype/account/account.py:148
 msgid "Account {0}: You can not assign itself as parent account"
 msgstr "Konto {0}: Sie können dieses Konto sich selbst nicht als Über-Konto zuweisen"
 
-#: accounts/general_ledger.py:403
+#: accounts/general_ledger.py:412
 msgid "Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry"
 msgstr "Konto: <b>{0}</b> ist in Bearbeitung und kann von Journal Entry nicht aktualisiert werden"
 
-#: accounts/doctype/journal_entry/journal_entry.py:243
+#: accounts/doctype/journal_entry/journal_entry.py:259
 msgid "Account: {0} can only be updated via Stock Transactions"
 msgstr "Konto: {0} kann nur über Lagertransaktionen aktualisiert werden"
 
-#: accounts/report/general_ledger/general_ledger.py:325
+#: accounts/report/general_ledger/general_ledger.py:338
 msgid "Account: {0} does not exist"
 msgstr "Konto {0} existiert nicht"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2098
+#: accounts/doctype/payment_entry/payment_entry.py:2117
 msgid "Account: {0} is not permitted under Payment Entry"
 msgstr "Konto {0} kann nicht in Zahlung verwendet werden"
 
-#: controllers/accounts_controller.py:2591
+#: controllers/accounts_controller.py:2676
 msgid "Account: {0} with currency: {1} can not be selected"
 msgstr "Konto: {0} mit Währung: {1} kann nicht ausgewählt werden"
 
@@ -2446,12 +2473,12 @@
 msgid "Accounting Dimension"
 msgstr "Buchhaltungsdimension"
 
-#: accounts/doctype/gl_entry/gl_entry.py:206
+#: accounts/doctype/gl_entry/gl_entry.py:196
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:153
 msgid "Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}."
 msgstr "Die Buchhaltungsdimension <b>{0}</b> ist für das Bilanzkonto <b>{1}</b> erforderlich."
 
-#: accounts/doctype/gl_entry/gl_entry.py:193
+#: accounts/doctype/gl_entry/gl_entry.py:183
 #: 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 "Für das Gewinn- und Verlustkonto {1} ist die Buchhaltungsdimension <b>{0}</b> erforderlich."
@@ -2767,53 +2794,54 @@
 msgid "Accounting Entries"
 msgstr "Buchungen"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:82
+#: accounts/doctype/sales_invoice/sales_invoice.js:86
 msgid "Accounting Entries are reposted"
 msgstr "Buchhaltungseinträge werden umgebucht"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:42
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
 msgid "Accounting Entries are reposted."
 msgstr "Buchhaltungseinträge werden umgebucht."
 
-#: assets/doctype/asset/asset.py:709 assets/doctype/asset/asset.py:724
-#: assets/doctype/asset_capitalization/asset_capitalization.py:572
+#: assets/doctype/asset/asset.py:713 assets/doctype/asset/asset.py:728
+#: assets/doctype/asset_capitalization/asset_capitalization.py:578
 msgid "Accounting Entry for Asset"
 msgstr "Buchungseintrag für Vermögenswert"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:738
+#: stock/doctype/purchase_receipt/purchase_receipt.py:737
 msgid "Accounting Entry for Service"
 msgstr "Buchhaltungseintrag für Service"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:906
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:926
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:942
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:959
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:978
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1126
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1266
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1284
-#: controllers/stock_controller.py:168 controllers/stock_controller.py:183
-#: stock/doctype/purchase_receipt/purchase_receipt.py:839
-#: stock/doctype/stock_entry/stock_entry.py:1464
-#: stock/doctype/stock_entry/stock_entry.py:1478
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:519
+#: 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
 msgid "Accounting Entry for Stock"
 msgstr "Lagerbuchung"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:658
+#: stock/doctype/purchase_receipt/purchase_receipt.py:659
 msgid "Accounting Entry for {0}"
 msgstr "Buchungen für {0}"
 
-#: controllers/accounts_controller.py:1950
+#: controllers/accounts_controller.py:2042
 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}"
 msgstr "Eine Buchung für {0}: {1} kann nur in der Währung: {2} vorgenommen werden"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:192
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:193
 #: buying/doctype/supplier/supplier.js:85
-#: public/js/controllers/stock_controller.js:72
-#: public/js/utils/ledger_preview.js:7 selling/doctype/customer/customer.js:159
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:43
+#: public/js/controllers/stock_controller.js:84
+#: public/js/utils/ledger_preview.js:8 selling/doctype/customer/customer.js:164
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:48
 msgid "Accounting Ledger"
 msgstr "Hauptbuch"
 
@@ -2844,15 +2872,19 @@
 msgid "Accounting entries are frozen up to this date. Nobody can create or modify entries except users with the role specified below"
 msgstr "Buchhaltungseinträge werden bis zu diesem Datum eingefroren. Niemand außer Benutzern mit der unten angegebenen Rolle kann Einträge erstellen oder ändern"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:69
+#: accounts/doctype/journal_entry/journal_entry.js:30
+msgid "Accounting entries for this Journal Entry need to be reposted. Please click on 'Repost' button to update."
+msgstr ""
+
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:82
 msgid "Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update."
 msgstr "Die Buchungen für diese Rechnung müssen umgebucht werden. Bitte klicken Sie zum Aktualisieren auf die Schaltfläche 'Umbuchen'."
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:72
+#: accounts/doctype/sales_invoice/sales_invoice.js:73
 msgid "Accounting entries for this invoice needs to be reposted. Please click on 'Repost' button to update."
 msgstr "Die Buchungen für diese Rechnung müssen umgebucht werden. Bitte klicken Sie zum Aktualisieren auf die Schaltfläche 'Umbuchen'."
 
-#: setup/doctype/company/company.py:317
+#: setup/doctype/company/company.py:316
 msgid "Accounts"
 msgstr "Rechnungswesen"
 
@@ -3027,7 +3059,7 @@
 msgid "Accounts Manager"
 msgstr "Kontenmanager"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:343
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:341
 msgid "Accounts Missing Error"
 msgstr ""
 
@@ -3037,9 +3069,9 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:85
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117
 #: accounts/report/accounts_payable/accounts_payable.json
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:122
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:125
 #: accounts/workspace/payables/payables.json
-#: buying/doctype/supplier/supplier.js:90
+#: buying/doctype/supplier/supplier.js:97
 msgid "Accounts Payable"
 msgstr "Verbindlichkeiten"
 
@@ -3052,7 +3084,7 @@
 
 #. Name of a report
 #. Label of a Link in the Payables Workspace
-#: accounts/report/accounts_payable/accounts_payable.js:175
+#: accounts/report/accounts_payable/accounts_payable.js:176
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.json
 #: accounts/workspace/payables/payables.json
 msgid "Accounts Payable Summary"
@@ -3065,10 +3097,10 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:12
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:12
 #: accounts/report/accounts_receivable/accounts_receivable.json
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:150
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:153
 #: accounts/workspace/accounting/accounting.json
 #: accounts/workspace/receivables/receivables.json
-#: selling/doctype/customer/customer.js:155
+#: selling/doctype/customer/customer.js:153
 msgid "Accounts Receivable"
 msgstr "Forderungen"
 
@@ -3227,7 +3259,7 @@
 msgid "Accounts User"
 msgstr "Rechnungswesen Benutzer"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1153
+#: accounts/doctype/journal_entry/journal_entry.py:1180
 msgid "Accounts table cannot be blank."
 msgstr "Kontenliste darf nicht leer sein."
 
@@ -3244,7 +3276,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:33
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:46
-#: accounts/report/account_balance/account_balance.js:38
+#: accounts/report/account_balance/account_balance.js:37
 msgid "Accumulated Depreciation"
 msgstr "Kumulierte Abschreibungen"
 
@@ -3267,7 +3299,7 @@
 msgstr "Konto für kumulierte Abschreibung"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:155
-#: assets/doctype/asset/asset.js:242
+#: assets/doctype/asset/asset.js:277
 msgid "Accumulated Depreciation Amount"
 msgstr "Aufgelaufener Abschreibungsbetrag"
 
@@ -3282,17 +3314,17 @@
 msgid "Accumulated Depreciation as on"
 msgstr "Kumulierte Abschreibungen zum"
 
-#: accounts/doctype/budget/budget.py:243
+#: accounts/doctype/budget/budget.py:250
 msgid "Accumulated Monthly"
 msgstr "Monatlich kumuliert"
 
-#: accounts/report/balance_sheet/balance_sheet.js:27
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:13
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:28
+#: accounts/report/balance_sheet/balance_sheet.js:22
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:8
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:23
 msgid "Accumulated Values"
 msgstr "Kumulierte Werte"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:101
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:125
 msgid "Accumulated Values in Group Company"
 msgstr "Kumulierte Werte in der Konzerngesellschaft"
 
@@ -3307,7 +3339,7 @@
 msgstr "Kaufdatum"
 
 #: crm/doctype/lead/lead.js:42
-#: public/js/bank_reconciliation_tool/dialog_manager.js:171
+#: public/js/bank_reconciliation_tool/dialog_manager.js:175
 msgid "Action"
 msgstr "Aktion"
 
@@ -3329,7 +3361,7 @@
 msgid "Action If Same Rate is Not Maintained"
 msgstr "Maßnahmen, wenn derselbe Preis nicht beibehalten wird"
 
-#: quality_management/doctype/quality_review/quality_review_list.js:9
+#: quality_management/doctype/quality_review/quality_review_list.js:7
 msgid "Action Initialised"
 msgstr "Aktion initialisiert"
 
@@ -3375,23 +3407,24 @@
 msgid "Action if Same Rate is Not Maintained Throughout Sales Cycle"
 msgstr "Maßnahmen, wenn derselbe Preis nicht während des gesamten Verkaufszyklus beibehalten wird"
 
-#: accounts/doctype/account/account.js:55
-#: accounts/doctype/account/account.js:62
-#: accounts/doctype/account/account.js:91
-#: accounts/doctype/account/account.js:116
-#: accounts/doctype/journal_entry/journal_entry.js:35
-#: accounts/doctype/payment_entry/payment_entry.js:160
+#: accounts/doctype/account/account.js:50
+#: accounts/doctype/account/account.js:57
+#: accounts/doctype/account/account.js:89
+#: accounts/doctype/account/account.js:117
+#: accounts/doctype/journal_entry/journal_entry.js:77
+#: accounts/doctype/payment_entry/payment_entry.js:190
 #: accounts/doctype/subscription/subscription.js:38
 #: accounts/doctype/subscription/subscription.js:44
 #: accounts/doctype/subscription/subscription.js:50
-#: buying/doctype/supplier/supplier.js:104
-#: buying/doctype/supplier/supplier.js:109
-#: projects/doctype/project/project.js:69
-#: projects/doctype/project/project.js:73
-#: projects/doctype/project/project.js:134
-#: public/js/bank_reconciliation_tool/data_table_manager.js:93
-#: public/js/utils/unreconcile.js:22 selling/doctype/customer/customer.js:170
-#: selling/doctype/customer/customer.js:175 stock/doctype/item/item.js:419
+#: buying/doctype/supplier/supplier.js:128
+#: buying/doctype/supplier/supplier.js:137
+#: projects/doctype/project/project.js:78
+#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:160
+#: public/js/bank_reconciliation_tool/data_table_manager.js:88
+#: public/js/bank_reconciliation_tool/data_table_manager.js:121
+#: public/js/utils/unreconcile.js:28 selling/doctype/customer/customer.js:184
+#: selling/doctype/customer/customer.js:193 stock/doctype/item/item.js:486
 #: templates/pages/order.html:20
 msgid "Actions"
 msgstr "Aktionen"
@@ -3428,7 +3461,7 @@
 msgstr "Aktionen ausgeführt"
 
 #: accounts/doctype/subscription/subscription_list.js:6
-#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:11
+#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:18
 #: stock/doctype/putaway_rule/putaway_rule_list.js:7
 msgid "Active"
 msgstr "Aktiv"
@@ -3474,6 +3507,12 @@
 msgid "Active Leads"
 msgstr "Aktive Leads"
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Active Status"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -3518,14 +3557,14 @@
 msgid "Activity Cost exists for Employee {0} against Activity Type - {1}"
 msgstr "Aktivitätskosten bestehen für Arbeitnehmer {0} zur Aktivitätsart {1}"
 
-#: projects/doctype/activity_type/activity_type.js:7
+#: projects/doctype/activity_type/activity_type.js:10
 msgid "Activity Cost per Employee"
 msgstr "Aktivitätskosten je Mitarbeiter"
 
 #. Name of a DocType
 #: projects/doctype/activity_type/activity_type.json
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:32
-#: public/js/projects/timer.js:8
+#: public/js/projects/timer.js:9 templates/pages/timelog_info.html:25
 msgid "Activity Type"
 msgstr "Aktivitätsart"
 
@@ -3665,6 +3704,7 @@
 msgid "Actual Posting"
 msgstr ""
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:21
 #: stock/report/product_bundle_balance/product_bundle_balance.py:96
 #: stock/report/stock_projected_qty/stock_projected_qty.py:136
 msgid "Actual Qty"
@@ -3718,10 +3758,19 @@
 msgid "Actual Qty in Warehouse"
 msgstr "Ist-Menge im Lager"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:185
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:196
 msgid "Actual Qty is mandatory"
 msgstr "Die Ist-Menge ist zwingend erforderlich"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:37
+#: stock/dashboard/item_dashboard_list.html:28
+msgid "Actual Qty {0} / Waiting Qty {1}"
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Actual Qty: Quantity available in the warehouse."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:95
 msgid "Actual Quantity"
 msgstr "Ist-Bestand"
@@ -3788,18 +3837,20 @@
 msgid "Actual qty in stock"
 msgstr "Ist-Menge auf Lager"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1223
+#: accounts/doctype/payment_entry/payment_entry.js:1470
 #: public/js/controllers/accounts.js:176
 msgid "Actual type tax cannot be included in Item rate in row {0}"
 msgstr "Tatsächliche Steuerart kann nicht im Artikelpreis in Zeile {0} beinhaltet sein"
 
-#: crm/doctype/lead/lead.js:82
-#: public/js/bom_configurator/bom_configurator.bundle.js:225
-#: public/js/bom_configurator/bom_configurator.bundle.js:237
-#: public/js/bom_configurator/bom_configurator.bundle.js:291
-#: public/js/utils/crm_activities.js:168
+#: crm/doctype/lead/lead.js:85
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:55
+#: public/js/bom_configurator/bom_configurator.bundle.js:231
+#: public/js/bom_configurator/bom_configurator.bundle.js:244
+#: public/js/bom_configurator/bom_configurator.bundle.js:329
+#: public/js/utils/crm_activities.js:170
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/dashboard/item_dashboard_list.html:59
 msgid "Add"
 msgstr "Hinzufügen"
 
@@ -3817,11 +3868,11 @@
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: stock/doctype/item/item.js:417 stock/doctype/price_list/price_list.js:7
+#: stock/doctype/item/item.js:482 stock/doctype/price_list/price_list.js:8
 msgid "Add / Edit Prices"
 msgstr "Preise hinzufügen / bearbeiten"
 
-#: accounts/doctype/account/account_tree.js:176
+#: accounts/doctype/account/account_tree.js:256
 msgid "Add Child"
 msgstr "Unterpunkt hinzufügen"
 
@@ -3829,27 +3880,36 @@
 msgid "Add Columns in Transaction Currency"
 msgstr "Spalten in Transaktionswährung hinzufügen"
 
+#: templates/pages/task_info.html:94 templates/pages/task_info.html:96
+msgid "Add Comment"
+msgstr ""
+
 #. Label of a Check field in DocType 'Manufacturing Settings'
 #: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
 msgctxt "Manufacturing Settings"
 msgid "Add Corrective Operation Cost in Finished Good Valuation"
 msgstr "Kosten für Korrekturmaßnahmen zur Bewertung der Fertigwaren hinzufügen"
 
-#: public/js/event.js:19
+#: public/js/event.js:24
 msgid "Add Customers"
 msgstr "Kunden hinzufügen"
 
-#: public/js/event.js:27
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:411
+msgid "Add Discount"
+msgstr ""
+
+#: public/js/event.js:40
 msgid "Add Employees"
 msgstr "Mitarbeiter hinzufügen"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:224
-#: selling/doctype/sales_order/sales_order.js:207
-#: stock/dashboard/item_dashboard.js:205
+#: public/js/bom_configurator/bom_configurator.bundle.js:230
+#: selling/doctype/sales_order/sales_order.js:228
+#: stock/dashboard/item_dashboard.js:212
 msgid "Add Item"
 msgstr "Artikel hinzufügen"
 
-#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:33
+#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:35
 msgid "Add Items"
 msgstr "Artikel hinzufügen"
 
@@ -3857,11 +3917,11 @@
 msgid "Add Items in the Purpose Table"
 msgstr ""
 
-#: crm/doctype/lead/lead.js:82
+#: crm/doctype/lead/lead.js:84
 msgid "Add Lead to Prospect"
 msgstr "Interessenten zu einem Potenziellen Kunden hinzufügen"
 
-#: public/js/event.js:15
+#: public/js/event.js:16
 msgid "Add Leads"
 msgstr "Interessenten hinzufügen"
 
@@ -3891,12 +3951,12 @@
 msgid "Add Or Deduct"
 msgstr "Hinzufügen oder Abziehen"
 
-#: selling/page/point_of_sale/pos_item_cart.js:269
+#: selling/page/point_of_sale/pos_item_cart.js:267
 msgid "Add Order Discount"
 msgstr "Bestellrabatt hinzufügen"
 
-#: public/js/event.js:17 public/js/event.js:21 public/js/event.js:25
-#: public/js/event.js:29 public/js/event.js:33
+#: public/js/event.js:20 public/js/event.js:28 public/js/event.js:36
+#: public/js/event.js:44 public/js/event.js:52
 msgid "Add Participants"
 msgstr "Teilnehmer hinzufügen"
 
@@ -3906,7 +3966,7 @@
 msgid "Add Quote"
 msgstr "Angebot hinzufügen"
 
-#: public/js/event.js:31
+#: public/js/event.js:48
 msgid "Add Sales Partners"
 msgstr "Verkaufspartner hinzufügen"
 
@@ -3940,17 +4000,21 @@
 msgid "Add Serial / Batch No (Rejected Qty)"
 msgstr "Serien-/Chargennummer hinzufügen (Abgelehnte Menge)"
 
-#: public/js/utils.js:61
+#: public/js/utils.js:71
 msgid "Add Serial No"
 msgstr "Seriennummer hinzufügen"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:231
-#: public/js/bom_configurator/bom_configurator.bundle.js:280
+#: manufacturing/doctype/plant_floor/plant_floor.js:172
+msgid "Add Stock"
+msgstr ""
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:238
+#: public/js/bom_configurator/bom_configurator.bundle.js:318
 msgid "Add Sub Assembly"
 msgstr "Unterbaugruppe hinzufügen"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:433
-#: public/js/event.js:23
+#: buying/doctype/request_for_quotation/request_for_quotation.js:472
+#: public/js/event.js:32
 msgid "Add Suppliers"
 msgstr "Lieferanten hinzufügen"
 
@@ -3970,7 +4034,7 @@
 msgid "Add Weekly Holidays"
 msgstr "Wöchentlich freie Tage hinzufügen"
 
-#: public/js/utils/crm_activities.js:140
+#: public/js/utils/crm_activities.js:142
 msgid "Add a Note"
 msgstr "Notiz hinzufügen"
 
@@ -3989,7 +4053,7 @@
 msgstr "Details hinzufügen"
 
 #: stock/doctype/pick_list/pick_list.js:71
-#: stock/doctype/pick_list/pick_list.py:614
+#: stock/doctype/pick_list/pick_list.py:654
 msgid "Add items in the Item Locations table"
 msgstr "Fügen Sie Artikel in der Tabelle „Artikelstandorte“ hinzu"
 
@@ -4025,10 +4089,14 @@
 msgid "Add to Transit"
 msgstr "Zum Transit hinzufügen"
 
-#: accounts/doctype/coupon_code/coupon_code.js:39
+#: accounts/doctype/coupon_code/coupon_code.js:36
 msgid "Add/Edit Coupon Conditions"
 msgstr "Gutscheinbedingungen hinzufügen / bearbeiten"
 
+#: templates/includes/footer/footer_extension.html:26
+msgid "Added"
+msgstr ""
+
 #. Label of a Link field in DocType 'CRM Note'
 #: crm/doctype/crm_note/crm_note.json
 msgctxt "CRM Note"
@@ -4045,7 +4113,7 @@
 msgid "Added Supplier Role to User {0}."
 msgstr "Lieferantenrolle zu Benutzer {0} hinzugefügt."
 
-#: public/js/utils/item_selector.js:66 public/js/utils/item_selector.js:80
+#: public/js/utils/item_selector.js:70 public/js/utils/item_selector.js:86
 msgid "Added {0} ({1})"
 msgstr "{0} ({1}) hinzugefügt"
 
@@ -4053,10 +4121,14 @@
 msgid "Added {1} Role to User {0}."
 msgstr "Rolle {1} zu Benutzer {0} hinzugefügt."
 
-#: crm/doctype/lead/lead.js:80
+#: crm/doctype/lead/lead.js:81
 msgid "Adding Lead to Prospect..."
 msgstr "Interessent wird zu Potenziellem Kunden hinzugefügt..."
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "Additional"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Asset'
 #: assets/doctype/asset/asset.json
 msgctxt "Asset"
@@ -4384,6 +4456,10 @@
 msgid "Additional Info"
 msgstr "Zusätzliche Info"
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Additional Information"
+msgstr "Weitere Informationen"
+
 #. Label of a Section Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -4708,7 +4784,7 @@
 msgid "Address HTML"
 msgstr "Adress-HTML"
 
-#: public/js/utils/contact_address_quick_entry.js:58
+#: public/js/utils/contact_address_quick_entry.js:61
 msgid "Address Line 1"
 msgstr "Adresse Zeile 1"
 
@@ -4718,7 +4794,7 @@
 msgid "Address Line 1"
 msgstr "Adresse Zeile 1"
 
-#: public/js/utils/contact_address_quick_entry.js:63
+#: public/js/utils/contact_address_quick_entry.js:66
 msgid "Address Line 2"
 msgstr "Adresse Zeile 2"
 
@@ -4817,15 +4893,15 @@
 msgid "Addresses"
 msgstr "Adressen"
 
-#: assets/doctype/asset/asset.js:116
+#: assets/doctype/asset/asset.js:144
 msgid "Adjust Asset Value"
 msgstr "Wert des Vermögensgegenstands anpassen"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:996
+#: accounts/doctype/sales_invoice/sales_invoice.js:1072
 msgid "Adjustment Against"
 msgstr "Anpassung gegen"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:581
+#: stock/doctype/purchase_receipt/purchase_receipt.py:582
 msgid "Adjustment based on Purchase Invoice rate"
 msgstr ""
 
@@ -4842,7 +4918,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:303
+#: stock/reorder_item.py:388
 msgid "Administrator"
 msgstr "Administrator"
 
@@ -4874,8 +4950,8 @@
 msgid "Advance Paid"
 msgstr "Angezahlt"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:47
-#: selling/doctype/sales_order/sales_order_list.js:61
+#: buying/doctype/purchase_order/purchase_order_list.js:65
+#: selling/doctype/sales_order/sales_order_list.js:105
 msgid "Advance Payment"
 msgstr "Anzahlung"
 
@@ -4891,7 +4967,7 @@
 msgid "Advance Payment Status"
 msgstr "Vorauszahlungsstatus"
 
-#: controllers/accounts_controller.py:214
+#: controllers/accounts_controller.py:224
 msgid "Advance Payments"
 msgstr "Anzahlungen"
 
@@ -4947,11 +5023,11 @@
 msgid "Advance amount"
 msgstr "Anzahlungsbetrag"
 
-#: controllers/taxes_and_totals.py:743
+#: controllers/taxes_and_totals.py:744
 msgid "Advance amount cannot be greater than {0} {1}"
 msgstr "Anzahlung kann nicht größer sein als {0} {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:741
+#: accounts/doctype/journal_entry/journal_entry.py:768
 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
 msgstr "Der auf {0} {1} gezahlte Vorschuss kann nicht höher sein als die Gesamtsumme {2}"
 
@@ -4999,6 +5075,10 @@
 msgid "Affected Transactions"
 msgstr "Betroffene Transaktionen"
 
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:23
+msgid "Against"
+msgstr "Zu"
+
 #. Label of a Text field in DocType 'GL Entry'
 #: accounts/doctype/gl_entry/gl_entry.json
 msgctxt "GL Entry"
@@ -5007,7 +5087,7 @@
 
 #: 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:631
+#: accounts/report/general_ledger/general_ledger.py:644
 msgid "Against Account"
 msgstr "Gegenkonto"
 
@@ -5041,11 +5121,11 @@
 msgid "Against Blanket Order"
 msgstr "Gegen Pauschalauftrag"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:945
+#: accounts/doctype/sales_invoice/sales_invoice.py:962
 msgid "Against Customer Order {0} dated {1}"
 msgstr "Gegen Kundenauftrag {0} vom {1}"
 
-#: selling/doctype/sales_order/sales_order.js:967
+#: selling/doctype/sales_order/sales_order.js:1127
 msgid "Against Default Supplier"
 msgstr "Gegen Standardlieferanten"
 
@@ -5103,12 +5183,12 @@
 msgid "Against Income Account"
 msgstr "Zu Ertragskonto"
 
-#: accounts/doctype/journal_entry/journal_entry.py:609
-#: accounts/doctype/payment_entry/payment_entry.py:669
+#: accounts/doctype/journal_entry/journal_entry.py:636
+#: accounts/doctype/payment_entry/payment_entry.py:678
 msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
 msgstr "Buchungssatz {0} hat keinen offenen Eintrag auf der {1}-Seite"
 
-#: accounts/doctype/gl_entry/gl_entry.py:410
+#: accounts/doctype/gl_entry/gl_entry.py:364
 msgid "Against Journal Entry {0} is already adjusted against some other voucher"
 msgstr "\"Zu Buchungssatz\" {0} ist bereits mit einem anderen Beleg abgeglichen"
 
@@ -5142,11 +5222,11 @@
 msgid "Against Stock Entry"
 msgstr "Zu Lagerbewegung"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
 msgid "Against Supplier Invoice {0} dated {1}"
 msgstr "Zu Eingangsrechnung {0} vom {1}"
 
-#: accounts/report/general_ledger/general_ledger.py:650
+#: accounts/report/general_ledger/general_ledger.py:663
 msgid "Against Voucher"
 msgstr "Gegenbeleg"
 
@@ -5157,7 +5237,7 @@
 msgstr "Gegenbeleg"
 
 #: accounts/report/general_ledger/general_ledger.js:57
-#: accounts/report/payment_ledger/payment_ledger.js:71
+#: accounts/report/payment_ledger/payment_ledger.js:70
 #: accounts/report/payment_ledger/payment_ledger.py:185
 msgid "Against Voucher No"
 msgstr "Belegnr."
@@ -5168,7 +5248,7 @@
 msgid "Against Voucher No"
 msgstr "Belegnr."
 
-#: accounts/report/general_ledger/general_ledger.py:648
+#: accounts/report/general_ledger/general_ledger.py:661
 #: accounts/report/payment_ledger/payment_ledger.py:176
 msgid "Against Voucher Type"
 msgstr "Gegen Belegart"
@@ -5186,14 +5266,15 @@
 msgstr "Gegen Belegart"
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:117
-#: manufacturing/report/work_order_summary/work_order_summary.js:59
+#: manufacturing/report/work_order_summary/work_order_summary.js:58
 #: manufacturing/report/work_order_summary/work_order_summary.py:259
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:96
 msgid "Age"
 msgstr "Alter"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:151
-#: accounts/report/accounts_receivable/accounts_receivable.py:1134
+#: accounts/report/accounts_receivable/accounts_receivable.html:133
+#: accounts/report/accounts_receivable/accounts_receivable.py:1142
 msgid "Age (Days)"
 msgstr "Alter (Tage)"
 
@@ -5203,7 +5284,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:58
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:21
-#: accounts/report/accounts_receivable/accounts_receivable.js:83
+#: accounts/report/accounts_receivable/accounts_receivable.js:86
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:21
 msgid "Ageing Based On"
 msgstr "Alter basierend auf"
@@ -5216,7 +5297,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:65
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:28
-#: accounts/report/accounts_receivable/accounts_receivable.js:90
+#: accounts/report/accounts_receivable/accounts_receivable.js:93
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:28
 #: stock/report/stock_ageing/stock_ageing.js:49
 msgid "Ageing Range 1"
@@ -5224,7 +5305,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:72
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:35
-#: accounts/report/accounts_receivable/accounts_receivable.js:97
+#: accounts/report/accounts_receivable/accounts_receivable.js:100
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:35
 #: stock/report/stock_ageing/stock_ageing.js:56
 msgid "Ageing Range 2"
@@ -5232,7 +5313,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:79
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:42
-#: accounts/report/accounts_receivable/accounts_receivable.js:104
+#: accounts/report/accounts_receivable/accounts_receivable.js:107
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:42
 #: stock/report/stock_ageing/stock_ageing.js:63
 msgid "Ageing Range 3"
@@ -5240,7 +5321,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:86
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:49
-#: accounts/report/accounts_receivable/accounts_receivable.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:49
 msgid "Ageing Range 4"
 msgstr "Alterungsbereich 4"
@@ -5304,6 +5385,11 @@
 msgid "Agents"
 msgstr "Agenten"
 
+#. Description of a DocType
+#: selling/doctype/product_bundle/product_bundle.json
+msgid "Aggregate a group of Items into another Item. This is useful if you are maintaining the stock of the packed items and not the bundled item"
+msgstr ""
+
 #. Name of a role
 #: assets/doctype/location/location.json
 msgid "Agriculture Manager"
@@ -5335,10 +5421,10 @@
 msgid "All"
 msgstr "Alle"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:148
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:168
+#: 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:1324 public/js/setup_wizard.js:163
+#: accounts/utils.py:1293 public/js/setup_wizard.js:174
 msgid "All Accounts"
 msgstr "Alle Konten"
 
@@ -5412,14 +5498,14 @@
 #: 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:310 setup/doctype/company/company.py:313
-#: setup/doctype/company/company.py:318 setup/doctype/company/company.py:324
-#: setup/doctype/company/company.py:330 setup/doctype/company/company.py:336
-#: setup/doctype/company/company.py:342 setup/doctype/company/company.py:348
-#: setup/doctype/company/company.py:354 setup/doctype/company/company.py:360
-#: setup/doctype/company/company.py:366 setup/doctype/company/company.py:372
-#: setup/doctype/company/company.py:378 setup/doctype/company/company.py:384
-#: setup/doctype/company/company.py:390
+#: 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
 msgid "All Departments"
 msgstr "Alle Abteilungen"
 
@@ -5440,6 +5526,10 @@
 msgid "All Item Groups"
 msgstr "Alle Artikelgruppen"
 
+#: selling/page/point_of_sale/pos_item_selector.js:25
+msgid "All Items"
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5458,6 +5548,11 @@
 msgid "All Sales Person"
 msgstr "Alle Vertriebsmitarbeiter"
 
+#. Description of a DocType
+#: setup/doctype/sales_person/sales_person.json
+msgid "All Sales Transactions can be tagged against multiple Sales Persons so that you can set and monitor targets."
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5487,7 +5582,7 @@
 msgid "All Territories"
 msgstr "Alle Gebiete"
 
-#: setup/doctype/company/company.py:259 setup/doctype/company/company.py:275
+#: setup/doctype/company/company.py:258 setup/doctype/company/company.py:274
 msgid "All Warehouses"
 msgstr "Alle Lager"
 
@@ -5498,19 +5593,19 @@
 msgid "All allocations have been successfully reconciled"
 msgstr "Alle Zuweisungen wurden erfolgreich abgeglichen"
 
-#: support/doctype/issue/issue.js:97
+#: support/doctype/issue/issue.js:107
 msgid "All communications including and above this shall be moved into the new Issue"
 msgstr "Alle Mitteilungen einschließlich und darüber sollen in die neue Ausgabe verschoben werden"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:1170
+#: stock/doctype/purchase_receipt/purchase_receipt.py:1172
 msgid "All items have already been Invoiced/Returned"
 msgstr "Alle Artikel wurden bereits in Rechnung gestellt / zurückgesandt"
 
-#: stock/doctype/stock_entry/stock_entry.py:2191
+#: stock/doctype/stock_entry/stock_entry.py:2222
 msgid "All items have already been transferred for this Work Order."
 msgstr "Alle Positionen wurden bereits für diesen Arbeitsauftrag übertragen."
 
-#: public/js/controllers/transaction.js:2210
+#: public/js/controllers/transaction.js:2253
 msgid "All items in this document already have a linked Quality Inspection."
 msgstr "Für alle Artikel in diesem Dokument ist bereits eine Qualitätsprüfung verknüpft."
 
@@ -5521,17 +5616,17 @@
 msgid "All the Comments and Emails will be copied from one document to another newly created document(Lead -> Opportunity -> Quotation) throughout the CRM documents."
 msgstr "Alle Kommentare und E-Mails werden von einem Dokument zu einem anderen neu erstellten Dokument kopiert (Lead -> Opportunity -> Quotation) über alle CRM-Dokumente."
 
-#: manufacturing/doctype/work_order/work_order.js:847
+#: manufacturing/doctype/work_order/work_order.js:916
 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 "Alle benötigten Artikel (Rohmaterial) werden aus der Stückliste geholt und in diese Tabelle eingetragen. Hier können Sie auch das Quelllager für jeden Artikel ändern. Und während der Produktion können Sie das übertragene Rohmaterial in dieser Tabelle verfolgen."
 
-#: stock/doctype/delivery_note/delivery_note.py:899
+#: stock/doctype/delivery_note/delivery_note.py:960
 msgid "All these items have already been Invoiced/Returned"
 msgstr "Alle diese Artikel wurden bereits in Rechnung gestellt / zurückgesandt"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:83
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:95
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:84
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:85
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:92
 msgid "Allocate"
 msgstr "Zuweisen"
 
@@ -5547,7 +5642,7 @@
 msgid "Allocate Advances Automatically (FIFO)"
 msgstr "Zuweisungen automatisch zuordnen (FIFO)"
 
-#: accounts/doctype/payment_entry/payment_entry.js:679
+#: accounts/doctype/payment_entry/payment_entry.js:831
 msgid "Allocate Payment Amount"
 msgstr "Zahlungsbetrag zuweisen"
 
@@ -5570,7 +5665,7 @@
 msgstr "Zugewiesen"
 
 #: accounts/report/gross_profit/gross_profit.py:314
-#: public/js/utils/unreconcile.js:62
+#: public/js/utils/unreconcile.js:86
 msgid "Allocated Amount"
 msgstr "Zugewiesener Betrag"
 
@@ -5629,21 +5724,25 @@
 msgid "Allocated Entries"
 msgstr "Zugeordnete Einträge"
 
+#: public/js/templates/crm_activities.html:49
+msgid "Allocated To:"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Invoice Advance'
 #: accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
 msgctxt "Sales Invoice Advance"
 msgid "Allocated amount"
 msgstr "Zugewiesener Betrag"
 
-#: accounts/utils.py:614
+#: accounts/utils.py:623
 msgid "Allocated amount cannot be greater than unadjusted amount"
 msgstr "Der zugewiesene Betrag kann nicht größer als der nicht angepasste Betrag sein"
 
-#: accounts/utils.py:612
+#: accounts/utils.py:621
 msgid "Allocated amount cannot be negative"
 msgstr "Der zugewiesene Betrag kann nicht negativ sein"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:258
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:262
 msgid "Allocation"
 msgstr "Zuweisung"
 
@@ -5653,7 +5752,7 @@
 msgid "Allocation"
 msgstr "Zuweisung"
 
-#: public/js/utils/unreconcile.js:67
+#: public/js/utils/unreconcile.js:97
 msgid "Allocations"
 msgstr "Zuweisungen"
 
@@ -5682,7 +5781,7 @@
 msgid "Allow"
 msgstr "Zulassen"
 
-#: accounts/doctype/account/account.py:488
+#: accounts/doctype/account/account.py:507
 #: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68
 msgid "Allow Account Creation Against Child Company"
 msgstr "Kontoerstellung für untergeordnete Unternehmen zulassen"
@@ -5787,7 +5886,7 @@
 msgid "Allow Material Transfer from Purchase Receipt to Purchase Invoice"
 msgstr "Materialübertragung vom Eingangsbeleg zur Eingangsrechnung zulassen"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:9
 msgid "Allow Multiple Material Consumption"
 msgstr "Mehrfachen Materialverbrauch zulassen"
 
@@ -5992,13 +6091,13 @@
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
 msgid "Allow to Edit Stock UOM Qty for Purchase Documents"
-msgstr ""
+msgstr "Bearbeitung der Menge in Lager-ME für Einkaufsdokumente zulassen"
 
 #. Label of a Check field in DocType 'Stock Settings'
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
 msgid "Allow to Edit Stock UOM Qty for Sales Documents"
-msgstr ""
+msgstr "Bearbeitung der Menge in Lager-ME für Verkaufsdokumente zulassen"
 
 #. Description of the 'Allow Excess Material Transfer' (Check) field in DocType
 #. 'Manufacturing Settings'
@@ -6064,7 +6163,7 @@
 msgid "Allows to keep aside a specific quantity of inventory for a particular order."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:721
+#: stock/doctype/pick_list/pick_list.py:792
 msgid "Already Picked"
 msgstr "Bereits kommissioniert"
 
@@ -6076,9 +6175,9 @@
 msgid "Already set default in pos profile {0} for user {1}, kindly disabled default"
 msgstr "Im Standardprofil {0} für den Benutzer {1} ist der Standard bereits festgelegt, standardmäßig deaktiviert"
 
-#: manufacturing/doctype/bom/bom.js:141
-#: manufacturing/doctype/work_order/work_order.js:162 public/js/utils.js:466
-#: stock/doctype/stock_entry/stock_entry.js:224
+#: manufacturing/doctype/bom/bom.js:152
+#: manufacturing/doctype/work_order/work_order.js:169 public/js/utils.js:519
+#: stock/doctype/stock_entry/stock_entry.js:245
 msgid "Alternate Item"
 msgstr "Alternativer Artikel"
 
@@ -6094,6 +6193,10 @@
 msgid "Alternative Item Name"
 msgstr "Alternativer Artikelname"
 
+#: selling/doctype/quotation/quotation.js:360
+msgid "Alternative Items"
+msgstr ""
+
 #: stock/doctype/item_alternative/item_alternative.py:37
 msgid "Alternative item must not be same as item code"
 msgstr "Der alternative Artikel darf nicht mit dem Artikelcode übereinstimmen"
@@ -6564,7 +6667,7 @@
 msgid "Amended From"
 msgstr "Abgeändert von"
 
-#: accounts/doctype/journal_entry/journal_entry.js:529
+#: accounts/doctype/journal_entry/journal_entry.js:579
 #: 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
@@ -6578,16 +6681,20 @@
 #: 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
-#: selling/doctype/quotation/quotation.js:286
+#: 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
 #: selling/report/sales_order_analysis/sales_order_analysis.py:290
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:46
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:69
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:67
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:108
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:109
 #: stock/report/delayed_item_report/delayed_item_report.py:152
 #: stock/report/delayed_order_report/delayed_order_report.py:71
-#: templates/pages/order.html:92 templates/pages/rfq.html:46
+#: templates/form_grid/bank_reconciliation_grid.html:4
+#: templates/form_grid/item_grid.html:9
+#: templates/form_grid/stock_entry_grid.html:11 templates/pages/order.html:104
+#: templates/pages/rfq.html:46
 msgid "Amount"
 msgstr "Betrag"
 
@@ -7105,19 +7212,19 @@
 msgid "Amount in customer's currency"
 msgstr "Betrag in der Währung des Kunden"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1119
+#: accounts/doctype/payment_entry/payment_entry.py:1128
 msgid "Amount {0} {1} against {2} {3}"
 msgstr "Betrag {0} {1} gegen {2} {3}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1127
+#: accounts/doctype/payment_entry/payment_entry.py:1136
 msgid "Amount {0} {1} deducted against {2}"
 msgstr "Betrag {0} {1} abgezogen gegen {2}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1095
+#: accounts/doctype/payment_entry/payment_entry.py:1104
 msgid "Amount {0} {1} transferred from {2} to {3}"
 msgstr "Betrag {0} {1} wurde von {2} zu {3} transferiert"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1102
+#: accounts/doctype/payment_entry/payment_entry.py:1111
 msgid "Amount {0} {1} {2} {3}"
 msgstr "Betrag {0} {1} {2} {3}"
 
@@ -7126,7 +7233,12 @@
 msgid "Amt"
 msgstr "Menge"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:393
+#. Description of a DocType
+#: setup/doctype/item_group/item_group.json
+msgid "An Item Group is a way to classify items based on types."
+msgstr ""
+
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:408
 msgid "An error has been appeared while reposting item valuation via {0}"
 msgstr ""
 
@@ -7135,19 +7247,19 @@
 msgid "An error has occurred during {0}. Check {1} for more details"
 msgstr ""
 
-#: public/js/controllers/buying.js:297 public/js/utils/sales_common.js:364
+#: public/js/controllers/buying.js:292 public/js/utils/sales_common.js:408
 msgid "An error occurred during the update process"
 msgstr "Während des Aktualisierungsvorgangs ist ein Fehler aufgetreten"
 
-#: stock/reorder_item.py:287
+#: stock/reorder_item.py:372
 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:232
+#: accounts/doctype/budget/budget.py:239
 msgid "Annual"
 msgstr "Jährlich"
 
-#: public/js/utils.js:103
+#: public/js/utils.js:120
 msgid "Annual Billing: {0}"
 msgstr "Jährliche Abrechnung: {0}"
 
@@ -7219,6 +7331,10 @@
 msgid "Applicable Dimension"
 msgstr "Anwendbare Dimension"
 
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:221
+msgid "Applicable For"
+msgstr "Anwenden für"
+
 #. Label of a Tab Break field in DocType 'Inventory Dimension'
 #: stock/doctype/inventory_dimension/inventory_dimension.json
 msgctxt "Inventory Dimension"
@@ -7499,6 +7615,12 @@
 msgid "Apply Recursion Over (As Per Transaction UOM)"
 msgstr ""
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Apply Recursion Over (As Per Transaction UOM)"
+msgstr ""
+
 #. Label of a Table field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -7614,7 +7736,7 @@
 msgid "Appointment Confirmation"
 msgstr "Terminbestätigung"
 
-#: www/book_appointment/index.js:229
+#: www/book_appointment/index.js:237
 msgid "Appointment Created Successfully"
 msgstr "Termin erfolgreich erstellt"
 
@@ -7679,11 +7801,11 @@
 msgid "Are you sure you want to clear all demo data?"
 msgstr "Sind Sie sicher, dass Sie alle Demodaten löschen möchten?"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:325
+#: public/js/bom_configurator/bom_configurator.bundle.js:363
 msgid "Are you sure you want to delete this Item?"
 msgstr "Sind Sie sicher, dass Sie diesen Artikel löschen möchten?"
 
-#: accounts/doctype/subscription/subscription.js:70
+#: accounts/doctype/subscription/subscription.js:69
 msgid "Are you sure you want to restart this subscription?"
 msgstr "Sind Sie sicher, dass Sie dieses Abonnement erneut starten möchten?"
 
@@ -7703,13 +7825,13 @@
 msgid "Arrival Quantity"
 msgstr "Ankunftsmenge"
 
-#: stock/report/serial_no_ledger/serial_no_ledger.js:58
+#: 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:31
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:30
 msgid "As On Date"
 msgstr "Zum"
 
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:16
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:15
 msgid "As on Date"
 msgstr ""
 
@@ -7732,20 +7854,24 @@
 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}."
 msgstr "Da es bereits gebuchte Transaktionen für den Artikel {0} gibt, können Sie den Wert von {1} nicht ändern."
 
-#: stock/doctype/stock_settings/stock_settings.py:195
+#: stock/doctype/stock_settings/stock_settings.py:198
 msgid "As there are negative stock, you can not enable {0}."
 msgstr "Da es negative Bestände gibt, können Sie {0} nicht aktivieren."
 
-#: stock/doctype/stock_settings/stock_settings.py:209
+#: stock/doctype/stock_settings/stock_settings.py:212
 msgid "As there are reserved stock, you cannot disable {0}."
 msgstr "Da es reservierte Bestände gibt, können Sie {0} nicht deaktivieren."
 
-#: manufacturing/doctype/production_plan/production_plan.py:1600
+#: manufacturing/doctype/production_plan/production_plan.py:915
+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
 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
 msgstr "Da genügend Rohstoffe vorhanden sind, ist für Warehouse {0} keine Materialanforderung erforderlich."
 
-#: stock/doctype/stock_settings/stock_settings.py:164
-#: stock/doctype/stock_settings/stock_settings.py:178
+#: stock/doctype/stock_settings/stock_settings.py:167
+#: stock/doctype/stock_settings/stock_settings.py:181
 msgid "As {0} is enabled, you can not enable {1}."
 msgstr "Da {0} aktiviert ist, können Sie {1} nicht aktivieren."
 
@@ -7756,13 +7882,13 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/account_balance/account_balance.js:26
+#: accounts/report/account_balance/account_balance.js:25
 #: 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
 #: assets/doctype/asset/asset.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:177
+#: stock/doctype/purchase_receipt/purchase_receipt.js:200
 msgid "Asset"
 msgstr "Vermögensgegenstand"
 
@@ -7912,7 +8038,7 @@
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:37
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:355
 #: assets/doctype/asset_category/asset_category.json
-#: assets/report/fixed_asset_register/fixed_asset_register.js:24
+#: assets/report/fixed_asset_register/fixed_asset_register.js:23
 #: assets/report/fixed_asset_register/fixed_asset_register.py:418
 msgid "Asset Category"
 msgstr "Vermögensgegenstand-Kategorie"
@@ -8009,8 +8135,8 @@
 msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
 msgstr "Zeitplan zur Abschreibung von Vermögensgegenstand {0} und Finanzbuch {1} verwendet keine schichtbasierte Abschreibung"
 
-#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:898
-#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:944
+#: 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
 msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
 msgstr "Vermögensgegenstand Abschreibungsplan nicht gefunden für Vermögensgegenstand {0} und Finanzbuch {1}"
@@ -8023,7 +8149,7 @@
 msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:181
+#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:183
 msgid "Asset Depreciation Schedules created:<br>{0}<br><br>Please check, edit if needed, and submit the Asset."
 msgstr "Abschreibungspläne für Vermögensgegenstand erstellt:<br>{0}<br><br>Bitte prüfen Sie, bearbeiten Sie sie bei Bedarf und buchen Sie den Vermögensgegenstand."
 
@@ -8118,7 +8244,7 @@
 
 #. Name of a DocType
 #: assets/doctype/asset_movement/asset_movement.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:184
+#: stock/doctype/purchase_receipt/purchase_receipt.js:211
 msgid "Asset Movement"
 msgstr "Vermögensgegenstand-Bewegung"
 
@@ -8133,7 +8259,7 @@
 msgid "Asset Movement Item"
 msgstr "Vermögensbewegungsgegenstand"
 
-#: assets/doctype/asset/asset.py:901
+#: assets/doctype/asset/asset.py:905
 msgid "Asset Movement record {0} created"
 msgstr "Vermögensgegenstand-Bewegung {0} erstellt"
 
@@ -8209,7 +8335,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:91
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:127
-#: accounts/report/account_balance/account_balance.js:39
+#: accounts/report/account_balance/account_balance.js:38
 msgid "Asset Received But Not Billed"
 msgstr "Erhaltene, nicht in Rechnung gestellte Vermögensgegenstände"
 
@@ -8319,35 +8445,35 @@
 msgid "Asset Value Analytics"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:172
+#: assets/doctype/asset/asset.py:174
 msgid "Asset cancelled"
 msgstr "Vermögensgegenstand storniert"
 
-#: assets/doctype/asset/asset.py:506
+#: assets/doctype/asset/asset.py:508
 msgid "Asset cannot be cancelled, as it is already {0}"
 msgstr "Vermögenswert kann nicht rückgängig gemacht werden, da es ohnehin schon {0} ist"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:687
+#: assets/doctype/asset_capitalization/asset_capitalization.py:693
 msgid "Asset capitalized after Asset Capitalization {0} was submitted"
 msgstr "Vermögensgegenstand aktiviert, nachdem die Vermögensgegenstand-Aktivierung {0} gebucht wurde"
 
-#: assets/doctype/asset/asset.py:194
+#: assets/doctype/asset/asset.py:196
 msgid "Asset created"
 msgstr "Vermögensgegenstand erstellt"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:633
+#: assets/doctype/asset_capitalization/asset_capitalization.py:639
 msgid "Asset created after Asset Capitalization {0} was submitted"
 msgstr "Vermögensgegenstand angelegt, nachdem die Vermögensgegenstand-Aktivierung {0} gebucht wurde"
 
-#: assets/doctype/asset/asset.py:1156
+#: assets/doctype/asset/asset.py:1160
 msgid "Asset created after being split from Asset {0}"
 msgstr "Vermögensgegenstand, der nach der Abspaltung von Vermögensgegenstand {0} erstellt wurde"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:695
+#: assets/doctype/asset_capitalization/asset_capitalization.py:701
 msgid "Asset decapitalized after Asset Capitalization {0} was submitted"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:197
+#: assets/doctype/asset/asset.py:199
 msgid "Asset deleted"
 msgstr "Vermögensgegenstand gelöscht"
 
@@ -8363,31 +8489,31 @@
 msgid "Asset received at Location {0} and issued to Employee {1}"
 msgstr "Vermögensgegenstand erhalten am Standort {0} und ausgegeben an Mitarbeiter {1}"
 
-#: assets/doctype/asset/depreciation.py:509
+#: assets/doctype/asset/depreciation.py:507
 msgid "Asset restored"
 msgstr "Vermögensgegenstand wiederhergestellt"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:703
+#: assets/doctype/asset_capitalization/asset_capitalization.py:709
 msgid "Asset restored after Asset Capitalization {0} was cancelled"
 msgstr "Vermögensgegenstand wiederhergestellt, nachdem die Vermögensgegenstand-Aktivierung {0} storniert wurde"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1320
+#: accounts/doctype/sales_invoice/sales_invoice.py:1331
 msgid "Asset returned"
 msgstr "Vermögensgegenstand zurückgegeben"
 
-#: assets/doctype/asset/depreciation.py:483
+#: assets/doctype/asset/depreciation.py:481
 msgid "Asset scrapped"
 msgstr "Vermögensgegenstand verschrottet"
 
-#: assets/doctype/asset/depreciation.py:485
+#: assets/doctype/asset/depreciation.py:483
 msgid "Asset scrapped via Journal Entry {0}"
 msgstr "Vermögensgegenstand verschrottet über Journaleintrag {0}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1365
 msgid "Asset sold"
 msgstr "Vermögensgegenstand verkauft"
 
-#: assets/doctype/asset/asset.py:160
+#: assets/doctype/asset/asset.py:161
 msgid "Asset submitted"
 msgstr "Vermögensgegenstand gebucht"
 
@@ -8395,7 +8521,7 @@
 msgid "Asset transferred to Location {0}"
 msgstr "Vermögensgegenstand an Standort {0} übertragen"
 
-#: assets/doctype/asset/asset.py:1080
+#: assets/doctype/asset/asset.py:1084
 msgid "Asset updated after being split into Asset {0}"
 msgstr "Vermögensgegenstand nach der Abspaltung in Vermögensgegenstand {0} aktualisiert"
 
@@ -8411,11 +8537,11 @@
 msgid "Asset {0} cannot be received at a location and given to an employee in a single movement"
 msgstr "Vermögensgegenstand {0} kann nicht in derselben Bewegung an einem Ort entgegengenommen und an einen Mitarbeiter übergeben werden"
 
-#: assets/doctype/asset/depreciation.py:449
+#: assets/doctype/asset/depreciation.py:447
 msgid "Asset {0} cannot be scrapped, as it is already {1}"
 msgstr "Vermögensgegenstand {0} kann nicht verschrottet werden, da er bereits {1} ist"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:237
+#: assets/doctype/asset_capitalization/asset_capitalization.py:243
 msgid "Asset {0} does not belong to Item {1}"
 msgstr "Vermögensgegenstand {0} gehört nicht zum Artikel {1}"
 
@@ -8431,20 +8557,20 @@
 msgid "Asset {0} does not belongs to the location {1}"
 msgstr "Anlage {0} gehört nicht zum Standort {1}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:759
-#: assets/doctype/asset_capitalization/asset_capitalization.py:859
+#: assets/doctype/asset_capitalization/asset_capitalization.py:765
+#: assets/doctype/asset_capitalization/asset_capitalization.py:865
 msgid "Asset {0} does not exist"
 msgstr "Vermögensgegenstand {0} existiert nicht"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:639
+#: assets/doctype/asset_capitalization/asset_capitalization.py:645
 msgid "Asset {0} has been created. Please set the depreciation details if any and submit it."
 msgstr "Vermögensgegenstand {0} wurde erstellt. Bitte geben Sie die Abschreibungsdetails ein, falls vorhanden, und buchen Sie sie."
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:661
+#: assets/doctype/asset_capitalization/asset_capitalization.py:667
 msgid "Asset {0} has been updated. Please set the depreciation details if any and submit it."
 msgstr "Vermögensgegenstand {0} wurde aktualisiert. Bitte geben Sie die Abschreibungsdetails ein, falls vorhanden, und buchen Sie sie."
 
-#: assets/doctype/asset/depreciation.py:446
+#: assets/doctype/asset/depreciation.py:444
 msgid "Asset {0} must be submitted"
 msgstr "Vermögensgegenstand {0} muss gebucht werden"
 
@@ -8486,7 +8612,7 @@
 msgid "Assets"
 msgstr "Vermögenswerte"
 
-#: controllers/buying_controller.py:732
+#: controllers/buying_controller.py:757
 msgid "Assets not created for {0}. You will have to create asset manually."
 msgstr "Assets nicht für {0} erstellt. Sie müssen das Asset manuell erstellen."
 
@@ -8495,11 +8621,11 @@
 msgid "Assets, Depreciations, Repairs, and more."
 msgstr "Vermögensgegenstände, Abschreibungen, Reparaturen und mehr."
 
-#: controllers/buying_controller.py:720
+#: controllers/buying_controller.py:745
 msgid "Asset{} {assets_link} created for {}"
 msgstr "Asset {} {Assets_link} erstellt für {}"
 
-#: manufacturing/doctype/job_card/job_card.js:249
+#: manufacturing/doctype/job_card/job_card.js:281
 msgid "Assign Job to Employee"
 msgstr ""
 
@@ -8521,9 +8647,9 @@
 msgid "Assign to Name"
 msgstr "Dem Namen zuweisen"
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:33
-#: support/report/issue_analytics/issue_analytics.js:82
-#: support/report/issue_summary/issue_summary.js:70
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:32
+#: support/report/issue_analytics/issue_analytics.js:81
+#: support/report/issue_summary/issue_summary.js:69
 msgid "Assigned To"
 msgstr "Zugewiesen zu"
 
@@ -8537,7 +8663,7 @@
 msgid "Assignment Conditions"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1011
+#: assets/doctype/asset/asset.py:1015
 msgid "At least one asset has to be selected."
 msgstr "Es muss mindestens ein Vermögensgegenstand ausgewählt werden."
 
@@ -8550,9 +8676,9 @@
 msgstr "Mindestens ein Artikel sollte mit negativer Menge in den Retourenbeleg eingetragen werden"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:405
-#: accounts/doctype/sales_invoice/sales_invoice.py:509
+#: accounts/doctype/sales_invoice/sales_invoice.py:522
 msgid "At least one mode of payment is required for POS invoice."
-msgstr "Mindestens eine Art der Bezahlung ist für POS-Rechnung erforderlich."
+msgstr "Mindestens eine Zahlungsweise ist für POS-Rechnung erforderlich."
 
 #: setup/doctype/terms_and_conditions/terms_and_conditions.py:39
 msgid "At least one of the Applicable Modules should be selected"
@@ -8562,7 +8688,7 @@
 msgid "At least one of the Selling or Buying must be selected"
 msgstr "Mindestens eine der Optionen „Verkauf“ oder „Einkauf“ muss ausgewählt werden"
 
-#: stock/doctype/stock_entry/stock_entry.py:643
+#: stock/doctype/stock_entry/stock_entry.py:598
 msgid "At least one warehouse is mandatory"
 msgstr "Mindestens ein Lager ist obligatorisch"
 
@@ -8570,22 +8696,26 @@
 msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}"
 msgstr "In Zeile {0}: Die Sequenz-ID {1} darf nicht kleiner sein als die vorherige Zeilen-Sequenz-ID {2}."
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:582
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
 msgid "At row {0}: Batch No is mandatory for Item {1}"
 msgstr "In Zeile {0}: Chargennummer ist obligatorisch für Artikel {1}"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:574
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:569
 msgid "At row {0}: Serial No is mandatory for Item {1}"
 msgstr "In Zeile {0}: Seriennummer ist obligatorisch für Artikel {1}"
 
+#: controllers/stock_controller.py:301
+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 ""
+
 #. Description of the 'File to Rename' (Attach) field in DocType 'Rename Tool'
 #: utilities/doctype/rename_tool/rename_tool.json
 msgctxt "Rename Tool"
 msgid "Attach .csv file with two columns, one for the old name and one for the new name"
 msgstr "Hängen Sie eine .csv-Datei mit zwei Spalten an, eine für den alten Namen und eine für den neuen Namen"
 
-#: public/js/utils/serial_no_batch_selector.js:246
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:66
+#: public/js/utils/serial_no_batch_selector.js:250
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:69
 msgid "Attach CSV File"
 msgstr "CSV-Datei anhängen"
 
@@ -8601,7 +8731,7 @@
 msgid "Attachment"
 msgstr "Anhang"
 
-#: templates/pages/order.html:125 templates/pages/projects.html:83
+#: templates/pages/order.html:137 templates/pages/projects.html:83
 msgid "Attachments"
 msgstr "Anhänge"
 
@@ -8781,7 +8911,7 @@
 msgid "Auto Email Report"
 msgstr "Auto Email-Bericht"
 
-#: public/js/utils/serial_no_batch_selector.js:316
+#: public/js/utils/serial_no_batch_selector.js:322
 msgid "Auto Fetch"
 msgstr "Automatischer Abruf"
 
@@ -8797,7 +8927,7 @@
 msgid "Auto Material Request"
 msgstr "Automatische Materialanfrage"
 
-#: stock/reorder_item.py:242
+#: stock/reorder_item.py:327
 msgid "Auto Material Requests Generated"
 msgstr "Automatische Materialanfragen generiert"
 
@@ -8821,7 +8951,7 @@
 msgid "Auto Opt In (For all customers)"
 msgstr "Automatische Anmeldung (für alle Kunden)"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:67
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:61
 msgid "Auto Reconcile"
 msgstr "Automatisch abgleichen"
 
@@ -8831,7 +8961,7 @@
 msgid "Auto Reconcile Payments"
 msgstr "Zahlungen automatisch abgleichen"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:414
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:413
 msgid "Auto Reconciliation"
 msgstr "Automatischer Abgleich"
 
@@ -8955,7 +9085,7 @@
 msgid "Auto re-order"
 msgstr "Automatische Nachbestellung"
 
-#: public/js/controllers/buying.js:295 public/js/utils/sales_common.js:362
+#: public/js/controllers/buying.js:290 public/js/utils/sales_common.js:403
 msgid "Auto repeat document updated"
 msgstr "Automatisches Wiederholungsdokument aktualisiert"
 
@@ -9040,7 +9170,7 @@
 msgstr "Verfügbar für Verwendungsdatum"
 
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:82
-#: public/js/utils.js:522 stock/report/stock_ageing/stock_ageing.py:156
+#: public/js/utils.js:579 stock/report/stock_ageing/stock_ageing.py:156
 msgid "Available Qty"
 msgstr "Verfügbare Menge"
 
@@ -9131,15 +9261,15 @@
 msgid "Available Stock for Packing Items"
 msgstr "Verfügbarer Bestand für Verpackungsartikel"
 
-#: assets/doctype/asset/asset.py:270
+#: assets/doctype/asset/asset.py:272
 msgid "Available for use date is required"
 msgstr "Verfügbar für das Nutzungsdatum ist erforderlich"
 
-#: stock/doctype/stock_entry/stock_entry.py:772
+#: stock/doctype/stock_entry/stock_entry.py:727
 msgid "Available quantity is {0}, you need {1}"
 msgstr "Die verfügbare Menge ist {0}. Sie benötigen {1}."
 
-#: stock/dashboard/item_dashboard.js:239
+#: stock/dashboard/item_dashboard.js:247
 msgid "Available {0}"
 msgstr "Verfügbar {0}"
 
@@ -9149,13 +9279,13 @@
 msgid "Available-for-use Date"
 msgstr "Verfügbarkeitsdatum"
 
-#: assets/doctype/asset/asset.py:355
+#: assets/doctype/asset/asset.py:357
 msgid "Available-for-use Date should be after purchase date"
 msgstr "Das für die Verwendung verfügbare Datum sollte nach dem Kaufdatum liegen"
 
 #: stock/report/stock_ageing/stock_ageing.py:157
 #: stock/report/stock_ageing/stock_ageing.py:191
-#: stock/report/stock_balance/stock_balance.py:477
+#: stock/report/stock_balance/stock_balance.py:485
 msgid "Average Age"
 msgstr "Durchschnittsalter"
 
@@ -9195,7 +9325,7 @@
 msgid "Avg Rate"
 msgstr "Durchschnittspreis"
 
-#: stock/report/stock_ledger/stock_ledger.py:197
+#: stock/report/stock_ledger/stock_ledger.py:270
 msgid "Avg Rate (Balance Stock)"
 msgstr ""
 
@@ -9238,14 +9368,14 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/bom/bom.json manufacturing/doctype/bom/bom_tree.js:8
-#: manufacturing/report/bom_explorer/bom_explorer.js:9
+#: manufacturing/report/bom_explorer/bom_explorer.js:8
 #: manufacturing/report/bom_explorer/bom_explorer.py:56
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:9
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:8
 #: manufacturing/report/bom_stock_report/bom_stock_report.js:5
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
-#: selling/doctype/sales_order/sales_order.js:810
-#: stock/doctype/material_request/material_request.js:243
-#: stock/doctype/stock_entry/stock_entry.js:545
+#: 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/report/bom_search/bom_search.py:38
 msgid "BOM"
 msgstr "Stückliste"
@@ -9316,7 +9446,7 @@
 msgid "BOM 1"
 msgstr "Stückliste 1"
 
-#: manufacturing/doctype/bom/bom.py:1348
+#: manufacturing/doctype/bom/bom.py:1347
 msgid "BOM 1 {0} and BOM 2 {1} should not be same"
 msgstr "Stückliste 1 {0} und Stückliste 2 {1} sollten nicht identisch sein"
 
@@ -9398,7 +9528,7 @@
 msgid "BOM Explosion Item"
 msgstr "Position der aufgelösten Stückliste"
 
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:21
+#: manufacturing/report/bom_operations_time/bom_operations_time.js:20
 #: manufacturing/report/bom_operations_time/bom_operations_time.py:101
 msgid "BOM ID"
 msgstr "Stücklisten-ID"
@@ -9419,7 +9549,7 @@
 msgid "BOM Level"
 msgstr "Stücklistenebene"
 
-#: manufacturing/report/bom_variance_report/bom_variance_report.js:9
+#: manufacturing/report/bom_variance_report/bom_variance_report.js:8
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:31
 msgid "BOM No"
 msgstr "Stücklisten-Nr."
@@ -9530,6 +9660,7 @@
 #. Name of a report
 #. Label of a Link in the Manufacturing Workspace
 #. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:1
 #: manufacturing/report/bom_stock_report/bom_stock_report.json
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "BOM Stock Report"
@@ -9550,7 +9681,7 @@
 msgid "BOM Update Batch"
 msgstr ""
 
-#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:82
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:84
 msgid "BOM Update Initiated"
 msgstr "Stücklistenaktualisierung eingeleitet"
 
@@ -9570,6 +9701,11 @@
 msgid "BOM Update Tool"
 msgstr "Stücklisten-Update-Tool"
 
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_log/bom_update_log.json
+msgid "BOM Update Tool Log with job status maintained"
+msgstr ""
+
 #: manufacturing/doctype/bom_update_log/bom_update_log.py:99
 msgid "BOM Updation already in progress. Please wait until {0} is complete."
 msgstr "Stücklistenaktualisierung bereits im Gange. Bitte warten Sie, bis {0} abgeschlossen ist."
@@ -9593,12 +9729,12 @@
 msgid "BOM Website Operation"
 msgstr "BOM Webseite Vorgang"
 
-#: stock/doctype/stock_entry/stock_entry.js:1000
+#: stock/doctype/stock_entry/stock_entry.js:1145
 msgid "BOM and Manufacturing Quantity are required"
 msgstr "Stückliste und Fertigungsmenge werden benötigt"
 
-#: stock/doctype/material_request/material_request.js:264
-#: stock/doctype/stock_entry/stock_entry.js:581
+#: stock/doctype/material_request/material_request.js:332
+#: stock/doctype/stock_entry/stock_entry.js:669
 msgid "BOM does not contain any stock item"
 msgstr "Stückliste enthält keine Lagerware"
 
@@ -9610,15 +9746,15 @@
 msgid "BOM recursion: {1} cannot be parent or child of {0}"
 msgstr "Stücklistenrekursion: {1} kann nicht über- oder untergeordnet von {0} sein"
 
-#: manufacturing/doctype/bom/bom.py:1223
+#: manufacturing/doctype/bom/bom.py:1222
 msgid "BOM {0} does not belong to Item {1}"
 msgstr "Stückliste {0} gehört nicht zum Artikel {1}"
 
-#: manufacturing/doctype/bom/bom.py:1205
+#: manufacturing/doctype/bom/bom.py:1204
 msgid "BOM {0} must be active"
 msgstr "Stückliste {0} muss aktiv sein"
 
-#: manufacturing/doctype/bom/bom.py:1208
+#: manufacturing/doctype/bom/bom.py:1207
 msgid "BOM {0} must be submitted"
 msgstr "Stückliste {0} muss gebucht werden"
 
@@ -9640,11 +9776,11 @@
 msgid "BOMs creation has been enqueued, kindly check the status after some time"
 msgstr "Die Stücklistenerstellung wurde in die Warteschlange gestellt. Bitte überprüfen Sie den Status nach einiger Zeit"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:323
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:334
 msgid "Backdated Stock Entry"
 msgstr "Rückdatierte Lagerbewegung"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:15
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
 msgid "Backflush Raw Materials"
 msgstr "Rückspülen von Rohstoffen"
 
@@ -9674,10 +9810,11 @@
 msgstr "Saldo"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:41
+#: accounts/report/general_ledger/general_ledger.html:32
 msgid "Balance (Dr - Cr)"
 msgstr "Saldo (S - H)"
 
-#: accounts/report/general_ledger/general_ledger.py:584
+#: accounts/report/general_ledger/general_ledger.py:597
 msgid "Balance ({0})"
 msgstr "Saldo ({0})"
 
@@ -9694,8 +9831,8 @@
 msgstr "Saldo in Basiswährung"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:82
-#: stock/report/stock_balance/stock_balance.py:405
-#: stock/report/stock_ledger/stock_ledger.py:153
+#: stock/report/stock_balance/stock_balance.py:413
+#: stock/report/stock_ledger/stock_ledger.py:226
 msgid "Balance Qty"
 msgstr "Bilanzmenge"
 
@@ -9703,10 +9840,6 @@
 msgid "Balance Qty (Stock)"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:259
-msgid "Balance Serial No"
-msgstr "Stand Seriennummern"
-
 #. Name of a report
 #. Label of a Link in the Financial Reports Workspace
 #: accounts/report/balance_sheet/balance_sheet.json
@@ -9739,18 +9872,22 @@
 msgid "Balance Sheet Summary"
 msgstr ""
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:13
+msgid "Balance Stock Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "Balance Stock Value"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:412
-#: stock/report/stock_ledger/stock_ledger.py:217
+#: stock/report/stock_balance/stock_balance.py:420
+#: stock/report/stock_ledger/stock_ledger.py:290
 msgid "Balance Value"
 msgstr "Bilanzwert"
 
-#: accounts/doctype/gl_entry/gl_entry.py:355
+#: accounts/doctype/gl_entry/gl_entry.py:309
 msgid "Balance for Account {0} must always be {1}"
 msgstr "Saldo für Konto {0} muss immer {1} sein"
 
@@ -9762,7 +9899,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/bank/bank.json
-#: accounts/report/account_balance/account_balance.js:40
+#: accounts/report/account_balance/account_balance.js:39
 msgid "Bank"
 msgstr "Bank"
 
@@ -9842,7 +9979,7 @@
 #: accounts/doctype/bank_account/bank_account.json
 #: 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:94
+#: buying/doctype/supplier/supplier.js:108
 #: setup/setup_wizard/operations/install_fixtures.py:492
 msgid "Bank Account"
 msgstr "Bankkonto"
@@ -10084,6 +10221,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:4
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Bank Reconciliation Statement"
@@ -10142,23 +10280,23 @@
 msgid "Bank Transaction Payments"
 msgstr "Banküberweisung Zahlungen"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:496
+#: public/js/bank_reconciliation_tool/dialog_manager.js:485
 msgid "Bank Transaction {0} Matched"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:544
+#: public/js/bank_reconciliation_tool/dialog_manager.js:533
 msgid "Bank Transaction {0} added as Journal Entry"
 msgstr "Banktransaktion {0} als Journaleintrag hinzugefügt"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:520
+#: public/js/bank_reconciliation_tool/dialog_manager.js:508
 msgid "Bank Transaction {0} added as Payment Entry"
 msgstr "Banktransaktion {0} als Zahlungseintrag hinzugefügt"
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:124
+#: accounts/doctype/bank_transaction/bank_transaction.py:127
 msgid "Bank Transaction {0} is already fully reconciled"
 msgstr "Die Banktransaktion {0} ist bereits vollständig abgeglichen"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:563
+#: public/js/bank_reconciliation_tool/dialog_manager.js:553
 msgid "Bank Transaction {0} updated"
 msgstr "Banktransaktion {0} aktualisiert"
 
@@ -10166,15 +10304,15 @@
 msgid "Bank account cannot be named as {0}"
 msgstr "Bankname {0} ungültig"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:130
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:146
 msgid "Bank account {0} already exists and could not be created again"
 msgstr "Das Bankkonto {0} ist bereits vorhanden und konnte nicht erneut erstellt werden"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:134
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:153
 msgid "Bank accounts added"
 msgstr "Bankkonten hinzugefügt"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:297
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:313
 msgid "Bank transaction creation error"
 msgstr "Fehler beim Erstellen der Banküberweisung"
 
@@ -10199,7 +10337,7 @@
 msgid "Banking"
 msgstr "Bankwesen"
 
-#: public/js/utils/barcode_scanner.js:273
+#: public/js/utils/barcode_scanner.js:282
 msgid "Barcode"
 msgstr "Barcode"
 
@@ -10326,7 +10464,7 @@
 msgid "Base Tax Withholding Net Total"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:239
 msgid "Base Total"
 msgstr ""
 
@@ -10354,18 +10492,18 @@
 msgid "Base URL"
 msgstr "Basis-URL"
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:28
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:27
 #: accounts/report/profitability_analysis/profitability_analysis.js:16
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:9
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:45
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:39
-#: manufacturing/report/production_planning_report/production_planning_report.js:17
-#: manufacturing/report/work_order_summary/work_order_summary.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:8
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:44
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:38
+#: manufacturing/report/production_planning_report/production_planning_report.js:16
+#: manufacturing/report/work_order_summary/work_order_summary.js:15
 #: public/js/purchase_trends_filters.js:45 public/js/sales_trends_filters.js:20
-#: stock/report/delayed_item_report/delayed_item_report.js:55
-#: stock/report/delayed_order_report/delayed_order_report.js:55
-#: support/report/issue_analytics/issue_analytics.js:17
-#: support/report/issue_summary/issue_summary.js:17
+#: stock/report/delayed_item_report/delayed_item_report.js:54
+#: stock/report/delayed_order_report/delayed_order_report.js:54
+#: support/report/issue_analytics/issue_analytics.js:16
+#: support/report/issue_summary/issue_summary.js:16
 msgid "Based On"
 msgstr "Basiert auf"
 
@@ -10381,18 +10519,18 @@
 msgid "Based On"
 msgstr "Basiert auf"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:47
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:46
 msgid "Based On Data ( in years )"
 msgstr "Basierend auf Daten (in Jahren)"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:31
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:30
 msgid "Based On Document"
 msgstr "Basierend auf Dokument"
 
-#: accounts/report/accounts_payable/accounts_payable.js:134
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:111
-#: accounts/report/accounts_receivable/accounts_receivable.js:156
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:137
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:114
+#: accounts/report/accounts_receivable/accounts_receivable.js:159
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:132
 msgid "Based On Payment Terms"
 msgstr "Basierend auf Zahlungsbedingungen"
 
@@ -10464,7 +10602,7 @@
 #: 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/stock_ledger/stock_ledger.py:239
+#: 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
 msgid "Batch"
@@ -10505,11 +10643,11 @@
 msgid "Batch Item Expiry Status"
 msgstr "Stapelobjekt Ablauf-Status"
 
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:88
+#: 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:2150
-#: public/js/utils/barcode_scanner.js:251
-#: public/js/utils/serial_no_batch_selector.js:367
+#: public/js/controllers/transaction.js:2193
+#: 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
@@ -10637,15 +10775,15 @@
 msgid "Batch No"
 msgstr "Chargennummer"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:585
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:580
 msgid "Batch No is mandatory"
 msgstr "Chargennummer ist obligatorisch"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2118
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2137
 msgid "Batch No {0} does not exists"
 msgstr "Charge Nr. {0} existiert nicht"
 
-#: stock/utils.py:643
+#: stock/utils.py:638
 msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
 msgstr "Die Chargennummer {0} ist mit dem Artikel {1} verknüpft, der eine Seriennummer hat. Bitte scannen Sie stattdessen die Seriennummer."
 
@@ -10655,13 +10793,13 @@
 msgid "Batch No."
 msgstr "Chargennummer."
 
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Batch Nos"
 msgstr "Chargennummern"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1113
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1120
 msgid "Batch Nos are created successfully"
 msgstr "Chargennummern wurden erfolgreich erstellt"
 
@@ -10681,7 +10819,7 @@
 msgid "Batch Quantity"
 msgstr "Chargenmenge"
 
-#: manufacturing/doctype/work_order/work_order.js:256
+#: manufacturing/doctype/work_order/work_order.js:271
 msgid "Batch Size"
 msgstr "Chargengröße"
 
@@ -10721,7 +10859,7 @@
 msgid "Batch and Serial No"
 msgstr "Chargen- und Seriennummer"
 
-#: manufacturing/doctype/work_order/work_order.py:485
+#: manufacturing/doctype/work_order/work_order.py:496
 msgid "Batch not created for item {} since it does not have a batch series."
 msgstr "Für Artikel {} wurde keine Charge erstellt, da er keinen Nummernkreis für Chargen vorgibt."
 
@@ -10729,12 +10867,12 @@
 msgid "Batch {0} and Warehouse"
 msgstr "Charge {0} und Lager"
 
-#: stock/doctype/stock_entry/stock_entry.py:2345
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:272
+#: stock/doctype/stock_entry/stock_entry.py:2379
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:283
 msgid "Batch {0} of Item {1} has expired."
 msgstr "Die Charge {0} des Artikels {1} ist abgelaufen."
 
-#: stock/doctype/stock_entry/stock_entry.py:2347
+#: stock/doctype/stock_entry/stock_entry.py:2381
 msgid "Batch {0} of Item {1} is disabled."
 msgstr "Charge {0} von Artikel {1} ist deaktiviert."
 
@@ -10774,7 +10912,7 @@
 msgid "Below Subscription Plans are of different currency to the party default billing currency/Company currency: {0}"
 msgstr "Die folgenden Abonnementpläne haben eine andere Währung als die Standardabrechnungswährung/Unternehmenswährung der Partei: {0}"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1061
+#: accounts/report/accounts_receivable/accounts_receivable.py:1069
 #: accounts/report/purchase_register/purchase_register.py:214
 msgid "Bill Date"
 msgstr "Rechnungsdatum"
@@ -10791,7 +10929,7 @@
 msgid "Bill Date"
 msgstr "Rechnungsdatum"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1060
+#: accounts/report/accounts_receivable/accounts_receivable.py:1068
 #: accounts/report/purchase_register/purchase_register.py:213
 msgid "Bill No"
 msgstr "Rechnungsnr."
@@ -10816,11 +10954,11 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Manufacturing Workspace
-#: manufacturing/doctype/bom/bom.py:1089
+#: manufacturing/doctype/bom/bom.py:1088
 #: 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:533
+#: stock/doctype/stock_entry/stock_entry.js:599
 msgid "Bill of Materials"
 msgstr "Stückliste"
 
@@ -11224,8 +11362,8 @@
 msgid "Blanket Order Rate"
 msgstr "Pauschale Bestellrate"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:101
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:265
 msgid "Block Invoice"
 msgstr "Rechnung sperren"
 
@@ -11364,7 +11502,7 @@
 msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
 msgstr ""
 
-#: accounts/general_ledger.py:685
+#: accounts/general_ledger.py:694
 msgid "Books have been closed till the period ending on {0}"
 msgstr ""
 
@@ -11430,11 +11568,11 @@
 #: accounts/report/gross_profit/gross_profit.py:243
 #: 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:41 public/js/stock_analytics.js:62
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:48
+#: public/js/stock_analytics.js:58 public/js/stock_analytics.js:93
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:47
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:61
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:100
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:101
 #: setup/doctype/brand/brand.json
 #: stock/report/item_price_stock/item_price_stock.py:25
 #: stock/report/item_prices/item_prices.py:53
@@ -11444,10 +11582,10 @@
 #: 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_analytics/stock_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:34
 #: stock/report/stock_analytics/stock_analytics.py:45
-#: stock/report/stock_ledger/stock_ledger.js:65
-#: stock/report/stock_ledger/stock_ledger.py:181
+#: 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
 #: stock/report/stock_projected_qty/stock_projected_qty.py:115
 msgid "Brand"
@@ -11606,16 +11744,16 @@
 msgid "Breakdown"
 msgstr "Ausfall"
 
-#: manufacturing/doctype/bom/bom.js:103
+#: manufacturing/doctype/bom/bom.js:102
 msgid "Browse BOM"
 msgstr "Stückliste durchsuchen"
 
 #. Name of a DocType
 #: accounts/doctype/budget/budget.json
-#: accounts/doctype/cost_center/cost_center.js:44
-#: accounts/doctype/cost_center/cost_center_tree.js:42
-#: accounts/doctype/cost_center/cost_center_tree.js:46
-#: accounts/doctype/cost_center/cost_center_tree.js:50
+#: accounts/doctype/cost_center/cost_center.js:45
+#: accounts/doctype/cost_center/cost_center_tree.js:65
+#: accounts/doctype/cost_center/cost_center_tree.js:73
+#: 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
@@ -11639,7 +11777,7 @@
 msgid "Budget Accounts"
 msgstr "Budget Konten"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:82
+#: accounts/report/budget_variance_report/budget_variance_report.js:80
 msgid "Budget Against"
 msgstr "Budget gegen"
 
@@ -11661,17 +11799,17 @@
 msgid "Budget Detail"
 msgstr "Budget-Detail"
 
-#: accounts/doctype/budget/budget.py:278 accounts/doctype/budget/budget.py:280
+#: accounts/doctype/budget/budget.py:285 accounts/doctype/budget/budget.py:287
 msgid "Budget Exceeded"
 msgstr "Budget überschritten"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:40
+#: accounts/doctype/cost_center/cost_center_tree.js:61
 msgid "Budget List"
 msgstr "Budgetliste"
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/cost_center/cost_center_tree.js:48
+#: accounts/doctype/cost_center/cost_center_tree.js:77
 #: accounts/report/budget_variance_report/budget_variance_report.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Budget Variance Report"
@@ -11744,6 +11882,11 @@
 msgid "Buy"
 msgstr "Kaufen"
 
+#. Description of a DocType
+#: selling/doctype/customer/customer.json
+msgid "Buyer of Goods and Services."
+msgstr ""
+
 #. Name of a Workspace
 #. Label of a Card Break in the Buying Workspace
 #: buying/workspace/buying/buying.json
@@ -11842,7 +11985,7 @@
 msgid "Buying must be checked, if Applicable For is selected as {0}"
 msgstr "Einkauf muss ausgewählt sein, wenn \"Anwenden auf\" auf {0} gesetzt wurde"
 
-#: buying/doctype/buying_settings/buying_settings.js:14
+#: buying/doctype/buying_settings/buying_settings.js:13
 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a <a href='https://docs.erpnext.com/docs/user/manual/en/setting-up/settings/naming-series' target='_blank'>Naming Series</a> choose the 'Naming Series' option."
 msgstr ""
 
@@ -12036,12 +12179,12 @@
 msgid "Call Routing"
 msgstr "Anrufweiterleitung"
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:57
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:58
 #: telephony/doctype/incoming_call_settings/incoming_call_settings.py:49
 msgid "Call Schedule Row {0}: To time slot should always be ahead of From time slot."
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:153
+#: public/js/call_popup/call_popup.js:164
 #: telephony/doctype/call_log/call_log.py:135
 msgid "Call Summary"
 msgstr "Anrufzusammenfassung"
@@ -12052,6 +12195,10 @@
 msgid "Call Summary"
 msgstr "Anrufzusammenfassung"
 
+#: public/js/call_popup/call_popup.js:186
+msgid "Call Summary Saved"
+msgstr ""
+
 #. Label of a Data field in DocType 'Telephony Call Type'
 #: telephony/doctype/telephony_call_type/telephony_call_type.json
 msgctxt "Telephony Call Type"
@@ -12198,7 +12345,7 @@
 msgid "Can be approved by {0}"
 msgstr "Kann von {0} genehmigt werden"
 
-#: manufacturing/doctype/work_order/work_order.py:1451
+#: manufacturing/doctype/work_order/work_order.py:1465
 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
 msgstr "Der Arbeitsauftrag kann nicht geschlossen werden, da sich {0} Jobkarten im Status „In Bearbeitung“ befinden."
 
@@ -12226,20 +12373,24 @@
 msgid "Can not filter based on Voucher No, if grouped by Voucher"
 msgstr "Kann nicht nach Belegnummer filtern, wenn nach Beleg gruppiert"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1226
-#: accounts/doctype/payment_entry/payment_entry.py:2229
+#: accounts/doctype/journal_entry/journal_entry.py:1240
+#: accounts/doctype/payment_entry/payment_entry.py:2254
 msgid "Can only make payment against unbilled {0}"
 msgstr "Zahlung kann nur zu einem noch nicht abgerechneten Beleg vom Typ {0} erstellt werden"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1199
-#: controllers/accounts_controller.py:2500 public/js/controllers/accounts.js:90
+#: accounts/doctype/payment_entry/payment_entry.js:1438
+#: controllers/accounts_controller.py:2585 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 "Kann sich nur auf eine Zeile beziehen, wenn die Berechnungsart der Kosten entweder \"auf vorherige Zeilensumme\" oder \"auf vorherigen Zeilenbetrag\" ist"
 
-#: stock/doctype/stock_settings/stock_settings.py:133
+#: stock/doctype/stock_settings/stock_settings.py:136
 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method"
 msgstr "Die Bewertungsmethode kann nicht geändert werden, da es Transaktionen gegen einige Artikel gibt, die keine eigene Bewertungsmethode haben"
 
+#: templates/pages/task_info.html:24
+msgid "Cancel"
+msgstr "Abbrechen"
+
 #. Label of a Check field in DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
 msgctxt "Subscription"
@@ -12270,8 +12421,8 @@
 msgid "Cancelation Date"
 msgstr "Stornierungsdatum"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:18
-#: stock/doctype/stock_entry/stock_entry_list.js:19
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:13
+#: stock/doctype/stock_entry/stock_entry_list.js:25
 msgid "Canceled"
 msgstr "Abgebrochen"
 
@@ -12288,11 +12439,12 @@
 msgstr "Abgebrochen"
 
 #: accounts/doctype/bank_transaction/bank_transaction_list.js:8
-#: accounts/doctype/payment_request/payment_request_list.js:20
+#: accounts/doctype/payment_request/payment_request_list.js:18
 #: accounts/doctype/subscription/subscription_list.js:14
 #: assets/doctype/asset_repair/asset_repair_list.js:9
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:11
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle_list.js:8
+#: templates/pages/task_info.html:77
 msgid "Cancelled"
 msgstr "Abgesagt"
 
@@ -12547,6 +12699,13 @@
 msgid "Cancelled"
 msgstr "Abgesagt"
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Cancelled"
+msgstr "Abgesagt"
+
 #. Option for the 'Status' (Select) field in DocType 'Warranty Claim'
 #: support/doctype/warranty_claim/warranty_claim.json
 msgctxt "Warranty Claim"
@@ -12559,7 +12718,7 @@
 msgid "Cancelled"
 msgstr "Abgesagt"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:76
+#: stock/doctype/delivery_trip/delivery_trip.js:89
 #: stock/doctype/delivery_trip/delivery_trip.py:189
 msgid "Cannot Calculate Arrival Time as Driver Address is Missing."
 msgstr "Die Ankunftszeit kann nicht berechnet werden, da die Adresse des Fahrers fehlt."
@@ -12569,7 +12728,7 @@
 msgid "Cannot Merge"
 msgstr "Zusammenführung nicht möglich"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:105
+#: stock/doctype/delivery_trip/delivery_trip.js:122
 msgid "Cannot Optimize Route as Driver Address is Missing."
 msgstr "Route kann nicht optimiert werden, da die Fahreradresse fehlt."
 
@@ -12585,7 +12744,7 @@
 msgid "Cannot amend {0} {1}, please create a new one instead."
 msgstr "{0} {1} kann nicht berichtigt werden. Bitte erstellen Sie stattdessen einen neuen Eintrag."
 
-#: accounts/doctype/journal_entry/journal_entry.py:257
+#: accounts/doctype/journal_entry/journal_entry.py:273
 msgid "Cannot apply TDS against multiple parties in one entry"
 msgstr ""
 
@@ -12593,23 +12752,23 @@
 msgid "Cannot be a fixed asset item as Stock Ledger is created."
 msgstr "Kann keine Anlageposition sein, wenn das Stock Ledger erstellt wird."
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:222
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:217
 msgid "Cannot cancel as processing of cancelled documents is pending."
 msgstr "Kann nicht storniert werden, da die Verarbeitung der stornierten Dokumente noch nicht abgeschlossen ist."
 
-#: manufacturing/doctype/work_order/work_order.py:641
+#: manufacturing/doctype/work_order/work_order.py:655
 msgid "Cannot cancel because submitted Stock Entry {0} exists"
 msgstr "Kann nicht storniert werden, da die gebuchte Lagerbewegung {0} existiert"
 
-#: stock/stock_ledger.py:196
+#: stock/stock_ledger.py:198
 msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet."
 msgstr "Sie können die Transaktion nicht stornieren. Die Umbuchung der Artikelbewertung bei der Buchung ist noch nicht abgeschlossen."
 
-#: controllers/buying_controller.py:811
+#: controllers/buying_controller.py:836
 msgid "Cannot cancel this document as it is linked with submitted asset {0}. Please cancel it to continue."
 msgstr "Dieses Dokument kann nicht storniert werden, da es mit einer gebuchten Sachanlage {0} verknüpft ist. Bitte stornieren Sie diese, um fortzufahren."
 
-#: stock/doctype/stock_entry/stock_entry.py:365
+#: stock/doctype/stock_entry/stock_entry.py:320
 msgid "Cannot cancel transaction for Completed Work Order."
 msgstr "Die Transaktion für den abgeschlossenen Arbeitsauftrag kann nicht storniert werden."
 
@@ -12621,7 +12780,7 @@
 msgid "Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."
 msgstr "Start- und Schlußdatum des Geschäftsjahres können nicht geändert werden, wenn das Geschäftsjahr gespeichert wurde."
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:66
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:70
 msgid "Cannot change Reference Document Type."
 msgstr "Der Referenzdokumenttyp kann nicht geändert werden."
 
@@ -12633,7 +12792,7 @@
 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this."
 msgstr "Die Eigenschaften der Variante können nach der Buchung nicht mehr verändert werden. Hierzu muss ein neuer Artikel erstellt werden."
 
-#: setup/doctype/company/company.py:209
+#: setup/doctype/company/company.py:208
 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."
 msgstr "Die Standardwährung des Unternehmens kann nicht geändern werden, weil es bestehende Transaktionen gibt. Transaktionen müssen abgebrochen werden, um die Standardwährung zu ändern."
 
@@ -12645,32 +12804,32 @@
 msgid "Cannot convert Cost Center to ledger as it has child nodes"
 msgstr "Kostenstelle kann nicht in ein Kontenblatt umgewandelt werden, da sie Unterknoten hat"
 
-#: projects/doctype/task/task.js:48
+#: projects/doctype/task/task.js:50
 msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}."
 msgstr ""
 
-#: accounts/doctype/account/account.py:373
+#: accounts/doctype/account/account.py:392
 msgid "Cannot convert to Group because Account Type is selected."
 msgstr ""
 
-#: accounts/doctype/account/account.py:250
+#: accounts/doctype/account/account.py:269
 msgid "Cannot covert to Group because Account Type is selected."
 msgstr "Kann nicht in eine Gruppe umgewandelt werden, weil Kontentyp ausgewählt ist."
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:914
+#: stock/doctype/purchase_receipt/purchase_receipt.py:916
 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
 msgstr "Für in der Zukunft datierte Kaufbelege kann keine Bestandsreservierung erstellt werden."
 
-#: stock/doctype/delivery_note/delivery_note_list.js:25
+#: stock/doctype/delivery_note/delivery_note_list.js:35
 msgid "Cannot create a Delivery Trip from Draft documents."
 msgstr "Auslieferungsfahrt kann nicht von einem Entwurf erstellt werden"
 
-#: selling/doctype/sales_order/sales_order.py:1576
-#: stock/doctype/pick_list/pick_list.py:104
+#: selling/doctype/sales_order/sales_order.py:1599
+#: stock/doctype/pick_list/pick_list.py:108
 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 "Es kann keine Pickliste für den Kundenauftrag {0} erstellt werden, da dieser einen reservierten Bestand hat. Bitte heben Sie die Reservierung des Bestands auf, um eine Pickliste zu erstellen."
 
-#: accounts/general_ledger.py:127
+#: accounts/general_ledger.py:131
 msgid "Cannot create accounting entries against disabled accounts: {0}"
 msgstr "Es kann nicht auf deaktivierte Konten gebucht werden: {0}"
 
@@ -12691,32 +12850,40 @@
 msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
 msgstr "Die Seriennummer {0} kann nicht gelöscht werden, da sie in Lagertransaktionen verwendet wird"
 
-#: selling/doctype/sales_order/sales_order.py:638
-#: selling/doctype/sales_order/sales_order.py:661
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:101
+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
 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
 msgstr "Die Lieferung per Seriennummer kann nicht sichergestellt werden, da Artikel {0} mit und ohne Lieferung per Seriennummer hinzugefügt wird."
 
-#: public/js/utils/barcode_scanner.js:51
+#: public/js/utils/barcode_scanner.js:54
 msgid "Cannot find Item with this Barcode"
 msgstr "Artikel mit diesem Barcode kann nicht gefunden werden"
 
-#: controllers/accounts_controller.py:3023
+#: controllers/accounts_controller.py:3114
 msgid "Cannot find {} for item {}. Please set the same in Item Master or Stock Settings."
 msgstr "{} Für Element {} kann nicht gefunden werden. Bitte stellen Sie dasselbe in den Artikelstamm- oder Lagereinstellungen ein."
 
-#: controllers/accounts_controller.py:1774
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:506
+msgid "Cannot make any transactions until the deletion job is completed"
+msgstr ""
+
+#: controllers/accounts_controller.py:1863
 msgid "Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings"
 msgstr "Für Artikel {0} in Zeile {1} kann nicht mehr als {2} zusätzlich in Rechnung gestellt werden. Um diese Überfakturierung zuzulassen, passen Sie bitte die Grenzwerte in den Buchhaltungseinstellungen an."
 
-#: manufacturing/doctype/work_order/work_order.py:292
+#: manufacturing/doctype/work_order/work_order.py:296
 msgid "Cannot produce more Item {0} than Sales Order quantity {1}"
 msgstr "Es können nicht mehr Artikel {0} produziert werden, als die über den Auftrag bestellte Stückzahl {1}"
 
-#: manufacturing/doctype/work_order/work_order.py:962
+#: manufacturing/doctype/work_order/work_order.py:976
 msgid "Cannot produce more item for {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:966
+#: manufacturing/doctype/work_order/work_order.py:980
 msgid "Cannot produce more than {0} items for {1}"
 msgstr "Es können nicht mehr als {0} Artikel für {1} produziert werden"
 
@@ -12724,8 +12891,8 @@
 msgid "Cannot receive from customer against negative outstanding"
 msgstr "Negativer Gesamtbetrag kann nicht vom Kunden empfangen werden"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1209
-#: controllers/accounts_controller.py:2515
+#: accounts/doctype/payment_entry/payment_entry.js:1455
+#: controllers/accounts_controller.py:2600
 #: public/js/controllers/accounts.js:100
 msgid "Cannot refer row number greater than or equal to current row number for this Charge type"
 msgstr "Für diese Berechnungsart kann keine Zeilennummern zugeschrieben werden, die größer oder gleich der aktuellen Zeilennummer ist"
@@ -12734,14 +12901,14 @@
 msgid "Cannot retrieve link token for update. Check Error Log for more information"
 msgstr "Link-Token für Update kann nicht abgerufen werden. Prüfen Sie das Fehlerprotokoll für weitere Informationen"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:60
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:63
 msgid "Cannot retrieve link token. Check Error Log for more information"
 msgstr "Link-Token kann nicht abgerufen werden. Prüfen Sie das Fehlerprotokoll für weitere Informationen"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1203
-#: accounts/doctype/payment_entry/payment_entry.js:1374
-#: accounts/doctype/payment_entry/payment_entry.py:1579
-#: controllers/accounts_controller.py:2505 public/js/controllers/accounts.js:94
+#: 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
 #: 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 "Die Berechnungsart kann für die erste Zeile nicht auf „Bezogen auf Betrag der vorhergenden Zeile“ oder auf „Bezogen auf Gesamtbetrag der vorhergenden Zeilen“ gesetzt werden"
@@ -12758,11 +12925,11 @@
 msgid "Cannot set multiple Item Defaults for a company."
 msgstr "Es können nicht mehrere Artikelstandards für ein Unternehmen festgelegt werden."
 
-#: controllers/accounts_controller.py:3173
+#: controllers/accounts_controller.py:3264
 msgid "Cannot set quantity less than delivered quantity"
 msgstr "Menge kann nicht kleiner als gelieferte Menge sein"
 
-#: controllers/accounts_controller.py:3178
+#: controllers/accounts_controller.py:3269
 msgid "Cannot set quantity less than received quantity"
 msgstr "Menge kann nicht kleiner als die empfangene Menge eingestellt werden"
 
@@ -12770,7 +12937,7 @@
 msgid "Cannot set the field <b>{0}</b> for copying in variants"
 msgstr "Das Feld <b>{0}</b> kann nicht zum Kopieren in Varianten festgelegt werden"
 
-#: accounts/doctype/payment_entry/payment_entry.js:876
+#: accounts/doctype/payment_entry/payment_entry.js:1050
 msgid "Cannot {0} {1} {2} without any negative outstanding invoice"
 msgstr "Kann nicht {0} {1} {2} ohne negative ausstehende Rechnung"
 
@@ -12790,7 +12957,7 @@
 msgid "Capacity Planning"
 msgstr "Kapazitätsplanung"
 
-#: manufacturing/doctype/work_order/work_order.py:627
+#: manufacturing/doctype/work_order/work_order.py:641
 msgid "Capacity Planning Error, planned start time can not be same as end time"
 msgstr "Fehler bei der Kapazitätsplanung, die geplante Startzeit darf nicht mit der Endzeit übereinstimmen"
 
@@ -12832,7 +12999,7 @@
 msgid "Capital Work In Progress Account"
 msgstr "Konto für Anlagen im Bau"
 
-#: accounts/report/account_balance/account_balance.js:43
+#: accounts/report/account_balance/account_balance.js:42
 msgid "Capital Work in Progress"
 msgstr "Anlagen im Bau"
 
@@ -12854,7 +13021,7 @@
 msgid "Capitalization Method"
 msgstr "Aktivierungsmethode"
 
-#: assets/doctype/asset/asset.js:155
+#: assets/doctype/asset/asset.js:194
 msgid "Capitalize Asset"
 msgstr "Vermögensgegenstand aktivieren"
 
@@ -12896,7 +13063,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:14
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:18
-#: accounts/report/account_balance/account_balance.js:41
+#: accounts/report/account_balance/account_balance.js:40
 #: setup/setup_wizard/operations/install_fixtures.py:208
 msgid "Cash"
 msgstr "Bargeld"
@@ -12960,7 +13127,7 @@
 msgid "Cash In Hand"
 msgstr "Barmittel"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:322
 msgid "Cash or Bank Account is mandatory for making payment entry"
 msgstr "Kassen- oder Bankkonto ist notwendig, um eine Zahlungsbuchung zu erstellen"
 
@@ -12982,7 +13149,7 @@
 msgid "Cash/Bank Account"
 msgstr "Kasse-/Bankkonto"
 
-#: accounts/report/pos_register/pos_register.js:39
+#: accounts/report/pos_register/pos_register.js:38
 #: accounts/report/pos_register/pos_register.py:126
 #: accounts/report/pos_register/pos_register.py:200
 msgid "Cashier"
@@ -13044,7 +13211,7 @@
 msgid "Category-wise Asset Value"
 msgstr "Kategorialer Vermögenswert"
 
-#: buying/doctype/purchase_order/purchase_order.py:313
+#: buying/doctype/purchase_order/purchase_order.py:314
 #: buying/doctype/request_for_quotation/request_for_quotation.py:99
 msgid "Caution"
 msgstr "Achtung"
@@ -13089,7 +13256,7 @@
 msgid "Certificate Required"
 msgstr "Zertifikat erforderlich"
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "Change"
 msgstr "Ändern"
 
@@ -13105,7 +13272,7 @@
 msgid "Change Amount"
 msgstr "Rückgeld"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:90
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:108
 msgid "Change Release Date"
 msgstr "Ändern Sie das Veröffentlichungsdatum"
 
@@ -13125,7 +13292,7 @@
 msgid "Change in Stock Value"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:885
+#: accounts/doctype/sales_invoice/sales_invoice.py:902
 msgid "Change the account type to Receivable or select a different account."
 msgstr "Ändern Sie den Kontotyp in &quot;Forderung&quot; oder wählen Sie ein anderes Konto aus."
 
@@ -13146,7 +13313,11 @@
 msgid "Changes"
 msgstr "Änderungen"
 
-#: stock/doctype/item/item.js:235
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Changes in {0}"
+msgstr ""
+
+#: stock/doctype/item/item.js:277
 msgid "Changing Customer Group for the selected Customer is not allowed."
 msgstr "Die Änderung der Kundengruppe für den ausgewählten Kunden ist nicht zulässig."
 
@@ -13156,12 +13327,12 @@
 msgid "Channel Partner"
 msgstr "Vertriebspartner"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1634
-#: controllers/accounts_controller.py:2568
+#: accounts/doctype/payment_entry/payment_entry.py:1653
+#: controllers/accounts_controller.py:2653
 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
 msgstr "Kosten für den Typ „Tatsächlich“ in Zeile {0} können nicht in den Artikelpreis oder den bezahlen Betrag einfließen"
 
-#: accounts/report/account_balance/account_balance.js:42
+#: accounts/report/account_balance/account_balance.js:41
 msgid "Chargeable"
 msgstr "Gebührenpflichtig"
 
@@ -13177,7 +13348,15 @@
 msgid "Charges Incurred"
 msgstr "Gebühren entstanden"
 
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges are updated in Purchase Receipt against each item"
+msgstr ""
+
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges will be distributed proportionately based on item qty or amount, as per your selection"
+msgstr ""
+
+#: selling/page/sales_funnel/sales_funnel.js:45
 msgid "Chart"
 msgstr "Diagramm"
 
@@ -13205,10 +13384,10 @@
 msgid "Chart Tree"
 msgstr "Diagrammbaum"
 
-#: accounts/doctype/account/account.js:75
+#: accounts/doctype/account/account.js:70
 #: accounts/doctype/account/account_tree.js:5
-#: accounts/doctype/cost_center/cost_center_tree.js:35
-#: public/js/setup_wizard.js:36 setup/doctype/company/company.js:92
+#: accounts/doctype/cost_center/cost_center_tree.js:52
+#: public/js/setup_wizard.js:37 setup/doctype/company/company.js:96
 msgid "Chart of Accounts"
 msgstr "Kontenplan"
 
@@ -13244,7 +13423,7 @@
 msgid "Chart of Accounts Importer"
 msgstr "Kontenplan Importeur"
 
-#: accounts/doctype/account/account_tree.js:133
+#: accounts/doctype/account/account_tree.js:181
 #: accounts/doctype/cost_center/cost_center.js:41
 msgid "Chart of Cost Centers"
 msgstr "Kostenstellenplan"
@@ -13255,7 +13434,7 @@
 msgid "Chart of Cost Centers"
 msgstr "Kostenstellenplan"
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:65
+#: manufacturing/report/work_order_summary/work_order_summary.js:64
 msgid "Charts Based On"
 msgstr "Diagramme basierend auf"
 
@@ -13333,7 +13512,12 @@
 msgid "Checking this will round off the tax amount to the nearest integer"
 msgstr "Falls aktiviert, wird der Steuerbetrag auf die nächste ganze Zahl gerundet"
 
-#: selling/page/point_of_sale/pos_item_cart.js:252
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:148
+msgid "Checkout"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:250
 msgid "Checkout Order / Submit Order / New Order"
 msgstr "Kaufabwicklung / Bestellung abschicken / Neue Bestellung"
 
@@ -13382,7 +13566,7 @@
 msgid "Cheque Width"
 msgstr "Scheck Breite"
 
-#: public/js/controllers/transaction.js:2061
+#: public/js/controllers/transaction.js:2104
 msgid "Cheque/Reference Date"
 msgstr "Scheck-/ Referenzdatum"
 
@@ -13403,6 +13587,7 @@
 msgstr "Scheck-/ Referenznummer"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:131
+#: accounts/report/accounts_receivable/accounts_receivable.html:113
 msgid "Cheques Required"
 msgstr "Überprüfungen erforderlich"
 
@@ -13420,7 +13605,7 @@
 msgid "Child Task exists for this Task. You can not delete this Task."
 msgstr "Für diesen Vorgang existiert ein untergeordneter Vorgang. Sie können diesen daher nicht löschen."
 
-#: stock/doctype/warehouse/warehouse_tree.js:17
+#: stock/doctype/warehouse/warehouse_tree.js:21
 msgid "Child nodes can be only created under 'Group' type nodes"
 msgstr "Unterknoten können nur unter Gruppenknoten erstellt werden."
 
@@ -13439,7 +13624,7 @@
 msgid "Circular Reference Error"
 msgstr "Zirkelschluss-Fehler"
 
-#: public/js/utils/contact_address_quick_entry.js:76
+#: public/js/utils/contact_address_quick_entry.js:79
 msgid "City"
 msgstr "Ort"
 
@@ -13467,12 +13652,27 @@
 msgid "Class / Percentage"
 msgstr "Klasse / Anteil"
 
+#. Description of a DocType
+#: setup/doctype/territory/territory.json
+msgid "Classification of Customers by region"
+msgstr ""
+
 #. Label of a Text Editor field in DocType 'Bank Guarantee'
 #: accounts/doctype/bank_guarantee/bank_guarantee.json
 msgctxt "Bank Guarantee"
 msgid "Clauses and Conditions"
 msgstr "Klauseln und Bedingungen"
 
+#: public/js/utils/demo.js:11
+msgid "Clear Demo Data"
+msgstr ""
+
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Clear Notifications"
+msgstr ""
+
 #. Label of a Button field in DocType 'Holiday List'
 #: setup/doctype/holiday_list/holiday_list.json
 msgctxt "Holiday List"
@@ -13480,7 +13680,9 @@
 msgstr "Tabelle leeren"
 
 #: 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
+#: templates/form_grid/bank_reconciliation_grid.html:7
 msgid "Clearance Date"
 msgstr "Abrechnungsdatum"
 
@@ -13520,11 +13722,11 @@
 msgid "Clearance Date"
 msgstr "Abrechnungsdatum"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:115
+#: accounts/doctype/bank_clearance/bank_clearance.py:117
 msgid "Clearance Date not mentioned"
 msgstr "Abrechnungsdatum nicht erwähnt"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:113
+#: accounts/doctype/bank_clearance/bank_clearance.py:115
 msgid "Clearance Date updated"
 msgstr "Abrechnungsdatum aktualisiert"
 
@@ -13532,7 +13734,7 @@
 msgid "Clearing Demo Data..."
 msgstr "Lösche Demodaten..."
 
-#: manufacturing/doctype/production_plan/production_plan.js:535
+#: manufacturing/doctype/production_plan/production_plan.js:577
 msgid "Click on 'Get Finished Goods for Manufacture' to fetch the items from the above Sales Orders. Items only for which a BOM is present will be fetched."
 msgstr "Klicken Sie auf „Fertigwaren zur Herstellung abrufen“, um die Artikel aus den oben genannten Kundenaufträgen abzurufen. Es werden nur Artikel abgerufen, für die eine Stückliste vorhanden ist."
 
@@ -13540,7 +13742,7 @@
 msgid "Click on Add to Holidays. This will populate the holidays table with all the dates that fall on the selected weekly off. Repeat the process for populating the dates for all your weekly holidays"
 msgstr "Klicken Sie auf „Zu arbeitsfreien Tagen hinzufügen“. Dadurch wird die Tabelle der arbeitsfreien Tage mit allen Terminen gefüllt, die auf den ausgewählten Wochentag fallen. Wiederholen Sie den Vorgang, um die Daten für alle arbeitsfreien Wochentage einzugeben"
 
-#: manufacturing/doctype/production_plan/production_plan.js:530
+#: manufacturing/doctype/production_plan/production_plan.js:572
 msgid "Click on Get Sales Orders to fetch sales orders based on the above filters."
 msgstr ""
 
@@ -13555,6 +13757,10 @@
 msgid "Click on the link below to verify your email and confirm the appointment"
 msgstr "Klicken Sie auf den folgenden Link, um Ihre E-Mail-Adresse zu bestätigen und den Termin zu bestätigen"
 
+#: selling/page/point_of_sale/pos_item_cart.js:468
+msgid "Click to add email / phone"
+msgstr ""
+
 #. Option for the 'Lead Type' (Select) field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -13573,19 +13779,19 @@
 msgid "Client Secret"
 msgstr "Client-Geheimnis"
 
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order_list.js:30
-#: crm/doctype/opportunity/opportunity.js:108
-#: manufacturing/doctype/production_plan/production_plan.js:101
-#: manufacturing/doctype/work_order/work_order.js:559
-#: quality_management/doctype/quality_meeting/quality_meeting_list.js:8
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/doctype/sales_order/sales_order_list.js:45
-#: stock/doctype/delivery_note/delivery_note.js:209
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/doctype/issue/issue.js:17
+#: buying/doctype/purchase_order/purchase_order.js:327
+#: buying/doctype/purchase_order/purchase_order_list.js:49
+#: crm/doctype/opportunity/opportunity.js:118
+#: manufacturing/doctype/production_plan/production_plan.js:111
+#: manufacturing/doctype/work_order/work_order.js:589
+#: quality_management/doctype/quality_meeting/quality_meeting_list.js:7
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:588
+#: selling/doctype/sales_order/sales_order_list.js:58
+#: stock/doctype/delivery_note/delivery_note.js:248
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:112
+#: support/doctype/issue/issue.js:21
 msgid "Close"
 msgstr "Schließen"
 
@@ -13595,7 +13801,7 @@
 msgid "Close Issue After Days"
 msgstr "Vorfall schließen nach"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:67
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:69
 msgid "Close Loan"
 msgstr "Darlehen schließen"
 
@@ -13605,17 +13811,18 @@
 msgid "Close Replied Opportunity After Days"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:178
+#: selling/page/point_of_sale/pos_controller.js:200
 msgid "Close the POS"
 msgstr "Schließen Sie die Kasse"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:6
-#: selling/doctype/sales_order/sales_order_list.js:7
-#: stock/doctype/delivery_note/delivery_note_list.js:8
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:8
-#: support/report/issue_analytics/issue_analytics.js:59
-#: support/report/issue_summary/issue_summary.js:47
+#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: selling/doctype/sales_order/sales_order_list.js:18
+#: stock/doctype/delivery_note/delivery_note_list.js:18
+#: 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
+#: templates/pages/task_info.html:76
 msgid "Closed"
 msgstr "Geschlossen"
 
@@ -13722,11 +13929,11 @@
 msgid "Closed Documents"
 msgstr "Geschlossene Dokumente"
 
-#: manufacturing/doctype/work_order/work_order.py:1395
+#: manufacturing/doctype/work_order/work_order.py:1409
 msgid "Closed Work Order can not be stopped or Re-opened"
-msgstr ""
+msgstr "Ein geschlossener Arbeitsauftrag kann nicht gestoppt oder erneut geöffnet werden"
 
-#: selling/doctype/sales_order/sales_order.py:420
+#: selling/doctype/sales_order/sales_order.py:423
 msgid "Closed order cannot be cancelled. Unclose to cancel."
 msgstr "Geschlosser Auftrag kann nicht abgebrochen werden. Bitte  wiedereröffnen um abzubrechen."
 
@@ -13778,11 +13985,11 @@
 
 #: public/js/bank_reconciliation_tool/number_card.js:18
 msgid "Closing Balance as per Bank Statement"
-msgstr ""
+msgstr "Schlusssaldo laut Kontoauszug"
 
 #: public/js/bank_reconciliation_tool/number_card.js:24
 msgid "Closing Balance as per ERP"
-msgstr ""
+msgstr "Schlusssaldo laut ERP"
 
 #. Label of a Date field in DocType 'Account Closing Balance'
 #: accounts/doctype/account_closing_balance/account_closing_balance.json
@@ -13831,7 +14038,7 @@
 msgid "Code"
 msgstr "Code"
 
-#: public/js/setup_wizard.js:174
+#: public/js/setup_wizard.js:190
 msgid "Collapse All"
 msgstr "Alles schließen"
 
@@ -13899,10 +14106,15 @@
 msgid "Column in Bank File"
 msgstr "Spalte in der Bankdatei"
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:389
+msgid "Column {0}"
+msgstr "Spalte {0}"
+
 #: accounts/doctype/payment_terms_template/payment_terms_template.py:40
 msgid "Combined invoice portion must equal 100%"
 msgstr "Der kombinierte Rechnungsanteil muss 100% betragen"
 
+#: templates/pages/task_info.html:86
 #: utilities/report/youtube_interactions/youtube_interactions.py:28
 msgid "Comments"
 msgstr "Kommentare"
@@ -14054,7 +14266,7 @@
 msgid "Communication Medium Type"
 msgstr "Typ des Kommunikationsmediums"
 
-#: setup/install.py:111
+#: setup/install.py:92
 msgid "Compact Item Print"
 msgstr "Artikel kompakt drucken"
 
@@ -14067,10 +14279,10 @@
 #. Name of a DocType
 #: accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js:8
 #: accounts/doctype/account/account_tree.js:12
-#: accounts/doctype/account/account_tree.js:149
-#: accounts/doctype/cost_center/cost_center_tree.js:8
-#: accounts/doctype/journal_entry/journal_entry.js:72
-#: accounts/report/account_balance/account_balance.js:9
+#: accounts/doctype/account/account_tree.js:212
+#: accounts/doctype/cost_center/cost_center_tree.js:9
+#: accounts/doctype/journal_entry/journal_entry.js:128
+#: accounts/report/account_balance/account_balance.js:8
 #: accounts/report/accounts_payable/accounts_payable.js:8
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:8
 #: accounts/report/accounts_receivable/accounts_receivable.js:10
@@ -14078,13 +14290,13 @@
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:8
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:8
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:8
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:8
-#: accounts/report/budget_variance_report/budget_variance_report.js:74
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:9
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:9
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:9
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:7
+#: accounts/report/budget_variance_report/budget_variance_report.js:72
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:8
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:8
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:8
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:80
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:9
+#: 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
@@ -14095,9 +14307,9 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:227
 #: 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/payment_ledger/payment_ledger.js:9
+#: 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:9
+#: accounts/report/pos_register/pos_register.js:8
 #: accounts/report/pos_register/pos_register.py:110
 #: accounts/report/profitability_analysis/profitability_analysis.js:8
 #: accounts/report/purchase_register/purchase_register.js:33
@@ -14105,78 +14317,79 @@
 #: accounts/report/sales_payment_summary/sales_payment_summary.js:22
 #: accounts/report/sales_register/sales_register.js:33
 #: accounts/report/share_ledger/share_ledger.py:58
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:9
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:9
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:9
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:8
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:8
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:8
 #: accounts/report/trial_balance/trial_balance.js:8
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:8
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:9
-#: assets/report/fixed_asset_register/fixed_asset_register.js:9
-#: buying/report/procurement_tracker/procurement_tracker.js:9
-#: buying/report/purchase_analytics/purchase_analytics.js:50
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:9
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:8
+#: assets/report/fixed_asset_register/fixed_asset_register.js:8
+#: 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/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:9
+#: 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/subcontract_order_summary/subcontract_order_summary.js:8
+#: 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:9
+#: crm/report/lead_details/lead_details.js:8
 #: crm/report/lead_details/lead_details.py:52
-#: crm/report/lost_opportunity/lost_opportunity.js:9
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:59
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:52
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:119
-#: manufacturing/doctype/bom_creator/bom_creator.js:52
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:9
-#: manufacturing/report/job_card_summary/job_card_summary.js:8
-#: manufacturing/report/process_loss_report/process_loss_report.js:8
-#: manufacturing/report/production_analytics/production_analytics.js:9
-#: manufacturing/report/production_planning_report/production_planning_report.js:9
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:8
-#: manufacturing/report/work_order_summary/work_order_summary.js:8
-#: projects/report/project_summary/project_summary.js:9
+#: crm/report/lost_opportunity/lost_opportunity.js:8
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:51
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:128
+#: manufacturing/doctype/bom_creator/bom_creator.js:51
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:2
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:8
+#: manufacturing/report/job_card_summary/job_card_summary.js:7
+#: manufacturing/report/process_loss_report/process_loss_report.js:7
+#: manufacturing/report/production_analytics/production_analytics.js:8
+#: manufacturing/report/production_planning_report/production_planning_report.js:8
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:7
+#: manufacturing/report/work_order_summary/work_order_summary.js:7
+#: projects/report/project_summary/project_summary.js:8
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:44
 #: public/js/financial_statements.js:153 public/js/purchase_trends_filters.js:8
-#: public/js/sales_trends_filters.js:55
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:28
+#: public/js/sales_trends_filters.js:51
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:27
 #: regional/report/irs_1099/irs_1099.js:8
-#: regional/report/uae_vat_201/uae_vat_201.js:9
-#: regional/report/vat_audit_report/vat_audit_report.js:9
-#: selling/page/point_of_sale/pos_controller.js:64
-#: selling/page/sales_funnel/sales_funnel.js:30
+#: regional/report/uae_vat_201/uae_vat_201.js:8
+#: regional/report/vat_audit_report/vat_audit_report.js:8
+#: selling/page/point_of_sale/pos_controller.js:72
+#: selling/page/sales_funnel/sales_funnel.js:33
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:16
 #: selling/report/customer_credit_balance/customer_credit_balance.js:8
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:9
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:8
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:114
 #: selling/report/lost_quotations/lost_quotations.js:8
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:9
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:8
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:46
-#: selling/report/sales_analytics/sales_analytics.js:50
-#: selling/report/sales_order_analysis/sales_order_analysis.js:9
+#: selling/report/sales_analytics/sales_analytics.js:57
+#: selling/report/sales_order_analysis/sales_order_analysis.js:8
 #: selling/report/sales_order_analysis/sales_order_analysis.py:343
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:35
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:9
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:34
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:9
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:33
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:8
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:33
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:8
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:9
-#: selling/report/territory_wise_sales/territory_wise_sales.js:17
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:8
+#: selling/report/territory_wise_sales/territory_wise_sales.js:18
 #: setup/doctype/company/company.json setup/doctype/company/company_tree.js:10
 #: setup/doctype/department/department_tree.js:10
 #: setup/doctype/employee/employee_tree.js:8
 #: stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.js:8
-#: stock/doctype/warehouse/warehouse_tree.js:10
+#: stock/doctype/warehouse/warehouse_tree.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:12
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:8
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:9
-#: stock/report/delayed_item_report/delayed_item_report.js:9
-#: stock/report/delayed_order_report/delayed_order_report.js:9
-#: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:8
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js: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_stock_value_report/incorrect_stock_value_report.js:8
-#: stock/report/item_shortage_report/item_shortage_report.js:9
+#: 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
 #: stock/report/product_bundle_balance/product_bundle_balance.py:115
 #: stock/report/reserved_stock/reserved_stock.js:8
@@ -14185,20 +14398,20 @@
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:73
 #: stock/report/serial_no_ledger/serial_no_ledger.py:37
 #: stock/report/stock_ageing/stock_ageing.js:8
-#: stock/report/stock_analytics/stock_analytics.js:42
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:8
+#: 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:466
+#: stock/report/stock_balance/stock_balance.py:474
 #: stock/report/stock_ledger/stock_ledger.js:8
-#: stock/report/stock_ledger/stock_ledger.py:268
+#: 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:9
-#: stock/report/total_stock_summary/total_stock_summary.js:18
+#: 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/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:9
-#: support/report/issue_analytics/issue_analytics.js:9
-#: support/report/issue_summary/issue_summary.js:9
+#: 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
 msgid "Company"
 msgstr "Unternehmen"
 
@@ -14656,6 +14869,12 @@
 msgid "Company"
 msgstr "Unternehmen"
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Company"
+msgstr "Unternehmen"
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -14950,7 +15169,7 @@
 msgid "Company Abbreviation"
 msgstr "Unternehmenskürzel"
 
-#: public/js/setup_wizard.js:155
+#: public/js/setup_wizard.js:164
 msgid "Company Abbreviation cannot have more than 5 characters"
 msgstr "Firmenkürzel darf nicht mehr als 5 Zeichen haben"
 
@@ -15134,7 +15353,7 @@
 msgid "Company Name as per Imported Tally Data"
 msgstr "Firmenname gemäß Imported Tally Data"
 
-#: public/js/setup_wizard.js:63
+#: public/js/setup_wizard.js:67
 msgid "Company Name cannot be Company"
 msgstr "Firmenname kann keine Firma sein"
 
@@ -15176,28 +15395,28 @@
 msgid "Company and Posting Date is mandatory"
 msgstr "Unternehmen und Buchungsdatum sind obligatorisch"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2203
+#: accounts/doctype/sales_invoice/sales_invoice.py:2172
 msgid "Company currencies of both the companies should match for Inter Company Transactions."
 msgstr "Firmenwährungen beider Unternehmen sollten für Inter Company-Transaktionen übereinstimmen."
 
-#: stock/doctype/material_request/material_request.js:258
-#: stock/doctype/stock_entry/stock_entry.js:575
+#: stock/doctype/material_request/material_request.js:326
+#: stock/doctype/stock_entry/stock_entry.js:663
 msgid "Company field is required"
 msgstr "Firmenfeld ist erforderlich"
 
-#: accounts/doctype/bank_account/bank_account.py:58
+#: accounts/doctype/bank_account/bank_account.py:72
 msgid "Company is mandatory for company account"
 msgstr "Wenn das Konto zu einem Unternehmen gehört, muss es einem Unternehmen zugeordnet werden"
 
-#: accounts/doctype/subscription/subscription.py:413
-msgid "Company is mandatory was generating invoice. Please set default company in Global Defaults."
+#: accounts/doctype/subscription/subscription.py:412
+msgid "Company is mandatory for generating an invoice. Please set a default company in Global Defaults."
 msgstr ""
 
-#: setup/doctype/company/company.js:161
+#: setup/doctype/company/company.js:191
 msgid "Company name not same"
 msgstr "Firma nicht gleich"
 
-#: assets/doctype/asset/asset.py:206
+#: assets/doctype/asset/asset.py:208
 msgid "Company of asset {0} and purchase document {1} doesn't matches."
 msgstr "Das Unternehmen von Anlage {0} und Eingangsbeleg {1} stimmt nicht überein."
 
@@ -15228,15 +15447,15 @@
 msgid "Company which internal supplier represents"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:80
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:85
 msgid "Company {0} already exists. Continuing will overwrite the Company and Chart of Accounts"
 msgstr "Firma {0} existiert bereits. Durch Fortfahren werden das Unternehmen und der Kontenplan überschrieben"
 
-#: accounts/doctype/account/account.py:443
+#: accounts/doctype/account/account.py:462
 msgid "Company {0} does not exist"
 msgstr "Unternehmen {0} existiert nicht"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:76
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:80
 msgid "Company {0} is added more than once"
 msgstr ""
 
@@ -15277,7 +15496,7 @@
 msgid "Competitor Name"
 msgstr "Name des Mitbewerbers"
 
-#: public/js/utils/sales_common.js:417
+#: public/js/utils/sales_common.js:476
 msgid "Competitors"
 msgstr "Mitbewerber"
 
@@ -15293,7 +15512,9 @@
 msgid "Competitors"
 msgstr "Mitbewerber"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:61
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:67
+#: manufacturing/doctype/workstation/workstation_job_card.html:68
+#: public/js/projects/timer.js:32
 msgid "Complete"
 msgstr "Komplett"
 
@@ -15309,23 +15530,26 @@
 msgid "Complete"
 msgstr "Komplett"
 
-#: manufacturing/doctype/job_card/job_card.js:263
+#: manufacturing/doctype/job_card/job_card.js:296
 msgid "Complete Job"
 msgstr "Auftrag abschließen"
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Complete Order"
+msgstr ""
+
 #: accounts/doctype/subscription/subscription_list.js:8
 #: assets/doctype/asset_repair/asset_repair_list.js:7
-#: buying/doctype/purchase_order/purchase_order_list.js:24
+#: buying/doctype/purchase_order/purchase_order_list.js:43
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:9
 #: manufacturing/report/job_card_summary/job_card_summary.py:93
 #: manufacturing/report/work_order_summary/work_order_summary.py:151
 #: projects/doctype/timesheet/timesheet_list.js:13
 #: projects/report/project_summary/project_summary.py:95
-#: selling/doctype/sales_order/sales_order_list.js:12
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:9
-#: stock/doctype/delivery_note/delivery_note_list.js:14
+#: selling/doctype/sales_order/sales_order_list.js:23
+#: stock/doctype/delivery_note/delivery_note_list.js:24
 #: stock/doctype/material_request/material_request_list.js:13
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:25
 msgid "Completed"
 msgstr "Abgeschlossen"
 
@@ -15584,11 +15808,12 @@
 msgid "Completed Qty"
 msgstr "Gefertigte Menge"
 
-#: manufacturing/doctype/work_order/work_order.py:885
+#: manufacturing/doctype/work_order/work_order.py:899
 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
 msgstr "Die abgeschlossene Menge darf nicht größer sein als die Menge bis zur Herstellung."
 
-#: manufacturing/doctype/job_card/job_card.js:277
+#: manufacturing/doctype/job_card/job_card.js:313
+#: manufacturing/doctype/workstation/workstation.js:199
 msgid "Completed Quantity"
 msgstr "Abgeschlossene Menge"
 
@@ -15723,7 +15948,7 @@
 msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained."
 msgstr ""
 
-#: buying/doctype/buying_settings/buying_settings.js:19
+#: buying/doctype/buying_settings/buying_settings.js:20
 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List."
 msgstr "Konfigurieren Sie die Standardpreisliste beim Erstellen einer neuen Kauftransaktion. Artikelpreise werden aus dieser Preisliste abgerufen."
 
@@ -15733,12 +15958,12 @@
 msgid "Confirmation Date"
 msgstr "Bestätigungsdatum"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:37
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:45
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:43
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:51
 msgid "Connect to Quickbooks"
 msgstr "Stellen Sie eine Verbindung zu Quickbooks her"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:59
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:65
 msgid "Connected to QuickBooks"
 msgstr "Verbunden mit QuickBooks"
 
@@ -15748,7 +15973,7 @@
 msgid "Connected to QuickBooks"
 msgstr "Verbunden mit QuickBooks"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:58
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:64
 msgid "Connecting to QuickBooks"
 msgstr "Verbinden mit QuickBooks"
 
@@ -15854,6 +16079,12 @@
 msgid "Connections"
 msgstr "Verknüpfungen"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Connections"
+msgstr "Verknüpfungen"
+
 #: accounts/report/general_ledger/general_ledger.js:172
 msgid "Consider Accounting Dimensions"
 msgstr "Berücksichtigen Sie die Abrechnungsdimensionen"
@@ -15870,6 +16101,12 @@
 msgid "Consider Minimum Order Qty"
 msgstr "Mindestbestellmenge berücksichtigen"
 
+#. Label of a Check field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Consider Rejected Warehouses"
+msgstr ""
+
 #. Label of a Select field in DocType 'Purchase Taxes and Charges'
 #: accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
 msgctxt "Purchase Taxes and Charges"
@@ -15967,7 +16204,7 @@
 msgid "Consumed Amount"
 msgstr "Verbrauchte Menge"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:318
+#: assets/doctype/asset_capitalization/asset_capitalization.py:324
 msgid "Consumed Asset Items is mandatory for Decapitalization"
 msgstr ""
 
@@ -16038,7 +16275,7 @@
 msgid "Consumed Stock Items"
 msgstr "Verbrauchte Lagerartikel"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:321
+#: assets/doctype/asset_capitalization/asset_capitalization.py:327
 msgid "Consumed Stock Items or Consumed Asset Items is mandatory for Capitalization"
 msgstr "Verbrauchte Lagerartikel oder verbrauchte Vermögensgegenstand-Artikel sind für die Aktivierung obligatorisch"
 
@@ -16573,9 +16810,9 @@
 msgid "Content Type"
 msgstr "Inhaltstyp"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
-#: public/js/controllers/transaction.js:2074
-#: selling/doctype/quotation/quotation.js:344
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:157
+#: public/js/controllers/transaction.js:2117
+#: selling/doctype/quotation/quotation.js:356
 msgid "Continue"
 msgstr "Fortsetzen"
 
@@ -16661,7 +16898,7 @@
 msgstr "Vertragsbedingungen"
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:76
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:121
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:122
 msgid "Contribution %"
 msgstr "Beitrag %"
 
@@ -16672,10 +16909,14 @@
 msgstr "Beitrag (%)"
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:88
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:123
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
 msgid "Contribution Amount"
 msgstr "Beitragshöhe"
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:124
+msgid "Contribution Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Team'
 #: selling/doctype/sales_team/sales_team.json
 msgctxt "Sales Team"
@@ -16694,7 +16935,7 @@
 msgid "Control Historical Stock Transactions"
 msgstr "Historische Lagerbewegungen überprüfen"
 
-#: public/js/utils.js:684
+#: public/js/utils.js:749
 msgid "Conversion Factor"
 msgstr "Umrechnungsfaktor"
 
@@ -16794,7 +17035,7 @@
 msgid "Conversion Factor"
 msgstr "Umrechnungsfaktor"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:86
+#: manufacturing/doctype/bom_creator/bom_creator.js:85
 msgid "Conversion Rate"
 msgstr "Wechselkurs"
 
@@ -16820,7 +17061,7 @@
 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}"
 msgstr "Umrechnungsfaktor für Standardmaßeinheit muss in Zeile {0} 1 sein"
 
-#: controllers/accounts_controller.py:2384
+#: controllers/accounts_controller.py:2476
 msgid "Conversion rate cannot be 0 or 1"
 msgstr "Umrechnungskurs kann nicht 0 oder 1 sein"
 
@@ -16830,12 +17071,12 @@
 msgid "Convert Item Description to Clean HTML in Transactions"
 msgstr "Artikelbeschreibung in sauberes HTML umwandeln"
 
-#: accounts/doctype/account/account.js:106
-#: accounts/doctype/cost_center/cost_center.js:119
+#: accounts/doctype/account/account.js:107
+#: accounts/doctype/cost_center/cost_center.js:123
 msgid "Convert to Group"
 msgstr "In Gruppe umwandeln"
 
-#: stock/doctype/warehouse/warehouse.js:61
+#: stock/doctype/warehouse/warehouse.js:58
 msgctxt "Warehouse"
 msgid "Convert to Group"
 msgstr "In Gruppe umwandeln"
@@ -16844,17 +17085,17 @@
 msgid "Convert to Item Based Reposting"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.js:60
+#: stock/doctype/warehouse/warehouse.js:57
 msgctxt "Warehouse"
 msgid "Convert to Ledger"
 msgstr "In Lagerbuch umwandeln"
 
-#: accounts/doctype/account/account.js:83
-#: accounts/doctype/cost_center/cost_center.js:116
+#: accounts/doctype/account/account.js:79
+#: accounts/doctype/cost_center/cost_center.js:121
 msgid "Convert to Non-Group"
 msgstr "In nicht-Gruppe umwandeln"
 
-#: crm/report/lead_details/lead_details.js:41
+#: crm/report/lead_details/lead_details.js:40
 #: selling/page/sales_funnel/sales_funnel.py:58
 msgid "Converted"
 msgstr "umgewandelt"
@@ -16901,11 +17142,11 @@
 msgid "Corrective Action"
 msgstr "Korrekturmaßnahme"
 
-#: manufacturing/doctype/job_card/job_card.js:146
+#: manufacturing/doctype/job_card/job_card.js:155
 msgid "Corrective Job Card"
 msgstr "Nacharbeitsauftrag"
 
-#: manufacturing/doctype/job_card/job_card.js:151
+#: manufacturing/doctype/job_card/job_card.js:162
 msgid "Corrective Operation"
 msgstr "Nacharbeit"
 
@@ -16938,23 +17179,23 @@
 #: 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:1047
+#: accounts/report/accounts_receivable/accounts_receivable.py:1055
 #: 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:643
+#: accounts/report/general_ledger/general_ledger.py:656
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:300
 #: 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/trial_balance/trial_balance.js:49
-#: assets/report/fixed_asset_register/fixed_asset_register.js:30
+#: assets/report/fixed_asset_register/fixed_asset_register.js:29
 #: assets/report/fixed_asset_register/fixed_asset_register.py:461
-#: buying/report/procurement_tracker/procurement_tracker.js:16
+#: buying/report/procurement_tracker/procurement_tracker.js:15
 #: buying/report/procurement_tracker/procurement_tracker.py:32
-#: public/js/financial_statements.js:237
+#: public/js/financial_statements.js:246
 msgid "Cost Center"
 msgstr "Kostenstelle"
 
@@ -17330,7 +17571,7 @@
 msgid "Cost Center Allocation Percentages"
 msgstr ""
 
-#: public/js/utils/sales_common.js:383
+#: public/js/utils/sales_common.js:435
 msgid "Cost Center For Item with Item Code {0} has been Changed to {1}"
 msgstr "Die Kostenstelle für Artikel mit Artikelcode {0} wurde auf {1} geändert"
 
@@ -17340,7 +17581,7 @@
 msgid "Cost Center Name"
 msgstr "Kostenstellenbezeichnung"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:25
+#: accounts/doctype/cost_center/cost_center_tree.js:38
 msgid "Cost Center Number"
 msgstr "Kostenstellen-Nummer"
 
@@ -17359,8 +17600,8 @@
 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:1235
-#: stock/doctype/purchase_receipt/purchase_receipt.py:788
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1287
+#: stock/doctype/purchase_receipt/purchase_receipt.py:790
 msgid "Cost Center is required in row {0} in Taxes table for type {1}"
 msgstr "Kostenstelle wird in Zeile {0} der Steuertabelle für Typ {1} gebraucht"
 
@@ -17380,11 +17621,11 @@
 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:246
+#: assets/doctype/asset/asset.py:248
 msgid "Cost Center {} doesn't belong to Company {}"
 msgstr "Kostenstelle {} gehört nicht zum Unternehmen {}"
 
-#: assets/doctype/asset/asset.py:253
+#: assets/doctype/asset/asset.py:255
 msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
 msgstr "Kostenstelle {} ist eine Gruppenkostenstelle und Gruppenkostenstellen können nicht in Transaktionen verwendet werden"
 
@@ -17424,7 +17665,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:45
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:64
-#: accounts/report/account_balance/account_balance.js:44
+#: accounts/report/account_balance/account_balance.js:43
 msgid "Cost of Goods Sold"
 msgstr "Selbstkosten"
 
@@ -17536,11 +17777,11 @@
 msgid "Could not auto update shifts. Shift with shift factor {0} needed."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:737
+#: stock/doctype/delivery_note/delivery_note.py:798
 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
 msgstr "Gutschrift konnte nicht automatisch erstellt werden, bitte deaktivieren Sie &#39;Gutschrift ausgeben&#39; und senden Sie sie erneut"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:339
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:355
 msgid "Could not detect the Company for updating Bank Accounts"
 msgstr ""
 
@@ -17562,10 +17803,6 @@
 msgid "Could not solve weighted score function. Make sure the formula is valid."
 msgstr "Die gewichtete Notenfunktion konnte nicht gelöst werden. Stellen Sie sicher, dass die Formel gültig ist."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1030
-msgid "Could not update stock, invoice contains drop shipping item."
-msgstr "Lager konnte nicht aktualisiert werden, Rechnung enthält Direktversand-Artikel."
-
 #. Label of a Int field in DocType 'Shipment Parcel'
 #: stock/doctype/shipment_parcel/shipment_parcel.json
 msgctxt "Shipment Parcel"
@@ -17573,7 +17810,7 @@
 msgstr "Anzahl"
 
 #: crm/report/lead_details/lead_details.py:63
-#: public/js/utils/contact_address_quick_entry.js:86
+#: public/js/utils/contact_address_quick_entry.js:89
 msgid "Country"
 msgstr "Land"
 
@@ -17672,6 +17909,12 @@
 msgid "Coupon Code"
 msgstr "Gutscheincode"
 
+#. Label of a Link field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Coupon Code"
+msgstr "Gutscheincode"
+
 #. Label of a Link field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
@@ -17702,147 +17945,149 @@
 msgid "Coupon Type"
 msgstr "Coupon-Typ"
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Cr"
 msgstr "Cr"
 
-#: accounts/doctype/account/account_tree.js:148
-#: accounts/doctype/account/account_tree.js:151
-#: accounts/doctype/dunning/dunning.js:54
-#: accounts/doctype/dunning/dunning.js:56
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:31
-#: accounts/doctype/journal_entry/journal_entry.js:85
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/pos_invoice/pos_invoice.js:51
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:97
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:103
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:114
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: accounts/doctype/account/account_tree.js:209
+#: accounts/doctype/account/account_tree.js:216
+#: accounts/doctype/dunning/dunning.js:55
+#: accounts/doctype/dunning/dunning.js:57
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:34
+#: accounts/doctype/journal_entry/journal_entry.js:139
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/pos_invoice/pos_invoice.js:55
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:127
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:189
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:609
-#: accounts/doctype/sales_invoice/sales_invoice.js:106
-#: accounts/doctype/sales_invoice/sales_invoice.js:108
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:134
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:225
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:654
+#: accounts/doctype/sales_invoice/sales_invoice.js:109
+#: accounts/doctype/sales_invoice/sales_invoice.js:110
 #: accounts/doctype/sales_invoice/sales_invoice.js:121
 #: accounts/doctype/sales_invoice/sales_invoice.js:122
-#: accounts/doctype/sales_invoice/sales_invoice.js:135
-#: accounts/doctype/sales_invoice/sales_invoice.js:142
-#: accounts/doctype/sales_invoice/sales_invoice.js:146
-#: accounts/doctype/sales_invoice/sales_invoice.js:157
-#: accounts/doctype/sales_invoice/sales_invoice.js:164
-#: accounts/doctype/sales_invoice/sales_invoice.js:184
-#: buying/doctype/purchase_order/purchase_order.js:94
-#: buying/doctype/purchase_order/purchase_order.js:310
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: buying/doctype/purchase_order/purchase_order.js:324
-#: buying/doctype/purchase_order/purchase_order.js:330
-#: buying/doctype/purchase_order/purchase_order.js:336
-#: buying/doctype/purchase_order/purchase_order.js:348
+#: accounts/doctype/sales_invoice/sales_invoice.js:136
+#: accounts/doctype/sales_invoice/sales_invoice.js:147
+#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:168
+#: 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/request_for_quotation/request_for_quotation.js:43
-#: buying/doctype/request_for_quotation/request_for_quotation.js:146
-#: buying/doctype/request_for_quotation/request_for_quotation.js:169
-#: buying/doctype/supplier/supplier.js:96
-#: buying/doctype/supplier/supplier.js:100
-#: buying/doctype/supplier_quotation/supplier_quotation.js:24
+#: 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:421
+#: 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
+#: buying/doctype/supplier/supplier.js:112
+#: buying/doctype/supplier/supplier.js:120
 #: buying/doctype/supplier_quotation/supplier_quotation.js:25
+#: buying/doctype/supplier_quotation/supplier_quotation.js:26
 #: buying/doctype/supplier_quotation/supplier_quotation.js:27
-#: crm/doctype/lead/lead.js:35 crm/doctype/lead/lead.js:38
+#: crm/doctype/lead/lead.js:31 crm/doctype/lead/lead.js:37
 #: crm/doctype/lead/lead.js:39 crm/doctype/lead/lead.js:41
-#: crm/doctype/lead/lead.js:220 crm/doctype/opportunity/opportunity.js:85
-#: crm/doctype/opportunity/opportunity.js:90
-#: crm/doctype/opportunity/opportunity.js:97
+#: crm/doctype/lead/lead.js:230 crm/doctype/opportunity/opportunity.js:85
+#: crm/doctype/opportunity/opportunity.js:93
 #: crm/doctype/opportunity/opportunity.js:103
-#: crm/doctype/prospect/prospect.js:12 crm/doctype/prospect/prospect.js:20
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:151
-#: manufacturing/doctype/blanket_order/blanket_order.js:31
-#: manufacturing/doctype/blanket_order/blanket_order.js:41
-#: manufacturing/doctype/blanket_order/blanket_order.js:53
-#: manufacturing/doctype/bom/bom.js:121 manufacturing/doctype/bom/bom.js:126
-#: manufacturing/doctype/bom/bom.js:132 manufacturing/doctype/bom/bom.js:135
-#: manufacturing/doctype/bom/bom.js:344
-#: manufacturing/doctype/bom_creator/bom_creator.js:93
-#: manufacturing/doctype/production_plan/production_plan.js:109
-#: manufacturing/doctype/production_plan/production_plan.js:115
-#: manufacturing/doctype/production_plan/production_plan.js:121
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/doctype/work_order/work_order.js:726
-#: projects/doctype/task/task_tree.js:77 public/js/communication.js:16
-#: public/js/communication.js:24 public/js/communication.js:30
-#: public/js/controllers/transaction.js:300
-#: public/js/controllers/transaction.js:301
-#: public/js/controllers/transaction.js:2188
-#: selling/doctype/customer/customer.js:165
-#: selling/doctype/quotation/quotation.js:119
-#: selling/doctype/quotation/quotation.js:129
-#: selling/doctype/sales_order/sales_order.js:548
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order.js:560
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order.js:570
-#: selling/doctype/sales_order/sales_order.js:571
-#: selling/doctype/sales_order/sales_order.js:576
-#: selling/doctype/sales_order/sales_order.js:581
-#: selling/doctype/sales_order/sales_order.js:582
-#: selling/doctype/sales_order/sales_order.js:587
-#: selling/doctype/sales_order/sales_order.js:599
-#: selling/doctype/sales_order/sales_order.js:605
-#: selling/doctype/sales_order/sales_order.js:606
-#: selling/doctype/sales_order/sales_order.js:608
-#: selling/doctype/sales_order/sales_order.js:739
-#: selling/doctype/sales_order/sales_order.js:847
-#: stock/doctype/delivery_note/delivery_note.js:89
-#: stock/doctype/delivery_note/delivery_note.js:90
-#: stock/doctype/delivery_note/delivery_note.js:104
-#: stock/doctype/delivery_note/delivery_note.js:167
-#: stock/doctype/delivery_note/delivery_note.js:172
-#: stock/doctype/delivery_note/delivery_note.js:176
-#: stock/doctype/delivery_note/delivery_note.js:181
-#: stock/doctype/delivery_note/delivery_note.js:190
-#: stock/doctype/delivery_note/delivery_note.js:196
-#: stock/doctype/delivery_note/delivery_note.js:223
-#: stock/doctype/item/item.js:105 stock/doctype/item/item.js:108
-#: stock/doctype/item/item.js:112 stock/doctype/item/item.js:449
-#: stock/doctype/item/item.js:651
-#: stock/doctype/material_request/material_request.js:114
-#: stock/doctype/material_request/material_request.js:120
-#: stock/doctype/material_request/material_request.js:123
-#: stock/doctype/material_request/material_request.js:128
-#: stock/doctype/material_request/material_request.js:133
-#: stock/doctype/material_request/material_request.js:138
-#: stock/doctype/material_request/material_request.js:143
+#: crm/doctype/opportunity/opportunity.js:112
+#: crm/doctype/prospect/prospect.js:15 crm/doctype/prospect/prospect.js:27
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:159
+#: manufacturing/doctype/blanket_order/blanket_order.js:34
+#: manufacturing/doctype/blanket_order/blanket_order.js:48
+#: manufacturing/doctype/blanket_order/blanket_order.js:64
+#: manufacturing/doctype/bom/bom.js:123 manufacturing/doctype/bom/bom.js:132
+#: manufacturing/doctype/bom/bom.js:142 manufacturing/doctype/bom/bom.js:146
+#: manufacturing/doctype/bom/bom.js:360
+#: manufacturing/doctype/bom_creator/bom_creator.js:92
+#: manufacturing/doctype/plant_floor/plant_floor.js:240
+#: manufacturing/doctype/production_plan/production_plan.js:125
+#: manufacturing/doctype/production_plan/production_plan.js:139
+#: manufacturing/doctype/production_plan/production_plan.js:146
+#: manufacturing/doctype/work_order/work_order.js:301
+#: manufacturing/doctype/work_order/work_order.js:782
+#: projects/doctype/task/task_tree.js:81 public/js/communication.js:19
+#: 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
+#: selling/doctype/customer/customer.js:176
+#: selling/doctype/quotation/quotation.js:125
+#: selling/doctype/quotation/quotation.js:134
+#: selling/doctype/sales_order/sales_order.js:601
+#: selling/doctype/sales_order/sales_order.js:621
+#: selling/doctype/sales_order/sales_order.js:626
+#: selling/doctype/sales_order/sales_order.js:635
+#: selling/doctype/sales_order/sales_order.js:647
+#: selling/doctype/sales_order/sales_order.js:652
+#: selling/doctype/sales_order/sales_order.js:661
+#: selling/doctype/sales_order/sales_order.js:670
+#: selling/doctype/sales_order/sales_order.js:675
+#: selling/doctype/sales_order/sales_order.js:681
+#: selling/doctype/sales_order/sales_order.js:698
+#: selling/doctype/sales_order/sales_order.js:711
+#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:715
+#: selling/doctype/sales_order/sales_order.js:853
+#: selling/doctype/sales_order/sales_order.js:992
+#: stock/doctype/delivery_note/delivery_note.js:91
+#: stock/doctype/delivery_note/delivery_note.js:93
+#: stock/doctype/delivery_note/delivery_note.js:112
+#: stock/doctype/delivery_note/delivery_note.js:185
+#: stock/doctype/delivery_note/delivery_note.js:195
+#: stock/doctype/delivery_note/delivery_note.js:204
+#: stock/doctype/delivery_note/delivery_note.js:214
+#: stock/doctype/delivery_note/delivery_note.js:228
+#: stock/doctype/delivery_note/delivery_note.js:234
+#: stock/doctype/delivery_note/delivery_note.js:270
+#: stock/doctype/item/item.js:135 stock/doctype/item/item.js:142
+#: stock/doctype/item/item.js:150 stock/doctype/item/item.js:517
+#: stock/doctype/item/item.js:725
+#: stock/doctype/material_request/material_request.js:117
+#: stock/doctype/material_request/material_request.js:126
+#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:140
 #: stock/doctype/material_request/material_request.js:148
-#: stock/doctype/material_request/material_request.js:153
 #: stock/doctype/material_request/material_request.js:156
-#: stock/doctype/material_request/material_request.js:314
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/pick_list/pick_list.js:104
-#: stock/doctype/purchase_receipt/purchase_receipt.js:78
-#: stock/doctype/purchase_receipt/purchase_receipt.js:79
-#: stock/doctype/purchase_receipt/purchase_receipt.js:88
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
-#: stock/doctype/purchase_receipt/purchase_receipt.js:234
-#: stock/doctype/stock_entry/stock_entry.js:146
-#: stock/doctype/stock_entry/stock_entry.js:147
-#: stock/doctype/stock_entry/stock_entry.js:217
-#: stock/doctype/stock_entry/stock_entry.js:1065
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:159
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:193
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:63
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
+#: stock/doctype/material_request/material_request.js:164
+#: stock/doctype/material_request/material_request.js:172
+#: stock/doctype/material_request/material_request.js:180
+#: stock/doctype/material_request/material_request.js:184
+#: stock/doctype/material_request/material_request.js:384
+#: stock/doctype/pick_list/pick_list.js:112
+#: stock/doctype/pick_list/pick_list.js:118
+#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/purchase_receipt/purchase_receipt.js:85
+#: stock/doctype/purchase_receipt/purchase_receipt.js:97
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
+#: stock/doctype/purchase_receipt/purchase_receipt.js:263
+#: stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: 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
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:169
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:202
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:212
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:74
-#: support/doctype/issue/issue.js:27
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:88
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:90
+#: support/doctype/issue/issue.js:34
 msgid "Create"
 msgstr "Erstellen"
 
-#: manufacturing/doctype/work_order/work_order.js:179
+#: manufacturing/doctype/work_order/work_order.js:190
 msgid "Create BOM"
 msgstr "Stückliste anlegen"
 
@@ -17852,14 +18097,18 @@
 msgid "Create Chart Of Accounts Based On"
 msgstr "Kontenplan erstellen, basierend auf"
 
-#: stock/doctype/delivery_note/delivery_note_list.js:59
+#: stock/doctype/delivery_note/delivery_note_list.js:68
 msgid "Create Delivery Trip"
 msgstr "Erstelle Auslieferungsfahrt"
 
-#: assets/doctype/asset/asset.js:122
+#: assets/doctype/asset/asset.js:154
 msgid "Create Depreciation Entry"
 msgstr "Abschreibungseintrag erstellen"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:316
+msgid "Create Document"
+msgstr ""
+
 #: utilities/activation.py:138
 msgid "Create Employee"
 msgstr "Mitarbeiter anlegen"
@@ -17878,15 +18127,15 @@
 msgid "Create Grouped Asset"
 msgstr "Gruppierte Anlage erstellen"
 
-#: accounts/doctype/journal_entry/journal_entry.js:48
+#: accounts/doctype/journal_entry/journal_entry.js:96
 msgid "Create Inter Company Journal Entry"
 msgstr "Erstellen Sie einen Inter Company Journal Eintrag"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:45
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:49
 msgid "Create Invoices"
 msgstr "Rechnungen erstellen"
 
-#: manufacturing/doctype/work_order/work_order.js:152
+#: manufacturing/doctype/work_order/work_order.js:159
 msgid "Create Job Card"
 msgstr "Jobkarte erstellen"
 
@@ -17896,7 +18145,7 @@
 msgid "Create Job Card based on Batch Size"
 msgstr ""
 
-#: accounts/doctype/share_transfer/share_transfer.js:20
+#: accounts/doctype/share_transfer/share_transfer.js:18
 msgid "Create Journal Entry"
 msgstr "Buchungssatz erstellen"
 
@@ -17915,8 +18164,8 @@
 msgid "Create Ledger Entries for Change Amount"
 msgstr "Buchungssätze für Wechselgeld erstellen"
 
-#: buying/doctype/supplier/supplier.js:191
-#: selling/doctype/customer/customer.js:236
+#: buying/doctype/supplier/supplier.js:224
+#: selling/doctype/customer/customer.js:257
 msgid "Create Link"
 msgstr "Verknüpfung erstellen"
 
@@ -17926,45 +18175,45 @@
 msgid "Create Missing Party"
 msgstr "Fehlende Partei erstellen"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:150
+#: manufacturing/doctype/bom_creator/bom_creator.js:146
 msgid "Create Multi-level BOM"
 msgstr "Mehrstufige Stücklisten erstellen"
 
-#: public/js/call_popup/call_popup.js:119
+#: public/js/call_popup/call_popup.js:122
 msgid "Create New Contact"
 msgstr "Neuen Kontakt erstellen"
 
-#: public/js/call_popup/call_popup.js:124
+#: public/js/call_popup/call_popup.js:128
 msgid "Create New Customer"
 msgstr "Neuen Kunden erstellen"
 
-#: public/js/call_popup/call_popup.js:129
+#: public/js/call_popup/call_popup.js:134
 msgid "Create New Lead"
 msgstr "Neuen Interessenten erstellen"
 
 #. Title of an Onboarding Step
-#: crm/doctype/lead/lead.js:198
+#: crm/doctype/lead/lead.js:208
 #: crm/onboarding_step/create_opportunity/create_opportunity.json
 msgid "Create Opportunity"
 msgstr "Chance erstellen"
 
-#: selling/page/point_of_sale/pos_controller.js:60
+#: selling/page/point_of_sale/pos_controller.js:67
 msgid "Create POS Opening Entry"
 msgstr "POS-Eröffnungseintrag erstellen"
 
-#: accounts/doctype/payment_order/payment_order.js:31
+#: accounts/doctype/payment_order/payment_order.js:39
 msgid "Create Payment Entries"
 msgstr "Zahlungseinträge erstellen"
 
-#: accounts/doctype/payment_request/payment_request.js:46
+#: accounts/doctype/payment_request/payment_request.js:58
 msgid "Create Payment Entry"
 msgstr "Zahlungseintrag erstellen"
 
-#: manufacturing/doctype/work_order/work_order.js:588
+#: manufacturing/doctype/work_order/work_order.js:627
 msgid "Create Pick List"
 msgstr "Pickliste erstellen"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Create Print Format"
 msgstr "Druckformat erstellen"
 
@@ -17995,18 +18244,18 @@
 msgid "Create Receiver List"
 msgstr "Empfängerliste erstellen"
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:45
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:81
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:44
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:76
 msgid "Create Reposting Entries"
 msgstr ""
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:53
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:52
 msgid "Create Reposting Entry"
 msgstr ""
 
 #: projects/doctype/timesheet/timesheet.js:54
-#: projects/doctype/timesheet/timesheet.js:203
-#: projects/doctype/timesheet/timesheet.js:207
+#: projects/doctype/timesheet/timesheet.js:230
+#: projects/doctype/timesheet/timesheet.js:234
 msgid "Create Sales Invoice"
 msgstr "Ausgangsrechnung erstellen"
 
@@ -18020,24 +18269,24 @@
 msgid "Create Sales Orders to help you plan your work and deliver on-time"
 msgstr "Erstellen Sie Aufträge, um Ihre Arbeit zu planen und pünktlich zu liefern"
 
-#: stock/doctype/stock_entry/stock_entry.js:346
+#: stock/doctype/stock_entry/stock_entry.js:399
 msgid "Create Sample Retention Stock Entry"
 msgstr "Legen Sie einen Muster-Retention-Stock-Eintrag an"
 
-#: public/js/utils/serial_no_batch_selector.js:220
+#: public/js/utils/serial_no_batch_selector.js:223
 msgid "Create Serial Nos"
 msgstr "Seriennummern erstellen"
 
-#: stock/dashboard/item_dashboard.js:271
-#: stock/doctype/material_request/material_request.js:376
+#: stock/dashboard/item_dashboard.js:279
+#: stock/doctype/material_request/material_request.js:446
 msgid "Create Stock Entry"
 msgstr "Lagerbewegung erstellen"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:153
+#: buying/doctype/request_for_quotation/request_for_quotation.js:163
 msgid "Create Supplier Quotation"
 msgstr "Lieferantenangebot erstellen"
 
-#: setup/doctype/company/company.js:110
+#: setup/doctype/company/company.js:130
 msgid "Create Tax Template"
 msgstr "Steuervorlage erstellen"
 
@@ -18065,11 +18314,11 @@
 msgid "Create Users"
 msgstr "Benutzer erstellen"
 
-#: stock/doctype/item/item.js:647
+#: stock/doctype/item/item.js:721
 msgid "Create Variant"
 msgstr "Variante erstellen"
 
-#: stock/doctype/item/item.js:495 stock/doctype/item/item.js:530
+#: stock/doctype/item/item.js:563 stock/doctype/item/item.js:597
 msgid "Create Variants"
 msgstr "Varianten erstellen"
 
@@ -18176,7 +18425,7 @@
 msgid "Create an Item"
 msgstr "Einen Artikel erstellen"
 
-#: stock/stock_ledger.py:1684
+#: stock/stock_ledger.py:1704
 msgid "Create an incoming stock transaction for the Item."
 msgstr "Erstellen Sie eine eingehende Lagertransaktion für den Artikel."
 
@@ -18233,7 +18482,7 @@
 msgid "Created {0} scorecards for {1} between:"
 msgstr "Erstellte {0} Scorecards für {1} zwischen:"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:126
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:140
 msgid "Creating Accounts..."
 msgstr "Konten erstellen ..."
 
@@ -18241,11 +18490,11 @@
 msgid "Creating Company and Importing Chart of Accounts"
 msgstr "Firma anlegen und Kontenplan importieren"
 
-#: selling/doctype/sales_order/sales_order.js:912
+#: selling/doctype/sales_order/sales_order.js:1069
 msgid "Creating Delivery Note ..."
 msgstr "Lieferschein erstellen ..."
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:137
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:143
 msgid "Creating Dimensions..."
 msgstr "Dimensionen erstellen ..."
 
@@ -18253,34 +18502,34 @@
 msgid "Creating Packing Slip ..."
 msgstr "Packzettel erstellen ..."
 
-#: selling/doctype/sales_order/sales_order.js:1026
+#: selling/doctype/sales_order/sales_order.js:1194
 msgid "Creating Purchase Order ..."
 msgstr "Bestellung anlegen ..."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: buying/doctype/purchase_order/purchase_order.js:414
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:709
+#: buying/doctype/purchase_order/purchase_order.js:482
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:71
 msgid "Creating Purchase Receipt ..."
 msgstr "Eingangsbeleg erstellen ..."
 
-#: buying/doctype/purchase_order/purchase_order.js:81
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:146
+#: buying/doctype/purchase_order/purchase_order.js:85
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:155
 msgid "Creating Stock Entry"
 msgstr "Lagerbewegung erstellen"
 
-#: buying/doctype/purchase_order/purchase_order.js:429
+#: buying/doctype/purchase_order/purchase_order.js:497
 msgid "Creating Subcontracting Order ..."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:226
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:247
 msgid "Creating Subcontracting Receipt ..."
 msgstr "Erstelle Unterauftragsbeleg ..."
 
-#: setup/doctype/employee/employee.js:85
+#: setup/doctype/employee/employee.js:87
 msgid "Creating User..."
 msgstr "Benutzer erstellen..."
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:52
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:56
 msgid "Creating {0} Invoice"
 msgstr "{0} Rechnung erstellen"
 
@@ -18300,24 +18549,26 @@
 msgid "Creation Document No"
 msgstr "Belegerstellungs-Nr."
 
-#: utilities/bulk_transaction.py:173
+#: utilities/bulk_transaction.py:185
 msgid "Creation of <b><a href='/app/{0}'>{1}(s)</a></b> successful"
 msgstr "Erstellung erfolgreich: <b><a href='/app/{0}'>{1}</a></b>"
 
-#: utilities/bulk_transaction.py:190
+#: utilities/bulk_transaction.py:202
 msgid "Creation of {0} failed.\n"
 "\t\t\t\tCheck <b><a href=\"/app/bulk-transaction-log\">Bulk Transaction Log</a></b>"
 msgstr "Die Erstellung von {0} ist fehlgeschlagen.\n"
 "\t\t\t\tÜberprüfen Sie <b><a href=\"/app/bulk-transaction-log\">Massentransaktionsprotokoll</a></b>"
 
-#: utilities/bulk_transaction.py:181
+#: utilities/bulk_transaction.py:193
 msgid "Creation of {0} partially successful.\n"
 "\t\t\t\tCheck <b><a href=\"/app/bulk-transaction-log\">Bulk Transaction Log</a></b>"
 msgstr "Erstellung von {0} teilweise erfolgreich.\n"
 "\t\t\t\tÜberprüfen Sie <b><a href=\"/app/bulk-transaction-log\">Massentransaktionsprotokoll</a></b>"
 
 #: 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/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
@@ -18339,15 +18590,15 @@
 msgid "Credit"
 msgstr "Haben"
 
-#: accounts/report/general_ledger/general_ledger.py:601
+#: accounts/report/general_ledger/general_ledger.py:614
 msgid "Credit (Transaction)"
 msgstr "Haben (Transaktion)"
 
-#: accounts/report/general_ledger/general_ledger.py:578
+#: accounts/report/general_ledger/general_ledger.py:591
 msgid "Credit ({0})"
 msgstr "Guthaben ({0})"
 
-#: accounts/doctype/journal_entry/journal_entry.js:536
+#: accounts/doctype/journal_entry/journal_entry.js:593
 msgid "Credit Account"
 msgstr "Guthabenkonto"
 
@@ -18415,6 +18666,7 @@
 msgstr "Zahlungsziel"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:49
+#: accounts/report/accounts_receivable/accounts_receivable.html:36
 #: selling/report/customer_credit_balance/customer_credit_balance.py:65
 msgid "Credit Limit"
 msgstr "Kreditlimit"
@@ -18449,7 +18701,7 @@
 msgid "Credit Limit"
 msgstr "Kreditlimit"
 
-#: selling/doctype/customer/customer.py:546
+#: selling/doctype/customer/customer.py:558
 msgid "Credit Limit Crossed"
 msgstr "Kreditlimit überschritten"
 
@@ -18490,7 +18742,8 @@
 msgstr "Kreditmonate"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:173
-#: accounts/report/accounts_receivable/accounts_receivable.py:1070
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1078
 #: controllers/sales_and_purchase_return.py:328
 #: setup/setup_wizard/operations/install_fixtures.py:256
 #: stock/doctype/delivery_note/delivery_note.js:84
@@ -18517,10 +18770,11 @@
 msgstr "Gutschrift"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:200
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Credit Note Amount"
 msgstr "Gutschriftbetrag"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:254
+#: accounts/doctype/sales_invoice/sales_invoice.py:259
 msgid "Credit Note Issued"
 msgstr "Gutschrift ausgelöst"
 
@@ -18536,7 +18790,14 @@
 msgid "Credit Note Issued"
 msgstr "Gutschrift ausgelöst"
 
-#: stock/doctype/delivery_note/delivery_note.py:734
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+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
 msgid "Credit Note {0} has been created automatically"
 msgstr "Gutschrift {0} wurde automatisch erstellt"
 
@@ -18552,16 +18813,16 @@
 msgid "Credit in Company Currency"
 msgstr "(Gut)Haben in Unternehmenswährung"
 
-#: selling/doctype/customer/customer.py:512
-#: selling/doctype/customer/customer.py:566
+#: selling/doctype/customer/customer.py:524
+#: selling/doctype/customer/customer.py:579
 msgid "Credit limit has been crossed for customer {0} ({1}/{2})"
 msgstr "Das Kreditlimit wurde für den Kunden {0} ({1} / {2}) überschritten."
 
-#: selling/doctype/customer/customer.py:328
+#: selling/doctype/customer/customer.py:340
 msgid "Credit limit is already defined for the Company {0}"
 msgstr "Kreditlimit für das Unternehmen ist bereits definiert {0}"
 
-#: selling/doctype/customer/customer.py:565
+#: selling/doctype/customer/customer.py:578
 msgid "Credit limit reached for customer {0}"
 msgstr "Kreditlimit für Kunde erreicht {0}"
 
@@ -18630,25 +18891,31 @@
 msgid "Criteria weights must add up to 100%"
 msgstr "Die Gewichtung der Kriterien muss 100 % ergeben"
 
+#. Description of a DocType
+#: setup/doctype/website_item_group/website_item_group.json
+msgid "Cross Listing of Item in multiple groups"
+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 "Kumulativer Transaktionsschwellenwert"
 
-#: accounts/doctype/account/account_tree.js:121
+#: accounts/doctype/account/account_tree.js:166
 #: accounts/report/account_balance/account_balance.py:28
-#: accounts/report/accounts_receivable/accounts_receivable.py:1079
+#: 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/consolidated_financial_statement/consolidated_financial_statement.js:94
+#: 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/financial_statements.html:29
 #: accounts/report/financial_statements.py:631
 #: 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:644
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:650
 #: accounts/report/payment_ledger/payment_ledger.py:213
 #: accounts/report/profitability_analysis/profitability_analysis.py:175
 #: accounts/report/purchase_register/purchase_register.py:229
@@ -18657,12 +18924,12 @@
 #: 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
-#: manufacturing/doctype/bom_creator/bom_creator.js:77
-#: public/js/financial_statements.js:231 public/js/utils/unreconcile.js:63
+#: 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
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:72
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:85
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:137
 msgid "Currency"
 msgstr "Währung"
 
@@ -18950,12 +19217,12 @@
 msgid "Currency and Price List"
 msgstr "Währung und Preisliste"
 
-#: accounts/doctype/account/account.py:295
+#: accounts/doctype/account/account.py:314
 msgid "Currency can not be changed after making entries using some other currency"
 msgstr "Die Währung kann nicht geändert werden, wenn Buchungen in einer anderen Währung getätigt wurden"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1360
-#: accounts/doctype/payment_entry/payment_entry.py:1422 accounts/utils.py:2091
+#: accounts/doctype/payment_entry/payment_entry.py:1379
+#: accounts/doctype/payment_entry/payment_entry.py:1441 accounts/utils.py:2059
 msgid "Currency for {0} must be {1}"
 msgstr "Währung für {0} muss {1} sein"
 
@@ -19168,57 +19435,57 @@
 
 #. Name of a DocType
 #. Name of a role
-#: accounts/doctype/sales_invoice/sales_invoice.js:265
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
+#: 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/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:45
+#: 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/sales_register/sales_register.js:21
 #: accounts/report/sales_register/sales_register.py:185
-#: buying/doctype/supplier/supplier.js:162 crm/doctype/lead/lead.js:35
-#: crm/doctype/opportunity/opportunity.js:94 crm/doctype/prospect/prospect.js:7
+#: 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
-#: projects/doctype/timesheet/timesheet.js:195
+#: projects/doctype/timesheet/timesheet.js:222
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:45
-#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:42
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:22
+#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:39
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:21
 #: selling/doctype/customer/customer.json
 #: selling/doctype/sales_order/sales_order_calendar.js:18
-#: selling/page/point_of_sale/pos_item_cart.js:309
+#: selling/page/point_of_sale/pos_item_cart.js:307
 #: 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:8
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:7
 #: selling/report/inactive_customers/inactive_customers.py:78
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:48
+#: 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:38
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:37
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:19
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:41
 #: selling/report/sales_order_analysis/sales_order_analysis.py:230
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:42
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:40
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:32
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:54
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:53
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:32
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:42
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:40
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:53
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:53
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:64
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:65
 #: setup/doctype/customer_group/customer_group.json
 #: setup/doctype/territory/territory.json
-#: stock/doctype/delivery_note/delivery_note.js:359
-#: stock/doctype/stock_entry/stock_entry.js:300
-#: stock/report/delayed_item_report/delayed_item_report.js:37
+#: stock/doctype/delivery_note/delivery_note.js:405
+#: stock/doctype/stock_entry/stock_entry.js:342
+#: stock/report/delayed_item_report/delayed_item_report.js:36
 #: stock/report/delayed_item_report/delayed_item_report.py:117
-#: stock/report/delayed_order_report/delayed_order_report.js:37
+#: stock/report/delayed_order_report/delayed_order_report.js:36
 #: stock/report/delayed_order_report/delayed_order_report.py:46
-#: support/report/issue_analytics/issue_analytics.js:70
+#: support/report/issue_analytics/issue_analytics.js:69
 #: support/report/issue_analytics/issue_analytics.py:37
-#: support/report/issue_summary/issue_summary.js:58
+#: support/report/issue_summary/issue_summary.js:57
 #: support/report/issue_summary/issue_summary.py:34
 msgid "Customer"
 msgstr "Kunde"
@@ -19587,7 +19854,7 @@
 msgid "Customer Code"
 msgstr "Kunden-Nr."
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1027
+#: accounts/report/accounts_receivable/accounts_receivable.py:1035
 msgid "Customer Contact"
 msgstr "Kundenkontakt"
 
@@ -19667,11 +19934,11 @@
 msgstr "Kundenrückmeldung"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:118
-#: accounts/report/accounts_receivable/accounts_receivable.py:1097
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:99
+#: accounts/report/accounts_receivable/accounts_receivable.js:121
+#: accounts/report/accounts_receivable/accounts_receivable.py:1105
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:102
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:188
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
+#: 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/item_wise_sales_register/item_wise_sales_register.py:208
@@ -19680,10 +19947,10 @@
 #: public/js/sales_trends_filters.js:26
 #: selling/report/inactive_customers/inactive_customers.py:81
 #: 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:31
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:30
 #: setup/doctype/customer_group/customer_group.json
-#: stock/report/delayed_item_report/delayed_item_report.js:43
-#: stock/report/delayed_order_report/delayed_order_report.js:43
+#: stock/report/delayed_item_report/delayed_item_report.js:42
+#: stock/report/delayed_order_report/delayed_order_report.js:42
 msgid "Customer Group"
 msgstr "Kundengruppe"
 
@@ -19846,7 +20113,7 @@
 msgid "Customer Group Name"
 msgstr "Kundengruppenname"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1197
+#: accounts/report/accounts_receivable/accounts_receivable.py:1205
 msgid "Customer Group: {0} does not exist"
 msgstr "Kundengruppe: {0} existiert nicht"
 
@@ -19867,11 +20134,12 @@
 msgid "Customer Items"
 msgstr "Kunden-Artikel"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1088
+#: accounts/report/accounts_receivable/accounts_receivable.py:1096
 msgid "Customer LPO"
 msgstr "Kunden LPO"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:182
+#: accounts/report/accounts_receivable/accounts_receivable.html:152
 msgid "Customer LPO No."
 msgstr "Kunden-LPO-Nr."
 
@@ -19888,9 +20156,9 @@
 msgid "Customer Mobile No"
 msgstr "Mobilnummer des Kunden"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1034
+#: accounts/report/accounts_receivable/accounts_receivable.py:1042
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:92
+#: 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
@@ -20042,7 +20310,7 @@
 msgid "Customer PO Details"
 msgstr "Auftragsdetails"
 
-#: public/js/utils/contact_address_quick_entry.js:92
+#: public/js/utils/contact_address_quick_entry.js:95
 msgid "Customer POS Id"
 msgstr "Kunden-POS-ID"
 
@@ -20089,7 +20357,7 @@
 msgid "Customer Provided"
 msgstr "Vom Kunden beigestellt"
 
-#: setup/doctype/company/company.py:359
+#: setup/doctype/company/company.py:358
 msgid "Customer Service"
 msgstr "Kundenservice"
 
@@ -20117,7 +20385,7 @@
 msgid "Customer Warehouse (Optional)"
 msgstr "Kundenlagerkonto (optional)"
 
-#: selling/page/point_of_sale/pos_item_cart.js:924
+#: selling/page/point_of_sale/pos_item_cart.js:956
 msgid "Customer contact updated successfully."
 msgstr "Kundenkontakt erfolgreich aktualisiert."
 
@@ -20140,9 +20408,9 @@
 msgid "Customer required for 'Customerwise Discount'"
 msgstr "Kunde erforderlich für \"Kundenbezogener Rabatt\""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:986
-#: selling/doctype/sales_order/sales_order.py:335
-#: stock/doctype/delivery_note/delivery_note.py:354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1003
+#: selling/doctype/sales_order/sales_order.py:338
+#: stock/doctype/delivery_note/delivery_note.py:408
 msgid "Customer {0} does not belong to project {1}"
 msgstr "Customer {0} gehört nicht zum Projekt {1}"
 
@@ -20304,7 +20572,7 @@
 msgid "DUNN-.MM.-.YY.-"
 msgstr "DUNN-.MM .-. YY.-"
 
-#: public/js/stock_analytics.js:51
+#: public/js/stock_analytics.js:81
 msgid "Daily"
 msgstr "Täglich"
 
@@ -20413,7 +20681,7 @@
 msgid "Dashboard"
 msgstr "Dashboard"
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:15
 msgid "Data Based On"
 msgstr "Daten basierend auf"
 
@@ -20434,17 +20702,19 @@
 msgid "Data exported from Tally that consists of the Chart of Accounts, Customers, Suppliers, Addresses, Items and UOMs"
 msgstr "Aus Tally exportierte Daten, die aus dem Kontenplan, Kunden, Lieferanten, Adressen, Artikeln und Stücklisten bestehen"
 
-#: accounts/doctype/journal_entry/journal_entry.js:542
+#: accounts/doctype/journal_entry/journal_entry.js:603
 #: 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:16
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:37
+#: accounts/report/account_balance/account_balance.js:15
+#: accounts/report/accounts_receivable/accounts_receivable.html:132
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:38
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:26
+#: accounts/report/general_ledger/general_ledger.html:27
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:26
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:22
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:38
-#: accounts/report/share_balance/share_balance.js:10
-#: accounts/report/share_ledger/share_ledger.js:10
+#: 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
@@ -20452,12 +20722,12 @@
 #: 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
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:19
-#: public/js/bank_reconciliation_tool/data_table_manager.js:40
+#: public/js/bank_reconciliation_tool/data_table_manager.js:39
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:34
 #: selling/report/sales_order_analysis/sales_order_analysis.py:220
 #: stock/report/product_bundle_balance/product_bundle_balance.js:8
 #: stock/report/reserved_stock/reserved_stock.py:89
-#: stock/report/stock_ledger/stock_ledger.py:107
+#: stock/report/stock_ledger/stock_ledger.py:180
 #: support/report/first_response_time_for_issues/first_response_time_for_issues.py:11
 #: support/report/support_hour_distribution/support_hour_distribution.py:68
 msgid "Date"
@@ -20637,7 +20907,7 @@
 msgid "Date "
 msgstr "Datum "
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:98
+#: assets/report/fixed_asset_register/fixed_asset_register.js:97
 msgid "Date Based On"
 msgstr "Datum basierend auf"
 
@@ -20674,7 +20944,7 @@
 msgid "Date of Commencement"
 msgstr "Anfangsdatum"
 
-#: setup/doctype/company/company.js:70
+#: setup/doctype/company/company.js:69
 msgid "Date of Commencement should be greater than Date of Incorporation"
 msgstr "Das Datum des Beginns sollte größer sein als das Gründungsdatum"
 
@@ -20702,7 +20972,7 @@
 msgid "Date of Joining"
 msgstr "Eintrittsdatum"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:265
 msgid "Date of Transaction"
 msgstr "Datum der Transaktion"
 
@@ -20807,7 +21077,7 @@
 msgid "Days Since Last Order"
 msgstr "Tage seit der letzten Bestellung"
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:35
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:34
 msgid "Days Since Last order"
 msgstr "Tage seit dem letzten Auftrag"
 
@@ -20840,12 +21110,14 @@
 msgid "Dear"
 msgstr "Hallo"
 
-#: stock/reorder_item.py:285
+#: stock/reorder_item.py:370
 msgid "Dear System Manager,"
 msgstr "Sehr geehrter System Manager,"
 
 #: 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/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
@@ -20867,15 +21139,15 @@
 msgid "Debit"
 msgstr "Soll"
 
-#: accounts/report/general_ledger/general_ledger.py:594
+#: accounts/report/general_ledger/general_ledger.py:607
 msgid "Debit (Transaction)"
 msgstr "Soll (Transaktion)"
 
-#: accounts/report/general_ledger/general_ledger.py:572
+#: accounts/report/general_ledger/general_ledger.py:585
 msgid "Debit ({0})"
 msgstr "Soll ({0})"
 
-#: accounts/doctype/journal_entry/journal_entry.js:530
+#: accounts/doctype/journal_entry/journal_entry.js:583
 msgid "Debit Account"
 msgstr "Sollkonto"
 
@@ -20910,10 +21182,11 @@
 msgstr "Soll-Betrag in Transaktionswährung"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:175
-#: accounts/report/accounts_receivable/accounts_receivable.py:1073
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1081
 #: controllers/sales_and_purchase_return.py:332
 #: setup/setup_wizard/operations/install_fixtures.py:257
-#: stock/doctype/purchase_receipt/purchase_receipt.js:73
+#: stock/doctype/purchase_receipt/purchase_receipt.js:76
 msgid "Debit Note"
 msgstr "Lastschrift"
 
@@ -20931,6 +21204,7 @@
 msgstr "Lastschrift"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:202
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Debit Note Amount"
 msgstr "Lastschriftbetrag"
 
@@ -20940,6 +21214,13 @@
 msgid "Debit Note Issued"
 msgstr "Lastschrift ausgestellt am"
 
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Debit Note will update it's own outstanding amount, even if \"Return Against\" is specified."
+msgstr ""
+
 #. Label of a Link field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -20952,11 +21233,11 @@
 msgid "Debit To"
 msgstr "Forderungskonto"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
 msgid "Debit To is required"
 msgstr "Forderungskonto erforderlich"
 
-#: accounts/general_ledger.py:465
+#: accounts/general_ledger.py:474
 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
 msgstr "Soll und Haben nicht gleich für {0} #{1}. Unterschied ist {2}."
 
@@ -20996,7 +21277,7 @@
 msgid "Decapitalized"
 msgstr ""
 
-#: public/js/utils/sales_common.js:444
+#: public/js/utils/sales_common.js:503
 msgid "Declare Lost"
 msgstr "Für verloren erklären"
 
@@ -21128,15 +21409,15 @@
 msgid "Default BOM ({0}) must be active for this item or its template"
 msgstr "Standardstückliste ({0}) muss für diesen Artikel oder dessen Vorlage aktiv sein"
 
-#: manufacturing/doctype/work_order/work_order.py:1234
+#: manufacturing/doctype/work_order/work_order.py:1248
 msgid "Default BOM for {0} not found"
 msgstr "Standardstückliste für {0} nicht gefunden"
 
-#: controllers/accounts_controller.py:3216
+#: controllers/accounts_controller.py:3307
 msgid "Default BOM not found for FG Item {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1231
+#: manufacturing/doctype/work_order/work_order.py:1245
 msgid "Default BOM not found for Item {0} and Project {1}"
 msgstr "Standard-Stückliste nicht gefunden für Position {0} und Projekt {1}"
 
@@ -21594,11 +21875,11 @@
 msgid "Default Unit of Measure"
 msgstr "Standardmaßeinheit"
 
-#: stock/doctype/item/item.py:1233
+#: stock/doctype/item/item.py:1234
 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 "Die Standardmaßeinheit für Artikel {0} kann nicht direkt geändert werden, da bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt wurden. Sie können entweder die verknüpften Dokumente stornieren oder einen neuen Artikel erstellen."
 
-#: stock/doctype/item/item.py:1216
+#: stock/doctype/item/item.py:1217
 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 "Die Standard-Maßeinheit für Artikel {0} kann nicht direkt geändert werden, weil Sie bereits einige Transaktionen mit einer anderen Maßeinheit durchgeführt haben. Sie müssen einen neuen Artikel erstellen, um eine andere Standard-Maßeinheit verwenden zukönnen."
 
@@ -21685,7 +21966,12 @@
 msgid "Default account will be automatically updated in POS Invoice when this mode is selected."
 msgstr "Das Standardkonto wird in POS-Rechnung automatisch aktualisiert, wenn dieser Modus ausgewählt ist."
 
-#: setup/doctype/company/company.js:133
+#. Description of a DocType
+#: stock/doctype/stock_settings/stock_settings.json
+msgid "Default settings for your stock-related transactions"
+msgstr ""
+
+#: setup/doctype/company/company.js:160
 msgid "Default tax templates for sales, purchase and items are created."
 msgstr "Es werden Standard-Steuervorlagen für Verkauf, Einkauf und Artikel erstellt."
 
@@ -21866,7 +22152,7 @@
 msgid "Delayed Tasks Summary"
 msgstr "Zusammenfassung verzögerter Aufgaben"
 
-#: setup/doctype/company/company.js:176
+#: setup/doctype/company/company.js:207
 msgid "Delete"
 msgstr "Löschen"
 
@@ -21876,21 +22162,39 @@
 msgid "Delete Accounting and Stock Ledger Entries on deletion of Transaction"
 msgstr "Beim Löschen einer Transaktion auch die entsprechenden Buchungs- und Lagerbuchungssätze löschen"
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Bins"
+msgstr ""
+
 #. Label of a Check field in DocType 'Repost Accounting Ledger'
 #: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
 msgctxt "Repost Accounting Ledger"
 msgid "Delete Cancelled Ledger Entries"
 msgstr "Stornierte Buchungseinträge löschen"
 
-#: stock/doctype/inventory_dimension/inventory_dimension.js:50
+#: stock/doctype/inventory_dimension/inventory_dimension.js:66
 msgid "Delete Dimension"
 msgstr "Dimension löschen"
 
-#: setup/doctype/company/company.js:117
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Leads and Addresses"
+msgstr ""
+
+#: setup/doctype/company/company.js:141
 msgid "Delete Transactions"
 msgstr "Transaktionen löschen"
 
-#: setup/doctype/company/company.js:176
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Transactions"
+msgstr "Transaktionen löschen"
+
+#: setup/doctype/company/company.js:206
 msgid "Delete all the Transactions for this Company"
 msgstr "Löschen aller Transaktionen dieses Unternehmens"
 
@@ -21900,12 +22204,16 @@
 msgid "Deleted Documents"
 msgstr "Gelöschte Dokumente"
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:489
+msgid "Deletion in Progress!"
+msgstr ""
+
 #: regional/__init__.py:14
 msgid "Deletion is not permitted for country {0}"
 msgstr "Das Löschen ist für das Land {0} nicht zulässig."
 
-#: buying/doctype/purchase_order/purchase_order.js:297
-#: buying/doctype/purchase_order/purchase_order_list.js:10
+#: 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
 msgid "Delivered"
@@ -22018,7 +22326,7 @@
 msgid "Delivery"
 msgstr "Lieferung"
 
-#: public/js/utils.js:678
+#: public/js/utils.js:742 selling/doctype/sales_order/sales_order.js:1012
 #: selling/report/sales_order_analysis/sales_order_analysis.py:321
 msgid "Delivery Date"
 msgstr "Liefertermin"
@@ -22051,17 +22359,17 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:281
-#: accounts/doctype/sales_invoice/sales_invoice_list.js:27
+#: 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
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order_list.js:57
+#: selling/doctype/sales_order/sales_order.js:619
+#: selling/doctype/sales_order/sales_order_list.js:70
 #: stock/doctype/delivery_note/delivery_note.json
-#: stock/doctype/delivery_trip/delivery_trip.js:51
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/delivery_trip/delivery_trip.js:52
+#: stock/doctype/pick_list/pick_list.js:110
+#: stock/doctype/purchase_receipt/purchase_receipt.js:90
 msgid "Delivery Note"
 msgstr "Lieferschein"
 
@@ -22177,16 +22485,16 @@
 msgid "Delivery Note Trends"
 msgstr "Entwicklung Lieferscheine"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1148
+#: accounts/doctype/sales_invoice/sales_invoice.py:1155
 msgid "Delivery Note {0} is not submitted"
 msgstr "Lieferschein {0} ist nicht gebucht"
 
-#: stock/doctype/pick_list/pick_list.py:885
+#: stock/doctype/pick_list/pick_list.py:1005
 msgid "Delivery Note(s) created for the Pick List"
 msgstr "Lieferschein(e) für die Pickliste erstellt"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1092
-#: stock/doctype/delivery_trip/delivery_trip.js:67
+#: accounts/report/accounts_receivable/accounts_receivable.py:1100
+#: stock/doctype/delivery_trip/delivery_trip.js:72
 msgid "Delivery Notes"
 msgstr "Lieferscheine"
 
@@ -22233,7 +22541,7 @@
 msgstr "Lieferung an"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:180
+#: stock/doctype/delivery_note/delivery_note.js:210
 #: stock/doctype/delivery_trip/delivery_trip.json
 msgid "Delivery Trip"
 msgstr "Liefertrip"
@@ -22265,7 +22573,7 @@
 msgid "Delivery to"
 msgstr "Lieferung an"
 
-#: selling/doctype/sales_order/sales_order.py:351
+#: selling/doctype/sales_order/sales_order.py:354
 msgid "Delivery warehouse required for stock item {0}"
 msgstr "Auslieferungslager für Lagerartikel {0} erforderlich"
 
@@ -22384,7 +22692,7 @@
 msgid "Depends on Tasks"
 msgstr "Abhängig von Vorgang"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:61
+#: public/js/bank_reconciliation_tool/data_table_manager.js:60
 msgid "Deposit"
 msgstr "Einzahlung"
 
@@ -22426,7 +22734,7 @@
 
 #: 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:45
+#: accounts/report/account_balance/account_balance.js:44
 #: accounts/report/cash_flow/cash_flow.py:129
 msgid "Depreciation"
 msgstr "Abschreibung"
@@ -22445,7 +22753,7 @@
 msgstr "Abschreibung"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:149
-#: assets/doctype/asset/asset.js:241
+#: assets/doctype/asset/asset.js:276
 msgid "Depreciation Amount"
 msgstr "Abschreibungsbetrag"
 
@@ -22508,7 +22816,7 @@
 msgid "Depreciation Expense Account"
 msgstr "Konto für Abschreibungsaufwand"
 
-#: assets/doctype/asset/depreciation.py:390
+#: assets/doctype/asset/depreciation.py:388
 msgid "Depreciation Expense Account should be an Income or Expense Account."
 msgstr ""
 
@@ -22542,19 +22850,19 @@
 msgid "Depreciation Posting Date"
 msgstr "Buchungsdatum der Abschreibung"
 
-#: assets/doctype/asset/asset.js:661
+#: assets/doctype/asset/asset.js:780
 msgid "Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:491
+#: assets/doctype/asset/asset.py:493
 msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
 msgstr "Abschreibungszeile {0}: Der erwartete Wert nach der Nutzungsdauer muss größer oder gleich {1} sein"
 
-#: assets/doctype/asset/asset.py:460
+#: assets/doctype/asset/asset.py:462
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date"
 msgstr "Abschreibungszeile {0}: Das nächste Abschreibungsdatum darf nicht vor dem Verfügbarkeitsdatum liegen"
 
-#: assets/doctype/asset/asset.py:451
+#: assets/doctype/asset/asset.py:453
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date"
 msgstr "Abschreibungszeile {0}: Das nächste Abschreibungsdatum darf nicht vor dem Kaufdatum liegen"
 
@@ -22589,7 +22897,7 @@
 msgid "Depreciation Schedule View"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:347
+#: assets/doctype/asset/asset.py:349
 msgid "Depreciation cannot be calculated for fully depreciated assets"
 msgstr ""
 
@@ -22599,12 +22907,15 @@
 #: 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
+#: manufacturing/doctype/bom/bom_item_preview.html:12
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:58
+#: 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:56
-#: public/js/controllers/transaction.js:2138
-#: selling/doctype/quotation/quotation.js:279
+#: public/js/bank_reconciliation_tool/data_table_manager.js:55
+#: public/js/controllers/transaction.js:2181
+#: 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
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:26
@@ -22615,7 +22926,7 @@
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:59
 #: stock/report/product_bundle_balance/product_bundle_balance.py:112
 #: stock/report/stock_ageing/stock_ageing.py:126
-#: stock/report/stock_ledger/stock_ledger.py:187
+#: 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
@@ -23181,7 +23492,7 @@
 msgid "Desk User"
 msgstr "Schreibtisch-Benutzer"
 
-#: public/js/utils/sales_common.js:423
+#: public/js/utils/sales_common.js:482
 msgid "Detailed Reason"
 msgstr "Ausführlicher Grund"
 
@@ -23197,6 +23508,10 @@
 msgid "Detailed Reason"
 msgstr "Ausführlicher Grund"
 
+#: templates/pages/task_info.html:49
+msgid "Details"
+msgstr "Details"
+
 #. Label of a Long Text field in DocType 'Appointment'
 #: crm/doctype/appointment/appointment.json
 msgctxt "Appointment"
@@ -23257,6 +23572,12 @@
 msgid "Details"
 msgstr "Details"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Details"
+msgstr "Details"
+
 #. Label of a Select field in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
 msgctxt "Accounts Settings"
@@ -23270,7 +23591,7 @@
 msgstr "Diesel"
 
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:175
-#: public/js/bank_reconciliation_tool/number_card.js:31
+#: 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
 msgid "Difference"
@@ -23300,7 +23621,7 @@
 msgid "Difference (Dr - Cr)"
 msgstr "Differenz (Soll - Haben)"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:287
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:294
 msgid "Difference Account"
 msgstr "Differenzkonto"
 
@@ -23329,15 +23650,15 @@
 msgid "Difference Account"
 msgstr "Differenzkonto"
 
-#: stock/doctype/stock_entry/stock_entry.py:573
+#: stock/doctype/stock_entry/stock_entry.py:528
 msgid "Difference Account must be a Asset/Liability type account, since this Stock Entry is an Opening Entry"
 msgstr "Das Differenzkonto muss ein Konto vom Typ Aktiva / Passiva sein, da es sich bei dieser Bestandsbuchung um eine Eröffnungsbuchung handelt"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:714
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:768
 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"
 msgstr "Differenzkonto muss ein Vermögens-/Verbindlichkeiten-Konto sein, da dieser Lagerabgleich eine Eröffnungsbuchung ist"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:301
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:309
 msgid "Difference Amount"
 msgstr "Differenzbetrag"
 
@@ -23401,7 +23722,7 @@
 msgid "Difference Value"
 msgstr "Differenzwert"
 
-#: stock/doctype/delivery_note/delivery_note.js:366
+#: stock/doctype/delivery_note/delivery_note.js:414
 msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
 msgstr "Für jede Zeile können unterschiedliche „Quelllager“ und „Ziellager“ festgelegt werden."
 
@@ -23421,7 +23742,7 @@
 msgid "Dimension Details"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:94
+#: accounts/report/budget_variance_report/budget_variance_report.js:92
 msgid "Dimension Filter"
 msgstr "Dimensionsfilter"
 
@@ -23591,7 +23912,7 @@
 msgstr ""
 
 #: selling/report/customer_credit_balance/customer_credit_balance.py:70
-#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:8
+#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:16
 #: stock/doctype/putaway_rule/putaway_rule_list.js:5
 msgid "Disabled"
 msgstr "Deaktiviert"
@@ -23740,19 +24061,19 @@
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: accounts/general_ledger.py:128
+#: accounts/general_ledger.py:132
 msgid "Disabled Account Selected"
 msgstr ""
 
-#: stock/utils.py:454
+#: stock/utils.py:449
 msgid "Disabled Warehouse {0} cannot be used for this transaction."
 msgstr ""
 
-#: controllers/accounts_controller.py:550
+#: controllers/accounts_controller.py:594
 msgid "Disabled pricing rules since this {} is an internal transfer"
 msgstr ""
 
-#: controllers/accounts_controller.py:564
+#: controllers/accounts_controller.py:608
 msgid "Disabled tax included prices since this {} is an internal transfer"
 msgstr ""
 
@@ -23767,11 +24088,11 @@
 msgid "Disables auto-fetching of existing quantity"
 msgstr "Deaktiviert das automatische Abrufen der vorhandenen Menge"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:62
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:64
 msgid "Disburse Loan"
 msgstr "Darlehen auszahlen"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:12
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
 msgid "Disbursed"
 msgstr "Ausgezahlt"
 
@@ -23781,7 +24102,8 @@
 msgid "Disbursed"
 msgstr "Ausgezahlt"
 
-#: selling/page/point_of_sale/pos_item_cart.js:380
+#: selling/page/point_of_sale/pos_item_cart.js:387
+#: templates/form_grid/item_grid.html:71
 msgid "Discount"
 msgstr "Rabatt"
 
@@ -24047,7 +24369,7 @@
 msgid "Discount and Margin"
 msgstr "Rabatt und Marge"
 
-#: selling/page/point_of_sale/pos_item_cart.js:761
+#: selling/page/point_of_sale/pos_item_cart.js:791
 msgid "Discount cannot be greater than 100%"
 msgstr "Der Rabatt kann nicht größer als 100% sein"
 
@@ -24055,7 +24377,7 @@
 msgid "Discount must be less than 100"
 msgstr "Discount muss kleiner als 100 sein"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2532
+#: accounts/doctype/payment_entry/payment_entry.py:2561
 msgid "Discount of {} applied as per Payment Term"
 msgstr "Skonto von {} gemäß Zahlungsbedingung angewendet"
 
@@ -24141,7 +24463,7 @@
 msgid "Dislikes"
 msgstr "Gefällt mir nicht"
 
-#: setup/doctype/company/company.py:353
+#: setup/doctype/company/company.py:352
 msgid "Dispatch"
 msgstr "Versand"
 
@@ -24249,6 +24571,11 @@
 msgid "Distinct Item and Warehouse"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/serial_no/serial_no.json
+msgid "Distinct unit of an Item"
+msgstr ""
+
 #. Label of a Select field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
@@ -24295,7 +24622,7 @@
 msgid "Divorced"
 msgstr "Geschieden"
 
-#: crm/report/lead_details/lead_details.js:42
+#: crm/report/lead_details/lead_details.js:41
 msgid "Do Not Contact"
 msgstr "Nicht Kontakt aufnehmen"
 
@@ -24317,6 +24644,12 @@
 msgid "Do Not Explode"
 msgstr ""
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Do Not Update Serial / Batch on Creation of Auto Bundle"
+msgstr ""
+
 #. Description of the 'Hide Currency Symbol' (Select) field in DocType 'Global
 #. Defaults'
 #: setup/doctype/global_defaults/global_defaults.json
@@ -24330,29 +24663,49 @@
 msgid "Do not update variants on save"
 msgstr "Aktualisieren Sie keine Varianten beim Speichern"
 
-#: assets/doctype/asset/asset.js:683
+#: assets/doctype/asset/asset.js:800
 msgid "Do you really want to restore this scrapped asset?"
 msgstr "Wollen Sie diesen entsorgte Vermögenswert wirklich wiederherstellen?"
 
-#: assets/doctype/asset/asset.js:669
+#: assets/doctype/asset/asset.js:788
 msgid "Do you really want to scrap this asset?"
 msgstr "Möchten Sie diesen Vermögenswert wirklich entsorgen?"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:134
+#: public/js/controllers/transaction.js:978
+msgid "Do you want to clear the selected {0}?"
+msgstr ""
+
+#: stock/doctype/delivery_trip/delivery_trip.js:155
 msgid "Do you want to notify all the customers by email?"
 msgstr "Möchten Sie alle Kunden per E-Mail benachrichtigen?"
 
-#: manufacturing/doctype/production_plan/production_plan.js:196
+#: manufacturing/doctype/production_plan/production_plan.js:221
 msgid "Do you want to submit the material request"
 msgstr "Möchten Sie die Materialanforderung buchen"
 
+#. Label of a Data field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocField"
+msgstr "DocField"
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "DocType"
+msgstr "DocType"
+
+#. Label of a Link field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocType"
+msgstr "DocType"
+
 #. Label of a Link field in DocType 'Transaction Deletion Record Item'
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgctxt "Transaction Deletion Record Item"
 msgid "DocType"
 msgstr "DocType"
 
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:45
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:69
 msgid "DocTypes should not be added manually to the 'Excluded DocTypes' table. You are only allowed to remove entries from it."
 msgstr "DocTypes sollten nicht manuell zur Tabelle 'Ausgeschlossene DocTypes' hinzugefügt werden. Sie dürfen nur Einträge aus der Tabelle entfernen."
 
@@ -24371,9 +24724,9 @@
 msgstr "DocType"
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:141
-#: manufacturing/report/production_planning_report/production_planning_report.js:43
+#: manufacturing/report/production_planning_report/production_planning_report.js:42
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:102
-#: public/js/bank_reconciliation_tool/dialog_manager.js:104
+#: public/js/bank_reconciliation_tool/dialog_manager.js:111
 msgid "Document Name"
 msgstr "Dokumentenname"
 
@@ -24391,15 +24744,15 @@
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:134
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:100
-#: public/js/bank_reconciliation_tool/dialog_manager.js:99
-#: public/js/bank_reconciliation_tool/dialog_manager.js:182
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:16
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:15
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:23
+#: public/js/bank_reconciliation_tool/dialog_manager.js:106
+#: public/js/bank_reconciliation_tool/dialog_manager.js:186
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:14
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:22
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:14
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:14
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:22
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:14
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:23
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:22
 msgid "Document Type"
 msgstr "Dokumententyp"
 
@@ -24445,11 +24798,11 @@
 msgid "Document Type "
 msgstr "Art des Dokuments"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:56
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:60
 msgid "Document Type already used as a dimension"
 msgstr "Dokumenttyp wird bereits als Dimension verwendet"
 
-#: accounts/doctype/bank_transaction/bank_transaction.js:64
+#: accounts/doctype/bank_transaction/bank_transaction.js:59
 msgid "Document {0} successfully uncleared"
 msgstr "Dokument {0} wurde nicht erfolgreich gelöscht"
 
@@ -24459,7 +24812,7 @@
 msgid "Documents"
 msgstr "Dokumente"
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:200
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:202
 msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
 msgstr ""
 
@@ -24496,7 +24849,13 @@
 #: 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
-#: public/js/utils/crm_activities.js:211
+#: public/js/utils/crm_activities.js:212
+msgid "Done"
+msgstr "Erledigt"
+
+#. Label of a Check field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
 msgid "Done"
 msgstr "Erledigt"
 
@@ -24532,8 +24891,8 @@
 msgid "Double Declining Balance"
 msgstr "Doppelte degressive"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:84
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:93
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:27
 msgid "Download"
 msgstr "Herunterladen"
 
@@ -24542,7 +24901,7 @@
 msgid "Download Backups"
 msgstr "Datensicherungen herunterladen"
 
-#: public/js/utils/serial_no_batch_selector.js:237
+#: public/js/utils/serial_no_batch_selector.js:241
 msgid "Download CSV Template"
 msgstr "CSV-Vorlage herunterladen"
 
@@ -24558,11 +24917,11 @@
 msgid "Download Materials Request Plan Section"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:60
+#: buying/doctype/request_for_quotation/request_for_quotation.js:70
 msgid "Download PDF"
 msgstr "PDF Herunterladen"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:31
 msgid "Download Template"
 msgstr "Vorlage herunterladen"
 
@@ -24618,18 +24977,17 @@
 msgid "Downtime Reason"
 msgstr "Grund für Ausfallzeiten"
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Dr"
 msgstr "S"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:6
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:5
 #: accounts/doctype/payment_request/payment_request_list.js:5
-#: assets/doctype/asset/asset_list.js:35
+#: assets/doctype/asset/asset_list.js:25
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:5
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:7
-#: stock/doctype/stock_entry/stock_entry_list.js:10
+#: stock/doctype/stock_entry/stock_entry_list.js:18
 msgid "Draft"
 msgstr "Entwurf"
 
@@ -24826,13 +25184,6 @@
 msgid "Draft"
 msgstr "Entwurf"
 
-#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
-#. Record'
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-msgctxt "Transaction Deletion Record"
-msgid "Draft"
-msgstr "Entwurf"
-
 #. Option for the 'Status' (Select) field in DocType 'Work Order'
 #: manufacturing/doctype/work_order/work_order.json
 msgctxt "Work Order"
@@ -24931,7 +25282,7 @@
 msgid "Due / Reference Date cannot be after {0}"
 msgstr "Fälligkeits-/Stichdatum kann nicht nach {0} liegen"
 
-#: accounts/doctype/payment_entry/payment_entry.js:649
+#: accounts/doctype/payment_entry/payment_entry.js:795
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:40
 msgid "Due Date"
 msgstr "Fälligkeitsdatum"
@@ -25013,14 +25364,14 @@
 msgid "Due Date cannot be before Posting / Supplier Invoice Date"
 msgstr "Das Fälligkeitsdatum darf nicht vor dem Datum der Buchung / Lieferantenrechnung liegen"
 
-#: controllers/accounts_controller.py:576
+#: controllers/accounts_controller.py:628
 msgid "Due Date is mandatory"
 msgstr "Fälligkeitsdatum wird zwingend vorausgesetzt"
 
 #. Name of a DocType
 #. Label of a Card Break in the Receivables Workspace
 #: accounts/doctype/dunning/dunning.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:164
 #: accounts/workspace/receivables/receivables.json
 msgid "Dunning"
 msgstr "Mahnung"
@@ -25097,7 +25448,7 @@
 msgid "Dunning Type"
 msgstr "Mahnart"
 
-#: stock/doctype/item/item.js:135 stock/doctype/putaway_rule/putaway_rule.py:55
+#: stock/doctype/item/item.js:178 stock/doctype/putaway_rule/putaway_rule.py:55
 msgid "Duplicate"
 msgstr "Duplizieren"
 
@@ -25113,7 +25464,7 @@
 msgid "Duplicate Entry. Please check Authorization Rule {0}"
 msgstr "Doppelter Eintrag/doppelte Buchung. Bitte überprüfen Sie Autorisierungsregel {0}"
 
-#: assets/doctype/asset/asset.py:301
+#: assets/doctype/asset/asset.py:303
 msgid "Duplicate Finance Book"
 msgstr "Doppeltes Finanzbuch"
 
@@ -25126,7 +25477,7 @@
 msgid "Duplicate POS Invoices found"
 msgstr "Doppelte POS-Rechnungen gefunden"
 
-#: projects/doctype/project/project.js:67
+#: projects/doctype/project/project.js:74
 msgid "Duplicate Project with Tasks"
 msgstr "Projekt mit Aufgaben duplizieren"
 
@@ -25142,7 +25493,7 @@
 msgid "Duplicate item group found in the item group table"
 msgstr "Doppelte Artikelgruppe in der Artikelgruppentabelle gefunden"
 
-#: projects/doctype/project/project.js:146
+#: projects/doctype/project/project.js:174
 msgid "Duplicate project has been created"
 msgstr "Es wurde ein doppeltes Projekt erstellt"
 
@@ -25243,7 +25594,7 @@
 msgid "Earliest"
 msgstr "Frühestens"
 
-#: stock/report/stock_balance/stock_balance.py:478
+#: stock/report/stock_balance/stock_balance.py:486
 msgid "Earliest Age"
 msgstr "Frühestes Alter"
 
@@ -25257,6 +25608,14 @@
 msgid "Edit"
 msgstr "Bearbeiten"
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.html:37
+msgid "Edit Capacity"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Edit Cart"
+msgstr ""
+
 #: public/js/utils/serial_no_batch_selector.js:30
 msgid "Edit Full Form"
 msgstr "Vollständiges Formular bearbeiten"
@@ -25265,11 +25624,11 @@
 msgid "Edit Not Allowed"
 msgstr "Bearbeiten nicht erlaubt"
 
-#: public/js/utils/crm_activities.js:182
+#: public/js/utils/crm_activities.js:184
 msgid "Edit Note"
 msgstr "Notiz bearbeiten"
 
-#: stock/doctype/delivery_note/delivery_note.js:370
+#: stock/doctype/delivery_note/delivery_note.js:418
 msgid "Edit Posting Date and Time"
 msgstr "Buchungsdatum und -uhrzeit bearbeiten"
 
@@ -25327,15 +25686,15 @@
 msgid "Edit Posting Date and Time"
 msgstr "Buchungsdatum und -uhrzeit bearbeiten"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:366
+#: public/js/bom_configurator/bom_configurator.bundle.js:405
 msgid "Edit Qty"
 msgstr "Menge bearbeiten"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:238
+#: selling/page/point_of_sale/pos_past_order_summary.js:247
 msgid "Edit Receipt"
 msgstr "Beleg bearbeiten"
 
-#: selling/page/point_of_sale/pos_item_cart.js:717
+#: selling/page/point_of_sale/pos_item_cart.js:745
 msgid "Editing {0} is not allowed as per POS Profile settings"
 msgstr ""
 
@@ -25351,7 +25710,7 @@
 msgid "Educational Qualification"
 msgstr "Schulische Qualifikation"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
 msgid "Either 'Selling' or 'Buying' must be selected"
 msgstr "Es muss entweder „Verkauf“ oder „Einkauf“ ausgewählt werden"
 
@@ -25405,9 +25764,9 @@
 msgid "Electronic Invoice Register"
 msgstr "Elektronisches Rechnungsregister"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:231
+#: 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:874
+#: selling/page/point_of_sale/pos_item_cart.js:904
 msgid "Email"
 msgstr "E-Mail"
 
@@ -25561,7 +25920,7 @@
 msgid "Email Group"
 msgstr "E-Mail-Gruppe"
 
-#: public/js/utils/contact_address_quick_entry.js:39
+#: public/js/utils/contact_address_quick_entry.js:42
 msgid "Email Id"
 msgstr "E-Mail-ID"
 
@@ -25589,7 +25948,7 @@
 msgid "Email Sent"
 msgstr "E-Mail wurde versandt"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:289
+#: buying/doctype/request_for_quotation/request_for_quotation.py:313
 msgid "Email Sent to Supplier {0}"
 msgstr "E-Mail an Lieferanten gesendet {0}"
 
@@ -25617,15 +25976,15 @@
 msgid "Email Template"
 msgstr "E-Mail-Vorlage"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:269
+#: selling/page/point_of_sale/pos_past_order_summary.js:278
 msgid "Email not sent to {0} (unsubscribed / disabled)"
 msgstr "E-Mail wurde nicht an {0} gesendet (abbestellt / deaktiviert)"
 
-#: stock/doctype/shipment/shipment.js:153
+#: stock/doctype/shipment/shipment.js:174
 msgid "Email or Phone/Mobile of the Contact are mandatory to continue."
 msgstr "Um fortzufahren, sind Nachname, E-Mail oder Telefon/Mobiltelefon des Benutzers erforderlich."
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:273
+#: selling/page/point_of_sale/pos_past_order_summary.js:283
 msgid "Email sent successfully."
 msgstr "Email wurde erfolgreich Versendet."
 
@@ -25675,7 +26034,7 @@
 #: projects/doctype/timesheet/timesheet_calendar.js:28
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:27
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:10
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:50
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:45
 #: quality_management/doctype/non_conformance/non_conformance.json
 #: setup/doctype/company/company.json setup/doctype/employee/employee.json
 #: setup/doctype/sales_person/sales_person_tree.js:7
@@ -25878,7 +26237,7 @@
 msgid "Empty"
 msgstr "Leer"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1042
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1044
 msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
 msgstr "Aktivieren Sie „Teilreservierung zulassen“ in den Lagereinstellungen, um einen Teilbestand zu reservieren."
 
@@ -25916,6 +26275,12 @@
 msgid "Enable Common Party Accounting"
 msgstr "Verknüpfung von Kunden und Liefeanten erlauben"
 
+#. Label of a Check field in DocType 'Selling Settings'
+#: selling/doctype/selling_settings/selling_settings.json
+msgctxt "Selling Settings"
+msgid "Enable Cut-Off Date on Bulk Delivery Note Creation"
+msgstr ""
+
 #. Label of a Check field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
@@ -25988,6 +26353,13 @@
 msgid "Enable YouTube Tracking"
 msgstr "YouTube-Tracking aktivieren"
 
+#. Description of the 'Consider Rejected Warehouses' (Check) field in DocType
+#. 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Enable it if users want to consider rejected materials to dispatch."
+msgstr ""
+
 #: support/doctype/service_level_agreement/service_level_agreement.js:34
 msgid "Enable to apply SLA on every {0}"
 msgstr ""
@@ -26067,14 +26439,14 @@
 msgid "Encashment Date"
 msgstr "Inkassodatum"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:41
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:41
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:49
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:49
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:23
-#: accounts/report/payment_ledger/payment_ledger.js:24
-#: assets/report/fixed_asset_register/fixed_asset_register.js:75
+#: accounts/report/payment_ledger/payment_ledger.js:23
+#: assets/report/fixed_asset_register/fixed_asset_register.js:74
 #: projects/report/project_summary/project_summary.py:74
-#: public/js/financial_statements.js:191 public/js/setup_wizard.js:42
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:24
+#: public/js/financial_statements.js:200 public/js/setup_wizard.js:44
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:23
 #: templates/pages/projects.html:47
 msgid "End Date"
 msgstr "Enddatum"
@@ -26143,6 +26515,10 @@
 msgid "End Date cannot be before Start Date."
 msgstr "Das Enddatum darf nicht vor dem Startdatum liegen."
 
+#: manufacturing/doctype/workstation/workstation.js:206
+msgid "End Time"
+msgstr "Endzeit"
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -26167,15 +26543,15 @@
 msgid "End Time"
 msgstr "Endzeit"
 
-#: stock/doctype/stock_entry/stock_entry.js:241
+#: stock/doctype/stock_entry/stock_entry.js:268
 msgid "End Transit"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
 #: accounts/report/financial_ratios/financial_ratios.js:25
-#: assets/report/fixed_asset_register/fixed_asset_register.js:90
-#: public/js/financial_statements.js:206
+#: assets/report/fixed_asset_register/fixed_asset_register.js:89
+#: public/js/financial_statements.js:215
 msgid "End Year"
 msgstr "Ende Jahr"
 
@@ -26183,7 +26559,7 @@
 msgid "End Year cannot be before Start Year"
 msgstr "End-Jahr kann nicht gleich oder kleiner dem Start-Jahr sein."
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:43
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:48
 #: accounts/doctype/process_deferred_accounting/process_deferred_accounting.py:37
 msgid "End date cannot be before start date"
 msgstr "Das Enddatum darf nicht vor dem Startdatum liegen"
@@ -26207,6 +26583,8 @@
 msgid "End of the current subscription period"
 msgstr ""
 
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:13
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:23
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:31
 msgid "Enough Parts to Build"
 msgstr "Genug Teile zu bauen"
@@ -26221,27 +26599,29 @@
 msgid "Enter API key in Google Settings."
 msgstr "Geben Sie den API-Schlüssel in den Google-Einstellungen ein."
 
-#: setup/doctype/employee/employee.js:102
+#: setup/doctype/employee/employee.js:103
 msgid "Enter First and Last name of Employee, based on Which Full Name will be updated. IN transactions, it will be Full Name which will be fetched."
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:208
+#: public/js/utils/serial_no_batch_selector.js:211
 msgid "Enter Serial Nos"
 msgstr "Seriennummern eingeben"
 
-#: stock/doctype/material_request/material_request.js:313
+#: stock/doctype/material_request/material_request.js:383
 msgid "Enter Supplier"
 msgstr "Lieferant eingeben"
 
-#: manufacturing/doctype/job_card/job_card.js:280
+#: manufacturing/doctype/job_card/job_card.js:320
+#: manufacturing/doctype/workstation/workstation.js:189
+#: manufacturing/doctype/workstation/workstation.js:236
 msgid "Enter Value"
 msgstr "Wert eingeben"
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:91
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:96
 msgid "Enter Visit Details"
 msgstr ""
 
-#: manufacturing/doctype/routing/routing.js:77
+#: manufacturing/doctype/routing/routing.js:78
 msgid "Enter a name for Routing."
 msgstr ""
 
@@ -26253,31 +26633,31 @@
 msgid "Enter a name for this Holiday List."
 msgstr "Geben Sie einen Namen für diese Liste der arbeitsfreien Tage ein."
 
-#: selling/page/point_of_sale/pos_payment.js:499
+#: selling/page/point_of_sale/pos_payment.js:527
 msgid "Enter amount to be redeemed."
 msgstr "Geben Sie den einzulösenden Betrag ein."
 
-#: stock/doctype/item/item.js:804
+#: stock/doctype/item/item.js:882
 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field."
 msgstr "Geben Sie einen Artikelcode ein. Der Name wird automatisch mit dem Artikelcode ausgefüllt, wenn Sie in das Feld Artikelname klicken."
 
-#: selling/page/point_of_sale/pos_item_cart.js:877
+#: selling/page/point_of_sale/pos_item_cart.js:907
 msgid "Enter customer's email"
 msgstr "Geben Sie die E-Mail-Adresse des Kunden ein"
 
-#: selling/page/point_of_sale/pos_item_cart.js:882
+#: selling/page/point_of_sale/pos_item_cart.js:913
 msgid "Enter customer's phone number"
 msgstr "Geben Sie die Telefonnummer des Kunden ein"
 
-#: assets/doctype/asset/asset.py:345
+#: assets/doctype/asset/asset.py:347
 msgid "Enter depreciation details"
 msgstr "Geben Sie die Abschreibungsdetails ein"
 
-#: selling/page/point_of_sale/pos_item_cart.js:382
+#: selling/page/point_of_sale/pos_item_cart.js:389
 msgid "Enter discount percentage."
 msgstr "Geben Sie den Rabattprozentsatz ein."
 
-#: public/js/utils/serial_no_batch_selector.js:211
+#: public/js/utils/serial_no_batch_selector.js:214
 msgid "Enter each serial no in a new line"
 msgstr "Geben Sie jede Seriennummer in eine neue Zeile ein"
 
@@ -26291,7 +26671,7 @@
 msgid "Enter the Bank Guarantee Number before submitting."
 msgstr "Geben Sie die Nummer der Bankgarantie ein, bevor Sie buchen."
 
-#: manufacturing/doctype/routing/routing.js:82
+#: manufacturing/doctype/routing/routing.js:83
 msgid "Enter the Operation, the table will fetch the Operation details like Hourly Rate, Workstation automatically.\n\n"
 " After that, set the Operation Time in minutes and the table will calculate the Operation Costs based on the Hourly Rate and Operation Time."
 msgstr "Geben Sie den Vorgang ein. Die Tabelle holt sich automatisch die Vorgangsdetails wie Stundensatz und Arbeitsplatz.\n\n"
@@ -26305,19 +26685,19 @@
 msgid "Enter the name of the bank or lending institution before submitting."
 msgstr "Geben Sie den Namen der Bank oder des Kreditinstituts ein, bevor Sie buchen."
 
-#: stock/doctype/item/item.js:824
+#: stock/doctype/item/item.js:908
 msgid "Enter the opening stock units."
 msgstr "Geben Sie die Anfangsbestandseinheiten ein."
 
-#: manufacturing/doctype/bom/bom.js:730
+#: manufacturing/doctype/bom/bom.js:761
 msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
 msgstr "Geben Sie die Menge des Artikels ein, der aus dieser Stückliste hergestellt werden soll."
 
-#: manufacturing/doctype/work_order/work_order.js:817
+#: manufacturing/doctype/work_order/work_order.js:878
 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:392
+#: selling/page/point_of_sale/pos_payment.js:411
 msgid "Enter {0} amount."
 msgstr "Geben Sie den Betrag {0} ein."
 
@@ -26332,7 +26712,7 @@
 msgid "Entity"
 msgstr "Entität"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:203
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:123
 msgid "Entity Type"
 msgstr "Entitätstyp"
@@ -26357,8 +26737,8 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:102
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:150
-#: accounts/report/account_balance/account_balance.js:30
-#: accounts/report/account_balance/account_balance.js:46
+#: accounts/report/account_balance/account_balance.js:29
+#: accounts/report/account_balance/account_balance.js:45
 #: accounts/report/balance_sheet/balance_sheet.py:242
 #: setup/setup_wizard/operations/install_fixtures.py:259
 msgid "Equity"
@@ -26383,8 +26763,8 @@
 msgid "Equity/Liability Account"
 msgstr "Eigenkapital / Verbindlichkeitskonto"
 
-#: accounts/doctype/payment_request/payment_request.py:410
-#: manufacturing/doctype/job_card/job_card.py:773
+#: 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
 msgid "Error"
 msgstr "Fehler"
@@ -26449,6 +26829,16 @@
 msgid "Error Log"
 msgstr "Fehlerprotokoll"
 
+#. Label of a Long Text field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Error Log"
+msgstr "Fehlerprotokoll"
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+msgid "Error Message"
+msgstr "Fehlermeldung"
+
 #. Label of a Text field in DocType 'Period Closing Voucher'
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgctxt "Period Closing Voucher"
@@ -26471,7 +26861,7 @@
 msgid "Error occurred while parsing Chart of Accounts: Please make sure that no two accounts have the same name"
 msgstr "Beim Parsen des Kontenplans ist ein Fehler aufgetreten: Bitte stellen Sie sicher, dass keine zwei Konten den gleichen Namen haben"
 
-#: assets/doctype/asset/depreciation.py:406
+#: assets/doctype/asset/depreciation.py:404
 msgid "Error while posting depreciation entries"
 msgstr "Fehler beim Buchen von Abschreibungsbuchungen"
 
@@ -26479,11 +26869,15 @@
 msgid "Error while processing deferred accounting for {0}"
 msgstr "Fehler bei der Verarbeitung der Rechnungsabgrenzung für {0}"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:389
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:404
 msgid "Error while reposting item valuation"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:720
+#: templates/includes/footer/footer_extension.html:29
+msgid "Error: Not a valid id?"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.js:883
 msgid "Error: {0} is mandatory field"
 msgstr "Fehler: {0} ist ein Pflichtfeld"
 
@@ -26552,7 +26946,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 "Beispiel: ABCD. #####. Wenn die Serie gesetzt ist und die Chargennummer in den Transaktionen nicht erwähnt wird, wird die automatische Chargennummer basierend auf dieser Serie erstellt. Wenn Sie die Chargennummer für diesen Artikel immer explizit angeben möchten, lassen Sie dieses Feld leer. Hinweis: Diese Einstellung hat Vorrang vor dem Naming Series Prefix in den Stock Settings."
 
-#: stock/stock_ledger.py:1976
+#: stock/stock_ledger.py:1983
 msgid "Example: Serial No {0} reserved in {1}."
 msgstr "Beispiel: Seriennummer {0} reserviert in {1}."
 
@@ -26562,11 +26956,11 @@
 msgid "Exception Budget Approver Role"
 msgstr "Ausnahmegenehmigerrolle"
 
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:56
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:55
 msgid "Excess Materials Consumed"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:869
+#: manufacturing/doctype/job_card/job_card.py:876
 msgid "Excess Transfer"
 msgstr ""
 
@@ -26590,7 +26984,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:517
+#: setup/doctype/company/company.py:516
 msgid "Exchange Gain/Loss"
 msgstr "Exchange-Gewinn / Verlust"
 
@@ -26612,8 +27006,8 @@
 msgid "Exchange Gain/Loss"
 msgstr "Exchange-Gewinn / Verlust"
 
-#: controllers/accounts_controller.py:1313
-#: controllers/accounts_controller.py:1394
+#: controllers/accounts_controller.py:1382
+#: controllers/accounts_controller.py:1463
 msgid "Exchange Gain/Loss amount has been booked through {0}"
 msgstr "Wechselkursgewinne/-verluste wurden über {0} verbucht"
 
@@ -26797,7 +27191,7 @@
 msgid "Excise Entry"
 msgstr "Eintrag/Buchung entfernen"
 
-#: stock/doctype/stock_entry/stock_entry.js:1060
+#: stock/doctype/stock_entry/stock_entry.js:1213
 msgid "Excise Invoice"
 msgstr "Verbrauch Rechnung"
 
@@ -26846,9 +27240,9 @@
 msgid "Exit Interview Held On"
 msgstr "Entlassungsgespräch am"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:138
-#: public/js/bom_configurator/bom_configurator.bundle.js:179
-#: public/js/setup_wizard.js:168
+#: public/js/bom_configurator/bom_configurator.bundle.js:140
+#: public/js/bom_configurator/bom_configurator.bundle.js:183
+#: public/js/setup_wizard.js:181
 msgid "Expand All"
 msgstr "Alle ausklappen"
 
@@ -26906,11 +27300,13 @@
 msgid "Expected Delivery Date"
 msgstr "Geplanter Liefertermin"
 
-#: selling/doctype/sales_order/sales_order.py:316
+#: selling/doctype/sales_order/sales_order.py:319
 msgid "Expected Delivery Date should be after Sales Order Date"
 msgstr "Voraussichtlicher Liefertermin sollte nach Auftragsdatum erfolgen"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:44
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:104
+#: templates/pages/task_info.html:64
 msgid "Expected End Date"
 msgstr "Voraussichtliches Enddatum"
 
@@ -26936,7 +27332,7 @@
 msgid "Expected End Date should be less than or equal to parent task's Expected End Date {0}."
 msgstr "Das erwartete Enddatum sollte kleiner oder gleich dem erwarteten Enddatum {0} der übergeordneten Aufgabe sein."
 
-#: public/js/projects/timer.js:12
+#: public/js/projects/timer.js:16
 msgid "Expected Hrs"
 msgstr "Erwartete Stunden"
 
@@ -26946,7 +27342,9 @@
 msgid "Expected Hrs"
 msgstr "Erwartete Stunden"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:40
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:98
+#: templates/pages/task_info.html:59
 msgid "Expected Start Date"
 msgstr "Voraussichtliches Startdatum"
 
@@ -26996,8 +27394,8 @@
 msgid "Expected Value After Useful Life"
 msgstr "Erwartungswert nach der Ausmusterung"
 
-#: accounts/report/account_balance/account_balance.js:29
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:81
+#: 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/profitability_analysis/profitability_analysis.py:189
 msgid "Expense"
@@ -27028,11 +27426,11 @@
 msgid "Expense"
 msgstr "Aufwand"
 
-#: controllers/stock_controller.py:359
+#: controllers/stock_controller.py:541
 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
 msgstr "Aufwands-/Differenz-Konto ({0}) muss ein \"Gewinn oder Verlust\"-Konto sein"
 
-#: accounts/report/account_balance/account_balance.js:47
+#: accounts/report/account_balance/account_balance.js:46
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:248
 msgid "Expense Account"
 msgstr "Aufwandskonto"
@@ -27115,7 +27513,7 @@
 msgid "Expense Account"
 msgstr "Aufwandskonto"
 
-#: controllers/stock_controller.py:339
+#: controllers/stock_controller.py:521
 msgid "Expense Account Missing"
 msgstr "Spesenabrechnung fehlt"
 
@@ -27132,13 +27530,13 @@
 msgid "Expense Head"
 msgstr "Ausgabenbezeichnung"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:510
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:528
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:514
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:532
 msgid "Expense Head Changed"
 msgstr "Aufwandskonto geändert"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:552
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:556
 msgid "Expense account is mandatory for item {0}"
 msgstr "Aufwandskonto ist zwingend für Artikel {0}"
 
@@ -27149,7 +27547,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:46
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:65
-#: accounts/report/account_balance/account_balance.js:48
+#: accounts/report/account_balance/account_balance.js:49
 msgid "Expenses Included In Asset Valuation"
 msgstr "Aufwendungen, die in der Vermögensbewertung enthalten sind"
 
@@ -27161,7 +27559,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:49
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:69
-#: accounts/report/account_balance/account_balance.js:49
+#: accounts/report/account_balance/account_balance.js:51
 msgid "Expenses Included In Valuation"
 msgstr "In der Bewertung enthaltene Aufwendungen"
 
@@ -27172,8 +27570,8 @@
 msgstr "In der Bewertung enthaltene Aufwendungen"
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:9
-#: selling/doctype/quotation/quotation_list.js:35
-#: stock/doctype/batch/batch_list.js:9 stock/doctype/item/item_list.js:10
+#: selling/doctype/quotation/quotation_list.js:34
+#: stock/doctype/batch/batch_list.js:13 stock/doctype/item/item_list.js:18
 msgid "Expired"
 msgstr "Verfallen"
 
@@ -27195,7 +27593,7 @@
 msgid "Expired"
 msgstr "Verfallen"
 
-#: stock/doctype/stock_entry/stock_entry.js:316
+#: stock/doctype/stock_entry/stock_entry.js:362
 msgid "Expired Batches"
 msgstr "Abgelaufene Chargen"
 
@@ -27265,11 +27663,11 @@
 msgid "Export Data"
 msgstr "Daten exportieren"
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:35
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:34
 msgid "Export E-Invoices"
 msgstr "E-Rechnungen exportieren"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:106
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:93
 msgid "Export Errored Rows"
 msgstr "Exportieren Sie fehlerhafte Zeilen"
 
@@ -27361,7 +27759,7 @@
 msgid "FIFO Stock Queue (qty, rate)"
 msgstr ""
 
-#. Label of a Text field in DocType 'Stock Ledger Entry'
+#. Label of a Long Text field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "FIFO Stock Queue (qty, rate)"
@@ -27373,7 +27771,8 @@
 msgid "FIFO/LIFO Queue"
 msgstr "FIFO/LIFO-Warteschlange"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:62
+#: 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
 msgid "Failed"
 msgstr "Fehlgeschlagen"
@@ -27486,7 +27885,14 @@
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:9
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Failed"
+msgstr "Fehlgeschlagen"
+
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:17
 msgid "Failed Entries"
 msgstr ""
 
@@ -27521,11 +27927,11 @@
 msgid "Failed to setup defaults"
 msgstr "Standardwerte konnten nicht gesetzt werden"
 
-#: setup/doctype/company/company.py:699
+#: setup/doctype/company/company.py:698
 msgid "Failed to setup defaults for country {0}. Please contact support."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Failure"
 msgstr "Fehler"
 
@@ -27541,6 +27947,10 @@
 msgid "Failure Description"
 msgstr ""
 
+#: accounts/doctype/payment_request/payment_request.js:29
+msgid "Failure: {0}"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -27602,7 +28012,7 @@
 msgid "Fees"
 msgstr "Gebühren"
 
-#: public/js/utils/serial_no_batch_selector.js:332
+#: public/js/utils/serial_no_batch_selector.js:338
 msgid "Fetch Based On"
 msgstr "Abrufen basierend auf"
 
@@ -27612,7 +28022,7 @@
 msgid "Fetch Customers"
 msgstr "Kunden holen"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:50
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:56
 msgid "Fetch Data"
 msgstr "Daten abrufen"
 
@@ -27620,7 +28030,7 @@
 msgid "Fetch Items from Warehouse"
 msgstr "Abrufen von Artikeln aus dem Lager"
 
-#: accounts/doctype/dunning/dunning.js:60
+#: accounts/doctype/dunning/dunning.js:61
 msgid "Fetch Overdue Payments"
 msgstr "Überfällige Zahlungen abrufen"
 
@@ -27628,8 +28038,8 @@
 msgid "Fetch Subscription Updates"
 msgstr "Abruf von Abonnement-Updates"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:952
-#: accounts/doctype/sales_invoice/sales_invoice.js:954
+#: accounts/doctype/sales_invoice/sales_invoice.js:1028
+#: accounts/doctype/sales_invoice/sales_invoice.js:1030
 msgid "Fetch Timesheet"
 msgstr "Zeiterfassung laden"
 
@@ -27639,8 +28049,8 @@
 msgid "Fetch Value From"
 msgstr "Wert abrufen von"
 
-#: stock/doctype/material_request/material_request.js:252
-#: stock/doctype/stock_entry/stock_entry.js:554
+#: stock/doctype/material_request/material_request.js:318
+#: stock/doctype/stock_entry/stock_entry.js:640
 msgid "Fetch exploded BOM (including sub-assemblies)"
 msgstr "Abruf der aufgelösten Stückliste (einschließlich der Unterbaugruppen)"
 
@@ -27651,11 +28061,20 @@
 msgid "Fetch items based on Default Supplier."
 msgstr "Abrufen von Elementen basierend auf dem Standardlieferanten."
 
-#: accounts/doctype/dunning/dunning.js:131
-#: public/js/controllers/transaction.js:1083
+#: accounts/doctype/dunning/dunning.js:135
+#: public/js/controllers/transaction.js:1138
 msgid "Fetching exchange rates ..."
 msgstr "Wechselkurse werden abgerufen ..."
 
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:72
+msgid "Fetching..."
+msgstr ""
+
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:106
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Field"
+msgstr "Feld"
+
 #. Label of a Select field in DocType 'POS Search Fields'
 #: accounts/doctype/pos_search_fields/pos_search_fields.json
 msgctxt "POS Search Fields"
@@ -27729,8 +28148,8 @@
 msgid "File to Rename"
 msgstr "Datei, die umbenannt werden soll"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:17
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:17
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:16
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:16
 #: public/js/financial_statements.js:167
 msgid "Filter Based On"
 msgstr "Filter basierend auf"
@@ -27741,7 +28160,7 @@
 msgid "Filter Duration (Months)"
 msgstr "Filterdauer (Monate)"
 
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:46
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:45
 msgid "Filter Total Zero Qty"
 msgstr "Gesamtmenge filtern"
 
@@ -27767,8 +28186,8 @@
 msgid "Filter on Payment"
 msgstr "Nach Zahlung filtern"
 
-#: accounts/doctype/payment_entry/payment_entry.js:696
-#: public/js/bank_reconciliation_tool/dialog_manager.js:192
+#: accounts/doctype/payment_entry/payment_entry.js:858
+#: public/js/bank_reconciliation_tool/dialog_manager.js:196
 msgid "Filters"
 msgstr "Filter"
 
@@ -27827,13 +28246,13 @@
 #: accounts/report/accounts_receivable/accounts_receivable.js:24
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:56
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:48
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:32
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:52
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:104
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:31
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:51
 #: accounts/report/general_ledger/general_ledger.js:16
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:32
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:31
 #: accounts/report/trial_balance/trial_balance.js:70
-#: assets/report/fixed_asset_register/fixed_asset_register.js:49
+#: assets/report/fixed_asset_register/fixed_asset_register.js:48
 #: public/js/financial_statements.js:161
 msgid "Finance Book"
 msgstr "Finanzbuch"
@@ -27959,14 +28378,14 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Financial Reports Workspace
-#: accounts/doctype/account/account_tree.js:158
+#: accounts/doctype/account/account_tree.js:234
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/workspace/financial_reports/financial_reports.json
 #: public/js/financial_statements.js:129
 msgid "Financial Statements"
 msgstr "Finanzberichte"
 
-#: public/js/setup_wizard.js:40
+#: public/js/setup_wizard.js:42
 msgid "Financial Year Begins On"
 msgstr "Das Geschäftsjahr beginnt am"
 
@@ -27977,13 +28396,13 @@
 msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) "
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:627
-#: manufacturing/doctype/work_order/work_order.js:642
-#: manufacturing/doctype/work_order/work_order.js:651
+#: manufacturing/doctype/work_order/work_order.js:675
+#: manufacturing/doctype/work_order/work_order.js:690
+#: manufacturing/doctype/work_order/work_order.js:699
 msgid "Finish"
 msgstr "Fertig"
 
-#: buying/doctype/purchase_order/purchase_order.js:176
+#: buying/doctype/purchase_order/purchase_order.js:182
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:43
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:119
 msgid "Finished Good"
@@ -28019,7 +28438,7 @@
 msgid "Finished Good BOM"
 msgstr "Fertigerzeugnis Stückliste"
 
-#: public/js/utils.js:698
+#: public/js/utils.js:768
 msgid "Finished Good Item"
 msgstr "Fertigerzeugnis Artikel"
 
@@ -28033,7 +28452,7 @@
 msgid "Finished Good Item Code"
 msgstr "Fertiger Artikelcode"
 
-#: public/js/utils.js:715
+#: public/js/utils.js:786
 msgid "Finished Good Item Qty"
 msgstr "Fertigerzeugnis Menge"
 
@@ -28043,15 +28462,15 @@
 msgid "Finished Good Item Quantity"
 msgstr "Fertigerzeugnis Menge"
 
-#: controllers/accounts_controller.py:3204
+#: controllers/accounts_controller.py:3295
 msgid "Finished Good Item is not specified for service item {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:3219
+#: controllers/accounts_controller.py:3310
 msgid "Finished Good Item {0} Qty can not be zero"
 msgstr "Menge für Fertigerzeugnis {0} kann nicht Null sein"
 
-#: controllers/accounts_controller.py:3213
+#: controllers/accounts_controller.py:3304
 msgid "Finished Good Item {0} must be a sub-contracted item"
 msgstr "Fertigerzeugnis {0} muss ein untervergebener Artikel sein"
 
@@ -28095,15 +28514,15 @@
 msgid "Finished Good {0} must be a sub-contracted item."
 msgstr "Fertigerzeugnis {0} muss ein Artikel sein, der untervergeben wurde."
 
-#: setup/doctype/company/company.py:262
+#: setup/doctype/company/company.py:261
 msgid "Finished Goods"
 msgstr "Fertigerzeugnisse"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:25
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
 msgid "Finished Goods Warehouse"
 msgstr "Fertigwarenlager"
 
-#: stock/doctype/stock_entry/stock_entry.py:1264
+#: stock/doctype/stock_entry/stock_entry.py:1273
 msgid "Finished Item {0} does not match with Work Order {1}"
 msgstr "Fertigerzeugnis {0} stimmt nicht mit dem Arbeitsauftrag {1} überein"
 
@@ -28190,16 +28609,17 @@
 
 #. Name of a DocType
 #: accounts/doctype/fiscal_year/fiscal_year.json
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:17
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:1
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:16
 #: accounts/report/profitability_analysis/profitability_analysis.js:38
 #: accounts/report/trial_balance/trial_balance.js:16
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:16
-#: manufacturing/report/job_card_summary/job_card_summary.js:17
-#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:48
+#: manufacturing/report/job_card_summary/job_card_summary.js:16
+#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:44
 #: regional/report/irs_1099/irs_1099.js:17
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:16
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:16
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:15
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:15
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:15
 msgid "Fiscal Year"
 msgstr "Geschäftsjahr"
 
@@ -28277,7 +28697,7 @@
 msgid "Fixed"
 msgstr "Fest"
 
-#: accounts/report/account_balance/account_balance.js:50
+#: accounts/report/account_balance/account_balance.js:52
 msgid "Fixed Asset"
 msgstr "Anlagevermögen"
 
@@ -28351,11 +28771,23 @@
 msgid "Fleet Manager"
 msgstr "Flottenverwalter"
 
-#: selling/page/point_of_sale/pos_item_selector.js:303
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor"
+msgstr ""
+
+#. Label of a Data field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor Name"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_selector.js:300
 msgid "Focus on Item Group filter"
 msgstr "Fokus auf Artikelgruppenfilter"
 
-#: selling/page/point_of_sale/pos_item_selector.js:294
+#: selling/page/point_of_sale/pos_item_selector.js:291
 msgid "Focus on search input"
 msgstr "Konzentrieren Sie sich auf die Sucheingabe"
 
@@ -28375,15 +28807,15 @@
 msgid "Following Material Requests have been raised automatically based on Item's re-order level"
 msgstr "Folgende Materialanfragen wurden automatisch auf der Grundlage der Nachbestellmenge des Artikels generiert"
 
-#: selling/doctype/customer/customer.py:740
+#: selling/doctype/customer/customer.py:751
 msgid "Following fields are mandatory to create address:"
 msgstr "Folgende Felder müssen ausgefüllt werden, um eine Adresse zu erstellen:"
 
-#: controllers/buying_controller.py:906
+#: controllers/buying_controller.py:932
 msgid "Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr "Das folgende Element {0} ist nicht als Element {1} markiert. Sie können sie als Element {1} in ihrem Artikelstamm aktivieren"
 
-#: controllers/buying_controller.py:902
+#: controllers/buying_controller.py:928
 msgid "Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr "Die folgenden Elemente {0} sind nicht als Element {1} markiert. Sie können sie als Element {1} in ihrem Artikelstamm aktivieren"
 
@@ -28391,7 +28823,7 @@
 msgid "For"
 msgstr "Für"
 
-#: public/js/utils/sales_common.js:274
+#: public/js/utils/sales_common.js:309
 msgid "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table."
 msgstr "Für Artikel aus \"Produkt-Bundles\" werden Lager, Seriennummer und Chargennummer aus der Tabelle \"Packliste\" berücksichtigt. Wenn Lager und Chargennummer für alle Packstücke in jedem Artikel eines Produkt-Bundles gleich sind, können diese Werte in die Tabelle \"Hauptpositionen\" eingetragen werden, Die Werte werden in die Tabelle \"Packliste\" kopiert."
 
@@ -28407,11 +28839,16 @@
 msgid "For Company"
 msgstr "Für Unternehmen"
 
-#: stock/doctype/material_request/material_request.js:293
+#: stock/doctype/material_request/material_request.js:361
 msgid "For Default Supplier (Optional)"
 msgstr "Für Standardlieferanten (optional)"
 
-#: controllers/stock_controller.py:770
+#: manufacturing/doctype/plant_floor/plant_floor.js:159
+#: manufacturing/doctype/plant_floor/plant_floor.js:183
+msgid "For Item"
+msgstr ""
+
+#: controllers/stock_controller.py:953
 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
 msgstr "Für Artikel {0} können nicht mehr als {1} ME gegen {2} {3} in Empfang genommen werden"
 
@@ -28421,7 +28858,7 @@
 msgid "For Job Card"
 msgstr "Für Jobkarte"
 
-#: manufacturing/doctype/job_card/job_card.js:160
+#: manufacturing/doctype/job_card/job_card.js:175
 msgid "For Operation"
 msgstr "Für Vorgang"
 
@@ -28446,23 +28883,28 @@
 msgid "For Production"
 msgstr "Für die Produktion"
 
-#: stock/doctype/stock_entry/stock_entry.py:657
+#: stock/doctype/stock_entry/stock_entry.py:612
 msgid "For Quantity (Manufactured Qty) is mandatory"
 msgstr "Für Menge (hergestellte Menge) ist zwingend erforderlich"
 
+#: controllers/accounts_controller.py:1070
+msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}"
+msgstr ""
+
 #. Label of a Check field in DocType 'Currency Exchange'
 #: setup/doctype/currency_exchange/currency_exchange.json
 msgctxt "Currency Exchange"
 msgid "For Selling"
 msgstr "Für den Verkauf"
 
-#: accounts/doctype/payment_order/payment_order.js:98
+#: accounts/doctype/payment_order/payment_order.js:106
 msgid "For Supplier"
 msgstr "Für Lieferant"
 
-#: manufacturing/doctype/production_plan/production_plan.js:331
-#: selling/doctype/sales_order/sales_order.js:808
-#: stock/doctype/material_request/material_request.js:247
+#: manufacturing/doctype/production_plan/production_plan.js:358
+#: selling/doctype/sales_order/sales_order.js:933
+#: stock/doctype/material_request/material_request.js:310
+#: templates/form_grid/material_request_grid.html:36
 msgid "For Warehouse"
 msgstr "Für Lager"
 
@@ -28472,11 +28914,11 @@
 msgid "For Warehouse"
 msgstr "Für Lager"
 
-#: manufacturing/doctype/work_order/work_order.py:427
+#: manufacturing/doctype/work_order/work_order.py:438
 msgid "For Warehouse is required before Submit"
 msgstr "\"Für Lager\" wird vor dem Buchen benötigt"
 
-#: public/js/utils/serial_no_batch_selector.js:116
+#: public/js/utils/serial_no_batch_selector.js:119
 msgid "For Work Order"
 msgstr "Für Arbeitsauftrag"
 
@@ -28518,15 +28960,15 @@
 msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}"
 msgstr "Für den Artikel {0} muss der Einzelpreis eine positive Zahl sein. Um negative Einzelpreise zuzulassen, aktivieren Sie {1} in {2}"
 
-#: stock/doctype/stock_entry/stock_entry.py:384
+#: stock/doctype/stock_entry/stock_entry.py:339
 msgid "For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry"
 msgstr "Für die Jobkarte {0} können Sie nur die Bestandsbuchung vom Typ &#39;Materialtransfer für Fertigung&#39; vornehmen"
 
-#: manufacturing/doctype/work_order/work_order.py:1523
+#: manufacturing/doctype/work_order/work_order.py:1537
 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
 msgstr "Für den Vorgang {0}: Die Menge ({1}) darf nicht größer sein als die ausstehende Menge ({2})"
 
-#: stock/doctype/stock_entry/stock_entry.py:1302
+#: stock/doctype/stock_entry/stock_entry.py:1311
 msgid "For quantity {0} should not be greater than allowed quantity {1}"
 msgstr ""
 
@@ -28536,12 +28978,12 @@
 msgid "For reference"
 msgstr "Zu Referenzzwecken"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1229
+#: accounts/doctype/payment_entry/payment_entry.js:1477
 #: public/js/controllers/accounts.js:182
 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
 msgstr "Für Zeile {0} in {1}. Um {2} in die Artikel-Bewertung mit einzubeziehen, muss auch Zeile {3} mit enthalten sein"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1498
+#: manufacturing/doctype/production_plan/production_plan.py:1520
 msgid "For row {0}: Enter Planned Qty"
 msgstr "Für Zeile {0}: Geben Sie die geplante Menge ein"
 
@@ -28549,6 +28991,11 @@
 msgid "For the 'Apply Rule On Other' condition the field {0} is mandatory"
 msgstr "Für die Bedingung &#39;Regel auf andere anwenden&#39; ist das Feld {0} obligatorisch"
 
+#. Description of a DocType
+#: stock/doctype/item_customer_detail/item_customer_detail.json
+msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes"
+msgstr ""
+
 #. Label of a shortcut in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "Forecasting"
@@ -28731,7 +29178,7 @@
 msgid "Friday"
 msgstr "Freitag"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:957
+#: accounts/doctype/sales_invoice/sales_invoice.js:1033
 #: templates/pages/projects.html:67
 msgid "From"
 msgstr "Von"
@@ -28783,13 +29230,13 @@
 msgid "From Customer"
 msgstr "Von Kunden"
 
-#: accounts/doctype/payment_entry/payment_entry.js:645
-#: accounts/doctype/payment_entry/payment_entry.js:650
+#: accounts/doctype/payment_entry/payment_entry.js:789
+#: accounts/doctype/payment_entry/payment_entry.js:796
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:16
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:16
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:8
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:16
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:38
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:15
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:37
 #: accounts/report/financial_ratios/financial_ratios.js:41
 #: accounts/report/general_ledger/general_ledger.js:22
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -28797,77 +29244,77 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:8
 #: 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:17
+#: accounts/report/pos_register/pos_register.js:16
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:8
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:16
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:47
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:47
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:15
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:46
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:46
 #: accounts/report/trial_balance/trial_balance.js:37
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:37
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:15
-#: buying/report/procurement_tracker/procurement_tracker.js:28
-#: buying/report/purchase_analytics/purchase_analytics.js:36
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:18
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:18
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:16
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:23
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:23
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:14
+#: buying/report/procurement_tracker/procurement_tracker.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:35
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:17
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:17
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:15
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:22
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:22
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:16
 #: crm/report/campaign_efficiency/campaign_efficiency.js:7
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:9
-#: crm/report/lead_conversion_time/lead_conversion_time.js:9
-#: crm/report/lead_details/lead_details.js:17
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:8
+#: crm/report/lead_conversion_time/lead_conversion_time.js:8
+#: crm/report/lead_details/lead_details.js:16
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:7
-#: crm/report/lost_opportunity/lost_opportunity.js:17
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:23
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:16
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:16
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:17
-#: manufacturing/report/process_loss_report/process_loss_report.js:30
-#: manufacturing/report/production_analytics/production_analytics.js:17
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:8
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:16
+#: crm/report/lost_opportunity/lost_opportunity.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:22
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:15
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:15
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:16
+#: manufacturing/report/process_loss_report/process_loss_report.js:29
+#: manufacturing/report/production_analytics/production_analytics.js:16
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:7
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:15
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:8
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:9
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:8
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:28
-#: public/js/stock_analytics.js:47
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:9
-#: regional/report/uae_vat_201/uae_vat_201.js:17
-#: regional/report/vat_audit_report/vat_audit_report.js:17
-#: selling/page/sales_funnel/sales_funnel.js:39
+#: public/js/stock_analytics.js:74
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:8
+#: regional/report/uae_vat_201/uae_vat_201.js:16
+#: regional/report/vat_audit_report/vat_audit_report.js:16
+#: selling/page/sales_funnel/sales_funnel.js:43
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:24
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:18
-#: selling/report/sales_analytics/sales_analytics.js:36
-#: selling/report/sales_order_analysis/sales_order_analysis.js:18
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:22
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:23
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:17
+#: selling/report/sales_analytics/sales_analytics.js:43
+#: selling/report/sales_order_analysis/sales_order_analysis.js:17
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:21
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:21
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:21
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:21
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:8
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:16
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:17
-#: stock/report/delayed_item_report/delayed_item_report.js:17
-#: stock/report/delayed_order_report/delayed_order_report.js:17
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:21
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:31
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:15
+#: stock/report/delayed_item_report/delayed_item_report.js:16
+#: stock/report/delayed_order_report/delayed_order_report.js:16
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:20
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:30
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:8
 #: stock/report/reserved_stock/reserved_stock.js:16
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:16
-#: stock/report/stock_analytics/stock_analytics.js:63
+#: stock/report/stock_analytics/stock_analytics.js:62
 #: stock/report/stock_balance/stock_balance.js:16
 #: stock/report/stock_ledger/stock_ledger.js:16
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:15
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:9
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:9
-#: support/report/issue_analytics/issue_analytics.js:25
-#: support/report/issue_summary/issue_summary.js:25
-#: support/report/support_hour_distribution/support_hour_distribution.js:8
-#: utilities/report/youtube_interactions/youtube_interactions.js:9
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:8
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:8
+#: support/report/issue_analytics/issue_analytics.js:24
+#: support/report/issue_summary/issue_summary.js:24
+#: support/report/support_hour_distribution/support_hour_distribution.js:7
+#: utilities/report/youtube_interactions/youtube_interactions.js:8
 msgid "From Date"
 msgstr "Von-Datum"
 
@@ -28973,7 +29420,7 @@
 msgid "From Date"
 msgstr "Von-Datum"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:41
+#: accounts/doctype/bank_clearance/bank_clearance.py:43
 msgid "From Date and To Date are Mandatory"
 msgstr "Von Datum und Bis Datum sind obligatorisch"
 
@@ -29019,7 +29466,7 @@
 msgid "From Delivery Date"
 msgstr "Ab Lieferdatum"
 
-#: selling/doctype/installation_note/installation_note.js:58
+#: selling/doctype/installation_note/installation_note.js:59
 msgid "From Delivery Note"
 msgstr "Von Lieferschein"
 
@@ -29029,7 +29476,7 @@
 msgid "From Doctype"
 msgstr "Von DocType"
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:80
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:78
 msgid "From Due Date"
 msgstr "Ab Fälligkeitsdatum"
 
@@ -29039,7 +29486,7 @@
 msgid "From Employee"
 msgstr "Von Mitarbeiter"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:45
+#: accounts/report/budget_variance_report/budget_variance_report.js:43
 msgid "From Fiscal Year"
 msgstr "Ab dem Geschäftsjahr"
 
@@ -29103,8 +29550,8 @@
 msgid "From Payment Date"
 msgstr "Ab Zahlungsdatum"
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:37
-#: manufacturing/report/work_order_summary/work_order_summary.js:23
+#: manufacturing/report/job_card_summary/job_card_summary.js:36
+#: manufacturing/report/work_order_summary/work_order_summary.js:22
 msgid "From Posting Date"
 msgstr "Ab dem Buchungsdatum"
 
@@ -29150,6 +29597,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:91
 #: manufacturing/report/job_card_summary/job_card_summary.py:179
+#: templates/pages/timelog_info.html:31
 msgid "From Time"
 msgstr "Von-Zeit"
 
@@ -29235,7 +29683,7 @@
 msgid "From Voucher Detail No"
 msgstr "Von Beleg-Position"
 
-#: stock/report/reserved_stock/reserved_stock.js:106
+#: stock/report/reserved_stock/reserved_stock.js:103
 #: stock/report/reserved_stock/reserved_stock.py:164
 msgid "From Voucher No"
 msgstr "Von Beleg-Nr."
@@ -29246,7 +29694,7 @@
 msgid "From Voucher No"
 msgstr "Von Beleg-Nr."
 
-#: stock/report/reserved_stock/reserved_stock.js:95
+#: stock/report/reserved_stock/reserved_stock.js:92
 #: stock/report/reserved_stock/reserved_stock.py:158
 msgid "From Voucher Type"
 msgstr "Von Beleg-Typ"
@@ -29297,7 +29745,7 @@
 msgid "From and To dates are required"
 msgstr "Von- und Bis-Daten sind erforderlich"
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:47
+#: manufacturing/doctype/blanket_order/blanket_order.py:48
 msgid "From date cannot be greater than To date"
 msgstr "Das Ab-Datum kann nicht größer als das Bis-Datum sein"
 
@@ -29485,30 +29933,33 @@
 msgid "Furniture and Fixtures"
 msgstr "Betriebs- und Geschäftsausstattung"
 
-#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/account/account_tree.js:138
 msgid "Further accounts can be made under Groups, but entries can be made against non-Groups"
 msgstr "Weitere Konten können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:24
+#: accounts/doctype/cost_center/cost_center_tree.js:31
 msgid "Further cost centers can be made under Groups but entries can be made against non-Groups"
 msgstr "Weitere Kostenstellen können unter Gruppen angelegt werden, aber Buchungen können zu nicht-Gruppen erstellt werden"
 
-#: setup/doctype/sales_person/sales_person_tree.js:10
+#: setup/doctype/sales_person/sales_person_tree.js:15
 msgid "Further nodes can be only created under 'Group' type nodes"
 msgstr "Weitere Knoten können nur unter Knoten vom Typ \"Gruppe\" erstellt werden"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:185
-#: accounts/report/accounts_receivable/accounts_receivable.py:1084
+#: 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
 msgid "Future Payment Amount"
 msgstr "Zukünftiger Zahlungsbetrag"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:184
-#: accounts/report/accounts_receivable/accounts_receivable.py:1083
+#: accounts/report/accounts_receivable/accounts_receivable.html:154
+#: accounts/report/accounts_receivable/accounts_receivable.py:1091
 msgid "Future Payment Ref"
 msgstr "Zukünftige Zahlung"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:120
+#: accounts/report/accounts_receivable/accounts_receivable.html:102
 msgid "Future Payments"
 msgstr "Zukünftige Zahlungen"
 
@@ -29524,7 +29975,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/gl_entry/gl_entry.json
-#: accounts/report/general_ledger/general_ledger.py:557
+#: accounts/report/general_ledger/general_ledger.py:570
 msgid "GL Entry"
 msgstr "Buchung zum Hauptbuch"
 
@@ -29585,11 +30036,11 @@
 
 #: 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:525
+#: setup/doctype/company/company.py:524
 msgid "Gain/Loss on Asset Disposal"
 msgstr "Gewinn / Verlust aus der Veräußerung von Vermögenswerten"
 
-#: projects/doctype/project/project.js:79
+#: projects/doctype/project/project.js:93
 msgid "Gantt Chart"
 msgstr "Gantt-Diagramm"
 
@@ -29625,7 +30076,7 @@
 #. Name of a report
 #. Label of a shortcut in the Accounting Workspace
 #. Label of a Link in the Financial Reports Workspace
-#: accounts/doctype/account/account.js:95
+#: accounts/doctype/account/account.js:93
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/report/general_ledger/general_ledger.json
 #: accounts/workspace/accounting/accounting.json
@@ -29646,7 +30097,7 @@
 msgid "General Ledger"
 msgstr "Hauptbuch"
 
-#: stock/doctype/warehouse/warehouse.js:74
+#: stock/doctype/warehouse/warehouse.js:68
 msgctxt "Warehouse"
 msgid "General Ledger"
 msgstr "Hauptbuch"
@@ -29666,7 +30117,7 @@
 msgid "Generate Closing Stock Balance"
 msgstr ""
 
-#: public/js/setup_wizard.js:46
+#: public/js/setup_wizard.js:48
 msgid "Generate Demo Data for Exploration"
 msgstr "Demo-Daten für die Erkundung generieren"
 
@@ -29692,6 +30143,11 @@
 msgid "Generate Schedule"
 msgstr "Zeitplan generieren"
 
+#. Description of a DocType
+#: stock/doctype/packing_slip/packing_slip.json
+msgid "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight."
+msgstr ""
+
 #. Label of a Check field in DocType 'Bisect Nodes'
 #: accounts/doctype/bisect_nodes/bisect_nodes.json
 msgctxt "Bisect Nodes"
@@ -29738,7 +30194,7 @@
 msgid "Get Current Stock"
 msgstr "Aktuellen Lagerbestand aufrufen"
 
-#: selling/doctype/customer/customer.js:168
+#: selling/doctype/customer/customer.js:180
 msgid "Get Customer Group Details"
 msgstr "Einstellungen aus Kundengruppe übernehmen"
 
@@ -29754,12 +30210,12 @@
 msgid "Get Finished Goods for Manufacture"
 msgstr "Fertigwaren zur Herstellung abrufen"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:55
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:157
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:57
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:159
 msgid "Get Invoices"
 msgstr "Rechnungen abrufen"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:102
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:104
 msgid "Get Invoices based on Filters"
 msgstr "Abrufen von Rechnungen basierend auf Filtern"
 
@@ -29769,11 +30225,11 @@
 msgid "Get Item Locations"
 msgstr "Artikelstandorte abrufen"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:351
-#: manufacturing/doctype/production_plan/production_plan.js:342
-#: stock/doctype/pick_list/pick_list.js:161
-#: stock/doctype/pick_list/pick_list.js:202
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: buying/doctype/request_for_quotation/request_for_quotation.js:377
+#: manufacturing/doctype/production_plan/production_plan.js:369
+#: stock/doctype/pick_list/pick_list.js:193
+#: stock/doctype/pick_list/pick_list.js:236
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:163
 msgid "Get Items"
 msgstr "Artikel aufrufen"
 
@@ -29783,37 +30239,37 @@
 msgid "Get Items"
 msgstr "Artikel aufrufen"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:147
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:165
-#: accounts/doctype/sales_invoice/sales_invoice.js:252
-#: accounts/doctype/sales_invoice/sales_invoice.js:276
-#: accounts/doctype/sales_invoice/sales_invoice.js:304
-#: buying/doctype/purchase_order/purchase_order.js:456
-#: buying/doctype/purchase_order/purchase_order.js:473
-#: buying/doctype/request_for_quotation/request_for_quotation.js:315
-#: buying/doctype/request_for_quotation/request_for_quotation.js:334
-#: buying/doctype/request_for_quotation/request_for_quotation.js:375
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:195
+#: 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/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
 #: buying/doctype/supplier_quotation/supplier_quotation.js:49
-#: buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:78
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:96
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:112
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:132
-#: public/js/controllers/buying.js:267
-#: selling/doctype/quotation/quotation.js:160
-#: selling/doctype/sales_order/sales_order.js:132
-#: selling/doctype/sales_order/sales_order.js:643
-#: stock/doctype/delivery_note/delivery_note.js:160
-#: stock/doctype/material_request/material_request.js:100
-#: stock/doctype/material_request/material_request.js:162
-#: stock/doctype/purchase_receipt/purchase_receipt.js:130
-#: stock/doctype/purchase_receipt/purchase_receipt.js:217
-#: stock/doctype/stock_entry/stock_entry.js:275
-#: stock/doctype/stock_entry/stock_entry.js:312
-#: stock/doctype/stock_entry/stock_entry.js:336
-#: stock/doctype/stock_entry/stock_entry.js:387
-#: stock/doctype/stock_entry/stock_entry.js:535
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
+#: buying/doctype/supplier_quotation/supplier_quotation.js:82
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:80
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:100
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:119
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:142
+#: public/js/controllers/buying.js:262
+#: selling/doctype/quotation/quotation.js:167
+#: selling/doctype/sales_order/sales_order.js:158
+#: selling/doctype/sales_order/sales_order.js:743
+#: stock/doctype/delivery_note/delivery_note.js:173
+#: stock/doctype/material_request/material_request.js:101
+#: stock/doctype/material_request/material_request.js:192
+#: stock/doctype/purchase_receipt/purchase_receipt.js:145
+#: stock/doctype/purchase_receipt/purchase_receipt.js:249
+#: 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:119
 msgid "Get Items From"
 msgstr "Holen Sie Elemente aus"
 
@@ -29829,13 +30285,13 @@
 msgid "Get Items From Purchase Receipts"
 msgstr "Artikel vom Eingangsbeleg übernehmen"
 
-#: stock/doctype/material_request/material_request.js:241
-#: stock/doctype/stock_entry/stock_entry.js:555
-#: stock/doctype/stock_entry/stock_entry.js:568
+#: stock/doctype/material_request/material_request.js:295
+#: stock/doctype/stock_entry/stock_entry.js:643
+#: stock/doctype/stock_entry/stock_entry.js:656
 msgid "Get Items from BOM"
 msgstr "Artikel aus der Stückliste holen"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:348
+#: buying/doctype/request_for_quotation/request_for_quotation.js:374
 msgid "Get Items from Material Requests against this Supplier"
 msgstr "Erhalten Sie Artikel aus Materialanfragen gegen diesen Lieferanten"
 
@@ -29845,7 +30301,7 @@
 msgid "Get Items from Open Material Requests"
 msgstr "Hole Artikel von offenen Material  Anfragen"
 
-#: public/js/controllers/buying.js:507
+#: public/js/controllers/buying.js:504
 msgid "Get Items from Product Bundle"
 msgstr "Artikel aus dem Produkt-Bundle übernehmen"
 
@@ -29879,18 +30335,24 @@
 msgid "Get Outstanding Orders"
 msgstr "Ausstehende Bestellungen abrufen"
 
+#: accounts/doctype/bank_clearance/bank_clearance.js:38
 #: accounts/doctype/bank_clearance/bank_clearance.js:40
-#: accounts/doctype/bank_clearance/bank_clearance.js:44
-#: accounts/doctype/bank_clearance/bank_clearance.js:56
-#: accounts/doctype/bank_clearance/bank_clearance.js:75
+#: accounts/doctype/bank_clearance/bank_clearance.js:52
+#: accounts/doctype/bank_clearance/bank_clearance.js:71
 msgid "Get Payment Entries"
 msgstr "Get Payment-Einträge"
 
-#: accounts/doctype/payment_order/payment_order.js:20
-#: accounts/doctype/payment_order/payment_order.js:24
+#: accounts/doctype/payment_order/payment_order.js:23
+#: accounts/doctype/payment_order/payment_order.js:31
 msgid "Get Payments from"
 msgstr "Zahlungen erhalten von"
 
+#. Label of a Check field in DocType 'Manufacturing Settings'
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+msgctxt "Manufacturing Settings"
+msgid "Get Raw Materials Cost from Consumption Entry"
+msgstr ""
+
 #. Label of a Button field in DocType 'Production Plan'
 #: manufacturing/doctype/production_plan/production_plan.json
 msgctxt "Production Plan"
@@ -29921,7 +30383,7 @@
 msgid "Get Started Sections"
 msgstr "Erste Schritte Abschnitte"
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:432
 msgid "Get Stock"
 msgstr "Lagerbestand abrufen"
 
@@ -29931,29 +30393,29 @@
 msgid "Get Sub Assembly Items"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:102
+#: buying/doctype/supplier/supplier.js:124
 msgid "Get Supplier Group Details"
 msgstr "Werte aus Lieferantengruppe übernehmen"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:384
-#: buying/doctype/request_for_quotation/request_for_quotation.js:402
+#: buying/doctype/request_for_quotation/request_for_quotation.js:416
+#: buying/doctype/request_for_quotation/request_for_quotation.js:436
 msgid "Get Suppliers"
 msgstr "Holen Sie sich Lieferanten"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:405
+#: buying/doctype/request_for_quotation/request_for_quotation.js:440
 msgid "Get Suppliers By"
 msgstr "Holen Sie sich Lieferanten durch"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:989
+#: accounts/doctype/sales_invoice/sales_invoice.js:1065
 msgid "Get Timesheets"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:81
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:84
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:77
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:80
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:87
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:94
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:75
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:81
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:91
 msgid "Get Unreconciled Entries"
 msgstr "Nicht zugeordnete Buchungen aufrufen"
 
@@ -29961,11 +30423,11 @@
 msgid "Get Updates"
 msgstr "Newsletter abonnieren"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:65
+#: stock/doctype/delivery_trip/delivery_trip.js:68
 msgid "Get stops from"
 msgstr "Stationen abrufen von"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:125
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:149
 msgid "Getting Scrap Items"
 msgstr ""
 
@@ -29982,6 +30444,13 @@
 msgid "Give free item for every N quantity"
 msgstr ""
 
+#. Description of the 'Recurse Every (As Per Transaction UOM)' (Float) field in
+#. DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Give free item for every N quantity"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/global_defaults/global_defaults.json
 msgid "Global Defaults"
@@ -29998,7 +30467,7 @@
 msgid "Go back"
 msgstr "Zurück"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:113
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:97
 msgid "Go to {0} List"
 msgstr "Gehen Sie zur Liste {0}"
 
@@ -30037,16 +30506,16 @@
 msgid "Goods"
 msgstr "Waren"
 
-#: setup/doctype/company/company.py:263
-#: stock/doctype/stock_entry/stock_entry_list.js:14
+#: setup/doctype/company/company.py:262
+#: stock/doctype/stock_entry/stock_entry_list.js:21
 msgid "Goods In Transit"
 msgstr "Waren im Transit"
 
-#: stock/doctype/stock_entry/stock_entry_list.js:17
+#: stock/doctype/stock_entry/stock_entry_list.js:23
 msgid "Goods Transferred"
 msgstr "Übergebene Ware"
 
-#: stock/doctype/stock_entry/stock_entry.py:1618
+#: stock/doctype/stock_entry/stock_entry.py:1627
 msgid "Goods are already received against the outward entry {0}"
 msgstr "Waren sind bereits gegen die Ausreise eingegangen {0}"
 
@@ -30070,7 +30539,12 @@
 #: accounts/report/pos_register/pos_register.py:207
 #: 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:253
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:251
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:154
+#: selling/page/point_of_sale/pos_payment.js:590
 #: templates/includes/order/order_taxes.html:105 templates/pages/rfq.html:58
 msgid "Grand Total"
 msgstr "Gesamtbetrag"
@@ -30292,7 +30766,7 @@
 msgid "Grant Commission"
 msgstr "Provision gewähren"
 
-#: accounts/doctype/payment_entry/payment_entry.js:654
+#: accounts/doctype/payment_entry/payment_entry.js:802
 msgid "Greater Than Amount"
 msgstr "Größer als Menge"
 
@@ -30318,13 +30792,13 @@
 #: telephony/doctype/incoming_call_settings/incoming_call_settings.json
 msgctxt "Incoming Call Settings"
 msgid "Greeting Message"
-msgstr ""
+msgstr "Grußnachricht"
 
 #. Label of a Data field in DocType 'Voice Call Settings'
 #: telephony/doctype/voice_call_settings/voice_call_settings.json
 msgctxt "Voice Call Settings"
 msgid "Greeting Message"
-msgstr ""
+msgstr "Grußnachricht"
 
 #. Label of a Data field in DocType 'Support Settings'
 #: support/doctype/support_settings/support_settings.json
@@ -30401,11 +30875,11 @@
 msgid "Gross Purchase Amount"
 msgstr "Bruttokaufbetrag"
 
-#: assets/doctype/asset/asset.py:317
+#: assets/doctype/asset/asset.py:319
 msgid "Gross Purchase Amount is mandatory"
 msgstr "Bruttokaufbetrag ist erforderlich"
 
-#: assets/doctype/asset/asset.py:362
+#: assets/doctype/asset/asset.py:364
 msgid "Gross Purchase Amount should be <b>equal</b> to purchase amount of one single Asset."
 msgstr ""
 
@@ -30434,11 +30908,11 @@
 #: accounts/report/gross_profit/gross_profit.js:36
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:52
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:58
-#: assets/report/fixed_asset_register/fixed_asset_register.js:36
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
+#: assets/report/fixed_asset_register/fixed_asset_register.js:35
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:41
 #: public/js/purchase_trends_filters.js:61 public/js/sales_trends_filters.js:37
 #: selling/report/lost_quotations/lost_quotations.js:33
-#: stock/report/total_stock_summary/total_stock_summary.js:9
+#: stock/report/total_stock_summary/total_stock_summary.js:8
 msgid "Group By"
 msgstr "Gruppiere nach"
 
@@ -30448,15 +30922,15 @@
 msgid "Group By"
 msgstr "Gruppiere nach"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:151
+#: accounts/report/accounts_receivable/accounts_receivable.js:154
 msgid "Group By Customer"
 msgstr "Nach Kunden gruppieren"
 
-#: accounts/report/accounts_payable/accounts_payable.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:132
 msgid "Group By Supplier"
 msgstr "Nach Lieferanten gruppieren"
 
-#: setup/doctype/sales_person/sales_person_tree.js:9
+#: setup/doctype/sales_person/sales_person_tree.js:14
 msgid "Group Node"
 msgstr "Gruppen-Knoten"
 
@@ -30466,12 +30940,12 @@
 msgid "Group Same Items"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:112
+#: stock/doctype/stock_settings/stock_settings.py:115
 msgid "Group Warehouses cannot be used in transactions. Please change the value of {0}"
 msgstr "Group Warehouses können nicht für Transaktionen verwendet werden. Bitte ändern Sie den Wert von {0}"
 
 #: accounts/report/general_ledger/general_ledger.js:115
-#: accounts/report/pos_register/pos_register.js:57
+#: accounts/report/pos_register/pos_register.js:56
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:78
 msgid "Group by"
 msgstr "Gruppieren nach"
@@ -30480,34 +30954,34 @@
 msgid "Group by Account"
 msgstr "Gruppieren nach Konto"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:82
 msgid "Group by Item"
 msgstr "Nach Artikel gruppieren"
 
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:62
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:61
 msgid "Group by Material Request"
 msgstr "Nach Materialanforderung gruppieren"
 
 #: accounts/report/general_ledger/general_ledger.js:132
-#: accounts/report/payment_ledger/payment_ledger.js:83
+#: accounts/report/payment_ledger/payment_ledger.js:82
 msgid "Group by Party"
 msgstr "Gruppieren nach Partei"
 
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:71
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:70
 msgid "Group by Purchase Order"
 msgstr "Nach Bestellung gruppieren"
 
-#: selling/report/sales_order_analysis/sales_order_analysis.js:73
+#: selling/report/sales_order_analysis/sales_order_analysis.js:72
 msgid "Group by Sales Order"
 msgstr "Nach Auftrag gruppieren"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:81
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:84
 msgid "Group by Supplier"
 msgstr "Nach Lieferanten gruppieren"
 
-#: accounts/report/accounts_payable/accounts_payable.js:159
-#: accounts/report/accounts_receivable/accounts_receivable.js:191
+#: accounts/report/accounts_payable/accounts_payable.js:162
+#: accounts/report/accounts_receivable/accounts_receivable.js:194
 #: accounts/report/general_ledger/general_ledger.js:120
 msgid "Group by Voucher"
 msgstr "Gruppieren nach Beleg"
@@ -30530,7 +31004,7 @@
 msgid "Group by Voucher (Consolidated)"
 msgstr "Gruppieren nach Beleg (konsolidiert)"
 
-#: stock/utils.py:448
+#: stock/utils.py:443
 msgid "Group node warehouse is not allowed to select for transactions"
 msgstr "Gruppenknoten Lager ist nicht für Transaktionen zu wählen erlaubt"
 
@@ -30592,8 +31066,8 @@
 msgid "Groups"
 msgstr "Gruppen"
 
-#: accounts/report/balance_sheet/balance_sheet.js:18
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:18
+#: accounts/report/balance_sheet/balance_sheet.js:14
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
 msgid "Growth View"
 msgstr "Wachstumsansicht"
 
@@ -30639,14 +31113,14 @@
 msgid "Half Yearly"
 msgstr "Halbjährlich"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:66
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:69
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
-#: public/js/financial_statements.js:219
+#: accounts/report/budget_variance_report/budget_variance_report.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
+#: public/js/financial_statements.js:228
 #: public/js/purchase_trends_filters.js:21 public/js/sales_trends_filters.js:13
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
 msgid "Half-Yearly"
 msgstr "Halbjährlich"
 
@@ -30805,6 +31279,11 @@
 msgid "Have Default Naming Series for Batch ID?"
 msgstr ""
 
+#. Description of a DocType
+#: accounts/doctype/account/account.json
+msgid "Heads (or groups) against which Accounting Entries are made and balances are maintained."
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -30829,7 +31308,7 @@
 msgid "Height (cm)"
 msgstr "Höhe (cm)"
 
-#: assets/doctype/asset/depreciation.py:412
+#: assets/doctype/asset/depreciation.py:410
 msgid "Hello,"
 msgstr "Hallo,"
 
@@ -30863,11 +31342,16 @@
 msgid "Help Text"
 msgstr "Hilfe Text"
 
-#: assets/doctype/asset/depreciation.py:419
+#. Description of a DocType
+#: accounts/doctype/monthly_distribution/monthly_distribution.json
+msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
+msgstr ""
+
+#: assets/doctype/asset/depreciation.py:417
 msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
 msgstr "Hier sind die Fehlerprotokolle für die oben erwähnten fehlgeschlagenen Abschreibungseinträge: {0}"
 
-#: stock/stock_ledger.py:1669
+#: stock/stock_ledger.py:1689
 msgid "Here are the options to proceed:"
 msgstr "Hier sind die Optionen für das weitere Vorgehen:"
 
@@ -30884,15 +31368,15 @@
 msgid "Here you can maintain height, weight, allergies, medical concerns etc"
 msgstr "Hier können Sie Größe, Gewicht, Allergien, medizinische Belange usw. pflegen"
 
-#: setup/doctype/employee/employee.js:122
+#: setup/doctype/employee/employee.js:129
 msgid "Here, you can select a senior of this Employee. Based on this, Organization Chart will be populated."
 msgstr "Hier können Sie einen Vorgesetzten dieses Mitarbeiters auswählen. Auf dieser Grundlage wird das Organigramm erstellt."
 
-#: setup/doctype/holiday_list/holiday_list.js:75
+#: setup/doctype/holiday_list/holiday_list.js:77
 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 "Hier werden Ihre wöchentlichen freien Tage auf der Grundlage der zuvor getroffenen Auswahlen vorausgefüllt. Sie können weitere Zeilen hinzufügen, um auch gesetzliche und nationale Feiertage individuell hinzuzufügen."
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:391
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:406
 msgid "Hi,"
 msgstr "Hallo,"
 
@@ -30954,12 +31438,12 @@
 msgid "History In Company"
 msgstr "Historie im Unternehmen"
 
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: selling/doctype/sales_order/sales_order.js:539
+#: buying/doctype/purchase_order/purchase_order.js:315
+#: selling/doctype/sales_order/sales_order.js:582
 msgid "Hold"
 msgstr "Anhalten"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
 msgid "Hold Invoice"
 msgstr "Rechnung zurückhalten"
 
@@ -31065,6 +31549,13 @@
 msgstr "Stündlich"
 
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:31
+#: templates/pages/timelog_info.html:37
+msgid "Hours"
+msgstr "Std"
+
+#. Label of a Float field in DocType 'Workstation Working Hour'
+#: manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
+msgctxt "Workstation Working Hour"
 msgid "Hours"
 msgstr "Std"
 
@@ -31103,7 +31594,7 @@
 msgid "Hrs"
 msgstr "Std"
 
-#: setup/doctype/company/company.py:365
+#: setup/doctype/company/company.py:364
 msgid "Human Resources"
 msgstr "Personalwesen"
 
@@ -31141,8 +31632,8 @@
 msgid "IBAN"
 msgstr "IBAN"
 
-#: accounts/doctype/bank_account/bank_account.py:84
-#: accounts/doctype/bank_account/bank_account.py:87
+#: accounts/doctype/bank_account/bank_account.py:98
+#: accounts/doctype/bank_account/bank_account.py:101
 msgid "IBAN is not valid"
 msgstr "IBAN ist ungültig"
 
@@ -31217,6 +31708,12 @@
 msgid "Identifying Decision Makers"
 msgstr "Entscheidungsträger identifizieren"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Idle"
+msgstr ""
+
 #. Description of the 'Book Deferred Entries Based On' (Select) field in
 #. DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31224,6 +31721,10 @@
 msgid "If \"Months\" is selected, a fixed amount will be booked as deferred revenue or expense for each month irrespective of the number of days in a month. It will be prorated if deferred revenue or expense is not booked for an entire month"
 msgstr "Wenn &quot;Monate&quot; ausgewählt ist, wird ein fester Betrag als abgegrenzte Einnahmen oder Ausgaben für jeden Monat gebucht, unabhängig von der Anzahl der Tage in einem Monat. Es wird anteilig berechnet, wenn abgegrenzte Einnahmen oder Ausgaben nicht für einen ganzen Monat gebucht werden"
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)"
+msgstr ""
+
 #. Description of the 'Cost Center' (Link) field in DocType 'Journal Entry
 #. Account'
 #: accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -31231,7 +31732,7 @@
 msgid "If Income or Expense"
 msgstr "Wenn Ertrag oder Aufwand"
 
-#: manufacturing/doctype/operation/operation.js:30
+#: manufacturing/doctype/operation/operation.js:32
 msgid "If an operation is divided into sub operations, they can be added here."
 msgstr "Wenn ein Vorgang in Untervorgänge unterteilt ist, können diese hier hinzugefügt werden."
 
@@ -31288,7 +31789,7 @@
 msgid "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 msgstr "Falls aktiviert, wird der Steuerbetrag als im Einzelpreis enthalten betrachtet"
 
-#: public/js/setup_wizard.js:48
+#: public/js/setup_wizard.js:50
 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later."
 msgstr "Falls aktiviert, werden Demodaten erstellt, damit Sie das System erkunden können. Diese Demodaten können später wieder gelöscht werden."
 
@@ -31334,6 +31835,14 @@
 msgid "If enabled, all files attached to this document will be attached to each email"
 msgstr "Falls aktiviert, werden alle Dateien, die an dieses Dokument angehängt sind, an jede E-Mail angehängt"
 
+#. Description of the 'Do Not Update Serial / Batch on Creation of Auto Bundle'
+#. (Check) field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "If enabled, do not update serial / batch values in the stock transactions on creation of auto Serial \n"
+" / Batch Bundle. "
+msgstr ""
+
 #. Description of the 'Create Ledger Entries for Change Amount' (Check) field
 #. in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31374,7 +31883,7 @@
 msgid "If more than one package of the same type (for print)"
 msgstr "Wenn es mehr als ein Paket von der gleichen Art (für den Druck) gibt"
 
-#: stock/stock_ledger.py:1679
+#: stock/stock_ledger.py:1699
 msgid "If not, you can Cancel / Submit this entry"
 msgstr "Wenn nicht, können Sie diesen Eintrag stornieren / buchen"
 
@@ -31392,7 +31901,7 @@
 msgid "If subcontracted to a vendor"
 msgstr "Wenn an einen Zulieferer untervergeben"
 
-#: manufacturing/doctype/work_order/work_order.js:842
+#: manufacturing/doctype/work_order/work_order.js:911
 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."
 msgstr "Wenn die Stückliste Schrottmaterial ergibt, muss ein Schrottlager ausgewählt werden."
 
@@ -31402,11 +31911,11 @@
 msgid "If the account is frozen, entries are allowed to restricted users."
 msgstr "Wenn das Konto gesperrt ist, sind einem eingeschränkten Benutzerkreis Buchungen erlaubt."
 
-#: stock/stock_ledger.py:1672
+#: stock/stock_ledger.py:1692
 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 "Wenn der Artikel in diesem Eintrag als Artikel mit der Bewertung Null bewertet wird, aktivieren Sie in der Tabelle {0} Artikel die Option &#39;Nullbewertung zulassen&#39;."
 
-#: manufacturing/doctype/work_order/work_order.js:857
+#: manufacturing/doctype/work_order/work_order.js:930
 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
 msgstr ""
 
@@ -31452,7 +31961,7 @@
 msgid "If this is unchecked, direct GL entries will be created to book deferred revenue or expense"
 msgstr "Falls deaktiviert, werden direkte Hauptbucheinträge erstellt, um abgegrenzte Einnahmen oder Ausgaben zu buchen"
 
-#: accounts/doctype/payment_entry/payment_entry.py:638
+#: accounts/doctype/payment_entry/payment_entry.py:647
 msgid "If this is undesirable please cancel the corresponding Payment Entry."
 msgstr "Falls dies nicht erwünscht ist, stornieren Sie bitte die entsprechende Zahlung."
 
@@ -31462,23 +31971,34 @@
 msgid "If this item has variants, then it cannot be selected in sales orders etc."
 msgstr "Wenn dieser Artikel Varianten hat, dann kann er bei den Aufträgen, etc. nicht ausgewählt werden"
 
-#: buying/doctype/buying_settings/buying_settings.js:24
+#: buying/doctype/buying_settings/buying_settings.js:27
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master."
 msgstr "Wenn diese Option auf 'Ja' gesetzt ist, validiert ERPNext, dass Sie eine Bestellung angelegt haben, bevor Sie eine Eingangsrechnung oder einen Eingangsbeleg erfassen können. Diese Konfiguration kann für einzelne Lieferanten überschrieben werden, indem Sie die Option 'Erstellung von Eingangsrechnungen ohne Bestellung zulassen' im Lieferantenstamm aktivieren."
 
-#: buying/doctype/buying_settings/buying_settings.js:29
+#: buying/doctype/buying_settings/buying_settings.js:34
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master."
 msgstr "Wenn diese Option auf 'Ja' gesetzt ist, validiert ERPNext, dass Sie einen Eingangsbeleg angelegt haben, bevor Sie eine Eingangsrechnung erfassen können. Diese Konfiguration kann für einzelne Lieferanten überschrieben werden, indem Sie die Option 'Erstellung von Kaufrechnungen ohne Eingangsbeleg zulassen' im Lieferantenstamm aktivieren."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:11
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
 msgid "If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured."
 msgstr "Wenn dieses Kontrollkästchen aktiviert ist, können mehrere Materialien für einen einzelnen Arbeitsauftrag verwendet werden. Dies ist nützlich, wenn ein oder mehrere zeitaufwändige Produkte hergestellt werden."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:36
 msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
 msgstr "Wenn dieses Kontrollkästchen aktiviert ist, werden die Stücklistenkosten automatisch basierend auf dem Bewertungssatz / Preislistenpreis / der letzten Einkaufsrate der Rohstoffe aktualisiert."
 
-#: stock/doctype/item/item.js:814
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
+msgstr ""
+
+#. Description of the 'Is Rejected Warehouse' (Check) field in DocType
+#. 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "If yes, then this warehouse will be used to store rejected materials"
+msgstr ""
+
+#: stock/doctype/item/item.js:894
 msgid "If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item."
 msgstr ""
 
@@ -31489,7 +32009,11 @@
 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:1605
+#: manufacturing/doctype/production_plan/production_plan.py:920
+msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.py:1625
 msgid "If you still want to proceed, please enable {0}."
 msgstr "Wenn Sie dennoch fortfahren möchten, aktivieren Sie bitte {0}."
 
@@ -31556,17 +32080,21 @@
 msgid "Ignore Empty Stock"
 msgstr "Leeren Bestand ignorieren"
 
+#: accounts/report/general_ledger/general_ledger.js:209
+msgid "Ignore Exchange Rate Revaluation Journals"
+msgstr ""
+
 #. Label of a Check field in DocType 'Process Statement Of Accounts'
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 msgctxt "Process Statement Of Accounts"
 msgid "Ignore Exchange Rate Revaluation Journals"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:800
+#: selling/doctype/sales_order/sales_order.js:916
 msgid "Ignore Existing Ordered Qty"
 msgstr "Existierende bestelle Menge ignorieren"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1597
+#: manufacturing/doctype/production_plan/production_plan.py:1617
 msgid "Ignore Existing Projected Quantity"
 msgstr "Vorhandene projizierte Menge ignorieren"
 
@@ -31630,7 +32158,7 @@
 msgid "Ignore Pricing Rule"
 msgstr "Preisregel ignorieren"
 
-#: selling/page/point_of_sale/pos_payment.js:187
+#: selling/page/point_of_sale/pos_payment.js:188
 msgid "Ignore Pricing Rule is enabled. Cannot apply coupon code."
 msgstr ""
 
@@ -31953,10 +32481,15 @@
 msgid "Image View"
 msgstr "Bildansicht"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:118
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:132
 msgid "Import"
 msgstr "Importieren"
 
+#. Description of a DocType
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json
+msgid "Import Chart of Accounts from a csv file"
+msgstr ""
+
 #. Label of a Link in the Home Workspace
 #. Label of a Link in the Settings Workspace
 #: setup/workspace/home/home.json setup/workspace/settings/settings.json
@@ -31969,7 +32502,7 @@
 msgid "Import Data from Spreadsheet"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:66
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:71
 msgid "Import Day Book Data"
 msgstr "Tagesbuchdaten importieren"
 
@@ -32009,7 +32542,7 @@
 msgid "Import Log Preview"
 msgstr "Protokollvorschau importieren"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:54
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:59
 msgid "Import Master Data"
 msgstr "Stammdaten importieren"
 
@@ -32019,11 +32552,11 @@
 msgid "Import Preview"
 msgstr "Vorschau importieren"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:61
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
 msgid "Import Progress"
 msgstr "Importfortschritt"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:130
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:144
 msgid "Import Successful"
 msgstr "Import erfolgreich"
 
@@ -32044,8 +32577,8 @@
 msgid "Import Type"
 msgstr "Importtyp"
 
-#: public/js/utils/serial_no_batch_selector.js:197
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:77
+#: public/js/utils/serial_no_batch_selector.js:200
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:80
 msgid "Import Using CSV file"
 msgstr "Importieren mit CSV-Datei"
 
@@ -32061,7 +32594,7 @@
 msgid "Import from Google Sheets"
 msgstr "Import aus Google Sheets"
 
-#: stock/doctype/item_price/item_price.js:27
+#: stock/doctype/item_price/item_price.js:29
 msgid "Import in Bulk"
 msgstr "Mengenimport"
 
@@ -32073,7 +32606,7 @@
 msgid "Importing Parties and Addresses"
 msgstr "Parteien und Adressen importieren"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:47
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:45
 msgid "Importing {0} of {1}, {2}"
 msgstr "{0} von {1}, {2} importieren"
 
@@ -32084,7 +32617,7 @@
 msgid "In House"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:20
+#: assets/doctype/asset/asset_list.js:15
 msgid "In Maintenance"
 msgstr "In Wartung"
 
@@ -32112,8 +32645,8 @@
 msgid "In Minutes"
 msgstr "In Minuten"
 
-#: accounts/report/accounts_payable/accounts_payable.js:149
-#: accounts/report/accounts_receivable/accounts_receivable.js:181
+#: accounts/report/accounts_payable/accounts_payable.js:152
+#: accounts/report/accounts_receivable/accounts_receivable.js:184
 msgid "In Party Currency"
 msgstr ""
 
@@ -32160,10 +32693,10 @@
 msgid "In Production"
 msgstr "In Produktion"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:65
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:52
 #: accounts/doctype/ledger_merge/ledger_merge.js:19
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:36
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:60
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:40
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:66
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:7
 msgid "In Progress"
 msgstr "In Bearbeitung"
@@ -32224,11 +32757,17 @@
 msgstr "In Bearbeitung"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:80
-#: stock/report/stock_balance/stock_balance.py:433
-#: stock/report/stock_ledger/stock_ledger.py:139
+#: stock/report/stock_balance/stock_balance.py:441
+#: stock/report/stock_ledger/stock_ledger.py:212
 msgid "In Qty"
 msgstr "In Menge"
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "In Stock"
+msgstr ""
+
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:12
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:22
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:30
 msgid "In Stock Qty"
 msgstr "Anzahl auf Lager"
@@ -32250,15 +32789,15 @@
 msgid "In Transit"
 msgstr "In Lieferung"
 
-#: stock/doctype/material_request/material_request.js:375
+#: stock/doctype/material_request/material_request.js:445
 msgid "In Transit Transfer"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:344
+#: stock/doctype/material_request/material_request.js:414
 msgid "In Transit Warehouse"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:439
+#: stock/report/stock_balance/stock_balance.py:447
 msgid "In Value"
 msgstr "Wert bei"
 
@@ -32443,7 +32982,7 @@
 msgid "In minutes"
 msgstr "In Minuten"
 
-#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:7
+#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:8
 msgid "In row {0} of Appointment Booking Slots: \"To Time\" must be later than \"From Time\"."
 msgstr ""
 
@@ -32458,7 +32997,11 @@
 msgid "In the case of 'Use Multi-Level BOM' in a work order, if the user wishes to add sub-assembly costs to Finished Goods items without using a job card as well the scrap items, then this option needs to be enable."
 msgstr ""
 
-#: stock/doctype/item/item.js:839
+#: accounts/doctype/loyalty_program/loyalty_program.js:12
+msgid "In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent"
+msgstr ""
+
+#: stock/doctype/item/item.js:927
 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc."
 msgstr "In diesem Abschnitt können Sie unternehmensweite transaktionsbezogene Standardwerte für diesen Artikel festlegen. Z. B. Standardlager, Standardpreisliste, Lieferant, etc."
 
@@ -32494,6 +33037,12 @@
 msgid "Inactive Sales Items"
 msgstr "Inaktive Verkaufspositionen"
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Inactive Status"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:93
 msgid "Incentives"
 msgstr "Anreize"
@@ -32504,7 +33053,7 @@
 msgid "Incentives"
 msgstr "Anreize"
 
-#: accounts/report/payment_ledger/payment_ledger.js:77
+#: accounts/report/payment_ledger/payment_ledger.js:76
 msgid "Include Account Currency"
 msgstr "Kontowährung einbeziehen"
 
@@ -32515,27 +33064,27 @@
 msgstr "Zusammenfassung des Alterns einschließen"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:54
-#: assets/report/fixed_asset_register/fixed_asset_register.js:55
+#: assets/report/fixed_asset_register/fixed_asset_register.js:54
 msgid "Include Default FB Assets"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:34
-#: accounts/report/cash_flow/cash_flow.js:20
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:107
+#: accounts/report/balance_sheet/balance_sheet.js:29
+#: 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/trial_balance/trial_balance.js:98
+#: accounts/report/trial_balance/trial_balance.js:104
 msgid "Include Default FB Entries"
 msgstr "Standardbucheinträge einschließen"
 
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:60
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:55
 msgid "Include Disabled"
 msgstr "Deaktivierte einbeziehen"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:85
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:88
 msgid "Include Expired"
 msgstr "Abgelaufen einschließen"
 
-#: selling/doctype/sales_order/sales_order.js:798
+#: selling/doctype/sales_order/sales_order.js:912
 msgid "Include Exploded Items"
 msgstr "Unterartikel einbeziehen"
 
@@ -32605,7 +33154,7 @@
 msgid "Include Non Stock Items"
 msgstr "Nichtlagerpositionen einschließen"
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:44
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:45
 msgid "Include POS Transactions"
 msgstr "POS-Transaktionen einschließen"
 
@@ -32639,7 +33188,7 @@
 msgid "Include Safety Stock in Required Qty Calculation"
 msgstr "Sicherheitsbestand in die Berechnung der benötigten Menge einbeziehen"
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:88
+#: manufacturing/report/production_planning_report/production_planning_report.js:87
 msgid "Include Sub-assembly Raw Materials"
 msgstr "Rohstoffe für Unterbaugruppen einbeziehen"
 
@@ -32649,12 +33198,12 @@
 msgid "Include Subcontracted Items"
 msgstr "Subkontrahierte Artikel einbeziehen"
 
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:57
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
 msgid "Include Timesheets in Draft Status"
 msgstr "Entwürfe einbeziehen"
 
 #: stock/report/stock_balance/stock_balance.js:84
-#: stock/report/stock_ledger/stock_ledger.js:82
+#: stock/report/stock_ledger/stock_ledger.js:90
 #: stock/report/stock_projected_qty/stock_projected_qty.js:51
 msgid "Include UOM"
 msgstr "Fügen Sie UOM hinzu"
@@ -32685,10 +33234,10 @@
 
 #: 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:28
+#: accounts/report/account_balance/account_balance.js:27
 #: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:172
 #: accounts/report/profitability_analysis/profitability_analysis.py:182
-#: public/js/financial_statements.js:35
+#: public/js/financial_statements.js:36
 msgid "Income"
 msgstr "Ertrag"
 
@@ -32711,7 +33260,7 @@
 msgid "Income"
 msgstr "Ertrag"
 
-#: accounts/report/account_balance/account_balance.js:51
+#: 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
 msgid "Income Account"
@@ -32784,7 +33333,7 @@
 msgstr "Einstellungen für eingehende Anrufe"
 
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:163
-#: stock/report/stock_ledger/stock_ledger.py:189
+#: 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
 msgid "Incoming Rate"
@@ -32808,12 +33357,6 @@
 msgid "Incoming Rate"
 msgstr "Eingangsbewertung"
 
-#. Label of a Float field in DocType 'Serial and Batch Entry'
-#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
-msgctxt "Serial and Batch Entry"
-msgid "Incoming Rate"
-msgstr "Eingangsbewertung"
-
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
@@ -32835,16 +33378,16 @@
 msgid "Incorrect Balance Qty After Transaction"
 msgstr "Falsche Saldo-Menge nach Transaktion"
 
-#: controllers/subcontracting_controller.py:710
+#: controllers/subcontracting_controller.py:714
 msgid "Incorrect Batch Consumed"
 msgstr "Falsche Charge verbraucht"
 
-#: assets/doctype/asset/asset.py:278
+#: assets/doctype/asset/asset.py:280
 #: assets/doctype/asset_value_adjustment/asset_value_adjustment.py:74
 msgid "Incorrect Date"
 msgstr "Falsches Datum"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:99
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:120
 msgid "Incorrect Invoice"
 msgstr "Falsche Rechnung"
 
@@ -32857,12 +33400,16 @@
 msgid "Incorrect Payment Type"
 msgstr "Falsche Zahlungsart"
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+msgid "Incorrect Reference Document (Purchase Receipt Item)"
+msgstr ""
+
 #. Name of a report
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.json
 msgid "Incorrect Serial No Valuation"
 msgstr "Falsche Bewertung der Seriennummer"
 
-#: controllers/subcontracting_controller.py:723
+#: controllers/subcontracting_controller.py:727
 msgid "Incorrect Serial Number Consumed"
 msgstr "Falsche Seriennummer verbraucht"
 
@@ -32871,15 +33418,15 @@
 msgid "Incorrect Stock Value Report"
 msgstr ""
 
-#: stock/serial_batch_bundle.py:95
+#: stock/serial_batch_bundle.py:96
 msgid "Incorrect Type of Transaction"
 msgstr "Falsche Transaktionsart"
 
-#: stock/doctype/stock_settings/stock_settings.py:115
+#: stock/doctype/stock_settings/stock_settings.py:118
 msgid "Incorrect Warehouse"
 msgstr "Falsches Lager"
 
-#: accounts/general_ledger.py:47
+#: accounts/general_ledger.py:51
 msgid "Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction."
 msgstr "Falsche Anzahl von Buchungen im Hauptbuch gefunden. Möglicherweise wurde für die Transaktion ein falsches Konto gewählt."
 
@@ -33030,11 +33577,11 @@
 msgid "Individual"
 msgstr "Einzelperson"
 
-#: accounts/doctype/gl_entry/gl_entry.py:336
+#: accounts/doctype/gl_entry/gl_entry.py:290
 msgid "Individual GL Entry cannot be cancelled."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:326
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:337
 msgid "Individual Stock Ledger Entry cannot be cancelled."
 msgstr "Einzelne Lagerbuch-Einträge können nicht storniert werden."
 
@@ -33079,7 +33626,13 @@
 msgid "Initial Email Notification Sent"
 msgstr "Erste E-Mail-Benachrichtigung gesendet"
 
-#: accounts/doctype/payment_request/payment_request_list.js:11
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Initialize Summary Table"
+msgstr ""
+
+#: accounts/doctype/payment_request/payment_request_list.js:10
 msgid "Initiated"
 msgstr "Initiiert"
 
@@ -33110,7 +33663,7 @@
 msgid "Insert New Records"
 msgstr "Fügen Sie neue Datensätze ein"
 
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:34
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:33
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:109
 msgid "Inspected By"
 msgstr "kontrolliert durch"
@@ -33121,11 +33674,11 @@
 msgid "Inspected By"
 msgstr "kontrolliert durch"
 
-#: controllers/stock_controller.py:666
+#: controllers/stock_controller.py:849
 msgid "Inspection Rejected"
 msgstr "Inspektion abgelehnt"
 
-#: controllers/stock_controller.py:636 controllers/stock_controller.py:638
+#: controllers/stock_controller.py:819 controllers/stock_controller.py:821
 msgid "Inspection Required"
 msgstr "Prüfung erforderlich"
 
@@ -33147,7 +33700,7 @@
 msgid "Inspection Required before Purchase"
 msgstr "Inspektion erforderlich, bevor Kauf"
 
-#: controllers/stock_controller.py:653
+#: controllers/stock_controller.py:836
 msgid "Inspection Submission"
 msgstr ""
 
@@ -33169,7 +33722,7 @@
 
 #. Name of a DocType
 #: selling/doctype/installation_note/installation_note.json
-#: stock/doctype/delivery_note/delivery_note.js:171
+#: stock/doctype/delivery_note/delivery_note.js:191
 msgid "Installation Note"
 msgstr "Installationshinweis"
 
@@ -33186,7 +33739,7 @@
 msgid "Installation Note Item"
 msgstr "Bestandteil des Installationshinweises"
 
-#: stock/doctype/delivery_note/delivery_note.py:688
+#: stock/doctype/delivery_note/delivery_note.py:749
 msgid "Installation Note {0} has already been submitted"
 msgstr "Der Installationsschein {0} wurde bereits gebucht"
 
@@ -33251,19 +33804,19 @@
 msgid "Insufficient Capacity"
 msgstr "Unzureichende Kapazität"
 
-#: controllers/accounts_controller.py:3130
-#: controllers/accounts_controller.py:3154
+#: controllers/accounts_controller.py:3221
+#: controllers/accounts_controller.py:3245
 msgid "Insufficient Permissions"
 msgstr "Nicht ausreichende Berechtigungen"
 
-#: stock/doctype/pick_list/pick_list.py:705
-#: stock/doctype/stock_entry/stock_entry.py:776
-#: stock/serial_batch_bundle.py:880 stock/stock_ledger.py:1369
-#: stock/stock_ledger.py:1840
+#: stock/doctype/pick_list/pick_list.py:776
+#: stock/doctype/stock_entry/stock_entry.py:731
+#: stock/serial_batch_bundle.py:899 stock/stock_ledger.py:1395
+#: stock/stock_ledger.py:1847
 msgid "Insufficient Stock"
 msgstr "Nicht genug Lagermenge."
 
-#: stock/stock_ledger.py:1855
+#: stock/stock_ledger.py:1862
 msgid "Insufficient Stock for Batch"
 msgstr "Unzureichender Bestand für Charge"
 
@@ -33404,11 +33957,11 @@
 msgid "Interest"
 msgstr "Zinsen"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2339
+#: accounts/doctype/payment_entry/payment_entry.py:2364
 msgid "Interest and/or dunning fee"
 msgstr "Zinsen und/oder Mahngebühren"
 
-#: crm/report/lead_details/lead_details.js:40
+#: crm/report/lead_details/lead_details.js:39
 msgid "Interested"
 msgstr "Interessiert"
 
@@ -33432,11 +33985,11 @@
 msgid "Internal Customer for company {0} already exists"
 msgstr "Interner Kunde für Unternehmen {0} existiert bereits"
 
-#: controllers/accounts_controller.py:533
+#: controllers/accounts_controller.py:577
 msgid "Internal Sale or Delivery Reference missing."
 msgstr "Interne Verkaufs- oder Lieferreferenz fehlt."
 
-#: controllers/accounts_controller.py:535
+#: controllers/accounts_controller.py:579
 msgid "Internal Sales Reference Missing"
 msgstr "Interne Verkaufsreferenz Fehlt"
 
@@ -33485,7 +34038,7 @@
 msgid "Internal Transfer"
 msgstr "Interner Transfer"
 
-#: controllers/accounts_controller.py:544
+#: controllers/accounts_controller.py:588
 msgid "Internal Transfer Reference Missing"
 msgstr ""
 
@@ -33499,7 +34052,7 @@
 msgid "Internal Work History"
 msgstr "Interne Arbeits-Historie"
 
-#: controllers/stock_controller.py:735
+#: controllers/stock_controller.py:918
 msgid "Internal transfers can only be done in company's default currency"
 msgstr ""
 
@@ -33534,14 +34087,14 @@
 msgid "Invalid"
 msgstr "Ungültig"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:377
-#: accounts/doctype/sales_invoice/sales_invoice.py:876
-#: accounts/doctype/sales_invoice/sales_invoice.py:886
+#: 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:2531
-#: controllers/accounts_controller.py:2537
+#: controllers/accounts_controller.py:2616
+#: controllers/accounts_controller.py:2622
 msgid "Invalid Account"
 msgstr "Ungültiger Account"
 
@@ -33549,7 +34102,7 @@
 msgid "Invalid Attribute"
 msgstr "Ungültige Attribute"
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 msgid "Invalid Auto Repeat Date"
 msgstr "Ungültiges Datum für die automatische Wiederholung"
 
@@ -33557,7 +34110,7 @@
 msgid "Invalid Barcode. There is no Item attached to this barcode."
 msgstr "Ungültiger Barcode. Es ist kein Artikel an diesen Barcode angehängt."
 
-#: public/js/controllers/transaction.js:2360
+#: public/js/controllers/transaction.js:2413
 msgid "Invalid Blanket Order for the selected Customer and Item"
 msgstr "Ungültiger Blankoauftrag für den ausgewählten Kunden und Artikel"
 
@@ -33565,12 +34118,12 @@
 msgid "Invalid Child Procedure"
 msgstr "Ungültige untergeordnete Prozedur"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1977
+#: accounts/doctype/sales_invoice/sales_invoice.py:1946
 msgid "Invalid Company for Inter Company Transaction."
 msgstr "Ungültige Firma für Inter Company-Transaktion."
 
-#: assets/doctype/asset/asset.py:249 assets/doctype/asset/asset.py:256
-#: controllers/accounts_controller.py:2552
+#: assets/doctype/asset/asset.py:251 assets/doctype/asset/asset.py:258
+#: controllers/accounts_controller.py:2637
 msgid "Invalid Cost Center"
 msgstr "Ungültige Kostenstelle"
 
@@ -33578,11 +34131,11 @@
 msgid "Invalid Credentials"
 msgstr "Ungültige Anmeldeinformationen"
 
-#: selling/doctype/sales_order/sales_order.py:318
+#: selling/doctype/sales_order/sales_order.py:321
 msgid "Invalid Delivery Date"
 msgstr "Ungültiges Lieferdatum"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:88
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
 msgid "Invalid Document"
 msgstr "Ungültiges Dokument"
 
@@ -33595,7 +34148,7 @@
 msgid "Invalid Formula"
 msgstr "Ungültige Formel"
 
-#: assets/doctype/asset/asset.py:367
+#: assets/doctype/asset/asset.py:369
 msgid "Invalid Gross Purchase Amount"
 msgstr "Ungültiger Bruttokaufbetrag"
 
@@ -33607,12 +34160,12 @@
 msgid "Invalid Item"
 msgstr "Ungültiger Artikel"
 
-#: stock/doctype/item/item.py:1371
+#: stock/doctype/item/item.py:1372
 msgid "Invalid Item Defaults"
 msgstr "Ungültige Artikel-Standardwerte"
 
 #: accounts/doctype/pos_closing_entry/pos_closing_entry.py:59
-#: accounts/general_ledger.py:677
+#: accounts/general_ledger.py:686
 msgid "Invalid Opening Entry"
 msgstr "Ungültiger Eröffnungseintrag"
 
@@ -33620,11 +34173,11 @@
 msgid "Invalid POS Invoices"
 msgstr "Ungültige POS-Rechnungen"
 
-#: accounts/doctype/account/account.py:320
+#: accounts/doctype/account/account.py:339
 msgid "Invalid Parent Account"
 msgstr "Ungültiges übergeordnetes Konto"
 
-#: public/js/controllers/buying.js:338
+#: public/js/controllers/buying.js:333
 msgid "Invalid Part Number"
 msgstr "Ungültige Teilenummer"
 
@@ -33644,24 +34197,24 @@
 msgid "Invalid Process Loss Configuration"
 msgstr "Ungültige Prozessverlust-Konfiguration"
 
-#: accounts/doctype/payment_entry/payment_entry.py:599
+#: accounts/doctype/payment_entry/payment_entry.py:608
 msgid "Invalid Purchase Invoice"
 msgstr "Ungültige Eingangsrechnung"
 
-#: controllers/accounts_controller.py:3169
+#: controllers/accounts_controller.py:3260
 msgid "Invalid Qty"
 msgstr "Ungültige Menge"
 
-#: controllers/accounts_controller.py:1021
+#: controllers/accounts_controller.py:1085
 msgid "Invalid Quantity"
 msgstr "Ungültige Menge"
 
-#: assets/doctype/asset/asset.py:411 assets/doctype/asset/asset.py:417
-#: assets/doctype/asset/asset.py:444
+#: assets/doctype/asset/asset.py:413 assets/doctype/asset/asset.py:419
+#: assets/doctype/asset/asset.py:446
 msgid "Invalid Schedule"
 msgstr "Ungültiger Zeitplan"
 
-#: controllers/selling_controller.py:225
+#: controllers/selling_controller.py:226
 msgid "Invalid Selling Price"
 msgstr "Ungültiger Verkaufspreis"
 
@@ -33694,22 +34247,21 @@
 msgid "Invalid reference {0} {1}"
 msgstr "Ungültige Referenz {0} {1}"
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:101
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:102
 msgid "Invalid result key. Response:"
 msgstr "Ungültiger Ergebnisschlüssel. Antwort:"
 
-#: accounts/doctype/gl_entry/gl_entry.py:229
-#: accounts/doctype/gl_entry/gl_entry.py:239
 #: 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
 msgid "Invalid value {0} for {1} against account {2}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:569
+#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:642
 msgid "Invalid {0}"
 msgstr "Ungültige(r) {0}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1975
+#: accounts/doctype/sales_invoice/sales_invoice.py:1944
 msgid "Invalid {0} for Inter Company Transaction."
 msgstr "Ungültige {0} für Inter Company-Transaktion."
 
@@ -33729,7 +34281,7 @@
 msgid "Inventory Dimension"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:147
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:157
 msgid "Inventory Dimension Negative Stock"
 msgstr ""
 
@@ -33787,7 +34339,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/invoice_discounting/invoice_discounting.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:144
+#: accounts/doctype/sales_invoice/sales_invoice.js:151
 msgid "Invoice Discounting"
 msgstr "Rechnungsrabatt"
 
@@ -33798,7 +34350,7 @@
 msgid "Invoice Discounting"
 msgstr "Rechnungsrabatt"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1065
+#: accounts/report/accounts_receivable/accounts_receivable.py:1073
 msgid "Invoice Grand Total"
 msgstr "Rechnungssumme"
 
@@ -33875,7 +34427,8 @@
 msgid "Invoice Status"
 msgstr "Rechnungsstatus"
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:7
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:85
 msgid "Invoice Type"
 msgstr "Rechnungstyp"
 
@@ -33910,7 +34463,7 @@
 msgid "Invoice Type"
 msgstr "Rechnungstyp"
 
-#: projects/doctype/timesheet/timesheet.py:376
+#: projects/doctype/timesheet/timesheet.py:386
 msgid "Invoice already created for all billing hours"
 msgstr "Die Rechnung wurde bereits für alle Abrechnungsstunden erstellt"
 
@@ -33920,12 +34473,13 @@
 msgid "Invoice and Billing"
 msgstr ""
 
-#: projects/doctype/timesheet/timesheet.py:373
+#: projects/doctype/timesheet/timesheet.py:383
 msgid "Invoice can't be made for zero billing hour"
 msgstr "Die Rechnung kann nicht für die Null-Rechnungsstunde erstellt werden"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:168
-#: accounts/report/accounts_receivable/accounts_receivable.py:1067
+#: 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
 msgid "Invoiced Amount"
@@ -33935,7 +34489,7 @@
 msgid "Invoiced Qty"
 msgstr "In Rechnung gestellte Menge"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2028
+#: accounts/doctype/sales_invoice/sales_invoice.py:1997
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
 msgid "Invoices"
 msgstr "Rechnungen"
@@ -34017,7 +34571,7 @@
 msgid "Is Account Payable"
 msgstr "Ist Konto zahlbar"
 
-#: projects/report/project_summary/project_summary.js:17
+#: projects/report/project_summary/project_summary.js:16
 msgid "Is Active"
 msgstr "Ist aktiv(iert)"
 
@@ -34076,7 +34630,7 @@
 msgid "Is Advance"
 msgstr "Ist Anzahlung"
 
-#: selling/doctype/quotation/quotation.js:294
+#: selling/doctype/quotation/quotation.js:306
 msgid "Is Alternative"
 msgstr "Ist Alternative"
 
@@ -34384,9 +34938,9 @@
 msgid "Is Fully Depreciated"
 msgstr "Ist vollständig abgeschrieben"
 
-#: accounts/doctype/account/account_tree.js:110
-#: accounts/doctype/cost_center/cost_center_tree.js:23
-#: stock/doctype/warehouse/warehouse_tree.js:16
+#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/cost_center/cost_center_tree.js:30
+#: stock/doctype/warehouse/warehouse_tree.js:20
 msgid "Is Group"
 msgstr "Ist Gruppe"
 
@@ -34660,7 +35214,13 @@
 msgid "Is Rejected"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.js:64
+#. Label of a Check field in DocType 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "Is Rejected Warehouse"
+msgstr ""
+
+#: accounts/report/pos_register/pos_register.js:63
 #: accounts/report/pos_register/pos_register.py:226
 msgid "Is Return"
 msgstr "Ist Retoure"
@@ -34810,7 +35370,7 @@
 msgstr "Ist diese Steuer im Basispreis enthalten?"
 
 #. Name of a DocType
-#: assets/doctype/asset/asset_list.js:26 public/js/communication.js:12
+#: assets/doctype/asset/asset_list.js:19 public/js/communication.js:13
 #: support/doctype/issue/issue.json
 msgid "Issue"
 msgstr "Anfrage"
@@ -34875,15 +35435,15 @@
 msgid "Issue Date"
 msgstr "Ausstellungsdatum"
 
-#: stock/doctype/material_request/material_request.js:127
+#: stock/doctype/material_request/material_request.js:138
 msgid "Issue Material"
 msgstr "Material ausgeben"
 
 #. Name of a DocType
 #: support/doctype/issue_priority/issue_priority.json
-#: support/report/issue_analytics/issue_analytics.js:64
+#: support/report/issue_analytics/issue_analytics.js:63
 #: support/report/issue_analytics/issue_analytics.py:64
-#: support/report/issue_summary/issue_summary.js:52
+#: support/report/issue_summary/issue_summary.js:51
 #: support/report/issue_summary/issue_summary.py:61
 msgid "Issue Priority"
 msgstr "Ausgabepriorität"
@@ -34931,7 +35491,7 @@
 msgid "Issue a debit note with 0 qty against an existing Sales Invoice"
 msgstr "Lastschrift mit Menge 0 gegen eine bestehende Ausgangsrechnung ausstellen"
 
-#: stock/doctype/material_request/material_request_list.js:29
+#: stock/doctype/material_request/material_request_list.js:33
 msgid "Issued"
 msgstr "Ausgegeben"
 
@@ -34983,70 +35543,79 @@
 msgid "It can take upto few hours for accurate stock values to be visible after merging items."
 msgstr "Es kann bis zu einigen Stunden dauern, bis nach der Zusammenführung von Artikeln genaue Bestandswerte sichtbar sind."
 
-#: public/js/controllers/transaction.js:1839
+#: public/js/controllers/transaction.js:1882
 msgid "It is needed to fetch Item Details."
 msgstr "Wird gebraucht, um Artikeldetails abzurufen"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:135
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:156
 msgid "It's not possible to distribute charges equally when total amount is zero, please set 'Distribute Charges Based On' as 'Quantity'"
 msgstr "Es ist nicht möglich, die Gebühren gleichmäßig zu verteilen, wenn der Gesamtbetrag gleich Null ist. Bitte stellen Sie 'Gebühren verteilen auf Basis' auf 'Menge'"
 
 #. Name of a DocType
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:16
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:15
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:32
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:22
 #: buying/report/procurement_tracker/procurement_tracker.py:60
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:50
+#: 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:1018
+#: controllers/taxes_and_totals.py:1019
+#: 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_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:67
-#: manufacturing/report/process_loss_report/process_loss_report.js:16
+#: 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
-#: public/js/bom_configurator/bom_configurator.bundle.js:202
-#: public/js/bom_configurator/bom_configurator.bundle.js:270
+#: 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
 #: public/js/purchase_trends_filters.js:48
-#: public/js/purchase_trends_filters.js:65 public/js/sales_trends_filters.js:23
-#: public/js/sales_trends_filters.js:41 public/js/stock_analytics.js:61
-#: selling/doctype/sales_order/sales_order.js:977
-#: selling/report/customer_wise_item_price/customer_wise_item_price.js:15
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:37
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:63
-#: stock/dashboard/item_dashboard.js:208 stock/doctype/item/item.json
+#: public/js/purchase_trends_filters.js:63 public/js/sales_trends_filters.js:23
+#: public/js/sales_trends_filters.js:39 public/js/stock_analytics.js:92
+#: selling/doctype/sales_order/sales_order.js:1139
+#: selling/page/point_of_sale/pos_item_cart.js:46
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:14
+#: 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/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
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:24
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:32
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:74
-#: stock/report/item_price_stock/item_price_stock.js:9
+#: stock/report/item_price_stock/item_price_stock.js:8
 #: 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:11
+#: stock/report/item_variant_details/item_variant_details.js:10
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55
 #: 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:33
+#: stock/report/reserved_stock/reserved_stock.js:30
 #: stock/report/reserved_stock/reserved_stock.py:103
 #: 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:16
+#: stock/report/stock_analytics/stock_analytics.js:15
 #: stock/report/stock_analytics/stock_analytics.py:30
 #: stock/report/stock_balance/stock_balance.js:39
-#: stock/report/stock_balance/stock_balance.py:361
+#: stock/report/stock_balance/stock_balance.py:369
 #: stock/report/stock_ledger/stock_ledger.js:42
-#: stock/report/stock_ledger/stock_ledger.py:109
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:32
+#: 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 templates/generators/bom.html:19
-#: templates/pages/material_request_info.html:42 templates/pages/order.html:83
+#: templates/emails/reorder_item.html:8
+#: templates/form_grid/material_request_grid.html:6
+#: templates/form_grid/stock_entry_grid.html:8 templates/generators/bom.html:19
+#: templates/pages/material_request_info.html:42 templates/pages/order.html:95
 msgid "Item"
 msgstr "Artikel"
 
@@ -35240,6 +35809,10 @@
 msgid "Item Barcode"
 msgstr "Artikelbarcode"
 
+#: selling/page/point_of_sale/pos_item_cart.js:46
+msgid "Item Cart"
+msgstr ""
+
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:69
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:36
 #: accounts/report/gross_profit/gross_profit.py:224
@@ -35249,40 +35822,41 @@
 #: 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/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:9
+#: 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/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:76
+#: 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/quality_inspection_summary/quality_inspection_summary.js:28
+#: 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:187
-#: public/js/controllers/transaction.js:2112 public/js/utils.js:459
-#: public/js/utils.js:606 selling/doctype/quotation/quotation.js:268
-#: selling/doctype/sales_order/sales_order.js:291
-#: selling/doctype/sales_order/sales_order.js:392
-#: selling/doctype/sales_order/sales_order.js:682
-#: selling/doctype/sales_order/sales_order.js:806
+#: 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
+#: selling/doctype/sales_order/sales_order.js:318
+#: selling/doctype/sales_order/sales_order.js:422
+#: selling/doctype/sales_order/sales_order.js:784
+#: selling/doctype/sales_order/sales_order.js:926
 #: selling/report/customer_wise_item_price/customer_wise_item_price.py:29
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:27
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:19
 #: selling/report/sales_order_analysis/sales_order_analysis.py:241
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:86
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:16
+#: 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:8
+#: 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/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:8
+#: stock/report/serial_no_ledger/serial_no_ledger.js:7
 #: stock/report/stock_ageing/stock_ageing.py:119
 #: 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
@@ -35674,7 +36248,7 @@
 msgid "Item Code"
 msgstr "Artikel-Code"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:61
+#: manufacturing/doctype/bom_creator/bom_creator.js:60
 msgid "Item Code (Final Product)"
 msgstr "Artikelcode (Endprodukt)"
 
@@ -35682,12 +36256,12 @@
 msgid "Item Code cannot be changed for Serial No."
 msgstr "Artikelnummer kann nicht für Seriennummer geändert werden"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:444
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:448
 msgid "Item Code required at Row No {0}"
 msgstr "Artikelnummer wird in Zeile {0} benötigt"
 
-#: selling/page/point_of_sale/pos_controller.js:672
-#: selling/page/point_of_sale/pos_item_details.js:251
+#: selling/page/point_of_sale/pos_controller.js:704
+#: selling/page/point_of_sale/pos_item_details.js:262
 msgid "Item Code: {0} is not available under warehouse {1}."
 msgstr "Artikelcode: {0} ist unter Lager {1} nicht verfügbar."
 
@@ -35755,6 +36329,10 @@
 msgid "Item Description"
 msgstr "Artikelbeschreibung"
 
+#: selling/page/point_of_sale/pos_item_details.js:28
+msgid "Item Details"
+msgstr "Artikeldetails"
+
 #. Label of a Section Break field in DocType 'Production Plan Sub Assembly
 #. Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -35763,9 +36341,9 @@
 msgstr "Artikeldetails"
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:43
+#: accounts/report/gross_profit/gross_profit.js:44
 #: accounts/report/gross_profit/gross_profit.py:237
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:22
+#: 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
@@ -35773,36 +36351,38 @@
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:181
 #: accounts/report/purchase_register/purchase_register.js:58
 #: accounts/report/sales_register/sales_register.js:70
+#: manufacturing/doctype/plant_floor/plant_floor.js:100
+#: manufacturing/doctype/workstation/workstation_job_card.html:94
 #: public/js/purchase_trends_filters.js:49 public/js/sales_trends_filters.js:24
-#: selling/page/point_of_sale/pos_item_selector.js:159
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:31
+#: selling/page/point_of_sale/pos_item_selector.js:156
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:30
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:35
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:55
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:54
 #: selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:89
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:42
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:41
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:54
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:41
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:93
+#: 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/delayed_item_report/delayed_item_report.js:49
-#: stock/report/delayed_order_report/delayed_order_report.js:49
+#: 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/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_analytics/stock_analytics.js:9
+#: stock/report/stock_analytics/stock_analytics.js:8
 #: stock/report/stock_analytics/stock_analytics.py:39
 #: stock/report/stock_balance/stock_balance.js:32
-#: stock/report/stock_balance/stock_balance.py:369
+#: stock/report/stock_balance/stock_balance.py:377
 #: stock/report/stock_ledger/stock_ledger.js:53
-#: stock/report/stock_ledger/stock_ledger.py:174
+#: stock/report/stock_ledger/stock_ledger.py:247
 #: stock/report/stock_projected_qty/stock_projected_qty.js:39
 #: stock/report/stock_projected_qty/stock_projected_qty.py:108
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:25
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:24
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:94
 msgid "Item Group"
 msgstr "Artikelgruppe"
@@ -36022,7 +36602,7 @@
 msgid "Item Group Name"
 msgstr "Name der Artikelgruppe"
 
-#: setup/doctype/item_group/item_group.js:65
+#: setup/doctype/item_group/item_group.js:82
 msgid "Item Group Tree"
 msgstr "Artikelgruppenbaumstruktur"
 
@@ -36088,7 +36668,8 @@
 #: 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
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:95
+#: 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
@@ -36097,7 +36678,7 @@
 #: manufacturing/report/production_planning_report/production_planning_report.py:356
 #: 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:2118
+#: public/js/controllers/transaction.js:2161
 #: 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
@@ -36111,8 +36692,8 @@
 #: 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:367
-#: stock/report/stock_ledger/stock_ledger.py:115
+#: stock/report/stock_balance/stock_balance.py:375
+#: 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
@@ -36495,15 +37076,15 @@
 msgid "Item Price Stock"
 msgstr "Artikel Preis Lagerbestand"
 
-#: stock/get_item_details.py:878
+#: stock/get_item_details.py:889
 msgid "Item Price added for {0} in Price List {1}"
 msgstr "Artikel Preis hinzugefügt für {0} in Preisliste {1}"
 
-#: stock/doctype/item_price/item_price.py:142
+#: stock/doctype/item_price/item_price.py:136
 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:862
+#: stock/get_item_details.py:873
 msgid "Item Price updated for {0} in Price List {1}"
 msgstr "Artikel Preis aktualisiert für {0} in der Preisliste {1}"
 
@@ -36547,7 +37128,7 @@
 msgid "Item Reorder"
 msgstr "Artikelnachbestellung"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:130
 msgid "Item Row {0}: {1} {2} does not exist in above '{1}' table"
 msgstr "Artikelzeile {0}: {1} {2} ist in der obigen Tabelle &quot;{1}&quot; nicht vorhanden"
 
@@ -36761,7 +37342,7 @@
 msgstr "Details der Artikelvariante"
 
 #. Name of a DocType
-#: stock/doctype/item/item.js:94
+#: stock/doctype/item/item.js:114
 #: stock/doctype/item_variant_settings/item_variant_settings.json
 msgid "Item Variant Settings"
 msgstr "Einstellungen zur Artikelvariante"
@@ -36772,7 +37353,7 @@
 msgid "Item Variant Settings"
 msgstr "Einstellungen zur Artikelvariante"
 
-#: stock/doctype/item/item.js:667
+#: stock/doctype/item/item.js:744
 msgid "Item Variant {0} already exists with same attributes"
 msgstr "Artikelvariante {0} mit denselben Attributen existiert bereits"
 
@@ -36867,7 +37448,7 @@
 msgid "Item and Warranty Details"
 msgstr "Einzelheiten Artikel und Garantie"
 
-#: stock/doctype/stock_entry/stock_entry.py:2325
+#: stock/doctype/stock_entry/stock_entry.py:2359
 msgid "Item for row {0} does not match Material Request"
 msgstr "Artikel für Zeile {0} stimmt nicht mit Materialanforderung überein"
 
@@ -36875,16 +37456,16 @@
 msgid "Item has variants."
 msgstr "Artikel hat Varianten."
 
-#: selling/page/point_of_sale/pos_item_details.js:110
+#: selling/page/point_of_sale/pos_item_details.js:108
 msgid "Item is removed since no serial / batch no selected."
 msgstr "Artikel wird entfernt, da keine Serien-/Chargennummer ausgewählt wurde."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:105
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:126
 msgid "Item must be added using 'Get Items from Purchase Receipts' button"
 msgstr "Artikel müssen über die Schaltfläche \"Artikel von Eingangsbeleg übernehmen\" hinzugefügt werden"
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: selling/doctype/sales_order/sales_order.js:984
+#: selling/doctype/sales_order/sales_order.js:1146
 msgid "Item name"
 msgstr "Artikelname"
 
@@ -36894,11 +37475,11 @@
 msgid "Item operation"
 msgstr "Artikeloperation"
 
-#: controllers/accounts_controller.py:3196
+#: controllers/accounts_controller.py:3287
 msgid "Item qty can not be updated as raw materials are already processed."
 msgstr "Die Artikelmenge kann nicht aktualisiert werden, da das Rohmaterial bereits verarbeitet werden."
 
-#: stock/doctype/stock_entry/stock_entry.py:857
+#: stock/doctype/stock_entry/stock_entry.py:813
 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
 msgstr ""
 
@@ -36908,7 +37489,11 @@
 msgid "Item to be manufactured or repacked"
 msgstr "Zu fertigender oder umzupackender Artikel"
 
-#: stock/utils.py:564
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Item valuation rate is recalculated considering landed cost voucher amount"
+msgstr ""
+
+#: stock/utils.py:559
 msgid "Item valuation reposting in progress. Report might show incorrect item valuation."
 msgstr ""
 
@@ -36920,11 +37505,11 @@
 msgid "Item {0} cannot be added as a sub-assembly of itself"
 msgstr "Artikel {0} kann nicht als Unterbaugruppe für sich selbst hinzugefügt werden"
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:146
+#: manufacturing/doctype/blanket_order/blanket_order.py:189
 msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:231 stock/doctype/item/item.py:603
+#: assets/doctype/asset/asset.py:233 stock/doctype/item/item.py:603
 msgid "Item {0} does not exist"
 msgstr "Artikel {0} existiert nicht"
 
@@ -36932,7 +37517,7 @@
 msgid "Item {0} does not exist in the system or has expired"
 msgstr "Artikel {0} ist nicht im System vorhanden oder abgelaufen"
 
-#: controllers/selling_controller.py:655
+#: controllers/selling_controller.py:679
 msgid "Item {0} entered multiple times."
 msgstr "Artikel {0} mehrfach eingegeben."
 
@@ -36940,11 +37525,11 @@
 msgid "Item {0} has already been returned"
 msgstr "Artikel {0} wurde bereits zurück gegeben"
 
-#: assets/doctype/asset/asset.py:233
+#: assets/doctype/asset/asset.py:235
 msgid "Item {0} has been disabled"
 msgstr "Artikel {0} wurde deaktiviert"
 
-#: selling/doctype/sales_order/sales_order.py:645
+#: selling/doctype/sales_order/sales_order.py:651
 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No"
 msgstr "Artikel {0} hat keine Seriennummer. Nur Artikel mit Seriennummer können basierend auf der Seriennummer geliefert werden"
 
@@ -36952,7 +37537,7 @@
 msgid "Item {0} has reached its end of life on {1}"
 msgstr "Artikel {0} hat das Ende seiner Lebensdauer erreicht zum Datum {1}"
 
-#: stock/stock_ledger.py:111
+#: stock/stock_ledger.py:113
 msgid "Item {0} ignored since it is not a stock item"
 msgstr "Artikel {0} ignoriert, da es sich nicht um einen Lagerartikel handelt"
 
@@ -36976,43 +37561,43 @@
 msgid "Item {0} is not a stock Item"
 msgstr "Artikel {0} ist kein Lagerartikel"
 
-#: stock/doctype/stock_entry/stock_entry.py:1538
+#: stock/doctype/stock_entry/stock_entry.py:1547
 msgid "Item {0} is not active or end of life has been reached"
 msgstr "Artikel {0} ist nicht aktiv oder hat das Ende der Lebensdauer erreicht"
 
-#: assets/doctype/asset/asset.py:235
+#: assets/doctype/asset/asset.py:237
 msgid "Item {0} must be a Fixed Asset Item"
 msgstr "Artikel {0} muss ein Posten des Anlagevermögens sein"
 
-#: stock/get_item_details.py:228
+#: stock/get_item_details.py:233
 msgid "Item {0} must be a Non-Stock Item"
 msgstr "Artikel {0} darf kein Lagerartikel sein"
 
-#: stock/get_item_details.py:225
+#: stock/get_item_details.py:230
 msgid "Item {0} must be a Sub-contracted Item"
 msgstr "Artikel {0} muss ein unterbeauftragter Artikel sein"
 
-#: assets/doctype/asset/asset.py:237
+#: assets/doctype/asset/asset.py:239
 msgid "Item {0} must be a non-stock item"
 msgstr "Artikel {0} darf kein Lagerartikel sein"
 
-#: stock/doctype/stock_entry/stock_entry.py:1086
+#: stock/doctype/stock_entry/stock_entry.py:1095
 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}"
 msgstr "Artikel {0} wurde in der Tabelle „Gelieferte Rohstoffe“ in {1} {2} nicht gefunden"
 
-#: stock/doctype/item_price/item_price.py:57
+#: stock/doctype/item_price/item_price.py:56
 msgid "Item {0} not found."
 msgstr "Artikel {0} nicht gefunden."
 
-#: buying/doctype/purchase_order/purchase_order.py:342
+#: buying/doctype/purchase_order/purchase_order.py:343
 msgid "Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item)."
 msgstr "Artikel {0}: Bestellmenge {1} kann nicht weniger als Mindestbestellmenge {2} (im Artikel definiert) sein."
 
-#: manufacturing/doctype/production_plan/production_plan.js:418
+#: manufacturing/doctype/production_plan/production_plan.js:453
 msgid "Item {0}: {1} qty produced. "
 msgstr "Artikel {0}: {1} produzierte Menge."
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1131
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1190
 msgid "Item {} does not exist."
 msgstr "Artikel {0} existiert nicht."
 
@@ -37058,9 +37643,12 @@
 msgid "Item: {0} does not exist in the system"
 msgstr "Artikel: {0} ist nicht im System vorhanden"
 
-#: public/js/utils.js:442 setup/doctype/item_group/item_group.js:70
-#: stock/doctype/delivery_note/delivery_note.js:364
-#: templates/generators/bom.html:38 templates/pages/rfq.html:37
+#: public/js/utils.js:489
+#: 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
+#: templates/form_grid/item_grid.html:6 templates/generators/bom.html:38
+#: templates/pages/rfq.html:37
 msgid "Items"
 msgstr "Artikel"
 
@@ -37231,8 +37819,8 @@
 msgid "Items Filter"
 msgstr "Artikel filtern"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1462
-#: selling/doctype/sales_order/sales_order.js:1018
+#: manufacturing/doctype/production_plan/production_plan.py:1484
+#: selling/doctype/sales_order/sales_order.js:1182
 msgid "Items Required"
 msgstr "Erforderliche Artikel"
 
@@ -37248,15 +37836,15 @@
 msgid "Items and Pricing"
 msgstr "Artikel und Preise"
 
-#: controllers/accounts_controller.py:3416
+#: controllers/accounts_controller.py:3507
 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:824
+#: selling/doctype/sales_order/sales_order.js:962
 msgid "Items for Raw Material Request"
 msgstr "Artikel für Rohstoffanforderung"
 
-#: stock/doctype/stock_entry/stock_entry.py:853
+#: stock/doctype/stock_entry/stock_entry.py:809
 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}"
 msgstr ""
 
@@ -37266,7 +37854,7 @@
 msgid "Items to Be Repost"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1461
+#: manufacturing/doctype/production_plan/production_plan.py:1483
 msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
 msgstr "Zu fertigende Gegenstände sind erforderlich, um die damit verbundenen Rohstoffe zu ziehen."
 
@@ -37275,11 +37863,11 @@
 msgid "Items to Order and Receive"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:252
+#: selling/doctype/sales_order/sales_order.js:278
 msgid "Items to Reserve"
 msgstr "Zu reservierende Artikel"
 
-#. Description of the 'Parent Warehouse' (Link) field in DocType 'Pick List'
+#. Description of the 'Warehouse' (Link) field in DocType 'Pick List'
 #: stock/doctype/pick_list/pick_list.json
 msgctxt "Pick List"
 msgid "Items under this warehouse will be suggested"
@@ -37304,11 +37892,18 @@
 msgid "JAN"
 msgstr "JAN"
 
+#. Label of a Int field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Capacity"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/job_card/job_card.json
-#: manufacturing/doctype/job_card/job_card.py:765
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:28
+#: manufacturing/doctype/job_card/job_card.py:772
+#: 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
 msgid "Job Card"
 msgstr "Jobkarte"
@@ -37412,11 +38007,17 @@
 msgid "Job Card Time Log"
 msgstr "Jobkarten-Zeitprotokoll"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:94
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Cards"
+msgstr ""
+
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:95
 msgid "Job Paused"
 msgstr "Auftrag pausiert"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:54
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:53
 msgid "Job Started"
 msgstr "Auftrag gestartet"
 
@@ -37438,11 +38039,11 @@
 msgid "Job Title"
 msgstr "Stellenbezeichnung"
 
-#: manufacturing/doctype/work_order/work_order.py:1562
+#: manufacturing/doctype/work_order/work_order.py:1576
 msgid "Job card {0} created"
 msgstr "Jobkarte {0} erstellt"
 
-#: utilities/bulk_transaction.py:48
+#: utilities/bulk_transaction.py:52
 msgid "Job: {0} has been triggered for processing failed transactions"
 msgstr ""
 
@@ -37456,19 +38057,20 @@
 msgid "Joining"
 msgstr "Eintritt"
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:29
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:30
 msgid "Journal Entries"
 msgstr "Journaleinträge"
 
-#: accounts/utils.py:866
+#: accounts/utils.py:875
 msgid "Journal Entries {0} are un-linked"
 msgstr "Buchungssätze {0} sind nicht verknüpft"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:146
+#: accounts/doctype/account/account_tree.js:205
 #: accounts/doctype/journal_entry/journal_entry.json
 #: accounts/print_format/journal_auditing_voucher/journal_auditing_voucher.html:10
-#: assets/doctype/asset/asset.js:246 assets/doctype/asset/asset.js:249
+#: assets/doctype/asset/asset.js:282 assets/doctype/asset/asset.js:291
+#: templates/form_grid/bank_reconciliation_grid.html:3
 msgid "Journal Entry"
 msgstr "Buchungssatz"
 
@@ -37553,7 +38155,7 @@
 msgid "Journal Entry Type"
 msgstr "Buchungssatz-Typ"
 
-#: accounts/doctype/journal_entry/journal_entry.py:471
+#: accounts/doctype/journal_entry/journal_entry.py:487
 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset."
 msgstr "Der Journaleintrag für die Verschrottung von Anlagen kann nicht storniert werden. Bitte stellen Sie die Anlage wieder her."
 
@@ -37563,11 +38165,11 @@
 msgid "Journal Entry for Scrap"
 msgstr "Buchungssatz für Ausschuss"
 
-#: accounts/doctype/journal_entry/journal_entry.py:232
+#: accounts/doctype/journal_entry/journal_entry.py:248
 msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:597
+#: accounts/doctype/journal_entry/journal_entry.py:624
 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
 msgstr "Buchungssatz {0} gehört nicht zu Konto {1} oder ist bereits mit einem anderen Beleg abgeglichen"
 
@@ -37577,14 +38179,19 @@
 msgid "Journals"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:95
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:99
 msgid "Journals have been created"
 msgstr ""
 
-#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:104
 msgid "Kanban Board"
 msgstr "Kanban-Tafel"
 
+#. Description of a DocType
+#: crm/doctype/campaign/campaign.json
+msgid "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. "
+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"
@@ -37605,11 +38212,11 @@
 msgid "Key Reports"
 msgstr "Wichtige Berichte"
 
-#: manufacturing/doctype/job_card/job_card.py:768
+#: manufacturing/doctype/job_card/job_card.py:775
 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}."
 msgstr "Stornieren Sie bitte zuerst die Fertigungseinträge gegen den Arbeitsauftrag {0}."
 
-#: public/js/utils/party.js:221
+#: public/js/utils/party.js:264
 msgid "Kindly select the company first"
 msgstr "Bitte wählen Sie zuerst das Unternehmen aus"
 
@@ -37749,7 +38356,7 @@
 msgid "Last Name"
 msgstr "Familienname"
 
-#: stock/doctype/shipment/shipment.js:247
+#: stock/doctype/shipment/shipment.js:275
 msgid "Last Name, Email or Phone/Mobile of the user are mandatory to continue."
 msgstr "Um fortzufahren, sind Nachname, E-Mail oder Telefon/Mobiltelefon des Benutzers erforderlich."
 
@@ -37792,7 +38399,7 @@
 msgid "Last Purchase Rate"
 msgstr "Letzter Anschaffungspreis"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:313
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:324
 msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
 msgstr "Die letzte Lagertransaktion für Artikel {0} unter Lager {1} war am {2}."
 
@@ -37804,7 +38411,7 @@
 msgid "Latest"
 msgstr "Neueste"
 
-#: stock/report/stock_balance/stock_balance.py:479
+#: stock/report/stock_balance/stock_balance.py:487
 msgid "Latest Age"
 msgstr "Spätes Stadium"
 
@@ -37821,11 +38428,11 @@
 msgstr "Breite"
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:34
+#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:33
 #: crm/report/lead_details/lead_details.py:18
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:8
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:28
-#: public/js/communication.js:20
+#: public/js/communication.js:25
 msgid "Lead"
 msgstr "Interessent"
 
@@ -38090,9 +38697,9 @@
 msgid "Leave blank to use the standard Delivery Note format"
 msgstr "Leer lassen, um das Standard-Lieferscheinformat zu verwenden"
 
-#: accounts/doctype/journal_entry/journal_entry.js:18
-#: accounts/doctype/payment_entry/payment_entry.js:265
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:24
+#: accounts/doctype/journal_entry/journal_entry.js:54
+#: accounts/doctype/payment_entry/payment_entry.js:343
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:25
 msgid "Ledger"
 msgstr "Ledger"
 
@@ -38135,10 +38742,15 @@
 msgid "Left Index"
 msgstr "Linker Index"
 
-#: setup/doctype/company/company.py:389
+#: setup/doctype/company/company.py:388
 msgid "Legal"
 msgstr "Legal"
 
+#. Description of a DocType
+#: setup/doctype/company/company.json
+msgid "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization."
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:59
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:84
 msgid "Legal Expenses"
@@ -38164,7 +38776,7 @@
 msgid "Length (cm)"
 msgstr "Länge (cm)"
 
-#: accounts/doctype/payment_entry/payment_entry.js:657
+#: accounts/doctype/payment_entry/payment_entry.js:807
 msgid "Less Than Amount"
 msgstr "Weniger als der Betrag"
 
@@ -38485,7 +39097,7 @@
 msgid "Liabilities"
 msgstr "Verbindlichkeiten"
 
-#: accounts/report/account_balance/account_balance.js:27
+#: accounts/report/account_balance/account_balance.js:26
 msgid "Liability"
 msgstr "Verbindlichkeit"
 
@@ -38582,20 +39194,20 @@
 msgid "Link existing Quality Procedure."
 msgstr "Bestehendes Qualitätsverfahren verknüpfen."
 
-#: buying/doctype/purchase_order/purchase_order.js:487
+#: buying/doctype/purchase_order/purchase_order.js:564
 msgid "Link to Material Request"
 msgstr "Verknüpfung zur Materialanforderung"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:378
-#: buying/doctype/supplier_quotation/supplier_quotation.js:52
+#: buying/doctype/request_for_quotation/request_for_quotation.js:407
+#: buying/doctype/supplier_quotation/supplier_quotation.js:54
 msgid "Link to Material Requests"
 msgstr "Link zu Materialanfragen"
 
-#: buying/doctype/supplier/supplier.js:107
+#: buying/doctype/supplier/supplier.js:133
 msgid "Link with Customer"
 msgstr "Mit Kunde verknüpfen"
 
-#: selling/doctype/customer/customer.js:173
+#: selling/doctype/customer/customer.js:189
 msgid "Link with Supplier"
 msgstr "Mit Lieferant verknüpfen"
 
@@ -38620,16 +39232,16 @@
 msgid "Linked with submitted documents"
 msgstr "Verknüpft mit gebuchten Dokumenten"
 
-#: buying/doctype/supplier/supplier.js:185
-#: selling/doctype/customer/customer.js:230
+#: buying/doctype/supplier/supplier.js:218
+#: selling/doctype/customer/customer.js:251
 msgid "Linking Failed"
 msgstr "Verknüpfung fehlgeschlagen"
 
-#: buying/doctype/supplier/supplier.js:184
+#: buying/doctype/supplier/supplier.js:217
 msgid "Linking to Customer Failed. Please try again."
 msgstr "Verknüpfung mit Kunde fehlgeschlagen. Bitte versuchen Sie es erneut."
 
-#: selling/doctype/customer/customer.js:229
+#: selling/doctype/customer/customer.js:250
 msgid "Linking to Supplier Failed. Please try again."
 msgstr "Verknüpfung mit Lieferant fehlgeschlagen. Bitte versuchen Sie es erneut."
 
@@ -38651,7 +39263,7 @@
 msgid "Load All Criteria"
 msgstr "Alle Kriterien laden"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:298
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:276
 msgid "Loading import file..."
 msgstr "Importdatei wird geladen ..."
 
@@ -38760,6 +39372,11 @@
 msgid "Log Entries"
 msgstr "Protokolleinträge"
 
+#. Description of a DocType
+#: stock/doctype/item_price/item_price.json
+msgid "Log the selling and buying rate of an Item"
+msgstr ""
+
 #. Label of a Attach Image field in DocType 'Manufacturer'
 #: stock/doctype/manufacturer/manufacturer.json
 msgctxt "Manufacturer"
@@ -38785,7 +39402,7 @@
 msgstr "Längengrad"
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:7
-#: selling/doctype/quotation/quotation_list.js:33
+#: selling/doctype/quotation/quotation_list.js:32
 msgid "Lost"
 msgstr "Verloren"
 
@@ -38812,7 +39429,7 @@
 msgid "Lost Opportunity"
 msgstr "Verpasste Gelegenheit"
 
-#: crm/report/lead_details/lead_details.js:39
+#: crm/report/lead_details/lead_details.js:38
 msgid "Lost Quotation"
 msgstr "Verlorene Angebote"
 
@@ -38832,7 +39449,7 @@
 msgid "Lost Quotations %"
 msgstr "Verlorene Angebote %"
 
-#: crm/report/lost_opportunity/lost_opportunity.js:31
+#: crm/report/lost_opportunity/lost_opportunity.js:30
 #: selling/report/lost_quotations/lost_quotations.py:24
 msgid "Lost Reason"
 msgstr "Verlustgrund"
@@ -38849,7 +39466,7 @@
 msgstr "Verlorene Begründung Detail"
 
 #: crm/report/lost_opportunity/lost_opportunity.py:49
-#: public/js/utils/sales_common.js:410
+#: public/js/utils/sales_common.js:466
 msgid "Lost Reasons"
 msgstr "Verlorene Gründe"
 
@@ -38867,7 +39484,7 @@
 msgid "Lost Reasons"
 msgstr "Verlorene Gründe"
 
-#: crm/doctype/opportunity/opportunity.js:29
+#: crm/doctype/opportunity/opportunity.js:28
 msgid "Lost Reasons are required in case opportunity is Lost."
 msgstr ""
 
@@ -38945,7 +39562,7 @@
 msgid "Loyalty Point Entry Redemption"
 msgstr "Loyalty Point Entry Rückzahlung"
 
-#: selling/page/point_of_sale/pos_item_cart.js:891
+#: selling/page/point_of_sale/pos_item_cart.js:924
 msgid "Loyalty Points"
 msgstr "Treuepunkte"
 
@@ -38992,14 +39609,18 @@
 msgid "Loyalty Points Redemption"
 msgstr "Treuepunkte-Einlösung"
 
-#: public/js/utils.js:109
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+msgid "Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned."
+msgstr ""
+
+#: public/js/utils.js:136
 msgid "Loyalty Points: {0}"
 msgstr "Treuepunkte: {0}"
 
 #. Name of a DocType
 #: accounts/doctype/loyalty_program/loyalty_program.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:1041
-#: selling/page/point_of_sale/pos_item_cart.js:885
+#: accounts/doctype/sales_invoice/sales_invoice.js:1117
+#: selling/page/point_of_sale/pos_item_cart.js:917
 msgid "Loyalty Program"
 msgstr "Treueprogramm"
 
@@ -39182,11 +39803,16 @@
 msgid "MFG-WO-.YYYY.-"
 msgstr "MFG-WO-.YYYY.-"
 
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:22
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:23
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:78
+#: public/js/plant_floor_visual/visual_plant.js:86
 msgid "Machine"
 msgstr "Maschine"
 
+#: public/js/plant_floor_visual/visual_plant.js:70
+msgid "Machine Type"
+msgstr ""
+
 #. Option for the 'Stop Reason' (Select) field in DocType 'Downtime Entry'
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 msgctxt "Downtime Entry"
@@ -39199,8 +39825,8 @@
 msgid "Machine operator errors"
 msgstr "Maschinenbedienerfehler"
 
-#: setup/doctype/company/company.py:563 setup/doctype/company/company.py:578
-#: setup/doctype/company/company.py:579 setup/doctype/company/company.py:580
+#: setup/doctype/company/company.py:562 setup/doctype/company/company.py:577
+#: setup/doctype/company/company.py:578 setup/doctype/company/company.py:579
 msgid "Main"
 msgstr "Haupt"
 
@@ -39214,7 +39840,7 @@
 msgid "Main Cost Center {0} cannot be entered in the child table"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:102
+#: assets/doctype/asset/asset.js:118
 msgid "Maintain Asset"
 msgstr "Vermögensgegenstand warten"
 
@@ -39271,6 +39897,12 @@
 msgid "Maintenance"
 msgstr "Wartung"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Maintenance"
+msgstr "Wartung"
+
 #. Label of a Date field in DocType 'Maintenance Visit'
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
 msgctxt "Maintenance Visit"
@@ -39283,7 +39915,7 @@
 msgid "Maintenance Details"
 msgstr "Wartungsdetails"
 
-#: assets/doctype/asset_maintenance/asset_maintenance.js:43
+#: assets/doctype/asset_maintenance/asset_maintenance.js:41
 msgid "Maintenance Log"
 msgstr "Wartungsprotokoll"
 
@@ -39330,10 +39962,10 @@
 msgstr "Wartungsrolle"
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:162
+#: accounts/doctype/sales_invoice/sales_invoice.js:175
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.json
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:78
-#: selling/doctype/sales_order/sales_order.js:582
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
+#: selling/doctype/sales_order/sales_order.js:673
 msgid "Maintenance Schedule"
 msgstr "Wartungsplan"
 
@@ -39476,10 +40108,10 @@
 msgstr "Nutzer Instandhaltung"
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:83
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:87
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
-#: selling/doctype/sales_order/sales_order.js:581
-#: support/doctype/warranty_claim/warranty_claim.js:50
+#: selling/doctype/sales_order/sales_order.js:668
+#: support/doctype/warranty_claim/warranty_claim.js:47
 msgid "Maintenance Visit"
 msgstr "Wartungsbesuch"
 
@@ -39512,16 +40144,16 @@
 msgid "Major/Optional Subjects"
 msgstr "Wichtiger/wahlweiser Betreff"
 
-#: accounts/doctype/journal_entry/journal_entry.js:51
-#: manufacturing/doctype/job_card/job_card.js:174
+#: accounts/doctype/journal_entry/journal_entry.js:100
+#: manufacturing/doctype/job_card/job_card.js:196
 msgid "Make"
 msgstr "Erstellen"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:56
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:54
 msgid "Make "
 msgstr "Erstellen "
 
-#: assets/doctype/asset/asset_list.js:39
+#: assets/doctype/asset/asset_list.js:29
 msgid "Make Asset Movement"
 msgstr ""
 
@@ -39551,7 +40183,7 @@
 msgid "Make Quotation"
 msgstr "Angebot erstellen"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:335
 msgid "Make Return Entry"
 msgstr ""
 
@@ -39567,7 +40199,7 @@
 msgid "Make Serial No / Batch from Work Order"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
+#: stock/doctype/purchase_receipt/purchase_receipt.js:261
 msgid "Make Stock Entry"
 msgstr "Bestandserfassung vornehmen"
 
@@ -39575,20 +40207,20 @@
 msgid "Make project from a template."
 msgstr "Projekt aus einer Vorlage erstellen."
 
-#: stock/doctype/item/item.js:502
+#: stock/doctype/item/item.js:569
 msgid "Make {0} Variant"
 msgstr "{0} Variante erstellen"
 
-#: stock/doctype/item/item.js:504
+#: stock/doctype/item/item.js:571
 msgid "Make {0} Variants"
 msgstr "{0} Varianten erstellen"
 
-#: assets/doctype/asset/asset.js:85 assets/doctype/asset/asset.js:89
-#: assets/doctype/asset/asset.js:93 assets/doctype/asset/asset.js:98
-#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:109
-#: assets/doctype/asset/asset.js:113 assets/doctype/asset/asset.js:118
-#: assets/doctype/asset/asset.js:124 assets/doctype/asset/asset.js:136
-#: setup/doctype/company/company.js:112 setup/doctype/company/company.js:119
+#: assets/doctype/asset/asset.js:88 assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:112
+#: assets/doctype/asset/asset.js:122 assets/doctype/asset/asset.js:131
+#: assets/doctype/asset/asset.js:139 assets/doctype/asset/asset.js:148
+#: assets/doctype/asset/asset.js:158 assets/doctype/asset/asset.js:174
+#: setup/doctype/company/company.js:134 setup/doctype/company/company.js:145
 msgid "Manage"
 msgstr "Verwalten"
 
@@ -39612,22 +40244,22 @@
 msgid "Manage your orders"
 msgstr "Verwalten Sie Ihre Aufträge"
 
-#: setup/doctype/company/company.py:371
+#: setup/doctype/company/company.py:370
 msgid "Management"
 msgstr "Verwaltung"
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
-#: manufacturing/doctype/bom/bom.js:71 manufacturing/doctype/bom/bom.js:482
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: 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
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484 public/js/utils/party.js:273
-#: stock/doctype/delivery_note/delivery_note.js:138
-#: stock/doctype/purchase_receipt/purchase_receipt.js:113
-#: stock/doctype/purchase_receipt/purchase_receipt.js:198
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
+#: public/js/controllers/transaction.js:2537 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:99
 msgid "Mandatory"
 msgstr "Zwingend notwendig"
 
@@ -39653,7 +40285,7 @@
 msgid "Mandatory Depends On"
 msgstr "Bedingung für Pflichtfeld"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
 msgid "Mandatory Field"
 msgstr "Pflichtfeld"
 
@@ -39673,11 +40305,11 @@
 msgid "Mandatory Missing"
 msgstr "Obligatorisch fehlt"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:587
 msgid "Mandatory Purchase Order"
 msgstr "Obligatorische Bestellung"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
 msgid "Mandatory Purchase Receipt"
 msgstr "Obligatorischer Eingangsbeleg"
 
@@ -39745,7 +40377,7 @@
 msgid "Manual Inspection"
 msgstr "Manuelle Inspektion"
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:34
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:36
 msgid "Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again"
 msgstr "Manuelle Eingabe kann nicht erstellt werden! Deaktivieren Sie die automatische Eingabe für die verzögerte Buchhaltung in den Buchhaltungseinstellungen und versuchen Sie es erneut"
 
@@ -39841,7 +40473,7 @@
 msgid "Manufacture against Material Request"
 msgstr "Herstellen, gegen Material anfordern"
 
-#: stock/doctype/material_request/material_request_list.js:33
+#: stock/doctype/material_request/material_request_list.js:37
 msgid "Manufactured"
 msgstr "Hergestellt"
 
@@ -39973,10 +40605,15 @@
 msgid "Manufacturer Part Number"
 msgstr "Herstellernummer"
 
-#: public/js/controllers/buying.js:337
+#: public/js/controllers/buying.js:332
 msgid "Manufacturer Part Number <b>{0}</b> is invalid"
 msgstr "Die Herstellerteilenummer <b>{0}</b> ist ungültig"
 
+#. Description of a DocType
+#: stock/doctype/manufacturer/manufacturer.json
+msgid "Manufacturers used in Items"
+msgstr ""
+
 #. Name of a Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: selling/doctype/sales_order/sales_order_dashboard.py:26
@@ -40023,7 +40660,7 @@
 msgid "Manufacturing Manager"
 msgstr "Fertigungsleiter"
 
-#: stock/doctype/stock_entry/stock_entry.py:1689
+#: stock/doctype/stock_entry/stock_entry.py:1698
 msgid "Manufacturing Quantity is mandatory"
 msgstr "Eingabe einer Fertigungsmenge ist erforderlich"
 
@@ -40087,15 +40724,15 @@
 msgid "Manufacturing module is all set up!"
 msgstr "Das Fertigungsmodul ist fertig eingerichtet!"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:148
+#: stock/doctype/purchase_receipt/purchase_receipt.js:168
 msgid "Mapping Purchase Receipt ..."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:98
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:97
 msgid "Mapping Subcontracting Order ..."
 msgstr ""
 
-#: public/js/utils.js:843
+#: public/js/utils.js:913
 msgid "Mapping {0} ..."
 msgstr ""
 
@@ -40231,7 +40868,7 @@
 msgid "Margin Type"
 msgstr "Margenart"
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:19
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:15
 msgid "Margin View"
 msgstr "Margenansicht"
 
@@ -40241,6 +40878,15 @@
 msgid "Marital Status"
 msgstr "Familienstand"
 
+#: public/js/templates/crm_activities.html:39
+#: public/js/templates/crm_activities.html:82
+msgid "Mark As Closed"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:323
+msgid "Mark as unresolved"
+msgstr ""
+
 #. Name of a DocType
 #: crm/doctype/market_segment/market_segment.json
 msgid "Market Segment"
@@ -40276,7 +40922,7 @@
 msgid "Market Segment"
 msgstr "Marktsegment"
 
-#: setup/doctype/company/company.py:323
+#: setup/doctype/company/company.py:322
 msgid "Marketing"
 msgstr "Marketing"
 
@@ -40316,7 +40962,7 @@
 msgid "Material"
 msgstr "Material"
 
-#: manufacturing/doctype/work_order/work_order.js:613
+#: manufacturing/doctype/work_order/work_order.js:655
 msgid "Material Consumption"
 msgstr "Materialverbrauch"
 
@@ -40332,7 +40978,7 @@
 msgid "Material Consumption for Manufacture"
 msgstr "Materialverbrauch für die Herstellung"
 
-#: stock/doctype/stock_entry/stock_entry.js:420
+#: stock/doctype/stock_entry/stock_entry.js:480
 msgid "Material Consumption is not set in Manufacturing Settings."
 msgstr "Der Materialverbrauch ist in den Produktionseinstellungen nicht festgelegt."
 
@@ -40374,7 +41020,7 @@
 msgid "Material Issue"
 msgstr "Materialentnahme"
 
-#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:146
 msgid "Material Receipt"
 msgstr "Materialannahme"
 
@@ -40391,20 +41037,21 @@
 msgstr "Materialannahme"
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:435
-#: buying/doctype/request_for_quotation/request_for_quotation.js:297
-#: buying/doctype/supplier_quotation/supplier_quotation.js:31
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:34
+#: buying/doctype/purchase_order/purchase_order.js:504
+#: 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
-#: manufacturing/doctype/job_card/job_card.js:57
-#: manufacturing/doctype/production_plan/production_plan.js:113
-#: selling/doctype/sales_order/sales_order.js:570
+#: 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/stock_entry/stock_entry.js:192
-#: stock/doctype/stock_entry/stock_entry.js:277
+#: stock/doctype/stock_entry/stock_entry.js:210
+#: stock/doctype/stock_entry/stock_entry.js:313
 msgid "Material Request"
 msgstr "Materialanfrage"
 
@@ -40622,13 +41269,17 @@
 msgid "Material Request Planning"
 msgstr "Materialanforderungsplanung"
 
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:1
+msgid "Material Request Type"
+msgstr "Materialanfragetyp"
+
 #. Label of a Select field in DocType 'Item Reorder'
 #: stock/doctype/item_reorder/item_reorder.json
 msgctxt "Item Reorder"
 msgid "Material Request Type"
 msgstr "Materialanfragetyp"
 
-#: selling/doctype/sales_order/sales_order.py:1521
+#: selling/doctype/sales_order/sales_order.py:1544
 msgid "Material Request not created, as quantity for Raw Materials already available."
 msgstr "Materialanforderung nicht angelegt, da Menge für Rohstoffe bereits vorhanden."
 
@@ -40643,11 +41294,11 @@
 msgid "Material Request used to make this Stock Entry"
 msgstr "Materialanfrage wurde für die Erstellung dieser Lagerbuchung verwendet"
 
-#: controllers/subcontracting_controller.py:974
+#: controllers/subcontracting_controller.py:979
 msgid "Material Request {0} is cancelled or stopped"
 msgstr "Materialanfrage {0} wird storniert oder gestoppt"
 
-#: selling/doctype/sales_order/sales_order.js:839
+#: selling/doctype/sales_order/sales_order.js:978
 msgid "Material Request {0} submitted."
 msgstr "Materialanforderung {0} gebucht."
 
@@ -40663,7 +41314,7 @@
 msgid "Material Requests"
 msgstr "Materialwünsche"
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Material Requests Required"
 msgstr "Materialanforderungen erforderlich"
 
@@ -40674,12 +41325,12 @@
 msgid "Material Requests for which Supplier Quotations are not created"
 msgstr "Materialanfragen, für die keine Lieferantenangebote erstellt werden"
 
-#: stock/doctype/stock_entry/stock_entry_list.js:7
+#: stock/doctype/stock_entry/stock_entry_list.js:13
 msgid "Material Returned from WIP"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:67
-#: stock/doctype/material_request/material_request.js:119
+#: manufacturing/doctype/job_card/job_card.js:64
+#: stock/doctype/material_request/material_request.js:124
 msgid "Material Transfer"
 msgstr "Materialübertrag"
 
@@ -40720,7 +41371,7 @@
 msgid "Material Transfer"
 msgstr "Materialübertrag"
 
-#: stock/doctype/material_request/material_request.js:122
+#: stock/doctype/material_request/material_request.js:130
 msgid "Material Transfer (In Transit)"
 msgstr "Materialtransfer (In Transit)"
 
@@ -40774,8 +41425,8 @@
 msgid "Material Transferred for Subcontract"
 msgstr "Material für den Untervertrag übertragen"
 
-#: buying/doctype/purchase_order/purchase_order.js:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:360
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:206
 msgid "Material to Supplier"
 msgstr "Material an den Lieferanten"
 
@@ -40785,11 +41436,11 @@
 msgid "Materials Required (Exploded)"
 msgstr "Benötigte Materialien (erweitert)"
 
-#: controllers/subcontracting_controller.py:1164
+#: controllers/subcontracting_controller.py:1169
 msgid "Materials are already received against the {0} {1}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:636
+#: manufacturing/doctype/job_card/job_card.py:643
 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}"
 msgstr ""
 
@@ -40869,8 +41520,8 @@
 msgid "Max discount allowed for item: {0} is {1}%"
 msgstr "Der maximal zulässige Rabatt für den Artikel: {0} beträgt {1}%"
 
-#: manufacturing/doctype/work_order/work_order.js:715
-#: stock/doctype/pick_list/pick_list.js:147
+#: manufacturing/doctype/work_order/work_order.js:768
+#: stock/doctype/pick_list/pick_list.js:176
 msgid "Max: {0}"
 msgstr "Max: {0}"
 
@@ -40892,11 +41543,11 @@
 msgid "Maximum Payment Amount"
 msgstr "Maximaler Zahlungsbetrag"
 
-#: stock/doctype/stock_entry/stock_entry.py:2842
+#: stock/doctype/stock_entry/stock_entry.py:2878
 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
 msgstr "Maximum Samples - {0} kann für Batch {1} und Item {2} beibehalten werden."
 
-#: stock/doctype/stock_entry/stock_entry.py:2833
+#: stock/doctype/stock_entry/stock_entry.py:2869
 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
 msgstr "Maximum Samples - {0} wurden bereits für Batch {1} und Artikel {2} in Batch {3} gespeichert."
 
@@ -40918,11 +41569,11 @@
 msgid "Maximum Value"
 msgstr "Maximalwert"
 
-#: controllers/selling_controller.py:194
+#: controllers/selling_controller.py:195
 msgid "Maximum discount for Item {0} is {1}%"
 msgstr "Der maximale Rabatt für Artikel {0} beträgt {1}%"
 
-#: public/js/utils/barcode_scanner.js:94
+#: public/js/utils/barcode_scanner.js:99
 msgid "Maximum quantity scanned for item {0}."
 msgstr ""
 
@@ -40960,7 +41611,7 @@
 msgid "Meeting"
 msgstr "Treffen"
 
-#: stock/stock_ledger.py:1685
+#: stock/stock_ledger.py:1705
 msgid "Mention Valuation Rate in the Item master."
 msgstr "Erwähnen Sie die Bewertungsrate im Artikelstamm."
 
@@ -40988,11 +41639,11 @@
 msgid "Mention if non-standard receivable account applicable"
 msgstr "Vermerken, wenn kein Standard-Forderungskonto verwendbar ist"
 
-#: accounts/doctype/account/account.js:151
+#: accounts/doctype/account/account.js:152
 msgid "Merge"
 msgstr "Zusammenführen"
 
-#: accounts/doctype/account/account.js:51
+#: accounts/doctype/account/account.js:46
 msgid "Merge Account"
 msgstr "Konto zusammenfassen"
 
@@ -41012,15 +41663,15 @@
 msgid "Merge Similar Account Heads"
 msgstr ""
 
-#: public/js/utils.js:873
+#: public/js/utils.js:943
 msgid "Merge taxes from multiple documents"
 msgstr ""
 
-#: accounts/doctype/account/account.js:123
+#: accounts/doctype/account/account.js:124
 msgid "Merge with Existing Account"
 msgstr "Mit existierendem Konto zusammenfassen"
 
-#: accounts/doctype/cost_center/cost_center.js:66
+#: accounts/doctype/cost_center/cost_center.js:68
 msgid "Merge with existing"
 msgstr "Mit Existierenden zusammenführen"
 
@@ -41030,7 +41681,7 @@
 msgid "Merged"
 msgstr "Zusammengeführt"
 
-#: accounts/doctype/account/account.py:546
+#: accounts/doctype/account/account.py:565
 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency"
 msgstr ""
 
@@ -41038,23 +41689,27 @@
 msgid "Merging {0} of {1}"
 msgstr ""
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Message"
+msgstr "Nachricht"
+
 #. Label of a Text field in DocType 'Payment Request'
 #: accounts/doctype/payment_request/payment_request.json
 msgctxt "Payment Request"
 msgid "Message"
-msgstr "Botschaft"
+msgstr "Nachricht"
 
 #. Label of a Text field in DocType 'Project'
 #: projects/doctype/project/project.json
 msgctxt "Project"
 msgid "Message"
-msgstr "Botschaft"
+msgstr "Nachricht"
 
 #. Label of a Text field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
 msgid "Message"
-msgstr "Botschaft"
+msgstr "Nachricht"
 
 #. Label of a HTML field in DocType 'Payment Gateway Account'
 #: accounts/doctype/payment_gateway_account/payment_gateway_account.json
@@ -41068,7 +41723,7 @@
 msgid "Message Examples"
 msgstr "Mitteilungsbeispiele"
 
-#: accounts/doctype/payment_request/payment_request.js:38
+#: accounts/doctype/payment_request/payment_request.js:47
 #: setup/doctype/email_digest/email_digest.js:26
 msgid "Message Sent"
 msgstr "Mitteilung gesendet"
@@ -41097,6 +41752,10 @@
 msgid "Messages greater than 160 characters will be split into multiple messages"
 msgstr "Mitteilungen mit mehr als 160 Zeichen werden in mehrere Nachrichten aufgeteilt"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Meta Data"
+msgstr ""
+
 #: setup/setup_wizard/operations/install_fixtures.py:263
 #: setup/setup_wizard/operations/install_fixtures.py:379
 msgid "Middle Income"
@@ -41170,7 +41829,7 @@
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
 msgid "Min Qty (As Per Stock UOM)"
-msgstr ""
+msgstr "Mindestmenge (gemäß Lager-ME)"
 
 #: accounts/doctype/pricing_rule/pricing_rule.py:216
 msgid "Min Qty can not be greater than Max Qty"
@@ -41263,32 +41922,32 @@
 msgid "Mismatch"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1132
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1191
 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:548
-#: accounts/doctype/sales_invoice/sales_invoice.py:2044
-#: accounts/doctype/sales_invoice/sales_invoice.py:2602
+#: 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
 msgid "Missing Account"
 msgstr "Fehlendes Konto"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1403
+#: accounts/doctype/sales_invoice/sales_invoice.py:1414
 msgid "Missing Asset"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:179 assets/doctype/asset/asset.py:265
+#: accounts/doctype/gl_entry/gl_entry.py:169 assets/doctype/asset/asset.py:267
 msgid "Missing Cost Center"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:309
+#: assets/doctype/asset/asset.py:311
 msgid "Missing Finance Book"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1280
+#: stock/doctype/stock_entry/stock_entry.py:1289
 msgid "Missing Finished Good"
 msgstr ""
 
@@ -41308,7 +41967,7 @@
 msgid "Missing Serial No Bundle"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:743
+#: selling/doctype/customer/customer.py:754
 msgid "Missing Values Required"
 msgstr "Angaben zu fehlenden Werten erforderlich"
 
@@ -41316,12 +41975,12 @@
 msgid "Missing Warehouse"
 msgstr "Fehlendes Lager"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:132
+#: stock/doctype/delivery_trip/delivery_trip.js:153
 msgid "Missing email template for dispatch. Please set one in Delivery Settings."
 msgstr "Fehlende E-Mail-Vorlage für den Versand. Bitte legen Sie einen in den Liefereinstellungen fest."
 
 #: manufacturing/doctype/bom/bom.py:957
-#: manufacturing/doctype/work_order/work_order.py:979
+#: manufacturing/doctype/work_order/work_order.py:993
 msgid "Missing value"
 msgstr "Fehlender Wert"
 
@@ -41461,7 +42120,7 @@
 msgid "Mobile No"
 msgstr "Mobilfunknummer"
 
-#: public/js/utils/contact_address_quick_entry.js:48
+#: public/js/utils/contact_address_quick_entry.js:51
 msgid "Mobile Number"
 msgstr "Mobilfunknummer"
 
@@ -41470,30 +42129,30 @@
 #: accounts/report/purchase_register/purchase_register.py:201
 #: accounts/report/sales_register/sales_register.py:222
 msgid "Mode Of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Name of a DocType
 #: accounts/doctype/mode_of_payment/mode_of_payment.json
-#: accounts/doctype/payment_order/payment_order.js:109
+#: accounts/doctype/payment_order/payment_order.js:124
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:40
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:47
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:35
 #: accounts/report/purchase_register/purchase_register.js:40
 #: accounts/report/sales_register/sales_register.js:40
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'Cashier Closing Payments'
 #: accounts/doctype/cashier_closing_payments/cashier_closing_payments.json
 msgctxt "Cashier Closing Payments"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'Journal Entry'
 #: accounts/doctype/journal_entry/journal_entry.json
 msgctxt "Journal Entry"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Data field in DocType 'Mode of Payment'
 #. Label of a Link in the Accounting Workspace
@@ -41501,88 +42160,88 @@
 #: accounts/workspace/accounting/accounting.json
 msgctxt "Mode of Payment"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'Overdue Payment'
 #: accounts/doctype/overdue_payment/overdue_payment.json
 msgctxt "Overdue Payment"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'POS Closing Entry Detail'
 #: accounts/doctype/pos_closing_entry_detail/pos_closing_entry_detail.json
 msgctxt "POS Closing Entry Detail"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'POS Opening Entry Detail'
 #: accounts/doctype/pos_opening_entry_detail/pos_opening_entry_detail.json
 msgctxt "POS Opening Entry Detail"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'POS Payment Method'
 #: accounts/doctype/pos_payment_method/pos_payment_method.json
 msgctxt "POS Payment Method"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'Payment Order Reference'
 #: accounts/doctype/payment_order_reference/payment_order_reference.json
 msgctxt "Payment Order Reference"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'Payment Request'
 #: accounts/doctype/payment_request/payment_request.json
 msgctxt "Payment Request"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'Payment Schedule'
 #: accounts/doctype/payment_schedule/payment_schedule.json
 msgctxt "Payment Schedule"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'Payment Term'
 #: accounts/doctype/payment_term/payment_term.json
 msgctxt "Payment Term"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'Payment Terms Template Detail'
 #: accounts/doctype/payment_terms_template_detail/payment_terms_template_detail.json
 msgctxt "Payment Terms Template Detail"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Label of a Link field in DocType 'Sales Invoice Payment'
 #: accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
 msgctxt "Sales Invoice Payment"
 msgid "Mode of Payment"
-msgstr "Zahlungsart"
+msgstr "Zahlungsweise"
 
 #. Name of a DocType
 #: accounts/doctype/mode_of_payment_account/mode_of_payment_account.json
 msgid "Mode of Payment Account"
-msgstr "Art des Zahlungskontos"
+msgstr "Konto für Zahlungsweise"
 
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:35
 msgid "Mode of Payments"
-msgstr "Zahlungsweise"
+msgstr "Zahlungsweisen"
 
 #. Label of a Data field in DocType 'Vehicle'
 #: setup/doctype/vehicle/vehicle.json
@@ -41594,7 +42253,7 @@
 #: accounts/doctype/pos_closing_entry/pos_closing_entry.json
 msgctxt "POS Closing Entry"
 msgid "Modes of Payment"
-msgstr "Zahlungsmodi"
+msgstr "Zahlungsweisen"
 
 #: templates/pages/projects.html:69
 msgid "Modified By"
@@ -41714,21 +42373,21 @@
 msgid "Month(s) after the end of the invoice month"
 msgstr "Monat (e) nach dem Ende des Rechnungsmonats"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:67
+#: 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
-#: buying/report/purchase_analytics/purchase_analytics.js:62
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
-#: manufacturing/report/production_analytics/production_analytics.js:35
-#: public/js/financial_statements.js:217
+#: 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
+#: public/js/financial_statements.js:226
 #: public/js/purchase_trends_filters.js:19 public/js/sales_trends_filters.js:11
-#: public/js/stock_analytics.js:53
-#: selling/report/sales_analytics/sales_analytics.js:62
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
-#: stock/report/stock_analytics/stock_analytics.js:81
-#: support/report/issue_analytics/issue_analytics.js:43
+#: public/js/stock_analytics.js:83
+#: selling/report/sales_analytics/sales_analytics.js:69
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:32
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:32
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:32
+#: stock/report/stock_analytics/stock_analytics.js:80
+#: support/report/issue_analytics/issue_analytics.js:42
 msgid "Monthly"
 msgstr "Monatlich"
 
@@ -41778,7 +42437,7 @@
 msgstr "Monatlich abgeschlossene Arbeitsaufträge"
 
 #. Name of a DocType
-#: accounts/doctype/cost_center/cost_center_tree.js:44
+#: accounts/doctype/cost_center/cost_center_tree.js:69
 #: accounts/doctype/monthly_distribution/monthly_distribution.json
 msgid "Monthly Distribution"
 msgstr "Monatsbezogene Verteilung"
@@ -42024,14 +42683,20 @@
 msgid "More columns found than expected. Please compare the uploaded file with standard template"
 msgstr "Es wurden mehr Spalten gefunden als erwartet. Bitte vergleichen Sie die hochgeladene Datei mit der Standardvorlage"
 
-#: stock/doctype/batch/batch.js:111 stock/doctype/batch/batch_dashboard.py:10
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:58
+#: stock/dashboard/item_dashboard_list.html:52 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:128 stock/doctype/batch/batch_dashboard.py:10
 msgid "Move"
 msgstr "Verschieben"
 
-#: stock/dashboard/item_dashboard.js:205
+#: stock/dashboard/item_dashboard.js:212
 msgid "Move Item"
 msgstr "Element verschieben"
 
+#: manufacturing/doctype/plant_floor/plant_floor.js:211
+msgid "Move Stock"
+msgstr ""
+
 #: templates/includes/macros.html:169
 msgid "Move to Cart"
 msgstr ""
@@ -42074,11 +42739,11 @@
 msgid "Multi Currency"
 msgstr "Unterschiedliche Währungen"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:42
+#: manufacturing/doctype/bom_creator/bom_creator.js:41
 msgid "Multi-level BOM Creator"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:369
+#: selling/doctype/customer/customer.py:381
 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually."
 msgstr ""
 
@@ -42093,7 +42758,7 @@
 msgid "Multiple Tier Program"
 msgstr "Mehrstufiges Programm"
 
-#: stock/doctype/item/item.js:106
+#: stock/doctype/item/item.js:138
 msgid "Multiple Variants"
 msgstr "Mehrere Varianten"
 
@@ -42101,11 +42766,11 @@
 msgid "Multiple Warehouse Accounts"
 msgstr "Mehrere Lager-Konten"
 
-#: controllers/accounts_controller.py:899
+#: controllers/accounts_controller.py:951
 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
 msgstr "Mehrere Geschäftsjahre existieren für das Datum {0}. Bitte setzen Unternehmen im Geschäftsjahr"
 
-#: stock/doctype/stock_entry/stock_entry.py:1287
+#: stock/doctype/stock_entry/stock_entry.py:1296
 msgid "Multiple items cannot be marked as finished item"
 msgstr ""
 
@@ -42142,9 +42807,9 @@
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.py:86
 #: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:357
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:29
-#: manufacturing/doctype/bom_creator/bom_creator.js:45
-#: public/js/utils/serial_no_batch_selector.js:404
-#: selling/doctype/quotation/quotation.js:261
+#: manufacturing/doctype/bom_creator/bom_creator.js:44
+#: public/js/utils/serial_no_batch_selector.js:413
+#: selling/doctype/quotation/quotation.js:273
 msgid "Name"
 msgstr "Name"
 
@@ -42202,7 +42867,7 @@
 msgid "Name of Beneficiary"
 msgstr "Name des Begünstigten"
 
-#: accounts/doctype/account/account_tree.js:107
+#: accounts/doctype/account/account_tree.js:124
 msgid "Name of new Account. Note: Please don't create accounts for Customers and Suppliers"
 msgstr "Name des neuen Kontos. Hinweis: Bitte keine Konten für Kunden und Lieferanten erstellen"
 
@@ -42381,11 +43046,11 @@
 msgid "Needs Analysis"
 msgstr "Muss analysiert werden"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:431
 msgid "Negative Quantity is not allowed"
 msgstr "Negative Menge ist nicht erlaubt"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:381
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:435
 msgid "Negative Valuation Rate is not allowed"
 msgstr "Negative Bewertung ist nicht erlaubt"
 
@@ -42682,6 +43347,10 @@
 #: 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
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:124
 #: templates/includes/order/order_taxes.html:5
 msgid "Net Total"
 msgstr "Nettosumme"
@@ -42869,15 +43538,15 @@
 msgid "Net Weight UOM"
 msgstr "Nettogewichtmaßeinheit"
 
-#: controllers/accounts_controller.py:1210
+#: controllers/accounts_controller.py:1277
 msgid "Net total calculation precision loss"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:164
+#: accounts/doctype/account/account_tree.js:241
 msgid "New"
 msgstr "Neu"
 
-#: accounts/doctype/account/account_tree.js:106
+#: accounts/doctype/account/account_tree.js:122
 msgid "New Account Name"
 msgstr "Neuer Kontoname"
 
@@ -42891,7 +43560,7 @@
 msgid "New Assets (This Year)"
 msgstr "Neue Vermögenswerte (dieses Jahr)"
 
-#: manufacturing/doctype/bom/bom_tree.js:56
+#: manufacturing/doctype/bom/bom_tree.js:55
 msgid "New BOM"
 msgstr "Neue Stückliste"
 
@@ -42919,21 +43588,21 @@
 msgid "New Balance In Base Currency"
 msgstr "Neuer Kontostand in der Basiswährung"
 
-#: stock/doctype/batch/batch.js:127
+#: stock/doctype/batch/batch.js:146
 msgid "New Batch ID (Optional)"
 msgstr "Neue Batch-ID (optional)"
 
-#: stock/doctype/batch/batch.js:121
+#: stock/doctype/batch/batch.js:140
 msgid "New Batch Qty"
 msgstr "Neue Batch-Menge"
 
-#: accounts/doctype/account/account_tree.js:100
-#: accounts/doctype/cost_center/cost_center_tree.js:16
+#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/cost_center/cost_center_tree.js:18
 #: setup/doctype/company/company_tree.js:23
 msgid "New Company"
 msgstr "Neues Unternehmen anlegen"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:22
+#: accounts/doctype/cost_center/cost_center_tree.js:26
 msgid "New Cost Center Name"
 msgstr "Neuer Kostenstellenname"
 
@@ -42953,7 +43622,8 @@
 msgid "New Employee"
 msgstr "Neuer Angestellter"
 
-#: public/js/utils/crm_activities.js:81
+#: public/js/templates/crm_activities.html:14
+#: public/js/utils/crm_activities.js:85
 msgid "New Event"
 msgstr "Neues Event"
 
@@ -42979,6 +43649,10 @@
 msgid "New Location"
 msgstr "Neuer Ort"
 
+#: public/js/templates/crm_notes.html:7
+msgid "New Note"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
@@ -43013,7 +43687,7 @@
 msgid "New Sales Orders"
 msgstr "Neue Aufträge"
 
-#: setup/doctype/sales_person/sales_person_tree.js:5
+#: setup/doctype/sales_person/sales_person_tree.js:3
 msgid "New Sales Person Name"
 msgstr "Neuer Verkaufspersonenname"
 
@@ -43021,15 +43695,16 @@
 msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
 msgstr "\"Neue Seriennummer\" kann keine Lagerangabe enthalten. Lagerangaben müssen durch eine Lagerbuchung oder einen Eingangsbeleg erstellt werden"
 
-#: public/js/utils/crm_activities.js:63
+#: public/js/templates/crm_activities.html:8
+#: public/js/utils/crm_activities.js:67
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: manufacturing/doctype/bom/bom.js:112
+#: manufacturing/doctype/bom/bom.js:111
 msgid "New Version"
 msgstr "Neue Version"
 
-#: stock/doctype/warehouse/warehouse_tree.js:15
+#: stock/doctype/warehouse/warehouse_tree.js:16
 msgid "New Warehouse Name"
 msgstr "Neuer Lagername"
 
@@ -43039,10 +43714,14 @@
 msgid "New Workplace"
 msgstr "Neuer Arbeitsplatz"
 
-#: selling/doctype/customer/customer.py:338
+#: selling/doctype/customer/customer.py:350
 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}"
 msgstr "Neues Kreditlimit ist weniger als der aktuell ausstehende Betrag für den Kunden. Kreditlimit muss mindestens {0} sein"
 
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:3
+msgid "New fiscal year created :- "
+msgstr ""
+
 #. Description of the 'Generate New Invoices Past Due Date' (Check) field in
 #. DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
@@ -43050,7 +43729,7 @@
 msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
 msgstr "Neue Rechnungen werden planmäßig erstellt, auch wenn aktuelle Rechnungen nicht bezahlt wurden oder überfällig sind"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:218
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:255
 msgid "New release date should be in the future"
 msgstr "Das neue Erscheinungsdatum sollte in der Zukunft liegen"
 
@@ -43058,7 +43737,7 @@
 msgid "New task"
 msgstr "Neuer Vorgang"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:211
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:213
 msgid "New {0} pricing rules are created"
 msgstr "Neue {0} Preisregeln werden erstellt"
 
@@ -43200,7 +43879,7 @@
 msgid "No Account matched these filters: {}"
 msgstr "Kein Konto entspricht diesen Filtern: {}"
 
-#: quality_management/doctype/quality_review/quality_review_list.js:6
+#: quality_management/doctype/quality_review/quality_review_list.js:5
 msgid "No Action"
 msgstr "Keine Aktion"
 
@@ -43210,44 +43889,52 @@
 msgid "No Answer"
 msgstr "Keine Antwort"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2146
+#: accounts/doctype/sales_invoice/sales_invoice.py:2115
 msgid "No Customer found for Inter Company Transactions which represents company {0}"
 msgstr "Für Transaktionen zwischen Unternehmen, die das Unternehmen {0} darstellen, wurde kein Kunde gefunden."
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:118
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:362
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:115
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:350
 msgid "No Customers found with selected options."
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:48
+#: selling/page/sales_funnel/sales_funnel.js:59
 msgid "No Data"
 msgstr "Keine Daten"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:122
+#: stock/doctype/delivery_trip/delivery_trip.js:143
 msgid "No Delivery Note selected for Customer {}"
 msgstr "Kein Lieferschein für den Kunden {} ausgewählt"
 
-#: stock/get_item_details.py:199
+#: stock/get_item_details.py:204
 msgid "No Item with Barcode {0}"
 msgstr "Kein Artikel mit Barcode {0}"
 
-#: stock/get_item_details.py:203
+#: stock/get_item_details.py:208
 msgid "No Item with Serial No {0}"
 msgstr "Kein Artikel mit Seriennummer {0}"
 
-#: controllers/subcontracting_controller.py:1084
+#: controllers/subcontracting_controller.py:1089
 msgid "No Items selected for transfer."
 msgstr "Keine Artikel zur Übertragung ausgewählt."
 
-#: selling/doctype/sales_order/sales_order.js:668
+#: selling/doctype/sales_order/sales_order.js:769
 msgid "No Items with Bill of Materials to Manufacture"
 msgstr "Keine Elemente mit Bill of Materials zu Herstellung"
 
-#: selling/doctype/sales_order/sales_order.js:782
+#: selling/doctype/sales_order/sales_order.js:898
 msgid "No Items with Bill of Materials."
 msgstr "Keine Artikel mit Stückliste."
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:213
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:15
+msgid "No Matching Bank Transactions Found"
+msgstr ""
+
+#: public/js/templates/crm_notes.html:44
+msgid "No Notes"
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:219
 msgid "No Outstanding Invoices found for this party"
 msgstr "Für diese Partei wurden keine ausstehenden Rechnungen gefunden"
 
@@ -43255,28 +43942,32 @@
 msgid "No POS Profile found. Please create a New POS Profile first"
 msgstr "Kein POS-Profil gefunden. Bitte erstellen Sie zunächst ein neues POS-Profil"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1420
-#: accounts/doctype/journal_entry/journal_entry.py:1486
-#: accounts/doctype/journal_entry/journal_entry.py:1509
-#: stock/doctype/item/item.py:1332
+#: 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
 msgid "No Permission"
 msgstr "Keine Berechtigung"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:23
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:38
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:22
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:39
 msgid "No Records for these settings."
 msgstr "Keine Datensätze für diese Einstellungen."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
-#: accounts/doctype/sales_invoice/sales_invoice.py:949
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:337
+#: accounts/doctype/sales_invoice/sales_invoice.py:966
 msgid "No Remarks"
 msgstr "Keine Anmerkungen"
 
-#: stock/dashboard/item_dashboard.js:147
+#: stock/dashboard/item_dashboard.js:150
 msgid "No Stock Available Currently"
 msgstr "Derzeit kein Lagerbestand verfügbar"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2130
+#: public/js/templates/call_link.html:30
+msgid "No Summary"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.py:2099
 msgid "No Supplier found for Inter Company Transactions which represents company {0}"
 msgstr "Es wurde kein Lieferant für Transaktionen zwischen Unternehmen gefunden, die das Unternehmen {0} darstellen."
 
@@ -43288,32 +43979,32 @@
 msgid "No Terms"
 msgstr "Keine Bedingungen"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:211
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:216
 msgid "No Unreconciled Invoices and Payments found for this party and account"
 msgstr "Für diese Partei und dieses Konto wurden keine nicht abgeglichenen Rechnungen und Zahlungen gefunden"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:215
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:221
 msgid "No Unreconciled Payments found for this party"
 msgstr "Für diese Partei wurden keine nicht abgestimmten Zahlungen gefunden"
 
-#: manufacturing/doctype/production_plan/production_plan.py:682
+#: manufacturing/doctype/production_plan/production_plan.py:691
 msgid "No Work Orders were created"
 msgstr "Es wurden keine Arbeitsaufträge erstellt"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:727
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:606
+#: stock/doctype/purchase_receipt/purchase_receipt.py:726
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:607
 msgid "No accounting entries for the following warehouses"
 msgstr "Keine Buchungen für die folgenden Lager"
 
-#: selling/doctype/sales_order/sales_order.py:651
+#: selling/doctype/sales_order/sales_order.py:657
 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured"
 msgstr "Für Artikel {0} wurde keine aktive Stückliste gefunden. Die Lieferung per Seriennummer kann nicht gewährleistet werden"
 
-#: stock/doctype/item_variant_settings/item_variant_settings.js:31
+#: stock/doctype/item_variant_settings/item_variant_settings.js:46
 msgid "No additional fields available"
 msgstr "Keine zusätzlichen Felder verfügbar"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:429
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:417
 msgid "No billing email found for customer: {0}"
 msgstr "Keine Rechnungs-E-Mail für den Kunden gefunden: {0}"
 
@@ -43321,7 +44012,7 @@
 msgid "No contacts with email IDs found."
 msgstr "Keine Kontakte mit E-Mail-IDs gefunden."
 
-#: selling/page/sales_funnel/sales_funnel.js:115
+#: selling/page/sales_funnel/sales_funnel.js:130
 msgid "No data for this period"
 msgstr "Keine Daten für diesen Zeitraum"
 
@@ -43329,7 +44020,7 @@
 msgid "No data found. Seems like you uploaded a blank file"
 msgstr "Keine Daten gefunden. Es scheint, als hätten Sie eine leere Datei hochgeladen"
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:38
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:37
 msgid "No data to export"
 msgstr "Keine zu exportierenden Daten"
 
@@ -43341,11 +44032,15 @@
 msgid "No employee was scheduled for call popup"
 msgstr "Es war kein Mitarbeiter für das Anruf-Popup eingeplant"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1064
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:486
+msgid "No failed logs"
+msgstr "Keine fehlgeschlagenen Protokolle"
+
+#: accounts/doctype/payment_entry/payment_entry.js:1289
 msgid "No gain or loss in the exchange rate"
 msgstr "Kein Gewinn oder Verlust im Wechselkurs"
 
-#: controllers/subcontracting_controller.py:1005
+#: controllers/subcontracting_controller.py:1010
 msgid "No item available for transfer."
 msgstr "Kein Artikel zur Übertragung verfügbar."
 
@@ -43358,28 +44053,38 @@
 msgid "No items are available in the sales order {0} for production"
 msgstr "Im Kundenauftrag {0} sind keine Artikel für die Produktion verfügbar"
 
-#: selling/page/point_of_sale/pos_item_selector.js:320
+#: selling/page/point_of_sale/pos_item_selector.js:317
 msgid "No items found. Scan barcode again."
 msgstr "Keine Elemente gefunden. Scannen Sie den Barcode erneut."
 
+#: selling/page/point_of_sale/pos_item_cart.js:76
+msgid "No items in cart"
+msgstr ""
+
 #: setup/doctype/email_digest/email_digest.py:168
 msgid "No items to be received are overdue"
 msgstr "Keine zu übergebenden Artikel sind überfällig"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:424
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:423
 msgid "No matches occurred via auto reconciliation"
 msgstr "Keine Treffer beim automatischen Abgleich"
 
-#: manufacturing/doctype/production_plan/production_plan.py:879
+#: manufacturing/doctype/production_plan/production_plan.py:888
 msgid "No material request created"
 msgstr "Es wurde keine Materialanforderung erstellt"
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:198
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:199
 msgid "No more children on Left"
-msgstr ""
+msgstr "Keine Unterpunkte auf der linken Seite"
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:212
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:213
 msgid "No more children on Right"
+msgstr "Keine Unterpunkte auf der rechten Seite"
+
+#. Label of a Int field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "No of Docs"
 msgstr ""
 
 #. Label of a Select field in DocType 'Lead'
@@ -43433,6 +44138,14 @@
 msgid "No of Visits"
 msgstr "Anzahl der Besuche"
 
+#: public/js/templates/crm_activities.html:104
+msgid "No open event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:57
+msgid "No open task"
+msgstr ""
+
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:315
 msgid "No outstanding invoices found"
 msgstr "Keine offenen Rechnungen gefunden"
@@ -43441,15 +44154,15 @@
 msgid "No outstanding invoices require exchange rate revaluation"
 msgstr "Keine ausstehenden Rechnungen erfordern eine Neubewertung des Wechselkurses"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1801
+#: accounts/doctype/payment_entry/payment_entry.py:1820
 msgid "No outstanding {0} found for the {1} {2} which qualify the filters you have specified."
 msgstr "Für {1} {2} wurden kein ausstehender Beleg vom Typ {0} gefunden, der den angegebenen Filtern entspricht."
 
-#: public/js/controllers/buying.js:439
+#: public/js/controllers/buying.js:436
 msgid "No pending Material Requests found to link for the given items."
 msgstr "Es wurden keine ausstehenden Materialanforderungen gefunden, die für die angegebenen Artikel verknüpft sind."
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:436
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:424
 msgid "No primary email found for customer: {0}"
 msgstr "Keine primäre E-Mail-Adresse für den Kunden gefunden: {0}"
 
@@ -43463,15 +44176,15 @@
 msgid "No record found"
 msgstr "Kein Datensatz gefunden"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:677
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:687
 msgid "No records found in Allocation table"
 msgstr "Keine Datensätze in der Zuteilungstabelle gefunden"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:579
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:584
 msgid "No records found in the Invoices table"
 msgstr "Keine Datensätze in der Tabelle Rechnungen gefunden"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:582
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:587
 msgid "No records found in the Payments table"
 msgstr "Keine Datensätze in der Zahlungstabelle gefunden"
 
@@ -43482,7 +44195,7 @@
 msgid "No stock transactions can be created or modified before this date."
 msgstr ""
 
-#: controllers/accounts_controller.py:2435
+#: controllers/accounts_controller.py:2520
 msgid "No updates pending for reposting"
 msgstr ""
 
@@ -43490,17 +44203,17 @@
 msgid "No values"
 msgstr "Keine Werte"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:340
 msgid "No {0} Accounts found for this company."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2197
+#: accounts/doctype/sales_invoice/sales_invoice.py:2166
 msgid "No {0} found for Inter Company Transactions."
 msgstr "Keine {0} für Inter-Company-Transaktionen gefunden."
 
-#: assets/doctype/asset/asset.js:239
+#: assets/doctype/asset/asset.js:274
 msgid "No."
-msgstr "Nein."
+msgstr "Nr."
 
 #. Label of a Select field in DocType 'Prospect'
 #: crm/doctype/prospect/prospect.json
@@ -43508,7 +44221,7 @@
 msgid "No. of Employees"
 msgstr "Anzahl Mitarbeiter"
 
-#: manufacturing/doctype/workstation/workstation.js:42
+#: manufacturing/doctype/workstation/workstation.js:66
 msgid "No. of parallel job cards which can be allowed on this workstation. Example: 2 would mean this workstation can process production for two Work Orders at a time."
 msgstr ""
 
@@ -43534,7 +44247,7 @@
 msgid "Non Profit"
 msgstr "Gemeinnützig"
 
-#: manufacturing/doctype/bom/bom.py:1305
+#: manufacturing/doctype/bom/bom.py:1304
 msgid "Non stock items"
 msgstr "Nicht vorrätige Artikel"
 
@@ -43545,7 +44258,7 @@
 msgid "None"
 msgstr "Keine"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:315
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:369
 msgid "None of the items have any change in quantity or value."
 msgstr "Keiner der Artikel hat irgendeine Änderung bei Mengen oder Kosten."
 
@@ -43558,11 +44271,11 @@
 
 #: 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:525
-#: assets/doctype/asset/asset.js:530 assets/doctype/asset/asset.js:547
+#: accounts/doctype/sales_invoice/sales_invoice.py:538
+#: assets/doctype/asset/asset.js:603 assets/doctype/asset/asset.js:620
 #: controllers/buying_controller.py:206
 #: selling/doctype/product_bundle/product_bundle.py:71
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:48
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:72
 msgid "Not Allowed"
 msgstr "Nicht Erlaubt"
 
@@ -43578,8 +44291,8 @@
 msgid "Not Applicable"
 msgstr "Nicht andwendbar"
 
-#: selling/page/point_of_sale/pos_controller.js:671
-#: selling/page/point_of_sale/pos_controller.js:694
+#: selling/page/point_of_sale/pos_controller.js:703
+#: selling/page/point_of_sale/pos_controller.js:732
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
@@ -43602,8 +44315,8 @@
 msgid "Not Initiated"
 msgstr "Nicht initiiert"
 
-#: buying/doctype/purchase_order/purchase_order.py:744
-#: templates/pages/material_request_info.py:21 templates/pages/order.py:32
+#: buying/doctype/purchase_order/purchase_order.py:747
+#: templates/pages/material_request_info.py:21 templates/pages/order.py:34
 #: templates/pages/rfq.py:48
 msgid "Not Permitted"
 msgstr "Nicht zulässig"
@@ -43623,7 +44336,7 @@
 msgstr "Keine Angabe"
 
 #: manufacturing/doctype/production_plan/production_plan_list.js:7
-#: manufacturing/doctype/work_order/work_order_list.js:7
+#: manufacturing/doctype/work_order/work_order_list.js:15
 #: stock/doctype/material_request/material_request_list.js:9
 msgid "Not Started"
 msgstr "Nicht begonnen"
@@ -43655,11 +44368,11 @@
 msgid "Not allow to set alternative item for the item {0}"
 msgstr "Nicht zulassen, alternative Artikel für den Artikel {0} festzulegen"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:48
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:52
 msgid "Not allowed to create accounting dimension for {0}"
 msgstr "Kontodimension für {0} darf nicht erstellt werden"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:254
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:265
 msgid "Not allowed to update stock transactions older than {0}"
 msgstr "Aktualisierung von Transaktionen älter als {0} nicht erlaubt"
 
@@ -43667,31 +44380,37 @@
 msgid "Not authorized since {0} exceeds limits"
 msgstr "Nicht zugelassen, da {0} die Grenzwerte überschreitet"
 
-#: accounts/doctype/gl_entry/gl_entry.py:445
+#: accounts/doctype/gl_entry/gl_entry.py:399
 msgid "Not authorized to edit frozen Account {0}"
 msgstr "Keine Berechtigung gesperrtes Konto {0} zu bearbeiten"
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "Not in Stock"
+msgstr ""
+
 #: templates/includes/products_as_grid.html:20
 msgid "Not in stock"
 msgstr "Nicht lagernd"
 
-#: buying/doctype/purchase_order/purchase_order.py:667
-#: manufacturing/doctype/work_order/work_order.py:1256
-#: manufacturing/doctype/work_order/work_order.py:1390
-#: manufacturing/doctype/work_order/work_order.py:1440
-#: selling/doctype/sales_order/sales_order.py:755
-#: selling/doctype/sales_order/sales_order.py:1504
+#: 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
 msgid "Not permitted"
 msgstr "Nicht gestattet"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:240
+#: 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:1607
-#: public/js/controllers/buying.js:440 selling/doctype/customer/customer.py:125
-#: selling/doctype/sales_order/sales_order.js:957
-#: stock/doctype/item/item.js:426 stock/doctype/item/item.py:539
-#: stock/doctype/stock_entry/stock_entry.py:1288
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:732
+#: 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
+#: 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
+#: templates/pages/timelog_info.html:43
 msgid "Note"
 msgstr "Anmerkung"
 
@@ -43728,15 +44447,15 @@
 msgid "Note: Email will not be sent to disabled users"
 msgstr "Hinweis: E-Mail wird nicht an gesperrte Nutzer gesendet"
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:53
+#: manufacturing/doctype/blanket_order/blanket_order.py:91
 msgid "Note: Item {0} added multiple times"
 msgstr "Hinweis: Element {0} wurde mehrmals hinzugefügt"
 
-#: controllers/accounts_controller.py:450
+#: controllers/accounts_controller.py:494
 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
 msgstr "Hinweis: Zahlungsbuchung wird nicht erstellt, da kein \"Kassen- oder Bankkonto\" angegeben wurde"
 
-#: accounts/doctype/cost_center/cost_center.js:32
+#: accounts/doctype/cost_center/cost_center.js:30
 msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups."
 msgstr "Hinweis: Diese Kostenstelle ist eine Gruppe. Buchungen können nicht zu Gruppen erstellt werden."
 
@@ -43744,10 +44463,12 @@
 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
 msgstr "Hinweis: Um die Artikel zusammenzuführen, erstellen Sie eine separate Bestandsabstimmung für den alten Artikel {0}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:895
+#: accounts/doctype/journal_entry/journal_entry.py:922
 msgid "Note: {0}"
 msgstr "Hinweis: {0}"
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
 #: www/book_appointment/index.html:55
 msgid "Notes"
 msgstr "Anmerkungen"
@@ -43939,12 +44660,6 @@
 msgid "Number of Depreciations Booked"
 msgstr "Anzahl der gebuchten Abschreibungen"
 
-#. Label of a Data field in DocType 'Transaction Deletion Record Item'
-#: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
-msgctxt "Transaction Deletion Record Item"
-msgid "Number of Docs"
-msgstr ""
-
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:14
 msgid "Number of Interaction"
 msgstr "Anzahl der Interaktion"
@@ -43979,11 +44694,11 @@
 msgid "Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days"
 msgstr "Anzahl der Intervalle für das Intervallfeld, z. B. wenn das Intervall &quot;Tage&quot; ist und das Abrechnungsintervall 3 beträgt, werden die Rechnungen alle 3 Tage generiert"
 
-#: accounts/doctype/account/account_tree.js:109
+#: accounts/doctype/account/account_tree.js:132
 msgid "Number of new Account, it will be included in the account name as a prefix"
 msgstr "Die Nummer des neuen Kontos wird als Präfix in den Kontonamen aufgenommen"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:26
+#: accounts/doctype/cost_center/cost_center_tree.js:39
 msgid "Number of new Cost Center, it will be included in the cost center name as a prefix"
 msgstr "Nummer der neuen Kostenstelle, wird als Name in den Namen der Kostenstelle eingefügt"
 
@@ -44058,6 +44773,12 @@
 msgid "Odometer Value (Last)"
 msgstr "(letzter) Tachostand"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Off"
+msgstr "aus"
+
 #. Label of a Date field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -44085,7 +44806,7 @@
 msgid "Offsetting Account"
 msgstr ""
 
-#: accounts/general_ledger.py:77
+#: accounts/general_ledger.py:81
 msgid "Offsetting for Accounting Dimension"
 msgstr ""
 
@@ -44135,11 +44856,11 @@
 msgid "On Converting Opportunity"
 msgstr "Über die Konvertierung von Opportunitys"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:31
-#: buying/doctype/purchase_order/purchase_order_list.js:8
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:27
+#: buying/doctype/purchase_order/purchase_order_list.js:17
 #: buying/doctype/supplier/supplier_list.js:5
-#: selling/doctype/sales_order/sales_order_list.js:10
-#: support/report/issue_summary/issue_summary.js:45
+#: 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
 msgid "On Hold"
 msgstr "Zurückgestellt"
@@ -44256,10 +44977,17 @@
 msgid "On Track"
 msgstr "Auf Kurs"
 
-#: manufacturing/doctype/production_plan/production_plan.js:540
+#: manufacturing/doctype/production_plan/production_plan.js:584
 msgid "On expanding a row in the Items to Manufacture table, you'll see an option to 'Include Exploded Items'. Ticking this includes raw materials of the sub-assembly items in the production process."
 msgstr ""
 
+#. Description of the 'Use Serial / Batch Fields' (Check) field in DocType
+#. 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "On submission of the stock transaction, system will auto create the Serial and Batch Bundle based on the Serial No / Batch fields."
+msgstr ""
+
 #: setup/default_energy_point_rules.py:43
 msgid "On {0} Creation"
 msgstr "Bei {0} Erstellung"
@@ -44276,10 +45004,14 @@
 msgid "Once set, this invoice will be on hold till the set date"
 msgstr "Einmal eingestellt, liegt diese Rechnung bis zum festgelegten Datum auf Eis"
 
-#: manufacturing/doctype/work_order/work_order.js:560
+#: manufacturing/doctype/work_order/work_order.js:591
 msgid "Once the Work Order is Closed. It can't be resumed."
 msgstr "Sobald der Arbeitsauftrag abgeschlossen ist, kann er nicht wiederaufgenommen werden."
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:16
+msgid "One customer can be part of only single Loyalty Program."
+msgstr ""
+
 #: manufacturing/dashboard_fixtures.py:228
 msgid "Ongoing Job Cards"
 msgstr "Laufende Jobkarten"
@@ -44306,11 +45038,11 @@
 msgid "Only Include Allocated Payments"
 msgstr ""
 
-#: accounts/doctype/account/account.py:134
+#: accounts/doctype/account/account.py:135
 msgid "Only Parent can be of type {0}"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:44
+#: assets/report/fixed_asset_register/fixed_asset_register.js:43
 msgid "Only existing assets"
 msgstr "Nur bestehende Vermögensgegenstände"
 
@@ -44330,6 +45062,10 @@
 msgid "Only one Subcontracting Order can be created against a Purchase Order, cancel the existing Subcontracting Order to create a new one."
 msgstr ""
 
+#: stock/doctype/stock_entry/stock_entry.py:898
+msgid "Only one {0} entry can be created against the Work Order {1}"
+msgstr ""
+
 #. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
 #: accounts/doctype/pos_profile/pos_profile.json
 msgctxt "POS Profile"
@@ -44354,13 +45090,14 @@
 msgid "Only {0} are supported"
 msgstr "Es werden nur {0} unterstützt"
 
-#: crm/report/lead_details/lead_details.js:35
+#: crm/report/lead_details/lead_details.js:34
 #: manufacturing/report/job_card_summary/job_card_summary.py:92
 #: quality_management/doctype/quality_meeting/quality_meeting_list.js:5
-#: selling/doctype/quotation/quotation_list.js:27
-#: support/report/issue_analytics/issue_analytics.js:56
-#: support/report/issue_summary/issue_summary.js:43
+#: 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
+#: templates/pages/task_info.html:72
 msgid "Open"
 msgstr "Offen"
 
@@ -44491,11 +45228,27 @@
 msgid "Open Activities HTML"
 msgstr "Alle Aktivitäten HTML"
 
-#: public/js/call_popup/call_popup.js:114
+#: manufacturing/doctype/bom/bom_item_preview.html:21
+msgid "Open BOM {0}"
+msgstr ""
+
+#: public/js/templates/call_link.html:11
+msgid "Open Call Log"
+msgstr ""
+
+#: public/js/call_popup/call_popup.js:116
 msgid "Open Contact"
 msgstr "Öffnen Sie Kontakt"
 
-#: selling/page/point_of_sale/pos_controller.js:172
+#: public/js/templates/crm_activities.html:76
+msgid "Open Event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:63
+msgid "Open Events"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_controller.js:189
 msgid "Open Form View"
 msgstr "Öffnen Sie die Formularansicht"
 
@@ -44509,6 +45262,11 @@
 msgid "Open Issues "
 msgstr "Offene Probleme"
 
+#: manufacturing/doctype/bom/bom_item_preview.html:25
+#: manufacturing/doctype/work_order/work_order_preview.html:28
+msgid "Open Item {0}"
+msgstr ""
+
 #: setup/doctype/email_digest/templates/default.html:154
 msgid "Open Notifications"
 msgstr "Offene Benachrichtigungen"
@@ -44544,6 +45302,14 @@
 msgid "Open Sales Orders"
 msgstr "Offene Kundenaufträge"
 
+#: public/js/templates/crm_activities.html:33
+msgid "Open Task"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:21
+msgid "Open Tasks"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
@@ -44554,6 +45320,10 @@
 msgid "Open To Do "
 msgstr "Offene Aufgaben"
 
+#: manufacturing/doctype/work_order/work_order_preview.html:24
+msgid "Open Work Order {0}"
+msgstr ""
+
 #. Name of a report
 #: manufacturing/report/open_work_orders/open_work_orders.json
 msgid "Open Work Orders"
@@ -44564,7 +45334,7 @@
 msgstr "Öffnen Sie ein neues Ticket"
 
 #: accounts/report/general_ledger/general_ledger.py:56
-#: public/js/stock_analytics.js:64
+#: public/js/stock_analytics.js:97
 msgid "Opening"
 msgstr "Eröffnung"
 
@@ -44602,7 +45372,7 @@
 msgid "Opening Accumulated Depreciation"
 msgstr "Öffnungs Kumulierte Abschreibungen"
 
-#: assets/doctype/asset/asset.py:428
+#: assets/doctype/asset/asset.py:430
 msgid "Opening Accumulated Depreciation must be less than or equal to {0}"
 msgstr ""
 
@@ -44652,7 +45422,7 @@
 msgid "Opening Entry"
 msgstr "Eröffnungsbuchung"
 
-#: accounts/general_ledger.py:676
+#: accounts/general_ledger.py:685
 msgid "Opening Entry can not be created after Period Closing Voucher is created."
 msgstr ""
 
@@ -44661,7 +45431,7 @@
 msgstr "Öffnen der Rechnungserstellung läuft"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/account/account_tree.js:189
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
 msgid "Opening Invoice Creation Tool"
 msgstr "Offene Rechnungen übertragen"
@@ -44682,12 +45452,16 @@
 msgid "Opening Invoice Item"
 msgstr "Rechnungsposition öffnen"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:125
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:8
+msgid "Opening Invoices"
+msgstr ""
+
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:128
 msgid "Opening Invoices Summary"
 msgstr "Rechnungszusammenfassung öffnen"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:79
-#: stock/report/stock_balance/stock_balance.py:419
+#: stock/report/stock_balance/stock_balance.py:427
 msgid "Opening Qty"
 msgstr "Anfangsmenge"
 
@@ -44713,7 +45487,7 @@
 msgid "Opening Time"
 msgstr "Öffnungszeit"
 
-#: stock/report/stock_balance/stock_balance.py:426
+#: stock/report/stock_balance/stock_balance.py:434
 msgid "Opening Value"
 msgstr "Öffnungswert"
 
@@ -44722,7 +45496,7 @@
 msgid "Opening and Closing"
 msgstr "Öffnen und Schließen"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:30
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:31
 msgid "Opening {0} Invoices created"
 msgstr ""
 
@@ -44754,7 +45528,7 @@
 msgid "Operating Cost Per BOM Quantity"
 msgstr "Betriebskosten pro Stücklistenmenge"
 
-#: manufacturing/doctype/bom/bom.py:1321
+#: manufacturing/doctype/bom/bom.py:1320
 msgid "Operating Cost as per Work Order / BOM"
 msgstr "Betriebskosten gemäß Fertigungsauftrag / Stückliste"
 
@@ -44778,14 +45552,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/bom/bom.js:319
+#: manufacturing/doctype/bom/bom.js:332
 #: manufacturing/doctype/operation/operation.json
-#: manufacturing/doctype/work_order/work_order.js:225
+#: manufacturing/doctype/work_order/work_order.js:240
 #: 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:48
+#: 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/job_card_summary/job_card_summary.js:79
+#: manufacturing/report/job_card_summary/job_card_summary.js:78
 #: manufacturing/report/job_card_summary/job_card_summary.py:167
 msgid "Operation"
 msgstr "Arbeitsgang"
@@ -44880,7 +45654,7 @@
 msgid "Operation ID"
 msgstr "Betriebs-ID"
 
-#: manufacturing/doctype/work_order/work_order.js:239
+#: manufacturing/doctype/work_order/work_order.js:254
 msgid "Operation Id"
 msgstr "Arbeitsgang-ID"
 
@@ -44908,7 +45682,7 @@
 msgid "Operation Time "
 msgstr "Betriebszeit"
 
-#: manufacturing/doctype/work_order/work_order.py:985
+#: manufacturing/doctype/work_order/work_order.py:999
 msgid "Operation Time must be greater than 0 for Operation {0}"
 msgstr "Betriebszeit muss für die Operation {0} größer als 0 sein"
 
@@ -44925,20 +45699,20 @@
 msgid "Operation time does not depend on quantity to produce"
 msgstr "Die Vorgangsdauer hängt nicht von der zu produzierenden Menge ab"
 
-#: manufacturing/doctype/job_card/job_card.js:215
+#: manufacturing/doctype/job_card/job_card.js:238
 msgid "Operation {0} added multiple times in the work order {1}"
 msgstr "Operation {0} wurde mehrfach zum Arbeitsauftrag {1} hinzugefügt"
 
-#: manufacturing/doctype/job_card/job_card.py:975
+#: manufacturing/doctype/job_card/job_card.py:990
 msgid "Operation {0} does not belong to the work order {1}"
 msgstr "Operation {0} gehört nicht zum Arbeitsauftrag {1}"
 
-#: manufacturing/doctype/workstation/workstation.py:179
+#: manufacturing/doctype/workstation/workstation.py:335
 msgid "Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations"
 msgstr "Arbeitsgang {0} ist länger als alle verfügbaren Arbeitszeiten am Arbeitsplatz {1}. Bitte den Vorgang in mehrere Teilarbeitsgänge aufteilen."
 
-#: manufacturing/doctype/work_order/work_order.js:220
-#: setup/doctype/company/company.py:341 templates/generators/bom.html:61
+#: manufacturing/doctype/work_order/work_order.js:235
+#: setup/doctype/company/company.py:340 templates/generators/bom.html:61
 msgid "Operations"
 msgstr "Arbeitsvorbereitung"
 
@@ -44968,6 +45742,7 @@
 msgid "Operations cannot be left blank"
 msgstr "Der Betrieb kann nicht leer sein"
 
+#: manufacturing/doctype/workstation/workstation.js:165
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:85
 msgid "Operator"
 msgstr ""
@@ -44999,17 +45774,17 @@
 msgid "Opportunities"
 msgstr "Chancen"
 
-#: selling/page/sales_funnel/sales_funnel.js:43
+#: selling/page/sales_funnel/sales_funnel.js:48
 msgid "Opportunities by lead source"
 msgstr "Chancen nach Interessenten-Quelle"
 
 #. Name of a DocType
-#: buying/doctype/request_for_quotation/request_for_quotation.js:318
-#: crm/doctype/lead/lead.js:36 crm/doctype/opportunity/opportunity.json
-#: crm/doctype/prospect/prospect.js:15
-#: crm/report/lead_details/lead_details.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: crm/doctype/lead/lead.js:33 crm/doctype/opportunity/opportunity.json
+#: crm/doctype/prospect/prospect.js:20
+#: crm/report/lead_details/lead_details.js:36
 #: crm/report/lost_opportunity/lost_opportunity.py:17
-#: public/js/communication.js:26 selling/doctype/quotation/quotation.js:133
+#: public/js/communication.js:35 selling/doctype/quotation/quotation.js:139
 msgid "Opportunity"
 msgstr "Chance"
 
@@ -45078,7 +45853,7 @@
 msgid "Opportunity Date"
 msgstr "Datum der Chance"
 
-#: crm/report/lost_opportunity/lost_opportunity.js:43
+#: crm/report/lost_opportunity/lost_opportunity.js:42
 #: crm/report/lost_opportunity/lost_opportunity.py:24
 msgid "Opportunity From"
 msgstr "Chance von"
@@ -45123,7 +45898,7 @@
 msgstr "Gelegenheit verloren Grund Detail"
 
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:32
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:55
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:57
 msgid "Opportunity Owner"
 msgstr "Chancen-Inhaber"
 
@@ -45133,8 +45908,8 @@
 msgid "Opportunity Owner"
 msgstr "Chancen-Inhaber"
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:47
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:59
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:45
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:58
 msgid "Opportunity Source"
 msgstr "Quelle der Chance"
 
@@ -45151,9 +45926,9 @@
 #. Name of a DocType
 #: crm/doctype/opportunity_type/opportunity_type.json
 #: crm/report/lost_opportunity/lost_opportunity.py:44
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:53
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:51
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:48
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:65
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:64
 msgid "Opportunity Type"
 msgstr "Chance-Typ"
 
@@ -45169,7 +45944,7 @@
 msgid "Opportunity Value"
 msgstr "Wert"
 
-#: public/js/communication.js:86
+#: public/js/communication.js:102
 msgid "Opportunity {0} created"
 msgstr "Opportunity {0} erstellt"
 
@@ -45179,11 +45954,11 @@
 msgid "Optimize Route"
 msgstr "Route optimieren"
 
-#: accounts/doctype/account/account_tree.js:122
+#: accounts/doctype/account/account_tree.js:168
 msgid "Optional. Sets company's default currency, if not specified."
 msgstr "Optional. Stellt die Standardwährung des Unternehmens ein, falls nichts angegeben ist."
 
-#: accounts/doctype/account/account_tree.js:117
+#: accounts/doctype/account/account_tree.js:155
 msgid "Optional. This setting will be used to filter in various transactions."
 msgstr "Optional. Diese Einstellung wird verwendet, um in verschiedenen Transaktionen zu filtern."
 
@@ -45211,7 +45986,7 @@
 msgid "Order Amount"
 msgstr "Bestellbetrag"
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:81
+#: manufacturing/report/production_planning_report/production_planning_report.js:80
 msgid "Order By"
 msgstr "Sortieren nach"
 
@@ -45256,9 +46031,13 @@
 msgid "Order Status"
 msgstr "Bestellstatus"
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:30
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:8
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:8
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:4
+msgid "Order Summary"
+msgstr ""
+
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:29
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:7
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:7
 msgid "Order Type"
 msgstr "Bestellart"
 
@@ -45291,8 +46070,8 @@
 msgstr "Best/Ang %"
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:5
-#: selling/doctype/quotation/quotation_list.js:31
-#: stock/doctype/material_request/material_request_list.js:25
+#: selling/doctype/quotation/quotation_list.js:30
+#: stock/doctype/material_request/material_request_list.js:29
 msgid "Ordered"
 msgstr "Bestellt"
 
@@ -45345,6 +46124,10 @@
 msgid "Ordered Qty"
 msgstr "Bestellte Menge"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Ordered Qty: Quantity ordered for purchase, but not received."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:102
 msgid "Ordered Quantity"
 msgstr "Bestellte Menge"
@@ -45357,7 +46140,7 @@
 
 #: buying/doctype/supplier/supplier_dashboard.py:14
 #: selling/doctype/customer/customer_dashboard.py:21
-#: selling/doctype/sales_order/sales_order.py:745
+#: selling/doctype/sales_order/sales_order.py:751
 #: setup/doctype/company/company_dashboard.py:23
 msgid "Orders"
 msgstr "Bestellungen"
@@ -45489,12 +46272,12 @@
 msgstr "Weitere Einstellungen"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:81
-#: stock/report/stock_balance/stock_balance.py:441
-#: stock/report/stock_ledger/stock_ledger.py:146
+#: stock/report/stock_balance/stock_balance.py:449
+#: stock/report/stock_ledger/stock_ledger.py:219
 msgid "Out Qty"
 msgstr "Ausgabe-Menge"
 
-#: stock/report/stock_balance/stock_balance.py:447
+#: stock/report/stock_balance/stock_balance.py:455
 msgid "Out Value"
 msgstr "Out Wert"
 
@@ -45511,7 +46294,7 @@
 msgid "Out of AMC"
 msgstr "Außerhalb des jährlichen Wartungsvertrags"
 
-#: assets/doctype/asset/asset_list.js:23
+#: assets/doctype/asset/asset_list.js:17
 msgid "Out of Order"
 msgstr "Außer Betrieb"
 
@@ -45521,7 +46304,7 @@
 msgid "Out of Order"
 msgstr "Außer Betrieb"
 
-#: stock/doctype/pick_list/pick_list.py:386
+#: stock/doctype/pick_list/pick_list.py:426
 msgid "Out of Stock"
 msgstr "Nicht vorrättig"
 
@@ -45592,9 +46375,10 @@
 msgid "Outstanding"
 msgstr "Ausstehend"
 
-#: accounts/doctype/payment_entry/payment_entry.js:653
+#: 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.py:1074
+#: 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/purchase_register/purchase_register.py:289
 #: accounts/report/sales_register/sales_register.py:317
@@ -45651,7 +46435,7 @@
 msgid "Outstanding Cheques and Deposits to clear"
 msgstr "Ausstehende Schecks und Anzahlungen zum verbuchen"
 
-#: accounts/doctype/gl_entry/gl_entry.py:422
+#: accounts/doctype/gl_entry/gl_entry.py:376
 msgid "Outstanding for {0} cannot be less than zero ({1})"
 msgstr "Ausstände für {0} können nicht kleiner als Null sein ({1})"
 
@@ -45700,7 +46484,7 @@
 msgid "Over Delivery/Receipt Allowance (%)"
 msgstr "Erlaubte Mehrlieferung/-annahme (%)"
 
-#: controllers/stock_controller.py:896
+#: controllers/stock_controller.py:1082
 msgid "Over Receipt"
 msgstr ""
 
@@ -45724,13 +46508,14 @@
 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role."
 msgstr "Überhöhte Abrechnung von Artikel {2} mit {0} {1} wurde ignoriert, weil Sie die Rolle {3} haben."
 
-#: controllers/accounts_controller.py:1713
+#: controllers/accounts_controller.py:1802
 msgid "Overbilling of {} ignored because you have {} role."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:261
+#: accounts/doctype/sales_invoice/sales_invoice.py:266
 #: projects/report/project_summary/project_summary.py:94
-#: selling/doctype/sales_order/sales_order_list.js:18
+#: selling/doctype/sales_order/sales_order_list.js:29
+#: templates/pages/task_info.html:75
 msgid "Overdue"
 msgstr "Überfällig"
 
@@ -45940,11 +46725,11 @@
 msgid "POS Closing Entry Taxes"
 msgstr ""
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:30
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:31
 msgid "POS Closing Failed"
 msgstr ""
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:54
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:55
 msgid "POS Closing failed while running in a background process. You can resolve the {0} and retry the process again."
 msgstr ""
 
@@ -46091,10 +46876,10 @@
 
 #. Name of a DocType
 #: accounts/doctype/pos_profile/pos_profile.json
-#: accounts/report/pos_register/pos_register.js:33
+#: accounts/report/pos_register/pos_register.js:32
 #: accounts/report/pos_register/pos_register.py:120
 #: accounts/report/pos_register/pos_register.py:193
-#: selling/page/point_of_sale/pos_controller.js:68
+#: selling/page/point_of_sale/pos_controller.js:80
 msgid "POS Profile"
 msgstr "Verkaufsstellen-Profil"
 
@@ -46131,13 +46916,13 @@
 msgid "POS Profile doesn't matches {}"
 msgstr "POS-Profil stimmt nicht mit {} überein"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1119
+#: accounts/doctype/sales_invoice/sales_invoice.py:1135
 msgid "POS Profile required to make POS Entry"
 msgstr "Verkaufsstellen-Profil benötigt, um Verkaufsstellen-Buchung zu erstellen"
 
 #: accounts/doctype/mode_of_payment/mode_of_payment.py:63
 msgid "POS Profile {} contains Mode of Payment {}. Please remove them to disable this mode."
-msgstr ""
+msgstr "Das POS-Profil {} enthält die Zahlungsweise {}. Bitte entfernen Sie diese erst dort, bevor Sie sie deaktivieren."
 
 #: accounts/doctype/pos_opening_entry/pos_opening_entry.py:46
 msgid "POS Profile {} does not belongs to company {}"
@@ -46182,7 +46967,7 @@
 msgid "POS Transactions"
 msgstr "POS-Transaktionen"
 
-#: selling/page/point_of_sale/pos_controller.js:363
+#: selling/page/point_of_sale/pos_controller.js:392
 msgid "POS invoice {0} created successfully"
 msgstr "POS-Rechnung {0} erfolgreich erstellt"
 
@@ -46255,7 +47040,7 @@
 msgid "Package Weight Details"
 msgstr "Details zum Verpackungsgewicht"
 
-#: stock/doctype/delivery_note/delivery_note_list.js:65
+#: stock/doctype/delivery_note/delivery_note_list.js:74
 msgid "Packaging Slip From Delivery Note"
 msgstr ""
 
@@ -46288,7 +47073,7 @@
 msgid "Packed Items"
 msgstr "Verpackte Artikel"
 
-#: controllers/stock_controller.py:739
+#: controllers/stock_controller.py:922
 msgid "Packed Items cannot be transferred internally"
 msgstr ""
 
@@ -46329,7 +47114,7 @@
 msgstr "Packliste"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:186
+#: stock/doctype/delivery_note/delivery_note.js:221
 #: stock/doctype/packing_slip/packing_slip.json
 msgid "Packing Slip"
 msgstr "Packzettel"
@@ -46345,7 +47130,7 @@
 msgid "Packing Slip Item"
 msgstr "Position auf dem Packzettel"
 
-#: stock/doctype/delivery_note/delivery_note.py:704
+#: stock/doctype/delivery_note/delivery_note.py:765
 msgid "Packing Slip(s) cancelled"
 msgstr "Packzettel storniert"
 
@@ -46455,8 +47240,8 @@
 msgid "Page {0} of {1}"
 msgstr "Seite {0} von {1}"
 
-#: accounts/doctype/payment_request/payment_request_list.js:17
-#: accounts/doctype/sales_invoice/sales_invoice.py:267
+#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/sales_invoice/sales_invoice.py:272
 msgid "Paid"
 msgstr "Bezahlt"
 
@@ -46485,10 +47270,12 @@
 msgstr "Bezahlt"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:170
-#: accounts/report/accounts_receivable/accounts_receivable.py:1068
+#: 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
+#: 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"
 msgstr "Gezahlter Betrag"
@@ -46565,7 +47352,7 @@
 msgid "Paid Amount After Tax (Company Currency)"
 msgstr "Gezahlter Betrag nach Steuern (Währung des Unternehmens)"
 
-#: accounts/doctype/payment_entry/payment_entry.js:881
+#: accounts/doctype/payment_entry/payment_entry.js:1059
 msgid "Paid Amount cannot be greater than total negative outstanding amount {0}"
 msgstr "Der gezahlte Betrag darf nicht größer sein als der gesamte, negative, ausstehende Betrag {0}"
 
@@ -46587,8 +47374,8 @@
 msgid "Paid To Account Type"
 msgstr "Bezahlt an Kontotyp"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:324
-#: accounts/doctype/sales_invoice/sales_invoice.py:994
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:328
+#: accounts/doctype/sales_invoice/sales_invoice.py:1011
 msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
 msgstr "Summe aus gezahltem Betrag + ausgebuchter Betrag darf nicht größer der Gesamtsumme sein"
 
@@ -46732,7 +47519,7 @@
 msgid "Parent Company"
 msgstr "Muttergesellschaft"
 
-#: setup/doctype/company/company.py:460
+#: setup/doctype/company/company.py:459
 msgid "Parent Company must be a group company"
 msgstr "Die Muttergesellschaft muss eine Konzerngesellschaft sein"
 
@@ -46842,12 +47629,6 @@
 msgid "Parent Warehouse"
 msgstr "Übergeordnetes Lager"
 
-#. Label of a Link field in DocType 'Pick List'
-#: stock/doctype/pick_list/pick_list.json
-msgctxt "Pick List"
-msgid "Parent Warehouse"
-msgstr "Übergeordnetes Lager"
-
 #. Label of a Link field in DocType 'Warehouse'
 #: stock/doctype/warehouse/warehouse.json
 msgctxt "Warehouse"
@@ -46860,7 +47641,7 @@
 msgid "Partial Material Transferred"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1043
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1045
 msgid "Partial Stock Reservation"
 msgstr ""
 
@@ -46903,7 +47684,7 @@
 msgid "Partially Delivered"
 msgstr "Teilweise geliefert"
 
-#: assets/doctype/asset/asset_list.js:8
+#: assets/doctype/asset/asset_list.js:7
 msgid "Partially Depreciated"
 msgstr "Teilweise abgeschrieben"
 
@@ -46919,7 +47700,7 @@
 msgid "Partially Fulfilled"
 msgstr "Teilweise erfüllt"
 
-#: selling/doctype/quotation/quotation_list.js:29
+#: selling/doctype/quotation/quotation_list.js:28
 msgid "Partially Ordered"
 msgstr "Teilweise bestellt"
 
@@ -46935,7 +47716,7 @@
 msgid "Partially Ordered"
 msgstr "Teilweise bestellt"
 
-#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/payment_request/payment_request_list.js:12
 msgid "Partially Paid"
 msgstr "Teilweise bezahlt"
 
@@ -46959,7 +47740,7 @@
 msgid "Partially Paid"
 msgstr "Teilweise bezahlt"
 
-#: stock/doctype/material_request/material_request_list.js:21
+#: stock/doctype/material_request/material_request_list.js:25
 msgid "Partially Received"
 msgstr "Teilweise erhalten"
 
@@ -47005,7 +47786,7 @@
 msgid "Parties"
 msgstr "Parteien"
 
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:14
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:23
 msgid "Partly Billed"
 msgstr "Teilweise abgerechnet"
 
@@ -47063,30 +47844,38 @@
 msgid "Partnership"
 msgstr ""
 
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Parts Per Hour"
+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
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:193
 #: accounts/doctype/tax_category/tax_category_dashboard.py:11
-#: accounts/report/accounts_payable/accounts_payable.js:109
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:86
-#: accounts/report/accounts_receivable/accounts_receivable.js:54
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:86
+#: accounts/report/accounts_payable/accounts_payable.js:112
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:89
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.js:74
-#: accounts/report/general_ledger/general_ledger.py:633
-#: accounts/report/payment_ledger/payment_ledger.js:52
+#: accounts/report/general_ledger/general_ledger.py:646
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:92
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:27
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:27
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:26
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:26
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:57
-#: crm/report/lost_opportunity/lost_opportunity.js:56
+#: crm/report/lost_opportunity/lost_opportunity.js:55
 #: crm/report/lost_opportunity/lost_opportunity.py:31
-#: public/js/bank_reconciliation_tool/data_table_manager.js:51
-#: public/js/bank_reconciliation_tool/dialog_manager.js:128
+#: public/js/bank_reconciliation_tool/data_table_manager.js:50
+#: public/js/bank_reconciliation_tool/dialog_manager.js:135
 msgid "Party"
 msgstr "Partei"
 
@@ -47226,18 +48015,12 @@
 #: accounts/doctype/bank_transaction/bank_transaction.json
 msgctxt "Bank Transaction"
 msgid "Party Account No. (Bank Statement)"
-msgstr ""
+msgstr "Konto-Nr. der Partei (Kontoauszug)"
 
-#: controllers/accounts_controller.py:1983
+#: controllers/accounts_controller.py:2075
 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same"
 msgstr ""
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Party Balance"
-msgstr "Saldo der Partei"
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47280,13 +48063,19 @@
 msgid "Party Information"
 msgstr "Informationen zur Partei"
 
+#. Label of a Data field in DocType 'Blanket Order Item'
+#: manufacturing/doctype/blanket_order_item/blanket_order_item.json
+msgctxt "Blanket Order Item"
+msgid "Party Item Code"
+msgstr ""
+
 #. Name of a DocType
 #: accounts/doctype/party_link/party_link.json
 msgid "Party Link"
 msgstr ""
 
 #: accounts/report/general_ledger/general_ledger.js:109
-#: selling/report/address_and_contacts/address_and_contacts.js:23
+#: selling/report/address_and_contacts/address_and_contacts.js:22
 msgid "Party Name"
 msgstr "Name der Partei"
 
@@ -47339,16 +48128,16 @@
 #: 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/general_ledger/general_ledger.js:65
-#: accounts/report/general_ledger/general_ledger.py:632
-#: accounts/report/payment_ledger/payment_ledger.js:42
+#: accounts/report/general_ledger/general_ledger.py:645
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:16
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:16
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:15
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:15
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:49
-#: public/js/bank_reconciliation_tool/data_table_manager.js:46
-#: selling/report/address_and_contacts/address_and_contacts.js:10
+#: public/js/bank_reconciliation_tool/data_table_manager.js:45
+#: selling/report/address_and_contacts/address_and_contacts.js:9
 #: setup/doctype/party_type/party_type.json
 msgid "Party Type"
 msgstr "Partei-Typ"
@@ -47453,7 +48242,7 @@
 msgid "Party Type and Party is mandatory for {0} account"
 msgstr "Partei-Typ und Partei sind Pflichtfelder für Konto {0}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:162
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:161
 msgid "Party Type and Party is required for Receivable / Payable account {0}"
 msgstr ""
 
@@ -47467,7 +48256,7 @@
 msgid "Party User"
 msgstr "Benutzer der Partei"
 
-#: accounts/doctype/payment_entry/payment_entry.js:308
+#: accounts/doctype/payment_entry/payment_entry.js:390
 msgid "Party can only be one of {0}"
 msgstr ""
 
@@ -47521,7 +48310,7 @@
 msgid "Path"
 msgstr "Pfad"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:84
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:85
 msgid "Pause"
 msgstr "Anhalten"
 
@@ -47531,7 +48320,7 @@
 msgid "Pause"
 msgstr "Anhalten"
 
-#: manufacturing/doctype/job_card/job_card.js:259
+#: manufacturing/doctype/job_card/job_card.js:292
 msgid "Pause Job"
 msgstr ""
 
@@ -47554,6 +48343,10 @@
 msgid "Paused"
 msgstr "Pausiert"
 
+#: templates/pages/order.html:43
+msgid "Pay"
+msgstr "Zahlen"
+
 #. Option for the 'Payment Type' (Select) field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47566,7 +48359,7 @@
 msgid "Pay To / Recd From"
 msgstr "Zahlen an/Erhalten von"
 
-#: accounts/report/account_balance/account_balance.js:52
+#: accounts/report/account_balance/account_balance.js:54
 msgid "Payable"
 msgstr "Zahlbar"
 
@@ -47615,15 +48408,15 @@
 
 #: accounts/doctype/dunning/dunning.js:51
 #: accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:110
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:65
-#: accounts/doctype/sales_invoice/sales_invoice.js:104
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:52
+#: 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:31
-#: buying/doctype/purchase_order/purchase_order.js:328
+#: accounts/doctype/sales_invoice/sales_invoice_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:385
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:20
-#: selling/doctype/sales_order/sales_order.js:606
+#: selling/doctype/sales_order/sales_order.js:713
 #: selling/doctype/sales_order/sales_order_dashboard.py:28
 msgid "Payment"
 msgstr "Bezahlung"
@@ -47731,15 +48524,16 @@
 msgid "Payment Entries"
 msgstr "Zahlungs Einträge"
 
-#: accounts/utils.py:937
+#: accounts/utils.py:946
 msgid "Payment Entries {0} are un-linked"
 msgstr "Zahlungs Einträge {0} sind un-linked"
 
 #. Name of a DocType
 #: accounts/doctype/payment_entry/payment_entry.json
-#: accounts/doctype/payment_order/payment_order.js:22
+#: accounts/doctype/payment_order/payment_order.js:27
 #: accounts/print_format/bank_and_cash_payment_voucher/bank_and_cash_payment_voucher.html:12
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.py:29
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:11
 msgid "Payment Entry"
 msgstr "Zahlung"
 
@@ -47792,23 +48586,24 @@
 msgid "Payment Entry Reference"
 msgstr "Zahlungsreferenz"
 
-#: accounts/doctype/payment_request/payment_request.py:410
+#: accounts/doctype/payment_request/payment_request.py:413
 msgid "Payment Entry already exists"
 msgstr "Zahlung existiert bereits"
 
-#: accounts/utils.py:604
+#: accounts/utils.py:613
 msgid "Payment Entry has been modified after you pulled it. Please pull it again."
 msgstr "Zahlungsbuchung wurde geändert, nachdem sie abgerufen wurde. Bitte erneut abrufen."
 
-#: accounts/doctype/payment_request/payment_request.py:568
+#: accounts/doctype/payment_request/payment_request.py:111
+#: accounts/doctype/payment_request/payment_request.py:460
 msgid "Payment Entry is already created"
 msgstr "Payment Eintrag bereits erstellt"
 
-#: controllers/accounts_controller.py:1164
+#: controllers/accounts_controller.py:1231
 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:261
+#: selling/page/point_of_sale/pos_payment.js:271
 msgid "Payment Failed"
 msgstr "Bezahlung fehlgeschlagen"
 
@@ -47859,7 +48654,7 @@
 msgid "Payment Gateway Account"
 msgstr "Payment Gateway Konto"
 
-#: accounts/utils.py:1227
+#: accounts/utils.py:1196
 msgid "Payment Gateway Account not created, please create one manually."
 msgstr "Payment Gateway-Konto nicht erstellt haben, erstellen Sie bitte ein manuell."
 
@@ -47889,9 +48684,10 @@
 msgid "Payment Limit"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.js:51
+#: accounts/report/pos_register/pos_register.js:50
 #: accounts/report/pos_register/pos_register.py:129
 #: accounts/report/pos_register/pos_register.py:221
+#: selling/page/point_of_sale/pos_payment.js:19
 msgid "Payment Method"
 msgstr "Zahlungsmethode"
 
@@ -47983,7 +48779,7 @@
 msgid "Payment Receipt Note"
 msgstr "Zahlungsnachweis"
 
-#: selling/page/point_of_sale/pos_payment.js:248
+#: selling/page/point_of_sale/pos_payment.js:252
 msgid "Payment Received"
 msgstr "Zahlung erhalten"
 
@@ -48016,7 +48812,7 @@
 msgid "Payment Reconciliation Invoice"
 msgstr "Rechnung zum Zahlungsabgleich"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:120
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:123
 msgid "Payment Reconciliation Job: {0} is running for this party. Can't reconcile now."
 msgstr ""
 
@@ -48044,12 +48840,12 @@
 msgstr "Bezahlung Referenzen"
 
 #. Name of a DocType
-#: accounts/doctype/payment_order/payment_order.js:18
+#: accounts/doctype/payment_order/payment_order.js:19
 #: accounts/doctype/payment_request/payment_request.json
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:125
-#: accounts/doctype/sales_invoice/sales_invoice.js:140
-#: buying/doctype/purchase_order/purchase_order.js:335
-#: selling/doctype/sales_order/sales_order.js:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:145
+#: accounts/doctype/sales_invoice/sales_invoice.js:143
+#: buying/doctype/purchase_order/purchase_order.js:393
+#: selling/doctype/sales_order/sales_order.js:709
 msgid "Payment Request"
 msgstr "Zahlungsaufforderung"
 
@@ -48078,15 +48874,15 @@
 msgid "Payment Request Type"
 msgstr "Zahlungsauftragstyp"
 
-#: accounts/doctype/payment_request/payment_request.py:502
+#: accounts/doctype/payment_request/payment_request.py:507
 msgid "Payment Request for {0}"
 msgstr "Zahlungsanforderung für {0}"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:268
+#: accounts/doctype/pos_invoice/pos_invoice.js:289
 msgid "Payment Request took too long to respond. Please try requesting for payment again."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:450
+#: accounts/doctype/payment_request/payment_request.py:453
 msgid "Payment Requests cannot be created against: {0}"
 msgstr "Zahlungsanforderungen können nicht erstellt werden für: {0}"
 
@@ -48137,13 +48933,9 @@
 msgid "Payment Schedule"
 msgstr "Zahlungsplan"
 
-#: public/js/controllers/transaction.js:925
-msgid "Payment Schedule Table"
-msgstr "Zahlungsplan Tabelle"
-
 #. Name of a DocType
 #: accounts/doctype/payment_term/payment_term.json
-#: accounts/report/accounts_receivable/accounts_receivable.py:1064
+#: accounts/report/accounts_receivable/accounts_receivable.py:1072
 #: accounts/report/gross_profit/gross_profit.py:348
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
 msgid "Payment Term"
@@ -48186,6 +48978,7 @@
 msgstr "Name der Zahlungsbedingung"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:44
+#: accounts/report/accounts_receivable/accounts_receivable.html:31
 msgid "Payment Terms"
 msgstr "Zahlungsbedingungen"
 
@@ -48239,11 +49032,11 @@
 #. Name of a DocType
 #: accounts/doctype/payment_terms_template/payment_terms_template.json
 #: accounts/report/accounts_payable/accounts_payable.js:93
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:99
-#: accounts/report/accounts_receivable/accounts_receivable.js:127
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:105
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:62
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:62
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:102
+#: accounts/report/accounts_receivable/accounts_receivable.js:130
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:108
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:61
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:61
 msgid "Payment Terms Template"
 msgstr "Vorlage Zahlungsbedingungen"
 
@@ -48311,15 +49104,15 @@
 msgid "Payment Type"
 msgstr "Zahlungsart"
 
-#: accounts/doctype/payment_entry/payment_entry.py:501
+#: accounts/doctype/payment_entry/payment_entry.py:510
 msgid "Payment Type must be one of Receive, Pay and Internal Transfer"
 msgstr "Zahlungsart muss entweder 'Empfangen', 'Zahlen' oder 'Interner Transfer' sein"
 
-#: accounts/utils.py:927
+#: accounts/utils.py:936
 msgid "Payment Unlink Error"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:764
+#: accounts/doctype/journal_entry/journal_entry.py:791
 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
 msgstr "Zahlung zu {0} {1} kann nicht größer als ausstehender Betrag {2} sein"
 
@@ -48331,12 +49124,12 @@
 msgid "Payment methods are mandatory. Please add at least one payment method."
 msgstr "Zahlungsmethoden sind obligatorisch. Bitte fügen Sie mindestens eine Zahlungsmethode hinzu."
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:277
-#: selling/page/point_of_sale/pos_payment.js:252
+#: accounts/doctype/pos_invoice/pos_invoice.js:301
+#: selling/page/point_of_sale/pos_payment.js:259
 msgid "Payment of {0} received successfully."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:257
+#: selling/page/point_of_sale/pos_payment.js:266
 msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
 msgstr ""
 
@@ -48344,11 +49137,11 @@
 msgid "Payment related to {0} is not completed"
 msgstr "Die Zahlung für {0} ist nicht abgeschlossen"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:259
+#: accounts/doctype/pos_invoice/pos_invoice.js:278
 msgid "Payment request failed"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:713
+#: accounts/doctype/payment_entry/payment_entry.py:722
 msgid "Payment term {0} not used in {1}"
 msgstr "Zahlungsbedingung {0} nicht verwendet in {1}"
 
@@ -48363,6 +49156,7 @@
 #: accounts/workspace/receivables/receivables.json
 #: buying/doctype/supplier/supplier_dashboard.py:15
 #: selling/doctype/customer/customer_dashboard.py:22
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Payments"
 msgstr "Zahlungen"
 
@@ -48427,11 +49221,11 @@
 msgstr "payslip"
 
 #: assets/doctype/asset_repair/asset_repair_list.js:5
-#: buying/doctype/request_for_quotation/request_for_quotation.py:314
+#: buying/doctype/request_for_quotation/request_for_quotation.py:338
 #: 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
-#: templates/pages/order.html:56
+#: templates/pages/order.html:68
 msgid "Pending"
 msgstr "Ausstehend"
 
@@ -48509,9 +49303,9 @@
 msgstr "Ausstehender Betrag"
 
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:218
-#: manufacturing/doctype/work_order/work_order.js:244
+#: 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:991
+#: selling/doctype/sales_order/sales_order.js:1153
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
 msgid "Pending Qty"
 msgstr "Ausstehende Menge"
@@ -48527,6 +49321,10 @@
 msgid "Pending Quantity"
 msgstr "Ausstehende Menge"
 
+#: templates/pages/task_info.html:74
+msgid "Pending Review"
+msgstr "Wartet auf Überprüfung"
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -48548,7 +49346,7 @@
 msgid "Pending activities for today"
 msgstr "Ausstehende Aktivitäten für heute"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:224
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:219
 msgid "Pending processing"
 msgstr ""
 
@@ -48701,25 +49499,25 @@
 msgid "Perception Analysis"
 msgstr "Wahrnehmungs-Analyse"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:61
+#: accounts/report/budget_variance_report/budget_variance_report.js:59
 #: public/js/purchase_trends_filters.js:16 public/js/sales_trends_filters.js:8
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:30
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:30
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:30
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:29
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:29
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:29
 msgid "Period"
 msgstr "Periode"
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:61
+#: assets/report/fixed_asset_register/fixed_asset_register.js:60
 msgid "Period Based On"
 msgstr "Zeitraum basierend auf"
 
-#: accounts/general_ledger.py:690
+#: accounts/general_ledger.py:699
 msgid "Period Closed"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.js:82
-msgid "Period Closing Entry"
-msgstr "Periodenabschlussbuchung"
+#: accounts/report/trial_balance/trial_balance.js:88
+msgid "Period Closing Entry For Current Period"
+msgstr ""
 
 #. Label of a Section Break field in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -48728,7 +49526,7 @@
 msgstr "Periodenabschlusseinstellungen"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:141
+#: accounts/doctype/account/account_tree.js:197
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgid "Period Closing Voucher"
 msgstr "Periodenabschlussbeleg"
@@ -48815,10 +49613,10 @@
 msgid "Period_from_date"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:72
 #: accounts/report/financial_ratios/financial_ratios.js:33
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:55
-#: public/js/financial_statements.js:214
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:54
+#: public/js/financial_statements.js:223
 msgid "Periodicity"
 msgstr "Häufigkeit"
 
@@ -48953,7 +49751,7 @@
 msgid "Phone No"
 msgstr "Telefonnummer"
 
-#: selling/page/point_of_sale/pos_item_cart.js:880
+#: selling/page/point_of_sale/pos_item_cart.js:911
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
@@ -48963,13 +49761,13 @@
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
-#: public/js/utils.js:64
+#: public/js/utils.js:78
 msgid "Pick Batch No"
 msgstr "Chargennummer auswählen"
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:548
-#: stock/doctype/material_request/material_request.js:113
+#: selling/doctype/sales_order/sales_order.js:599
+#: stock/doctype/material_request/material_request.js:115
 #: stock/doctype/pick_list/pick_list.json
 msgid "Pick List"
 msgstr "Pickliste"
@@ -48999,7 +49797,7 @@
 msgid "Pick List"
 msgstr "Pickliste"
 
-#: stock/doctype/pick_list/pick_list.py:116
+#: stock/doctype/pick_list/pick_list.py:120
 msgid "Pick List Incomplete"
 msgstr "Pickliste unvollständig"
 
@@ -49080,7 +49878,7 @@
 msgid "Pickup Date"
 msgstr "Abholdatum"
 
-#: stock/doctype/shipment/shipment.js:364
+#: stock/doctype/shipment/shipment.js:398
 msgid "Pickup Date cannot be before this day"
 msgstr "Das Abholdatum kann nicht vor diesem Tag liegen"
 
@@ -49114,7 +49912,7 @@
 msgid "Pickup to"
 msgstr "Abholung bis"
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:9
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:8
 msgid "Pipeline By"
 msgstr ""
 
@@ -49142,16 +49940,16 @@
 msgid "Plaid Environment"
 msgstr "Plaid-Umgebung"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:136
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:160
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:152
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:176
 msgid "Plaid Link Failed"
 msgstr "Plaid-Link fehlgeschlagen"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:238
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:254
 msgid "Plaid Link Refresh Required"
 msgstr "Aktualisierung des Plaid-Links erforderlich"
 
-#: accounts/doctype/bank/bank.js:121
+#: accounts/doctype/bank/bank.js:131
 msgid "Plaid Link Updated"
 msgstr "Plaid-Link aktualisiert"
 
@@ -49172,7 +49970,7 @@
 msgid "Plaid Settings"
 msgstr "Plaid-Einstellungen"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:211
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:227
 msgid "Plaid transactions sync error"
 msgstr "Synchronisierungsfehler für Plaid-Transaktionen"
 
@@ -49273,6 +50071,10 @@
 msgid "Planned Qty"
 msgstr "Geplante Menge"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:109
 msgid "Planned Quantity"
 msgstr "Geplante Menge"
@@ -49328,12 +50130,36 @@
 msgid "Plans"
 msgstr "Pläne"
 
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Plant Dashboard"
+msgstr ""
+
+#. Name of a DocType
+#: manufacturing/doctype/plant_floor/plant_floor.json
+#: public/js/plant_floor_visual/visual_plant.js:53
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/workspace/manufacturing/manufacturing.json
+msgctxt "Plant Floor"
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Plant Floor"
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:30
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:43
 msgid "Plants and Machineries"
 msgstr "Pflanzen und Maschinen"
 
-#: stock/doctype/pick_list/pick_list.py:383
+#: stock/doctype/pick_list/pick_list.py:423
 msgid "Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List."
 msgstr "Bitte füllen Sie die Artikel wieder auf und aktualisieren Sie die Pickliste, um fortzufahren. Um abzubrechen, stornieren Sie die Pickliste."
 
@@ -49341,17 +50167,17 @@
 msgid "Please Select a Company"
 msgstr "Bitte wählen Sie eine Firma aus"
 
-#: selling/page/sales_funnel/sales_funnel.js:94
+#: selling/page/sales_funnel/sales_funnel.js:109
 msgid "Please Select a Company."
 msgstr "Bitte wählen Sie eine Firma aus."
 
-#: stock/doctype/delivery_note/delivery_note.js:139
+#: stock/doctype/delivery_note/delivery_note.js:151
 msgid "Please Select a Customer"
 msgstr "Bitte wählen Sie einen Kunden aus"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:114
-#: stock/doctype/purchase_receipt/purchase_receipt.js:199
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:82
+#: stock/doctype/purchase_receipt/purchase_receipt.js:128
+#: stock/doctype/purchase_receipt/purchase_receipt.js:230
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
 msgid "Please Select a Supplier"
 msgstr "Bitte wählen Sie einen Lieferanten"
 
@@ -49359,7 +50185,7 @@
 msgid "Please Set Supplier Group in Buying Settings."
 msgstr "Bitte legen Sie die Lieferantengruppe in den Kaufeinstellungen fest."
 
-#: accounts/doctype/payment_entry/payment_entry.js:1071
+#: accounts/doctype/payment_entry/payment_entry.js:1297
 msgid "Please Specify Account"
 msgstr "Bitte Konto angeben"
 
@@ -49367,7 +50193,7 @@
 msgid "Please add 'Supplier' role to user {0}."
 msgstr "Bitte fügen Sie dem Benutzer {0} die Rolle „Lieferant“ hinzu."
 
-#: selling/page/point_of_sale/pos_controller.js:87
+#: selling/page/point_of_sale/pos_controller.js:101
 msgid "Please add Mode of payments and opening balance details."
 msgstr "Bitte fügen Sie die Zahlungsweise und die Details zum Eröffnungssaldo hinzu."
 
@@ -49383,7 +50209,7 @@
 msgid "Please add a Temporary Opening account in Chart of Accounts"
 msgstr "Bitte fügen Sie ein vorübergehendes Eröffnungskonto im Kontenplan hinzu"
 
-#: public/js/utils/serial_no_batch_selector.js:535
+#: public/js/utils/serial_no_batch_selector.js:542
 msgid "Please add atleast one Serial No / Batch No"
 msgstr "Bitte fügen Sie mindestens eine Serien-/Chargennummer hinzu"
 
@@ -49391,11 +50217,11 @@
 msgid "Please add the Bank Account column"
 msgstr "Bitte fügen Sie die Spalte „Bankkonto“ hinzu"
 
-#: accounts/doctype/account/account_tree.js:168
+#: accounts/doctype/account/account_tree.js:246
 msgid "Please add the account to root level Company - {0}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:215
+#: accounts/doctype/account/account.py:234
 msgid "Please add the account to root level Company - {}"
 msgstr "Bitte fügen Sie das Konto der Root-Ebene Company - {} hinzu"
 
@@ -49403,28 +50229,28 @@
 msgid "Please add {1} role to user {0}."
 msgstr "Bitte fügen Sie dem Benutzer {0} die Rolle {1} hinzu."
 
-#: controllers/stock_controller.py:909
+#: controllers/stock_controller.py:1095
 msgid "Please adjust the qty or edit {0} to proceed."
 msgstr "Bitte passen Sie die Menge an oder bearbeiten Sie {0}, um fortzufahren."
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:121
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:124
 msgid "Please attach CSV file"
 msgstr "Bitte CSV-Datei anhängen"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2735
+#: accounts/doctype/sales_invoice/sales_invoice.py:2704
 msgid "Please cancel and amend the Payment Entry"
 msgstr "Bitte stornieren und berichtigen Sie die Zahlung"
 
-#: accounts/utils.py:926
+#: accounts/utils.py:935
 msgid "Please cancel payment entry manually first"
 msgstr "Bitte stornieren Sie die Zahlung zunächst manuell"
 
-#: accounts/doctype/gl_entry/gl_entry.py:337
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:327
+#: accounts/doctype/gl_entry/gl_entry.py:291
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:338
 msgid "Please cancel related transaction."
 msgstr "Bitte stornieren Sie die entsprechende Transaktion."
 
-#: accounts/doctype/journal_entry/journal_entry.py:836
+#: accounts/doctype/journal_entry/journal_entry.py:863
 msgid "Please check Multi Currency option to allow accounts with other currency"
 msgstr "Bitte die Option \"Unterschiedliche Währungen\" aktivieren um Konten mit anderen Währungen zu erlauben"
 
@@ -49432,11 +50258,11 @@
 msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:71
+#: manufacturing/doctype/bom/bom.js:70
 msgid "Please check either with operations or FG Based Operating Cost."
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:397
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:412
 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again."
 msgstr ""
 
@@ -49444,14 +50270,10 @@
 msgid "Please check your Plaid client ID and secret values"
 msgstr "Bitte überprüfen Sie Ihre Plaid-Client-ID und Ihre geheimen Werte"
 
-#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:227
+#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:235
 msgid "Please check your email to confirm the appointment"
 msgstr "Bitte überprüfen Sie Ihre E-Mails, um den Termin zu bestätigen"
 
-#: public/js/controllers/transaction.js:917
-msgid "Please clear the"
-msgstr "Bitte löschen Sie die"
-
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:377
 msgid "Please click on 'Generate Schedule'"
 msgstr "Bitte auf \"Zeitplan generieren\" klicken"
@@ -49464,19 +50286,19 @@
 msgid "Please click on 'Generate Schedule' to get schedule"
 msgstr "Bitte auf \"Zeitplan generieren\" klicken, um den Zeitplan zu erhalten"
 
-#: selling/doctype/customer/customer.py:538
+#: selling/doctype/customer/customer.py:550
 msgid "Please contact any of the following users to extend the credit limits for {0}: {1}"
 msgstr "Bitte kontaktieren Sie einen der folgenden Benutzer, um die Kreditlimits für {0} zu erweitern: {1}"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:321
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:332
 msgid "Please contact any of the following users to {} this transaction."
 msgstr "Bitte kontaktieren Sie einen der folgenden Benutzer, um diese Transaktion zu {}."
 
-#: selling/doctype/customer/customer.py:531
+#: selling/doctype/customer/customer.py:543
 msgid "Please contact your administrator to extend the credit limits for {0}."
 msgstr "Bitte wenden Sie sich an Ihren Administrator, um die Kreditlimits für {0} zu erweitern."
 
-#: accounts/doctype/account/account.py:317
+#: accounts/doctype/account/account.py:336
 msgid "Please convert the parent account in corresponding child company to a group account."
 msgstr "Bitte konvertieren Sie das Elternkonto in der entsprechenden Kinderfirma in ein Gruppenkonto."
 
@@ -49484,19 +50306,19 @@
 msgid "Please create Customer from Lead {0}."
 msgstr "Bitte erstellen Sie einen Kunden aus Interessent {0}."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:96
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:117
 msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:67
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:71
 msgid "Please create a new Accounting Dimension if required."
 msgstr "Bitte erstellen Sie bei Bedarf eine neue Buchhaltungsdimension."
 
-#: controllers/accounts_controller.py:534
+#: controllers/accounts_controller.py:578
 msgid "Please create purchase from internal sale or delivery document itself"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:327
+#: assets/doctype/asset/asset.py:329
 msgid "Please create purchase receipt or purchase invoice for the item {0}"
 msgstr "Bitte erstellen Sie eine Kaufquittung oder eine Eingangsrechnungen für den Artikel {0}"
 
@@ -49504,7 +50326,7 @@
 msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:366
+#: assets/doctype/asset/asset.py:368
 msgid "Please do not book expense of multiple assets against one single Asset."
 msgstr ""
 
@@ -49520,8 +50342,12 @@
 msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses"
 msgstr "Bitte aktivieren Sie \"Anwendbar bei Bestellung\" und \"Anwendbar bei Buchung der Ist-Ausgaben\""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:135
-#: public/js/utils/serial_no_batch_selector.js:289
+#: stock/doctype/pick_list/pick_list.py:143
+msgid "Please enable Use Old Serial / Batch Fields to make_bundle"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:145
+#: public/js/utils/serial_no_batch_selector.js:295
 #: regional/report/electronic_invoice_register/electronic_invoice_register.js:49
 msgid "Please enable pop-ups"
 msgstr "Bitte Pop-ups aktivieren"
@@ -49530,32 +50356,32 @@
 msgid "Please enable {0} in the {1}."
 msgstr ""
 
-#: controllers/selling_controller.py:657
+#: controllers/selling_controller.py:681
 msgid "Please enable {} in {} to allow same item in multiple rows"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:871
+#: accounts/doctype/sales_invoice/sales_invoice.py:888
 msgid "Please ensure {} account is a Balance Sheet account."
 msgstr "Bitte stellen Sie sicher, dass das Konto {} ein Bilanzkonto ist."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:366
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:370
 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 "Bitte stellen Sie sicher, dass das Konto {} ein Bilanzkonto ist. Sie können das übergeordnete Konto in ein Bilanzkonto ändern oder ein anderes Konto auswählen."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:374
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:378
 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:880
+#: accounts/doctype/sales_invoice/sales_invoice.py:897
 msgid "Please ensure {} account {} is a Receivable account."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:563
+#: stock/doctype/stock_entry/stock_entry.py:518
 msgid "Please enter <b>Difference Account</b> or set default <b>Stock Adjustment Account</b> for company {0}"
 msgstr "Geben Sie das <b>Differenzkonto ein</b> oder legen Sie das Standardkonto für die <b>Bestandsanpassung</b> für Firma {0} fest."
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:430
-#: accounts/doctype/sales_invoice/sales_invoice.py:1024
+#: accounts/doctype/sales_invoice/sales_invoice.py:1046
 msgid "Please enter Account for Change Amount"
 msgstr "Bitte geben Sie Konto für Änderungsbetrag"
 
@@ -49563,32 +50389,32 @@
 msgid "Please enter Approving Role or Approving User"
 msgstr "Bitte genehmigende Rolle oder genehmigenden Nutzer eingeben"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:697
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:751
 msgid "Please enter Cost Center"
 msgstr "Bitte die Kostenstelle eingeben"
 
-#: selling/doctype/sales_order/sales_order.py:322
+#: selling/doctype/sales_order/sales_order.py:325
 msgid "Please enter Delivery Date"
 msgstr "Bitte geben Sie das Lieferdatum ein"
 
-#: setup/doctype/sales_person/sales_person_tree.js:8
+#: setup/doctype/sales_person/sales_person_tree.js:9
 msgid "Please enter Employee Id of this sales person"
 msgstr "Bitte die Mitarbeiter-ID dieses Vertriebsmitarbeiters angeben"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:708
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:762
 msgid "Please enter Expense Account"
 msgstr "Bitte das Aufwandskonto angeben"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.js:87
-#: stock/doctype/stock_entry/stock_entry.js:82
+#: assets/doctype/asset_capitalization/asset_capitalization.js:89
+#: stock/doctype/stock_entry/stock_entry.js:87
 msgid "Please enter Item Code to get Batch Number"
 msgstr "Bitte geben Sie Item Code zu Chargennummer erhalten"
 
-#: public/js/controllers/transaction.js:2236
+#: public/js/controllers/transaction.js:2289
 msgid "Please enter Item Code to get batch no"
 msgstr "Bitte die Artikelnummer eingeben um die Chargennummer zu erhalten"
 
-#: manufacturing/doctype/production_plan/production_plan.js:67
+#: manufacturing/doctype/production_plan/production_plan.js:66
 msgid "Please enter Item first"
 msgstr "Bitte zuerst den Artikel angeben"
 
@@ -49600,27 +50426,27 @@
 msgid "Please enter Planned Qty for Item {0} at row {1}"
 msgstr "Bitte die geplante Menge für Artikel {0} in Zeile {1} eingeben"
 
-#: setup/doctype/employee/employee.js:76
+#: setup/doctype/employee/employee.js:78
 msgid "Please enter Preferred Contact Email"
 msgstr "Bitte geben Sie Bevorzugte Kontakt per E-Mail"
 
-#: manufacturing/doctype/work_order/work_order.js:71
+#: manufacturing/doctype/work_order/work_order.js:73
 msgid "Please enter Production Item first"
 msgstr "Bitte zuerst Herstellungsartikel eingeben"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:74
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:76
 msgid "Please enter Purchase Receipt first"
 msgstr "Bitte zuerst Eingangsbeleg eingeben"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:77
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:98
 msgid "Please enter Receipt Document"
 msgstr "Bitte geben Sie Eingangsbeleg"
 
-#: accounts/doctype/journal_entry/journal_entry.py:901
+#: accounts/doctype/journal_entry/journal_entry.py:928
 msgid "Please enter Reference date"
 msgstr "Bitte den Stichtag eingeben"
 
-#: controllers/buying_controller.py:851
+#: controllers/buying_controller.py:877
 msgid "Please enter Reqd by Date"
 msgstr "Bitte geben Sie Requd by Date ein"
 
@@ -49628,40 +50454,40 @@
 msgid "Please enter Root Type for account- {0}"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:258
+#: public/js/utils/serial_no_batch_selector.js:262
 msgid "Please enter Serial Nos"
 msgstr "Bitte Seriennummern eingeben"
 
 #: stock/doctype/shipment/shipment.py:83
 msgid "Please enter Shipment Parcel information"
-msgstr ""
+msgstr "Bitte geben Sie die Paketinformationen für die Sendung ein"
 
 #: assets/doctype/asset_repair/asset_repair.py:173
 msgid "Please enter Stock Items consumed during the Repair."
-msgstr ""
+msgstr "Bitte geben Sie die während der Reparatur verbrauchten Lagerartikel ein."
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:29
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:30
 msgid "Please enter Warehouse and Date"
 msgstr "Bitte geben Sie Lager und Datum ein"
 
 #: assets/doctype/asset_repair/asset_repair.py:177
 msgid "Please enter Warehouse from which Stock Items consumed during the Repair were taken."
-msgstr ""
+msgstr "Bitte geben Sie das Lagerhaus ein, aus dem Lagerartikel während der Reparatur verbraucht wurden."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
-#: accounts/doctype/sales_invoice/sales_invoice.py:1020
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:613
+#: accounts/doctype/sales_invoice/sales_invoice.py:1042
 msgid "Please enter Write Off Account"
 msgstr "Bitte Abschreibungskonto eingeben"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:23
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:26
 msgid "Please enter company first"
 msgstr "Bitte zuerst Unternehmen angeben"
 
-#: accounts/doctype/cost_center/cost_center.js:109
+#: accounts/doctype/cost_center/cost_center.js:114
 msgid "Please enter company name first"
 msgstr "Bitte zuerst Firma angeben"
 
-#: controllers/accounts_controller.py:2378
+#: controllers/accounts_controller.py:2470
 msgid "Please enter default currency in Company Master"
 msgstr "Bitte die Standardwährung in die Stammdaten des Unternehmens eingeben"
 
@@ -49669,7 +50495,7 @@
 msgid "Please enter message before sending"
 msgstr "Bitte eine Nachricht vor dem Versenden eingeben"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:247
+#: accounts/doctype/pos_invoice/pos_invoice.js:266
 msgid "Please enter mobile number first."
 msgstr "Bitte geben Sie zuerst Ihre Handynummer ein."
 
@@ -49677,7 +50503,7 @@
 msgid "Please enter parent cost center"
 msgstr "Bitte übergeordnete Kostenstelle eingeben"
 
-#: public/js/utils/barcode_scanner.js:160
+#: public/js/utils/barcode_scanner.js:165
 msgid "Please enter quantity for item {0}"
 msgstr "Bitte geben Sie die Anzahl für den Artikel {0} ein"
 
@@ -49685,11 +50511,11 @@
 msgid "Please enter relieving date."
 msgstr "Bitte Freistellungsdatum eingeben."
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:125
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:128
 msgid "Please enter serial nos"
 msgstr "Bitte geben Sie die Seriennummern ein"
 
-#: setup/doctype/company/company.js:155
+#: setup/doctype/company/company.js:183
 msgid "Please enter the company name to confirm"
 msgstr "Bitte geben Sie den Firmennamen zur Bestätigung ein"
 
@@ -49697,19 +50523,23 @@
 msgid "Please enter the phone number first"
 msgstr "Bitte geben Sie zuerst die Telefonnummer ein"
 
-#: public/js/setup_wizard.js:83
+#: public/js/setup_wizard.js:87
 msgid "Please enter valid Financial Year Start and End Dates"
 msgstr "Bitte geben Sie für das Geschäftsjahr einen gültigen Start- und Endtermin an."
 
+#: templates/includes/footer/footer_extension.html:37
+msgid "Please enter valid email address"
+msgstr ""
+
 #: setup/doctype/employee/employee.py:225
 msgid "Please enter {0}"
 msgstr "Bitte geben Sie {0} ein"
 
-#: public/js/utils/party.js:273
+#: public/js/utils/party.js:317
 msgid "Please enter {0} first"
 msgstr "Bitte geben Sie zuerst {0} ein"
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Please fill the Material Requests table"
 msgstr "Bitte füllen Sie die Materialanforderungstabelle aus"
 
@@ -49717,11 +50547,11 @@
 msgid "Please fill the Sales Orders table"
 msgstr "Bitte füllen Sie die Tabelle Aufträge aus"
 
-#: stock/doctype/shipment/shipment.js:248
+#: stock/doctype/shipment/shipment.js:277
 msgid "Please first set Last Name, Email and Phone for the user"
 msgstr "Bitte geben Sie zunächst Nachname, E-Mail und Telefonnummer des Benutzers ein"
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:92
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:94
 msgid "Please fix overlapping time slots for {0}"
 msgstr ""
 
@@ -49733,6 +50563,10 @@
 msgid "Please import accounts against parent company or enable {} in company master."
 msgstr ""
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:175
+msgid "Please keep one Applicable Charges, when 'Distribute Charges Based On' is 'Distribute Manually'. For more charges, please create another Landed Cost Voucher."
+msgstr ""
+
 #: setup/doctype/employee/employee.py:184
 msgid "Please make sure the employees above report to another Active employee."
 msgstr "Bitte stellen Sie sicher, dass die oben genannten Mitarbeiter einem anderen aktiven Mitarbeiter Bericht erstatten."
@@ -49741,19 +50575,19 @@
 msgid "Please make sure the file you are using has 'Parent Account' column present in the header."
 msgstr "Bitte vergewissern Sie sich, dass die von Ihnen verwendete Datei in der Kopfzeile die Spalte 'Parent Account' enthält."
 
-#: setup/doctype/company/company.js:157
+#: setup/doctype/company/company.js:185
 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone."
 msgstr "Bitte sicher stellen, dass wirklich alle Transaktionen dieses Unternehmens gelöscht werden sollen. Die Stammdaten bleiben bestehen. Diese Aktion kann nicht rückgängig gemacht werden."
 
-#: stock/doctype/item/item.js:425
+#: stock/doctype/item/item.js:493
 msgid "Please mention 'Weight UOM' along with Weight."
 msgstr "Bitte geben Sie neben dem Gewicht auch die entsprechende Mengeneinheit an."
 
-#: accounts/general_ledger.py:555
+#: accounts/general_ledger.py:564
 msgid "Please mention Round Off Account in Company"
 msgstr "Bitte ein Standardkonto Konto für Rundungsdifferenzen in Unternehmen einstellen"
 
-#: accounts/general_ledger.py:558
+#: accounts/general_ledger.py:567
 msgid "Please mention Round Off Cost Center in Company"
 msgstr "Bitte eine Kostenstelle für Rundungsdifferenzen in Unternehmen einstellen"
 
@@ -49769,16 +50603,16 @@
 msgid "Please pull items from Delivery Note"
 msgstr "Bitte Artikel aus dem Lieferschein ziehen"
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:444
 msgid "Please rectify and try again."
 msgstr "Bitte korrigieren Sie den Fehler und versuchen Sie es erneut."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:237
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:253
 msgid "Please refresh or reset the Plaid linking of the Bank {}."
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:12
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:29
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
 msgid "Please save before proceeding."
 msgstr "Bitte speichern Sie, bevor Sie fortfahren."
 
@@ -49786,16 +50620,16 @@
 msgid "Please save first"
 msgstr "Bitte speichern Sie zuerst"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:70
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:79
 msgid "Please select <b>Template Type</b> to download template"
 msgstr "Bitte wählen Sie <b>Vorlagentyp</b> , um die Vorlage herunterzuladen"
 
-#: controllers/taxes_and_totals.py:651
+#: controllers/taxes_and_totals.py:652
 #: public/js/controllers/taxes_and_totals.js:688
 msgid "Please select Apply Discount On"
 msgstr "Bitte \"Rabatt anwenden auf\" auswählen"
 
-#: selling/doctype/sales_order/sales_order.py:1469
+#: selling/doctype/sales_order/sales_order.py:1492
 msgid "Please select BOM against item {0}"
 msgstr "Bitte eine Stückliste für Artikel {0} auswählen"
 
@@ -49807,25 +50641,26 @@
 msgid "Please select BOM in BOM field for Item {0}"
 msgstr "Bitte im Stücklistenfeld eine Stückliste für Artikel {0} auswählen"
 
-#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:12
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:13
 msgid "Please select Category first"
 msgstr "Bitte zuerst eine Kategorie auswählen"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1195
+#: accounts/doctype/payment_entry/payment_entry.js:1429
 #: public/js/controllers/accounts.js:86 public/js/controllers/accounts.js:124
 msgid "Please select Charge Type first"
 msgstr "Bitte zuerst einen Chargentyp auswählen"
 
-#: accounts/doctype/journal_entry/journal_entry.js:401
+#: accounts/doctype/journal_entry/journal_entry.js:443
 msgid "Please select Company"
 msgstr "Bitte Unternehmen auswählen"
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:135
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:141
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:75
 msgid "Please select Company and Posting Date to getting entries"
 msgstr "Bitte wählen Sie Unternehmen und Buchungsdatum, um Einträge zu erhalten"
 
-#: accounts/doctype/journal_entry/journal_entry.js:606
+#: accounts/doctype/journal_entry/journal_entry.js:688
+#: manufacturing/doctype/plant_floor/plant_floor.js:12
 msgid "Please select Company first"
 msgstr "Bitte zuerst Unternehmen auswählen"
 
@@ -49833,12 +50668,12 @@
 msgid "Please select Completion Date for Completed Asset Maintenance Log"
 msgstr "Bitte wählen Sie Fertigstellungsdatum für das abgeschlossene Wartungsprotokoll für den Vermögenswert"
 
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:116
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:84
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:125
 msgid "Please select Customer first"
 msgstr "Bitte wählen Sie zuerst den Kunden aus"
 
-#: setup/doctype/company/company.py:407
+#: setup/doctype/company/company.py:406
 msgid "Please select Existing Company for creating Chart of Accounts"
 msgstr "Bitte wählen Sie Bestehende Unternehmen für die Erstellung von Konten"
 
@@ -49846,7 +50681,7 @@
 msgid "Please select Finished Good Item for Service Item {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:531 assets/doctype/asset/asset.js:548
+#: assets/doctype/asset/asset.js:604 assets/doctype/asset/asset.js:621
 msgid "Please select Item Code first"
 msgstr "Bitte wählen Sie zuerst den Artikelcode"
 
@@ -49855,18 +50690,18 @@
 msgstr "Bitte wählen Sie Wartungsstatus als erledigt oder entfernen Sie das Abschlussdatum"
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:52
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:33
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:33
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:32
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:32
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:63
-#: selling/report/address_and_contacts/address_and_contacts.js:28
+#: selling/report/address_and_contacts/address_and_contacts.js:27
 msgid "Please select Party Type first"
 msgstr "Bitte zuerst Partei-Typ auswählen"
 
-#: accounts/doctype/payment_entry/payment_entry.js:342
+#: accounts/doctype/payment_entry/payment_entry.js:429
 msgid "Please select Posting Date before selecting Party"
 msgstr "Bitte erst Buchungsdatum und dann die Partei auswählen"
 
-#: accounts/doctype/journal_entry/journal_entry.js:607
+#: accounts/doctype/journal_entry/journal_entry.js:689
 msgid "Please select Posting Date first"
 msgstr "Bitte zuerst ein Buchungsdatum auswählen"
 
@@ -49874,7 +50709,7 @@
 msgid "Please select Price List"
 msgstr "Bitte eine Preisliste auswählen"
 
-#: selling/doctype/sales_order/sales_order.py:1471
+#: selling/doctype/sales_order/sales_order.py:1494
 msgid "Please select Qty against item {0}"
 msgstr "Bitte wählen Sie Menge für Artikel {0}"
 
@@ -49890,15 +50725,15 @@
 msgid "Please select Start Date and End Date for Item {0}"
 msgstr "Bitte Start -und Enddatum für den Artikel {0} auswählen"
 
-#: stock/doctype/stock_entry/stock_entry.py:1202
+#: stock/doctype/stock_entry/stock_entry.py:1211
 msgid "Please select Subcontracting Order instead of Purchase Order {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2288
+#: controllers/accounts_controller.py:2380
 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1229
+#: manufacturing/doctype/bom/bom.py:1228
 msgid "Please select a BOM"
 msgstr "Bitte Stückliste auwählen"
 
@@ -49906,10 +50741,10 @@
 msgid "Please select a Company"
 msgstr "Bitte ein Unternehmen auswählen"
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: manufacturing/doctype/bom/bom.js:482 manufacturing/doctype/bom/bom.py:245
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: manufacturing/doctype/bom/bom.js:499 manufacturing/doctype/bom/bom.py:245
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484
+#: public/js/controllers/transaction.js:2537
 msgid "Please select a Company first."
 msgstr "Bitte wählen Sie zuerst eine Firma aus."
 
@@ -49925,11 +50760,15 @@
 msgid "Please select a Subcontracting Purchase Order."
 msgstr ""
 
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
+#: buying/doctype/supplier_quotation/supplier_quotation.js:65
 msgid "Please select a Supplier"
 msgstr "Bitte wählen Sie einen Lieferanten aus"
 
-#: manufacturing/doctype/job_card/job_card.py:1063
+#: public/js/utils/serial_no_batch_selector.js:546
+msgid "Please select a Warehouse"
+msgstr ""
+
+#: manufacturing/doctype/job_card/job_card.py:1084
 msgid "Please select a Work Order first."
 msgstr "Bitte wählen Sie zuerst einen Arbeitsauftrag aus."
 
@@ -49941,23 +50780,23 @@
 msgid "Please select a customer for fetching payments."
 msgstr "Bitte wählen Sie einen Kunden aus, um Zahlungen abzurufen."
 
-#: www/book_appointment/index.js:63
+#: www/book_appointment/index.js:67
 msgid "Please select a date"
 msgstr "Bitte wählen Sie ein Datum"
 
-#: www/book_appointment/index.js:48
+#: www/book_appointment/index.js:52
 msgid "Please select a date and time"
 msgstr "Bitte wählen Sie ein Datum und eine Uhrzeit"
 
 #: accounts/doctype/pos_profile/pos_profile.py:145
 msgid "Please select a default mode of payment"
-msgstr "Bitte wählen Sie eine Standardzahlungsart"
+msgstr "Bitte wählen Sie eine Standardzahlungsweise"
 
-#: selling/page/point_of_sale/pos_item_cart.js:753
+#: selling/page/point_of_sale/pos_item_cart.js:783
 msgid "Please select a field to edit from numpad"
 msgstr "Bitte wähle ein Feld aus numpad aus"
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:68
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:67
 msgid "Please select a row to create a Reposting Entry"
 msgstr ""
 
@@ -49973,11 +50812,11 @@
 msgid "Please select a valid Purchase Order that is configured for Subcontracting."
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:220
+#: selling/doctype/quotation/quotation.js:229
 msgid "Please select a value for {0} quotation_to {1}"
 msgstr "Bitte einen Wert für {0} Angebot an {1} auswählen"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1570
+#: accounts/doctype/journal_entry/journal_entry.py:1574
 msgid "Please select correct account"
 msgstr "Bitte richtiges Konto auswählen"
 
@@ -49994,12 +50833,12 @@
 msgid "Please select item code"
 msgstr "Bitte Artikelnummer auswählen"
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:71
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:69
 msgid "Please select only one row to create a Reposting Entry"
 msgstr ""
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:60
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:96
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:59
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:91
 msgid "Please select rows to create Reposting Entries"
 msgstr ""
 
@@ -50007,7 +50846,7 @@
 msgid "Please select the Company"
 msgstr "Bitte wählen Sie das Unternehmen aus"
 
-#: accounts/doctype/loyalty_program/loyalty_program.js:57
+#: accounts/doctype/loyalty_program/loyalty_program.js:65
 msgid "Please select the Multiple Tier Program type for more than one collection rules."
 msgstr "Wählen Sie den Programmtyp Mehrstufig für mehrere Sammlungsregeln aus."
 
@@ -50018,7 +50857,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:21
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:21
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:42
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:53
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:54
 msgid "Please select the document type first"
 msgstr "Bitte zuerst den Dokumententyp auswählen"
 
@@ -50034,25 +50873,25 @@
 msgid "Please select weekly off day"
 msgstr "Bitte die wöchentlichen Auszeittage auswählen"
 
-#: public/js/utils.js:891
+#: public/js/utils.js:961
 msgid "Please select {0}"
 msgstr "Bitte {0} auswählen"
 
-#: accounts/doctype/payment_entry/payment_entry.js:991
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:575
+#: 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
 msgid "Please select {0} first"
 msgstr "Bitte zuerst {0} auswählen"
 
-#: public/js/controllers/transaction.js:76
+#: public/js/controllers/transaction.js:77
 msgid "Please set 'Apply Additional Discount On'"
 msgstr "Bitte \"Zusätzlichen Rabatt anwenden auf\" aktivieren"
 
-#: assets/doctype/asset/depreciation.py:790
+#: assets/doctype/asset/depreciation.py:788
 msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
 msgstr "Bitte setzen Sie die Kostenstelle für Abschreibungen von Vermögenswerten für das Unternehmen {0}"
 
-#: assets/doctype/asset/depreciation.py:787
+#: assets/doctype/asset/depreciation.py:785
 msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
 msgstr "Bitte setzen Sie \"Gewinn-/Verlustrechnung auf die Veräußerung von Vermögenswerten\" für Unternehmen {0}"
 
@@ -50060,6 +50899,10 @@
 msgid "Please set Account"
 msgstr "Bitte legen Sie ein Konto fest"
 
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
+msgid "Please set Account for Change Amount"
+msgstr ""
+
 #: stock/__init__.py:88
 msgid "Please set Account in Warehouse {0} or Default Inventory Account in Company {1}"
 msgstr "Bitte legen Sie das Konto im Lager {0} oder im Standardbestandskonto im Unternehmen {1} fest."
@@ -50070,23 +50913,23 @@
 
 #: accounts/doctype/ledger_merge/ledger_merge.js:23
 #: accounts/doctype/ledger_merge/ledger_merge.js:34
-#: accounts/doctype/pos_profile/pos_profile.js:27
-#: accounts/doctype/pos_profile/pos_profile.js:50
-#: accounts/doctype/pos_profile/pos_profile.js:64
-#: accounts/doctype/pos_profile/pos_profile.js:78
-#: accounts/doctype/pos_profile/pos_profile.js:91
-#: accounts/doctype/sales_invoice/sales_invoice.js:707
-#: accounts/doctype/sales_invoice/sales_invoice.js:721
-#: selling/doctype/quotation/quotation.js:28
-#: selling/doctype/sales_order/sales_order.js:28
+#: accounts/doctype/pos_profile/pos_profile.js:25
+#: accounts/doctype/pos_profile/pos_profile.js:48
+#: accounts/doctype/pos_profile/pos_profile.js:62
+#: accounts/doctype/pos_profile/pos_profile.js:76
+#: accounts/doctype/pos_profile/pos_profile.js:89
+#: accounts/doctype/sales_invoice/sales_invoice.js:763
+#: accounts/doctype/sales_invoice/sales_invoice.js:777
+#: selling/doctype/quotation/quotation.js:29
+#: selling/doctype/sales_order/sales_order.js:31
 msgid "Please set Company"
 msgstr "Bitte Unternehmen angeben"
 
-#: assets/doctype/asset/depreciation.py:372
+#: assets/doctype/asset/depreciation.py:370
 msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
 msgstr "Bitte stellen Sie die Abschreibungskonten in der Anlagenkategorie {0} oder im Unternehmen {1} ein"
 
-#: stock/doctype/shipment/shipment.js:154
+#: stock/doctype/shipment/shipment.js:176
 msgid "Please set Email/Phone for the contact"
 msgstr "Bitte legen Sie E-Mail/Telefon für den Kontakt fest"
 
@@ -50100,11 +50943,11 @@
 msgid "Please set Fiscal Code for the public administration '%s'"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:547
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:551
 msgid "Please set Fixed Asset Account in {} against {}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:435
+#: assets/doctype/asset/asset.py:437
 msgid "Please set Number of Depreciations Booked"
 msgstr "Bitte setzen Sie Anzahl der Abschreibungen gebucht"
 
@@ -50134,11 +50977,11 @@
 msgid "Please set a Company"
 msgstr "Bitte legen Sie eine Firma fest"
 
-#: assets/doctype/asset/asset.py:262
+#: assets/doctype/asset/asset.py:264
 msgid "Please set a Cost Center for the Asset or set an Asset Depreciation Cost Center for the Company {}"
 msgstr "Bitte legen Sie eine Kostenstelle für den Vermögensgegenstand oder eine Standard-Kostenstelle für die Abschreibung von Vermögensgegenständen für das Unternehmen {} fest"
 
-#: selling/doctype/sales_order/sales_order.py:1260
+#: selling/doctype/sales_order/sales_order.py:1283
 msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
 msgstr "Stellen Sie einen Lieferanten für die Artikel ein, die in der Bestellung berücksichtigt werden sollen."
 
@@ -50150,7 +50993,7 @@
 msgid "Please set a default Holiday List for Employee {0} or Company {1}"
 msgstr "Bitte stellen Sie eine Standard-Feiertagsliste für Mitarbeiter {0} oder Gesellschaft {1}"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:991
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1019
 msgid "Please set account in Warehouse {0}"
 msgstr "Bitte Konto in Lager {0} setzen"
 
@@ -50159,7 +51002,7 @@
 msgid "Please set an Address on the Company '%s'"
 msgstr "Bitte geben Sie eine Adresse für das Unternehmen „%s“ ein"
 
-#: controllers/stock_controller.py:334
+#: controllers/stock_controller.py:516
 msgid "Please set an Expense Account in the Items table"
 msgstr "Bitte legen Sie in der Artikeltabelle ein Aufwandskonto fest"
 
@@ -50171,23 +51014,23 @@
 msgid "Please set at least one row in the Taxes and Charges Table"
 msgstr "Bitte setzen Sie mindestens eine Zeile in die Tabelle Steuern und Abgaben"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2041
+#: accounts/doctype/sales_invoice/sales_invoice.py:2010
 msgid "Please set default Cash or Bank account in Mode of Payment {0}"
-msgstr "Bitte Standardeinstellungen für Kassen- oder Bankkonto in \"Zahlungsart\" {0} setzen"
+msgstr "Bitte tragen Sie ein Bank- oder Kassenkonto in Zahlungsweise {0} ein"
 
 #: 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:2599
+#: accounts/doctype/sales_invoice/sales_invoice.py:2568
 msgid "Please set default Cash or Bank account in Mode of Payment {}"
-msgstr "Bitte setzen Sie das Standard-Bargeld- oder Bankkonto im Zahlungsmodus {}"
+msgstr "Bitte tragen Sie ein Bank- oder Kassenkonto in Zahlungsweise {} ein"
 
 #: 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:2601
+#: accounts/doctype/sales_invoice/sales_invoice.py:2570
 msgid "Please set default Cash or Bank account in Mode of Payments {}"
-msgstr "Bitte setzen Sie das Standard-Bargeld- oder Bankkonto im Zahlungsmodus {}"
+msgstr "Bitte tragen Sie jeweils ein Bank- oder Kassenkonto in Zahlungsweisen {} ein"
 
-#: accounts/utils.py:2086
+#: accounts/utils.py:2054
 msgid "Please set default Exchange Gain/Loss Account in Company {}"
 msgstr "Bitte legen Sie im Unternehmen {} das Standardkonto für Wechselkursgewinne/-verluste fest"
 
@@ -50199,11 +51042,11 @@
 msgid "Please set default UOM in Stock Settings"
 msgstr "Bitte legen Sie die Standardeinheit in den Materialeinstellungen fest"
 
-#: controllers/stock_controller.py:204
+#: controllers/stock_controller.py:386
 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:946
+#: accounts/utils.py:955
 msgid "Please set default {0} in Company {1}"
 msgstr "Bitte Standardwert für {0} in Unternehmen {1} setzen"
 
@@ -50220,11 +51063,11 @@
 msgid "Please set filters"
 msgstr "Bitte Filter einstellen"
 
-#: controllers/accounts_controller.py:1896
+#: controllers/accounts_controller.py:1988
 msgid "Please set one of the following:"
 msgstr "Bitte stellen Sie eine der folgenden Optionen ein:"
 
-#: public/js/controllers/transaction.js:1967
+#: public/js/controllers/transaction.js:2010
 msgid "Please set recurring after saving"
 msgstr "Bitte setzen Sie wiederkehrende nach dem Speichern"
 
@@ -50236,7 +51079,7 @@
 msgid "Please set the Default Cost Center in {0} company."
 msgstr "Bitte die Standardkostenstelle im Unternehmen {0} festlegen."
 
-#: manufacturing/doctype/work_order/work_order.js:487
+#: manufacturing/doctype/work_order/work_order.js:512
 msgid "Please set the Item Code first"
 msgstr "Bitte legen Sie zuerst den Itemcode fest"
 
@@ -50244,7 +51087,7 @@
 msgid "Please set the Payment Schedule"
 msgstr "Bitte legen Sie den Zahlungsplan fest"
 
-#: accounts/doctype/gl_entry/gl_entry.py:175
+#: accounts/doctype/gl_entry/gl_entry.py:165
 msgid "Please set the cost center field in {0} or setup a default Cost Center for the Company."
 msgstr "Legen Sie das Feld Kostenstelle in {0} fest oder richten Sie eine Standardkostenstelle für das Unternehmen ein."
 
@@ -50252,8 +51095,8 @@
 msgid "Please set up the Campaign Schedule in the Campaign {0}"
 msgstr "Richten Sie den Kampagnenzeitplan in der Kampagne {0} ein."
 
-#: public/js/queries.js:39 public/js/queries.js:49 public/js/queries.js:66
-#: public/js/queries.js:95 stock/report/reserved_stock/reserved_stock.py:26
+#: public/js/queries.js:32 public/js/queries.js:44 public/js/queries.js:64
+#: public/js/queries.js:96 stock/report/reserved_stock/reserved_stock.py:26
 msgid "Please set {0}"
 msgstr "Bitte {0} setzen"
 
@@ -50269,34 +51112,34 @@
 msgid "Please set {0} in BOM Creator {1}"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:95
-msgid "Please setup a default bank account for company {0}"
-msgstr "Bitte richten Sie ein Standard-Bankkonto für das Unternehmen {0} ein."
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:97
+msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
+msgstr ""
 
-#: assets/doctype/asset/depreciation.py:424
+#: assets/doctype/asset/depreciation.py:422
 msgid "Please share this email with your support team so that they can find and fix the issue."
 msgstr ""
 
-#: public/js/controllers/transaction.js:1837
+#: public/js/controllers/transaction.js:1880
 msgid "Please specify"
 msgstr "Bitte angeben"
 
-#: stock/get_item_details.py:210
+#: stock/get_item_details.py:215
 msgid "Please specify Company"
 msgstr "Bitte Unternehmen angeben"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:81
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:380
-#: accounts/doctype/sales_invoice/sales_invoice.js:452
+#: accounts/doctype/pos_invoice/pos_invoice.js:88
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:420
+#: accounts/doctype/sales_invoice/sales_invoice.js:501
 msgid "Please specify Company to proceed"
 msgstr "Bitte Unternehmen angeben um fortzufahren"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1206
-#: controllers/accounts_controller.py:2511 public/js/controllers/accounts.js:97
+#: accounts/doctype/payment_entry/payment_entry.js:1452
+#: controllers/accounts_controller.py:2596 public/js/controllers/accounts.js:97
 msgid "Please specify a valid Row ID for row {0} in table {1}"
 msgstr "Bitte eine gültige Zeilen-ID für die Zeile {0} in Tabelle {1} angeben"
 
-#: public/js/queries.js:104
+#: public/js/queries.js:106
 msgid "Please specify a {0}"
 msgstr ""
 
@@ -50304,7 +51147,7 @@
 msgid "Please specify at least one attribute in the Attributes table"
 msgstr "Bitte geben Sie mindestens ein Attribut in der Attributtabelle ein"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:372
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:426
 msgid "Please specify either Quantity or Valuation Rate or both"
 msgstr "Bitte entweder die Menge oder den Wertansatz oder beides eingeben"
 
@@ -50312,11 +51155,11 @@
 msgid "Please specify from/to range"
 msgstr "Bitte Von-/Bis-Bereich genau angeben"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:35
+#: buying/doctype/request_for_quotation/request_for_quotation.js:37
 msgid "Please supply the specified items at the best possible rates"
 msgstr "Bitte geben Sie die angegebenen Elemente zu den bestmöglichen Preisen"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:223
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:218
 msgid "Please try again in an hour."
 msgstr "Bitte versuchen Sie es in einer Stunde erneut."
 
@@ -50373,7 +51216,7 @@
 msgid "Portrait"
 msgstr "Porträt"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:337
+#: buying/doctype/request_for_quotation/request_for_quotation.js:362
 msgid "Possible Supplier"
 msgstr "Möglicher Lieferant"
 
@@ -50440,17 +51283,18 @@
 msgid "Postal Expenses"
 msgstr "Portoaufwendungen"
 
-#: accounts/doctype/payment_entry/payment_entry.js:644
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: 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/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:563
+#: 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/item_wise_sales_register/item_wise_sales_register.py:200
@@ -50465,7 +51309,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:45
 #: 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:84
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:89
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:129
@@ -50475,6 +51319,7 @@
 #: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
 #: 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
 msgid "Posting Date"
 msgstr "Buchungsdatum"
 
@@ -50659,11 +51504,17 @@
 msgid "Posting Date cannot be future date"
 msgstr "Buchungsdatum darf nicht in der Zukunft liegen"
 
+#. Label of a Datetime field in DocType 'Stock Ledger Entry'
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+msgctxt "Stock Ledger Entry"
+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
-#: stock/report/serial_no_ledger/serial_no_ledger.js:64
+#: 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_ledger_invariant_check/stock_ledger_invariant_check.py:126
@@ -50761,7 +51612,7 @@
 msgid "Posting Time"
 msgstr "Buchungszeit"
 
-#: stock/doctype/stock_entry/stock_entry.py:1641
+#: stock/doctype/stock_entry/stock_entry.py:1650
 msgid "Posting date and posting time is mandatory"
 msgstr "Buchungsdatum und Buchungszeit sind zwingend erforderlich"
 
@@ -50769,6 +51620,11 @@
 msgid "Posting timestamp must be after {0}"
 msgstr "Buchungszeitstempel muss nach {0} liegen"
 
+#. Description of a DocType
+#: crm/doctype/opportunity/opportunity.json
+msgid "Potential Sales Deal"
+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
@@ -50867,7 +51723,7 @@
 msgid "Preventive Maintenance"
 msgstr "Vorbeugende Wartung"
 
-#: public/js/utils/ledger_preview.js:20 public/js/utils/ledger_preview.js:40
+#: public/js/utils/ledger_preview.js:28 public/js/utils/ledger_preview.js:57
 msgid "Preview"
 msgstr "Vorschau"
 
@@ -50883,7 +51739,7 @@
 msgid "Preview"
 msgstr "Vorschau"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:205
+#: buying/doctype/request_for_quotation/request_for_quotation.js:223
 msgid "Preview Email"
 msgstr "Vorschau E-Mail"
 
@@ -50904,7 +51760,7 @@
 msgid "Previous Work Experience"
 msgstr "Vorherige Berufserfahrung"
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:152
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:153
 msgid "Previous Year is not closed, please close it first"
 msgstr ""
 
@@ -51115,7 +51971,7 @@
 msgid "Price List Currency"
 msgstr "Preislistenwährung"
 
-#: stock/get_item_details.py:1029
+#: stock/get_item_details.py:1040
 msgid "Price List Currency not selected"
 msgstr "Preislistenwährung nicht ausgewählt"
 
@@ -51203,6 +52059,12 @@
 msgid "Price List Rate"
 msgstr "Preisliste"
 
+#. Label of a Currency field in DocType 'Material Request Item'
+#: stock/doctype/material_request_item/material_request_item.json
+msgctxt "Material Request Item"
+msgid "Price List Rate"
+msgstr "Preisliste"
+
 #. Label of a Currency field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
@@ -51323,7 +52185,7 @@
 msgid "Price Per Unit ({0})"
 msgstr "Preis pro Einheit ({0})"
 
-#: selling/page/point_of_sale/pos_controller.js:553
+#: selling/page/point_of_sale/pos_controller.js:581
 msgid "Price is not set for the item."
 msgstr ""
 
@@ -51337,7 +52199,7 @@
 msgid "Price or Product Discount"
 msgstr "Preis- oder Produktrabatt"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:145
 msgid "Price or product discount slabs are required"
 msgstr "Preis- oder Produktrabattplatten sind erforderlich"
 
@@ -51353,7 +52215,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/pricing_rule/pricing_rule.json
-#: buying/doctype/supplier/supplier.js:98
+#: buying/doctype/supplier/supplier.js:116
 msgid "Pricing Rule"
 msgstr "Preisregel"
 
@@ -51470,7 +52332,7 @@
 msgid "Pricing Rule Item Group"
 msgstr "Artikelgruppe für Preisregel"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:208
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:210
 msgid "Pricing Rule {0} is updated"
 msgstr "Die Preisregel {0} wurde aktualisiert"
 
@@ -51594,7 +52456,7 @@
 msgid "Primary Address"
 msgstr "Hauptadresse"
 
-#: public/js/utils/contact_address_quick_entry.js:54
+#: public/js/utils/contact_address_quick_entry.js:57
 msgid "Primary Address Details"
 msgstr "Primäre Adressendetails"
 
@@ -51616,7 +52478,7 @@
 msgid "Primary Contact"
 msgstr "Hauptkontakt"
 
-#: public/js/utils/contact_address_quick_entry.js:35
+#: public/js/utils/contact_address_quick_entry.js:38
 msgid "Primary Contact Details"
 msgstr "Primäre Kontaktdaten"
 
@@ -51645,7 +52507,7 @@
 msgid "Primary Settings"
 msgstr "Primäre Einstellungen"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:69
+#: selling/page/point_of_sale/pos_past_order_summary.js:67
 #: templates/pages/material_request_info.html:15 templates/pages/order.html:33
 msgid "Print"
 msgstr "Drucken"
@@ -51886,7 +52748,7 @@
 msgid "Print Preferences"
 msgstr "Druckeinstellungen"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:223
+#: selling/page/point_of_sale/pos_past_order_summary.js:231
 msgid "Print Receipt"
 msgstr "Druckeingang"
 
@@ -51951,7 +52813,7 @@
 msgid "Print Style"
 msgstr "Druckstil"
 
-#: setup/install.py:118
+#: setup/install.py:99
 msgid "Print UOM after Quantity"
 msgstr "UOM nach Menge drucken"
 
@@ -51966,15 +52828,16 @@
 msgid "Print and Stationery"
 msgstr "Drucken und Papierwaren"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:73
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:75
 msgid "Print settings updated in respective print format"
 msgstr "Die Druckeinstellungen im jeweiligen Druckformat aktualisiert"
 
-#: setup/install.py:125
+#: setup/install.py:106
 msgid "Print taxes with zero amount"
 msgstr "Steuern mit null Betrag drucken"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:364
+#: accounts/report/accounts_receivable/accounts_receivable.html:285
 msgid "Printed On "
 msgstr "Gedruckt auf"
 
@@ -52055,9 +52918,10 @@
 msgid "Priorities"
 msgstr "Prioritäten"
 
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:19
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:18
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:93
-#: projects/report/project_summary/project_summary.js:37
+#: projects/report/project_summary/project_summary.js:36
+#: templates/pages/task_info.html:54
 msgid "Priority"
 msgstr "Priorität"
 
@@ -52145,6 +53009,12 @@
 msgid "Problem"
 msgstr "Problem"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Problem"
+msgstr "Problem"
+
 #. Label of a Link field in DocType 'Non Conformance'
 #: quality_management/doctype/non_conformance/non_conformance.json
 msgctxt "Non Conformance"
@@ -52169,7 +53039,7 @@
 msgid "Procedure"
 msgstr "Verfahren"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:70
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:75
 msgid "Process Day Book Data"
 msgstr "Tagesbuchdaten verarbeiten"
 
@@ -52255,7 +53125,7 @@
 msgid "Process Loss Value"
 msgstr "Prozessverlustwert"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:58
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:63
 msgid "Process Master Data"
 msgstr "Stammdaten bearbeiten"
 
@@ -52307,6 +53177,12 @@
 msgid "Process Subscription"
 msgstr ""
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Process in Single Transaction"
+msgstr ""
+
 #. Label of a Long Text field in DocType 'BOM Update Log'
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 msgctxt "BOM Update Log"
@@ -52337,7 +53213,7 @@
 msgid "Processing Party Addresses"
 msgstr "Verarbeitung der Adressen der Parteien"
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:115
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:122
 msgid "Processing Sales! Please Wait..."
 msgstr ""
 
@@ -52410,7 +53286,7 @@
 msgstr "Produkt"
 
 #. Name of a DocType
-#: public/js/controllers/buying.js:265 public/js/controllers/buying.js:511
+#: public/js/controllers/buying.js:260 public/js/controllers/buying.js:508
 #: selling/doctype/product_bundle/product_bundle.json
 msgid "Product Bundle"
 msgstr "Produkt-Bundle"
@@ -52514,7 +53390,13 @@
 
 #. Label of a Card Break in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
-#: setup/doctype/company/company.py:347
+#: setup/doctype/company/company.py:346
+msgid "Production"
+msgstr "Produktion"
+
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
 msgid "Production"
 msgstr "Produktion"
 
@@ -52525,18 +53407,18 @@
 msgid "Production Analytics"
 msgstr "Produktions-Analysen"
 
-#. Label of a Int field in DocType 'Workstation'
+#. Label of a Section Break field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Production Capacity"
 msgstr "Produktionskapazität"
 
 #: manufacturing/doctype/work_order/work_order_calendar.js:38
-#: manufacturing/report/job_card_summary/job_card_summary.js:65
+#: manufacturing/report/job_card_summary/job_card_summary.js:64
 #: manufacturing/report/job_card_summary/job_card_summary.py:152
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:43
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:42
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:113
-#: manufacturing/report/work_order_summary/work_order_summary.js:51
+#: manufacturing/report/work_order_summary/work_order_summary.js:50
 #: manufacturing/report/work_order_summary/work_order_summary.py:208
 msgid "Production Item"
 msgstr "Produktions-Artikel"
@@ -52561,7 +53443,7 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/production_plan/production_plan.json
-#: manufacturing/report/production_plan_summary/production_plan_summary.js:9
+#: manufacturing/report/production_plan_summary/production_plan_summary.js:8
 msgid "Production Plan"
 msgstr "Produktionsplan"
 
@@ -52768,7 +53650,7 @@
 msgid "Profitability Analysis"
 msgstr "Wirtschaftlichkeitsanalyse"
 
-#: templates/pages/projects.html:25
+#: projects/doctype/task/task_list.js:52 templates/pages/projects.html:25
 msgid "Progress"
 msgstr "Fortschritt"
 
@@ -52788,10 +53670,10 @@
 msgstr "Fortschritt (%)"
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:973
+#: 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:634
+#: 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
@@ -52799,30 +53681,31 @@
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:73
 #: accounts/report/sales_register/sales_register.py:228
 #: accounts/report/trial_balance/trial_balance.js:64
-#: buying/report/procurement_tracker/procurement_tracker.js:22
+#: 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:34
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:33
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:182
 #: projects/doctype/project/project.json
 #: projects/doctype/project/project_dashboard.py:11
 #: projects/doctype/task/task_calendar.js:19
-#: projects/doctype/task/task_tree.js:11
+#: projects/doctype/task/task_list.js:45 projects/doctype/task/task_tree.js:11
 #: projects/doctype/timesheet/timesheet_calendar.js:22
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:34
 #: projects/report/project_summary/project_summary.py:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:19
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:51
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:25
-#: public/js/financial_statements.js:247 public/js/projects/timer.js:10
+#: public/js/financial_statements.js:256 public/js/projects/timer.js:14
 #: public/js/purchase_trends_filters.js:52 public/js/sales_trends_filters.js:28
-#: selling/doctype/sales_order/sales_order.js:587
+#: selling/doctype/sales_order/sales_order.js:681
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:94
-#: stock/report/reserved_stock/reserved_stock.js:139
+#: stock/report/reserved_stock/reserved_stock.js:130
 #: stock/report/reserved_stock/reserved_stock.py:184
-#: stock/report/stock_ledger/stock_ledger.js:76
-#: stock/report/stock_ledger/stock_ledger.py:261
-#: support/report/issue_analytics/issue_analytics.js:76
-#: support/report/issue_summary/issue_summary.js:64
+#: stock/report/stock_ledger/stock_ledger.js:84
+#: stock/report/stock_ledger/stock_ledger.py:333
+#: support/report/issue_analytics/issue_analytics.js:75
+#: support/report/issue_summary/issue_summary.js:63
+#: templates/pages/task_info.html:39 templates/pages/timelog_info.html:22
 msgid "Project"
 msgstr "Projekt"
 
@@ -52887,6 +53770,12 @@
 msgid "Project"
 msgstr "Projekt"
 
+#. Label of a Link field in DocType 'Installation Note'
+#: selling/doctype/installation_note/installation_note.json
+msgctxt "Installation Note"
+msgid "Project"
+msgstr "Projekt"
+
 #. Label of a Link field in DocType 'Issue'
 #: support/doctype/issue/issue.json
 msgctxt "Issue"
@@ -53192,7 +54081,7 @@
 
 #. Name of a DocType
 #: projects/doctype/project_type/project_type.json
-#: projects/report/project_summary/project_summary.js:31
+#: projects/report/project_summary/project_summary.js:30
 msgid "Project Type"
 msgstr "Projekttyp"
 
@@ -53268,6 +54157,8 @@
 msgid "Project-wise data is not available for Quotation"
 msgstr "Projektbezogene Daten sind für das Angebot nicht verfügbar"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:46
+#: stock/dashboard/item_dashboard_list.html:37
 #: stock/report/item_shortage_report/item_shortage_report.py:73
 #: stock/report/stock_projected_qty/stock_projected_qty.py:199
 #: templates/emails/reorder_item.html:12
@@ -53320,6 +54211,10 @@
 msgid "Projected Quantity"
 msgstr "Projizierte Menge"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Projected Quantity Formula"
+msgstr ""
+
 #: stock/page/stock_balance/stock_balance.js:51
 msgid "Projected qty"
 msgstr "Geplante Menge"
@@ -53450,7 +54345,7 @@
 msgstr "Prorieren"
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:61
+#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:62
 #: crm/doctype/prospect/prospect.json
 msgid "Prospect"
 msgstr "Potenzieller Kunde"
@@ -53545,7 +54440,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:335
+#: setup/doctype/company/company.py:334
 msgid "Purchase"
 msgstr "Einkauf"
 
@@ -53638,15 +54533,15 @@
 #. Name of a DocType
 #: 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:23
+#: 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:323
-#: buying/doctype/purchase_order/purchase_order_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:378
+#: 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:110
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:22
-#: stock/doctype/stock_entry/stock_entry.js:262
+#: stock/doctype/purchase_receipt/purchase_receipt.js:123
+#: stock/doctype/purchase_receipt/purchase_receipt.js:268
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:30
+#: stock/doctype/stock_entry/stock_entry.js:294
 msgid "Purchase Invoice"
 msgstr "Eingangsrechnung"
 
@@ -53769,16 +54664,16 @@
 msgid "Purchase Invoice Trends"
 msgstr "Trendanalyse Eingangsrechnungen"
 
-#: assets/doctype/asset/asset.py:213
+#: assets/doctype/asset/asset.py:215
 msgid "Purchase Invoice cannot be made against an existing asset {0}"
 msgstr "Eingangsrechnung kann nicht gegen bestehenden Vermögensgegenstand {0} ausgestellt werden"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:389
-#: stock/doctype/purchase_receipt/purchase_receipt.py:403
+#: stock/doctype/purchase_receipt/purchase_receipt.py:390
+#: stock/doctype/purchase_receipt/purchase_receipt.py:404
 msgid "Purchase Invoice {0} is already submitted"
 msgstr "Eingangsrechnung {0} ist bereits gebucht"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1769
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1828
 msgid "Purchase Invoices"
 msgstr "Eingangsrechnungen"
 
@@ -53796,6 +54691,7 @@
 #: setup/doctype/supplier_group/supplier_group.json stock/doctype/bin/bin.json
 #: stock/doctype/material_request/material_request.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgid "Purchase Manager"
 msgstr "Einkaufsleiter"
@@ -53810,21 +54706,21 @@
 msgstr "Einkaufsstammdaten-Manager"
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:131
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:155
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:234
 #: accounts/report/purchase_register/purchase_register.py:216
 #: buying/doctype/purchase_order/purchase_order.json
-#: buying/doctype/supplier_quotation/supplier_quotation.js:23
+#: 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:41
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:40
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:167
-#: controllers/buying_controller.py:624
-#: manufacturing/doctype/blanket_order/blanket_order.js:45
-#: selling/doctype/sales_order/sales_order.js:112
-#: selling/doctype/sales_order/sales_order.js:576
-#: stock/doctype/material_request/material_request.js:137
-#: stock/doctype/purchase_receipt/purchase_receipt.js:194
+#: controllers/buying_controller.py:649
+#: manufacturing/doctype/blanket_order/blanket_order.js:54
+#: selling/doctype/sales_order/sales_order.js:136
+#: selling/doctype/sales_order/sales_order.js:659
+#: stock/doctype/material_request/material_request.js:154
+#: stock/doctype/purchase_receipt/purchase_receipt.js:225
 msgid "Purchase Order"
 msgstr "Bestellung"
 
@@ -53995,7 +54891,7 @@
 msgid "Purchase Order Item Supplied"
 msgstr "Bestellartikel geliefert"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:684
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:685
 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}"
 msgstr ""
 
@@ -54009,11 +54905,11 @@
 msgid "Purchase Order Pricing Rule"
 msgstr "Preisregel für Bestellungen"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:579
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
 msgid "Purchase Order Required"
 msgstr "Bestellung erforderlich"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:576
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:580
 msgid "Purchase Order Required for item {}"
 msgstr "Bestellung erforderlich für Artikel {}"
 
@@ -54025,7 +54921,7 @@
 msgid "Purchase Order Trends"
 msgstr "Entwicklung Bestellungen"
 
-#: selling/doctype/sales_order/sales_order.js:957
+#: selling/doctype/sales_order/sales_order.js:1115
 msgid "Purchase Order already created for all Sales Order items"
 msgstr "Bestellung bereits für alle Auftragspositionen angelegt"
 
@@ -54033,11 +54929,11 @@
 msgid "Purchase Order number required for Item {0}"
 msgstr "Bestellnummer ist für den Artikel {0} erforderlich"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:618
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:622
 msgid "Purchase Order {0} is not submitted"
 msgstr "Lieferantenauftrag {0} ist nicht gebucht"
 
-#: buying/doctype/purchase_order/purchase_order.py:824
+#: buying/doctype/purchase_order/purchase_order.py:827
 msgid "Purchase Orders"
 msgstr "Kauforder"
 
@@ -54047,7 +54943,7 @@
 msgid "Purchase Orders Items Overdue"
 msgstr "Bestellungen überfällig"
 
-#: buying/doctype/purchase_order/purchase_order.py:301
+#: buying/doctype/purchase_order/purchase_order.py:302
 msgid "Purchase Orders are not allowed for {0} due to a scorecard standing of {1}."
 msgstr "Kaufaufträge sind für {0} wegen einer Scorecard von {1} nicht erlaubt."
 
@@ -54063,7 +54959,7 @@
 msgid "Purchase Orders to Receive"
 msgstr "Anzuliefernde Bestellungen"
 
-#: controllers/accounts_controller.py:1517
+#: controllers/accounts_controller.py:1606
 msgid "Purchase Orders {0} are un-linked"
 msgstr ""
 
@@ -54072,17 +54968,17 @@
 msgstr "Einkaufspreisliste"
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:607
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:613
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: 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/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:310
-#: buying/doctype/purchase_order/purchase_order_list.js:43
+#: buying/doctype/purchase_order/purchase_order.js:352
+#: buying/doctype/purchase_order/purchase_order_list.js:61
 #: stock/doctype/purchase_receipt/purchase_receipt.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:56
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:65
 msgid "Purchase Receipt"
 msgstr "Eingangsbeleg"
 
@@ -54199,11 +55095,11 @@
 msgid "Purchase Receipt No"
 msgstr "Eingangsbeleg Nr."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:601
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
 msgid "Purchase Receipt Required"
 msgstr "Eingangsbeleg notwendig"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:600
 msgid "Purchase Receipt Required for item {}"
 msgstr "Eingangsbeleg für Artikel {} erforderlich"
 
@@ -54216,15 +55112,15 @@
 msgid "Purchase Receipt Trends"
 msgstr "Trendanalyse Eingangsbelege"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:314
+#: stock/doctype/purchase_receipt/purchase_receipt.js:363
 msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
 msgstr "Der Eingangsbeleg enthält keinen Artikel, für den die Option &quot;Probe aufbewahren&quot; aktiviert ist."
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:702
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:703
 msgid "Purchase Receipt {0} created."
 msgstr "Eingangsbeleg {0} erstellt."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:628
 msgid "Purchase Receipt {0} is not submitted"
 msgstr "Eingangsbeleg {0} ist nicht gebucht"
 
@@ -54241,11 +55137,11 @@
 msgid "Purchase Register"
 msgstr "Übersicht über Einkäufe"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
 msgid "Purchase Return"
 msgstr "Warenrücksendung"
 
-#: setup/doctype/company/company.js:104
+#: setup/doctype/company/company.js:118
 msgid "Purchase Tax Template"
 msgstr "Umsatzsteuer-Vorlage"
 
@@ -54362,6 +55258,7 @@
 #: stock/doctype/price_list/price_list.json
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -54427,7 +55324,7 @@
 msgid "Purple"
 msgstr "Lila"
 
-#: stock/doctype/stock_entry/stock_entry.js:287
+#: stock/doctype/stock_entry/stock_entry.js:329
 msgid "Purpose"
 msgstr "Zweck"
 
@@ -54467,7 +55364,7 @@
 msgid "Purpose"
 msgstr "Zweck"
 
-#: stock/doctype/stock_entry/stock_entry.py:380
+#: stock/doctype/stock_entry/stock_entry.py:335
 msgid "Purpose must be one of {0}"
 msgstr "Zweck muss einer von diesen sein: {0}"
 
@@ -54508,18 +55405,21 @@
 #: controllers/trends.py:240 controllers/trends.py:252
 #: controllers/trends.py:257
 #: manufacturing/report/bom_explorer/bom_explorer.py:57
-#: public/js/bom_configurator/bom_configurator.bundle.js:203
-#: public/js/bom_configurator/bom_configurator.bundle.js:266
-#: public/js/bom_configurator/bom_configurator.bundle.js:271
-#: public/js/bom_configurator/bom_configurator.bundle.js:344
-#: public/js/utils.js:660 selling/doctype/sales_order/sales_order.js:315
-#: selling/doctype/sales_order/sales_order.js:410
-#: selling/doctype/sales_order/sales_order.js:698
-#: selling/doctype/sales_order/sales_order.js:815
+#: 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
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:106
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:166
 #: 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
+#: templates/form_grid/stock_entry_grid.html:10
 #: templates/generators/bom.html:50 templates/pages/rfq.html:40
 msgid "Qty"
 msgstr "Menge"
@@ -54666,7 +55566,7 @@
 msgid "Qty"
 msgstr "Menge"
 
-#: templates/pages/order.html:167
+#: templates/pages/order.html:179
 msgid "Qty "
 msgstr "Menge "
 
@@ -54716,7 +55616,7 @@
 msgid "Qty Per Unit"
 msgstr "Menge pro Einheit"
 
-#: manufacturing/doctype/bom/bom.js:237
+#: manufacturing/doctype/bom/bom.js:256
 #: manufacturing/report/process_loss_report/process_loss_report.py:83
 msgid "Qty To Manufacture"
 msgstr "Herzustellende Menge"
@@ -54807,7 +55707,14 @@
 msgid "Qty for which recursion isn't applicable."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:713
+#. Description of the 'Apply Recursion Over (As Per Transaction UOM)' (Float)
+#. field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Qty for which recursion isn't applicable."
+msgstr ""
+
+#: manufacturing/doctype/work_order/work_order.js:766
 msgid "Qty for {0}"
 msgstr "Menge für {0}"
 
@@ -54827,7 +55734,7 @@
 msgid "Qty in Stock UOM"
 msgstr "Menge in Lagermaßeinheit"
 
-#: stock/doctype/pick_list/pick_list.js:145
+#: stock/doctype/pick_list/pick_list.js:174
 msgid "Qty of Finished Goods Item"
 msgstr "Menge des Fertigerzeugnisses"
 
@@ -54837,7 +55744,7 @@
 msgid "Qty of Finished Goods Item"
 msgstr "Menge des Fertigerzeugnisses"
 
-#: stock/doctype/pick_list/pick_list.py:430
+#: stock/doctype/pick_list/pick_list.py:470
 msgid "Qty of Finished Goods Item should be greater than 0."
 msgstr "Die Menge des Fertigwarenartikels sollte größer als 0 sein."
 
@@ -54867,11 +55774,12 @@
 msgid "Qty to Deliver"
 msgstr "Zu liefernde Menge"
 
-#: public/js/utils/serial_no_batch_selector.js:321
+#: public/js/utils/serial_no_batch_selector.js:327
 msgid "Qty to Fetch"
 msgstr "Abzurufende Menge"
 
-#: manufacturing/doctype/job_card/job_card.py:668
+#: manufacturing/doctype/job_card/job_card.py:675
+#: manufacturing/doctype/workstation/workstation_job_card.html:56
 msgid "Qty to Manufacture"
 msgstr "Herzustellende Menge"
 
@@ -55052,7 +55960,7 @@
 msgstr "Qualitätsziel"
 
 #. Name of a DocType
-#: manufacturing/doctype/bom/bom.js:130
+#: manufacturing/doctype/bom/bom.js:138
 #: stock/doctype/quality_inspection/quality_inspection.json
 msgid "Quality Inspection"
 msgstr "Qualitätsprüfung"
@@ -55212,12 +56120,12 @@
 msgid "Quality Inspection Template Name"
 msgstr "Name der Qualitätsinspektionsvorlage"
 
-#: public/js/controllers/transaction.js:298
-#: stock/doctype/stock_entry/stock_entry.js:143
+#: public/js/controllers/transaction.js:324
+#: stock/doctype/stock_entry/stock_entry.js:157
 msgid "Quality Inspection(s)"
 msgstr "Qualitätsprüfung(en)"
 
-#: setup/doctype/company/company.py:377
+#: setup/doctype/company/company.py:376
 msgid "Quality Management"
 msgstr "Qualitätsmanagement"
 
@@ -55316,23 +56224,26 @@
 
 #: 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:29
+#: buying/report/purchase_analytics/purchase_analytics.js:28
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:215
-#: manufacturing/doctype/bom/bom.js:306
-#: manufacturing/doctype/bom_creator/bom_creator.js:69
-#: public/js/controllers/buying.js:518 public/js/stock_analytics.js:37
-#: public/js/utils/serial_no_batch_selector.js:393
+#: 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/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
-#: selling/report/sales_analytics/sales_analytics.js:29
+#: selling/report/sales_analytics/sales_analytics.js:36
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:67
-#: stock/dashboard/item_dashboard.js:236
-#: stock/doctype/material_request/material_request.js:249
-#: stock/doctype/stock_entry/stock_entry.js:551
+#: stock/dashboard/item_dashboard.js:244
+#: stock/doctype/material_request/material_request.js:314
+#: stock/doctype/stock_entry/stock_entry.js:636
 #: 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:28
+#: stock/report/stock_analytics/stock_analytics.js:27
 #: templates/emails/reorder_item.html:10 templates/generators/bom.html:30
-#: templates/pages/material_request_info.html:48 templates/pages/order.html:86
+#: templates/pages/material_request_info.html:48 templates/pages/order.html:98
 msgid "Quantity"
 msgstr "Menge"
 
@@ -55571,16 +56482,20 @@
 msgid "Quantity and Warehouse"
 msgstr "Menge und Lager"
 
-#: stock/doctype/stock_entry/stock_entry.py:1270
+#: stock/doctype/stock_entry/stock_entry.py:1279
 msgid "Quantity in row {0} ({1}) must be same as manufactured quantity {2}"
 msgstr "Menge in Zeile {0} ({1}) muss die gleiche sein wie die hergestellte Menge {2}"
 
-#: stock/dashboard/item_dashboard.js:273
+#: manufacturing/doctype/plant_floor/plant_floor.js:246
+msgid "Quantity is required"
+msgstr ""
+
+#: stock/dashboard/item_dashboard.js:281
 msgid "Quantity must be greater than zero, and less or equal to {0}"
 msgstr "Die Menge muss größer als Null und kleiner oder gleich {0} sein"
 
-#: manufacturing/doctype/work_order/work_order.js:721
-#: stock/doctype/pick_list/pick_list.js:152
+#: manufacturing/doctype/work_order/work_order.js:775
+#: stock/doctype/pick_list/pick_list.js:182
 msgid "Quantity must not be more than {0}"
 msgstr "Menge darf nicht mehr als {0} sein"
 
@@ -55595,26 +56510,27 @@
 msgstr "Für Artikel {0} in Zeile {1} benötigte Menge"
 
 #: manufacturing/doctype/bom/bom.py:568
+#: manufacturing/doctype/workstation/workstation.js:216
 msgid "Quantity should be greater than 0"
 msgstr "Menge sollte größer 0 sein"
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:22
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:21
 msgid "Quantity to Make"
 msgstr "Zu machende Menge"
 
-#: manufacturing/doctype/work_order/work_order.js:249
+#: manufacturing/doctype/work_order/work_order.js:264
 msgid "Quantity to Manufacture"
 msgstr "Menge zu fertigen"
 
-#: manufacturing/doctype/work_order/work_order.py:1516
+#: manufacturing/doctype/work_order/work_order.py:1530
 msgid "Quantity to Manufacture can not be zero for the operation {0}"
 msgstr "Die herzustellende Menge darf für den Vorgang {0} nicht Null sein."
 
-#: manufacturing/doctype/work_order/work_order.py:934
+#: manufacturing/doctype/work_order/work_order.py:948
 msgid "Quantity to Manufacture must be greater than 0."
 msgstr "Menge Herstellung muss größer als 0 sein."
 
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:21
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:24
 msgid "Quantity to Produce"
 msgstr "Menge zu produzieren"
 
@@ -55622,7 +56538,7 @@
 msgid "Quantity to Produce should be greater than zero."
 msgstr "Die zu produzierende Menge sollte größer als Null sein."
 
-#: public/js/utils/barcode_scanner.js:227
+#: public/js/utils/barcode_scanner.js:236
 msgid "Quantity to Scan"
 msgstr "Zu scannende Menge"
 
@@ -55631,20 +56547,20 @@
 msgid "Quarter {0} {1}"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:65
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:68
-#: buying/report/purchase_analytics/purchase_analytics.js:63
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
-#: manufacturing/report/production_analytics/production_analytics.js:36
-#: public/js/financial_statements.js:218
+#: accounts/report/budget_variance_report/budget_variance_report.js:63
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:76
+#: buying/report/purchase_analytics/purchase_analytics.js:62
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
+#: manufacturing/report/production_analytics/production_analytics.js:35
+#: public/js/financial_statements.js:227
 #: public/js/purchase_trends_filters.js:20 public/js/sales_trends_filters.js:12
-#: public/js/stock_analytics.js:54
-#: selling/report/sales_analytics/sales_analytics.js:63
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
-#: stock/report/stock_analytics/stock_analytics.js:82
-#: support/report/issue_analytics/issue_analytics.js:44
+#: public/js/stock_analytics.js:84
+#: selling/report/sales_analytics/sales_analytics.js:70
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
+#: stock/report/stock_analytics/stock_analytics.js:81
+#: support/report/issue_analytics/issue_analytics.js:43
 msgid "Quarterly"
 msgstr "Quartalsweise"
 
@@ -55732,11 +56648,18 @@
 msgid "Queued"
 msgstr "Warteschlange"
 
-#: accounts/doctype/journal_entry/journal_entry.js:39
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Queued"
+msgstr "Warteschlange"
+
+#: accounts/doctype/journal_entry/journal_entry.js:82
 msgid "Quick Entry"
 msgstr "Schnelleingabe"
 
-#: accounts/doctype/journal_entry/journal_entry.js:527
+#: accounts/doctype/journal_entry/journal_entry.js:577
 msgid "Quick Journal Entry"
 msgstr "Schnellbuchung"
 
@@ -55773,13 +56696,14 @@
 msgstr "Ang/Inter %"
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:257
-#: buying/doctype/supplier_quotation/supplier_quotation.js:26
-#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:100
-#: crm/report/lead_details/lead_details.js:38
-#: manufacturing/doctype/blanket_order/blanket_order.js:33
+#: accounts/doctype/sales_invoice/sales_invoice.js:287
+#: buying/doctype/supplier_quotation/supplier_quotation.js:27
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
+#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:108
+#: crm/report/lead_details/lead_details.js:37
+#: manufacturing/doctype/blanket_order/blanket_order.js:38
 #: selling/doctype/quotation/quotation.json
-#: selling/doctype/sales_order/sales_order.js:613
+#: selling/doctype/sales_order/sales_order.js:721
 msgid "Quotation"
 msgstr "Angebot"
 
@@ -55887,11 +56811,11 @@
 msgid "Quotation Trends"
 msgstr "Trendanalyse Angebote"
 
-#: selling/doctype/sales_order/sales_order.py:383
+#: selling/doctype/sales_order/sales_order.py:386
 msgid "Quotation {0} is cancelled"
 msgstr "Angebot {0} wird storniert"
 
-#: selling/doctype/sales_order/sales_order.py:300
+#: selling/doctype/sales_order/sales_order.py:303
 msgid "Quotation {0} not of type {1}"
 msgstr "Angebot {0} nicht vom Typ {1}"
 
@@ -55947,13 +56871,13 @@
 msgid "Random"
 msgstr "Zufällig"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:58
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:26
-#: manufacturing/report/production_analytics/production_analytics.js:31
-#: public/js/stock_analytics.js:49
-#: selling/report/sales_analytics/sales_analytics.js:58
-#: stock/report/stock_analytics/stock_analytics.js:77
-#: support/report/issue_analytics/issue_analytics.js:39
+#: buying/report/purchase_analytics/purchase_analytics.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:25
+#: manufacturing/report/production_analytics/production_analytics.js:30
+#: public/js/stock_analytics.js:78
+#: selling/report/sales_analytics/sales_analytics.js:65
+#: stock/report/stock_analytics/stock_analytics.js:76
+#: support/report/issue_analytics/issue_analytics.js:38
 msgid "Range"
 msgstr "Bandbreite"
 
@@ -55973,12 +56897,13 @@
 #: 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:669
+#: accounts/report/share_ledger/share_ledger.py:56 public/js/utils.js:732
 #: 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:243
+#: stock/dashboard/item_dashboard.js:251
 #: stock/report/delayed_item_report/delayed_item_report.py:151
-#: templates/pages/order.html:89 templates/pages/rfq.html:43
+#: templates/form_grid/item_grid.html:8 templates/pages/order.html:101
+#: templates/pages/rfq.html:43
 msgid "Rate"
 msgstr "Einzelpreis"
 
@@ -56588,6 +57513,7 @@
 msgstr "Verhältnisse"
 
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:52
+#: public/js/bom_configurator/bom_configurator.bundle.js:118
 #: setup/setup_wizard/operations/install_fixtures.py:46
 #: setup/setup_wizard/operations/install_fixtures.py:167
 msgid "Raw Material"
@@ -56657,12 +57583,13 @@
 msgid "Raw Material Value"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:66
+#: manufacturing/report/production_planning_report/production_planning_report.js:65
 msgid "Raw Material Warehouse"
 msgstr "Rohstofflager"
 
-#: manufacturing/doctype/bom/bom.js:274
-#: public/js/bom_configurator/bom_configurator.bundle.js:268
+#: manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/workstation/workstation_job_card.html:76
+#: public/js/bom_configurator/bom_configurator.bundle.js:289
 msgid "Raw Materials"
 msgstr "Rohes Material"
 
@@ -56748,12 +57675,12 @@
 msgid "Raw Materials cannot be blank."
 msgstr "Rohmaterial kann nicht leer sein"
 
-#: buying/doctype/purchase_order/purchase_order.js:304
-#: manufacturing/doctype/production_plan/production_plan.js:97
-#: manufacturing/doctype/work_order/work_order.js:574
-#: selling/doctype/sales_order/sales_order.js:526
-#: selling/doctype/sales_order/sales_order_list.js:49
-#: stock/doctype/material_request/material_request.js:166
+#: buying/doctype/purchase_order/purchase_order.js:342
+#: manufacturing/doctype/production_plan/production_plan.js:103
+#: manufacturing/doctype/work_order/work_order.js:610
+#: selling/doctype/sales_order/sales_order.js:563
+#: selling/doctype/sales_order/sales_order_list.js:62
+#: stock/doctype/material_request/material_request.js:197
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 msgid "Re-open"
 msgstr "Wiedereröffnen"
@@ -56770,7 +57697,7 @@
 msgid "Re-order Qty"
 msgstr "Nachbestellmenge"
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:226
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:227
 msgid "Reached Root"
 msgstr "Oberste Ebene erreicht"
 
@@ -56857,11 +57784,11 @@
 msgid "Readings"
 msgstr "Ablesungen"
 
-#: support/doctype/issue/issue.js:44
+#: support/doctype/issue/issue.js:51
 msgid "Reason"
 msgstr "Grund"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:242
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:279
 msgid "Reason For Putting On Hold"
 msgstr "Grund für das auf Eis legen"
 
@@ -56871,8 +57798,14 @@
 msgid "Reason For Putting On Hold"
 msgstr "Grund für das auf Eis legen"
 
-#: buying/doctype/purchase_order/purchase_order.js:565
-#: selling/doctype/sales_order/sales_order.js:1112
+#. Label of a Data field in DocType 'Payment Request'
+#: accounts/doctype/payment_request/payment_request.json
+msgctxt "Payment Request"
+msgid "Reason for Failure"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:661
+#: selling/doctype/sales_order/sales_order.js:1274
 msgid "Reason for Hold"
 msgstr "Grund für das auf Eis legen"
 
@@ -56882,11 +57815,11 @@
 msgid "Reason for Leaving"
 msgstr "Grund für den Austritt"
 
-#: selling/doctype/sales_order/sales_order.js:1127
+#: selling/doctype/sales_order/sales_order.js:1289
 msgid "Reason for hold:"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:144
+#: manufacturing/doctype/bom_creator/bom_creator.js:140
 msgid "Rebuild Tree"
 msgstr "Baum neu aufbauen"
 
@@ -56900,11 +57833,11 @@
 msgid "Recalculate Incoming/Outgoing Rate"
 msgstr ""
 
-#: projects/doctype/project/project.js:104
+#: projects/doctype/project/project.js:128
 msgid "Recalculating Purchase Cost against this Project..."
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:29
+#: assets/doctype/asset/asset_list.js:21
 msgid "Receipt"
 msgstr "Beleg"
 
@@ -56950,7 +57883,7 @@
 msgid "Receipt Document Type"
 msgstr "Receipt Dokumenttyp"
 
-#: accounts/report/account_balance/account_balance.js:53
+#: accounts/report/account_balance/account_balance.js:55
 msgid "Receivable"
 msgstr "Forderung"
 
@@ -56979,7 +57912,7 @@
 msgid "Receivable / Payable Account"
 msgstr "Forderungen-/Verbindlichkeiten-Konto"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:67
+#: 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
@@ -57013,10 +57946,10 @@
 msgid "Receive"
 msgstr "Empfangen"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:297
+#: buying/doctype/request_for_quotation/request_for_quotation.py:321
 #: buying/doctype/supplier_quotation/supplier_quotation.py:175
-#: stock/doctype/material_request/material_request_list.js:23
-#: stock/doctype/material_request/material_request_list.js:31
+#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:35
 msgid "Received"
 msgstr "Empfangen"
 
@@ -57057,7 +57990,7 @@
 msgid "Received Amount After Tax (Company Currency)"
 msgstr "Erhaltener Betrag nach Steuern (Währung des Unternehmens)"
 
-#: accounts/doctype/payment_entry/payment_entry.py:891
+#: accounts/doctype/payment_entry/payment_entry.py:900
 msgid "Received Amount cannot be greater than Paid Amount"
 msgstr "Der erhaltene Betrag darf nicht größer sein als der gezahlte Betrag"
 
@@ -57128,9 +58061,10 @@
 #: stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 msgctxt "Purchase Receipt Item"
 msgid "Received Qty in Stock UOM"
-msgstr ""
+msgstr "Erhaltene Menge in Lager-ME"
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:50
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:9
 msgid "Received Quantity"
 msgstr "Empfangene Menge"
 
@@ -57146,7 +58080,7 @@
 msgid "Received Quantity"
 msgstr "Empfangene Menge"
 
-#: stock/doctype/stock_entry/stock_entry.js:250
+#: stock/doctype/stock_entry/stock_entry.js:278
 msgid "Received Stock Entries"
 msgstr "Erhaltene Lagerbuchungen"
 
@@ -57179,6 +58113,10 @@
 msgid "Receiving"
 msgstr "Empfang"
 
+#: selling/page/point_of_sale/pos_past_order_list.js:17
+msgid "Recent Orders"
+msgstr ""
+
 #. Label of a Dynamic Link field in DocType 'Email Campaign'
 #: crm/doctype/email_campaign/email_campaign.json
 msgctxt "Email Campaign"
@@ -57209,8 +58147,8 @@
 msgid "Recipients"
 msgstr "Empfänger"
 
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:89
 #: accounts/doctype/payment_reconciliation/payment_reconciliation.js:90
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:93
 msgid "Reconcile"
 msgstr "Abgleichen"
 
@@ -57220,11 +58158,11 @@
 msgid "Reconcile"
 msgstr "Abgleichen"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:325
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:341
 msgid "Reconcile Entries"
 msgstr "Einträge abgleichen"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:217
+#: public/js/bank_reconciliation_tool/dialog_manager.js:221
 msgid "Reconcile the Bank Transaction"
 msgstr ""
 
@@ -57301,6 +58239,12 @@
 msgid "Recurse Every (As Per Transaction UOM)"
 msgstr ""
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Recurse Every (As Per Transaction UOM)"
+msgstr ""
+
 #: accounts/doctype/pricing_rule/pricing_rule.py:232
 msgid "Recurse Over Qty cannot be less than 0"
 msgstr ""
@@ -57329,7 +58273,7 @@
 msgid "Redeem Against"
 msgstr "Gegen einlösen"
 
-#: selling/page/point_of_sale/pos_payment.js:497
+#: selling/page/point_of_sale/pos_payment.js:525
 msgid "Redeem Loyalty Points"
 msgstr "Treuepunkte einlösen"
 
@@ -57410,7 +58354,12 @@
 #: accounts/doctype/promotional_scheme/promotional_scheme_dashboard.py:7
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:22
 #: accounts/doctype/sales_invoice/sales_invoice_dashboard.py:34
+#: accounts/report/accounts_receivable/accounts_receivable.html:136
+#: 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/general_ledger/general_ledger.html:28
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:22
 #: buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:15
 #: manufacturing/doctype/job_card/job_card_dashboard.py:10
@@ -57564,11 +58513,12 @@
 msgid "Reference"
 msgstr "Referenz"
 
-#: accounts/doctype/journal_entry/journal_entry.py:899
+#: accounts/doctype/journal_entry/journal_entry.py:926
 msgid "Reference #{0} dated {1}"
 msgstr "Referenz #{0} vom {1}"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:112
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:27
+#: public/js/bank_reconciliation_tool/dialog_manager.js:119
 msgid "Reference Date"
 msgstr "Referenzdatum"
 
@@ -57578,7 +58528,7 @@
 msgid "Reference Date"
 msgstr "Referenzdatum"
 
-#: public/js/controllers/transaction.js:2073
+#: public/js/controllers/transaction.js:2116
 msgid "Reference Date for Early Payment Discount"
 msgstr ""
 
@@ -57600,7 +58550,7 @@
 msgid "Reference Doctype"
 msgstr "Referenz-DocType"
 
-#: accounts/doctype/payment_entry/payment_entry.py:555
+#: accounts/doctype/payment_entry/payment_entry.py:564
 msgid "Reference Doctype must be one of {0}"
 msgstr "Referenz-Typ muss eine von {0} sein"
 
@@ -57769,24 +58719,30 @@
 msgid "Reference Name"
 msgstr "Referenzname"
 
-#: accounts/doctype/journal_entry/journal_entry.py:532
+#. Label of a Data field in DocType 'Sales Invoice Payment'
+#: accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
+msgctxt "Sales Invoice Payment"
+msgid "Reference No"
+msgstr ""
+
+#: accounts/doctype/journal_entry/journal_entry.py:548
 msgid "Reference No & Reference Date is required for {0}"
 msgstr "Referenznr. & Referenz-Tag sind erforderlich für {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1087
+#: accounts/doctype/payment_entry/payment_entry.py:1096
 msgid "Reference No and Reference Date is mandatory for Bank transaction"
 msgstr "Referenznummer und Referenzdatum sind Pflichtfelder"
 
-#: accounts/doctype/journal_entry/journal_entry.py:537
+#: accounts/doctype/journal_entry/journal_entry.py:553
 msgid "Reference No is mandatory if you entered Reference Date"
 msgstr "Referenznummer ist ein Pflichtfeld, wenn ein Referenzdatum eingegeben wurde"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
 msgid "Reference No."
 msgstr "Referenznummer."
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:88
-#: public/js/bank_reconciliation_tool/dialog_manager.js:123
+#: public/js/bank_reconciliation_tool/data_table_manager.js:83
+#: public/js/bank_reconciliation_tool/dialog_manager.js:130
 msgid "Reference Number"
 msgstr "Referenznummer"
 
@@ -57962,7 +58918,15 @@
 msgid "References"
 msgstr "Referenzen"
 
-#: accounts/doctype/payment_entry/payment_entry.py:631
+#: stock/doctype/delivery_note/delivery_note.py:395
+msgid "References to Sales Invoices are Incomplete"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:371
+msgid "References to Sales Orders are Incomplete"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.py:640
 msgid "References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount."
 msgstr "Referenzen {0} des Typs {1} hatten keinen ausstehenden Betrag mehr, bevor sie die Zahlung gebucht haben. Jetzt haben sie einen negativen ausstehenden Betrag."
 
@@ -57978,7 +58942,8 @@
 msgid "Referral Sales Partner"
 msgstr "Empfehlungs-Vertriebspartner"
 
-#: selling/page/sales_funnel/sales_funnel.js:44
+#: public/js/plant_floor_visual/visual_plant.js:151
+#: selling/page/sales_funnel/sales_funnel.js:51
 msgid "Refresh"
 msgstr "Aktualisieren"
 
@@ -57988,7 +58953,7 @@
 msgid "Refresh Google Sheet"
 msgstr "Google Sheet aktualisieren"
 
-#: accounts/doctype/bank/bank.js:22
+#: accounts/doctype/bank/bank.js:21
 msgid "Refresh Plaid Link"
 msgstr ""
 
@@ -57998,7 +58963,7 @@
 msgid "Refresh Token"
 msgstr "Aktualisieren Token"
 
-#: stock/reorder_item.py:303
+#: stock/reorder_item.py:388
 msgid "Regards,"
 msgstr "Grüße,"
 
@@ -58140,8 +59105,8 @@
 msgid "Relation"
 msgstr "Beziehung"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:234
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:278
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:271
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:315
 msgid "Release Date"
 msgstr "Veröffentlichungsdatum"
 
@@ -58157,7 +59122,7 @@
 msgid "Release Date"
 msgstr "Veröffentlichungsdatum"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:314
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
 msgid "Release date must be in the future"
 msgstr "Das Erscheinungsdatum muss in der Zukunft liegen"
 
@@ -58167,17 +59132,18 @@
 msgid "Relieving Date"
 msgstr "Freistellungsdatum"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:118
+#: public/js/bank_reconciliation_tool/dialog_manager.js:125
 msgid "Remaining"
 msgstr "Verbleibend"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:186
-#: accounts/report/accounts_receivable/accounts_receivable.py:1085
+#: 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
 msgid "Remaining Balance"
 msgstr "Verbleibendes Saldo"
 
-#: selling/page/point_of_sale/pos_payment.js:350
+#: selling/page/point_of_sale/pos_payment.js:367
 msgid "Remark"
 msgstr "Bemerkung"
 
@@ -58200,8 +59166,14 @@
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:240
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:311
 #: accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:11
-#: accounts/report/accounts_receivable/accounts_receivable.py:1117
-#: accounts/report/general_ledger/general_ledger.py:661
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.html:29
+#: accounts/report/general_ledger/general_ledger.html:51
+#: accounts/report/general_ledger/general_ledger.py:674
 #: 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
@@ -58324,11 +59296,15 @@
 msgid "Remarks Column Length"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:323
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Remove item if charges is not applicable to that item"
+msgstr ""
+
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
 msgid "Removed items with no change in quantity or value."
 msgstr "Artikel wurden ohne Veränderung der Menge oder des Wertes entfernt."
 
-#: utilities/doctype/rename_tool/rename_tool.js:25
+#: utilities/doctype/rename_tool/rename_tool.js:24
 msgid "Rename"
 msgstr "Umbenennen"
 
@@ -58345,7 +59321,7 @@
 msgid "Rename Log"
 msgstr "Protokoll umbenennen"
 
-#: accounts/doctype/account/account.py:502
+#: accounts/doctype/account/account.py:521
 msgid "Rename Not Allowed"
 msgstr "Umbenennen nicht erlaubt"
 
@@ -58354,7 +59330,7 @@
 msgid "Rename Tool"
 msgstr "Werkzeug zum Umbenennen"
 
-#: accounts/doctype/account/account.py:494
+#: accounts/doctype/account/account.py:513
 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch."
 msgstr "Das Umbenennen ist nur über die Muttergesellschaft {0} zulässig, um Fehlanpassungen zu vermeiden."
 
@@ -58377,11 +59353,11 @@
 msgid "Rented"
 msgstr "Gemietet"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:34
-#: crm/doctype/opportunity/opportunity.js:113
-#: stock/doctype/delivery_note/delivery_note.js:228
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: support/doctype/issue/issue.js:30
+#: buying/doctype/purchase_order/purchase_order_list.js:53
+#: crm/doctype/opportunity/opportunity.js:123
+#: stock/doctype/delivery_note/delivery_note.js:277
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: support/doctype/issue/issue.js:37
 msgid "Reopen"
 msgstr "Wieder öffnen"
 
@@ -58418,7 +59394,7 @@
 msgid "Repair"
 msgstr "Reparieren"
 
-#: assets/doctype/asset/asset.js:107
+#: assets/doctype/asset/asset.js:127
 msgid "Repair Asset"
 msgstr "Vermögensgegenstand reparieren"
 
@@ -58466,9 +59442,15 @@
 msgid "Replace BOM"
 msgstr "Erstelle Stückliste"
 
-#: crm/report/lead_details/lead_details.js:36
-#: support/report/issue_analytics/issue_analytics.js:57
-#: support/report/issue_summary/issue_summary.js:44
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.json
+msgid "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM.\n"
+"It also updates latest price in all the BOMs."
+msgstr ""
+
+#: 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
 msgid "Replied"
 msgstr "Beantwortet"
@@ -58497,7 +59479,7 @@
 msgid "Replied"
 msgstr "Beantwortet"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:86
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:110
 msgid "Report"
 msgstr "Bericht"
 
@@ -58517,7 +59499,7 @@
 msgid "Report Date"
 msgstr "Berichtsdatum"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:213
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:192
 msgid "Report Error"
 msgstr ""
 
@@ -58533,12 +59515,12 @@
 msgid "Report Type"
 msgstr "Berichtstyp"
 
-#: accounts/doctype/account/account.py:395
+#: accounts/doctype/account/account.py:414
 msgid "Report Type is mandatory"
 msgstr "Berichtstyp ist zwingend erforderlich"
 
-#: accounts/report/balance_sheet/balance_sheet.js:17
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:17
+#: accounts/report/balance_sheet/balance_sheet.js:13
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:13
 msgid "Report View"
 msgstr "Berichtsansicht"
 
@@ -58572,8 +59554,9 @@
 msgid "Reports to"
 msgstr "Vorgesetzter"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:70
-#: accounts/doctype/sales_invoice/sales_invoice.js:73
+#: accounts/doctype/journal_entry/journal_entry.js:34
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:87
+#: accounts/doctype/sales_invoice/sales_invoice.js:78
 msgid "Repost Accounting Entries"
 msgstr ""
 
@@ -58618,6 +59601,12 @@
 msgid "Repost Payment Ledger Items"
 msgstr ""
 
+#. Label of a Check field in DocType 'Journal Entry'
+#: accounts/doctype/journal_entry/journal_entry.json
+msgctxt "Journal Entry"
+msgid "Repost Required"
+msgstr ""
+
 #. Label of a Check field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
@@ -58636,11 +59625,11 @@
 msgid "Repost Status"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:137
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:138
 msgid "Repost has started in the background"
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:38
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:40
 msgid "Repost in background"
 msgstr ""
 
@@ -58648,7 +59637,7 @@
 msgid "Repost started in the background"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:105
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:115
 msgid "Reposting Completed {0}%"
 msgstr ""
 
@@ -58664,7 +59653,7 @@
 msgid "Reposting Info"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:113
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:123
 msgid "Reposting Progress"
 msgstr ""
 
@@ -58673,16 +59662,17 @@
 msgid "Reposting entries created: {0}"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:89
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:99
 msgid "Reposting has been started in the background."
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:47
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:49
 msgid "Reposting in the background."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:76
-#: accounts/doctype/sales_invoice/sales_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:39
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/sales_invoice/sales_invoice.js:83
 msgid "Reposting..."
 msgstr ""
 
@@ -58740,11 +59730,20 @@
 msgid "Represents Company"
 msgstr "Repräsentiert das Unternehmen"
 
-#: public/js/utils.js:678
+#. Description of a DocType
+#: accounts/doctype/fiscal_year/fiscal_year.json
+msgid "Represents a Financial Year. All accounting entries and other major transactions are tracked against the Fiscal Year."
+msgstr ""
+
+#: templates/form_grid/material_request_grid.html:25
+msgid "Reqd By Date"
+msgstr ""
+
+#: public/js/utils.js:742
 msgid "Reqd by date"
 msgstr "Erforderlich nach Datum"
 
-#: crm/doctype/opportunity/opportunity.js:87
+#: crm/doctype/opportunity/opportunity.js:89
 msgid "Request For Quotation"
 msgstr "Angebotsanfrage"
 
@@ -58754,7 +59753,7 @@
 msgid "Request Parameters"
 msgstr "Anfrageparameter"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:269
+#: accounts/doctype/pos_invoice/pos_invoice.js:292
 msgid "Request Timeout"
 msgstr "Zeitüberschreitung der Anfrage"
 
@@ -58778,11 +59777,11 @@
 
 #. Name of a DocType
 #: buying/doctype/request_for_quotation/request_for_quotation.json
-#: buying/doctype/request_for_quotation/request_for_quotation.py:346
-#: buying/doctype/supplier_quotation/supplier_quotation.js:57
+#: buying/doctype/request_for_quotation/request_for_quotation.py:370
+#: 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
-#: stock/doctype/material_request/material_request.js:142
+#: stock/doctype/material_request/material_request.js:162
 msgid "Request for Quotation"
 msgstr "Angebotsanfrage"
 
@@ -58820,7 +59819,7 @@
 msgid "Request for Quotation Supplier"
 msgstr "Angebotsanfrage Lieferant"
 
-#: selling/doctype/sales_order/sales_order.js:571
+#: selling/doctype/sales_order/sales_order.js:650
 msgid "Request for Raw Materials"
 msgstr "Anfrage für Rohstoffe"
 
@@ -58876,6 +59875,10 @@
 msgid "Requested Qty"
 msgstr "Angeforderte Menge"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Requested Qty: Quantity requested for purchase, but not ordered."
+msgstr ""
+
 #: buying/report/procurement_tracker/procurement_tracker.py:46
 msgid "Requesting Site"
 msgstr "Anfordernde Site"
@@ -58962,8 +59965,15 @@
 msgid "Required Items"
 msgstr "Erforderliche Elemente"
 
+#: templates/form_grid/material_request_grid.html:7
+msgid "Required On"
+msgstr ""
+
 #: 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_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
@@ -59040,7 +60050,7 @@
 msgid "Research"
 msgstr "Forschung"
 
-#: setup/doctype/company/company.py:383
+#: setup/doctype/company/company.py:382
 msgid "Research & Development"
 msgstr "Forschung & Entwicklung"
 
@@ -59072,11 +60082,11 @@
 msgid "Reselect, if the chosen contact is edited after save"
 msgstr "Wählen Sie erneut, wenn der ausgewählte Kontakt nach dem Speichern bearbeitet wird"
 
-#: accounts/doctype/payment_request/payment_request.js:30
+#: accounts/doctype/payment_request/payment_request.js:39
 msgid "Resend Payment Email"
 msgstr "Zahlungsemail erneut senden"
 
-#: stock/report/reserved_stock/reserved_stock.js:121
+#: stock/report/reserved_stock/reserved_stock.js:118
 msgid "Reservation Based On"
 msgstr "Reservierung basierend auf"
 
@@ -59086,12 +60096,12 @@
 msgid "Reservation Based On"
 msgstr "Reservierung basierend auf"
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: stock/doctype/pick_list/pick_list.js:110
+#: selling/doctype/sales_order/sales_order.js:80
+#: stock/doctype/pick_list/pick_list.js:126
 msgid "Reserve"
 msgstr "Reservieren"
 
-#: selling/doctype/sales_order/sales_order.js:322
+#: selling/doctype/sales_order/sales_order.js:347
 msgid "Reserve Stock"
 msgstr "Reservierter Bestand"
 
@@ -59125,6 +60135,8 @@
 msgid "Reserved"
 msgstr "Reserviert"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:29
+#: stock/dashboard/item_dashboard_list.html:20
 #: stock/report/reserved_stock/reserved_stock.py:124
 #: stock/report/stock_projected_qty/stock_projected_qty.py:164
 msgid "Reserved Qty"
@@ -59164,16 +60176,28 @@
 msgid "Reserved Qty for Production Plan"
 msgstr "Reservierte Menge für Produktionsplan"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Production: Raw materials quantity to make manufacturing items."
+msgstr ""
+
 #. Label of a Float field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "Reserved Qty for Subcontract"
 msgstr "Reservierte Menge für Unterauftrag"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
+msgstr ""
+
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:497
 msgid "Reserved Qty should be greater than Delivered Qty."
 msgstr "Die reservierte Menge sollte größer sein als die gelieferte Menge."
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty: Quantity ordered for sale, but not delivered."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:116
 msgid "Reserved Quantity"
 msgstr "Reservierte Menge"
@@ -59182,16 +60206,18 @@
 msgid "Reserved Quantity for Production"
 msgstr "Reservierte Menge für die Produktion"
 
-#: stock/stock_ledger.py:1982
+#: stock/stock_ledger.py:1989
 msgid "Reserved Serial No."
 msgstr "Reservierte Seriennr."
 
 #. Name of a report
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:374
-#: stock/doctype/pick_list/pick_list.js:120
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:24
+#: selling/doctype/sales_order/sales_order.js:99
+#: selling/doctype/sales_order/sales_order.js:404
+#: 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:459 stock/stock_ledger.py:1962
+#: stock/report/stock_balance/stock_balance.py:467 stock/stock_ledger.py:1969
 msgid "Reserved Stock"
 msgstr "Reservierter Bestand"
 
@@ -59201,7 +60227,7 @@
 msgid "Reserved Stock"
 msgstr "Reservierter Bestand"
 
-#: stock/stock_ledger.py:2012
+#: stock/stock_ledger.py:2019
 msgid "Reserved Stock for Batch"
 msgstr "Reservierter Bestand für Charge"
 
@@ -59233,21 +60259,27 @@
 msgid "Reserved for sub contracting"
 msgstr "Reserviert für Unteraufträge"
 
-#: selling/doctype/sales_order/sales_order.js:335
-#: stock/doctype/pick_list/pick_list.js:237
+#: selling/doctype/sales_order/sales_order.js:360
+#: stock/doctype/pick_list/pick_list.js:271
 msgid "Reserving Stock..."
 msgstr "Bestand reservieren..."
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:139
-#: support/doctype/issue/issue.js:48
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:155
+#: support/doctype/issue/issue.js:55
 msgid "Reset"
 msgstr "Zurücksetzen"
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Reset Company Default Values"
+msgstr ""
+
 #: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:19
 msgid "Reset Plaid Link"
 msgstr "Plaid-Link zurücksetzen"
 
-#: support/doctype/issue/issue.js:39
+#: support/doctype/issue/issue.js:46
 msgid "Reset Service Level Agreement"
 msgstr "Service Level Agreement zurücksetzen"
 
@@ -59257,7 +60289,7 @@
 msgid "Reset Service Level Agreement"
 msgstr "Service Level Agreement zurücksetzen"
 
-#: support/doctype/issue/issue.js:56
+#: support/doctype/issue/issue.js:63
 msgid "Resetting Service Level Agreement."
 msgstr "Service Level Agreement zurücksetzen."
 
@@ -59346,8 +60378,8 @@
 msgstr "Klären"
 
 #: accounts/doctype/dunning/dunning_list.js:4
-#: support/report/issue_analytics/issue_analytics.js:58
-#: support/report/issue_summary/issue_summary.js:46
+#: support/report/issue_analytics/issue_analytics.js:57
+#: support/report/issue_summary/issue_summary.js:45
 #: support/report/issue_summary/issue_summary.py:366
 msgid "Resolved"
 msgstr "Geklärt"
@@ -59427,7 +60459,7 @@
 msgid "Rest Of The World"
 msgstr "Rest der Welt"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:72
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:82
 msgid "Restart"
 msgstr "Neustart"
 
@@ -59435,7 +60467,7 @@
 msgid "Restart Subscription"
 msgstr "Abonnement neu starten"
 
-#: assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:108
 msgid "Restore Asset"
 msgstr "Vermögensgegenstand wiederherstellen"
 
@@ -59482,12 +60514,12 @@
 msgid "Result Title Field"
 msgstr "Ergebnis Titelfeld"
 
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: selling/doctype/sales_order/sales_order.js:515
+#: buying/doctype/purchase_order/purchase_order.js:321
+#: selling/doctype/sales_order/sales_order.js:549
 msgid "Resume"
 msgstr "Fortsetzen"
 
-#: manufacturing/doctype/job_card/job_card.js:255
+#: manufacturing/doctype/job_card/job_card.js:288
 msgid "Resume Job"
 msgstr ""
 
@@ -59514,11 +60546,11 @@
 msgid "Retained Earnings"
 msgstr "Gewinnrücklagen"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: stock/doctype/purchase_receipt/purchase_receipt.js:274
 msgid "Retention Stock Entry"
 msgstr "Vorratsbestandseintrag"
 
-#: stock/doctype/stock_entry/stock_entry.js:450
+#: stock/doctype/stock_entry/stock_entry.js:510
 msgid "Retention Stock Entry already created or Sample Quantity not provided"
 msgstr "Aufbewahrungsbestandseintrag bereits angelegt oder Musterbestand nicht bereitgestellt"
 
@@ -59528,20 +60560,21 @@
 msgid "Retried"
 msgstr "Erneut versucht"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:134
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 #: accounts/doctype/ledger_merge/ledger_merge.js:72
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:65
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:66
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
 msgid "Retry"
 msgstr "Wiederholen"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:13
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:27
 msgid "Retry Failed Transactions"
-msgstr ""
+msgstr "Fehlgeschlagene Transaktionen wiederholen"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/sales_invoice/sales_invoice.py:263
-#: stock/doctype/delivery_note/delivery_note_list.js:6
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:6
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/sales_invoice/sales_invoice.py:268
+#: stock/doctype/delivery_note/delivery_note_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:15
 msgid "Return"
 msgstr "Retoure"
 
@@ -59569,11 +60602,11 @@
 msgid "Return"
 msgstr "Retoure"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:120
+#: accounts/doctype/sales_invoice/sales_invoice.js:121
 msgid "Return / Credit Note"
 msgstr "Return / Gutschrift"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
 msgid "Return / Debit Note"
 msgstr "Rückgabe / Lastschrift"
 
@@ -59581,19 +60614,19 @@
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
 msgid "Return Against"
-msgstr ""
+msgstr "Korrektur von"
 
 #. Label of a Link field in DocType 'POS Invoice Reference'
 #: accounts/doctype/pos_invoice_reference/pos_invoice_reference.json
 msgctxt "POS Invoice Reference"
 msgid "Return Against"
-msgstr ""
+msgstr "Korrektur von"
 
 #. Label of a Link field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "Return Against"
-msgstr ""
+msgstr "Korrektur von"
 
 #. Label of a Link field in DocType 'Delivery Note'
 #: stock/doctype/delivery_note/delivery_note.json
@@ -59619,12 +60652,12 @@
 msgid "Return Against Subcontracting Receipt"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:194
+#: manufacturing/doctype/work_order/work_order.js:205
 msgid "Return Components"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note_list.js:10
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:10
+#: stock/doctype/delivery_note/delivery_note_list.js:20
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:19
 msgid "Return Issued"
 msgstr ""
 
@@ -59646,16 +60679,16 @@
 msgid "Return Issued"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:334
 msgid "Return Qty"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:265
+#: stock/doctype/purchase_receipt/purchase_receipt.js:310
 msgid "Return Qty from Rejected Warehouse"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:77
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:142
+#: buying/doctype/purchase_order/purchase_order.js:80
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:150
 msgid "Return of Components"
 msgstr ""
 
@@ -59727,15 +60760,15 @@
 #: stock/doctype/delivery_note_item/delivery_note_item.json
 msgctxt "Delivery Note Item"
 msgid "Returned Qty in Stock UOM"
-msgstr ""
+msgstr "Zurückgegebene Menge in Lager-ME"
 
 #. Label of a Float field in DocType 'Purchase Receipt Item'
 #: stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 msgctxt "Purchase Receipt Item"
 msgid "Returned Qty in Stock UOM"
-msgstr ""
+msgstr "Zurückgegebene Menge in Lager-ME"
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:103
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:104
 msgid "Returned exchange rate is neither integer not float."
 msgstr ""
 
@@ -59753,14 +60786,14 @@
 msgid "Returns"
 msgstr "Retouren"
 
-#: accounts/report/accounts_payable/accounts_payable.js:154
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:116
-#: accounts/report/accounts_receivable/accounts_receivable.js:186
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:144
+#: accounts/report/accounts_payable/accounts_payable.js:157
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:119
+#: accounts/report/accounts_receivable/accounts_receivable.js:189
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:147
 msgid "Revaluation Journals"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
 msgid "Revenue"
 msgstr "Umsatz"
 
@@ -59770,7 +60803,7 @@
 msgid "Reversal Of"
 msgstr "Umkehrung von"
 
-#: accounts/doctype/journal_entry/journal_entry.js:33
+#: accounts/doctype/journal_entry/journal_entry.js:73
 msgid "Reverse Journal Entry"
 msgstr "Buchungssatz umkehren"
 
@@ -59927,12 +60960,12 @@
 msgid "Root"
 msgstr "Wurzel"
 
-#: accounts/doctype/account/account_tree.js:41
+#: accounts/doctype/account/account_tree.js:47
 msgid "Root Company"
 msgstr "Stammfirma"
 
-#: accounts/doctype/account/account_tree.js:112
-#: accounts/report/account_balance/account_balance.js:23
+#: accounts/doctype/account/account_tree.js:145
+#: accounts/report/account_balance/account_balance.js:22
 msgid "Root Type"
 msgstr "Wurzel-Typ"
 
@@ -59952,11 +60985,11 @@
 msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity"
 msgstr ""
 
-#: accounts/doctype/account/account.py:392
+#: accounts/doctype/account/account.py:411
 msgid "Root Type is mandatory"
 msgstr "Root-Typ ist zwingend erforderlich"
 
-#: accounts/doctype/account/account.py:195
+#: accounts/doctype/account/account.py:214
 msgid "Root cannot be edited."
 msgstr "Root kann nicht bearbeitet werden."
 
@@ -59972,7 +61005,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:66
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:90
-#: accounts/report/account_balance/account_balance.js:54
+#: accounts/report/account_balance/account_balance.js:56
 msgid "Round Off"
 msgstr "Abschliessen"
 
@@ -60233,12 +61266,12 @@
 msgid "Rounding Loss Allowance"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:41
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:45
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:48
 msgid "Rounding Loss Allowance should be between 0 and 1"
 msgstr ""
 
-#: controllers/stock_controller.py:216 controllers/stock_controller.py:231
+#: controllers/stock_controller.py:398 controllers/stock_controller.py:413
 msgid "Rounding gain/loss Entry for Stock Transfer"
 msgstr ""
 
@@ -60279,11 +61312,11 @@
 msgid "Routing Name"
 msgstr "Routing-Name"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:428
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:482
 msgid "Row #"
 msgstr "Zeile #"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:334
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:388
 msgid "Row # {0}:"
 msgstr "Zeile # {0}:"
 
@@ -60300,12 +61333,12 @@
 msgstr "Zeile {0}: Zurückgegebenes Element {1} ist in {2} {3} nicht vorhanden"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:439
-#: accounts/doctype/sales_invoice/sales_invoice.py:1715
+#: accounts/doctype/sales_invoice/sales_invoice.py:1684
 msgid "Row #{0} (Payment Table): Amount must be negative"
 msgstr "Zeile {0} (Zahlungstabelle): Betrag muss negativ sein"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:437
-#: accounts/doctype/sales_invoice/sales_invoice.py:1710
+#: accounts/doctype/sales_invoice/sales_invoice.py:1679
 msgid "Row #{0} (Payment Table): Amount must be positive"
 msgstr "Zeile {0} (Zahlungstabelle): Betrag muss positiv sein"
 
@@ -60322,7 +61355,7 @@
 msgstr "Zeile #{0}: Die Formel für die Akzeptanzkriterien ist erforderlich."
 
 #: controllers/subcontracting_controller.py:72
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:413
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:414
 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same"
 msgstr ""
 
@@ -60330,11 +61363,11 @@
 msgid "Row #{0}: Accepted Warehouse and Supplier Warehouse cannot be same"
 msgstr "Zeile {0}: Akzeptiertes Lager und Lieferantenlager können nicht identisch sein"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:406
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:407
 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
 msgstr ""
 
-#: controllers/accounts_controller.py:887
+#: controllers/accounts_controller.py:939
 msgid "Row #{0}: Account {1} does not belong to company {2}"
 msgstr "Zeile {0}: Konto {1} gehört nicht zur Unternehmen {2}"
 
@@ -60347,15 +61380,15 @@
 msgid "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:309
+#: assets/doctype/asset_capitalization/asset_capitalization.py:315
 msgid "Row #{0}: Amount must be a positive number"
 msgstr "Zeile #{0}: Betrag muss eine positive Zahl sein"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:375
+#: accounts/doctype/sales_invoice/sales_invoice.py:386
 msgid "Row #{0}: Asset {1} cannot be submitted, it is already {2}"
 msgstr "Zeile #{0}: Asset {1} kann nicht gebucht werden, es ist bereits {2}"
 
-#: buying/doctype/purchase_order/purchase_order.py:351
+#: buying/doctype/purchase_order/purchase_order.py:352
 msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
 msgstr ""
 
@@ -60363,27 +61396,27 @@
 msgid "Row #{0}: Batch No {1} is already selected."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:736
+#: accounts/doctype/payment_entry/payment_entry.py:745
 msgid "Row #{0}: Cannot allocate more than {1} against payment term {2}"
 msgstr "Zeile {0}: Es kann nicht mehr als {1} zu Zahlungsbedingung {2} zugeordnet werden"
 
-#: controllers/accounts_controller.py:3064
+#: controllers/accounts_controller.py:3155
 msgid "Row #{0}: Cannot delete item {1} which has already been billed."
 msgstr "Zeile {0}: Der bereits abgerechnete Artikel {1} kann nicht gelöscht werden."
 
-#: controllers/accounts_controller.py:3038
+#: controllers/accounts_controller.py:3129
 msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
 msgstr "Zeile {0}: Element {1}, das bereits geliefert wurde, kann nicht gelöscht werden"
 
-#: controllers/accounts_controller.py:3057
+#: controllers/accounts_controller.py:3148
 msgid "Row #{0}: Cannot delete item {1} which has already been received"
 msgstr "Zeile {0}: Element {1}, das bereits empfangen wurde, kann nicht gelöscht werden"
 
-#: controllers/accounts_controller.py:3044
+#: controllers/accounts_controller.py:3135
 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
 msgstr "Zeile {0}: Element {1}, dem ein Arbeitsauftrag zugewiesen wurde, kann nicht gelöscht werden."
 
-#: controllers/accounts_controller.py:3050
+#: controllers/accounts_controller.py:3141
 msgid "Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order."
 msgstr "Zeile {0}: Artikel {1}, der der Bestellung des Kunden zugeordnet ist, kann nicht gelöscht werden."
 
@@ -60391,11 +61424,11 @@
 msgid "Row #{0}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor"
 msgstr "Zeile {0}: Supplier Warehouse kann nicht ausgewählt werden, während Rohstoffe an Subunternehmer geliefert werden"
 
-#: controllers/accounts_controller.py:3309
+#: controllers/accounts_controller.py:3400
 msgid "Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}."
 msgstr "Zeile {0}: Die Rate kann nicht festgelegt werden, wenn der Betrag für Artikel {1} höher als der Rechnungsbetrag ist."
 
-#: manufacturing/doctype/job_card/job_card.py:864
+#: manufacturing/doctype/job_card/job_card.py:871
 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
 msgstr ""
 
@@ -60403,31 +61436,31 @@
 msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
 msgstr "Zeile {0}: Untergeordnetes Element sollte kein Produktpaket sein. Bitte entfernen Sie Artikel {1} und speichern Sie"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:97
+#: accounts/doctype/bank_clearance/bank_clearance.py:99
 msgid "Row #{0}: Clearance date {1} cannot be before Cheque Date {2}"
 msgstr "Zeile {0}: Räumungsdatum {1} kann nicht vor dem Scheck Datum sein {2}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:286
+#: assets/doctype/asset_capitalization/asset_capitalization.py:292
 msgid "Row #{0}: Consumed Asset {1} cannot be Draft"
 msgstr "Zeile #{0}: verbrauchter Vermögensgegenstand {1} darf nicht im Entwurfsstatus sein"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:288
+#: assets/doctype/asset_capitalization/asset_capitalization.py:294
 msgid "Row #{0}: Consumed Asset {1} cannot be cancelled"
 msgstr "Zeile #{0}: verbrauchter Vermögensgegenstand {1} darf nicht storniert sein"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:273
+#: assets/doctype/asset_capitalization/asset_capitalization.py:279
 msgid "Row #{0}: Consumed Asset {1} cannot be the same as the Target Asset"
 msgstr "Zeile #{0}: verbrauchter Vermögensgegenstand {1} darf nicht identisch mit der Ziel-Vermögensgegenstand sein"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:282
+#: assets/doctype/asset_capitalization/asset_capitalization.py:288
 msgid "Row #{0}: Consumed Asset {1} cannot be {2}"
 msgstr "Zeile #{0}: verbrauchter Vermögensgegenstand {1} darf nicht {2} sein"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:292
+#: assets/doctype/asset_capitalization/asset_capitalization.py:298
 msgid "Row #{0}: Consumed Asset {1} does not belong to company {2}"
 msgstr "Zeile #{0}: verbrauchter Vermögensgegenstand {1} gehört nicht zu Unternehmen {2}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:385
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:105
 msgid "Row #{0}: Cost Center {1} does not belong to company {2}"
 msgstr "Zeile {0}: Kostenstelle {1} gehört nicht zu Firma {2}"
 
@@ -60439,7 +61472,7 @@
 msgid "Row #{0}: Dates overlapping with other row"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:375
+#: buying/doctype/purchase_order/purchase_order.py:376
 msgid "Row #{0}: Default BOM not found for FG Item {1}"
 msgstr ""
 
@@ -60447,35 +61480,35 @@
 msgid "Row #{0}: Duplicate entry in References {1} {2}"
 msgstr "Referenz {1} {2} in Zeile {0} kommt doppelt vor"
 
-#: selling/doctype/sales_order/sales_order.py:237
+#: selling/doctype/sales_order/sales_order.py:239
 msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
 msgstr "Zeile {0}: Voraussichtlicher Liefertermin kann nicht vor Bestelldatum sein"
 
-#: controllers/stock_controller.py:336
+#: controllers/stock_controller.py:518
 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
 msgstr "Zeile #{0}: Aufwandskonto für den Artikel nicht festgelegt {1}. {2}"
 
-#: buying/doctype/purchase_order/purchase_order.py:378
+#: buying/doctype/purchase_order/purchase_order.py:379
 msgid "Row #{0}: Finished Good Item Qty can not be zero"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:362
+#: buying/doctype/purchase_order/purchase_order.py:363
 msgid "Row #{0}: Finished Good Item is not specified for service item {1}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:369
+#: buying/doctype/purchase_order/purchase_order.py:370
 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:394
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:395
 msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:571
+#: accounts/doctype/journal_entry/journal_entry.py:594
 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:577
+#: accounts/doctype/journal_entry/journal_entry.py:604
 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
 msgstr "Zeile #{0}: Für {1} können Sie den Referenzbeleg nur auswählen, wenn das Konto belastet wird"
 
@@ -60483,7 +61516,7 @@
 msgid "Row #{0}: From Date cannot be before To Date"
 msgstr "Zeile #{0}: Von-Datum kann nicht vor Bis-Datum liegen"
 
-#: public/js/utils/barcode_scanner.js:489
+#: public/js/utils/barcode_scanner.js:394
 msgid "Row #{0}: Item added"
 msgstr "Zeile {0}: Element hinzugefügt"
 
@@ -60491,23 +61524,23 @@
 msgid "Row #{0}: Item {1} does not exist"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:949
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:951
 msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
 msgstr "Zeile #{0}: Artikel {1} wurde kommissioniert, bitte reservieren Sie den Bestand aus der Pickliste."
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:491
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:545
 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it."
 msgstr "Zeile {0}: Element {1} ist kein serialisiertes / gestapeltes Element. Es kann keine Seriennummer / Chargennummer dagegen haben."
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:303
+#: assets/doctype/asset_capitalization/asset_capitalization.py:309
 msgid "Row #{0}: Item {1} is not a service item"
 msgstr "Zeile #{0}: Artikel {1} ist kein Dienstleistungsartikel"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:261
+#: assets/doctype/asset_capitalization/asset_capitalization.py:267
 msgid "Row #{0}: Item {1} is not a stock item"
 msgstr "Zeile #{0}: Artikel {1} ist kein Lagerartikel"
 
-#: accounts/doctype/payment_entry/payment_entry.py:657
+#: accounts/doctype/payment_entry/payment_entry.py:666
 msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
 msgstr "Zeile {0}: Buchungssatz {1} betrifft nicht Konto {2} oder bereits mit einem anderen Beleg verrechnet"
 
@@ -60515,48 +61548,48 @@
 msgid "Row #{0}: Maximum Net Rate cannot be greater than Minimum Net Rate"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:535
+#: selling/doctype/sales_order/sales_order.py:541
 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
 msgstr "Zeile {0}: Es ist nicht erlaubt den Lieferanten zu wechseln, da bereits eine Bestellung vorhanden ist"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1032
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1034
 msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:687
+#: stock/doctype/stock_entry/stock_entry.py:642
 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 "Zeile {0}: Vorgang {1} ist für {2} Fertigwarenmenge im Fertigungsauftrag {3} nicht abgeschlossen. Bitte aktualisieren Sie den Betriebsstatus über die Jobkarte {4}."
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:93
+#: accounts/doctype/bank_clearance/bank_clearance.py:95
 msgid "Row #{0}: Payment document is required to complete the transaction"
 msgstr "Zeile {0}: Der Zahlungsbeleg ist erforderlich, um die Transaktion abzuschließen"
 
-#: manufacturing/doctype/production_plan/production_plan.py:892
+#: manufacturing/doctype/production_plan/production_plan.py:901
 msgid "Row #{0}: Please select Item Code in Assembly Items"
 msgstr "Zeile #{0}: Bitte wählen Sie den Artikelcode in den Baugruppenartikeln aus"
 
-#: manufacturing/doctype/production_plan/production_plan.py:895
+#: manufacturing/doctype/production_plan/production_plan.py:904
 msgid "Row #{0}: Please select the BOM No in Assembly Items"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:889
-msgid "Row #{0}: Please select the FG Warehouse in Assembly Items"
+#: manufacturing/doctype/production_plan/production_plan.py:898
+msgid "Row #{0}: Please select the Sub Assembly Warehouse"
 msgstr ""
 
 #: stock/doctype/item/item.py:487
 msgid "Row #{0}: Please set reorder quantity"
 msgstr "Zeile {0}: Bitte Nachbestellmenge angeben"
 
-#: controllers/accounts_controller.py:367
+#: controllers/accounts_controller.py:411
 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:487
+#: public/js/utils/barcode_scanner.js:392
 msgid "Row #{0}: Qty increased by {1}"
 msgstr "Zeile #{0}: Menge erhöht um {1}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:264
-#: assets/doctype/asset_capitalization/asset_capitalization.py:306
+#: assets/doctype/asset_capitalization/asset_capitalization.py:270
+#: assets/doctype/asset_capitalization/asset_capitalization.py:312
 msgid "Row #{0}: Qty must be a positive number"
 msgstr "Zeile #{0}: Menge muss eine positive Zahl sein"
 
@@ -60564,12 +61597,12 @@
 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 "Zeile #{0}: Die Menge sollte kleiner oder gleich der verfügbaren Menge zum Reservieren sein (Ist-Menge – reservierte Menge) {1} für Artikel {2} der Charge {3} im Lager {4}."
 
-#: controllers/accounts_controller.py:1018
-#: controllers/accounts_controller.py:3166
+#: controllers/accounts_controller.py:1082
+#: controllers/accounts_controller.py:3257
 msgid "Row #{0}: Quantity for Item {1} cannot be zero."
 msgstr "Zeile {0}: Artikelmenge {1} kann nicht Null sein."
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1017
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1019
 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
 msgstr "Zeile #{0}: Die zu reservierende Menge für den Artikel {1} sollte größer als 0 sein."
 
@@ -60581,11 +61614,11 @@
 msgid "Row #{0}: Received Qty must be equal to Accepted + Rejected Qty for Item {1}"
 msgstr "Zeile #{0}: Die erhaltene Menge muss gleich der angenommenen + abgelehnten Menge für Artikel {1} sein"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1016
+#: accounts/doctype/payment_entry/payment_entry.js:1234
 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry"
 msgstr "Zeile {0}: Referenzdokumenttyp muss eine der Bestellung, Eingangsrechnung oder Buchungssatz sein"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1008
+#: accounts/doctype/payment_entry/payment_entry.js:1220
 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning"
 msgstr "Zeile #{0}: Referenzbelegtyp muss einer der folgenden sein: Kundenauftrag, Ausgangsrechnung, Journalbuchung oder Mahnung"
 
@@ -60593,7 +61626,7 @@
 msgid "Row #{0}: Rejected Qty can not be entered in Purchase Return"
 msgstr "Zeile {0}: Abgelehnte Menge kann nicht in Kaufrückgabe eingegeben werden"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:387
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:388
 msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}."
 msgstr "Zeile #{0}: Die abgelehnte Menge kann nicht für den Ausschussartikel {1} festgelegt werden."
 
@@ -60601,22 +61634,22 @@
 msgid "Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}"
 msgstr ""
 
-#: controllers/buying_controller.py:849
+#: controllers/buying_controller.py:875
 msgid "Row #{0}: Reqd by Date cannot be before Transaction Date"
 msgstr "Zeile {0}: Erforderlich nach Datum darf nicht vor dem Transaktionsdatum liegen"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:382
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:383
 msgid "Row #{0}: Scrap Item Qty cannot be zero"
 msgstr "Zeile #{0}: Die Menge des Ausschussartikels darf nicht Null sein"
 
-#: controllers/selling_controller.py:212
+#: controllers/selling_controller.py:213
 msgid "Row #{0}: Selling rate for item {1} is lower than its {2}.\n"
 "\t\t\t\t\tSelling {3} should be atleast {4}.<br><br>Alternatively,\n"
 "\t\t\t\t\tyou can disable selling price validation in {5} to bypass\n"
 "\t\t\t\t\tthis validation."
 msgstr ""
 
-#: controllers/stock_controller.py:97
+#: controllers/stock_controller.py:129
 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
 msgstr "Zeile {0}: Seriennummer {1} gehört nicht zu Charge {2}"
 
@@ -60628,27 +61661,35 @@
 msgid "Row #{0}: Serial No {1} is already selected."
 msgstr "Zeile #{0}: Die Seriennummer {1} ist bereits ausgewählt."
 
-#: controllers/accounts_controller.py:395
+#: controllers/accounts_controller.py:439
 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date"
 msgstr "Zeile #{0}: Das Service-Enddatum darf nicht vor dem Rechnungsbuchungsdatum liegen"
 
-#: controllers/accounts_controller.py:391
+#: controllers/accounts_controller.py:435
 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date"
 msgstr "Zeile {0}: Das Servicestartdatum darf nicht höher als das Serviceenddatum sein"
 
-#: controllers/accounts_controller.py:387
+#: controllers/accounts_controller.py:431
 msgid "Row #{0}: Service Start and End Date is required for deferred accounting"
 msgstr "Zeile {0}: Das Start- und Enddatum des Service ist für die aufgeschobene Abrechnung erforderlich"
 
-#: selling/doctype/sales_order/sales_order.py:391
+#: selling/doctype/sales_order/sales_order.py:394
 msgid "Row #{0}: Set Supplier for item {1}"
 msgstr "Zeile {0}: Lieferanten für Artikel {1} einstellen"
 
+#: manufacturing/doctype/workstation/workstation.py:80
+msgid "Row #{0}: Start Time and End Time are required"
+msgstr ""
+
+#: manufacturing/doctype/workstation/workstation.py:83
+msgid "Row #{0}: Start Time must be before End Time"
+msgstr ""
+
 #: stock/doctype/quality_inspection/quality_inspection.py:120
 msgid "Row #{0}: Status is mandatory"
 msgstr "Zeile #{0}: Status ist obligatorisch"
 
-#: accounts/doctype/journal_entry/journal_entry.py:381
+#: accounts/doctype/journal_entry/journal_entry.py:397
 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
 msgstr "Zeile {0}: Status muss {1} für Rechnungsrabatt {2} sein"
 
@@ -60656,19 +61697,19 @@
 msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
 msgstr "Zeile #{0}: Der Bestand kann nicht für Artikel {1} für eine deaktivierte Charge {2} reserviert werden."
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:962
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:964
 msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:975
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:977
 msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
 msgstr "Zeile #{0}: Bestand kann nicht im Gruppenlager {1} reserviert werden."
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:989
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:991
 msgid "Row #{0}: Stock is already reserved for the Item {1}."
 msgstr "Zeile #{0}: Für den Artikel {1} ist bereits ein Lagerbestand reserviert."
 
-#: stock/doctype/delivery_note/delivery_note.py:605
+#: stock/doctype/delivery_note/delivery_note.py:666
 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
 msgstr "Zeile #{0}: Der Bestand ist für den Artikel {1} im Lager {2} reserviert."
 
@@ -60676,19 +61717,19 @@
 msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
 msgstr "Zeile #{0}: Bestand nicht verfügbar für Artikel {1} von Charge {2} im Lager {3}."
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1003
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1005
 msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
 msgstr "Zeile #{0}: Kein Bestand für den Artikel {1} im Lager {2} verfügbar."
 
-#: controllers/stock_controller.py:110
+#: controllers/stock_controller.py:142
 msgid "Row #{0}: The batch {1} has already expired."
 msgstr "Zeile {0}: Der Stapel {1} ist bereits abgelaufen."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1687
-msgid "Row #{0}: The following Serial Nos are not present in Delivery Note {1}:"
-msgstr "Zeile #{0}: Die folgenden Seriennummern sind nicht im Lieferschein {1} enthalten:"
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:150
+msgid "Row #{0}: The following serial numbers are not present in Delivery Note {1}:"
+msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.py:116
+#: manufacturing/doctype/workstation/workstation.py:137
 msgid "Row #{0}: Timings conflicts with row {1}"
 msgstr "Zeile {0}: Timing-Konflikte mit Zeile {1}"
 
@@ -60696,15 +61737,11 @@
 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:1402
+#: accounts/doctype/sales_invoice/sales_invoice.py:1413
 msgid "Row #{0}: You must select an Asset for Item {1}."
 msgstr "Zeile #{0}: Sie müssen einen Vermögensgegenstand für Artikel {1} auswählen."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1696
-msgid "Row #{0}: {1} Serial numbers required for Item {2}. You have provided {3}."
-msgstr "Zeile #{0}: {1} Seriennummern erforderlich für Artikel {2}. Sie haben {3} angegeben."
-
-#: controllers/buying_controller.py:483 public/js/controllers/buying.js:208
+#: controllers/buying_controller.py:483 public/js/controllers/buying.js:203
 msgid "Row #{0}: {1} can not be negative for item {2}"
 msgstr "Zeile {0}: {1} kann für Artikel nicht negativ sein {2}"
 
@@ -60720,6 +61757,10 @@
 msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account."
 msgstr "Zeile #{0}: {1} von {2} sollte {3} sein. Bitte aktualisieren Sie die {1} oder wählen Sie ein anderes Konto."
 
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:161
+msgid "Row #{0}: {1} serial numbers are required for Item {2}. You have provided {3} serial numbers."
+msgstr ""
+
 #: buying/utils.py:106
 msgid "Row #{1}: Warehouse is mandatory for stock Item {0}"
 msgstr "Zeile #{1}: Lager ist obligatorisch für Artikel {0}"
@@ -60728,11 +61769,11 @@
 msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
 msgstr "Zeile # {}: Die Währung von {} - {} stimmt nicht mit der Firmenwährung überein."
 
-#: assets/doctype/asset/asset.py:275
+#: assets/doctype/asset/asset.py:277
 msgid "Row #{}: Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr "Zeile # {}: Das Buchungsdatum der Abschreibung sollte nicht dem Datum der Verfügbarkeit entsprechen."
 
-#: assets/doctype/asset/asset.py:308
+#: assets/doctype/asset/asset.py:310
 msgid "Row #{}: Finance Book should not be empty since you're using multiple."
 msgstr "Zeile #{}: Das Finanzbuch sollte nicht leer sein, da Sie mehrere verwenden."
 
@@ -60760,7 +61801,7 @@
 msgid "Row #{}: Please assign task to a member."
 msgstr "Zeile #{}: Bitte weisen Sie die Aufgabe einem Mitglied zu."
 
-#: assets/doctype/asset/asset.py:300
+#: assets/doctype/asset/asset.py:302
 msgid "Row #{}: Please use a different Finance Book."
 msgstr "Zeile #{}: Bitte verwenden Sie ein anderes Finanzbuch."
 
@@ -60776,7 +61817,7 @@
 msgid "Row #{}: You cannot add positive quantities in a return invoice. Please remove item {} to complete the return."
 msgstr "Zeile #{}: Sie können keine positiven Mengen in einer Retourenrechnung hinzufügen. Bitte entfernen Sie Artikel {}, um die Rückgabe abzuschließen."
 
-#: stock/doctype/pick_list/pick_list.py:83
+#: stock/doctype/pick_list/pick_list.py:87
 msgid "Row #{}: item {} has been picked already."
 msgstr "Zeile #{}: Artikel {} wurde bereits kommissioniert."
 
@@ -60788,39 +61829,47 @@
 msgid "Row #{}: {} {} does not exist."
 msgstr "Zeile # {}: {} {} existiert nicht."
 
-#: stock/doctype/item/item.py:1364
+#: stock/doctype/item/item.py:1365
 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:433
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:437
 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
 msgstr "Zeile Nr. {0}: Lager ist erforderlich. Bitte legen Sie ein Standardlager für Artikel {1} und Unternehmen {2} fest"
 
-#: manufacturing/doctype/job_card/job_card.py:599
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Row Number"
+msgstr "Zeilennummer"
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:376
+msgid "Row {0}"
+msgstr "Zeile {0}"
+
+#: manufacturing/doctype/job_card/job_card.py:606
 msgid "Row {0} : Operation is required against the raw material item {1}"
 msgstr "Zeile {0}: Vorgang ist für die Rohmaterialposition {1} erforderlich"
 
-#: stock/doctype/pick_list/pick_list.py:113
+#: stock/doctype/pick_list/pick_list.py:117
 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required."
 msgstr "Zeile {0} kommissionierte Menge ist kleiner als die erforderliche Menge, zusätzliche {1} {2} erforderlich."
 
-#: stock/doctype/stock_entry/stock_entry.py:1135
+#: stock/doctype/stock_entry/stock_entry.py:1144
 msgid "Row {0}# Item {1} cannot be transferred more than {2} against {3} {4}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1159
+#: stock/doctype/stock_entry/stock_entry.py:1168
 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
 msgstr "Zeile {0}# Artikel {1} wurde in der Tabelle „Gelieferte Rohstoffe“ in {2} {3} nicht gefunden"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:190
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:191
 msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
 msgstr "Zeile {0}: Die akzeptierte Menge und die abgelehnte Menge können nicht gleichzeitig Null sein."
 
-#: accounts/doctype/journal_entry/journal_entry.py:509
+#: accounts/doctype/journal_entry/journal_entry.py:525
 msgid "Row {0}: Account {1} and Party Type {2} have different account types"
 msgstr ""
 
-#: controllers/accounts_controller.py:2536
+#: controllers/accounts_controller.py:2621
 msgid "Row {0}: Account {1} is a Group Account"
 msgstr "Zeile {0}: Konto {1} ist eine Kontogruppe"
 
@@ -60828,43 +61877,47 @@
 msgid "Row {0}: Activity Type is mandatory."
 msgstr "Zeile {0}: Leistungsart ist obligatorisch."
 
-#: accounts/doctype/journal_entry/journal_entry.py:561
+#: accounts/doctype/journal_entry/journal_entry.py:577
 msgid "Row {0}: Advance against Customer must be credit"
 msgstr "Zeile {0}: Voraus gegen Kunde muss Kredit"
 
-#: accounts/doctype/journal_entry/journal_entry.py:563
+#: accounts/doctype/journal_entry/journal_entry.py:579
 msgid "Row {0}: Advance against Supplier must be debit"
 msgstr "Zeile {0}: Voraus gegen Lieferant muss belasten werden"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:671
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:681
 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:663
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:673
 msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:763
+#: stock/doctype/stock_entry/stock_entry.py:884
+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
 msgid "Row {0}: Bill of Materials not found for the Item {1}"
 msgstr "Zeile {0}: Bill of Materials nicht für den Artikel gefunden {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:796
+#: accounts/doctype/journal_entry/journal_entry.py:823
 msgid "Row {0}: Both Debit and Credit values cannot be zero"
 msgstr "Zeile {0}: Sowohl Soll als auch Haben können nicht gleich Null sein"
 
-#: controllers/buying_controller.py:438 controllers/selling_controller.py:204
+#: controllers/buying_controller.py:438 controllers/selling_controller.py:205
 msgid "Row {0}: Conversion Factor is mandatory"
 msgstr "Zeile {0}: Umrechnungsfaktor ist zwingend erfoderlich"
 
-#: controllers/accounts_controller.py:2549
+#: controllers/accounts_controller.py:2634
 msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
 msgstr "Zeile {0}: Die Kostenstelle {1} gehört nicht zum Unternehmen {2}"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:116
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:137
 msgid "Row {0}: Cost center is required for an item {1}"
 msgstr "Zeile {0}: Kostenstelle ist für einen Eintrag {1} erforderlich"
 
-#: accounts/doctype/journal_entry/journal_entry.py:647
+#: accounts/doctype/journal_entry/journal_entry.py:674
 msgid "Row {0}: Credit entry can not be linked with a {1}"
 msgstr "Zeile {0}: Habenbuchung kann nicht mit ein(em) {1} verknüpft werden"
 
@@ -60872,19 +61925,19 @@
 msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
 msgstr "Zeile {0}: Währung der Stückliste # {1} sollte der gewählten Währung entsprechen {2}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:642
+#: accounts/doctype/journal_entry/journal_entry.py:669
 msgid "Row {0}: Debit entry can not be linked with a {1}"
 msgstr "Zeile {0}: Sollbuchung kann nicht mit ein(em) {1} verknüpft werden"
 
-#: controllers/selling_controller.py:679
+#: controllers/selling_controller.py:703
 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
 msgstr "Zeile {0}: Lieferlager ({1}) und Kundenlager ({2}) können nicht identisch sein"
 
-#: assets/doctype/asset/asset.py:417
+#: assets/doctype/asset/asset.py:419
 msgid "Row {0}: Depreciation Start Date is required"
 msgstr "Zeile {0}: Das Abschreibungsstartdatum ist erforderlich"
 
-#: controllers/accounts_controller.py:2209
+#: controllers/accounts_controller.py:2301
 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
 msgstr "Zeile {0}: Fälligkeitsdatum in der Tabelle &quot;Zahlungsbedingungen&quot; darf nicht vor dem Buchungsdatum liegen"
 
@@ -60892,28 +61945,28 @@
 msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
 msgstr ""
 
-#: controllers/buying_controller.py:742
+#: controllers/buying_controller.py:767
 msgid "Row {0}: Enter location for the asset item {1}"
 msgstr "Zeile {0}: Geben Sie einen Ort für den Vermögenswert {1} ein."
 
-#: accounts/doctype/journal_entry/journal_entry.py:886
-#: controllers/taxes_and_totals.py:1115
+#: accounts/doctype/journal_entry/journal_entry.py:913
+#: controllers/taxes_and_totals.py:1116
 msgid "Row {0}: Exchange Rate is mandatory"
 msgstr "Zeile {0}: Wechselkurs ist erforderlich"
 
-#: assets/doctype/asset/asset.py:408
+#: assets/doctype/asset/asset.py:410
 msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
 msgstr "Zeile {0}: Erwarteter Wert nach Nutzungsdauer muss kleiner als Brutto Kaufbetrag sein"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:523
 msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
 msgstr "Zeile {0}: Aufwandskonto geändert zu {1}, da kein Eingangsbeleg für Artikel {2} erstellt wird."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:482
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:486
 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 "Zeile {0}: Aufwandskonto geändert zu {1}, weil das Konto {2} nicht mit dem Lager {3} verknüpft ist oder es nicht das Standard-Inventarkonto ist"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:505
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:509
 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
 msgstr "Zeile {0}: Aufwandskonto geändert zu {1}, da dieses bereits in Eingangsbeleg {2} verwendet wurde"
 
@@ -60930,7 +61983,7 @@
 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
 msgstr "Zeile {0}: Zeitüberlappung in {1} mit {2}"
 
-#: controllers/stock_controller.py:730
+#: controllers/stock_controller.py:913
 msgid "Row {0}: From Warehouse is mandatory for internal transfers"
 msgstr ""
 
@@ -60942,15 +61995,15 @@
 msgid "Row {0}: Hours value must be greater than zero."
 msgstr "Zeile {0}: Stunden-Wert muss größer als Null sein."
 
-#: accounts/doctype/journal_entry/journal_entry.py:665
+#: accounts/doctype/journal_entry/journal_entry.py:692
 msgid "Row {0}: Invalid reference {1}"
 msgstr "Zeile {0}: Ungültige Referenz {1}"
 
-#: controllers/taxes_and_totals.py:128
+#: controllers/taxes_and_totals.py:129
 msgid "Row {0}: Item Tax template updated as per validity and rate applied"
 msgstr ""
 
-#: controllers/buying_controller.py:400 controllers/selling_controller.py:479
+#: controllers/buying_controller.py:400 controllers/selling_controller.py:484
 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer"
 msgstr "Zeile {0}: Der Einzelpreis wurde gemäß dem Bewertungskurs aktualisiert, da es sich um eine interne Umlagerung handelt"
 
@@ -60962,7 +62015,7 @@
 msgid "Row {0}: Item {1} must be a subcontracted item."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:661
+#: stock/doctype/delivery_note/delivery_note.py:722
 msgid "Row {0}: Packed Qty must be equal to {1} Qty."
 msgstr ""
 
@@ -60970,11 +62023,11 @@
 msgid "Row {0}: Packing Slip is already created for Item {1}."
 msgstr "Zeile {0}: Für den Artikel {1} wurde bereits ein Packzettel erstellt."
 
-#: accounts/doctype/journal_entry/journal_entry.py:687
+#: accounts/doctype/journal_entry/journal_entry.py:714
 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
 msgstr "Zeile {0}: Partei / Konto stimmt nicht mit {1} / {2} in {3} {4} überein"
 
-#: accounts/doctype/journal_entry/journal_entry.py:500
+#: accounts/doctype/journal_entry/journal_entry.py:516
 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}"
 msgstr "Zeile {0}: Partei-Typ und Partei sind für Forderungen-/Verbindlichkeiten-Konto {1} zwingend erforderlich"
 
@@ -60982,11 +62035,11 @@
 msgid "Row {0}: Payment Term is mandatory"
 msgstr "Zeile {0}: Zahlungsbedingung ist obligatorisch"
 
-#: accounts/doctype/journal_entry/journal_entry.py:554
+#: accounts/doctype/journal_entry/journal_entry.py:570
 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
 msgstr "Zeile {0}: \"Zahlung zu Auftrag bzw. Bestellung\" sollte immer als \"Vorkasse\" eingestellt werden"
 
-#: accounts/doctype/journal_entry/journal_entry.py:547
+#: accounts/doctype/journal_entry/journal_entry.py:563
 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
 msgstr "Zeile {0}: Wenn es sich um eine Vorkasse-Buchung handelt, bitte \"Ist Vorkasse\" zu Konto {1} anklicken, ."
 
@@ -61012,7 +62065,7 @@
 
 #: regional/italy/utils.py:338
 msgid "Row {0}: Please set the Mode of Payment in Payment Schedule"
-msgstr "Zeile {0}: Bitte legen Sie die Zahlungsart im Zahlungsplan fest"
+msgstr "Zeile {0}: Bitte legen Sie die Zahlungsweise im Zahlungsplan fest"
 
 #: regional/italy/utils.py:345
 msgid "Row {0}: Please set the correct code on Mode of Payment {1}"
@@ -61022,7 +62075,7 @@
 msgid "Row {0}: Project must be same as the one set in the Timesheet: {1}."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:114
 msgid "Row {0}: Purchase Invoice {1} has no stock impact."
 msgstr "Zeile {0}: Eingangsrechnung {1} hat keine Auswirkungen auf den Bestand."
 
@@ -61030,7 +62083,7 @@
 msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}."
 msgstr "Zeile {0}: Die Menge darf für den Artikel {2} nicht größer als {1} sein."
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Row {0}: Qty in Stock UOM can not be zero."
 msgstr "Zeile {0}: Menge in Lager-ME kann nicht Null sein."
 
@@ -61038,7 +62091,7 @@
 msgid "Row {0}: Qty must be greater than 0."
 msgstr "Zeile {0}: Menge muss größer als 0 sein."
 
-#: stock/doctype/stock_entry/stock_entry.py:762
+#: stock/doctype/stock_entry/stock_entry.py:717
 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})"
 msgstr "Zeile {0}: Menge für {4} in Lager {1} zum Buchungszeitpunkt des Eintrags nicht verfügbar ({2} {3})"
 
@@ -61046,15 +62099,15 @@
 msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed"
 msgstr "Zeile {0}: Schicht kann nicht geändert werden, da die Abschreibung bereits verarbeitet wurde"
 
-#: stock/doctype/stock_entry/stock_entry.py:1170
+#: stock/doctype/stock_entry/stock_entry.py:1179
 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
 msgstr "Zeile {0}: Unterauftragsartikel sind für den Rohstoff {1} obligatorisch."
 
-#: controllers/stock_controller.py:721
+#: controllers/stock_controller.py:904
 msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:450
+#: stock/doctype/stock_entry/stock_entry.py:405
 msgid "Row {0}: The item {1}, quantity must be positive number"
 msgstr "Zeile {0}: Die Menge des Artikels {1} muss eine positive Zahl sein"
 
@@ -61062,15 +62115,15 @@
 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:441
+#: assets/doctype/asset/asset.py:443
 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:401
+#: stock/doctype/stock_entry/stock_entry.py:356
 msgid "Row {0}: UOM Conversion Factor is mandatory"
 msgstr "Zeile {0}: Umrechnungsfaktor für Maßeinheit ist zwingend erforderlich"
 
-#: controllers/accounts_controller.py:786
+#: controllers/accounts_controller.py:838
 msgid "Row {0}: user has not applied the rule {1} on the item {2}"
 msgstr "Zeile {0}: Der Nutzer hat die Regel {1} nicht auf das Element {2} angewendet."
 
@@ -61082,15 +62135,19 @@
 msgid "Row {0}: {1} must be greater than 0"
 msgstr "Zeile {0}: {1} muss größer als 0 sein"
 
-#: controllers/accounts_controller.py:511
+#: controllers/accounts_controller.py:555
 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:701
+#: accounts/doctype/journal_entry/journal_entry.py:728
 msgid "Row {0}: {1} {2} does not match with {3}"
 msgstr "Zeile {0}: {1} {2} stimmt nicht mit {3} überein"
 
-#: controllers/accounts_controller.py:2528
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:87
+msgid "Row {0}: {2} Item {1} does not exist in {2} {3}"
+msgstr ""
+
+#: controllers/accounts_controller.py:2613
 msgid "Row {0}: {3} Account {1} does not belong to Company {2}"
 msgstr ""
 
@@ -61098,7 +62155,7 @@
 msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}."
 msgstr "Zeile {1}: Menge ({0}) darf kein Bruch sein. Deaktivieren Sie dazu &#39;{2}&#39; in UOM {3}."
 
-#: controllers/buying_controller.py:726
+#: controllers/buying_controller.py:751
 msgid "Row {}: Asset Naming Series is mandatory for the auto creation for item {}"
 msgstr "Zeile {}: Asset Naming Series ist für die automatische Erstellung von Element {} obligatorisch"
 
@@ -61110,11 +62167,11 @@
 msgid "Row({0}): {1} is already discounted in {2}"
 msgstr "Zeile ({0}): {1} ist bereits in {2} abgezinst."
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:193
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:200
 msgid "Rows Added in {0}"
 msgstr "Zeilen hinzugefügt in {0}"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:194
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:201
 msgid "Rows Removed in {0}"
 msgstr "Zeilen in {0} entfernt"
 
@@ -61125,15 +62182,15 @@
 msgid "Rows with Same Account heads will be merged on Ledger"
 msgstr ""
 
-#: controllers/accounts_controller.py:2218
+#: controllers/accounts_controller.py:2310
 msgid "Rows with duplicate due dates in other rows were found: {0}"
 msgstr "Zeilen mit doppelten Fälligkeitsdaten in anderen Zeilen wurden gefunden: {0}"
 
-#: accounts/doctype/journal_entry/journal_entry.js:61
+#: accounts/doctype/journal_entry/journal_entry.js:115
 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually."
 msgstr ""
 
-#: controllers/accounts_controller.py:211
+#: controllers/accounts_controller.py:221
 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry."
 msgstr ""
 
@@ -61161,6 +62218,12 @@
 msgid "Rule Description"
 msgstr "Regelbeschreibung"
 
+#. Description of the 'Job Capacity' (Int) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Run parallel job cards in a workstation"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Process Payment
 #. Reconciliation'
 #: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
@@ -61175,6 +62238,13 @@
 msgid "Running"
 msgstr "Laufend"
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Running"
+msgstr "Laufend"
+
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:28
 msgid "S.O. No."
 msgstr "Nummer der Lieferantenbestellung"
@@ -61239,7 +62309,7 @@
 msgid "SLA Paused On"
 msgstr "SLA pausiert am"
 
-#: public/js/utils.js:1015
+#: public/js/utils.js:1098
 msgid "SLA is on hold since {0}"
 msgstr "SLA ist seit {0} auf Eis gelegt"
 
@@ -61278,6 +62348,10 @@
 msgid "SO Qty"
 msgstr "Kd.-Auftr.-Menge"
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:107
+msgid "SO Total Qty"
+msgstr ""
+
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:16
 msgid "STATEMENTS OF ACCOUNTS"
 msgstr ""
@@ -61372,7 +62446,7 @@
 #: 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:329 setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:328 setup/doctype/company/company.py:491
 #: setup/doctype/company/company_dashboard.py:9
 #: setup/doctype/sales_person/sales_person_dashboard.py:12
 #: setup/setup_wizard/operations/install_fixtures.py:250
@@ -61410,7 +62484,7 @@
 msgid "Sales"
 msgstr "Vertrieb"
 
-#: setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:491
 msgid "Sales Account"
 msgstr "Verkaufskonto"
 
@@ -61444,7 +62518,7 @@
 #. Label of a Link in the CRM Workspace
 #. Label of a Link in the Selling Workspace
 #: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:7
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: selling/page/sales_funnel/sales_funnel.js:46
 #: selling/workspace/selling/selling.json
 msgid "Sales Funnel"
 msgstr "Verkaufstrichter"
@@ -61455,11 +62529,11 @@
 #: accounts/report/gross_profit/gross_profit.js:30
 #: accounts/report/gross_profit/gross_profit.py:199
 #: accounts/report/gross_profit/gross_profit.py:206
-#: selling/doctype/quotation/quotation_list.js:20
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order_list.js:53
-#: stock/doctype/delivery_note/delivery_note.js:222
-#: stock/doctype/delivery_note/delivery_note_list.js:61
+#: selling/doctype/quotation/quotation_list.js:19
+#: selling/doctype/sales_order/sales_order.js:633
+#: selling/doctype/sales_order/sales_order_list.js:66
+#: stock/doctype/delivery_note/delivery_note.js:266
+#: stock/doctype/delivery_note/delivery_note_list.js:70
 msgid "Sales Invoice"
 msgstr "Ausgangsrechnung"
 
@@ -61609,11 +62683,11 @@
 msgid "Sales Invoice Trends"
 msgstr "Ausgangsrechnung-Trendanalyse"
 
-#: stock/doctype/delivery_note/delivery_note.py:679
+#: stock/doctype/delivery_note/delivery_note.py:740
 msgid "Sales Invoice {0} has already been submitted"
 msgstr "Ausgangsrechnung {0} wurde bereits gebucht"
 
-#: selling/doctype/sales_order/sales_order.py:472
+#: selling/doctype/sales_order/sales_order.py:475
 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order"
 msgstr "Ausgangsrechnung {0} muss vor der Stornierung dieses Kundenauftrags gelöscht werden"
 
@@ -61647,6 +62721,7 @@
 #: setup/doctype/sales_person/sales_person.json
 #: setup/doctype/territory/territory.json stock/doctype/bin/bin.json
 #: stock/doctype/packing_slip/packing_slip.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 msgid "Sales Manager"
 msgstr "Vertriebsleiter"
 
@@ -61676,36 +62751,36 @@
 msgid "Sales Monthly History"
 msgstr "Verkäufe Monatliche Geschichte"
 
-#: selling/page/sales_funnel/sales_funnel.js:129
+#: selling/page/sales_funnel/sales_funnel.js:144
 msgid "Sales Opportunities by Source"
 msgstr "Verkaufschancen nach Quelle"
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: accounts/doctype/sales_invoice/sales_invoice.js:236
+#: 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:421
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:64
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:113
-#: manufacturing/doctype/blanket_order/blanket_order.js:23
+#: controllers/selling_controller.py:422
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:65
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:122
+#: manufacturing/doctype/blanket_order/blanket_order.js:24
 #: manufacturing/doctype/work_order/work_order_calendar.js:32
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:127
 #: manufacturing/report/work_order_summary/work_order_summary.py:217
-#: selling/doctype/quotation/quotation.js:117
+#: selling/doctype/quotation/quotation.js:125
 #: selling/doctype/quotation/quotation_dashboard.py:11
-#: selling/doctype/quotation/quotation_list.js:16
+#: selling/doctype/quotation/quotation_list.js:15
 #: selling/doctype/sales_order/sales_order.json
 #: selling/onboarding_step/sales_order/sales_order.json
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:59
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13
-#: selling/report/sales_order_analysis/sales_order_analysis.js:34
+#: selling/report/sales_order_analysis/sales_order_analysis.js:33
 #: selling/report/sales_order_analysis/sales_order_analysis.py:222
-#: stock/doctype/delivery_note/delivery_note.js:134
-#: stock/doctype/material_request/material_request.js:161
-#: stock/report/delayed_item_report/delayed_item_report.js:31
+#: stock/doctype/delivery_note/delivery_note.js:146
+#: stock/doctype/material_request/material_request.js:190
+#: stock/report/delayed_item_report/delayed_item_report.js:30
 #: stock/report/delayed_item_report/delayed_item_report.py:155
-#: stock/report/delayed_order_report/delayed_order_report.js:31
+#: stock/report/delayed_order_report/delayed_order_report.js:30
 #: stock/report/delayed_order_report/delayed_order_report.py:74
 msgid "Sales Order"
 msgstr "Auftrag"
@@ -61856,8 +62931,8 @@
 msgstr "Auftragsdatum"
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:260
-#: selling/doctype/sales_order/sales_order.js:704
+#: selling/doctype/sales_order/sales_order.js:286
+#: selling/doctype/sales_order/sales_order.js:809
 #: selling/doctype/sales_order_item/sales_order_item.json
 msgid "Sales Order Item"
 msgstr "Auftrags-Artikel"
@@ -61946,11 +63021,11 @@
 msgid "Sales Order required for Item {0}"
 msgstr "Auftrag für den Artikel {0} erforderlich"
 
-#: selling/doctype/sales_order/sales_order.py:258
+#: selling/doctype/sales_order/sales_order.py:261
 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:1142
+#: accounts/doctype/sales_invoice/sales_invoice.py:1149
 msgid "Sales Order {0} is not submitted"
 msgstr "Kundenauftrag {0} ist nicht gebucht"
 
@@ -61958,12 +63033,12 @@
 msgid "Sales Order {0} is not valid"
 msgstr "Auftrag {0} ist nicht gültig"
 
-#: controllers/selling_controller.py:402
+#: controllers/selling_controller.py:403
 #: manufacturing/doctype/work_order/work_order.py:223
 msgid "Sales Order {0} is {1}"
 msgstr "Auftrag {0} ist {1}"
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:42
 msgid "Sales Orders"
 msgstr "Aufträge"
 
@@ -61991,14 +63066,14 @@
 msgstr "Auszuliefernde Aufträge"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:133
-#: accounts/report/accounts_receivable/accounts_receivable.py:1106
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:117
+#: accounts/report/accounts_receivable/accounts_receivable.js:136
+#: accounts/report/accounts_receivable/accounts_receivable.py:1114
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:197
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:74
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:10
+#: 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
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:9
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:8
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:71
 #: setup/doctype/sales_partner/sales_partner.json
 msgid "Sales Partner"
@@ -62141,17 +63216,18 @@
 
 #. Name of a DocType
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:155
-#: accounts/report/accounts_receivable/accounts_receivable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.py:1103
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:123
+#: 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_summary/accounts_receivable_summary.js:126
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:194
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
-#: accounts/report/gross_profit/gross_profit.js:49
+#: 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
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:10
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:115
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:116
 #: setup/doctype/sales_person/sales_person.json
 msgid "Sales Person"
 msgstr "Verkäufer"
@@ -62227,7 +63303,7 @@
 msgstr "Vertriebsmitarbeiterbezogene Zusammenfassung der Transaktionen"
 
 #. Label of a Card Break in the CRM Workspace
-#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:42
+#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:47
 msgid "Sales Pipeline"
 msgstr "Vertriebspipeline"
 
@@ -62238,7 +63314,7 @@
 msgid "Sales Pipeline Analytics"
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:131
+#: selling/page/sales_funnel/sales_funnel.js:146
 msgid "Sales Pipeline by Stage"
 msgstr "Vertriebspipeline nach Phase"
 
@@ -62254,14 +63330,14 @@
 msgstr "Übersicht über den Umsatz"
 
 #: accounts/report/gross_profit/gross_profit.py:777
-#: stock/doctype/delivery_note/delivery_note.js:175
+#: stock/doctype/delivery_note/delivery_note.js:200
 msgid "Sales Return"
 msgstr "Retoure"
 
 #. Name of a DocType
 #: crm/doctype/sales_stage/sales_stage.json
 #: crm/report/lost_opportunity/lost_opportunity.py:51
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:59
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:61
 msgid "Sales Stage"
 msgstr "Verkaufsphase"
 
@@ -62281,7 +63357,7 @@
 msgid "Sales Summary"
 msgstr "Verkaufszusammenfassung"
 
-#: setup/doctype/company/company.js:98
+#: setup/doctype/company/company.js:106
 msgid "Sales Tax Template"
 msgstr "Umsatzsteuer-Vorlage"
 
@@ -62468,6 +63544,7 @@
 #: stock/doctype/delivery_note/delivery_note.json stock/doctype/item/item.json
 #: stock/doctype/packing_slip/packing_slip.json
 #: stock/doctype/price_list/price_list.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
@@ -62527,7 +63604,7 @@
 msgid "Same Item"
 msgstr "Gleicher Artikel"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:350
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:404
 msgid "Same item and warehouse combination already entered."
 msgstr ""
 
@@ -62558,7 +63635,7 @@
 msgstr "Beispiel Retention Warehouse"
 
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: public/js/controllers/transaction.js:2131
+#: public/js/controllers/transaction.js:2174
 msgid "Sample Size"
 msgstr "Stichprobenumfang"
 
@@ -62568,11 +63645,11 @@
 msgid "Sample Size"
 msgstr "Stichprobenumfang"
 
-#: stock/doctype/stock_entry/stock_entry.py:2824
+#: stock/doctype/stock_entry/stock_entry.py:2860
 msgid "Sample quantity {0} cannot be more than received quantity {1}"
 msgstr "Die Beispielmenge {0} darf nicht mehr als die empfangene Menge {1} sein"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:7
 msgid "Sanctioned"
 msgstr "sanktionierte"
 
@@ -62641,16 +63718,16 @@
 msgid "Saturday"
 msgstr "Samstag"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:139
-#: accounts/doctype/journal_entry/journal_entry.js:550
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:118
+#: accounts/doctype/journal_entry/journal_entry.js:619
 #: accounts/doctype/ledger_merge/ledger_merge.js:75
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:252
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:288
-#: public/js/call_popup/call_popup.js:157
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:289
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:325
+#: public/js/call_popup/call_popup.js:169
 msgid "Save"
 msgstr "Speichern"
 
-#: selling/page/point_of_sale/pos_controller.js:176
+#: selling/page/point_of_sale/pos_controller.js:198
 msgid "Save as Draft"
 msgstr "Als Entwurf speichern"
 
@@ -62663,7 +63740,7 @@
 msgid "Savings"
 msgstr "Einsparungen"
 
-#: public/js/utils/barcode_scanner.js:206
+#: public/js/utils/barcode_scanner.js:215
 msgid "Scan Barcode"
 msgstr "Barcode scannen"
 
@@ -62739,7 +63816,7 @@
 msgid "Scan Barcode"
 msgstr "Barcode scannen"
 
-#: public/js/utils/serial_no_batch_selector.js:151
+#: public/js/utils/serial_no_batch_selector.js:154
 msgid "Scan Batch No"
 msgstr "Chargennummer scannen"
 
@@ -62755,11 +63832,11 @@
 msgid "Scan Mode"
 msgstr "Scan-Modus"
 
-#: public/js/utils/serial_no_batch_selector.js:136
+#: public/js/utils/serial_no_batch_selector.js:139
 msgid "Scan Serial No"
 msgstr "Seriennummer scannen"
 
-#: public/js/utils/barcode_scanner.js:172
+#: public/js/utils/barcode_scanner.js:179
 msgid "Scan barcode for item {0}"
 msgstr "Barcode für Artikel {0} scannen"
 
@@ -62773,7 +63850,7 @@
 msgid "Scanned Cheque"
 msgstr "Gescannte Scheck"
 
-#: public/js/utils/barcode_scanner.js:238
+#: public/js/utils/barcode_scanner.js:247
 msgid "Scanned Quantity"
 msgstr "Gescannte Menge"
 
@@ -62783,7 +63860,7 @@
 msgid "Schedule"
 msgstr "Planen"
 
-#: assets/doctype/asset/asset.js:240
+#: assets/doctype/asset/asset.js:275
 msgid "Schedule Date"
 msgstr "Geplantes Datum"
 
@@ -62818,7 +63895,7 @@
 msgid "Scheduled"
 msgstr "Geplant"
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:111
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:118
 msgid "Scheduled Date"
 msgstr "Geplantes Datum"
 
@@ -62846,7 +63923,7 @@
 msgid "Scheduled Time Logs"
 msgstr "Geplante Zeitprotokolle"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: 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
@@ -62865,7 +63942,7 @@
 msgid "Scheduler is inactive. Cannot enqueue job."
 msgstr "Zeitplaner ist inaktiv. Aufgabe kann nicht eingereiht werden."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:232
 msgid "Scheduler is inactive. Cannot import data."
 msgstr "Scheduler ist inaktiv. Daten können nicht importiert werden."
@@ -62947,7 +64024,7 @@
 msgid "Scrap & Process Loss"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:87
+#: assets/doctype/asset/asset.js:92
 msgid "Scrap Asset"
 msgstr "Vermögensgegenstand verschrotten"
 
@@ -63001,7 +64078,7 @@
 msgid "Scrap Warehouse"
 msgstr "Ausschusslager"
 
-#: assets/doctype/asset/asset_list.js:17
+#: assets/doctype/asset/asset_list.js:13
 msgid "Scrapped"
 msgstr "Verschrottet"
 
@@ -63011,7 +64088,7 @@
 msgid "Scrapped"
 msgstr "Verschrottet"
 
-#: selling/page/point_of_sale/pos_item_selector.js:150
+#: selling/page/point_of_sale/pos_item_selector.js:147
 #: selling/page/point_of_sale/pos_past_order_list.js:51
 #: templates/pages/help.html:14
 msgid "Search"
@@ -63034,7 +64111,7 @@
 msgid "Search Term Param Name"
 msgstr "Suchbegriff Param Name"
 
-#: selling/page/point_of_sale/pos_item_cart.js:312
+#: selling/page/point_of_sale/pos_item_cart.js:310
 msgid "Search by customer name, phone, email."
 msgstr "Suche nach Kundenname, Telefon, E-Mail."
 
@@ -63042,7 +64119,7 @@
 msgid "Search by invoice id or customer name"
 msgstr "Suche nach Rechnungs-ID oder Kundenname"
 
-#: selling/page/point_of_sale/pos_item_selector.js:152
+#: selling/page/point_of_sale/pos_item_selector.js:149
 msgid "Search by item code, serial number or barcode"
 msgstr ""
 
@@ -63064,7 +64141,7 @@
 msgid "Secondary Role"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:172
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:117
 msgid "Section Code"
 msgstr "Abschnittscode"
@@ -63087,8 +64164,13 @@
 msgid "See all open tickets"
 msgstr "Alle offenen Tickets anzeigen"
 
-#: buying/doctype/purchase_order/purchase_order.js:180
-#: selling/doctype/sales_order/sales_order.js:888
+#: stock/report/stock_ledger/stock_ledger.js:104
+msgid "Segregate Serial / Batch Bundle"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:186
+#: selling/doctype/sales_order/sales_order.js:1043
+#: selling/doctype/sales_order/sales_order_list.js:85
 msgid "Select"
 msgstr "Auswählen"
 
@@ -63096,33 +64178,33 @@
 msgid "Select Accounting Dimension."
 msgstr ""
 
-#: public/js/utils.js:440
+#: public/js/utils.js:487
 msgid "Select Alternate Item"
 msgstr "Wählen Sie Alternatives Element"
 
-#: selling/doctype/quotation/quotation.js:312
+#: selling/doctype/quotation/quotation.js:324
 msgid "Select Alternative Items for Sales Order"
 msgstr "Alternativpositionen für Auftragsbestätigung auswählen"
 
-#: stock/doctype/item/item.js:518
+#: stock/doctype/item/item.js:585
 msgid "Select Attribute Values"
 msgstr "Wählen Sie Attributwerte"
 
-#: selling/doctype/sales_order/sales_order.js:689
+#: selling/doctype/sales_order/sales_order.js:792
 msgid "Select BOM"
 msgstr "Stückliste auswählen"
 
-#: selling/doctype/sales_order/sales_order.js:678
+#: selling/doctype/sales_order/sales_order.js:779
 msgid "Select BOM and Qty for Production"
 msgstr "Wählen Sie Stückliste und Menge für die Produktion"
 
-#: selling/doctype/sales_order/sales_order.js:803
+#: selling/doctype/sales_order/sales_order.js:921
 msgid "Select BOM, Qty and For Warehouse"
 msgstr "Bitte Stückliste, Menge und Lager wählen"
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: selling/page/point_of_sale/pos_item_details.js:212
+#: stock/doctype/pick_list/pick_list.js:352
 msgid "Select Batch No"
 msgstr "Chargennummer auswählen"
 
@@ -63138,15 +64220,15 @@
 msgid "Select Billing Address"
 msgstr "Zahlungsadresse auswählen"
 
-#: public/js/stock_analytics.js:42
+#: public/js/stock_analytics.js:61
 msgid "Select Brand..."
 msgstr "Marke auswählen ..."
 
-#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/journal_entry/journal_entry.js:123
 msgid "Select Company"
 msgstr "Unternehmen auswählen"
 
-#: manufacturing/doctype/job_card/job_card.js:173
+#: manufacturing/doctype/job_card/job_card.js:193
 msgid "Select Corrective Operation"
 msgstr ""
 
@@ -63156,24 +64238,24 @@
 msgid "Select Customers By"
 msgstr "Wählen Sie Kunden nach"
 
-#: setup/doctype/employee/employee.js:112
+#: setup/doctype/employee/employee.js:115
 msgid "Select Date of Birth. This will validate Employees age and prevent hiring of under-age staff."
 msgstr ""
 
-#: setup/doctype/employee/employee.js:117
+#: setup/doctype/employee/employee.js:122
 msgid "Select Date of joining. It will have impact on the first salary calculation, Leave allocation on pro-rata bases."
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:111
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:131
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:114
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:138
 msgid "Select Default Supplier"
 msgstr "Standard -Lieferant auswählen"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:252
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:256
 msgid "Select Difference Account"
 msgstr "Wählen Sie Differenzkonto"
 
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:58
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:57
 msgid "Select Dimension"
 msgstr ""
 
@@ -63183,27 +64265,27 @@
 msgid "Select DocType"
 msgstr "DocType auswählen"
 
-#: manufacturing/doctype/job_card/job_card.js:246
+#: manufacturing/doctype/job_card/job_card.js:274
 msgid "Select Employees"
 msgstr "Mitarbeiter auswählen"
 
-#: buying/doctype/purchase_order/purchase_order.js:170
+#: buying/doctype/purchase_order/purchase_order.js:176
 msgid "Select Finished Good"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:962
+#: selling/doctype/sales_order/sales_order.js:1122
 msgid "Select Items"
 msgstr "Gegenstände auswählen"
 
-#: selling/doctype/sales_order/sales_order.js:861
+#: selling/doctype/sales_order/sales_order.js:1008
 msgid "Select Items based on Delivery Date"
 msgstr "Wählen Sie die Positionen nach dem Lieferdatum aus"
 
-#: public/js/controllers/transaction.js:2159
+#: public/js/controllers/transaction.js:2202
 msgid "Select Items for Quality Inspection"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:820
 msgid "Select Items to Manufacture"
 msgstr "Wählen Sie die Elemente Herstellung"
 
@@ -63213,27 +64295,31 @@
 msgid "Select Items to Manufacture"
 msgstr "Wählen Sie die Elemente Herstellung"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1038
-#: selling/page/point_of_sale/pos_item_cart.js:888
+#: selling/doctype/sales_order/sales_order_list.js:76
+msgid "Select Items up to Delivery Date"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.js:1114
+#: selling/page/point_of_sale/pos_item_cart.js:920
 msgid "Select Loyalty Program"
 msgstr "Wählen Sie Treueprogramm"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: buying/doctype/request_for_quotation/request_for_quotation.js:366
 msgid "Select Possible Supplier"
 msgstr "Möglichen Lieferanten wählen"
 
-#: manufacturing/doctype/work_order/work_order.js:726
-#: stock/doctype/pick_list/pick_list.js:161
+#: manufacturing/doctype/work_order/work_order.js:781
+#: stock/doctype/pick_list/pick_list.js:192
 msgid "Select Quantity"
 msgstr "Menge wählen"
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: selling/page/point_of_sale/pos_item_details.js:212
+#: stock/doctype/pick_list/pick_list.js:352
 msgid "Select Serial No"
 msgstr "Seriennummer auswählen"
 
-#: public/js/utils/sales_common.js:328 stock/doctype/pick_list/pick_list.js:321
+#: public/js/utils/sales_common.js:364 stock/doctype/pick_list/pick_list.js:355
 msgid "Select Serial and Batch"
 msgstr ""
 
@@ -63261,40 +64347,40 @@
 msgid "Select Supplier Address"
 msgstr "Lieferantenadresse auswählen"
 
-#: stock/doctype/batch/batch.js:110
+#: stock/doctype/batch/batch.js:127
 msgid "Select Target Warehouse"
 msgstr "Wählen Sie Target Warehouse"
 
-#: www/book_appointment/index.js:69
+#: www/book_appointment/index.js:73
 msgid "Select Time"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:14
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
+#: accounts/report/balance_sheet/balance_sheet.js:10
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:10
 msgid "Select View"
 msgstr "Ansicht auswählen"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:248
+#: public/js/bank_reconciliation_tool/dialog_manager.js:251
 msgid "Select Vouchers to Match"
 msgstr "Passende Belege auswählen"
 
-#: public/js/stock_analytics.js:46
+#: public/js/stock_analytics.js:72
 msgid "Select Warehouse..."
 msgstr "Lager auswählen ..."
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:431
 msgid "Select Warehouses to get Stock for Materials Planning"
 msgstr ""
 
-#: public/js/communication.js:67
+#: public/js/communication.js:80
 msgid "Select a Company"
 msgstr "Wählen Sie eine Firma aus"
 
-#: setup/doctype/employee/employee.js:107
+#: setup/doctype/employee/employee.js:110
 msgid "Select a Company this Employee belongs to."
 msgstr "Wählen Sie ein Unternehmen, zu dem dieser Mitarbeiter gehört."
 
-#: buying/doctype/supplier/supplier.js:160
+#: buying/doctype/supplier/supplier.js:188
 msgid "Select a Customer"
 msgstr "Wählen Sie einen Kunden"
 
@@ -63302,19 +64388,19 @@
 msgid "Select a Default Priority."
 msgstr "Wählen Sie eine Standardpriorität."
 
-#: selling/doctype/customer/customer.js:205
+#: selling/doctype/customer/customer.js:221
 msgid "Select a Supplier"
 msgstr "Wählen Sie einen Lieferanten aus"
 
-#: stock/doctype/material_request/material_request.js:297
+#: stock/doctype/material_request/material_request.js:365
 msgid "Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only."
 msgstr "Wählen Sie einen Lieferanten aus den Standardlieferanten der folgenden Artikel aus. Bei der Auswahl erfolgt eine Bestellung nur für Artikel, die dem ausgewählten Lieferanten gehören."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:156
 msgid "Select a company"
 msgstr "Wählen Sie eine Firma aus"
 
-#: stock/doctype/item/item.js:809
+#: stock/doctype/item/item.js:889
 msgid "Select an Item Group."
 msgstr "Wählen Sie eine Artikelgruppe."
 
@@ -63322,15 +64408,19 @@
 msgid "Select an account to print in account currency"
 msgstr "Wählen Sie ein Konto aus, das in der Kontowährung gedruckt werden soll"
 
-#: selling/doctype/quotation/quotation.js:327
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
+msgid "Select an invoice to load summary data"
+msgstr ""
+
+#: selling/doctype/quotation/quotation.js:339
 msgid "Select an item from each set to be used in the Sales Order."
 msgstr "Wählen Sie aus den Alternativen jeweils einen Artikel aus, der in die Auftragsbestätigung übernommen werden soll."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
-msgid "Select change amount account"
-msgstr "Wählen Sie Änderungsbetrag Konto"
+#: stock/doctype/item/item.js:590
+msgid "Select at least one value from each of the attributes."
+msgstr ""
 
-#: public/js/utils/party.js:305
+#: public/js/utils/party.js:352
 msgid "Select company first"
 msgstr "Zuerst das Unternehmen auswählen"
 
@@ -63341,15 +64431,15 @@
 msgid "Select company name first."
 msgstr "Zuerst Firma auswählen."
 
-#: controllers/accounts_controller.py:2394
+#: controllers/accounts_controller.py:2486
 msgid "Select finance book for the item {0} at row {1}"
 msgstr "Wählen Sie das Finanzbuch für das Element {0} in Zeile {1} aus."
 
-#: selling/page/point_of_sale/pos_item_selector.js:162
+#: selling/page/point_of_sale/pos_item_selector.js:159
 msgid "Select item group"
 msgstr "Artikelgruppe auswählen"
 
-#: manufacturing/doctype/bom/bom.js:293
+#: manufacturing/doctype/bom/bom.js:306
 msgid "Select template item"
 msgstr "Vorlagenelement auswählen"
 
@@ -63363,16 +64453,16 @@
 msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:807
+#: manufacturing/doctype/work_order/work_order.js:866
 msgid "Select the Item to be manufactured."
 msgstr "Wählen Sie den Artikel, der hergestellt werden soll."
 
-#: manufacturing/doctype/bom/bom.js:725
+#: manufacturing/doctype/bom/bom.js:754
 msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
 msgstr "Wählen Sie den Artikel, der hergestellt werden soll. Der Name des Artikels, die ME, das Unternehmen und die Währung werden automatisch abgerufen."
 
-#: manufacturing/doctype/production_plan/production_plan.js:294
-#: manufacturing/doctype/production_plan/production_plan.js:305
+#: manufacturing/doctype/production_plan/production_plan.js:319
+#: manufacturing/doctype/production_plan/production_plan.js:332
 msgid "Select the Warehouse"
 msgstr "Wählen Sie das Lager aus"
 
@@ -63384,15 +64474,15 @@
 msgid "Select the date and your timezone"
 msgstr "Wählen Sie das Datum und Ihre Zeitzone"
 
-#: manufacturing/doctype/bom/bom.js:740
+#: manufacturing/doctype/bom/bom.js:773
 msgid "Select the raw materials (Items) required to manufacture the Item"
 msgstr "Wählen Sie die Rohstoffe (Artikel) aus, die zur Herstellung des Artikels benötigt werden"
 
-#: manufacturing/doctype/bom/bom.js:338
+#: manufacturing/doctype/bom/bom.js:353
 msgid "Select variant item code for the template item {0}"
 msgstr "Wählen Sie den Variantenartikelcode für den Vorlagenartikel {0} aus"
 
-#: manufacturing/doctype/production_plan/production_plan.js:525
+#: manufacturing/doctype/production_plan/production_plan.js:565
 msgid "Select whether to get items from a Sales Order or a Material Request. For now select <b>Sales Order</b>.\n"
 " A Production Plan can also be created manually where you can select the Items to manufacture."
 msgstr ""
@@ -63412,7 +64502,7 @@
 msgid "Selected POS Opening Entry should be open."
 msgstr "Der ausgewählte POS-Eröffnungseintrag sollte geöffnet sein."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2192
+#: accounts/doctype/sales_invoice/sales_invoice.py:2161
 msgid "Selected Price List should have buying and selling fields checked."
 msgstr "Die ausgewählte Preisliste sollte die Kauf- und Verkaufsfelder überprüft haben."
 
@@ -63426,7 +64516,7 @@
 msgid "Selected date is"
 msgstr ""
 
-#: public/js/bulk_transaction_processing.js:26
+#: public/js/bulk_transaction_processing.js:34
 msgid "Selected document must be in submitted state"
 msgstr "Ausgewähltes Dokument muss in gebuchtem Zustand sein"
 
@@ -63441,7 +64531,7 @@
 msgid "Sell"
 msgstr "Verkaufen"
 
-#: assets/doctype/asset/asset.js:91
+#: assets/doctype/asset/asset.js:100
 msgid "Sell Asset"
 msgstr "Vermögensgegenstand verkaufen"
 
@@ -63571,7 +64661,7 @@
 msgid "Send Emails"
 msgstr "E-Mails senden"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:46
+#: buying/doctype/request_for_quotation/request_for_quotation.js:53
 msgid "Send Emails to Suppliers"
 msgstr "Senden Sie E-Mails an Lieferanten"
 
@@ -63579,7 +64669,7 @@
 msgid "Send Now"
 msgstr "Jetzt senden"
 
-#: public/js/controllers/transaction.js:440
+#: public/js/controllers/transaction.js:479
 msgid "Send SMS"
 msgstr "SMS verschicken"
 
@@ -63601,6 +64691,11 @@
 msgid "Send To Primary Contact"
 msgstr "An primären Kontakt senden"
 
+#. Description of a DocType
+#: setup/doctype/email_digest/email_digest.json
+msgid "Send regular summary reports via Email."
+msgstr ""
+
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
@@ -63631,7 +64726,7 @@
 msgid "Sender"
 msgstr "Absender"
 
-#: accounts/doctype/payment_request/payment_request.js:35
+#: accounts/doctype/payment_request/payment_request.js:44
 msgid "Sending"
 msgstr "Versand"
 
@@ -63653,7 +64748,7 @@
 msgid "Sequence ID"
 msgstr "Sequenz-ID"
 
-#: manufacturing/doctype/work_order/work_order.js:262
+#: manufacturing/doctype/work_order/work_order.js:277
 msgid "Sequence Id"
 msgstr "Sequenz-ID"
 
@@ -63704,26 +64799,26 @@
 msgid "Serial / Batch No"
 msgstr "Serien-/Chargennr"
 
-#: public/js/utils.js:124
+#: public/js/utils.js:153
 msgid "Serial / Batch Nos"
 msgstr ""
 
 #. Name of a DocType
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:73
+#: 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:2144
-#: public/js/utils/serial_no_batch_selector.js:350
+#: public/js/controllers/transaction.js:2187
+#: 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/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_no_ledger/serial_no_ledger.js:39
+#: 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:246
+#: stock/report/stock_ledger/stock_ledger.py:319
 msgid "Serial No"
 msgstr "Seriennummer"
 
-#. Label of a Small Text field in DocType 'Asset Capitalization Stock Item'
+#. Label of a Text field in DocType 'Asset Capitalization Stock Item'
 #: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
 msgctxt "Asset Capitalization Stock Item"
 msgid "Serial No"
@@ -63771,7 +64866,7 @@
 msgid "Serial No"
 msgstr "Seriennummer"
 
-#. Label of a Small Text field in DocType 'POS Invoice Item'
+#. Label of a Text field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
 msgid "Serial No"
@@ -63807,7 +64902,7 @@
 msgid "Serial No"
 msgstr "Seriennummer"
 
-#. Label of a Small Text field in DocType 'Sales Invoice Item'
+#. Label of a Text field in DocType 'Sales Invoice Item'
 #: accounts/doctype/sales_invoice_item/sales_invoice_item.json
 msgctxt "Sales Invoice Item"
 msgid "Serial No"
@@ -63828,7 +64923,7 @@
 msgid "Serial No"
 msgstr "Seriennummer"
 
-#. Label of a Small Text field in DocType 'Stock Entry Detail'
+#. Label of a Text field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
 msgid "Serial No"
@@ -63923,7 +65018,7 @@
 msgid "Serial No and Batch for Finished Good"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:572
 msgid "Serial No is mandatory"
 msgstr "Seriennummer ist obligatorisch"
 
@@ -63931,11 +65026,11 @@
 msgid "Serial No is mandatory for Item {0}"
 msgstr "Seriennummer ist für Artikel {0} zwingend erforderlich"
 
-#: public/js/utils/serial_no_batch_selector.js:480
+#: public/js/utils/serial_no_batch_selector.js:488
 msgid "Serial No {0} already exists"
 msgstr "Die Seriennummer {0} existiert bereits"
 
-#: public/js/utils/barcode_scanner.js:311
+#: public/js/utils/barcode_scanner.js:321
 msgid "Serial No {0} already scanned"
 msgstr "Seriennummer {0} bereits gescannt"
 
@@ -63952,16 +65047,11 @@
 msgid "Serial No {0} does not exist"
 msgstr "Seriennummer {0} existiert nicht"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2112
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2131
 msgid "Serial No {0} does not exists"
 msgstr "Seriennummer {0} existiert nicht"
 
 #: public/js/utils/barcode_scanner.js:402
-msgid "Serial No {0} has already scanned."
-msgstr "Seriennummer {0} wurde bereits gescannt."
-
-#: public/js/utils/barcode_scanner.js:499
-#: public/js/utils/barcode_scanner.js:506
 msgid "Serial No {0} is already added"
 msgstr "Die Seriennummer {0} ist bereits hinzugefügt"
 
@@ -63977,23 +65067,23 @@
 msgid "Serial No {0} not found"
 msgstr "Seriennummer {0} wurde nicht gefunden"
 
-#: selling/page/point_of_sale/pos_controller.js:695
+#: selling/page/point_of_sale/pos_controller.js:734
 msgid "Serial No: {0} has already been transacted into another POS Invoice."
 msgstr "Seriennummer: {0} wurde bereits in eine andere POS-Rechnung übertragen."
 
-#: public/js/utils/barcode_scanner.js:262
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/barcode_scanner.js:271
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Serial Nos"
 msgstr "Seriennummern"
 
 #: public/js/utils/serial_no_batch_selector.js:20
-#: public/js/utils/serial_no_batch_selector.js:183
+#: public/js/utils/serial_no_batch_selector.js:185
 msgid "Serial Nos / Batch Nos"
 msgstr "Serien-/Chargennummern"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1692
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:157
 msgid "Serial Nos Mismatch"
 msgstr "Seriennummern stimmen nicht überein"
 
@@ -64003,11 +65093,11 @@
 msgid "Serial Nos and Batches"
 msgstr "Seriennummern und Chargen"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1074
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1081
 msgid "Serial Nos are created successfully"
 msgstr "Seriennummern wurden erfolgreich erstellt"
 
-#: stock/stock_ledger.py:1972
+#: stock/stock_ledger.py:1979
 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
 msgstr "Seriennummern sind bereits reserviert. Sie müssen die Reservierung aufheben, bevor Sie fortfahren."
 
@@ -64033,7 +65123,7 @@
 #. Name of a DocType
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:80
-#: stock/report/stock_ledger/stock_ledger.py:253
+#: stock/report/stock_ledger/stock_ledger.py:326
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:154
 msgid "Serial and Batch Bundle"
 msgstr ""
@@ -64128,14 +65218,18 @@
 msgid "Serial and Batch Bundle"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1253
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1260
 msgid "Serial and Batch Bundle created"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1295
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1309
 msgid "Serial and Batch Bundle updated"
 msgstr ""
 
+#: controllers/stock_controller.py:82
+msgid "Serial and Batch Bundle {0} is already used in {1} {2}."
+msgstr ""
+
 #. Label of a Section Break field in DocType 'Subcontracting Receipt Item'
 #: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
 msgctxt "Subcontracting Receipt Item"
@@ -64159,7 +65253,7 @@
 msgid "Serial and Batch No"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:51
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:49
 msgid "Serial and Batch Nos"
 msgstr ""
 
@@ -64187,11 +65281,11 @@
 msgid "Serial and Batch Summary"
 msgstr ""
 
-#: stock/utils.py:427
+#: stock/utils.py:422
 msgid "Serial number {0} entered more than once"
 msgstr "Seriennummer {0} wurde mehrfach erfasst"
 
-#: accounts/doctype/journal_entry/journal_entry.js:545
+#: accounts/doctype/journal_entry/journal_entry.js:611
 msgid "Series"
 msgstr "Nummernkreis"
 
@@ -64649,7 +65743,7 @@
 msgid "Service Level Agreement has been changed to {0}."
 msgstr "Service Level Agreement wurde in {0} geändert."
 
-#: support/doctype/issue/issue.js:67
+#: support/doctype/issue/issue.js:77
 msgid "Service Level Agreement was reset."
 msgstr "Service Level Agreement wurde zurückgesetzt."
 
@@ -64730,11 +65824,11 @@
 msgid "Service Stop Date"
 msgstr "Service-Stopp-Datum"
 
-#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1239
+#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1298
 msgid "Service Stop Date cannot be after Service End Date"
 msgstr "Das Service-Stopp-Datum kann nicht nach dem Service-Enddatum liegen"
 
-#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1236
+#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1295
 msgid "Service Stop Date cannot be before Service Start Date"
 msgstr "Das Servicestoppdatum darf nicht vor dem Servicestartdatum liegen"
 
@@ -64767,7 +65861,7 @@
 msgid "Set Basic Rate Manually"
 msgstr "Grundpreis manuell einstellen"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:150
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:157
 msgid "Set Default Supplier"
 msgstr "Standard-Lieferant festlegen"
 
@@ -64808,11 +65902,11 @@
 msgid "Set Landed Cost Based on Purchase Invoice Rate"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1050
+#: accounts/doctype/sales_invoice/sales_invoice.js:1126
 msgid "Set Loyalty Program"
 msgstr "Treueprogramm eintragen"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:272
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:309
 msgid "Set New Release Date"
 msgstr "Neues Veröffentlichungsdatum festlegen"
 
@@ -64828,27 +65922,31 @@
 msgid "Set Operating Cost Based On BOM Quantity"
 msgstr ""
 
+#: buying/doctype/request_for_quotation/request_for_quotation.py:264
+msgid "Set Password"
+msgstr "Passwort festlegen"
+
 #. Label of a Check field in DocType 'POS Opening Entry'
 #: accounts/doctype/pos_opening_entry/pos_opening_entry.json
 msgctxt "POS Opening Entry"
 msgid "Set Posting Date"
 msgstr "Buchungsdatum festlegen"
 
-#: manufacturing/doctype/bom/bom.js:767
+#: manufacturing/doctype/bom/bom.js:800
 msgid "Set Process Loss Item Quantity"
 msgstr ""
 
-#: projects/doctype/project/project.js:116
-#: projects/doctype/project/project.js:118
-#: projects/doctype/project/project.js:132
+#: projects/doctype/project/project.js:140
+#: projects/doctype/project/project.js:143
+#: projects/doctype/project/project.js:157
 msgid "Set Project Status"
 msgstr "Projektstatus festlegen"
 
-#: projects/doctype/project/project.js:154
+#: projects/doctype/project/project.js:182
 msgid "Set Project and all Tasks to status {0}?"
 msgstr "Projekt und alle Aufgaben auf Status {0} setzen?"
 
-#: manufacturing/doctype/bom/bom.js:768
+#: manufacturing/doctype/bom/bom.js:801
 msgid "Set Quantity"
 msgstr "Anzahl festlegen"
 
@@ -64928,7 +66026,7 @@
 msgid "Set Valuation Rate Based on Source Warehouse"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:184
+#: selling/doctype/sales_order/sales_order.js:207
 msgid "Set Warehouse"
 msgstr "Lager festlegen"
 
@@ -64937,25 +66035,25 @@
 msgid "Set as Closed"
 msgstr "Als \"abgeschlossen\" markieren"
 
-#: projects/doctype/task/task_list.js:12
+#: projects/doctype/task/task_list.js:20
 msgid "Set as Completed"
 msgstr "Als abgeschlossen festlegen"
 
-#: public/js/utils/sales_common.js:406
-#: selling/doctype/quotation/quotation.js:124
+#: public/js/utils/sales_common.js:462
+#: selling/doctype/quotation/quotation.js:129
 msgid "Set as Lost"
 msgstr "Als \"verloren\" markieren"
 
 #: crm/doctype/opportunity/opportunity_list.js:13
-#: projects/doctype/task/task_list.js:8 support/doctype/issue/issue_list.js:8
+#: projects/doctype/task/task_list.js:16 support/doctype/issue/issue_list.js:8
 msgid "Set as Open"
 msgstr "Als \"geöffnet\" markieren"
 
-#: setup/doctype/company/company.py:419
+#: setup/doctype/company/company.py:418
 msgid "Set default inventory account for perpetual inventory"
 msgstr "Inventurkonto für permanente Inventur auswählen"
 
-#: setup/doctype/company/company.py:429
+#: setup/doctype/company/company.py:428
 msgid "Set default {0} account for non stock items"
 msgstr ""
 
@@ -64966,7 +66064,7 @@
 msgid "Set fieldname from which you want to fetch the data from the parent form."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:757
+#: manufacturing/doctype/bom/bom.js:790
 msgid "Set quantity of process loss item:"
 msgstr ""
 
@@ -64983,7 +66081,7 @@
 msgid "Set targets Item Group-wise for this Sales Person."
 msgstr "Ziele artikelgruppenbezogen für diesen Vertriebsmitarbeiter festlegen."
 
-#: manufacturing/doctype/work_order/work_order.js:852
+#: manufacturing/doctype/work_order/work_order.js:923
 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
 msgstr ""
 
@@ -65005,15 +66103,15 @@
 msgid "Set up your Warehouse"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:672
+#: assets/doctype/asset/asset.py:674
 msgid "Set {0} in asset category {1} for company {2}"
 msgstr "Legen Sie {0} in die Vermögensgegenstand-Kategorie {1} für das Unternehmen {2} fest"
 
-#: assets/doctype/asset/asset.py:953
+#: assets/doctype/asset/asset.py:957
 msgid "Set {0} in asset category {1} or company {2}"
 msgstr "Stellen Sie {0} in der Anlagenkategorie {1} oder im Unternehmen {2} ein"
 
-#: assets/doctype/asset/asset.py:949
+#: assets/doctype/asset/asset.py:953
 msgid "Set {0} in company {1}"
 msgstr "{0} in Firma {1} festlegen"
 
@@ -65094,7 +66192,7 @@
 msgstr "Firma gründen"
 
 #: manufacturing/doctype/bom/bom.py:956
-#: manufacturing/doctype/work_order/work_order.py:978
+#: manufacturing/doctype/work_order/work_order.py:992
 msgid "Setting {} is required"
 msgstr ""
 
@@ -65127,7 +66225,13 @@
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:15
+#. Description of a DocType
+#: crm/doctype/crm_settings/crm_settings.json
+#: selling/doctype/selling_settings/selling_settings.json
+msgid "Settings for Selling Module"
+msgstr ""
+
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:11
 msgid "Settled"
 msgstr "Erledigt"
 
@@ -65143,6 +66247,12 @@
 msgid "Settled"
 msgstr "Erledigt"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Setup"
+msgstr "Einrichtung"
+
 #. Title of an Onboarding Step
 #: setup/onboarding_step/letterhead/letterhead.json
 msgid "Setup Your Letterhead"
@@ -65161,7 +66271,7 @@
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
 #: accounts/doctype/share_balance/share_balance.json
-#: accounts/doctype/shareholder/shareholder.js:22
+#: accounts/doctype/shareholder/shareholder.js:21
 #: accounts/report/share_balance/share_balance.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Balance"
@@ -65176,7 +66286,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/shareholder/shareholder.js:28
+#: accounts/doctype/shareholder/shareholder.js:27
 #: accounts/report/share_ledger/share_ledger.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Ledger"
@@ -65220,9 +66330,9 @@
 
 #. Name of a DocType
 #: accounts/doctype/shareholder/shareholder.json
-#: accounts/report/share_balance/share_balance.js:17
+#: accounts/report/share_balance/share_balance.js:16
 #: accounts/report/share_balance/share_balance.py:57
-#: accounts/report/share_ledger/share_ledger.js:17
+#: accounts/report/share_ledger/share_ledger.js:16
 #: accounts/report/share_ledger/share_ledger.py:51
 msgid "Shareholder"
 msgstr "Aktionär"
@@ -65239,7 +66349,7 @@
 msgid "Shelf Life In Days"
 msgstr "Haltbarkeit in Tagen"
 
-#: assets/doctype/asset/asset.js:247
+#: assets/doctype/asset/asset.js:288
 msgid "Shift"
 msgstr "Schicht"
 
@@ -65262,7 +66372,7 @@
 msgstr "Schichtname"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:166
+#: stock/doctype/delivery_note/delivery_note.js:181
 #: stock/doctype/shipment/shipment.json
 msgid "Shipment"
 msgstr "Sendung"
@@ -65330,7 +66440,7 @@
 msgid "Shipment details"
 msgstr "Sendungsdetails"
 
-#: stock/doctype/delivery_note/delivery_note.py:846
+#: stock/doctype/delivery_note/delivery_note.py:907
 msgid "Shipments"
 msgstr "Lieferungen"
 
@@ -65678,31 +66788,35 @@
 msgid "Show Cancelled Entries"
 msgstr "Abgebrochene Einträge anzeigen"
 
-#: templates/pages/projects.js:64
+#: templates/pages/projects.js:61
 msgid "Show Completed"
 msgstr "Show abgeschlossen"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:107
+#: accounts/report/budget_variance_report/budget_variance_report.js:105
 msgid "Show Cumulative Amount"
 msgstr "Kumulativen Betrag anzeigen"
 
-#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:17
+#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:16
 msgid "Show Disabled Warehouses"
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:306
+msgid "Show Document"
+msgstr "Dokument anzeigen"
+
 #. Label of a Check field in DocType 'Bank Statement Import'
 #: accounts/doctype/bank_statement_import/bank_statement_import.json
 msgctxt "Bank Statement Import"
 msgid "Show Failed Logs"
 msgstr "Fehlgeschlagene Protokolle anzeigen"
 
-#: accounts/report/accounts_payable/accounts_payable.js:144
-#: accounts/report/accounts_receivable/accounts_receivable.js:161
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:134
+#: accounts/report/accounts_payable/accounts_payable.js:147
+#: accounts/report/accounts_receivable/accounts_receivable.js:164
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:137
 msgid "Show Future Payments"
 msgstr "Zukünftige Zahlungen anzeigen"
 
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:139
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:142
 msgid "Show GL Balance"
 msgstr ""
 
@@ -65735,7 +66849,7 @@
 msgid "Show Ledger View"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:166
+#: accounts/report/accounts_receivable/accounts_receivable.js:169
 msgid "Show Linked Delivery Notes"
 msgstr "Verknüpfte Lieferscheine anzeigen"
 
@@ -65749,7 +66863,7 @@
 msgid "Show Net Values in Party Account"
 msgstr ""
 
-#: templates/pages/projects.js:66
+#: templates/pages/projects.js:63
 msgid "Show Open"
 msgstr "zeigen open"
 
@@ -65783,18 +66897,18 @@
 msgid "Show Preview"
 msgstr "Vorschau anzeigen"
 
-#: accounts/report/accounts_payable/accounts_payable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.js:176
+#: accounts/report/accounts_payable/accounts_payable.js:142
+#: accounts/report/accounts_receivable/accounts_receivable.js:179
 #: accounts/report/general_ledger/general_ledger.js:204
 msgid "Show Remarks"
 msgstr "Bemerkungen anzeigen"
 
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:66
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:65
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:65
 msgid "Show Return Entries"
 msgstr "Zeige Return-Einträge"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:171
+#: accounts/report/accounts_receivable/accounts_receivable.js:174
 msgid "Show Sales Person"
 msgstr "Verkäufer anzeigen"
 
@@ -65808,11 +66922,16 @@
 msgid "Show Taxes as Table in Print"
 msgstr ""
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:456
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:296
+msgid "Show Traceback"
+msgstr "Traceback anzeigen"
+
 #: stock/report/stock_balance/stock_balance.js:90
 msgid "Show Variant Attributes"
 msgstr "Variantenattribute anzeigen"
 
-#: stock/doctype/item/item.js:90
+#: stock/doctype/item/item.js:106
 msgid "Show Variants"
 msgstr "Varianten anzeigen"
 
@@ -65820,8 +66939,8 @@
 msgid "Show Warehouse-wise Stock"
 msgstr "Lagerbestand anzeigen"
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:29
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:17
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:28
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:19
 msgid "Show exploded view"
 msgstr "Explosionsansicht anzeigen"
 
@@ -65831,7 +66950,7 @@
 msgid "Show in Website"
 msgstr "In der Website anzeigen"
 
-#: accounts/report/trial_balance/trial_balance.js:104
+#: accounts/report/trial_balance/trial_balance.js:110
 msgid "Show net values in opening and closing columns"
 msgstr ""
 
@@ -65839,30 +66958,30 @@
 msgid "Show only POS"
 msgstr "Zeige nur POS"
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:108
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:106
 msgid "Show only the Immediate Upcoming Term"
 msgstr ""
 
-#: stock/utils.py:588
+#: stock/utils.py:583
 msgid "Show pending entries"
 msgstr "Ausstehende Einträge anzeigen"
 
-#: accounts/report/trial_balance/trial_balance.js:93
+#: accounts/report/trial_balance/trial_balance.js:99
 msgid "Show unclosed fiscal year's P&L balances"
 msgstr "Gewinn- und Verlustrechnung für nicht geschlossenes Finanzjahr zeigen."
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:96
 msgid "Show with upcoming revenue/expense"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:113
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:137
 #: accounts/report/profitability_analysis/profitability_analysis.js:71
-#: accounts/report/trial_balance/trial_balance.js:88
+#: accounts/report/trial_balance/trial_balance.js:94
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:85
 msgid "Show zero values"
 msgstr "Nullwerte anzeigen"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.js:30
+#: accounts/doctype/accounting_dimension/accounting_dimension.js:35
 msgid "Show {0}"
 msgstr "{0} anzeigen"
 
@@ -65946,7 +67065,7 @@
 msgid "Simultaneous"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:551
+#: stock/doctype/stock_entry/stock_entry.py:506
 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 ""
 
@@ -65969,7 +67088,7 @@
 msgid "Single Transaction Threshold"
 msgstr "Einzeltransaktionsschwelle"
 
-#: stock/doctype/item/item.js:103
+#: stock/doctype/item/item.js:131
 msgid "Single Variant"
 msgstr "Einzelvariante"
 
@@ -66005,7 +67124,7 @@
 msgid "Skipping Tax Withholding Category {0} as there is no associated account set for Company {1} in it."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:49
 msgid "Skipping {0} of {1}, {2}"
 msgstr "Überspringe {0} von {1}, {2}"
 
@@ -66019,7 +67138,7 @@
 msgid "Small"
 msgstr "Klein"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:68
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:67
 msgid "Smoothing Constant"
 msgstr "Glättungskonstante"
 
@@ -66028,7 +67147,7 @@
 msgid "Software"
 msgstr "Software"
 
-#: assets/doctype/asset/asset_list.js:11
+#: assets/doctype/asset/asset_list.js:9
 msgid "Sold"
 msgstr "Verkauft"
 
@@ -66038,24 +67157,29 @@
 msgid "Sold"
 msgstr "Verkauft"
 
-#: www/book_appointment/index.js:239
+#: selling/page/point_of_sale/pos_past_order_summary.js:80
+msgid "Sold by"
+msgstr ""
+
+#: www/book_appointment/index.js:248
 msgid "Something went wrong please try again"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:747
+#: accounts/doctype/pricing_rule/utils.py:746
 msgid "Sorry, this coupon code is no longer valid"
 msgstr "Dieser Gutscheincode ist leider nicht mehr gültig"
 
-#: accounts/doctype/pricing_rule/utils.py:745
+#: accounts/doctype/pricing_rule/utils.py:744
 msgid "Sorry, this coupon code's validity has expired"
 msgstr "Die Gültigkeit dieses Gutscheincodes ist leider abgelaufen"
 
-#: accounts/doctype/pricing_rule/utils.py:742
+#: accounts/doctype/pricing_rule/utils.py:741
 msgid "Sorry, this coupon code's validity has not started"
 msgstr "Die Gültigkeit dieses Gutscheincodes wurde leider noch nicht gestartet"
 
 #: crm/report/lead_details/lead_details.py:40
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:38
+#: templates/form_grid/stock_entry_grid.html:29
 msgid "Source"
 msgstr "Quelle"
 
@@ -66161,10 +67285,10 @@
 msgid "Source Type"
 msgstr "Quelle Typ"
 
-#: manufacturing/doctype/bom/bom.js:313
+#: manufacturing/doctype/bom/bom.js:326
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:126
-#: stock/dashboard/item_dashboard.js:215
-#: stock/doctype/stock_entry/stock_entry.js:547
+#: stock/dashboard/item_dashboard.js:223
+#: stock/doctype/stock_entry/stock_entry.js:627
 msgid "Source Warehouse"
 msgstr "Ausgangslager"
 
@@ -66239,11 +67363,11 @@
 msgid "Source and Target Location cannot be same"
 msgstr "Quelle und Zielort können nicht identisch sein"
 
-#: stock/doctype/stock_entry/stock_entry.py:640
+#: stock/doctype/stock_entry/stock_entry.py:595
 msgid "Source and target warehouse cannot be same for row {0}"
 msgstr "Ausgangs- und Eingangslager können nicht gleich sein für die Zeile {0}"
 
-#: stock/dashboard/item_dashboard.js:278
+#: stock/dashboard/item_dashboard.js:286
 msgid "Source and target warehouse must be different"
 msgstr "Quell- und Ziel-Warehouse müssen unterschiedlich sein"
 
@@ -66252,8 +67376,8 @@
 msgid "Source of Funds (Liabilities)"
 msgstr "Mittelherkunft (Verbindlichkeiten)"
 
-#: stock/doctype/stock_entry/stock_entry.py:617
-#: stock/doctype/stock_entry/stock_entry.py:634
+#: stock/doctype/stock_entry/stock_entry.py:572
+#: stock/doctype/stock_entry/stock_entry.py:589
 msgid "Source warehouse is mandatory for row {0}"
 msgstr "Ausgangslager ist für Zeile {0} zwingend erforderlich"
 
@@ -66291,16 +67415,26 @@
 msgid "Spacer"
 msgstr "Abstandshalter"
 
-#: assets/doctype/asset/asset.js:467 stock/doctype/batch/batch.js:143
-#: support/doctype/issue/issue.js:100
+#. Description of a DocType
+#: setup/doctype/currency_exchange/currency_exchange.json
+msgid "Specify Exchange Rate to convert one currency into another"
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/shipping_rule/shipping_rule.json
+msgid "Specify conditions to calculate shipping amount"
+msgstr ""
+
+#: assets/doctype/asset/asset.js:540 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:162 support/doctype/issue/issue.js:112
 msgid "Split"
 msgstr "Teilt"
 
-#: assets/doctype/asset/asset.js:111 assets/doctype/asset/asset.js:451
+#: assets/doctype/asset/asset.js:135 assets/doctype/asset/asset.js:524
 msgid "Split Asset"
 msgstr "Vermögensgegenstand aufspalten"
 
-#: stock/doctype/batch/batch.js:142
+#: stock/doctype/batch/batch.js:161
 msgid "Split Batch"
 msgstr "Charge aufteilen"
 
@@ -66317,19 +67451,19 @@
 msgid "Split From"
 msgstr "Abspalten von"
 
-#: support/doctype/issue/issue.js:90
+#: support/doctype/issue/issue.js:100
 msgid "Split Issue"
 msgstr "Split-Problem"
 
-#: assets/doctype/asset/asset.js:457
+#: assets/doctype/asset/asset.js:530
 msgid "Split Qty"
 msgstr "Abgespaltene Menge"
 
-#: assets/doctype/asset/asset.py:1050
+#: assets/doctype/asset/asset.py:1054
 msgid "Split qty cannot be grater than or equal to asset qty"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1827
+#: accounts/doctype/payment_entry/payment_entry.py:1846
 msgid "Splitting {0} {1} into {2} rows as per Payment Terms"
 msgstr ""
 
@@ -66392,11 +67526,26 @@
 msgid "Standard Template"
 msgstr "Standard-Vorlage"
 
+#. Description of a DocType
+#: setup/doctype/terms_and_conditions/terms_and_conditions.json
+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
 msgid "Standard rated supplies in {0}"
 msgstr ""
 
+#. Description of a DocType
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Purchase Transactions. This template can contain a list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\", etc."
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Sales Transactions. This template can contain a list of tax heads and also other expense/income heads like \"Shipping\", \"Insurance\", \"Handling\" etc."
+msgstr ""
+
 #. Label of a Link field in DocType 'Supplier Scorecard Scoring Standing'
 #: buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
 msgctxt "Supplier Scorecard Scoring Standing"
@@ -66409,23 +67558,25 @@
 msgid "Standing Name"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:591
+#: manufacturing/doctype/work_order/work_order.js:630
+#: manufacturing/doctype/workstation/workstation_job_card.html:67
+#: public/js/projects/timer.js:32
 msgid "Start"
 msgstr "Starten"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:44
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:43
 msgid "Start / Resume"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:34
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:34
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:42
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:42
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:16
-#: accounts/report/payment_ledger/payment_ledger.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:68
+#: accounts/report/payment_ledger/payment_ledger.js:16
+#: assets/report/fixed_asset_register/fixed_asset_register.js:67
 #: projects/report/project_summary/project_summary.py:70
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
-#: public/js/financial_statements.js:184
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:17
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:47
+#: public/js/financial_statements.js:193
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:16
 msgid "Start Date"
 msgstr "Startdatum"
 
@@ -66499,11 +67650,16 @@
 msgid "Start Date cannot be before the current date"
 msgstr "Startdatum darf nicht vor dem aktuellen Datum liegen"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:133
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
+msgid "Start Deletion"
+msgstr ""
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 msgid "Start Import"
 msgstr "Starten Sie den Import"
 
-#: manufacturing/doctype/job_card/job_card.js:244
+#: manufacturing/doctype/job_card/job_card.js:269
+#: manufacturing/doctype/workstation/workstation.js:190
 msgid "Start Job"
 msgstr ""
 
@@ -66511,10 +67667,14 @@
 msgid "Start Merge"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:85
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:95
 msgid "Start Reposting"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation.js:159
+msgid "Start Time"
+msgstr "Startzeit"
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -66543,11 +67703,11 @@
 msgid "Start Time can't be greater than or equal to End Time for {0}."
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:48
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:48
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:56
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
 #: accounts/report/financial_ratios/financial_ratios.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:82
-#: public/js/financial_statements.js:198
+#: assets/report/fixed_asset_register/fixed_asset_register.js:81
+#: public/js/financial_statements.js:207
 msgid "Start Year"
 msgstr "Startjahr"
 
@@ -66581,7 +67741,7 @@
 msgid "Started Time"
 msgstr "Startzeit"
 
-#: utilities/bulk_transaction.py:19
+#: utilities/bulk_transaction.py:22
 msgid "Started a background job to create {1} {0}"
 msgstr ""
 
@@ -66598,7 +67758,7 @@
 msgstr "Ausgangsposition von der Oberkante"
 
 #: crm/report/lead_details/lead_details.py:59
-#: public/js/utils/contact_address_quick_entry.js:81
+#: public/js/utils/contact_address_quick_entry.js:84
 msgid "State"
 msgstr "Zustand"
 
@@ -66626,68 +67786,76 @@
 msgid "Statement Import Log"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:17
+#: accounts/report/general_ledger/general_ledger.html:1
+msgid "Statement of Account"
+msgstr ""
+
+#: 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
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order.js:298
-#: buying/doctype/purchase_order/purchase_order.js:300
-#: buying/doctype/purchase_order/purchase_order.js:304
+#: buying/doctype/purchase_order/purchase_order.js:317
+#: buying/doctype/purchase_order/purchase_order.js:323
+#: buying/doctype/purchase_order/purchase_order.js:329
+#: buying/doctype/purchase_order/purchase_order.js:335
+#: buying/doctype/purchase_order/purchase_order.js:337
+#: 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:53
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:52
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:173
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:134
-#: crm/report/lead_details/lead_details.js:31
+#: crm/report/lead_details/lead_details.js:30
 #: crm/report/lead_details/lead_details.py:25
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:34
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:39
-#: manufacturing/doctype/production_plan/production_plan.js:99
-#: manufacturing/doctype/production_plan/production_plan.js:103
-#: manufacturing/doctype/production_plan/production_plan.js:431
-#: manufacturing/doctype/work_order/work_order.js:352
-#: manufacturing/doctype/work_order/work_order.js:389
-#: manufacturing/doctype/work_order/work_order.js:565
-#: manufacturing/doctype/work_order/work_order.js:572
-#: manufacturing/doctype/work_order/work_order.js:576
-#: manufacturing/report/job_card_summary/job_card_summary.js:51
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:32
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:38
+#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:115
+#: manufacturing/doctype/production_plan/production_plan.js:466
+#: manufacturing/doctype/work_order/work_order.js:371
+#: manufacturing/doctype/work_order/work_order.js:407
+#: manufacturing/doctype/work_order/work_order.js:595
+#: manufacturing/doctype/work_order/work_order.js:606
+#: manufacturing/doctype/work_order/work_order.js:614
+#: 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/production_analytics/production_analytics.py:19
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:22
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:21
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:80
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:50
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:49
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:111
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:138
-#: manufacturing/report/work_order_summary/work_order_summary.js:37
+#: manufacturing/report/work_order_summary/work_order_summary.js:36
 #: manufacturing/report/work_order_summary/work_order_summary.py:202
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:35
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:25
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:24
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:92
-#: projects/report/project_summary/project_summary.js:24
+#: projects/report/project_summary/project_summary.js:23
 #: projects/report/project_summary/project_summary.py:58
-#: selling/doctype/sales_order/sales_order.js:517
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:528
-#: selling/doctype/sales_order/sales_order.js:539
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:90
+#: public/js/plant_floor_visual/visual_plant.js:111
+#: selling/doctype/sales_order/sales_order.js:553
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:567
+#: selling/doctype/sales_order/sales_order.js:584
+#: selling/doctype/sales_order/sales_order.js:590
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:88
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:68
-#: selling/report/sales_order_analysis/sales_order_analysis.js:55
+#: selling/report/sales_order_analysis/sales_order_analysis.js:54
 #: selling/report/sales_order_analysis/sales_order_analysis.py:228
-#: stock/doctype/delivery_note/delivery_note.js:210
-#: stock/doctype/delivery_note/delivery_note.js:229
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: stock/report/reserved_stock/reserved_stock.js:127
+#: stock/doctype/delivery_note/delivery_note.js:252
+#: stock/doctype/delivery_note/delivery_note.js:281
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: stock/report/reserved_stock/reserved_stock.js:124
 #: stock/report/reserved_stock/reserved_stock.py:178
 #: stock/report/serial_no_ledger/serial_no_ledger.py:51
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/report/issue_analytics/issue_analytics.js:52
-#: support/report/issue_summary/issue_summary.js:39
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:114
+#: support/report/issue_analytics/issue_analytics.js:51
+#: support/report/issue_summary/issue_summary.js:38
 #: templates/pages/projects.html:24 templates/pages/projects.html:46
-#: templates/pages/projects.html:66
+#: templates/pages/projects.html:66 templates/pages/task_info.html:69
+#: templates/pages/timelog_info.html:40
 msgid "Status"
 msgstr "Status"
 
@@ -67155,12 +68323,24 @@
 msgid "Status"
 msgstr "Status"
 
+#. Label of a Select field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status"
+msgstr "Status"
+
 #. Label of a Section Break field in DocType 'Service Level Agreement'
 #: support/doctype/service_level_agreement/service_level_agreement.json
 msgctxt "Service Level Agreement"
 msgid "Status Details"
 msgstr ""
 
+#. Label of a Section Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status Illustration"
+msgstr ""
+
 #: projects/doctype/project/project.py:719
 msgid "Status must be Cancelled or Completed"
 msgstr "Der Status muss abgebrochen oder abgeschlossen sein"
@@ -67182,7 +68362,7 @@
 #. Label of a Card Break in the Home Workspace
 #. Name of a Workspace
 #: accounts/doctype/item_tax_template/item_tax_template_dashboard.py:11
-#: accounts/report/account_balance/account_balance.js:55
+#: accounts/report/account_balance/account_balance.js:57
 #: manufacturing/doctype/bom/bom_dashboard.py:14 setup/workspace/home/home.json
 #: stock/doctype/material_request/material_request_dashboard.py:17
 #: stock/workspace/stock/stock.json
@@ -67209,8 +68389,8 @@
 
 #: 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:1187
-#: accounts/report/account_balance/account_balance.js:56
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1239
+#: accounts/report/account_balance/account_balance.js:58
 msgid "Stock Adjustment"
 msgstr "Bestandskorrektur"
 
@@ -67234,7 +68414,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: public/js/stock_analytics.js:8
+#: public/js/stock_analytics.js:7
 #: stock/report/stock_analytics/stock_analytics.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Analytics"
@@ -67252,7 +68432,7 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:52
+#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:49
 #: stock/report/stock_balance/stock_balance.json
 #: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py:107
 #: stock/workspace/stock/stock.json
@@ -67265,10 +68445,14 @@
 msgid "Stock Balance"
 msgstr "Lagerbestand"
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:16
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:15
 msgid "Stock Balance Report"
 msgstr "Bestandsbilanzbericht"
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:10
+msgid "Stock Capacity"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Stock Settings'
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
@@ -67299,12 +68483,12 @@
 msgid "Stock Details"
 msgstr "Lagerdetails"
 
-#: stock/doctype/stock_entry/stock_entry.py:730
+#: stock/doctype/stock_entry/stock_entry.py:685
 msgid "Stock Entries already created for Work Order {0}: {1}"
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/pick_list/pick_list.js:104
+#: stock/doctype/pick_list/pick_list.js:116
 #: stock/doctype/stock_entry/stock_entry.json
 msgid "Stock Entry"
 msgstr "Lagerbuchung"
@@ -67365,15 +68549,15 @@
 msgid "Stock Entry Type"
 msgstr "Art der Lagerbuchung"
 
-#: stock/doctype/pick_list/pick_list.py:1020
+#: stock/doctype/pick_list/pick_list.py:1140
 msgid "Stock Entry has been already created against this Pick List"
 msgstr "Für diese Pickliste wurde bereits eine Lagerbewegung erstellt"
 
-#: stock/doctype/batch/batch.js:104
+#: stock/doctype/batch/batch.js:115
 msgid "Stock Entry {0} created"
 msgstr "Lagerbuchung {0} erstellt"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1140
+#: accounts/doctype/journal_entry/journal_entry.py:1167
 msgid "Stock Entry {0} is not submitted"
 msgstr "Lagerbewegung {0} ist nicht gebucht"
 
@@ -67408,14 +68592,18 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: public/js/controllers/stock_controller.js:54
-#: public/js/utils/ledger_preview.js:27 stock/doctype/item/item.js:64
+#: public/js/controllers/stock_controller.js:66
+#: public/js/utils/ledger_preview.js:37 stock/doctype/item/item.js:68
 #: stock/doctype/item/item_dashboard.py:8
 #: stock/report/stock_ledger/stock_ledger.json stock/workspace/stock/stock.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:32
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:33
 msgid "Stock Ledger"
 msgstr "Lagerbuch"
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts"
+msgstr ""
+
 #. 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
@@ -67444,7 +68632,7 @@
 msgid "Stock Ledger report contains every submitted stock transaction. You can use filter to narrow down ledger entries."
 msgstr "Der Lagerbuchbericht enthält alle gebuchten Lagertransaktionen. Sie können Filter verwenden, um die angezeigten Einträge einzugrenzen."
 
-#: stock/doctype/batch/batch.js:50 stock/doctype/item/item.js:403
+#: stock/doctype/batch/batch.js:58 stock/doctype/item/item.js:467
 msgid "Stock Levels"
 msgstr "Lagerbestände"
 
@@ -67483,6 +68671,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_reconciliation/stock_reconciliation.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
@@ -67501,7 +68690,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: stock/doctype/item/item.js:70
+#: stock/doctype/item/item.js:78
 #: stock/report/stock_projected_qty/stock_projected_qty.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Projected Qty"
@@ -67550,7 +68739,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:90
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:123
-#: accounts/report/account_balance/account_balance.js:57
+#: accounts/report/account_balance/account_balance.js:59
 msgid "Stock Received But Not Billed"
 msgstr "Empfangener, aber nicht berechneter Lagerbestand"
 
@@ -67601,20 +68790,20 @@
 msgid "Stock Reposting Settings"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: selling/doctype/sales_order/sales_order.js:74
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:178
-#: stock/doctype/pick_list/pick_list.js:110
-#: stock/doctype/pick_list/pick_list.js:119
-#: stock/doctype/pick_list/pick_list.js:120
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:467
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:965
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:978
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:992
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1006
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1020
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1037
+#: selling/doctype/sales_order/sales_order.js:82
+#: selling/doctype/sales_order/sales_order.js:92
+#: selling/doctype/sales_order/sales_order.js:101
+#: selling/doctype/sales_order/sales_order.js:201
+#: 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_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
 msgid "Stock Reservation"
 msgstr ""
 
@@ -67624,18 +68813,18 @@
 msgid "Stock Reservation"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1144
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1146
 msgid "Stock Reservation Entries Cancelled"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1096
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1098
 msgid "Stock Reservation Entries Created"
 msgstr ""
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:383
+#: selling/doctype/sales_order/sales_order.js:413
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: stock/report/reserved_stock/reserved_stock.js:56
+#: stock/report/reserved_stock/reserved_stock.js:53
 #: stock/report/reserved_stock/reserved_stock.py:171
 msgid "Stock Reservation Entry"
 msgstr ""
@@ -67648,7 +68837,7 @@
 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:614
+#: stock/doctype/delivery_note/delivery_note.py:675
 msgid "Stock Reservation Warehouse Mismatch"
 msgstr ""
 
@@ -67668,7 +68857,7 @@
 msgid "Stock Reserved Qty (in Stock UOM)"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1498
+#: stock/doctype/stock_entry/stock_entry.py:1507
 msgid "Stock Return"
 msgstr ""
 
@@ -67696,6 +68885,13 @@
 msgid "Stock Summary"
 msgstr "Lager-Zusammenfassung"
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Stock Summary"
+msgstr "Lager-Zusammenfassung"
+
 #. Label of a Card Break in the Stock Workspace
 #: stock/workspace/stock/stock.json
 msgid "Stock Transactions"
@@ -67713,8 +68909,8 @@
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:232
 #: 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:398
-#: stock/report/stock_ledger/stock_ledger.py:117
+#: stock/report/stock_balance/stock_balance.py:406
+#: stock/report/stock_ledger/stock_ledger.py:190
 msgid "Stock UOM"
 msgstr "Lagermaßeinheit"
 
@@ -67890,9 +69086,9 @@
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
 msgid "Stock UOM Quantity"
-msgstr ""
+msgstr "Lager-ME Menge"
 
-#: selling/doctype/sales_order/sales_order.js:368
+#: selling/doctype/sales_order/sales_order.js:398
 msgid "Stock Unreservation"
 msgstr ""
 
@@ -67959,6 +69155,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -67997,29 +69194,33 @@
 
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:125
 msgid "Stock cannot be reserved in group warehouse {0}."
-msgstr ""
+msgstr "In der Lager-Gruppe {0} kann kein Bestand reserviert werden."
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:908
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:910
 msgid "Stock cannot be reserved in the group warehouse {0}."
-msgstr ""
+msgstr "In der Lager-Gruppe {0} kann kein Bestand reserviert werden."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1011
-msgid "Stock cannot be updated against Delivery Note {0}"
-msgstr "Lager kann nicht mit Lieferschein {0} aktualisiert werden"
-
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:673
 msgid "Stock cannot be updated against Purchase Receipt {0}"
 msgstr "Bestand kann nicht gegen Eingangsbeleg {0} aktualisiert werden"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:229
-msgid "Stock not available for Item {0} in Warehouse {1}."
+#: accounts/doctype/sales_invoice/sales_invoice.py:1032
+msgid "Stock cannot be updated against the following Delivery Notes: {0}"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:679
+#: accounts/doctype/sales_invoice/sales_invoice.py:1055
+msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
+msgstr ""
+
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:229
+msgid "Stock not available for Item {0} in Warehouse {1}."
+msgstr "Der Artikel {0} ist in Lager {1} nicht vorrätig."
+
+#: selling/page/point_of_sale/pos_controller.js:714
 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:241
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:252
 msgid "Stock transactions before {0} are frozen"
 msgstr "Lagertransaktionen vor {0} werden gesperrt"
 
@@ -68028,7 +69229,7 @@
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
 msgid "Stock transactions that are older than the mentioned days cannot be modified."
-msgstr ""
+msgstr "Lagerbewegungen, die älter als die genannten Tage sind, können nicht geändert werden."
 
 #. Description of the 'Auto Reserve Stock for Sales Order on Purchase' (Check)
 #. field in DocType 'Stock Settings'
@@ -68037,12 +69238,12 @@
 msgid "Stock will be reserved on submission of <b>Purchase Receipt</b> created against Material Receipt for Sales Order."
 msgstr ""
 
-#: stock/utils.py:579
+#: stock/utils.py:574
 msgid "Stock/Accounts can not be frozen as processing of backdated entries is going on. Please try again later."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:570
-#: stock/doctype/material_request/material_request.js:107
+#: manufacturing/doctype/work_order/work_order.js:602
+#: stock/doctype/material_request/material_request.js:109
 msgid "Stop"
 msgstr "Anhalten"
 
@@ -68118,11 +69319,11 @@
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: manufacturing/doctype/work_order/work_order.py:631
+#: manufacturing/doctype/work_order/work_order.py:645
 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
 msgstr "Der angehaltene Arbeitsauftrag kann nicht abgebrochen werden. Stoppen Sie ihn zuerst, um ihn abzubrechen"
 
-#: setup/doctype/company/company.py:260
+#: 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
@@ -68157,11 +69358,16 @@
 #: manufacturing/doctype/bom_creator/bom_creator.json
 msgctxt "BOM Creator"
 msgid "Sub Assemblies & Raw Materials"
+msgstr "Unterbaugruppen & Rohmaterialien"
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:129
+#: public/js/bom_configurator/bom_configurator.bundle.js:159
+msgid "Sub Assembly"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:264
+#: public/js/bom_configurator/bom_configurator.bundle.js:271
 msgid "Sub Assembly Item"
-msgstr ""
+msgstr "Artikel der Unterbaugruppe"
 
 #. Label of a Link field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -68231,7 +69437,7 @@
 msgid "Subcontract BOM"
 msgstr "Stückliste für Unterauftragnehmer"
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:37
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:36
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:128
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:22
 #: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:22
@@ -68243,7 +69449,7 @@
 msgid "Subcontract Order Summary"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:68
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
 msgid "Subcontract Return"
 msgstr ""
 
@@ -68279,10 +69485,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: controllers/subcontracting_controller.py:806
+#: buying/doctype/purchase_order/purchase_order.js:369
+#: controllers/subcontracting_controller.py:810
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:78
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:95
 msgid "Subcontracting Order"
 msgstr ""
 
@@ -68332,7 +69538,7 @@
 msgid "Subcontracting Order Supplied Item"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:861
+#: buying/doctype/purchase_order/purchase_order.py:864
 msgid "Subcontracting Order {0} created."
 msgstr ""
 
@@ -68343,7 +69549,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:200
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Subcontracting Receipt"
 msgstr "Unterauftragsbeleg"
@@ -68387,7 +69593,7 @@
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
 msgid "Subcontracting Settings"
-msgstr ""
+msgstr "Untervergabe-Einstellungen"
 
 #. Label of a Autocomplete field in DocType 'Holiday List'
 #: setup/doctype/holiday_list/holiday_list.json
@@ -68395,10 +69601,10 @@
 msgid "Subdivision"
 msgstr "Teilgebiet"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:219
-#: projects/doctype/task/task_tree.js:62
+#: buying/doctype/request_for_quotation/request_for_quotation.js:237
+#: projects/doctype/task/task_tree.js:65
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:91
-#: support/doctype/issue/issue.js:96
+#: support/doctype/issue/issue.js:106 templates/pages/task_info.html:44
 msgid "Subject"
 msgstr "Betreff"
 
@@ -68450,15 +69656,16 @@
 msgid "Subject"
 msgstr "Betreff"
 
-#: accounts/doctype/payment_order/payment_order.js:120
-#: public/js/payment/payments.js:28
-#: selling/page/point_of_sale/pos_controller.js:101
-#: www/book_appointment/index.html:59
+#: accounts/doctype/payment_order/payment_order.js:137
+#: manufacturing/doctype/workstation/workstation.js:237
+#: public/js/payment/payments.js:30
+#: selling/page/point_of_sale/pos_controller.js:119
+#: templates/pages/task_info.html:101 www/book_appointment/index.html:59
 msgid "Submit"
 msgstr "Buchen"
 
-#: buying/doctype/purchase_order/purchase_order.py:857
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:698
+#: buying/doctype/purchase_order/purchase_order.py:860
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:699
 msgid "Submit Action Failed"
 msgstr "Aktion Buchen fehlgeschlagen"
 
@@ -68486,14 +69693,18 @@
 msgid "Submit Journal Entries"
 msgstr "Journaleinträge buchen"
 
-#: manufacturing/doctype/work_order/work_order.js:135
+#: manufacturing/doctype/work_order/work_order.js:139
 msgid "Submit this Work Order for further processing."
 msgstr "Buchen Sie diesen Arbeitsauftrag zur weiteren Bearbeitung."
 
-#: assets/doctype/asset/asset_list.js:32
+#: buying/doctype/request_for_quotation/request_for_quotation.py:265
+msgid "Submit your Quotation"
+msgstr ""
+
+#: assets/doctype/asset/asset_list.js:23
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:15
-#: stock/doctype/stock_entry/stock_entry_list.js:21
-#: templates/pages/material_request_info.html:24 templates/pages/order.html:58
+#: stock/doctype/stock_entry/stock_entry_list.js:27
+#: templates/pages/material_request_info.html:24 templates/pages/order.html:70
 msgid "Submitted"
 msgstr "Gebucht"
 
@@ -68757,11 +69968,11 @@
 msgid "Succeeded"
 msgstr "Erfolgreich"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:6
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:7
 msgid "Succeeded Entries"
-msgstr ""
+msgstr "Erfolgreiche Einträge"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Success"
 msgstr "Erfolg"
 
@@ -68796,69 +70007,69 @@
 msgid "Successful"
 msgstr "Erfolgreich"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:538
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:543
 msgid "Successfully Reconciled"
 msgstr "Erfolgreich abgestimmt"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:164
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:171
 msgid "Successfully Set Supplier"
 msgstr "Setzen Sie den Lieferanten erfolgreich"
 
 #: stock/doctype/item/item.py:339
 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM."
-msgstr ""
+msgstr "Lager-ME erfolgreich geändert. Bitte passen Sie nun die Umrechnungsfaktoren an."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:468
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:430
 msgid "Successfully imported {0}"
 msgstr "Erfolgreich importiert {0}"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:182
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:161
 msgid "Successfully imported {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
-msgstr ""
+msgstr "{0} von {1} Datensätzen erfolgreich importiert. Klicken Sie auf „Fehlerhafte Zeilen exportieren“, beheben Sie die Fehler und importieren Sie erneut."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:166
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:145
 msgid "Successfully imported {0} record."
-msgstr ""
+msgstr "{0} Datensatz erfolgreich importiert."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:178
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:157
 msgid "Successfully imported {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
-msgstr ""
+msgstr "{0} von {1} Datensätzen erfolgreich importiert. Klicken Sie auf „Fehlerhafte Zeilen exportieren“, beheben Sie die Fehler und importieren Sie erneut."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:165
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:144
 msgid "Successfully imported {0} records."
-msgstr ""
+msgstr "{0} Datensätze erfolgreich importiert."
 
-#: buying/doctype/supplier/supplier.js:177
+#: buying/doctype/supplier/supplier.js:210
 msgid "Successfully linked to Customer"
-msgstr ""
+msgstr "Erfolgreich mit dem Kunden verknüpft"
 
-#: selling/doctype/customer/customer.js:222
+#: selling/doctype/customer/customer.js:243
 msgid "Successfully linked to Supplier"
-msgstr ""
+msgstr "Erfolgreich mit dem Lieferanten verknüpft"
 
 #: accounts/doctype/ledger_merge/ledger_merge.js:99
 msgid "Successfully merged {0} out of {1}."
-msgstr ""
+msgstr "{0} von {1} erfolgreich zusammengeführt."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:478
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:438
 msgid "Successfully updated {0}"
 msgstr "Erfolgreich aktualisiert {0}"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:193
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:172
 msgid "Successfully updated {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
-msgstr ""
+msgstr "{0} von {1} Datensätzen erfolgreich aktualisiert. Klicken Sie auf „Fehlerhafte Zeilen exportieren“, beheben Sie die Fehler und importieren Sie erneut."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:171
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:150
 msgid "Successfully updated {0} record."
-msgstr ""
+msgstr "{0} Datensatz erfolgreich aktualisiert."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:189
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:168
 msgid "Successfully updated {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
-msgstr ""
+msgstr "{0} von {1} Datensätzen erfolgreich aktualisiert. Klicken Sie auf „Fehlerhafte Zeilen exportieren“, beheben Sie die Fehler und importieren Sie erneut."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:170
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:149
 msgid "Successfully updated {0} records."
-msgstr ""
+msgstr "{0} Datensätze erfolgreich aktualisiert."
 
 #. Option for the 'Request Type' (Select) field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
@@ -68986,30 +70197,30 @@
 
 #. Name of a DocType
 #. Label of a Card Break in the Buying Workspace
-#: accounts/doctype/payment_order/payment_order.js:100
+#: accounts/doctype/payment_order/payment_order.js:110
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:61
 #: 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/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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:38
-#: buying/doctype/request_for_quotation/request_for_quotation.js:156
-#: buying/doctype/request_for_quotation/request_for_quotation.js:208
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:167
+#: 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/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:16
+#: 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:16
+#: 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/workspace/buying/buying.json public/js/purchase_trends_filters.js:50
-#: public/js/purchase_trends_filters.js:66
+#: public/js/purchase_trends_filters.js:63
 #: regional/report/irs_1099/irs_1099.py:79
-#: selling/doctype/customer/customer.js:207
-#: selling/doctype/sales_order/sales_order.js:1005
+#: 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
 msgid "Supplier"
 msgstr "Lieferant"
@@ -69315,15 +70526,15 @@
 msgstr "Lieferantendetails"
 
 #. Name of a DocType
-#: accounts/report/accounts_payable/accounts_payable.js:122
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:105
-#: accounts/report/accounts_receivable/accounts_receivable.py:1110
+#: 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/purchase_register/purchase_register.js:27
 #: accounts/report/purchase_register/purchase_register.py:186
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:56
-#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: 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
@@ -69397,15 +70608,15 @@
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Supplier Info"
-msgstr ""
+msgstr "Lieferanteninfo"
 
 #. Label of a Section Break field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Lieferantenrechnung"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:216
 msgid "Supplier Invoice Date"
 msgstr "Lieferantenrechnungsdatum"
 
@@ -69415,13 +70626,14 @@
 msgid "Supplier Invoice Date"
 msgstr "Lieferantenrechnungsdatum"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1550
 msgid "Supplier Invoice Date cannot be greater than Posting Date"
 msgstr "Lieferant Rechnungsdatum kann nicht größer sein als Datum der Veröffentlichung"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
-#: accounts/report/general_ledger/general_ledger.py:656
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: 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
 msgid "Supplier Invoice No"
 msgstr "Lieferantenrechnungsnr."
 
@@ -69437,14 +70649,14 @@
 msgid "Supplier Invoice No"
 msgstr "Lieferantenrechnungsnr."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1575
 msgid "Supplier Invoice No exists in Purchase Invoice {0}"
 msgstr "Die Rechnungsnummer des Lieferanten wurde bereits in Eingangsrechnung {0} verwendet"
 
 #. Name of a DocType
 #: accounts/doctype/supplier_item/supplier_item.json
 msgid "Supplier Item"
-msgstr ""
+msgstr "Lieferantenartikel"
 
 #. Label of a Table field in DocType 'Item'
 #: stock/doctype/item/item.json
@@ -69467,12 +70679,12 @@
 msgid "Supplier Ledger Summary"
 msgstr "Lieferanten-Ledger-Zusammenfassung"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1041
+#: accounts/report/accounts_receivable/accounts_receivable.py:1049
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
 #: 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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:74
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:73
 msgid "Supplier Name"
 msgstr "Lieferantenname"
 
@@ -69602,14 +70814,14 @@
 msgstr "Hauptkontakt des Lieferanten"
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:458
-#: buying/doctype/request_for_quotation/request_for_quotation.js:42
+#: buying/doctype/purchase_order/purchase_order.js:529
+#: 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
-#: crm/doctype/opportunity/opportunity.js:82
-#: stock/doctype/material_request/material_request.js:147
+#: crm/doctype/opportunity/opportunity.js:81
+#: stock/doctype/material_request/material_request.js:170
 msgid "Supplier Quotation"
 msgstr "Lieferantenangebot"
 
@@ -69661,7 +70873,7 @@
 msgid "Supplier Quotation Item"
 msgstr "Lieferantenangebotsposition"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:409
+#: buying/doctype/request_for_quotation/request_for_quotation.py:433
 msgid "Supplier Quotation {0} Created"
 msgstr "Lieferantenangebot {0} Erstellt"
 
@@ -69789,6 +71001,11 @@
 msgid "Supplier delivers to Customer"
 msgstr "Lieferant liefert an Kunden"
 
+#. Description of a DocType
+#: buying/doctype/supplier/supplier.json
+msgid "Supplier of Goods or Services."
+msgstr ""
+
 #: buying/doctype/supplier_quotation/supplier_quotation.py:167
 msgid "Supplier {0} not found in {1}"
 msgstr "Lieferant {0} nicht in {1} gefunden"
@@ -69879,9 +71096,9 @@
 msgid "Suspended"
 msgstr "Suspendiert"
 
-#: selling/page/point_of_sale/pos_payment.js:308
+#: selling/page/point_of_sale/pos_payment.js:325
 msgid "Switch Between Payment Modes"
-msgstr "Zwischen Zahlungsmodi wechseln"
+msgstr "Zwischen Zahlungsweisen wechseln"
 
 #: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:23
 msgid "Sync Now"
@@ -69975,6 +71192,7 @@
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 #: manufacturing/doctype/job_card/job_card.json
+#: manufacturing/doctype/plant_floor/plant_floor.json
 #: projects/doctype/activity_type/activity_type.json
 #: projects/doctype/project_template/project_template.json
 #: projects/doctype/project_type/project_type.json
@@ -70062,7 +71280,7 @@
 msgid "System will fetch all the entries if limit value is zero."
 msgstr "Das System ruft alle Einträge ab, wenn der Grenzwert Null ist."
 
-#: controllers/accounts_controller.py:1673
+#: controllers/accounts_controller.py:1762
 msgid "System will not check over billing since amount for Item {0} in {1} is zero"
 msgstr ""
 
@@ -70073,11 +71291,19 @@
 msgid "System will notify to increase or decrease quantity or amount "
 msgstr "Das System benachrichtigt Sie, um die Menge oder Menge zu erhöhen oder zu verringern"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TCS Amount"
+msgstr ""
+
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TCS Rate %"
 msgstr ""
 
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TDS Amount"
+msgstr ""
+
 #. Name of a report
 #: accounts/report/tds_computation_summary/tds_computation_summary.json
 msgid "TDS Computation Summary"
@@ -70087,7 +71313,7 @@
 msgid "TDS Payable"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TDS Rate %"
 msgstr ""
@@ -70098,7 +71324,12 @@
 msgid "TS-.YYYY.-"
 msgstr "TS-.YYYY.-"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:427
+#. Description of a DocType
+#: stock/doctype/item_website_specification/item_website_specification.json
+msgid "Table for Item that will be shown in Web Site"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:466
 msgid "Tag"
 msgstr "Schlagwort"
 
@@ -70121,7 +71352,7 @@
 #: erpnext_integrations/doctype/tally_migration/tally_migration.json
 msgctxt "Tally Migration"
 msgid "Tally Company"
-msgstr ""
+msgstr "Tally Unternehmen"
 
 #. Label of a Data field in DocType 'Tally Migration'
 #: erpnext_integrations/doctype/tally_migration/tally_migration.json
@@ -70133,17 +71364,21 @@
 #: erpnext_integrations/doctype/tally_migration/tally_migration.json
 msgctxt "Tally Migration"
 msgid "Tally Debtors Account"
-msgstr ""
+msgstr "Tally-Debitorenkonto"
 
 #. Name of a DocType
 #: erpnext_integrations/doctype/tally_migration/tally_migration.json
 msgid "Tally Migration"
-msgstr ""
+msgstr "Tally-Migration"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:32
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:34
 msgid "Tally Migration Error"
 msgstr "Tally Migrationsfehler"
 
+#: templates/form_grid/stock_entry_grid.html:36
+msgid "Target"
+msgstr "Ziel"
+
 #. Label of a Data field in DocType 'Quality Goal Objective'
 #: quality_management/doctype/quality_goal_objective/quality_goal_objective.json
 msgctxt "Quality Goal Objective"
@@ -70178,23 +71413,23 @@
 msgid "Target Asset Location"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:248
+#: assets/doctype/asset_capitalization/asset_capitalization.py:254
 msgid "Target Asset {0} cannot be cancelled"
 msgstr "Ziel-Vermögensgegenstand {0} kann nicht storniert werden"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:246
+#: assets/doctype/asset_capitalization/asset_capitalization.py:252
 msgid "Target Asset {0} cannot be submitted"
 msgstr "Ziel-Vermögensgegenstand {0} kann nicht gebucht werden"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:242
+#: assets/doctype/asset_capitalization/asset_capitalization.py:248
 msgid "Target Asset {0} cannot be {1}"
 msgstr "Ziel-Vermögensgegenstand {0} kann nicht {1} sein"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:252
+#: assets/doctype/asset_capitalization/asset_capitalization.py:258
 msgid "Target Asset {0} does not belong to company {1}"
 msgstr "Ziel-Vermögensgegenstand {0} gehört nicht zum Unternehmen {1}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:233
+#: assets/doctype/asset_capitalization/asset_capitalization.py:239
 msgid "Target Asset {0} needs to be composite asset"
 msgstr "Ziel-Vermögensgegenstand {0} muss ein zusammengesetzter Vermögensgegenstand sein"
 
@@ -70274,15 +71509,15 @@
 msgid "Target Item Name"
 msgstr "Ziel Artikelname"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:203
+#: assets/doctype/asset_capitalization/asset_capitalization.py:209
 msgid "Target Item {0} is neither a Fixed Asset nor a Stock Item"
 msgstr "Der Zielartikel {0} ist weder ein Vermögensgegenstand noch ein Lagerartikel"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:207
+#: assets/doctype/asset_capitalization/asset_capitalization.py:213
 msgid "Target Item {0} must be a Fixed Asset item"
 msgstr "Zielartikel {0} muss ein Vermögensgegenstand sein"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:209
+#: assets/doctype/asset_capitalization/asset_capitalization.py:215
 msgid "Target Item {0} must be a Stock Item"
 msgstr "Zielartikel {0} muss ein Lagerartikel sein"
 
@@ -70304,9 +71539,9 @@
 msgid "Target Location or To Employee is required while receiving Asset {0}"
 msgstr "Zielstandort oder An Mitarbeiter ist erforderlich, wenn das Asset {0} empfangen wird."
 
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:42
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:42
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:42
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:41
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:41
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:41
 msgid "Target On"
 msgstr "Ziel auf"
 
@@ -70322,7 +71557,7 @@
 msgid "Target Qty"
 msgstr "Zielmenge"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:214
+#: assets/doctype/asset_capitalization/asset_capitalization.py:220
 msgid "Target Qty must be a positive number"
 msgstr "Zielmenge muss eine positive Zahl sein"
 
@@ -70332,8 +71567,8 @@
 msgid "Target Serial No"
 msgstr "Ziel Seriennummer"
 
-#: stock/dashboard/item_dashboard.js:222
-#: stock/doctype/stock_entry/stock_entry.js:549
+#: stock/dashboard/item_dashboard.js:230
+#: stock/doctype/stock_entry/stock_entry.js:633
 msgid "Target Warehouse"
 msgstr "Eingangslager"
 
@@ -70392,16 +71627,16 @@
 msgid "Target Warehouse Address"
 msgstr "Ziellageradresse"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:224
+#: assets/doctype/asset_capitalization/asset_capitalization.py:230
 msgid "Target Warehouse is mandatory for Decapitalization"
 msgstr ""
 
-#: controllers/selling_controller.py:685
+#: controllers/selling_controller.py:709
 msgid "Target Warehouse is set for some items but the customer is not an internal customer."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:623
-#: stock/doctype/stock_entry/stock_entry.py:630
+#: stock/doctype/stock_entry/stock_entry.py:578
+#: stock/doctype/stock_entry/stock_entry.py:585
 msgid "Target warehouse is mandatory for row {0}"
 msgstr "Eingangslager ist für Zeile {0} zwingend erforderlich"
 
@@ -70433,8 +71668,8 @@
 #: projects/doctype/task/task.json projects/doctype/task/task_tree.js:17
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:33
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:90
-#: public/js/projects/timer.js:11 support/doctype/issue/issue.js:22
-#: templates/pages/projects.html:56
+#: public/js/projects/timer.js:15 support/doctype/issue/issue.js:27
+#: templates/pages/projects.html:56 templates/pages/timelog_info.html:28
 msgid "Task"
 msgstr "Vorgang"
 
@@ -70542,6 +71777,12 @@
 msgid "Tasks"
 msgstr "Aufgaben"
 
+#. Label of a Section Break field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Tasks"
+msgstr "Aufgaben"
+
 #: projects/report/project_summary/project_summary.py:62
 msgid "Tasks Completed"
 msgstr "Aufgaben erledigt"
@@ -70550,7 +71791,7 @@
 msgid "Tasks Overdue"
 msgstr "Überfällige Aufgaben"
 
-#: accounts/report/account_balance/account_balance.js:58
+#: accounts/report/account_balance/account_balance.js:60
 msgid "Tax"
 msgstr "Steuer"
 
@@ -70590,10 +71831,9 @@
 msgid "Tax Account"
 msgstr "Steuerkonto"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:247
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:137
 msgid "Tax Amount"
-msgstr ""
+msgstr "Steuerbetrag"
 
 #. Label of a Currency field in DocType 'Purchase Taxes and Charges'
 #: accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
@@ -70813,11 +72053,11 @@
 msgid "Tax ID"
 msgstr "Steuernummer"
 
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:86
+#: 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/supplier_ledger_summary/supplier_ledger_summary.js:68
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:67
 msgid "Tax Id"
 msgstr "Steuernummer"
 
@@ -70852,6 +72092,8 @@
 msgstr "Steuernummer"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:32
+#: accounts/report/accounts_receivable/accounts_receivable.html:19
+#: accounts/report/general_ledger/general_ledger.html:14
 msgid "Tax Id: "
 msgstr "Steuernummer / UstIdNr: "
 
@@ -70860,7 +72102,7 @@
 msgid "Tax Masters"
 msgstr "Steuer-Stammdaten"
 
-#: accounts/doctype/account/account_tree.js:119
+#: accounts/doctype/account/account_tree.js:160
 msgid "Tax Rate"
 msgstr "Steuersatz"
 
@@ -71074,7 +72316,7 @@
 msgid "Tax will be withheld only for amount exceeding the cumulative threshold"
 msgstr ""
 
-#: controllers/taxes_and_totals.py:1018
+#: controllers/taxes_and_totals.py:1019
 msgid "Taxable Amount"
 msgstr "Steuerpflichtiger Betrag"
 
@@ -71229,55 +72471,55 @@
 msgid "Taxes and Charges Added (Company Currency)"
 msgstr "Steuern und Gebühren hinzugerechnet (Unternehmenswährung)"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Berechnung der Steuern und Gebühren"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Berechnung der Steuern und Gebühren"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Berechnung der Steuern und Gebühren"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Berechnung der Steuern und Gebühren"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Berechnung der Steuern und Gebühren"
 
-#. Label of a Long Text field in DocType 'Quotation'
+#. Label of a Text Editor field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Taxes and Charges Calculation"
 msgstr "Berechnung der Steuern und Gebühren"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Berechnung der Steuern und Gebühren"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Berechnung der Steuern und Gebühren"
 
-#. Label of a Long Text field in DocType 'Supplier Quotation'
+#. Label of a Markdown Editor field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Taxes and Charges Calculation"
@@ -71351,9 +72593,9 @@
 #. Name of a DocType
 #: telephony/doctype/telephony_call_type/telephony_call_type.json
 msgid "Telephony Call Type"
-msgstr ""
+msgstr "Telefonie Anrufart"
 
-#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:12
+#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:20
 msgid "Template"
 msgstr "Vorlage"
 
@@ -71369,11 +72611,11 @@
 msgid "Template"
 msgstr "Vorlage"
 
-#: manufacturing/doctype/bom/bom.js:279
+#: manufacturing/doctype/bom/bom.js:292
 msgid "Template Item"
 msgstr "Vorlagenelement"
 
-#: stock/get_item_details.py:219
+#: stock/get_item_details.py:224
 msgid "Template Item Selected"
 msgstr ""
 
@@ -71413,11 +72655,11 @@
 msgid "Template Warnings"
 msgstr "Vorlagenwarnungen"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:38
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:29
 msgid "Temporarily on Hold"
 msgstr "Vorübergehend auf Eis gelegt"
 
-#: accounts/report/account_balance/account_balance.js:59
+#: accounts/report/account_balance/account_balance.js:61
 msgid "Temporary"
 msgstr "Temporär"
 
@@ -71533,13 +72775,13 @@
 #: buying/doctype/purchase_order/purchase_order.json
 msgctxt "Purchase Order"
 msgid "Terms & Conditions"
-msgstr ""
+msgstr "Bedingungen & Konditionen"
 
 #. Label of a Section Break field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
 msgid "Terms & Conditions"
-msgstr ""
+msgstr "Bedingungen & Konditionen"
 
 #. Label of a Link field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
@@ -71684,34 +72926,34 @@
 msgstr "Vorlage für Allgemeine Geschäftsbedingungen"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:145
-#: accounts/report/accounts_receivable/accounts_receivable.py:1094
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1102
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
+#: 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/inactive_sales_items/inactive_sales_items.js:9
+#: 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
-#: crm/report/lead_details/lead_details.js:47
+#: crm/report/lead_details/lead_details.js:46
 #: crm/report/lead_details/lead_details.py:34
-#: crm/report/lost_opportunity/lost_opportunity.js:37
+#: 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/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:48
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:46
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:39
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:60
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:59
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:39
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:48
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:46
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:60
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:59
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:71
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:72
 #: selling/report/territory_wise_sales/territory_wise_sales.py:22
 #: setup/doctype/territory/territory.json
 msgid "Territory"
@@ -71890,14 +73132,14 @@
 msgid "The 'From Package No.' field must neither be empty nor it's value less than 1."
 msgstr "Die &#39;Von Paketnummer&#39; Das Feld darf weder leer sein noch einen Wert kleiner als 1 haben."
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:331
+#: buying/doctype/request_for_quotation/request_for_quotation.py:355
 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings."
 msgstr "Der Zugriff auf die Angebotsanfrage vom Portal ist deaktiviert. Um den Zugriff zuzulassen, aktivieren Sie ihn in den Portaleinstellungen."
 
 #. Success message of the Module Onboarding 'Accounts'
 #: accounts/module_onboarding/accounts/accounts.json
 msgid "The Accounts Module is all set up!"
-msgstr ""
+msgstr "Das Buchhaltungsmodul ist fertig eingerichtet!"
 
 #. Success message of the Module Onboarding 'Assets'
 #: assets/module_onboarding/assets/assets.json
@@ -71930,13 +73172,13 @@
 
 #: support/doctype/service_level_agreement/service_level_agreement.py:202
 msgid "The Document Type {0} must have a Status field to configure Service Level Agreement"
-msgstr ""
+msgstr "Der Dokumenttyp {0} muss über ein Statusfeld verfügen, um das Service Level Agreement zu konfigurieren"
 
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.py:70
 msgid "The GL Entries will be cancelled in the background, it can take a few minutes."
 msgstr "Die Hauptbucheinträge werden im Hintergrund storniert, dies kann einige Minuten dauern."
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:176
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:177
 msgid "The GL Entries will be processed in the background, it can take a few minutes."
 msgstr "Die Hauptbucheinträge werden im Hintergrund verarbeitet, dies kann einige Minuten dauern."
 
@@ -71944,7 +73186,7 @@
 msgid "The Loyalty Program isn't valid for the selected company"
 msgstr "Das Treueprogramm ist für das ausgewählte Unternehmen nicht gültig"
 
-#: accounts/doctype/payment_request/payment_request.py:747
+#: accounts/doctype/payment_request/payment_request.py:750
 msgid "The Payment Request {0} is already paid, cannot process payment twice"
 msgstr ""
 
@@ -71952,11 +73194,11 @@
 msgid "The Payment Term at row {0} is possibly a duplicate."
 msgstr "Die Zahlungsbedingung in Zeile {0} ist möglicherweise ein Duplikat."
 
-#: stock/doctype/pick_list/pick_list.py:132
+#: stock/doctype/pick_list/pick_list.py:167
 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:1761
+#: stock/doctype/stock_entry/stock_entry.py:1770
 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
 msgstr ""
 
@@ -71965,7 +73207,7 @@
 msgid "The Selling Module is all set up!"
 msgstr "Das Vertriebsmodul ist fertig eingerichtet!"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:17
 msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing. <br><br> When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field."
 msgstr "Der Lagereintrag vom Typ &#39;Herstellung&#39; wird als Rückspülung bezeichnet. Rohstoffe, die zur Herstellung von Fertigwaren verbraucht werden, werden als Rückspülung bezeichnet.<br><br> Beim Erstellen eines Fertigungseintrags werden Rohstoffartikel basierend auf der Stückliste des Produktionsartikels zurückgespült. Wenn Sie möchten, dass Rohmaterialpositionen basierend auf der Materialtransfereintragung für diesen Arbeitsauftrag zurückgespült werden, können Sie sie in diesem Feld festlegen."
 
@@ -71988,7 +73230,7 @@
 msgid "The accounts are set by the system automatically but do confirm these defaults"
 msgstr "Die Konten werden vom System automatisch festgelegt, bestätigen jedoch diese Standardeinstellungen"
 
-#: accounts/doctype/payment_request/payment_request.py:144
+#: accounts/doctype/payment_request/payment_request.py:147
 msgid "The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document."
 msgstr "Der in dieser Zahlungsaufforderung angegebene Betrag von {0} unterscheidet sich von dem berechneten Betrag aller Zahlungspläne: {1}. Stellen Sie sicher, dass dies korrekt ist, bevor Sie das Dokument buchen."
 
@@ -71996,7 +73238,7 @@
 msgid "The currency of invoice {} ({}) is different from the currency of this dunning ({})."
 msgstr "Die Währung der Rechnung {} ({}) unterscheidet sich von der Währung dieser Mahnung ({})."
 
-#: manufacturing/doctype/work_order/work_order.js:812
+#: manufacturing/doctype/work_order/work_order.js:871
 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM."
 msgstr "Die Standardstückliste für diesen Artikel wird vom System abgerufen. Sie können die Stückliste auch ändern."
 
@@ -72033,7 +73275,7 @@
 msgid "The following Items, having Putaway Rules, could not be accomodated:"
 msgstr "Die folgenden Artikel, für die Einlagerungsregeln gelten, konnten nicht untergebracht werden:"
 
-#: assets/doctype/asset/depreciation.py:414
+#: assets/doctype/asset/depreciation.py:412
 msgid "The following assets have failed to automatically post depreciation entries: {0}"
 msgstr "Bei den folgenden Vermögensgegenständen wurden die Abschreibungen nicht automatisch gebucht: {0}"
 
@@ -72045,7 +73287,7 @@
 msgid "The following employees are currently still reporting to {0}:"
 msgstr "Die folgenden Mitarbeiter berichten derzeit noch an {0}:"
 
-#: stock/doctype/material_request/material_request.py:773
+#: stock/doctype/material_request/material_request.py:785
 msgid "The following {0} were created: {1}"
 msgstr "Die folgenden {0} wurden erstellt: {1}"
 
@@ -72091,7 +73333,7 @@
 msgid "The parent account {0} does not exists in the uploaded template"
 msgstr "Das übergeordnete Konto {0} ist in der hochgeladenen Vorlage nicht vorhanden"
 
-#: accounts/doctype/payment_request/payment_request.py:133
+#: accounts/doctype/payment_request/payment_request.py:136
 msgid "The payment gateway account in plan {0} is different from the payment gateway account in this payment request"
 msgstr "Das Zahlungsgatewaykonto in Plan {0} unterscheidet sich von dem Zahlungsgatewaykonto in dieser Zahlungsanforderung"
 
@@ -72100,14 +73342,14 @@
 #: accounts/doctype/accounts_settings/accounts_settings.json
 msgctxt "Accounts Settings"
 msgid "The percentage you are allowed to bill more against the amount ordered. For example, if the order value is $100 for an item and tolerance is set as 10%, then you are allowed to bill up to $110 "
-msgstr ""
+msgstr "Der Prozentsatz, den Sie über den bestellten Betrag hinaus in Rechnung stellen dürfen. Wenn der Bestellwert für einen Artikel z. B. €100 beträgt und die Toleranz auf 10% eingestellt ist, dürfen Sie bis zu €110 in Rechnung stellen "
 
 #. Description of the 'Over Delivery/Receipt Allowance (%)' (Float) field in
 #. DocType 'Stock Settings'
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
 msgid "The percentage you are allowed to receive or deliver more against the quantity ordered. For example, if you have ordered 100 units, and your Allowance is 10%, then you are allowed to receive 110 units."
-msgstr ""
+msgstr "Der Prozentsatz, um den Sie mehr als die bestellte Menge erhalten oder liefern dürfen. Wenn Sie z. B. 100 Einheiten bestellt haben und die Toleranz auf 10% eingestellt ist, dürfen Sie 110 Einheiten erhalten."
 
 #. Description of the 'Over Transfer Allowance' (Float) field in DocType 'Stock
 #. Settings'
@@ -72116,15 +73358,15 @@
 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:742
+#: public/js/utils.js:814
 msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.js:116
+#: stock/doctype/pick_list/pick_list.js:137
 msgid "The reserved stock will be released. Are you certain you wish to proceed?"
 msgstr "Der reservierte Bestand wird freigegeben. Sind Sie sicher, dass Sie fortfahren möchten?"
 
-#: accounts/doctype/account/account.py:198
+#: accounts/doctype/account/account.py:217
 msgid "The root account {0} must be a group"
 msgstr "Das Root-Konto {0} muss eine Gruppe sein"
 
@@ -72140,7 +73382,7 @@
 msgid "The selected item cannot have Batch"
 msgstr "Der ausgewählte Artikel kann keine Charge haben"
 
-#: assets/doctype/asset/asset.js:570
+#: assets/doctype/asset/asset.js:643
 msgid "The selected {0} does not contain the selected Asset Item."
 msgstr ""
 
@@ -72164,7 +73406,7 @@
 msgid "The shares don't exist with the {0}"
 msgstr "Die Freigaben existieren nicht mit der {0}"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:461
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:515
 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 ""
 
@@ -72172,24 +73414,16 @@
 msgid "The sync has started in the background, please check the {0} list for new records."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:155
 #: accounts/doctype/journal_entry/journal_entry.py:162
+#: accounts/doctype/journal_entry/journal_entry.py:169
 msgid "The task has been enqueued as a background job."
 msgstr "Die Aufgabe wurde als Hintergrundjob in die Warteschlange gestellt."
 
-#: stock/doctype/stock_entry/stock_entry.py:244
-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 Entry and revert to the Draft stage"
-msgstr ""
-
-#: stock/doctype/stock_entry/stock_entry.py:255
-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 Entry and revert to the Submitted stage"
-msgstr "Die Aufgabe wurde als Hintergrundjob in die Warteschlange gestellt. Falls bei der Verarbeitung im Hintergrund ein Problem auftritt, fügt das System einen Kommentar über den Fehler bei dieser Lagerbewegung hinzu und kehrt zur Stufe Gebucht zurück"
-
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:754
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:808
 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 "Die Aufgabe wurde als Hintergrundjob in die Warteschlange gestellt. Falls bei der Verarbeitung im Hintergrund Probleme auftreten, fügt das System einen Kommentar zum Fehler in dieser Bestandsabstimmung hinzu und kehrt zum Entwurfsstadium zurück"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:765
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:819
 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 "Die Aufgabe wurde als Hintergrundjob in die Warteschlange gestellt. Falls bei der Verarbeitung im Hintergrund ein Problem auftritt, fügt das System einen Kommentar über den Fehler bei dieser Bestandsabstimmung hinzu und kehrt zur Stufe Gebucht zurück"
 
@@ -72216,31 +73450,31 @@
 msgid "The value {0} is already assigned to an existing Item {1}."
 msgstr "Der Wert {0} ist bereits einem vorhandenen Element {1} zugeordnet."
 
-#: manufacturing/doctype/work_order/work_order.js:832
+#: manufacturing/doctype/work_order/work_order.js:899
 msgid "The warehouse where you store finished Items before they are shipped."
-msgstr ""
+msgstr "Das Lager, in dem Sie fertige Artikel lagern, bevor sie versandt werden."
 
-#: manufacturing/doctype/work_order/work_order.js:827
+#: manufacturing/doctype/work_order/work_order.js:892
 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage."
 msgstr "Das Lager, in dem Sie Ihre Rohmaterialien lagern. Jeder benötigte Artikel kann ein eigenes Quelllager haben. Auch ein Gruppenlager kann als Quelllager ausgewählt werden. Bei Buchung des Arbeitsauftrags werden die Rohstoffe in diesen Lagern für die Produktion reserviert."
 
-#: manufacturing/doctype/work_order/work_order.js:837
+#: manufacturing/doctype/work_order/work_order.js:904
 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 ""
+msgstr "Das Lager, in das Ihre Artikel übertragen werden, wenn Sie mit der Produktion beginnen. Es kann auch eine Lager-Gruppe ausgewählt werden."
 
-#: manufacturing/doctype/job_card/job_card.py:671
+#: manufacturing/doctype/job_card/job_card.py:678
 msgid "The {0} ({1}) must be equal to {2} ({3})"
 msgstr "Die {0} ({1}) muss gleich {2} ({3}) sein."
 
-#: stock/doctype/material_request/material_request.py:779
+#: stock/doctype/material_request/material_request.py:791
 msgid "The {0} {1} created successfully"
 msgstr "{0} {1} erfolgreich erstellt"
 
-#: manufacturing/doctype/job_card/job_card.py:762
+#: manufacturing/doctype/job_card/job_card.py:769
 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:501
+#: assets/doctype/asset/asset.py:503
 msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
 msgstr "Es gibt aktive Wartungs- oder Reparaturarbeiten am Vermögenswert. Sie müssen alle Schritte ausführen, bevor Sie das Asset stornieren können."
 
@@ -72248,24 +73482,36 @@
 msgid "There are inconsistencies between the rate, no of shares and the amount calculated"
 msgstr "Es gibt Unstimmigkeiten zwischen dem Kurs, der Anzahl der Aktien und dem berechneten Betrag"
 
-#: utilities/bulk_transaction.py:41
+#: accounts/doctype/account/account.py:202
+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
 msgid "There are no Failed transactions"
+msgstr "Es gibt keine fehlgeschlagenen Transaktionen"
+
+#: setup/demo.py:108
+msgid "There are no active Fiscal Years for which Demo Data can be generated."
 msgstr ""
 
-#: www/book_appointment/index.js:89
+#: www/book_appointment/index.js:95
 msgid "There are no slots available on this date"
-msgstr ""
+msgstr "Für dieses Datum sind keine Plätze verfügbar"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:245
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:273
 msgid "There are only {0} asset created or linked to {1}. Please create or link {2} Assets with respective document."
 msgstr ""
 
-#: stock/doctype/item/item.js:829
+#: stock/doctype/item/item.js:913
 msgid "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit <a href='https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/item-valuation-fifo-and-moving-average' target='_blank'>Item Valuation, FIFO and Moving Average.</a>"
 msgstr ""
 
 #: stock/report/item_variant_details/item_variant_details.py:25
 msgid "There aren't any item variants for the selected item"
+msgstr "Für den ausgewählten Artikel sind keine Artikelvarianten vorhanden"
+
+#: accounts/doctype/loyalty_program/loyalty_program.js:10
+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
@@ -72292,36 +73538,36 @@
 msgid "There is nothing to edit."
 msgstr "Es gibt nichts zu bearbeiten."
 
-#: stock/doctype/stock_entry/stock_entry.py:1279
+#: stock/doctype/stock_entry/stock_entry.py:1288
 msgid "There must be atleast 1 Finished Good in this Stock Entry"
-msgstr ""
+msgstr "Es muss mindestens 1 Fertigerzeugnis in dieser Lagerbewegung vorhanden sein"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:135
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:151
 msgid "There was an error creating Bank Account while linking with Plaid."
-msgstr ""
+msgstr "Bei der Verknüpfung mit Plaid ist ein Fehler beim Erstellen des Bankkontos aufgetreten."
 
-#: selling/page/point_of_sale/pos_controller.js:205
+#: selling/page/point_of_sale/pos_controller.js:228
 msgid "There was an error saving the document."
 msgstr "Beim Speichern des Dokuments ist ein Fehler aufgetreten."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:236
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:252
 msgid "There was an error syncing transactions."
-msgstr ""
+msgstr "Es ist ein Fehler bei der Synchronisierung von Transaktionen aufgetreten."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:157
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:173
 msgid "There was an error updating Bank Account {} while linking with Plaid."
-msgstr ""
+msgstr "Beim Verknüpfen mit Plaid ist beim Aktualisieren des Bankkontos {} ein Fehler aufgetreten."
 
-#: accounts/doctype/bank/bank.js:113
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:109
+#: accounts/doctype/bank/bank.js:115
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:114
 msgid "There was an issue connecting to Plaid's authentication server. Check browser console for more information"
-msgstr ""
+msgstr "Es gab ein Problem bei der Verbindung mit dem Authentifizierungsserver von Plaid. Prüfen Sie die Browser-Konsole für weitere Informationen"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:279
+#: selling/page/point_of_sale/pos_past_order_summary.js:289
 msgid "There were errors while sending email. Please try again."
 msgstr "Beim Versand der E-Mail ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut."
 
-#: accounts/utils.py:924
+#: accounts/utils.py:933
 msgid "There were issues unlinking payment entry {0}."
 msgstr ""
 
@@ -72330,13 +73576,13 @@
 #: accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json
 msgctxt "Exchange Rate Revaluation Account"
 msgid "This Account has '0' balance in either Base Currency or Account Currency"
-msgstr ""
+msgstr "Dieses Konto weist entweder in der Basiswährung oder in der Kontowährung einen Saldo von „0“ auf"
 
-#: stock/doctype/item/item.js:88
+#: stock/doctype/item/item.js:99
 msgid "This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set"
 msgstr "Dieser Artikel ist eine Vorlage und kann nicht in Transaktionen verwendet werden. Artikelattribute werden in die Varianten kopiert, es sein denn es wurde \"nicht kopieren\" ausgewählt"
 
-#: stock/doctype/item/item.js:118
+#: stock/doctype/item/item.js:158
 msgid "This Item is a Variant of {0} (Template)."
 msgstr "Dieser Artikel ist eine Variante von {0} (Vorlage)."
 
@@ -72344,11 +73590,11 @@
 msgid "This Month's Summary"
 msgstr "Zusammenfassung dieses Monats"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:26
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
 msgid "This Warehouse will be auto-updated in the Target Warehouse field of Work Order."
 msgstr "Dieses Lager wird im Feld Ziellager des Arbeitsauftrags automatisch aktualisiert."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:21
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:24
 msgid "This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Orders."
 msgstr "Dieses Warehouse wird im Feld Work In Progress Warehouse der Arbeitsaufträge automatisch aktualisiert."
 
@@ -72372,18 +73618,18 @@
 msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
 msgstr "Dieses Dokument ist über dem Limit von {0} {1} für item {4}. Machen Sie eine andere {3} gegen die gleiche {2}?"
 
-#: stock/doctype/delivery_note/delivery_note.js:360
+#: stock/doctype/delivery_note/delivery_note.js:406
 msgid "This field is used to set the 'Customer'."
-msgstr ""
+msgstr "Dieses Feld wird verwendet, um den „Kunden“ festzulegen."
 
 #. Description of the 'Bank / Cash Account' (Link) field in DocType 'Payment
 #. Reconciliation'
 #: accounts/doctype/payment_reconciliation/payment_reconciliation.json
 msgctxt "Payment Reconciliation"
 msgid "This filter will be applied to Journal Entry."
-msgstr ""
+msgstr "Dieser Filter wird auf den Journaleintrag angewendet."
 
-#: manufacturing/doctype/bom/bom.js:158
+#: manufacturing/doctype/bom/bom.js:171
 msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
 msgstr ""
 
@@ -72412,7 +73658,7 @@
 msgid "This is a location where scraped materials are stored."
 msgstr "Dies ist ein Ort, an dem abgekratzte Materialien gelagert werden."
 
-#: accounts/doctype/account/account.js:40
+#: accounts/doctype/account/account.js:36
 msgid "This is a root account and cannot be edited."
 msgstr "Dies ist ein Root-Konto und kann nicht bearbeitet werden."
 
@@ -72424,11 +73670,11 @@
 msgid "This is a root department and cannot be edited."
 msgstr "Dies ist eine Root-Abteilung und kann nicht bearbeitet werden."
 
-#: setup/doctype/item_group/item_group.js:81
+#: setup/doctype/item_group/item_group.js:98
 msgid "This is a root item group and cannot be edited."
 msgstr "Dies ist eine Root-Artikelgruppe und kann nicht bearbeitet werden."
 
-#: setup/doctype/sales_person/sales_person.js:36
+#: setup/doctype/sales_person/sales_person.js:46
 msgid "This is a root sales person and cannot be edited."
 msgstr "Dies ist ein Root-Vertriebsmitarbeiter und kann nicht bearbeitet werden."
 
@@ -72460,27 +73706,27 @@
 msgid "This is based on transactions against this Supplier. See timeline below for details"
 msgstr "Dies basiert auf Transaktionen gegen diesen Lieferanten. Siehe Zeitleiste unten für Details"
 
-#: stock/doctype/stock_settings/stock_settings.js:24
+#: stock/doctype/stock_settings/stock_settings.js:26
 msgid "This is considered dangerous from accounting point of view."
-msgstr ""
+msgstr "Dies gilt aus buchhalterischer Sicht als gefährlich."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:529
 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
 msgstr "Dies erfolgt zur Abrechnung von Fällen, in denen der Eingangsbeleg nach der Eingangsrechnung erstellt wird"
 
-#: manufacturing/doctype/work_order/work_order.js:822
+#: manufacturing/doctype/work_order/work_order.js:885
 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox."
 msgstr ""
 
-#: stock/doctype/item/item.js:819
+#: stock/doctype/item/item.js:901
 msgid "This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked."
 msgstr ""
 
 #: selling/doctype/party_specific_item/party_specific_item.py:35
 msgid "This item filter has already been applied for the {0}"
-msgstr ""
+msgstr "Dieser Artikelfilter wurde bereits für {0} angewendet"
 
-#: stock/doctype/delivery_note/delivery_note.js:371
+#: stock/doctype/delivery_note/delivery_note.js:419
 msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
 msgstr "Diese Option kann aktiviert werden, um die Felder 'Buchungsdatum' und 'Buchungszeit' zu bearbeiten."
 
@@ -72488,7 +73734,7 @@
 msgid "This schedule was created when Asset {0} was adjusted through Asset Value Adjustment {1}."
 msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} durch die Vermögenswertanpassung {1} angepasst wurde."
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:516
+#: assets/doctype/asset_capitalization/asset_capitalization.py:522
 msgid "This schedule was created when Asset {0} was consumed through Asset Capitalization {1}."
 msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} durch Vermögensgegenstand-Aktivierung {1} verbraucht wurde."
 
@@ -72496,27 +73742,27 @@
 msgid "This schedule was created when Asset {0} was repaired through Asset Repair {1}."
 msgstr "Dieser Zeitplan wurde erstellt, als Vermögensgegenstand {0} über Vermögensgegenstand-Reparatur {1} repariert wurde."
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:674
+#: assets/doctype/asset_capitalization/asset_capitalization.py:680
 msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
 msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} nach der Stornierung der Vermögensgegenstand-Aktivierung {1} wiederhergestellt wurde."
 
-#: assets/doctype/asset/depreciation.py:496
+#: assets/doctype/asset/depreciation.py:494
 msgid "This schedule was created when Asset {0} was restored."
 msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} wiederhergestellt wurde."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1325
+#: accounts/doctype/sales_invoice/sales_invoice.py:1336
 msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
-msgstr ""
+msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} über die Ausgangsrechnung {1} zurückgegeben wurde."
 
-#: assets/doctype/asset/depreciation.py:454
+#: assets/doctype/asset/depreciation.py:452
 msgid "This schedule was created when Asset {0} was scrapped."
 msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} verschrottet wurde."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1336
+#: accounts/doctype/sales_invoice/sales_invoice.py:1347
 msgid "This schedule was created when Asset {0} was sold through Sales Invoice {1}."
-msgstr ""
+msgstr "Dieser Zeitplan wurde erstellt, als der Vermögensgegenstand {0} über die Ausgangsrechnung {1} verkauft wurde."
 
-#: assets/doctype/asset/asset.py:1117
+#: assets/doctype/asset/asset.py:1121
 msgid "This schedule was created when Asset {0} was updated after being split into new Asset {1}."
 msgstr "Dieser Zeitplan wurde erstellt, als Vermögensgegenstand {0} aktualisiert wurde, nachdem er in einen neuen Vermögensgegenstand {1} aufgeteilt wurde."
 
@@ -72530,9 +73776,9 @@
 
 #: assets/doctype/asset_shift_allocation/asset_shift_allocation.py:246
 msgid "This schedule was created when Asset {0}'s shifts were adjusted through Asset Shift Allocation {1}."
-msgstr ""
+msgstr "Dieser Zeitplan wurde erstellt, als die Schichten des Vermögensgegenstandes {0} durch die Vermögensgegenstand -Schichtzuordung {1} angepasst wurden."
 
-#: assets/doctype/asset/asset.py:1180
+#: assets/doctype/asset/asset.py:1184
 msgid "This schedule was created when new Asset {0} was split from Asset {1}."
 msgstr "Dieser Zeitplan wurde erstellt, als der neue Vermögensgegenstand {0} von dem Vermögensgegenstand {1} abgespalten wurde."
 
@@ -72543,8 +73789,13 @@
 msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
 msgstr "In diesem Abschnitt kann der Benutzer den Text und den Schlusstext des Mahnbriefs für den Mahntyp basierend auf der Sprache festlegen, die im Druck verwendet werden kann."
 
-#: stock/doctype/delivery_note/delivery_note.js:365
+#: stock/doctype/delivery_note/delivery_note.js:412
 msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
+msgstr "Diese Tabelle wird verwendet, um Details zu „Artikel“, „Menge“, „Einzelpreis“ usw. festzulegen."
+
+#. Description of a DocType
+#: stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses."
 msgstr ""
 
 #. Description of the 'Abbreviation' (Data) field in DocType 'Item Attribute
@@ -72561,9 +73812,9 @@
 msgid "This will restrict user access to other employee records"
 msgstr "Dies schränkt den Benutzerzugriff auf andere Mitarbeiterdatensätze ein"
 
-#: controllers/selling_controller.py:686
+#: controllers/selling_controller.py:710
 msgid "This {} will be treated as material transfer."
-msgstr ""
+msgstr "Diese(r) {} wird als Materialtransfer behandelt."
 
 #. Label of a Percent field in DocType 'Promotional Scheme Price Discount'
 #: accounts/doctype/promotional_scheme_price_discount/promotional_scheme_price_discount.json
@@ -72581,19 +73832,19 @@
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
 msgid "Threshold for Suggestion (In Percentage)"
-msgstr ""
+msgstr "Schwellenwert für Vorschlag (in Prozent)"
 
 #. Label of a Data field in DocType 'BOM'
 #: manufacturing/doctype/bom/bom.json
 msgctxt "BOM"
 msgid "Thumbnail"
-msgstr ""
+msgstr "Miniaturansicht"
 
 #. Label of a Data field in DocType 'BOM Website Operation'
 #: manufacturing/doctype/bom_website_operation/bom_website_operation.json
 msgctxt "BOM Website Operation"
 msgid "Thumbnail"
-msgstr ""
+msgstr "Miniaturansicht"
 
 #. Option for the 'Day Of Week' (Select) field in DocType 'Appointment Booking
 #. Slots'
@@ -72760,7 +74011,7 @@
 
 #: selling/report/sales_order_analysis/sales_order_analysis.py:324
 msgid "Time Taken to Deliver"
-msgstr ""
+msgstr "Lieferzeit"
 
 #. Label of a Card Break in the Projects Workspace
 #: config/projects.py:50 projects/workspace/projects/projects.json
@@ -72778,22 +74029,22 @@
 #: manufacturing/doctype/sub_operation/sub_operation.json
 msgctxt "Sub Operation"
 msgid "Time in mins"
-msgstr ""
+msgstr "Zeit in Min"
 
 #. Description of the 'Total Operation Time' (Float) field in DocType
 #. 'Operation'
 #: manufacturing/doctype/operation/operation.json
 msgctxt "Operation"
 msgid "Time in mins."
-msgstr ""
+msgstr "Zeit in Min."
 
-#: manufacturing/doctype/job_card/job_card.py:654
+#: manufacturing/doctype/job_card/job_card.py:661
 msgid "Time logs are required for {0} {1}"
 msgstr "Zeitprotokolle sind für {0} {1} erforderlich"
 
 #: crm/doctype/appointment/appointment.py:60
 msgid "Time slot is not available"
-msgstr ""
+msgstr "Zeitfenster ist nicht verfügbar"
 
 #: templates/generators/bom.html:71
 msgid "Time(in mins)"
@@ -72805,11 +74056,12 @@
 msgid "Timeline"
 msgstr "Zeitleiste"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:31
 #: public/js/projects/timer.js:5
 msgid "Timer"
 msgstr "Timer"
 
-#: public/js/projects/timer.js:142
+#: public/js/projects/timer.js:149
 msgid "Timer exceeded the given hours."
 msgstr "Timer hat die angegebenen Stunden überschritten."
 
@@ -72851,11 +74103,11 @@
 msgid "Timesheet for tasks."
 msgstr "Zeitraport für Vorgänge."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:756
+#: accounts/doctype/sales_invoice/sales_invoice.py:773
 msgid "Timesheet {0} is already completed or cancelled"
 msgstr "Timesheet {0} ist bereits abgeschlossen oder abgebrochen"
 
-#: projects/doctype/timesheet/timesheet.py:520 templates/pages/projects.html:59
+#: projects/doctype/timesheet/timesheet.py:530 templates/pages/projects.html:59
 msgid "Timesheets"
 msgstr "Zeiterfassungen"
 
@@ -73054,7 +74306,7 @@
 msgid "Title"
 msgstr "Bezeichnung"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:967
+#: accounts/doctype/sales_invoice/sales_invoice.js:1043
 #: templates/pages/projects.html:68
 msgid "To"
 msgstr "Zu"
@@ -73077,15 +74329,15 @@
 msgid "To"
 msgstr "Zu"
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "To Be Paid"
 msgstr "Bezahlt werden"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:36
-#: selling/doctype/sales_order/sales_order_list.js:39
-#: stock/doctype/delivery_note/delivery_note_list.js:12
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:12
+#: buying/doctype/purchase_order/purchase_order_list.js:37
+#: selling/doctype/sales_order/sales_order_list.js:50
+#: selling/doctype/sales_order/sales_order_list.js:52
+#: stock/doctype/delivery_note/delivery_note_list.js:22
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:21
 msgid "To Bill"
 msgstr "Abrechnen"
 
@@ -73126,13 +74378,13 @@
 msgid "To Currency"
 msgstr "In Währung"
 
-#: accounts/doctype/payment_entry/payment_entry.js:648
-#: accounts/doctype/payment_entry/payment_entry.js:652
+#: accounts/doctype/payment_entry/payment_entry.js:794
+#: accounts/doctype/payment_entry/payment_entry.js:798
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:23
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:23
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:15
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:24
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:45
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:23
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:44
 #: accounts/report/financial_ratios/financial_ratios.js:48
 #: accounts/report/general_ledger/general_ledger.js:30
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -73140,76 +74392,76 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:15
 #: 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:25
+#: accounts/report/pos_register/pos_register.js:24
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:15
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:24
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:55
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:55
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:23
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:54
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:54
 #: accounts/report/trial_balance/trial_balance.js:43
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:43
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:22
-#: buying/report/procurement_tracker/procurement_tracker.js:34
-#: buying/report/purchase_analytics/purchase_analytics.js:43
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:26
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:26
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:23
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:30
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:30
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:21
+#: buying/report/procurement_tracker/procurement_tracker.js:33
+#: buying/report/purchase_analytics/purchase_analytics.js:42
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:25
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:25
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:22
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:29
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:29
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:24
 #: crm/report/campaign_efficiency/campaign_efficiency.js:13
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:16
-#: crm/report/lead_conversion_time/lead_conversion_time.js:16
-#: crm/report/lead_details/lead_details.js:24
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:15
+#: crm/report/lead_conversion_time/lead_conversion_time.js:15
+#: crm/report/lead_details/lead_details.js:23
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:13
-#: crm/report/lost_opportunity/lost_opportunity.js:24
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:29
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:21
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:22
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:15
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:24
-#: manufacturing/report/process_loss_report/process_loss_report.js:37
-#: manufacturing/report/production_analytics/production_analytics.js:24
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:15
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:24
+#: crm/report/lost_opportunity/lost_opportunity.js:23
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:27
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:20
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:23
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:16
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:36
+#: manufacturing/report/production_analytics/production_analytics.js:23
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:14
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:23
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:14
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:14
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:37
-#: public/js/stock_analytics.js:48
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:16
-#: regional/report/uae_vat_201/uae_vat_201.js:24
-#: regional/report/vat_audit_report/vat_audit_report.js:25
-#: selling/page/sales_funnel/sales_funnel.js:40
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:13
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:34
+#: public/js/stock_analytics.js:75
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:15
+#: regional/report/uae_vat_201/uae_vat_201.js:23
+#: regional/report/vat_audit_report/vat_audit_report.js:24
+#: selling/page/sales_funnel/sales_funnel.js:44
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:31
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:26
-#: selling/report/sales_analytics/sales_analytics.js:43
-#: selling/report/sales_order_analysis/sales_order_analysis.js:26
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:29
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:28
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:29
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:25
+#: selling/report/sales_analytics/sales_analytics.js:50
+#: selling/report/sales_order_analysis/sales_order_analysis.js:25
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:27
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:27
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:27
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:27
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:16
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:24
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:24
-#: stock/report/delayed_item_report/delayed_item_report.js:24
-#: stock/report/delayed_order_report/delayed_order_report.js:24
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:28
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:22
+#: stock/report/delayed_item_report/delayed_item_report.js:23
+#: stock/report/delayed_order_report/delayed_order_report.js:23
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:27
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:14
-#: stock/report/reserved_stock/reserved_stock.js:26
+#: stock/report/reserved_stock/reserved_stock.js:23
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:22
-#: stock/report/stock_analytics/stock_analytics.js:70
+#: stock/report/stock_analytics/stock_analytics.js:69
 #: stock/report/stock_balance/stock_balance.js:24
 #: stock/report/stock_ledger/stock_ledger.js:23
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:22
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:17
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:16
-#: support/report/issue_analytics/issue_analytics.js:32
-#: support/report/issue_summary/issue_summary.js:32
-#: support/report/support_hour_distribution/support_hour_distribution.js:15
-#: utilities/report/youtube_interactions/youtube_interactions.js:15
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:16
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:15
+#: support/report/issue_analytics/issue_analytics.js:31
+#: support/report/issue_summary/issue_summary.js:31
+#: support/report/support_hour_distribution/support_hour_distribution.js:14
+#: utilities/report/youtube_interactions/youtube_interactions.js:14
 msgid "To Date"
 msgstr "Bis-Datum"
 
@@ -73315,7 +74567,7 @@
 msgid "To Date"
 msgstr "Bis-Datum"
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 #: setup/doctype/holiday_list/holiday_list.py:115
 msgid "To Date cannot be before From Date"
 msgstr "Bis-Datum kann nicht vor Von-Datum liegen"
@@ -73344,8 +74596,8 @@
 msgid "To Datetime"
 msgstr "Bis Datum und Uhrzeit"
 
-#: selling/doctype/sales_order/sales_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:30
+#: selling/doctype/sales_order/sales_order_list.js:32
+#: selling/doctype/sales_order/sales_order_list.js:42
 msgid "To Deliver"
 msgstr "Auszuliefern"
 
@@ -73362,7 +74614,7 @@
 msgid "To Deliver"
 msgstr "Auszuliefern"
 
-#: selling/doctype/sales_order/sales_order_list.js:26
+#: selling/doctype/sales_order/sales_order_list.js:36
 msgid "To Deliver and Bill"
 msgstr "Auszuliefern und Abzurechnen"
 
@@ -73391,7 +74643,7 @@
 msgid "To Doctype"
 msgstr ""
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:85
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:83
 msgid "To Due Date"
 msgstr ""
 
@@ -73401,7 +74653,7 @@
 msgid "To Employee"
 msgstr "An Mitarbeiter"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:53
+#: accounts/report/budget_variance_report/budget_variance_report.js:51
 msgid "To Fiscal Year"
 msgstr "Bis zum Geschäftsjahr"
 
@@ -73441,8 +74693,8 @@
 msgid "To Package No."
 msgstr "Bis Paket Nr."
 
-#: buying/doctype/purchase_order/purchase_order_list.js:12
-#: selling/doctype/sales_order/sales_order_list.js:14
+#: buying/doctype/purchase_order/purchase_order_list.js:21
+#: selling/doctype/sales_order/sales_order_list.js:25
 msgid "To Pay"
 msgstr "Zu bezahlen"
 
@@ -73464,8 +74716,8 @@
 msgid "To Payment Date"
 msgstr ""
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:44
-#: manufacturing/report/work_order_summary/work_order_summary.js:30
+#: manufacturing/report/job_card_summary/job_card_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:29
 msgid "To Posting Date"
 msgstr "Zum Buchungsdatum"
 
@@ -73481,7 +74733,7 @@
 msgid "To Range"
 msgstr "Bis-Bereich"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:18
+#: buying/doctype/purchase_order/purchase_order_list.js:30
 msgid "To Receive"
 msgstr "Zu empfangen"
 
@@ -73491,7 +74743,7 @@
 msgid "To Receive"
 msgstr "Zu empfangen"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: buying/doctype/purchase_order/purchase_order_list.js:25
 msgid "To Receive and Bill"
 msgstr "Zu empfangen und abzurechnen"
 
@@ -73527,6 +74779,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:92
 #: manufacturing/report/job_card_summary/job_card_summary.py:180
+#: templates/pages/timelog_info.html:34
 msgid "To Time"
 msgstr "Bis-Zeit"
 
@@ -73608,7 +74861,8 @@
 msgid "To Value"
 msgstr "Bis-Wert"
 
-#: stock/doctype/batch/batch.js:83
+#: manufacturing/doctype/plant_floor/plant_floor.js:196
+#: stock/doctype/batch/batch.js:93
 msgid "To Warehouse"
 msgstr "An Lager"
 
@@ -73618,11 +74872,11 @@
 msgid "To Warehouse (Optional)"
 msgstr "Eingangslager (Optional)"
 
-#: manufacturing/doctype/bom/bom.js:735
+#: manufacturing/doctype/bom/bom.js:768
 msgid "To add Operations tick the 'With Operations' checkbox."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:550
+#: manufacturing/doctype/production_plan/production_plan.js:598
 msgid "To add subcontracted Item's raw materials if include exploded items is disabled."
 msgstr ""
 
@@ -73645,13 +74899,13 @@
 #: buying/doctype/purchase_order_item/purchase_order_item.json
 msgctxt "Purchase Order Item"
 msgid "To be Delivered to Customer"
-msgstr ""
+msgstr "An den Kunden zu liefern"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:521
+#: accounts/doctype/sales_invoice/sales_invoice.py:534
 msgid "To cancel a {} you need to cancel the POS Closing Entry {}."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:99
+#: accounts/doctype/payment_request/payment_request.py:100
 msgid "To create a Payment Request reference document is required"
 msgstr "Zur Erstellung eines Zahlungsauftrags ist ein Referenzdokument erforderlich"
 
@@ -73663,12 +74917,12 @@
 msgid "To enable Capital Work in Progress Accounting,"
 msgstr "Um die Buchung von Anlagen im Bau zu ermöglichen,"
 
-#: manufacturing/doctype/production_plan/production_plan.js:545
+#: manufacturing/doctype/production_plan/production_plan.js:591
 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:1625
-#: controllers/accounts_controller.py:2559
+#: accounts/doctype/payment_entry/payment_entry.py:1644
+#: controllers/accounts_controller.py:2644
 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
 msgstr "Um Steuern im Artikelpreis in Zeile {0} einzubeziehen, müssen Steuern in den Zeilen {1} ebenfalls einbezogen sein"
 
@@ -73676,7 +74930,7 @@
 msgid "To merge, following properties must be same for both items"
 msgstr "Um zwei Produkte zusammenzuführen, müssen folgende Eigenschaften für beide Produkte gleich sein"
 
-#: accounts/doctype/account/account.py:498
+#: accounts/doctype/account/account.py:517
 msgid "To overrule this, enable '{0}' in company {1}"
 msgstr "Um dies zu überschreiben, aktivieren Sie &#39;{0}&#39; in Firma {1}"
 
@@ -73684,11 +74938,11 @@
 msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
 msgstr "Aktivieren Sie {0} in den Einstellungen für Elementvarianten, um mit der Bearbeitung dieses Attributwerts fortzufahren."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:578
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:582
 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
 msgstr "Um die Rechnung ohne Bestellung zu buchen, stellen Sie bitte {0} als {1} in {2} ein"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:598
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:602
 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
 msgstr "Um die Rechnung ohne Eingangsbeleg zu buchen, stellen Sie bitte {0} als {1} in {2} ein"
 
@@ -73698,12 +74952,12 @@
 msgstr ""
 
 #: accounts/report/financial_statements.py:576
-#: accounts/report/general_ledger/general_ledger.py:273
+#: accounts/report/general_ledger/general_ledger.py:286
 #: accounts/report/trial_balance/trial_balance.py:278
 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:174
+#: selling/page/point_of_sale/pos_controller.js:192
 msgid "Toggle Recent Orders"
 msgstr "Letzte Bestellungen umschalten"
 
@@ -73713,16 +74967,20 @@
 msgid "Token Endpoint"
 msgstr "Token-Endpunkt"
 
+#: 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:485
-#: buying/doctype/purchase_order/purchase_order.js:541
-#: buying/doctype/request_for_quotation/request_for_quotation.js:57
-#: buying/doctype/request_for_quotation/request_for_quotation.js:143
-#: buying/doctype/request_for_quotation/request_for_quotation.js:381
-#: buying/doctype/request_for_quotation/request_for_quotation.js:387
-#: buying/doctype/supplier_quotation/supplier_quotation.js:55
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:116
+#: buying/doctype/purchase_order/purchase_order.js:560
+#: buying/doctype/purchase_order/purchase_order.js:636
+#: 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
+#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: buying/doctype/supplier_quotation/supplier_quotation.js:58
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:121
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: stock/workspace/stock/stock.json
 msgid "Tools"
@@ -73737,10 +74995,13 @@
 #: 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/general_ledger/general_ledger.py:56
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:636
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:642
 #: accounts/report/profitability_analysis/profitability_analysis.py:93
 #: accounts/report/profitability_analysis/profitability_analysis.py:98
 #: accounts/report/trial_balance/trial_balance.py:344
@@ -73936,6 +75197,11 @@
 msgid "Total Achieved"
 msgstr "Gesamtsumme erreicht"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Active Items"
+msgstr ""
+
 #: accounts/report/budget_variance_report/budget_variance_report.py:125
 msgid "Total Actual"
 msgstr "Summe (Ist)"
@@ -73994,7 +75260,7 @@
 msgid "Total Allocations"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:233
 #: 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
@@ -74038,7 +75304,7 @@
 msgid "Total Amount in Words"
 msgstr "Gesamtsumme in Worten"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:181
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:209
 msgid "Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges"
 msgstr "Gesamt Die Gebühren in Kauf Eingangspositionen Tabelle muss als Gesamt Steuern und Abgaben gleich sein"
 
@@ -74154,7 +75420,7 @@
 msgid "Total Commission"
 msgstr "Gesamtprovision"
 
-#: manufacturing/doctype/job_card/job_card.py:667
+#: manufacturing/doctype/job_card/job_card.py:674
 #: manufacturing/report/job_card_summary/job_card_summary.py:174
 msgid "Total Completed Qty"
 msgstr ""
@@ -74171,11 +75437,11 @@
 msgid "Total Consumed Material Cost (via Stock Entry)"
 msgstr "Verbrauchtes Material (Lagerbuchung)"
 
-#: setup/doctype/sales_person/sales_person.js:12
+#: setup/doctype/sales_person/sales_person.js:17
 msgid "Total Contribution Amount Against Invoices: {0}"
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person.js:9
+#: setup/doctype/sales_person/sales_person.js:10
 msgid "Total Contribution Amount Against Orders: {0}"
 msgstr ""
 
@@ -74221,7 +75487,7 @@
 msgid "Total Credit"
 msgstr "Gesamt-Haben"
 
-#: accounts/doctype/journal_entry/journal_entry.py:225
+#: accounts/doctype/journal_entry/journal_entry.py:241
 msgid "Total Credit/ Debit Amount should be same as linked Journal Entry"
 msgstr "Der Gesamtkreditbetrag sollte identisch mit dem verknüpften Buchungssatz sein"
 
@@ -74231,7 +75497,7 @@
 msgid "Total Debit"
 msgstr "Gesamt-Soll"
 
-#: accounts/doctype/journal_entry/journal_entry.py:802
+#: accounts/doctype/journal_entry/journal_entry.py:829
 msgid "Total Debit must be equal to Total Credit. The difference is {0}"
 msgstr "Gesamt-Soll muss gleich Gesamt-Haben sein. Die Differenz ist {0}"
 
@@ -74301,6 +75567,16 @@
 msgid "Total Income This Year"
 msgstr "Gesamteinkommen in diesem Jahr"
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
@@ -74311,9 +75587,10 @@
 #: accounts/doctype/dunning/dunning.json
 msgctxt "Dunning"
 msgid "Total Interest"
-msgstr ""
+msgstr "Gesamtzins"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:196
+#: accounts/report/accounts_receivable/accounts_receivable.html:160
 msgid "Total Invoiced Amount"
 msgstr "Gesamtrechnungsbetrag"
 
@@ -74321,6 +75598,10 @@
 msgid "Total Issues"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Total Items"
+msgstr ""
+
 #: accounts/report/balance_sheet/balance_sheet.py:208
 msgid "Total Liability"
 msgstr "Verbindlichkeiten"
@@ -74429,7 +75710,7 @@
 msgid "Total Order Value"
 msgstr "Gesamtbestellwert"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:629
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:635
 msgid "Total Other Charges"
 msgstr ""
 
@@ -74437,13 +75718,25 @@
 msgid "Total Outgoing"
 msgstr "Summe Auslieferungen"
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Total Outgoing Value (Consumption)"
 msgstr ""
 
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:9
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:97
+#: accounts/report/accounts_receivable/accounts_receivable.html:79
 msgid "Total Outstanding"
 msgstr "Summe ausstehende Beträge"
 
@@ -74454,18 +75747,20 @@
 msgstr "Summe ausstehende Beträge"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:205
+#: accounts/report/accounts_receivable/accounts_receivable.html:163
 msgid "Total Outstanding Amount"
 msgstr "Summe ausstehende Beträge"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:197
+#: accounts/report/accounts_receivable/accounts_receivable.html:161
 msgid "Total Paid Amount"
 msgstr "Summe gezahlte Beträge"
 
-#: controllers/accounts_controller.py:2266
+#: controllers/accounts_controller.py:2358
 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
 msgstr "Der gesamte Zahlungsbetrag im Zahlungsplan muss gleich Groß / Abgerundet sein"
 
-#: accounts/doctype/payment_request/payment_request.py:112
+#: accounts/doctype/payment_request/payment_request.py:115
 msgid "Total Payment Request amount cannot be greater than {0} amount"
 msgstr "Der Gesamtbetrag der Zahlungsanforderung darf nicht größer als {0} sein"
 
@@ -74497,7 +75792,7 @@
 msgid "Total Purchase Cost (via Purchase Invoice)"
 msgstr "Einkaufskosten (Eingangsrechnung)"
 
-#: projects/doctype/project/project.js:107
+#: projects/doctype/project/project.js:131
 msgid "Total Purchase Cost has been updated"
 msgstr ""
 
@@ -74513,6 +75808,8 @@
 msgstr "Gesamtmenge"
 
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:23
+#: selling/page/point_of_sale/pos_item_cart.js:520
+#: selling/page/point_of_sale/pos_item_cart.js:524
 msgid "Total Quantity"
 msgstr "Gesamtmenge"
 
@@ -74610,7 +75907,7 @@
 
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:260
 msgid "Total Sales Amount"
-msgstr ""
+msgstr "Gesamtumsatz"
 
 #. Label of a Currency field in DocType 'Project'
 #: projects/doctype/project/project.json
@@ -74623,17 +75920,22 @@
 msgid "Total Stock Summary"
 msgstr "Gesamt Stock Zusammenfassung"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Stock Value"
+msgstr ""
+
 #. Label of a Float field in DocType 'Purchase Order Item Supplied'
 #: buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
 msgctxt "Purchase Order Item Supplied"
 msgid "Total Supplied Qty"
-msgstr ""
+msgstr "Insgesamt gelieferte Menge"
 
 #. Label of a Float field in DocType 'Subcontracting Order Supplied Item'
 #: subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json
 msgctxt "Subcontracting Order Supplied Item"
 msgid "Total Supplied Qty"
-msgstr ""
+msgstr "Insgesamt gelieferte Menge"
 
 #: selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:130
 msgid "Total Target"
@@ -74645,7 +75947,7 @@
 msgid "Total Tasks"
 msgstr "Aufgaben insgesamt"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:622
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:628
 #: accounts/report/purchase_register/purchase_register.py:263
 msgid "Total Tax"
 msgstr "Summe Steuern"
@@ -74778,7 +76080,7 @@
 
 #: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py:132
 msgid "Total Time (in Mins)"
-msgstr ""
+msgstr "Gesamtzeit (in Min.)"
 
 #. Label of a Float field in DocType 'Job Card'
 #: manufacturing/doctype/job_card/job_card.json
@@ -74786,7 +76088,7 @@
 msgid "Total Time in Mins"
 msgstr "Gesamtzeit in Minuten"
 
-#: public/js/utils.js:105
+#: public/js/utils.js:129
 msgid "Total Unpaid: {0}"
 msgstr "Noch nicht bezahlt: {0}"
 
@@ -74806,7 +76108,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Total Value Difference (Incoming - Outgoing)"
-msgstr ""
+msgstr "Gesamtwertdifferenz (eingehend – ausgehend)"
 
 #: accounts/report/budget_variance_report/budget_variance_report.py:125
 #: selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:144
@@ -74817,6 +76119,11 @@
 msgid "Total Views"
 msgstr "Gesamte Aufrufe"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Warehouses"
+msgstr ""
+
 #. Label of a Float field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
 msgctxt "Delivery Note Item"
@@ -74877,26 +76184,40 @@
 msgid "Total Working Hours"
 msgstr "Gesamtarbeitszeit"
 
-#: controllers/accounts_controller.py:1838
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Total Working Hours"
+msgstr "Gesamtarbeitszeit"
+
+#: controllers/accounts_controller.py:1930
 msgid "Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})"
 msgstr "Insgesamt Voraus ({0}) gegen Bestellen {1} kann nicht größer sein als die Gesamtsumme ({2})"
 
-#: controllers/selling_controller.py:186
+#: controllers/selling_controller.py:187
 msgid "Total allocated percentage for sales team should be 100"
 msgstr "Insgesamt verteilte Prozentmenge für Vertriebsteam sollte 100 sein"
 
+#: manufacturing/doctype/workstation/workstation.py:229
+msgid "Total completed quantity: {0}"
+msgstr ""
+
 #: selling/doctype/customer/customer.py:157
 msgid "Total contribution percentage should be equal to 100"
 msgstr "Der prozentuale Gesamtbeitrag sollte 100 betragen"
 
+#: projects/doctype/project/project_dashboard.html:2
+msgid "Total hours: {0}"
+msgstr ""
+
 #: accounts/doctype/pos_invoice/pos_invoice.py:444
-#: accounts/doctype/sales_invoice/sales_invoice.py:505
+#: accounts/doctype/sales_invoice/sales_invoice.py:518
 msgid "Total payments amount can't be greater than {}"
 msgstr "Der Gesamtzahlungsbetrag darf nicht größer als {} sein."
 
 #: accounts/doctype/cost_center_allocation/cost_center_allocation.py:67
 msgid "Total percentage against cost centers should be 100"
-msgstr ""
+msgstr "Der Gesamtprozentsatz für die Kostenstellen sollte 100 betragen"
 
 #: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:765
 #: accounts/report/consolidated_financial_statement/consolidated_financial_statement.py:766
@@ -74905,7 +76226,7 @@
 msgid "Total {0} ({1})"
 msgstr "Insgesamt {0} ({1})"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:162
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:190
 msgid "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'"
 msgstr "Insgesamt {0} für alle Elemente gleich Null ist, sein kann, sollten Sie &quot;Verteilen Gebühren auf der Grundlage&quot; ändern"
 
@@ -74918,6 +76239,7 @@
 msgstr "Summe (Anzahl)"
 
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.py:88
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Totals"
 msgstr "Summen"
 
@@ -74994,7 +76316,7 @@
 #. Title of an Onboarding Step
 #: buying/onboarding_step/create_a_material_request/create_a_material_request.json
 msgid "Track Material Request"
-msgstr ""
+msgstr "Materialanforderung verfolgen"
 
 #. Label of a Check field in DocType 'Support Settings'
 #: support/doctype/support_settings/support_settings.json
@@ -75002,25 +76324,30 @@
 msgid "Track Service Level Agreement"
 msgstr "Service Level Agreement verfolgen"
 
+#. Description of a DocType
+#: accounts/doctype/cost_center/cost_center.json
+msgid "Track separate Income and Expense for product verticals or divisions."
+msgstr ""
+
 #. Label of a Select field in DocType 'Shipment'
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
 msgid "Tracking Status"
-msgstr ""
+msgstr "Tracking-Status"
 
 #. Label of a Data field in DocType 'Shipment'
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
 msgid "Tracking Status Info"
-msgstr ""
+msgstr "Tracking-Statusinformationen"
 
 #. Label of a Small Text field in DocType 'Shipment'
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
 msgid "Tracking URL"
-msgstr ""
+msgstr "Tracking-URL"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: manufacturing/doctype/workstation/workstation_dashboard.py:10
 msgid "Transaction"
 msgstr "Transaktion"
@@ -75062,7 +76389,7 @@
 msgstr "Transaktionswährung"
 
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:66
-#: selling/report/territory_wise_sales/territory_wise_sales.js:11
+#: selling/report/territory_wise_sales/territory_wise_sales.js:9
 msgid "Transaction Date"
 msgstr "Transaktionsdatum"
 
@@ -75102,12 +76429,21 @@
 msgid "Transaction Date"
 msgstr "Transaktionsdatum"
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:490
+msgid "Transaction Deletion Document: {0} is running for this Company. {1}"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
 msgid "Transaction Deletion Record"
 msgstr ""
 
 #. Name of a DocType
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgid "Transaction Deletion Record Details"
+msgstr ""
+
+#. Name of a DocType
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgid "Transaction Deletion Record Item"
 msgstr ""
@@ -75140,15 +76476,15 @@
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
 msgid "Transaction Settings"
-msgstr ""
+msgstr "Transaktionseinstellungen"
 
 #. Label of a Section Break field in DocType 'Selling Settings'
 #: selling/doctype/selling_settings/selling_settings.json
 msgctxt "Selling Settings"
 msgid "Transaction Settings"
-msgstr ""
+msgstr "Transaktionseinstellungen"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:256
 msgid "Transaction Type"
 msgstr "Art der Transaktion"
 
@@ -75158,7 +76494,7 @@
 msgid "Transaction Type"
 msgstr "Art der Transaktion"
 
-#: accounts/doctype/payment_request/payment_request.py:122
+#: accounts/doctype/payment_request/payment_request.py:125
 msgid "Transaction currency must be same as Payment Gateway currency"
 msgstr "Transaktionswährung muß gleiche wie Payment Gateway Währung"
 
@@ -75166,15 +76502,15 @@
 msgid "Transaction currency: {0} cannot be different from Bank Account({1}) currency: {2}"
 msgstr "Die Transaktionswährung: {0} darf sich nicht von der Währung des Bankkontos ({1}) unterscheiden: {2}"
 
-#: manufacturing/doctype/job_card/job_card.py:647
+#: manufacturing/doctype/job_card/job_card.py:654
 msgid "Transaction not allowed against stopped Work Order {0}"
 msgstr "Die Transaktion ist für den angehaltenen Arbeitsauftrag {0} nicht zulässig."
 
-#: accounts/doctype/payment_entry/payment_entry.py:1112
+#: accounts/doctype/payment_entry/payment_entry.py:1121
 msgid "Transaction reference no {0} dated {1}"
 msgstr "Transaktion Referenznummer {0} vom {1}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: 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
@@ -75189,12 +76525,12 @@
 msgid "Transactions Annual History"
 msgstr "Transaktionen Jährliche Geschichte"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:107
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:117
 msgid "Transactions against the Company already exist! Chart of Accounts can only be imported for a Company with no transactions."
-msgstr ""
+msgstr "Es gibt bereits Transaktionen für das Unternehmen! Kontenpläne können nur für ein Unternehmen ohne Transaktionen importiert werden."
 
-#: buying/doctype/purchase_order/purchase_order.js:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:364
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:208
 msgid "Transfer"
 msgstr "Übertragung"
 
@@ -75223,11 +76559,11 @@
 msgid "Transfer"
 msgstr "Übertragung"
 
-#: assets/doctype/asset/asset.js:83
+#: assets/doctype/asset/asset.js:84
 msgid "Transfer Asset"
 msgstr "Vermögensgegenstand übertragen"
 
-#: manufacturing/doctype/production_plan/production_plan.js:318
+#: manufacturing/doctype/production_plan/production_plan.js:345
 msgid "Transfer From Warehouses"
 msgstr ""
 
@@ -75243,7 +76579,7 @@
 msgid "Transfer Material Against"
 msgstr "Material übertragen gegen"
 
-#: manufacturing/doctype/production_plan/production_plan.js:313
+#: manufacturing/doctype/production_plan/production_plan.js:340
 msgid "Transfer Materials For Warehouse {0}"
 msgstr "Material für Lager übertragen {0}"
 
@@ -75263,7 +76599,7 @@
 msgid "Transfer Type"
 msgstr "Übertragungsart"
 
-#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:31
 msgid "Transferred"
 msgstr "Übergeben"
 
@@ -75273,6 +76609,7 @@
 msgid "Transferred"
 msgstr "Übergeben"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:96
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:131
 msgid "Transferred Qty"
 msgstr "Übergebene Menge"
@@ -75309,7 +76646,7 @@
 msgid "Transit"
 msgstr "Transit"
 
-#: stock/doctype/stock_entry/stock_entry.js:371
+#: stock/doctype/stock_entry/stock_entry.js:425
 msgid "Transit Entry"
 msgstr ""
 
@@ -75390,8 +76727,8 @@
 msgid "Tree Details"
 msgstr "Baum-Details"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:9
-#: selling/report/sales_analytics/sales_analytics.js:9
+#: buying/report/purchase_analytics/purchase_analytics.js:8
+#: selling/report/sales_analytics/sales_analytics.js:8
 msgid "Tree Type"
 msgstr "Struktur-Typ"
 
@@ -75671,10 +77008,11 @@
 #: 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
+#: 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:63 public/js/utils.js:632
-#: selling/doctype/sales_order/sales_order.js:999
+#: public/js/stock_analytics.js:94 public/js/utils.js:693
+#: 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
 #: setup/doctype/uom/uom.json
@@ -76005,7 +77343,7 @@
 msgid "UOM Conversion Factor"
 msgstr "Maßeinheit-Umrechnungsfaktor"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1248
+#: manufacturing/doctype/production_plan/production_plan.py:1270
 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
 msgstr "UOM-Umrechnungsfaktor ({0} -&gt; {1}) für Element nicht gefunden: {2}"
 
@@ -76019,7 +77357,7 @@
 msgid "UOM Name"
 msgstr "Maßeinheit-Name"
 
-#: stock/doctype/stock_entry/stock_entry.py:2773
+#: stock/doctype/stock_entry/stock_entry.py:2809
 msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
 msgstr ""
 
@@ -76063,7 +77401,7 @@
 msgid "URL can only be a string"
 msgstr "URL kann nur eine Zeichenfolge sein"
 
-#: public/js/utils/unreconcile.js:20
+#: public/js/utils/unreconcile.js:24
 msgid "UnReconcile"
 msgstr ""
 
@@ -76075,15 +77413,15 @@
 msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100"
 msgstr "Es konnte keine Punktzahl gefunden werden, die bei {0} beginnt. Sie benötigen eine Punktzahl zwischen 0 und 100."
 
-#: manufacturing/doctype/work_order/work_order.py:603
-msgid "Unable to find the time slot in the next {0} days for the operation {1}."
-msgstr "Das Zeitfenster in den nächsten {0} Tagen für den Vorgang {1} konnte nicht gefunden werden."
+#: manufacturing/doctype/work_order/work_order.py:613
+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
 msgid "Unable to find variable:"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:79
+#: public/js/bank_reconciliation_tool/data_table_manager.js:74
 msgid "Unallocated Amount"
 msgstr "Nicht zugewiesener Betrag"
 
@@ -76103,7 +77441,7 @@
 msgid "Unassigned Qty"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:115
 msgid "Unblock Invoice"
 msgstr "Rechnung entsperren"
 
@@ -76152,7 +77490,7 @@
 msgid "Under Warranty"
 msgstr "Innerhalb der Garantie"
 
-#: manufacturing/doctype/workstation/workstation.js:52
+#: manufacturing/doctype/workstation/workstation.js:78
 msgid "Under Working Hours table, you can add start and end times for a Workstation. For example, a Workstation may be active from 9 am to 1 pm, then 2 pm to 5 pm. You can also specify the working hours based on shifts. While scheduling a Work Order, the system will check for the availability of the Workstation based on the working hours specified."
 msgstr ""
 
@@ -76183,11 +77521,12 @@
 msgid "Units of Measure"
 msgstr "Maßeinheiten"
 
-#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:12
+#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:10
+#: projects/doctype/project/project_dashboard.html:7
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: public/js/call_popup/call_popup.js:109
+#: public/js/call_popup/call_popup.js:110
 msgid "Unknown Caller"
 msgstr "Unbekannter Anrufer"
 
@@ -76203,7 +77542,7 @@
 msgid "Unlink Payment on Cancellation of Invoice"
 msgstr "Zahlung bei Stornierung der Rechnung aufheben"
 
-#: accounts/doctype/bank_account/bank_account.js:34
+#: accounts/doctype/bank_account/bank_account.js:33
 msgid "Unlink external integrations"
 msgstr "Verknüpfung externer Integrationen aufheben"
 
@@ -76213,7 +77552,7 @@
 msgid "Unlinked"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:258
+#: accounts/doctype/sales_invoice/sales_invoice.py:263
 #: accounts/doctype/subscription/subscription_list.js:12
 msgid "Unpaid"
 msgstr "Unbezahlt"
@@ -76332,14 +77671,14 @@
 #: accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
 msgctxt "Payment Reconciliation Allocation"
 msgid "Unreconciled Amount"
-msgstr ""
+msgstr "Nicht abgestimmter Betrag"
 
 #. Label of a Currency field in DocType 'Process Payment Reconciliation Log
 #. Allocations'
 #: accounts/doctype/process_payment_reconciliation_log_allocations/process_payment_reconciliation_log_allocations.json
 msgctxt "Process Payment Reconciliation Log Allocations"
 msgid "Unreconciled Amount"
-msgstr ""
+msgstr "Nicht abgestimmter Betrag"
 
 #. Label of a Section Break field in DocType 'Payment Reconciliation'
 #: accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -76347,20 +77686,24 @@
 msgid "Unreconciled Entries"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:74
-#: stock/doctype/pick_list/pick_list.js:114
+#: selling/doctype/sales_order/sales_order.js:90
+#: stock/doctype/pick_list/pick_list.js:134
 msgid "Unreserve"
 msgstr "Reservierung aufheben"
 
-#: selling/doctype/sales_order/sales_order.js:418
+#: selling/doctype/sales_order/sales_order.js:448
 msgid "Unreserve Stock"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:430
-#: stock/doctype/pick_list/pick_list.js:252
+#: selling/doctype/sales_order/sales_order.js:460
+#: stock/doctype/pick_list/pick_list.js:286
 msgid "Unreserving Stock..."
 msgstr "Reservierung aufheben..."
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Unresolve"
+msgstr ""
+
 #: accounts/doctype/dunning/dunning_list.js:6
 msgid "Unresolved"
 msgstr "Ungeklärt"
@@ -76412,6 +77755,7 @@
 msgstr "Abgemeldet"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:37
+#: accounts/report/accounts_receivable/accounts_receivable.html:24
 msgid "Until"
 msgstr "Bis"
 
@@ -76439,22 +77783,23 @@
 msgid "Upcoming Calendar Events "
 msgstr "Bevorstehende Kalenderereignisse"
 
-#: accounts/doctype/account/account.js:210
-#: accounts/doctype/cost_center/cost_center.js:102
-#: public/js/bom_configurator/bom_configurator.bundle.js:367
-#: public/js/utils.js:551 public/js/utils.js:767
-#: public/js/utils/barcode_scanner.js:176
+#: 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/barcode_scanner.js:183
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:164
+#: templates/pages/task_info.html:22
 msgid "Update"
 msgstr "Aktualisieren"
 
-#: accounts/doctype/account/account.js:58
+#: accounts/doctype/account/account.js:53
 msgid "Update Account Name / Number"
 msgstr "Kontoname / Nummer aktualisieren"
 
-#: accounts/doctype/account/account.js:158
+#: accounts/doctype/account/account.js:159
 msgid "Update Account Number / Name"
 msgstr "Kontoname / Nummer aktualisieren"
 
@@ -76500,7 +77845,7 @@
 msgid "Update Auto Repeat Reference"
 msgstr "Auto-Repeat-Referenz aktualisieren"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:35
 msgid "Update BOM Cost Automatically"
 msgstr "Stücklisten-Kosten automatisch aktualisieren"
 
@@ -76529,6 +77874,18 @@
 msgid "Update Billed Amount in Delivery Note"
 msgstr ""
 
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Order"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Receipt"
+msgstr ""
+
 #. Label of a Check field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -76541,9 +77898,9 @@
 msgid "Update Billed Amount in Sales Order"
 msgstr "Aktualisierung des Rechnungsbetrags im Auftrag"
 
-#: accounts/doctype/bank_clearance/bank_clearance.js:57
-#: accounts/doctype/bank_clearance/bank_clearance.js:71
-#: accounts/doctype/bank_clearance/bank_clearance.js:76
+#: accounts/doctype/bank_clearance/bank_clearance.js:53
+#: accounts/doctype/bank_clearance/bank_clearance.js:67
+#: accounts/doctype/bank_clearance/bank_clearance.js:72
 msgid "Update Clearance Date"
 msgstr "Freigabedatum aktualisieren"
 
@@ -76553,7 +77910,7 @@
 msgid "Update Consumed Material Cost In Project"
 msgstr "Aktualisieren Sie die verbrauchten Materialkosten im Projekt"
 
-#: manufacturing/doctype/bom/bom.js:100
+#: manufacturing/doctype/bom/bom.js:99
 msgid "Update Cost"
 msgstr "Kosten aktualisieren"
 
@@ -76569,12 +77926,12 @@
 msgid "Update Cost"
 msgstr "Kosten aktualisieren"
 
-#: accounts/doctype/cost_center/cost_center.js:21
-#: accounts/doctype/cost_center/cost_center.js:50
+#: accounts/doctype/cost_center/cost_center.js:19
+#: accounts/doctype/cost_center/cost_center.js:52
 msgid "Update Cost Center Name / Number"
 msgstr "Name / Nummer der Kostenstelle aktualisieren"
 
-#: stock/doctype/pick_list/pick_list.js:99
+#: stock/doctype/pick_list/pick_list.js:104
 msgid "Update Current Stock"
 msgstr "Aktuellen Bestand aktualisieren"
 
@@ -76591,12 +77948,24 @@
 msgid "Update Existing Records"
 msgstr "Bestehende Datensätze aktualisieren"
 
-#: buying/doctype/purchase_order/purchase_order.js:275 public/js/utils.js:721
-#: selling/doctype/sales_order/sales_order.js:56
+#: buying/doctype/purchase_order/purchase_order.js:301 public/js/utils.js:793
+#: selling/doctype/sales_order/sales_order.js:63
 msgid "Update Items"
 msgstr "Artikel aktualisieren"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Update Print Format"
 msgstr "Druckformat aktualisieren"
 
@@ -76606,7 +77975,7 @@
 msgid "Update Rate and Availability"
 msgstr "Preis und Verfügbarkeit aktualisieren"
 
-#: buying/doctype/purchase_order/purchase_order.js:475
+#: buying/doctype/purchase_order/purchase_order.js:549
 msgid "Update Rate as per Last Purchase"
 msgstr "Rate gemäß dem letzten Kauf aktualisieren"
 
@@ -76639,7 +78008,7 @@
 msgid "Update Stock Opening Balance"
 msgstr ""
 
-#: projects/doctype/project/project.js:71
+#: projects/doctype/project/project.js:82
 msgid "Update Total Purchase Cost"
 msgstr ""
 
@@ -76661,7 +78030,7 @@
 msgid "Update latest price in all BOMs"
 msgstr "Aktualisieren des neuesten Preises in allen Stücklisten"
 
-#: assets/doctype/asset/asset.py:338
+#: assets/doctype/asset/asset.py:340
 msgid "Update stock must be enabled for the purchase invoice {0}"
 msgstr ""
 
@@ -76681,21 +78050,21 @@
 msgid "Updating Opening Balances"
 msgstr ""
 
-#: stock/doctype/item/item.py:1348
+#: stock/doctype/item/item.py:1349
 msgid "Updating Variants..."
 msgstr "Varianten werden aktualisiert ..."
 
-#: manufacturing/doctype/work_order/work_order.js:788
+#: manufacturing/doctype/work_order/work_order.js:847
 msgid "Updating Work Order status"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:48
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:46
 msgid "Updating {0} of {1}, {2}"
 msgstr "{0} von {1}, {2} wird aktualisiert"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:44
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:43
 msgid "Upload Bank Statement"
-msgstr ""
+msgstr "Kontoauszug hochladen"
 
 #. Label of a Section Break field in DocType 'Import Supplier Invoice'
 #: regional/doctype/import_supplier_invoice/import_supplier_invoice.json
@@ -76714,7 +78083,7 @@
 msgid "Urgent"
 msgstr "Dringend"
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:37
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:36
 msgid "Use 'Repost in background' button to trigger background job. Job can only be triggered when document is in Queued or Failed status."
 msgstr ""
 
@@ -76750,6 +78119,12 @@
 msgid "Use Google Maps Direction API to optimize route"
 msgstr "Verwenden Sie die Google Maps Direction API, um die Route zu optimieren"
 
+#. Label of a Check field in DocType 'Currency Exchange Settings'
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
+msgctxt "Currency Exchange Settings"
+msgid "Use HTTP Protocol"
+msgstr ""
+
 #. Label of a Check field in DocType 'Stock Reposting Settings'
 #: stock/doctype/stock_reposting_settings/stock_reposting_settings.json
 msgctxt "Stock Reposting Settings"
@@ -76768,6 +78143,84 @@
 msgid "Use Multi-Level BOM"
 msgstr "Mehrstufige Stückliste verwenden"
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Use Serial / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Asset Capitalization Stock Item'
+#: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
+msgctxt "Asset Capitalization Stock Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Delivery Note Item'
+#: stock/doctype/delivery_note_item/delivery_note_item.json
+msgctxt "Delivery Note Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'POS Invoice Item'
+#: accounts/doctype/pos_invoice_item/pos_invoice_item.json
+msgctxt "POS Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Packed Item'
+#: stock/doctype/packed_item/packed_item.json
+msgctxt "Packed Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Pick List Item'
+#: stock/doctype/pick_list_item/pick_list_item.json
+msgctxt "Pick List Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice Item'
+#: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+msgctxt "Purchase Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Receipt Item'
+#: stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+msgctxt "Purchase Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice Item'
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.json
+msgctxt "Sales Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Entry Detail'
+#: stock/doctype/stock_entry_detail/stock_entry_detail.json
+msgctxt "Stock Entry Detail"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Reconciliation Item'
+#: stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+msgctxt "Stock Reconciliation Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Item'
+#: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgctxt "Subcontracting Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Supplied Item'
+#: subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
+msgctxt "Subcontracting Receipt Supplied Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
 #. Label of a Check field in DocType 'Buying Settings'
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
@@ -76880,7 +78333,7 @@
 msgid "User ID not set for Employee {0}"
 msgstr "Benutzer-ID ist für Mitarbeiter {0} nicht eingegeben"
 
-#: accounts/doctype/journal_entry/journal_entry.js:544
+#: accounts/doctype/journal_entry/journal_entry.js:607
 msgid "User Remark"
 msgstr "Benutzerbemerkung"
 
@@ -76988,7 +78441,7 @@
 #: regional/doctype/south_africa_vat_settings/south_africa_vat_settings.json
 msgctxt "South Africa VAT Settings"
 msgid "VAT Accounts"
-msgstr ""
+msgstr "USt-Konten"
 
 #: regional/report/uae_vat_201/uae_vat_201.py:28
 msgid "VAT Amount (AED)"
@@ -76997,12 +78450,14 @@
 #. Name of a report
 #: regional/report/vat_audit_report/vat_audit_report.json
 msgid "VAT Audit Report"
-msgstr ""
+msgstr "USt-Prüfbericht"
 
+#: regional/report/uae_vat_201/uae_vat_201.html:47
 #: regional/report/uae_vat_201/uae_vat_201.py:115
 msgid "VAT on Expenses and All Other Inputs"
 msgstr ""
 
+#: regional/report/uae_vat_201/uae_vat_201.html:15
 #: regional/report/uae_vat_201/uae_vat_201.py:45
 msgid "VAT on Sales and All Other Outputs"
 msgstr ""
@@ -77055,10 +78510,6 @@
 msgid "Valid From"
 msgstr "Gültig ab"
 
-#: stock/doctype/item_price/item_price.py:62
-msgid "Valid From Date must be lesser than Valid Up To Date."
-msgstr "\"Gültig ab\" Datum muss vor \"Gültig bis\" Datum liegen."
-
 #: regional/doctype/lower_deduction_certificate/lower_deduction_certificate.py:45
 msgid "Valid From date not in Fiscal Year {0}"
 msgstr "Gültig ab Datum nicht im Geschäftsjahr {0}"
@@ -77068,7 +78519,7 @@
 msgstr ""
 
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:265
-#: templates/pages/order.html:47
+#: templates/pages/order.html:59
 msgid "Valid Till"
 msgstr "Gültig bis"
 
@@ -77212,7 +78663,7 @@
 msgstr "Bewertung"
 
 #: stock/report/stock_balance/stock_balance.js:76
-#: stock/report/stock_ledger/stock_ledger.js:88
+#: stock/report/stock_ledger/stock_ledger.js:96
 msgid "Valuation Field Type"
 msgstr ""
 
@@ -77229,8 +78680,8 @@
 #: accounts/report/gross_profit/gross_profit.py:266
 #: 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:449
-#: stock/report/stock_ledger/stock_ledger.py:207
+#: stock/report/stock_balance/stock_balance.py:457
+#: stock/report/stock_ledger/stock_ledger.py:280
 msgid "Valuation Rate"
 msgstr "Wertansatz"
 
@@ -77295,6 +78746,12 @@
 msgid "Valuation Rate"
 msgstr "Wertansatz"
 
+#. Label of a Float field in DocType 'Serial and Batch Entry'
+#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
+msgctxt "Serial and Batch Entry"
+msgid "Valuation Rate"
+msgstr "Wertansatz"
+
 #. Label of a Currency field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
@@ -77317,11 +78774,11 @@
 msgid "Valuation Rate (In / Out)"
 msgstr ""
 
-#: stock/stock_ledger.py:1688
+#: stock/stock_ledger.py:1708
 msgid "Valuation Rate Missing"
 msgstr "Bewertungsrate fehlt"
 
-#: stock/stock_ledger.py:1666
+#: stock/stock_ledger.py:1686
 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
 msgstr "Der Bewertungssatz für den Posten {0} ist erforderlich, um Buchhaltungseinträge für {1} {2} vorzunehmen."
 
@@ -77329,7 +78786,7 @@
 msgid "Valuation Rate is mandatory if Opening Stock entered"
 msgstr "Bewertungskurs ist obligatorisch, wenn Öffnung Stock eingegeben"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:514
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:568
 msgid "Valuation Rate required for Item {0} at row {1}"
 msgstr "Bewertungssatz für Position {0} in Zeile {1} erforderlich"
 
@@ -77340,12 +78797,12 @@
 msgid "Valuation and Total"
 msgstr "Bewertung und Summe"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:731
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:785
 msgid "Valuation rate for customer provided items has been set to zero."
 msgstr "Die Bewertungsrate für von Kunden beigestellte Artikel wurde auf Null gesetzt."
 
-#: accounts/doctype/payment_entry/payment_entry.py:1649
-#: controllers/accounts_controller.py:2583
+#: accounts/doctype/payment_entry/payment_entry.py:1668
+#: controllers/accounts_controller.py:2668
 msgid "Valuation type charges can not be marked as Inclusive"
 msgstr "Bewertungsgebühren können nicht als Inklusiv gekennzeichnet werden"
 
@@ -77353,10 +78810,10 @@
 msgid "Valuation type charges can not marked as Inclusive"
 msgstr "Bewertungsart Gebühren kann nicht als \"inklusive\" markiert werden"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:28
-#: public/js/stock_analytics.js:37
-#: selling/report/sales_analytics/sales_analytics.js:28
-#: stock/report/stock_analytics/stock_analytics.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:27
+#: public/js/stock_analytics.js:49
+#: selling/report/sales_analytics/sales_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:26
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:95
 msgid "Value"
 msgstr "Wert"
@@ -77419,7 +78876,7 @@
 msgid "Value Based Inspection"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:224
+#: stock/report/stock_ledger/stock_ledger.py:297
 msgid "Value Change"
 msgstr "Wertänderung"
 
@@ -77429,9 +78886,9 @@
 msgid "Value Details"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:25
-#: selling/report/sales_analytics/sales_analytics.js:25
-#: stock/report/stock_analytics/stock_analytics.js:24
+#: buying/report/purchase_analytics/purchase_analytics.js:24
+#: selling/report/sales_analytics/sales_analytics.js:32
+#: stock/report/stock_analytics/stock_analytics.js:23
 msgid "Value Or Qty"
 msgstr "Wert oder Menge"
 
@@ -77453,11 +78910,11 @@
 msgid "Value of goods cannot be 0"
 msgstr ""
 
-#: public/js/stock_analytics.js:36
+#: public/js/stock_analytics.js:46
 msgid "Value or Qty"
 msgstr "Wert oder Menge"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:120
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:121
 msgid "Values Changed"
 msgstr "Werte geändert"
 
@@ -77488,7 +78945,7 @@
 msgid "Variance ({})"
 msgstr "Varianz ({})"
 
-#: stock/doctype/item/item.js:110 stock/doctype/item/item_list.js:14
+#: stock/doctype/item/item.js:146 stock/doctype/item/item_list.js:22
 #: stock/report/item_variant_details/item_variant_details.py:74
 msgid "Variant"
 msgstr "Variante"
@@ -77497,13 +78954,17 @@
 msgid "Variant Attribute Error"
 msgstr "Variantenattributfehler"
 
+#: public/js/templates/item_quick_entry.html:1
+msgid "Variant Attributes"
+msgstr "Variantenattribute"
+
 #. Label of a Table field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
 msgid "Variant Attributes"
 msgstr "Variantenattribute"
 
-#: manufacturing/doctype/bom/bom.js:124
+#: manufacturing/doctype/bom/bom.js:128
 msgid "Variant BOM"
 msgstr "Variantenstückliste"
 
@@ -77517,7 +78978,7 @@
 msgid "Variant Based On cannot be changed"
 msgstr "Variant Based On kann nicht geändert werden"
 
-#: stock/doctype/item/item.js:98
+#: stock/doctype/item/item.js:122
 msgid "Variant Details Report"
 msgstr "Bericht der Variantendetails"
 
@@ -77526,7 +78987,7 @@
 msgid "Variant Field"
 msgstr "Variantenfeld"
 
-#: manufacturing/doctype/bom/bom.js:219 manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/bom/bom.js:238 manufacturing/doctype/bom/bom.js:300
 msgid "Variant Item"
 msgstr "Variantenartikel"
 
@@ -77546,7 +79007,7 @@
 msgid "Variant Of"
 msgstr "Variante von"
 
-#: stock/doctype/item/item.js:543
+#: stock/doctype/item/item.js:610
 msgid "Variant creation has been queued."
 msgstr "Variantenerstellung wurde der Warteschlange hinzugefügt"
 
@@ -77645,37 +79106,37 @@
 msgid "Video Settings"
 msgstr "Video-Einstellungen"
 
-#: accounts/doctype/account/account.js:79
+#: accounts/doctype/account/account.js:74
 #: accounts/doctype/account/account.js:103
-#: accounts/doctype/account/account_tree.js:135
-#: accounts/doctype/account/account_tree.js:139
-#: accounts/doctype/account/account_tree.js:143
-#: accounts/doctype/cost_center/cost_center_tree.js:37
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:202
-#: accounts/doctype/journal_entry/journal_entry.js:29
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:619
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:8
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:11
-#: buying/doctype/supplier/supplier.js:88
-#: buying/doctype/supplier/supplier.js:92
-#: manufacturing/doctype/production_plan/production_plan.js:94
-#: projects/doctype/project/project.js:84
-#: projects/doctype/project/project.js:92
-#: public/js/controllers/stock_controller.js:64
-#: public/js/controllers/stock_controller.js:83 public/js/utils.js:133
-#: selling/doctype/customer/customer.js:157
-#: selling/doctype/customer/customer.js:162 setup/doctype/company/company.js:88
-#: setup/doctype/company/company.js:94 setup/doctype/company/company.js:100
-#: setup/doctype/company/company.js:106
-#: stock/doctype/delivery_trip/delivery_trip.js:71
-#: stock/doctype/item/item.js:63 stock/doctype/item/item.js:69
-#: stock/doctype/item/item.js:75 stock/doctype/item/item.js:92
-#: stock/doctype/item/item.js:96 stock/doctype/item/item.js:100
-#: stock/doctype/purchase_receipt/purchase_receipt.js:182
-#: stock/doctype/purchase_receipt/purchase_receipt.js:189
-#: stock/doctype/stock_entry/stock_entry.js:257
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:41
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:53
+#: accounts/doctype/account/account_tree.js:185
+#: accounts/doctype/account/account_tree.js:193
+#: accounts/doctype/account/account_tree.js:201
+#: accounts/doctype/cost_center/cost_center_tree.js:56
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:205
+#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:668
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
+#: buying/doctype/supplier/supplier.js:93
+#: buying/doctype/supplier/supplier.js:104
+#: manufacturing/doctype/production_plan/production_plan.js:98
+#: projects/doctype/project/project.js:100
+#: projects/doctype/project/project.js:117
+#: public/js/controllers/stock_controller.js:76
+#: public/js/controllers/stock_controller.js:95 public/js/utils.js:164
+#: selling/doctype/customer/customer.js:160
+#: selling/doctype/customer/customer.js:172 setup/doctype/company/company.js:90
+#: setup/doctype/company/company.js:100 setup/doctype/company/company.js:112
+#: setup/doctype/company/company.js:124
+#: stock/doctype/delivery_trip/delivery_trip.js:83
+#: stock/doctype/item/item.js:65 stock/doctype/item/item.js:75
+#: stock/doctype/item/item.js:85 stock/doctype/item/item.js:110
+#: stock/doctype/item/item.js:118 stock/doctype/item/item.js:126
+#: stock/doctype/purchase_receipt/purchase_receipt.js:207
+#: stock/doctype/purchase_receipt/purchase_receipt.js:218
+#: stock/doctype/stock_entry/stock_entry.js:287
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:44
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:60
 msgid "View"
 msgstr "Ansicht"
 
@@ -77683,7 +79144,7 @@
 msgid "View BOM Update Log"
 msgstr ""
 
-#: public/js/setup_wizard.js:39
+#: public/js/setup_wizard.js:41
 msgid "View Chart of Accounts"
 msgstr "Kontenplan anzeigen"
 
@@ -77693,24 +79154,24 @@
 msgid "View Cost Center Tree"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:158
+#: accounts/doctype/payment_entry/payment_entry.js:183
 msgid "View Exchange Gain/Loss Journals"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:128
+#: assets/doctype/asset/asset.js:164
 #: assets/doctype/asset_repair/asset_repair.js:47
 msgid "View General Ledger"
-msgstr ""
+msgstr "Hauptbuch anzeigen"
 
-#: crm/doctype/campaign/campaign.js:11
+#: crm/doctype/campaign/campaign.js:15
 msgid "View Leads"
 msgstr "Interessenten anzeigen"
 
-#: accounts/doctype/account/account_tree.js:193 stock/doctype/batch/batch.js:18
+#: accounts/doctype/account/account_tree.js:278 stock/doctype/batch/batch.js:18
 msgid "View Ledger"
 msgstr "Hauptbuch anzeigen"
 
-#: stock/doctype/serial_no/serial_no.js:29
+#: stock/doctype/serial_no/serial_no.js:28
 msgid "View Ledgers"
 msgstr ""
 
@@ -77725,7 +79186,7 @@
 #. Title of an Onboarding Step
 #: stock/onboarding_step/view_warehouses/view_warehouses.json
 msgid "View Warehouses"
-msgstr ""
+msgstr "Lager anzeigen"
 
 #. Label of a Check field in DocType 'Project User'
 #: projects/doctype/project_user/project_user.json
@@ -77733,6 +79194,10 @@
 msgid "View attachments"
 msgstr "Anhänge anzeigen"
 
+#: public/js/call_popup/call_popup.js:186
+msgid "View call log"
+msgstr ""
+
 #: utilities/report/youtube_interactions/youtube_interactions.py:25
 msgid "Views"
 msgstr "Aufrufe"
@@ -77763,7 +79228,7 @@
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.json
 msgctxt "Maintenance Schedule"
 msgid "Visits"
-msgstr ""
+msgstr "Besuche"
 
 #. Option for the 'Communication Medium Type' (Select) field in DocType
 #. 'Communication Medium'
@@ -77775,16 +79240,16 @@
 #. Name of a DocType
 #: telephony/doctype/voice_call_settings/voice_call_settings.json
 msgid "Voice Call Settings"
-msgstr ""
+msgstr "Sprachanruf-Einstellungen"
 
 #: accounts/report/purchase_register/purchase_register.py:163
 #: accounts/report/sales_register/sales_register.py:177
 msgid "Voucher"
-msgstr ""
+msgstr "Beleg"
 
-#: stock/report/stock_ledger/stock_ledger.js:71
-#: stock/report/stock_ledger/stock_ledger.py:160
-#: stock/report/stock_ledger/stock_ledger.py:232
+#: stock/report/stock_ledger/stock_ledger.js:79
+#: stock/report/stock_ledger/stock_ledger.py:233
+#: stock/report/stock_ledger/stock_ledger.py:305
 msgid "Voucher #"
 msgstr "Beleg #"
 
@@ -77822,23 +79287,23 @@
 #: accounts/doctype/tax_withheld_vouchers/tax_withheld_vouchers.json
 msgctxt "Tax Withheld Vouchers"
 msgid "Voucher Name"
-msgstr ""
+msgstr "Beleg"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:273
-#: accounts/report/accounts_receivable/accounts_receivable.py:1050
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: accounts/report/accounts_receivable/accounts_receivable.py:1058
 #: 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_ledger/general_ledger.js:49
-#: accounts/report/general_ledger/general_ledger.py:625
-#: accounts/report/payment_ledger/payment_ledger.js:65
+#: accounts/report/general_ledger/general_ledger.py:638
+#: 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:61
+#: 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/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/reserved_stock/reserved_stock.js:80
+#: 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
@@ -77905,43 +79370,43 @@
 
 #: stock/report/reserved_stock/reserved_stock.py:117
 msgid "Voucher Qty"
-msgstr ""
+msgstr "Beleg Menge"
 
 #. Label of a Float field in DocType 'Stock Reservation Entry'
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 msgctxt "Stock Reservation Entry"
 msgid "Voucher Qty"
-msgstr ""
+msgstr "Beleg Menge"
 
-#: accounts/report/general_ledger/general_ledger.py:619
+#: accounts/report/general_ledger/general_ledger.py:632
 msgid "Voucher Subtype"
-msgstr ""
+msgstr "Beleg Untertyp"
 
 #. Label of a Small Text field in DocType 'GL Entry'
 #: accounts/doctype/gl_entry/gl_entry.json
 msgctxt "GL Entry"
 msgid "Voucher Subtype"
-msgstr ""
+msgstr "Beleg Untertyp"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1048
+#: 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:617
+#: accounts/report/general_ledger/general_ledger.py:630
 #: 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/voucher_wise_balance/voucher_wise_balance.py:17
-#: public/js/utils/unreconcile.js:60
+#: 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/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/reserved_stock/reserved_stock.js:68
+#: 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_ledger/stock_ledger.py:230
+#: 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
 msgid "Voucher Type"
@@ -78013,11 +79478,11 @@
 msgid "Voucher Type"
 msgstr "Belegtyp"
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:177
+#: accounts/doctype/bank_transaction/bank_transaction.py:180
 msgid "Voucher {0} is over-allocated by {1}"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:249
+#: accounts/doctype/bank_transaction/bank_transaction.py:252
 msgid "Voucher {0} value is broken: {1}"
 msgstr ""
 
@@ -78106,12 +79571,12 @@
 msgid "Wages per hour"
 msgstr "Lohn pro Stunde"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:251
+#: accounts/doctype/pos_invoice/pos_invoice.js:270
 msgid "Waiting for payment..."
-msgstr ""
+msgstr "Warte auf Zahlung..."
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:55
+#: accounts/report/gross_profit/gross_profit.js:56
 #: accounts/report/gross_profit/gross_profit.py:251
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
 #: accounts/report/purchase_register/purchase_register.js:52
@@ -78119,58 +79584,62 @@
 #: 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
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:16
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:11
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:82
+#: 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/work_order_stock_report/work_order_stock_report.js:9
-#: public/js/stock_analytics.js:45 public/js/utils.js:498
-#: public/js/utils/serial_no_batch_selector.js:90
-#: selling/doctype/sales_order/sales_order.js:300
-#: selling/doctype/sales_order/sales_order.js:401
-#: selling/report/sales_order_analysis/sales_order_analysis.js:49
+#: 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/utils/serial_no_batch_selector.js:94
+#: selling/doctype/sales_order/sales_order.js:327
+#: selling/doctype/sales_order/sales_order.js:431
+#: selling/report/sales_order_analysis/sales_order_analysis.js:48
 #: selling/report/sales_order_analysis/sales_order_analysis.py:334
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:78
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:79
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:256
 #: stock/doctype/warehouse/warehouse.json
 #: stock/page/stock_balance/stock_balance.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:22
+#: 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/item_price_stock/item_price_stock.py:27
-#: stock/report/item_shortage_report/item_shortage_report.js:18
+#: stock/report/item_shortage_report/item_shortage_report.js:17
 #: stock/report/item_shortage_report/item_shortage_report.py:81
 #: stock/report/product_bundle_balance/product_bundle_balance.js:42
 #: stock/report/product_bundle_balance/product_bundle_balance.py:89
-#: stock/report/reserved_stock/reserved_stock.js:44
+#: stock/report/reserved_stock/reserved_stock.js:41
 #: stock/report/reserved_stock/reserved_stock.py:96
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:140
-#: stock/report/serial_no_ledger/serial_no_ledger.js:22
+#: 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_analytics/stock_analytics.js:50
+#: stock/report/stock_analytics/stock_analytics.js:49
 #: stock/report/stock_balance/stock_balance.js:51
-#: stock/report/stock_balance/stock_balance.py:376
+#: stock/report/stock_balance/stock_balance.py:384
 #: stock/report/stock_ledger/stock_ledger.js:30
-#: stock/report/stock_ledger/stock_ledger.py:167
+#: stock/report/stock_ledger/stock_ledger.py:240
 #: stock/report/stock_ledger_variance/stock_ledger_variance.js:38
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:55
 #: 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:17
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:39
+#: 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
+#: templates/form_grid/material_request_grid.html:8
+#: templates/form_grid/stock_entry_grid.html:9
 msgid "Warehouse"
 msgstr "Lager"
 
@@ -78228,12 +79697,24 @@
 msgid "Warehouse"
 msgstr "Lager"
 
+#. Label of a Link field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Warehouse"
+msgstr "Lager"
+
 #. Label of a Link field in DocType 'Pick List Item'
 #: stock/doctype/pick_list_item/pick_list_item.json
 msgctxt "Pick List Item"
 msgid "Warehouse"
 msgstr "Lager"
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Warehouse"
+msgstr "Lager"
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -78368,6 +79849,12 @@
 msgid "Warehouse"
 msgstr "Lager"
 
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Warehouse"
+msgstr "Lager"
+
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:4
 msgid "Warehouse Capacity Summary"
 msgstr "Zusammenfassung der Lagerkapazität"
@@ -78392,11 +79879,11 @@
 #: subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
 msgctxt "Subcontracting Order Item"
 msgid "Warehouse Details"
-msgstr ""
+msgstr "Lagerdetails"
 
 #: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py:113
 msgid "Warehouse Disabled?"
-msgstr ""
+msgstr "Lager deaktiviert?"
 
 #. Label of a Data field in DocType 'Warehouse'
 #: stock/doctype/warehouse/warehouse.json
@@ -78408,7 +79895,7 @@
 #: buying/doctype/purchase_order_item/purchase_order_item.json
 msgctxt "Purchase Order Item"
 msgid "Warehouse Settings"
-msgstr ""
+msgstr "Lagereinstellungen"
 
 #. Name of a DocType
 #: stock/doctype/warehouse_type/warehouse_type.json
@@ -78433,7 +79920,7 @@
 #: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.json
 #: stock/workspace/stock/stock.json
 msgid "Warehouse Wise Stock Balance"
-msgstr ""
+msgstr "Bestand nach Lager"
 
 #. Label of a Section Break field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
@@ -78493,12 +79980,12 @@
 msgid "Warehouse not found against the account {0}"
 msgstr "Lager für Konto {0} nicht gefunden"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:367
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:421
 msgid "Warehouse not found in the system"
 msgstr "Lager im System nicht gefunden"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1005
-#: stock/doctype/delivery_note/delivery_note.py:362
+#: accounts/doctype/sales_invoice/sales_invoice.py:1022
+#: stock/doctype/delivery_note/delivery_note.py:416
 msgid "Warehouse required for stock Item {0}"
 msgstr "Angabe des Lagers ist für den Lagerartikel {0} erforderlich"
 
@@ -78518,25 +80005,25 @@
 
 #: stock/doctype/putaway_rule/putaway_rule.py:66
 msgid "Warehouse {0} does not belong to Company {1}."
-msgstr ""
+msgstr "Lager {0} gehört nicht zu Unternehmen {1}."
 
-#: stock/utils.py:441
+#: stock/utils.py:436
 msgid "Warehouse {0} does not belong to company {1}"
 msgstr "Lager {0} gehört nicht zu Unternehmen {1}"
 
-#: controllers/stock_controller.py:244
+#: controllers/stock_controller.py:426
 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 ""
+msgstr "Das Lager {0} ist mit keinem Konto verknüpft. Bitte geben Sie das Konto im Lagerdatensatz an oder legen Sie im Unternehmen {1} das Standardbestandskonto fest."
 
 #: stock/doctype/warehouse/warehouse.py:139
 msgid "Warehouse's Stock Value has already been booked in the following accounts:"
-msgstr ""
+msgstr "Der Lagerbestandswert wurde bereits auf den folgenden Konten gebucht:"
 
 #: stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:20
 msgid "Warehouse: {0} does not belong to {1}"
 msgstr "Lager: {0} gehört nicht zu {1}"
 
-#: manufacturing/doctype/production_plan/production_plan.js:379
+#: manufacturing/doctype/production_plan/production_plan.js:407
 msgid "Warehouses"
 msgstr "Lager"
 
@@ -78646,30 +80133,30 @@
 msgid "Warn for new Request for Quotations"
 msgstr "Warnung für neue Angebotsanfrage"
 
-#: accounts/doctype/payment_entry/payment_entry.py:639
-#: controllers/accounts_controller.py:1676
-#: stock/doctype/delivery_trip/delivery_trip.js:123
+#: accounts/doctype/payment_entry/payment_entry.py:648
+#: controllers/accounts_controller.py:1765
+#: stock/doctype/delivery_trip/delivery_trip.js:144
 #: utilities/transaction_base.py:122
 msgid "Warning"
 msgstr "Warnung"
 
 #: projects/doctype/timesheet/timesheet.py:76
 msgid "Warning - Row {0}: Billing Hours are more than Actual Hours"
-msgstr ""
+msgstr "Warnung - Zeile {0}: Abgerechnete Stunden sind mehr als tatsächliche Stunden"
 
 #: accounts/doctype/cost_center_allocation/cost_center_allocation.py:116
 msgid "Warning!"
 msgstr "Warnung!"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1146
+#: accounts/doctype/journal_entry/journal_entry.py:1173
 msgid "Warning: Another {0} # {1} exists against stock entry {2}"
 msgstr "Achtung: Zu Lagerbuchung {2} gibt es eine andere Gegenbuchung {0} # {1}"
 
-#: stock/doctype/material_request/material_request.js:415
+#: stock/doctype/material_request/material_request.js:484
 msgid "Warning: Material Requested Qty is less than Minimum Order Qty"
 msgstr "Achtung : Materialanfragemenge ist geringer als die Mindestbestellmenge"
 
-#: selling/doctype/sales_order/sales_order.py:252
+#: selling/doctype/sales_order/sales_order.py:254
 msgid "Warning: Sales Order {0} already exists against Customer's Purchase Order {1}"
 msgstr "Warnung: Auftrag {0} zu Kunden-Bestellung bereits vorhanden {1}"
 
@@ -78691,7 +80178,7 @@
 msgstr "Status der Garantie / des jährlichen Wartungsvertrags"
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:97
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:103
 #: support/doctype/warranty_claim/warranty_claim.json
 msgid "Warranty Claim"
 msgstr "Garantieanspruch"
@@ -78731,6 +80218,10 @@
 msgid "Watch Video"
 msgstr "Schau Video"
 
+#: controllers/accounts_controller.py:232
+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 ""
+
 #: www/support/index.html:7
 msgid "We're here to help!"
 msgstr "Wir sind hier um zu helfen!"
@@ -78932,7 +80423,7 @@
 #: selling/report/sales_analytics/sales_analytics.py:316
 #: stock/report/stock_analytics/stock_analytics.py:115
 msgid "Week {0} {1}"
-msgstr ""
+msgstr "Woche {0} {1}"
 
 #. Label of a Select field in DocType 'Quality Goal'
 #: quality_management/doctype/quality_goal/quality_goal.json
@@ -78940,12 +80431,12 @@
 msgid "Weekday"
 msgstr "Wochentag"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:34
-#: public/js/stock_analytics.js:52
-#: selling/report/sales_analytics/sales_analytics.js:61
-#: stock/report/stock_analytics/stock_analytics.js:80
-#: support/report/issue_analytics/issue_analytics.js:42
+#: buying/report/purchase_analytics/purchase_analytics.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:33
+#: public/js/stock_analytics.js:82
+#: selling/report/sales_analytics/sales_analytics.js:68
+#: stock/report/stock_analytics/stock_analytics.js:79
+#: support/report/issue_analytics/issue_analytics.js:41
 msgid "Weekly"
 msgstr "Wöchentlich"
 
@@ -79030,13 +80521,13 @@
 #: stock/doctype/shipment_parcel/shipment_parcel.json
 msgctxt "Shipment Parcel"
 msgid "Weight (kg)"
-msgstr ""
+msgstr "Gewicht (Kg)"
 
 #. Label of a Float field in DocType 'Shipment Parcel Template'
 #: stock/doctype/shipment_parcel_template/shipment_parcel_template.json
 msgctxt "Shipment Parcel Template"
 msgid "Weight (kg)"
-msgstr ""
+msgstr "Gewicht (Kg)"
 
 #. Label of a Float field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
@@ -79202,15 +80693,22 @@
 msgid "Wheels"
 msgstr "Räder"
 
-#: stock/doctype/item/item.js:834
-msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend."
+#. Description of the 'Sub Assembly Warehouse' (Link) field in DocType
+#. 'Production Plan'
+#: manufacturing/doctype/production_plan/production_plan.json
+msgctxt "Production Plan"
+msgid "When a parent warehouse is chosen, the system conducts stock checks against the associated child warehouses"
 msgstr ""
 
-#: accounts/doctype/account/account.py:313
+#: stock/doctype/item/item.js:920
+msgid "When creating an Item, entering a value for this field will automatically create an Item Price at the backend."
+msgstr "Wenn Sie bei der Erstellung eines Artikels einen Wert für dieses Feld eingeben, wird automatisch ein Artikelpreis erstellt."
+
+#: accounts/doctype/account/account.py:332
 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account."
 msgstr "Beim Erstellen eines Kontos für die untergeordnete Firma {0} wurde das übergeordnete Konto {1} als Sachkonto gefunden."
 
-#: accounts/doctype/account/account.py:303
+#: accounts/doctype/account/account.py:322
 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA"
 msgstr "Beim Erstellen eines Kontos für die untergeordnete Firma {0} wurde das übergeordnete Konto {1} nicht gefunden. Bitte erstellen Sie das übergeordnete Konto in der entsprechenden COA"
 
@@ -79219,7 +80717,7 @@
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
 msgid "While making Purchase Invoice from Purchase Order, use Exchange Rate on Invoice's transaction date rather than inheriting it from Purchase Order. Only applies for Purchase Invoice."
-msgstr ""
+msgstr "Einzelpreis am Transaktionsdatum der Rechnung verwenden, anstatt ihn aus dem Lieferantenauftrag zu übernehmen. Gilt nur für Eingangsrechnungen."
 
 #: setup/setup_wizard/operations/install_fixtures.py:237
 msgid "White"
@@ -79235,13 +80733,13 @@
 #: stock/doctype/shipment_parcel/shipment_parcel.json
 msgctxt "Shipment Parcel"
 msgid "Width (cm)"
-msgstr ""
+msgstr "Breite (cm)"
 
 #. Label of a Int field in DocType 'Shipment Parcel Template'
 #: stock/doctype/shipment_parcel_template/shipment_parcel_template.json
 msgctxt "Shipment Parcel Template"
 msgid "Width (cm)"
-msgstr ""
+msgstr "Breite (cm)"
 
 #. Label of a Float field in DocType 'Cheque Print Template'
 #: accounts/doctype/cheque_print_template/cheque_print_template.json
@@ -79273,15 +80771,19 @@
 msgid "With Operations"
 msgstr "Mit Arbeitsgängen"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:70
-msgid "Withdrawal"
+#: accounts/report/trial_balance/trial_balance.js:82
+msgid "With Period Closing Entry For Opening Balances"
 msgstr ""
 
+#: public/js/bank_reconciliation_tool/data_table_manager.js:67
+msgid "Withdrawal"
+msgstr "Auszahlung"
+
 #. Label of a Currency field in DocType 'Bank Transaction'
 #: accounts/doctype/bank_transaction/bank_transaction.json
 msgctxt "Bank Transaction"
 msgid "Withdrawal"
-msgstr ""
+msgstr "Auszahlung"
 
 #. Label of a Small Text field in DocType 'Maintenance Visit Purpose'
 #: maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
@@ -79289,7 +80791,7 @@
 msgid "Work Done"
 msgstr "Arbeit erledigt"
 
-#: setup/doctype/company/company.py:261
+#: setup/doctype/company/company.py:260
 msgid "Work In Progress"
 msgstr "Laufende Arbeit/-en"
 
@@ -79311,7 +80813,7 @@
 msgid "Work In Progress"
 msgstr "Laufende Arbeit/-en"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:20
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:23
 msgid "Work In Progress Warehouse"
 msgstr "In Arbeit befindliches Lager"
 
@@ -79319,19 +80821,20 @@
 #. Title of an Onboarding Step
 #: manufacturing/doctype/bom/bom.js:119
 #: manufacturing/doctype/work_order/work_order.json
+#: manufacturing/doctype/workstation/workstation_job_card.html:26
 #: manufacturing/onboarding_step/work_order/work_order.json
-#: manufacturing/report/bom_variance_report/bom_variance_report.js: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:42
+#: 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/job_card_summary/job_card_summary.py:145
-#: manufacturing/report/process_loss_report/process_loss_report.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:22
 #: manufacturing/report/process_loss_report/process_loss_report.py:68
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:30
+#: 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:560
-#: stock/doctype/material_request/material_request.js:152
-#: stock/doctype/material_request/material_request.py:779
+#: selling/doctype/sales_order/sales_order.js:624
+#: stock/doctype/material_request/material_request.js:178
+#: stock/doctype/material_request/material_request.py:791
 #: templates/pages/material_request_info.html:45
 msgid "Work Order"
 msgstr "Arbeitsauftrag"
@@ -79382,7 +80885,7 @@
 msgid "Work Order"
 msgstr "Arbeitsauftrag"
 
-#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:121
 msgid "Work Order / Subcontract PO"
 msgstr ""
 
@@ -79429,33 +80932,33 @@
 msgid "Work Order Summary"
 msgstr "Arbeitsauftragsübersicht"
 
-#: stock/doctype/material_request/material_request.py:784
+#: stock/doctype/material_request/material_request.py:796
 msgid "Work Order cannot be created for following reason: <br> {0}"
 msgstr "Arbeitsauftrag kann aus folgenden Gründen nicht erstellt werden:<br> {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:927
+#: manufacturing/doctype/work_order/work_order.py:941
 msgid "Work Order cannot be raised against a Item Template"
 msgstr "Arbeitsauftrag kann nicht gegen eine Artikelbeschreibungsvorlage ausgelöst werden"
 
-#: manufacturing/doctype/work_order/work_order.py:1399
-#: manufacturing/doctype/work_order/work_order.py:1458
+#: manufacturing/doctype/work_order/work_order.py:1413
+#: manufacturing/doctype/work_order/work_order.py:1472
 msgid "Work Order has been {0}"
 msgstr "Arbeitsauftrag wurde {0}"
 
-#: selling/doctype/sales_order/sales_order.js:667
+#: selling/doctype/sales_order/sales_order.js:768
 msgid "Work Order not created"
 msgstr "Arbeitsauftrag wurde nicht erstellt"
 
-#: stock/doctype/stock_entry/stock_entry.py:679
+#: stock/doctype/stock_entry/stock_entry.py:634
 msgid "Work Order {0}: Job Card not found for the operation {1}"
 msgstr "Fertigungsauftrag {0}: Auftragskarte für den Vorgang {1} nicht gefunden"
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:57
-#: stock/doctype/material_request/material_request.py:774
+#: manufacturing/report/job_card_summary/job_card_summary.js:56
+#: stock/doctype/material_request/material_request.py:786
 msgid "Work Orders"
 msgstr "Arbeitsanweisungen"
 
-#: selling/doctype/sales_order/sales_order.js:731
+#: selling/doctype/sales_order/sales_order.js:844
 msgid "Work Orders Created: {0}"
 msgstr "Arbeitsaufträge erstellt: {0}"
 
@@ -79482,7 +80985,7 @@
 msgid "Work-in-Progress Warehouse"
 msgstr "Fertigungslager"
 
-#: manufacturing/doctype/work_order/work_order.py:425
+#: manufacturing/doctype/work_order/work_order.py:436
 msgid "Work-in-Progress Warehouse is required before Submit"
 msgstr "Fertigungslager wird vor dem Übertragen benötigt"
 
@@ -79519,6 +81022,10 @@
 msgid "Workflow State"
 msgstr "Workflow-Status"
 
+#: templates/pages/task_info.html:73
+msgid "Working"
+msgstr "In Bearbeitung"
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -79545,14 +81052,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/work_order/work_order.js:232
+#: manufacturing/doctype/work_order/work_order.js:247
 #: manufacturing/doctype/workstation/workstation.json
 #: manufacturing/onboarding_step/workstation/workstation.json
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:36
+#: 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:61
+#: 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/job_card_summary/job_card_summary.js:73
+#: 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
 msgid "Workstation"
@@ -79594,40 +81101,52 @@
 msgid "Workstation / Machine"
 msgstr "Arbeitsstation / Maschine"
 
+#. Label of a HTML field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Dashboard"
+msgstr ""
+
 #. Label of a Data field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Workstation Name"
 msgstr "Name des Arbeitsplatzes"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Status"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/workstation_type/workstation_type.json
 msgid "Workstation Type"
-msgstr ""
+msgstr "Arbeitsplatztyp"
 
 #. Label of a Link field in DocType 'BOM Operation'
 #: manufacturing/doctype/bom_operation/bom_operation.json
 msgctxt "BOM Operation"
 msgid "Workstation Type"
-msgstr ""
+msgstr "Arbeitsplatztyp"
 
 #. Label of a Link field in DocType 'Job Card'
 #: manufacturing/doctype/job_card/job_card.json
 msgctxt "Job Card"
 msgid "Workstation Type"
-msgstr ""
+msgstr "Arbeitsplatztyp"
 
 #. Label of a Link field in DocType 'Work Order Operation'
 #: manufacturing/doctype/work_order_operation/work_order_operation.json
 msgctxt "Work Order Operation"
 msgid "Workstation Type"
-msgstr ""
+msgstr "Arbeitsplatztyp"
 
 #. Label of a Link field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Workstation Type"
-msgstr ""
+msgstr "Arbeitsplatztyp"
 
 #. Label of a Data field in DocType 'Workstation Type'
 #. Label of a Link in the Manufacturing Workspace
@@ -79635,24 +81154,30 @@
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgctxt "Workstation Type"
 msgid "Workstation Type"
-msgstr ""
+msgstr "Arbeitsplatztyp"
 
 #. Name of a DocType
 #: manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
 msgid "Workstation Working Hour"
 msgstr "Arbeitsplatz-Arbeitsstunde"
 
-#: manufacturing/doctype/workstation/workstation.py:199
+#: manufacturing/doctype/workstation/workstation.py:355
 msgid "Workstation is closed on the following dates as per Holiday List: {0}"
 msgstr "Arbeitsplatz ist an folgenden Tagen gemäß der Feiertagsliste geschlossen: {0}"
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Workstations"
+msgstr ""
+
 #: setup/setup_wizard/setup_wizard.py:16 setup/setup_wizard/setup_wizard.py:41
 msgid "Wrapping up"
 msgstr "Aufwickeln"
 
 #: 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:510
+#: setup/doctype/company/company.py:509
 msgid "Write Off"
 msgstr "Abschreiben"
 
@@ -79841,15 +81366,15 @@
 
 #: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:70
 msgid "Wrong Company"
-msgstr ""
+msgstr "Falsches Unternehmen"
 
-#: setup/doctype/company/company.js:172
+#: setup/doctype/company/company.js:202
 msgid "Wrong Password"
 msgstr "Falsches Passwort"
 
 #: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:55
 msgid "Wrong Template"
-msgstr ""
+msgstr "Falsche Vorlage"
 
 #: regional/doctype/import_supplier_invoice/import_supplier_invoice.py:67
 #: regional/doctype/import_supplier_invoice/import_supplier_invoice.py:70
@@ -79902,20 +81427,20 @@
 msgid "Year start date or end date is overlapping with {0}. To avoid please set company"
 msgstr "Jahresbeginn oder Enddatum überlappt mit {0}. Bitte ein Unternehmen wählen, um dies zu verhindern"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:67
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:70
-#: buying/report/purchase_analytics/purchase_analytics.js:64
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:37
-#: public/js/financial_statements.js:220
+#: accounts/report/budget_variance_report/budget_variance_report.js:65
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:78
+#: buying/report/purchase_analytics/purchase_analytics.js:63
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:36
+#: public/js/financial_statements.js:229
 #: public/js/purchase_trends_filters.js:22 public/js/sales_trends_filters.js:14
-#: public/js/stock_analytics.js:55
-#: selling/report/sales_analytics/sales_analytics.js:64
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:36
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:36
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:36
-#: stock/report/stock_analytics/stock_analytics.js:83
-#: support/report/issue_analytics/issue_analytics.js:45
+#: public/js/stock_analytics.js:85
+#: selling/report/sales_analytics/sales_analytics.js:71
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: stock/report/stock_analytics/stock_analytics.js:82
+#: support/report/issue_analytics/issue_analytics.js:44
 msgid "Yearly"
 msgstr "Jährlich"
 
@@ -80048,23 +81573,23 @@
 msgid "Yes"
 msgstr "Ja"
 
-#: controllers/accounts_controller.py:3151
+#: controllers/accounts_controller.py:3242
 msgid "You are not allowed to update as per the conditions set in {} Workflow."
 msgstr "Sie dürfen nicht gemäß den im {} Workflow festgelegten Bedingungen aktualisieren."
 
-#: accounts/general_ledger.py:665
+#: accounts/general_ledger.py:674
 msgid "You are not authorized to add or update entries before {0}"
 msgstr "Sie haben keine Berechtigung Buchungen vor {0} hinzuzufügen oder zu aktualisieren"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:317
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
 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:263
+#: accounts/doctype/account/account.py:282
 msgid "You are not authorized to set Frozen value"
 msgstr "Sie haben keine Berechtigung gesperrte Werte zu setzen"
 
-#: stock/doctype/pick_list/pick_list.py:307
+#: stock/doctype/pick_list/pick_list.py:347
 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 "Sie kommissionieren mehr als die erforderliche Menge für den Artikel {0}. Prüfen Sie, ob eine andere Pickliste für den Kundenauftrag erstellt wurde {1}."
 
@@ -80080,7 +81605,7 @@
 msgid "You can also set default CWIP account in Company {}"
 msgstr "Sie können auch das Standard-CWIP-Konto in Firma {} festlegen"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:873
+#: accounts/doctype/sales_invoice/sales_invoice.py:890
 msgid "You can change the parent account to a Balance Sheet account or select a different account."
 msgstr "Sie können das übergeordnete Konto in ein Bilanzkonto ändern oder ein anderes Konto auswählen."
 
@@ -80088,7 +81613,7 @@
 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:583
+#: accounts/doctype/journal_entry/journal_entry.py:610
 msgid "You can not enter current voucher in 'Against Journal Entry' column"
 msgstr "Momentan können keine Belege in die Spalte \"Zu Buchungssatz\" eingegeben werden"
 
@@ -80096,20 +81621,20 @@
 msgid "You can only have Plans with the same billing cycle in a Subscription"
 msgstr "Sie können nur Pläne mit demselben Abrechnungszyklus in einem Abonnement haben"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:239
-#: accounts/doctype/sales_invoice/sales_invoice.js:847
+#: accounts/doctype/pos_invoice/pos_invoice.js:258
+#: accounts/doctype/sales_invoice/sales_invoice.js:915
 msgid "You can only redeem max {0} points in this order."
 msgstr "Sie können maximal {0} Punkte in dieser Reihenfolge einlösen."
 
 #: accounts/doctype/pos_profile/pos_profile.py:148
 msgid "You can only select one mode of payment as default"
-msgstr "Sie können standardmäßig nur eine Zahlungsart auswählen"
+msgstr "Sie können nur eine Zahlungsweise als Standard auswählen"
 
-#: selling/page/point_of_sale/pos_payment.js:478
+#: selling/page/point_of_sale/pos_payment.js:506
 msgid "You can redeem upto {0}."
 msgstr "Sie können bis zu {0} einlösen."
 
-#: manufacturing/doctype/workstation/workstation.js:37
+#: manufacturing/doctype/workstation/workstation.js:59
 msgid "You can set it as a machine name or operation type. For example, stiching machine 12"
 msgstr ""
 
@@ -80118,7 +81643,7 @@
 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:1027
+#: manufacturing/doctype/job_card/job_card.py:1042
 msgid "You can't make any changes to Job Card since Work Order is closed."
 msgstr ""
 
@@ -80126,7 +81651,7 @@
 msgid "You can't redeem Loyalty Points having more value than the Rounded Total."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:532
+#: manufacturing/doctype/bom/bom.js:549
 msgid "You cannot change the rate if BOM is mentioned against any Item."
 msgstr ""
 
@@ -80134,15 +81659,15 @@
 msgid "You cannot create a {0} within the closed Accounting Period {1}"
 msgstr ""
 
-#: accounts/general_ledger.py:155
+#: accounts/general_ledger.py:159
 msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
 msgstr "Sie können im abgeschlossenen Abrechnungszeitraum {0} keine Buchhaltungseinträge mit erstellen oder stornieren."
 
-#: accounts/general_ledger.py:689
+#: accounts/general_ledger.py:698
 msgid "You cannot create/amend any accounting entries till this date."
-msgstr ""
+msgstr "Bis zu diesem Datum können Sie keine Buchungen erstellen/berichtigen."
 
-#: accounts/doctype/journal_entry/journal_entry.py:809
+#: accounts/doctype/journal_entry/journal_entry.py:836
 msgid "You cannot credit and debit same account at the same time"
 msgstr "Eine gleichzeitige Gutschrift und Belastung desselben Kontos ist nicht möglich"
 
@@ -80154,7 +81679,7 @@
 msgid "You cannot edit root node."
 msgstr "Sie können den Stammknoten nicht bearbeiten."
 
-#: selling/page/point_of_sale/pos_payment.js:507
+#: selling/page/point_of_sale/pos_payment.js:536
 msgid "You cannot redeem more than {0}."
 msgstr "Sie können nicht mehr als {0} einlösen."
 
@@ -80166,15 +81691,15 @@
 msgid "You cannot restart a Subscription that is not cancelled."
 msgstr "Sie können ein nicht abgebrochenes Abonnement nicht neu starten."
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:210
 msgid "You cannot submit empty order."
 msgstr "Sie können keine leere Bestellung buchen."
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:209
 msgid "You cannot submit the order without payment."
 msgstr "Sie können die Bestellung nicht ohne Zahlung buchen."
 
-#: controllers/accounts_controller.py:3127
+#: controllers/accounts_controller.py:3218
 msgid "You do not have permissions to {} items in a {}."
 msgstr "Sie haben keine Berechtigungen für {} Elemente in einem {}."
 
@@ -80182,7 +81707,7 @@
 msgid "You don't have enough Loyalty Points to redeem"
 msgstr "Sie haben nicht genügend Treuepunkte zum Einlösen"
 
-#: selling/page/point_of_sale/pos_payment.js:474
+#: selling/page/point_of_sale/pos_payment.js:499
 msgid "You don't have enough points to redeem."
 msgstr "Sie haben nicht genug Punkte zum Einlösen."
 
@@ -80190,7 +81715,7 @@
 msgid "You had {} errors while creating opening invoices. Check {} for more details"
 msgstr "Beim Erstellen von Eröffnungsrechnungen sind {} Fehler aufgetreten. Überprüfen Sie {} auf weitere Details"
 
-#: public/js/utils.js:822
+#: public/js/utils.js:893
 msgid "You have already selected items from {0} {1}"
 msgstr "Sie haben bereits Elemente aus {0} {1} gewählt"
 
@@ -80198,7 +81723,7 @@
 msgid "You have been invited to collaborate on the project: {0}"
 msgstr "Sie wurden zur Zusammenarbeit für das Projekt {0} eingeladen."
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:442
 msgid "You have entered a duplicate Delivery Note on Row"
 msgstr ""
 
@@ -80210,11 +81735,11 @@
 msgid "You haven't created a {0} yet"
 msgstr "Sie haben noch kein(en) {0} erstellt"
 
-#: selling/page/point_of_sale/pos_controller.js:196
+#: selling/page/point_of_sale/pos_controller.js:218
 msgid "You must add atleast one item to save it as draft."
 msgstr "Sie müssen mindestens ein Element hinzufügen, um es als Entwurf zu speichern."
 
-#: selling/page/point_of_sale/pos_controller.js:598
+#: selling/page/point_of_sale/pos_controller.js:626
 msgid "You must select a customer before adding an item."
 msgstr "Sie müssen einen Kunden auswählen, bevor Sie einen Artikel hinzufügen."
 
@@ -80225,7 +81750,7 @@
 #. Success message of the Module Onboarding 'Home'
 #: setup/module_onboarding/home/home.json
 msgid "You're ready to start your journey with ERPNext"
-msgstr ""
+msgstr "Sie sind bereit, Ihre Reise mit ERPNext zu beginnen"
 
 #. Option for the 'Provider' (Select) field in DocType 'Video'
 #: utilities/doctype/video/video.json
@@ -80247,7 +81772,7 @@
 
 #: www/book_appointment/index.html:49
 msgid "Your Name (required)"
-msgstr ""
+msgstr "Ihr Name (erforderlich)"
 
 #: templates/includes/footer/footer_extension.html:5
 #: templates/includes/footer/footer_extension.html:6
@@ -80256,7 +81781,7 @@
 
 #: www/book_appointment/verify/index.html:11
 msgid "Your email has been verified and your appointment has been scheduled"
-msgstr ""
+msgstr "Ihre E-Mail wurde verifiziert und Ihr Termin wurde geplant"
 
 #: patches/v11_0/add_default_dispatch_notification_template.py:22
 #: setup/setup_wizard/operations/install_fixtures.py:288
@@ -80271,7 +81796,7 @@
 #: utilities/doctype/video/video.json
 msgctxt "Video"
 msgid "Youtube ID"
-msgstr ""
+msgstr "Youtube-ID"
 
 #. Label of a Section Break field in DocType 'Video'
 #: utilities/doctype/video/video.json
@@ -80279,7 +81804,7 @@
 msgid "Youtube Statistics"
 msgstr "Youtube-Statistiken"
 
-#: public/js/utils/contact_address_quick_entry.js:68
+#: public/js/utils/contact_address_quick_entry.js:71
 msgid "ZIP Code"
 msgstr "Postleitzahl"
 
@@ -80293,7 +81818,7 @@
 msgid "Zero Rated"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Zero quantity"
 msgstr ""
 
@@ -80303,41 +81828,49 @@
 msgid "Zip File"
 msgstr "Zip-Datei"
 
-#: stock/reorder_item.py:283
+#: stock/reorder_item.py:368
 msgid "[Important] [ERPNext] Auto Reorder Errors"
 msgstr "[Wichtig] [ERPNext] Fehler bei der automatischen Neuordnung"
 
 #: controllers/status_updater.py:247
 msgid "`Allow Negative rates for Items`"
-msgstr ""
+msgstr "„Negative Preise für Artikel zulassen“"
 
-#: stock/doctype/stock_settings/stock_settings.py:89
+#: stock/doctype/stock_settings/stock_settings.py:92
 #, python-format
 msgid "`Freeze Stocks Older Than` should be smaller than %d days."
 msgstr ""
 
+#: stock/stock_ledger.py:1700
+msgid "after"
+msgstr ""
+
 #: accounts/doctype/shipping_rule/shipping_rule.py:204
 msgid "and"
 msgstr "und"
 
-#: manufacturing/doctype/bom/bom.js:759
+#: manufacturing/doctype/bom/bom.js:792
 msgid "as a percentage of finished item quantity"
-msgstr ""
+msgstr "als Prozentsatz der fertigen Artikelmenge"
 
 #: www/book_appointment/index.html:43
 msgid "at"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:17
-#: selling/report/sales_analytics/sales_analytics.js:17
+#: buying/report/purchase_analytics/purchase_analytics.js:16
+#: selling/report/sales_analytics/sales_analytics.js:24
 msgid "based_on"
 msgstr "basiert_auf"
 
+#: public/js/utils/sales_common.js:256
+msgid "cannot be greater than 100"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgctxt "Production Plan Sub Assembly Item"
 msgid "description"
-msgstr ""
+msgstr "beschreibung"
 
 #. Option for the 'Plaid Environment' (Select) field in DocType 'Plaid
 #. Settings'
@@ -80346,8 +81879,12 @@
 msgid "development"
 msgstr "Entwicklung"
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "discount applied"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:46
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:57
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:58
 msgid "doc_type"
 msgstr "doc_type"
 
@@ -80374,6 +81911,10 @@
 #: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
 msgctxt "Currency Exchange Settings"
 msgid "exchangerate.host"
+msgstr "exchangerate.host"
+
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:161
+msgid "fieldname"
 msgstr ""
 
 #. Option for the 'Service Provider' (Select) field in DocType 'Currency
@@ -80381,6 +81922,14 @@
 #: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
 msgctxt "Currency Exchange Settings"
 msgid "frankfurter.app"
+msgstr "frankfurter.app"
+
+#: templates/form_grid/item_grid.html:66 templates/form_grid/item_grid.html:80
+msgid "hidden"
+msgstr ""
+
+#: projects/doctype/project/project_dashboard.html:13
+msgid "hours"
 msgstr ""
 
 #. Label of a Attach Image field in DocType 'Batch'
@@ -80389,7 +81938,7 @@
 msgid "image"
 msgstr "Bild"
 
-#: accounts/doctype/budget/budget.py:253
+#: accounts/doctype/budget/budget.py:260
 msgid "is already"
 msgstr ""
 
@@ -80465,7 +82014,7 @@
 msgid "material_request_item"
 msgstr ""
 
-#: controllers/selling_controller.py:150
+#: controllers/selling_controller.py:151
 msgid "must be between 0 and 100"
 msgstr ""
 
@@ -80511,7 +82060,11 @@
 msgid "old_parent"
 msgstr "Altes übergeordnetes Element"
 
-#: controllers/accounts_controller.py:1033
+#: templates/pages/task_info.html:90
+msgid "on"
+msgstr ""
+
+#: controllers/accounts_controller.py:1097
 msgid "or"
 msgstr "oder"
 
@@ -80523,7 +82076,7 @@
 msgid "out of 5"
 msgstr "von 5"
 
-#: public/js/utils.js:369
+#: public/js/utils.js:417
 msgid "payments app is not installed. Please install it from {0} or {1}"
 msgstr ""
 
@@ -80564,7 +82117,7 @@
 msgid "per hour"
 msgstr "pro Stunde"
 
-#: stock/stock_ledger.py:1681
+#: stock/stock_ledger.py:1701
 msgid "performing either one below:"
 msgstr ""
 
@@ -80592,7 +82145,7 @@
 msgid "ratings"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 msgid "received from"
 msgstr "erhalten von"
 
@@ -80669,10 +82222,6 @@
 msgid "sandbox"
 msgstr "Sandkasten"
 
-#: public/js/controllers/transaction.js:920
-msgid "selected Payment Terms Template"
-msgstr ""
-
 #: accounts/doctype/subscription/subscription.py:711
 msgid "subscription is already cancelled."
 msgstr ""
@@ -80693,12 +82242,14 @@
 msgid "title"
 msgstr "Titel"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 #: 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 "An"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2737
+#: accounts/doctype/sales_invoice/sales_invoice.py:2706
 msgid "to unallocate the amount of this Return Invoice before cancelling it."
 msgstr ""
 
@@ -80721,7 +82272,7 @@
 msgid "via BOM Update Tool"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:256
+#: accounts/doctype/budget/budget.py:263
 msgid "will be"
 msgstr ""
 
@@ -80734,7 +82285,7 @@
 msgid "{0}"
 msgstr "{0}"
 
-#: controllers/accounts_controller.py:878
+#: controllers/accounts_controller.py:930
 msgid "{0} '{1}' is disabled"
 msgstr "{0} '{1}' ist deaktiviert"
 
@@ -80742,7 +82293,7 @@
 msgid "{0} '{1}' not in Fiscal Year {2}"
 msgstr "{0} '{1}' nicht im Geschäftsjahr {2}"
 
-#: manufacturing/doctype/work_order/work_order.py:355
+#: manufacturing/doctype/work_order/work_order.py:366
 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
 msgstr "{0} ({1}) darf nicht größer als die geplante Menge ({2}) im Arbeitsauftrag {3} sein"
 
@@ -80750,19 +82301,19 @@
 msgid "{0} - Above"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:253
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:281
 msgid "{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
 msgstr "{0} <b>{1}</b> hat Vermögensgegenstände gebucht. Entfernen Sie Artikel <b>{2}</b> aus der Tabelle, um fortzufahren."
 
-#: controllers/accounts_controller.py:1893
+#: controllers/accounts_controller.py:1985
 msgid "{0} Account not found against Customer {1}."
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:261
+#: accounts/doctype/budget/budget.py:268
 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It {5} exceed by {6}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:759
+#: accounts/doctype/pricing_rule/utils.py:758
 msgid "{0} Coupon used are {1}. Allowed quantity is exhausted"
 msgstr "Verwendeter {0} -Coupon ist {1}. Zulässige Menge ist erschöpft"
 
@@ -80770,11 +82321,11 @@
 msgid "{0} Digest"
 msgstr "{0} Zusammenfassung"
 
-#: accounts/utils.py:1286
+#: accounts/utils.py:1255
 msgid "{0} Number {1} is already used in {2} {3}"
 msgstr "{0} Nummer {1} wird bereits in {2} {3} verwendet"
 
-#: manufacturing/doctype/work_order/work_order.js:379
+#: manufacturing/doctype/work_order/work_order.js:397
 msgid "{0} Operations: {1}"
 msgstr "{0} Operationen: {1}"
 
@@ -80786,31 +82337,31 @@
 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
 msgstr "{0} Probe aufbewahren basiert auf Charge. Bitte aktivieren Sie die Option Chargennummer, um die Probe des Artikels aufzubewahren"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:429
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:428
 msgid "{0} Transaction(s) Reconciled"
 msgstr ""
 
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:61
 msgid "{0} account is not of type {1}"
-msgstr ""
+msgstr "Konto {0} ist nicht vom Typ {1}"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:447
+#: stock/doctype/purchase_receipt/purchase_receipt.py:448
 msgid "{0} account not found while submitting purchase receipt"
 msgstr "Konto {0} beim Buchen des Eingangsbelegs nicht gefunden"
 
-#: accounts/doctype/journal_entry/journal_entry.py:930
+#: accounts/doctype/journal_entry/journal_entry.py:957
 msgid "{0} against Bill {1} dated {2}"
 msgstr "{0} zu Rechnung {1} vom {2}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:939
+#: accounts/doctype/journal_entry/journal_entry.py:966
 msgid "{0} against Purchase Order {1}"
 msgstr "{0} zu Bestellung {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:906
+#: accounts/doctype/journal_entry/journal_entry.py:933
 msgid "{0} against Sales Invoice {1}"
 msgstr "{0} zu Ausgangsrechnung {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:913
+#: accounts/doctype/journal_entry/journal_entry.py:940
 msgid "{0} against Sales Order {1}"
 msgstr "{0} zu Auftrag{1}"
 
@@ -80818,7 +82369,7 @@
 msgid "{0} already has a Parent Procedure {1}."
 msgstr "{0} hat bereits eine übergeordnete Prozedur {1}."
 
-#: stock/doctype/delivery_note/delivery_note.py:610
+#: stock/doctype/delivery_note/delivery_note.py:671
 msgid "{0} and {1}"
 msgstr "{0} und {1}"
 
@@ -80837,18 +82388,18 @@
 
 #: accounts/doctype/cost_center_allocation/cost_center_allocation.py:138
 msgid "{0} cannot be used as a Main Cost Center because it has been used as child in Cost Center Allocation {1}"
-msgstr ""
+msgstr "{0} kann nicht als Hauptkostenstelle verwendet werden, da sie als untergeordnete Kostenstelle in der Kostenstellenzuordnung {1} verwendet wurde"
 
-#: manufacturing/doctype/production_plan/production_plan.py:783
-#: manufacturing/doctype/production_plan/production_plan.py:877
+#: manufacturing/doctype/production_plan/production_plan.py:792
+#: manufacturing/doctype/production_plan/production_plan.py:886
 msgid "{0} created"
 msgstr "{0} erstellt"
 
-#: setup/doctype/company/company.py:191
+#: setup/doctype/company/company.py:190
 msgid "{0} currency must be same as company's default currency. Please select another account."
 msgstr "Die Währung {0} muss mit der Standardwährung des Unternehmens übereinstimmen. Bitte wählen Sie ein anderes Konto aus."
 
-#: buying/doctype/purchase_order/purchase_order.py:310
+#: buying/doctype/purchase_order/purchase_order.py:311
 msgid "{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution."
 msgstr "{0} hat derzeit eine {1} Supplier Scorecard offen, und Bestellungen an diesen Lieferanten sollten mit Vorsicht erteilt werden."
 
@@ -80880,7 +82431,11 @@
 msgid "{0} has been submitted successfully"
 msgstr "{0} wurde erfolgreich gebucht"
 
-#: controllers/accounts_controller.py:2212
+#: projects/doctype/project/project_dashboard.html:15
+msgid "{0} hours"
+msgstr ""
+
+#: controllers/accounts_controller.py:2304
 msgid "{0} in row {1}"
 msgstr "{0} in Zeile {1}"
 
@@ -80888,31 +82443,35 @@
 msgid "{0} is a mandatory Accounting Dimension. <br>Please set a value for {0} in Accounting Dimensions section."
 msgstr ""
 
-#: controllers/accounts_controller.py:162
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:189
+msgid "{0} is already running for {1}"
+msgstr ""
+
+#: controllers/accounts_controller.py:164
 msgid "{0} is blocked so this transaction cannot proceed"
 msgstr "{0} ist blockiert, daher kann diese Transaktion nicht fortgesetzt werden"
 
 #: accounts/doctype/budget/budget.py:57
-#: accounts/doctype/payment_entry/payment_entry.py:542
+#: accounts/doctype/payment_entry/payment_entry.py:551
 #: accounts/report/general_ledger/general_ledger.py:62
 #: accounts/report/pos_register/pos_register.py:110 controllers/trends.py:50
 msgid "{0} is mandatory"
 msgstr "{0} ist zwingend erforderlich"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:975
+#: accounts/doctype/sales_invoice/sales_invoice.py:992
 msgid "{0} is mandatory for Item {1}"
 msgstr "{0} Artikel ist zwingend erfoderlich für {1}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:220
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:101
+#: accounts/general_ledger.py:722
 msgid "{0} is mandatory for account {1}"
-msgstr ""
+msgstr "{0} ist für Konto {1} obligatorisch"
 
 #: public/js/controllers/taxes_and_totals.js:122
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
 msgstr "{0} ist obligatorisch. Möglicherweise wird kein Währungsumtauschdatensatz für {1} bis {2} erstellt."
 
-#: controllers/accounts_controller.py:2491
+#: controllers/accounts_controller.py:2576
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
 msgstr "{0} ist zwingend erforderlich. Möglicherweise wurde der Datensatz für die Währungsumrechung für {1} bis {2} nicht erstellt."
 
@@ -80924,7 +82483,7 @@
 msgid "{0} is not a group node. Please select a group node as parent cost center"
 msgstr "{0} ist kein Gruppenknoten. Bitte wählen Sie einen Gruppenknoten als übergeordnete Kostenstelle"
 
-#: stock/doctype/stock_entry/stock_entry.py:456
+#: stock/doctype/stock_entry/stock_entry.py:411
 msgid "{0} is not a stock Item"
 msgstr "{0} ist kein Lagerartikel"
 
@@ -80940,26 +82499,30 @@
 msgid "{0} is not enabled in {1}"
 msgstr "{0} ist in {1} nicht aktiviert"
 
-#: stock/doctype/material_request/material_request.py:565
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197
+msgid "{0} is not running. Cannot trigger events for this Document"
+msgstr ""
+
+#: stock/doctype/material_request/material_request.py:566
 msgid "{0} is not the default supplier for any items."
 msgstr "{0} ist nicht der Standardlieferant für Artikel."
 
-#: accounts/doctype/payment_entry/payment_entry.py:2300
+#: accounts/doctype/payment_entry/payment_entry.py:2325
 msgid "{0} is on hold till {1}"
 msgstr "{0} ist auf Eis gelegt bis {1}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:131
+#: accounts/doctype/gl_entry/gl_entry.py:121
 #: accounts/doctype/pricing_rule/pricing_rule.py:165
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:182
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:193
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:118
 msgid "{0} is required"
 msgstr "{0}  erforderlich"
 
-#: manufacturing/doctype/work_order/work_order.js:343
+#: manufacturing/doctype/work_order/work_order.js:362
 msgid "{0} items in progress"
 msgstr "{0} Elemente in Bearbeitung"
 
-#: manufacturing/doctype/work_order/work_order.js:327
+#: manufacturing/doctype/work_order/work_order.js:346
 msgid "{0} items produced"
 msgstr "{0} Elemente hergestellt"
 
@@ -80967,7 +82530,7 @@
 msgid "{0} must be negative in return document"
 msgstr "{0} muss im Retourenschein negativ sein"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1988
+#: accounts/doctype/sales_invoice/sales_invoice.py:1957
 msgid "{0} not allowed to transact with {1}. Please change the Company."
 msgstr "{0} darf nicht mit {1} arbeiten. Bitte wählen Sie ein anderes Unternehmen."
 
@@ -80983,62 +82546,62 @@
 msgid "{0} payment entries can not be filtered by {1}"
 msgstr "{0} Zahlungsbuchungen können nicht nach {1} gefiltert werden"
 
-#: controllers/stock_controller.py:899
+#: controllers/stock_controller.py:1085
 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
-msgstr ""
+msgstr "Menge {0} des Artikels {1} wird im Lager {2} mit einer Kapazität von {3} empfangen."
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:451
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:505
 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:702
+#: stock/doctype/pick_list/pick_list.py:773
 msgid "{0} units of Item {1} is not available."
 msgstr "{0} Einheiten von Artikel {1} sind nicht verfügbar."
 
-#: stock/doctype/pick_list/pick_list.py:718
+#: stock/doctype/pick_list/pick_list.py:789
 msgid "{0} units of Item {1} is picked in another Pick List."
 msgstr "{0} Einheiten des Artikels {1} werden in einer anderen Pickliste kommissioniert."
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:135
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:145
 msgid "{0} units of {1} are required in {2}{3}, on {4} {5} for {6} to complete the transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1340 stock/stock_ledger.py:1829
-#: stock/stock_ledger.py:1845
+#: stock/stock_ledger.py:1366 stock/stock_ledger.py:1836
+#: stock/stock_ledger.py:1852
 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
 msgstr "Es werden {0} Einheiten von {1} in {2} auf {3} {4} für {5} benötigt, um diesen Vorgang abzuschließen."
 
-#: stock/stock_ledger.py:1955 stock/stock_ledger.py:2005
+#: stock/stock_ledger.py:1962 stock/stock_ledger.py:2012
 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1334
+#: stock/stock_ledger.py:1360
 msgid "{0} units of {1} needed in {2} to complete this transaction."
 msgstr "{0} Einheiten von {1} benötigt in {2} zum Abschluss dieser Transaktion."
 
-#: stock/utils.py:432
+#: stock/utils.py:427
 msgid "{0} valid serial nos for Item {1}"
 msgstr "{0} gültige Seriennummern für Artikel {1}"
 
-#: stock/doctype/item/item.js:548
+#: stock/doctype/item/item.js:615
 msgid "{0} variants created."
 msgstr "{0} Varianten erstellt."
 
-#: accounts/doctype/payment_term/payment_term.js:17
+#: accounts/doctype/payment_term/payment_term.js:19
 msgid "{0} will be given as discount."
-msgstr ""
+msgstr "{0} wird als Rabatt gewährt."
 
-#: manufacturing/doctype/job_card/job_card.py:773
+#: manufacturing/doctype/job_card/job_card.py:780
 msgid "{0} {1}"
-msgstr ""
+msgstr "{0} {1}"
 
-#: public/js/utils/serial_no_batch_selector.js:203
+#: public/js/utils/serial_no_batch_selector.js:206
 msgid "{0} {1} Manually"
 msgstr "{0} {1} manuell"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:433
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:432
 msgid "{0} {1} Partially Reconciled"
-msgstr ""
+msgstr "{0} {1} Teilweise abgeglichen"
 
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:417
 msgid "{0} {1} cannot be updated. If you need to make changes, we recommend canceling the existing entry and creating a new one."
@@ -81048,9 +82611,9 @@
 msgid "{0} {1} created"
 msgstr "{0} {1} erstellt"
 
-#: accounts/doctype/payment_entry/payment_entry.py:506
-#: accounts/doctype/payment_entry/payment_entry.py:562
-#: accounts/doctype/payment_entry/payment_entry.py:2065
+#: accounts/doctype/payment_entry/payment_entry.py:515
+#: accounts/doctype/payment_entry/payment_entry.py:571
+#: accounts/doctype/payment_entry/payment_entry.py:2084
 msgid "{0} {1} does not exist"
 msgstr "{0} {1} existiert nicht"
 
@@ -81066,8 +82629,8 @@
 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 "{0} {1} wurde bereits teilweise bezahlt. Bitte nutzen Sie den Button 'Ausstehende Rechnungen aufrufen', um die aktuell ausstehenden Beträge zu erhalten."
 
-#: buying/doctype/purchase_order/purchase_order.py:449
-#: selling/doctype/sales_order/sales_order.py:481
+#: buying/doctype/purchase_order/purchase_order.py:450
+#: selling/doctype/sales_order/sales_order.py:484
 #: stock/doctype/material_request/material_request.py:198
 msgid "{0} {1} has been modified. Please refresh."
 msgstr "{0} {1} wurde geändert. Bitte aktualisieren."
@@ -81078,14 +82641,14 @@
 
 #: accounts/doctype/bank_transaction/bank_transaction.py:90
 msgid "{0} {1} is allocated twice in this Bank Transaction"
-msgstr ""
+msgstr "{0} {1} wird in dieser Banktransaktion zweimal zugeteilt"
 
-#: accounts/doctype/payment_entry/payment_entry.py:591
+#: accounts/doctype/payment_entry/payment_entry.py:600
 msgid "{0} {1} is associated with {2}, but Party Account is {3}"
 msgstr "{0} {1} ist mit {2} verbunden, aber das Gegenkonto ist {3}"
 
-#: controllers/buying_controller.py:624 controllers/selling_controller.py:421
-#: controllers/subcontracting_controller.py:806
+#: controllers/buying_controller.py:649 controllers/selling_controller.py:422
+#: controllers/subcontracting_controller.py:810
 msgid "{0} {1} is cancelled or closed"
 msgstr "{0} {1} wurde abgebrochen oder geschlossen"
 
@@ -81097,7 +82660,7 @@
 msgid "{0} {1} is cancelled so the action cannot be completed"
 msgstr "{0} {1} wurde abgebrochen, deshalb kann die Aktion nicht abgeschlossen werden"
 
-#: accounts/doctype/journal_entry/journal_entry.py:725
+#: accounts/doctype/journal_entry/journal_entry.py:752
 msgid "{0} {1} is closed"
 msgstr "{0} {1} ist geschlossen"
 
@@ -81109,7 +82672,7 @@
 msgid "{0} {1} is frozen"
 msgstr "{0} {1} ist gesperrt"
 
-#: accounts/doctype/journal_entry/journal_entry.py:722
+#: accounts/doctype/journal_entry/journal_entry.py:749
 msgid "{0} {1} is fully billed"
 msgstr "{0} {1} wird voll in Rechnung gestellt"
 
@@ -81117,20 +82680,20 @@
 msgid "{0} {1} is not active"
 msgstr "{0} {1} ist nicht aktiv"
 
-#: accounts/doctype/payment_entry/payment_entry.py:569
+#: accounts/doctype/payment_entry/payment_entry.py:578
 msgid "{0} {1} is not associated with {2} {3}"
 msgstr "{0} {1} gehört nicht zu {2} {3}"
 
 #: accounts/utils.py:133
 msgid "{0} {1} is not in any active Fiscal Year"
-msgstr ""
+msgstr "{0} {1} befindet sich in keinem aktiven Geschäftsjahr"
 
-#: accounts/doctype/journal_entry/journal_entry.py:719
-#: accounts/doctype/journal_entry/journal_entry.py:760
+#: accounts/doctype/journal_entry/journal_entry.py:746
+#: accounts/doctype/journal_entry/journal_entry.py:787
 msgid "{0} {1} is not submitted"
 msgstr "{0} {1} ist nicht gebucht"
 
-#: accounts/doctype/payment_entry/payment_entry.py:598
+#: accounts/doctype/payment_entry/payment_entry.py:607
 msgid "{0} {1} is on hold"
 msgstr "{0} {1} liegt derzeit auf Eis"
 
@@ -81138,11 +82701,11 @@
 msgid "{0} {1} is {2}"
 msgstr "{0} {1} ist {2}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:603
+#: accounts/doctype/payment_entry/payment_entry.py:612
 msgid "{0} {1} must be submitted"
 msgstr "{0} {1} muss gebucht werden"
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:213
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:215
 msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
 msgstr ""
 
@@ -81150,83 +82713,83 @@
 msgid "{0} {1} status is {2}"
 msgstr "{0} {1} Status ist {2}"
 
-#: public/js/utils/serial_no_batch_selector.js:189
+#: public/js/utils/serial_no_batch_selector.js:191
 msgid "{0} {1} via CSV File"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:254
+#: accounts/doctype/gl_entry/gl_entry.py:208
 msgid "{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry"
 msgstr "{0} {1}: \"Gewinn und Verlust\" Konto-Art {2} ist nicht in Eröffnungs-Buchung erlaubt"
 
-#: accounts/doctype/gl_entry/gl_entry.py:283
+#: accounts/doctype/gl_entry/gl_entry.py:237
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:87
 msgid "{0} {1}: Account {2} does not belong to Company {3}"
 msgstr "{0} {1}: Konto {2} gehört nicht zu Unternehmen {3}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:271
+#: accounts/doctype/gl_entry/gl_entry.py:225
 #: 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:278
+#: accounts/doctype/gl_entry/gl_entry.py:232
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:82
 msgid "{0} {1}: Account {2} is inactive"
 msgstr "{0} {1}: Konto {2} ist inaktiv"
 
-#: accounts/doctype/gl_entry/gl_entry.py:322
+#: accounts/doctype/gl_entry/gl_entry.py:276
 msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
 msgstr "{0} {1}: Konteneintrag für {2} kann nur in folgender Währung vorgenommen werden: {3}"
 
-#: controllers/stock_controller.py:365
+#: controllers/stock_controller.py:547
 msgid "{0} {1}: Cost Center is mandatory for Item {2}"
 msgstr "{0} {1}: Kostenstelle ist zwingend erfoderlich für Artikel {2}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:171
+#: accounts/doctype/gl_entry/gl_entry.py:161
 msgid "{0} {1}: Cost Center is required for 'Profit and Loss' account {2}."
-msgstr ""
+msgstr "{0} {1}: Kostenstelle ist für das GUV-Konto {2} erforderlich."
 
-#: accounts/doctype/gl_entry/gl_entry.py:298
+#: accounts/doctype/gl_entry/gl_entry.py:252
 msgid "{0} {1}: Cost Center {2} does not belong to Company {3}"
 msgstr "{0} {1}: Kostenstelle {2} gehört nicht zu Unternehmen {3}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:305
+#: accounts/doctype/gl_entry/gl_entry.py:259
 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:137
+#: accounts/doctype/gl_entry/gl_entry.py:127
 msgid "{0} {1}: Customer is required against Receivable account {2}"
 msgstr "{0} {1}: Für das Eingangskonto {2} ist ein Kunde erforderlich"
 
-#: accounts/doctype/gl_entry/gl_entry.py:159
+#: accounts/doctype/gl_entry/gl_entry.py:149
 msgid "{0} {1}: Either debit or credit amount is required for {2}"
 msgstr "{0} {1}: Debit- oder Kreditbetrag ist für {2} erforderlich"
 
-#: accounts/doctype/gl_entry/gl_entry.py:143
+#: accounts/doctype/gl_entry/gl_entry.py:133
 msgid "{0} {1}: Supplier is required against Payable account {2}"
 msgstr "{0} {1}: Für das Kreditorenkonto ist ein Lieferant erforderlich {2}"
 
 #: projects/doctype/project/project_list.js:6
 msgid "{0}%"
-msgstr ""
+msgstr "{0}%"
 
 #: controllers/website_list_for_contact.py:205
 msgid "{0}% Billed"
-msgstr ""
+msgstr "{0}% in Rechnung gestellt"
 
 #: controllers/website_list_for_contact.py:213
 msgid "{0}% Delivered"
-msgstr ""
+msgstr "{0}% Geliefert"
 
 #: accounts/doctype/payment_term/payment_term.js:15
 #, python-format
 msgid "{0}% of total invoice value will be given as discount."
-msgstr ""
+msgstr "{0}% des Gesamtrechnungswerts wird als Rabatt gewährt."
 
 #: projects/doctype/task/task.py:119
 msgid "{0}'s {1} cannot be after {2}'s Expected End Date."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:1009
+#: manufacturing/doctype/job_card/job_card.py:1024
 msgid "{0}, complete the operation {1} before the operation {2}."
 msgstr "{0}, schließen Sie die Operation {1} vor der Operation {2} ab."
 
@@ -81234,7 +82797,7 @@
 msgid "{0}: {1} does not exists"
 msgstr "{0}: {1} existiert nicht"
 
-#: accounts/doctype/payment_entry/payment_entry.js:724
+#: accounts/doctype/payment_entry/payment_entry.js:889
 msgid "{0}: {1} must be less than {2}"
 msgstr "{0}: {1} muss kleiner als {2} sein"
 
@@ -81242,11 +82805,11 @@
 msgid "{0}{1} Did you rename the item? Please contact Administrator / Tech support"
 msgstr "{0} {1} Haben Sie den Artikel umbenannt? Bitte wenden Sie sich an den Administrator / technischen Support"
 
-#: controllers/stock_controller.py:1160
+#: controllers/stock_controller.py:1346
 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
-msgstr ""
+msgstr "Die Stichprobengröße von {item_name} ({sample_size}) darf nicht größer sein als die akzeptierte Menge ({accepted_quantity})"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1156
 msgid "{range4}-Above"
 msgstr ""
 
@@ -81254,11 +82817,11 @@
 msgid "{}"
 msgstr "{}"
 
-#: controllers/buying_controller.py:712
+#: controllers/buying_controller.py:737
 msgid "{} Assets created for {}"
 msgstr "{} Assets erstellt für {}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1775
+#: accounts/doctype/sales_invoice/sales_invoice.py:1744
 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
 msgstr "{} kann nicht storniert werden, da die gesammelten Treuepunkte eingelöst wurden. Brechen Sie zuerst das {} Nein {} ab"
 
@@ -81282,9 +82845,9 @@
 #: accounts/doctype/party_link/party_link.py:50
 #: accounts/doctype/party_link/party_link.py:60
 msgid "{} {} is already linked with another {}"
-msgstr ""
+msgstr "{} {} ist bereits mit einem anderen {} verknüpft"
 
 #: accounts/doctype/party_link/party_link.py:40
 msgid "{} {} is already linked with {} {}"
-msgstr ""
+msgstr "{} {} ist bereits mit {} {} verknüpft"
 
diff --git a/erpnext/locale/es.po b/erpnext/locale/es.po
index a99d9f5..995f2ad 100644
--- a/erpnext/locale/es.po
+++ b/erpnext/locale/es.po
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: info@erpnext.com\n"
-"POT-Creation-Date: 2024-01-29 18:13+0053\n"
-"PO-Revision-Date: 2024-03-05 14:17\n"
+"POT-Creation-Date: 2024-03-24 09:35+0000\n"
+"PO-Revision-Date: 2024-03-26 12:47\n"
 "Last-Translator: info@erpnext.com\n"
 "Language-Team: Spanish\n"
 "MIME-Version: 1.0\n"
@@ -18,21 +18,17 @@
 "X-Crowdin-File-ID: 46\n"
 "Language: es_ES\n"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:85
-msgid " "
-msgstr ""
-
 #. Label of a Column Break field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
 msgid "  "
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:76
+#: selling/doctype/quotation/quotation.js:77
 msgid " Address"
 msgstr " Dirección"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:612
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:618
 msgid " Amount"
 msgstr " Importe"
 
@@ -42,29 +38,16 @@
 msgid " Is Child Table"
 msgstr " Es una tabla secundaria"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:184
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:107
 #: selling/report/sales_analytics/sales_analytics.py:66
 msgid " Name"
 msgstr " Nombre"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:108
-msgid " Qty"
-msgstr " Cant"
-
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:603
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:609
 msgid " Rate"
 msgstr " Precio"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:116
-msgid " Raw Material"
-msgstr " Materia Prima"
-
-#: public/js/bom_configurator/bom_configurator.bundle.js:127
-#: public/js/bom_configurator/bom_configurator.bundle.js:157
-msgid " Sub Assembly"
-msgstr " Sub Ensamblado"
-
 #: projects/doctype/project_update/project_update.py:110
 msgid " Summary"
 msgstr " Resumen"
@@ -81,6 +64,10 @@
 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item"
 msgstr "\"Es activo fijo\" no puede estar sin marcar, ya que existe registro de activos contra el elemento"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "#"
+msgstr ""
+
 #. Description of the Onboarding Step 'Accounts Settings'
 #: accounts/onboarding_step/accounts_settings/accounts_settings.json
 msgid "# Account Settings\n\n"
@@ -319,7 +306,7 @@
 
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:148
 msgid "# In Stock"
-msgstr ""
+msgstr "# En stock"
 
 #. Description of the Onboarding Step 'Introduction to Stock Entry'
 #: stock/onboarding_step/introduction_to_stock_entry/introduction_to_stock_entry.json
@@ -509,7 +496,7 @@
 msgid "% Completed"
 msgstr "% Completado"
 
-#: manufacturing/doctype/bom/bom.js:755
+#: manufacturing/doctype/bom/bom.js:788
 #, python-format
 msgid "% Finished Item Quantity"
 msgstr ""
@@ -518,11 +505,12 @@
 #: stock/doctype/delivery_note/delivery_note.json
 msgctxt "Delivery Note"
 msgid "% Installed"
-msgstr ""
+msgstr "% Instalado"
 
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:70
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:16
 msgid "% Occupied"
-msgstr ""
+msgstr "% Ocupado"
 
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:280
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:332
@@ -533,7 +521,7 @@
 #: stock/doctype/material_request/material_request.json
 msgctxt "Material Request"
 msgid "% Ordered"
-msgstr ""
+msgstr "% Ordenado"
 
 #. Label of a Percent field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
@@ -557,43 +545,43 @@
 #: projects/doctype/task/task.json
 msgctxt "Task"
 msgid "% Progress"
-msgstr ""
+msgstr "% Progreso"
 
 #. Label of a Percent field in DocType 'Material Request'
 #: stock/doctype/material_request/material_request.json
 msgctxt "Material Request"
 msgid "% Received"
-msgstr ""
+msgstr "% Recibido"
 
 #. Label of a Percent field in DocType 'Purchase Order'
 #: buying/doctype/purchase_order/purchase_order.json
 msgctxt "Purchase Order"
 msgid "% Received"
-msgstr ""
+msgstr "% Recibido"
 
 #. Label of a Percent field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
 msgid "% Received"
-msgstr ""
+msgstr "% Recibido"
 
 #. Label of a Percent field in DocType 'Delivery Note'
 #: stock/doctype/delivery_note/delivery_note.json
 msgctxt "Delivery Note"
 msgid "% Returned"
-msgstr ""
+msgstr "% Devuelto"
 
 #. Label of a Percent field in DocType 'Purchase Receipt'
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 msgctxt "Purchase Receipt"
 msgid "% Returned"
-msgstr ""
+msgstr "% Devuelto"
 
 #. Label of a Percent field in DocType 'Subcontracting Receipt'
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgctxt "Subcontracting Receipt"
 msgid "% Returned"
-msgstr ""
+msgstr "% Devuelto"
 
 #. Description of the '% Amount Billed' (Percent) field in DocType 'Sales
 #. Order'
@@ -601,20 +589,20 @@
 #, python-format
 msgctxt "Sales Order"
 msgid "% of materials billed against this Sales Order"
-msgstr ""
+msgstr "% de materiales facturados contra esta Orden de Venta"
 
 #. Description of the '%  Delivered' (Percent) field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 #, python-format
 msgctxt "Sales Order"
 msgid "% of materials delivered against this Sales Order"
-msgstr ""
+msgstr "% de materiales entregados contra esta Orden de Venta"
 
-#: controllers/accounts_controller.py:1899
+#: controllers/accounts_controller.py:1991
 msgid "'Account' in the Accounting section of Customer {0}"
-msgstr ""
+msgstr "'Cuenta' en la sección Contabilidad de Cliente {0}"
 
-#: selling/doctype/sales_order/sales_order.py:263
+#: selling/doctype/sales_order/sales_order.py:266
 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'"
 msgstr ""
 
@@ -622,7 +610,7 @@
 msgid "'Based On' and 'Group By' can not be same"
 msgstr "'Basado en' y 'Agrupar por' no pueden ser iguales"
 
-#: stock/report/product_bundle_balance/product_bundle_balance.py:232
+#: stock/report/product_bundle_balance/product_bundle_balance.py:230
 msgid "'Date' is required"
 msgstr "'Fecha' es requerido"
 
@@ -630,11 +618,11 @@
 msgid "'Days Since Last Order' must be greater than or equal to zero"
 msgstr "'Días desde la última orden' debe ser mayor que o igual a cero"
 
-#: controllers/accounts_controller.py:1904
+#: controllers/accounts_controller.py:1996
 msgid "'Default {0} Account' in Company {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1048
+#: accounts/doctype/journal_entry/journal_entry.py:1075
 msgid "'Entries' cannot be empty"
 msgstr "'Entradas' no pueden estar vacías"
 
@@ -652,10 +640,26 @@
 msgid "'Has Serial No' can not be 'Yes' for non-stock item"
 msgstr "'Posee numero de serie' no puede ser \"Sí\" para los productos que NO son de stock"
 
-#: stock/report/stock_ledger/stock_ledger.py:436
+#: stock/report/stock_ledger/stock_ledger.py:538
 msgid "'Opening'"
 msgstr "'Apertura'"
 
+#: stock/doctype/delivery_note/delivery_note.py:388
+msgid "'Sales Invoice Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:381
+msgid "'Sales Invoice' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:364
+msgid "'Sales Order Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:357
+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
@@ -670,10 +674,18 @@
 msgid "'Update Stock' can not be checked because items are not delivered via {0}"
 msgstr "'Actualizar existencias' no puede marcarse porque los artículos no se han entregado mediante {0}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:369
+#: accounts/doctype/sales_invoice/sales_invoice.py:380
 msgid "'Update Stock' cannot be checked for fixed asset sale"
 msgstr "'Actualización de Inventario' no se puede comprobar en venta de activos fijos"
 
+#: accounts/doctype/bank_account/bank_account.py:64
+msgid "'{0}' account is already used by {1}. Use another account."
+msgstr ""
+
+#: controllers/accounts_controller.py:392
+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/stock_ledger_invariant_check/stock_ledger_invariant_check.py:180
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:104
@@ -765,17 +777,17 @@
 msgid "* Will be calculated in the transaction."
 msgstr "* Será calculado en la transacción."
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:130
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:140
 msgid ", with the inventory {0}: {1}"
 msgstr ""
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:118
 msgid "0-30"
-msgstr ""
+msgstr "0-30"
 
 #: manufacturing/report/work_order_summary/work_order_summary.py:110
 msgid "0-30 Days"
-msgstr ""
+msgstr "0-30 días"
 
 #. Description of the 'Conversion Factor' (Float) field in DocType 'Loyalty
 #. Program'
@@ -794,60 +806,60 @@
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
 msgid "1-10"
-msgstr ""
+msgstr "1-10"
 
 #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity'
 #: crm/doctype/opportunity/opportunity.json
 msgctxt "Opportunity"
 msgid "1-10"
-msgstr ""
+msgstr "1-10"
 
 #. Option for the 'No. of Employees' (Select) field in DocType 'Prospect'
 #: crm/doctype/prospect/prospect.json
 msgctxt "Prospect"
 msgid "1-10"
-msgstr ""
+msgstr "1-10"
 
 #. Option for the 'No of Employees' (Select) field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
 msgid "1000+"
-msgstr ""
+msgstr "más de 1.000"
 
 #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity'
 #: crm/doctype/opportunity/opportunity.json
 msgctxt "Opportunity"
 msgid "1000+"
-msgstr ""
+msgstr "más de 1.000"
 
 #. Option for the 'No. of Employees' (Select) field in DocType 'Prospect'
 #: crm/doctype/prospect/prospect.json
 msgctxt "Prospect"
 msgid "1000+"
-msgstr ""
+msgstr "más de 1.000"
 
 #. Option for the 'No of Employees' (Select) field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
 msgid "11-50"
-msgstr ""
+msgstr "11 a 50"
 
 #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity'
 #: crm/doctype/opportunity/opportunity.json
 msgctxt "Opportunity"
 msgid "11-50"
-msgstr ""
+msgstr "11 a 50"
 
 #. Option for the 'No. of Employees' (Select) field in DocType 'Prospect'
 #: crm/doctype/prospect/prospect.json
 msgctxt "Prospect"
 msgid "11-50"
-msgstr ""
+msgstr "11 a 50"
 
 #: regional/report/uae_vat_201/uae_vat_201.py:99
 #: regional/report/uae_vat_201/uae_vat_201.py:105
 msgid "1{0}"
-msgstr ""
+msgstr "1{0}"
 
 #. Option for the 'Periodicity' (Select) field in DocType 'Asset Maintenance
 #. Task'
@@ -860,19 +872,19 @@
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
 msgid "201-500"
-msgstr ""
+msgstr "201-500"
 
 #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity'
 #: crm/doctype/opportunity/opportunity.json
 msgctxt "Opportunity"
 msgid "201-500"
-msgstr ""
+msgstr "201-500"
 
 #. Option for the 'No. of Employees' (Select) field in DocType 'Prospect'
 #: crm/doctype/prospect/prospect.json
 msgctxt "Prospect"
 msgid "201-500"
-msgstr ""
+msgstr "201-500"
 
 #. Option for the 'Periodicity' (Select) field in DocType 'Asset Maintenance
 #. Task'
@@ -889,47 +901,47 @@
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:119
 msgid "30-60"
-msgstr ""
+msgstr "30-60"
 
 #: manufacturing/report/work_order_summary/work_order_summary.py:110
 msgid "30-60 Days"
-msgstr ""
+msgstr "30-60 días"
 
 #. Option for the 'No of Employees' (Select) field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
 msgid "501-1000"
-msgstr ""
+msgstr "501-1000"
 
 #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity'
 #: crm/doctype/opportunity/opportunity.json
 msgctxt "Opportunity"
 msgid "501-1000"
-msgstr ""
+msgstr "501-1000"
 
 #. Option for the 'No. of Employees' (Select) field in DocType 'Prospect'
 #: crm/doctype/prospect/prospect.json
 msgctxt "Prospect"
 msgid "501-1000"
-msgstr ""
+msgstr "501-1000"
 
 #. Option for the 'No of Employees' (Select) field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
 msgid "51-200"
-msgstr ""
+msgstr "51-200"
 
 #. Option for the 'No of Employees' (Select) field in DocType 'Opportunity'
 #: crm/doctype/opportunity/opportunity.json
 msgctxt "Opportunity"
 msgid "51-200"
-msgstr ""
+msgstr "51-200"
 
 #. Option for the 'No. of Employees' (Select) field in DocType 'Prospect'
 #: crm/doctype/prospect/prospect.json
 msgctxt "Prospect"
 msgid "51-200"
-msgstr ""
+msgstr "51-200"
 
 #. Option for the 'Frequency' (Select) field in DocType 'Video Settings'
 #: utilities/doctype/video_settings/video_settings.json
@@ -939,7 +951,7 @@
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:120
 msgid "60-90"
-msgstr ""
+msgstr "60-90"
 
 #: manufacturing/report/work_order_summary/work_order_summary.py:110
 msgid "60-90 Days"
@@ -997,7 +1009,7 @@
 msgid "<div class=\"text-muted text-center\">No Matching Bank Transactions Found</div>"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:258
+#: public/js/bank_reconciliation_tool/dialog_manager.js:262
 msgid "<div class=\"text-muted text-center\">{0}</div>"
 msgstr ""
 
@@ -1177,23 +1189,23 @@
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:190
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:114
 msgid "A - B"
-msgstr ""
+msgstr "A-B"
 
 #: stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py:190
 #: 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 ""
+msgstr "A-C"
 
 #: manufacturing/doctype/bom/bom.py:209
 msgid "A BOM with name {0} already exists for item {1}."
 msgstr "Ya existe una lista de materiales con el nombre {0} para el artículo {1}."
 
-#: selling/doctype/customer/customer.py:297
+#: selling/doctype/customer/customer.py:309
 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group"
 msgstr "Existe una categoría de cliente con el mismo nombre. Por favor cambie el nombre de cliente o renombre la categoría de cliente"
 
-#: manufacturing/doctype/workstation/workstation.js:47
+#: manufacturing/doctype/workstation/workstation.js:73
 msgid "A Holiday List can be added to exclude counting these days for the Workstation."
 msgstr ""
 
@@ -1205,7 +1217,17 @@
 msgid "A Packing Slip can only be created for Draft Delivery Note."
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:530
+#. Description of a DocType
+#: stock/doctype/price_list/price_list.json
+msgid "A Price List is a collection of Item Prices either Selling, Buying, or both"
+msgstr ""
+
+#. Description of a DocType
+#: stock/doctype/item/item.json
+msgid "A Product or a Service that is bought, sold or kept in stock."
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:535
 msgid "A Reconciliation Job {0} is running for the same filters. Cannot reconcile now"
 msgstr ""
 
@@ -1215,12 +1237,13 @@
 "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:937
-msgid "A Transaction Deletion Job is triggered for {0}"
+#: setup/doctype/company/company.py:916
+msgid "A Transaction Deletion Document: {0} is triggered for {0}"
 msgstr ""
 
-#: setup/doctype/company/company.py:914
-msgid "A Transaction Deletion Job: {0} is already running for {1}"
+#. Description of a DocType
+#: accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+msgid "A condition for a Shipping Rule"
 msgstr ""
 
 #. Description of the 'Send To Primary Contact' (Check) field in DocType
@@ -1238,6 +1261,11 @@
 msgid "A driver must be set to submit."
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/warehouse/warehouse.json
+msgid "A logical Warehouse against which stock entries are made."
+msgstr ""
+
 #: templates/emails/confirm_appointment.html:2
 msgid "A new appointment has been created for you with {0}"
 msgstr "Se ha creado una nueva cita para usted con {0}"
@@ -1246,6 +1274,11 @@
 msgid "A template with tax category {0} already exists. Only one template is allowed with each tax category"
 msgstr "Ya existe una plantilla con categoría de impuestos {0}. Sólo se permite una plantilla con cada categoría de impuestos"
 
+#. Description of a DocType
+#: setup/doctype/sales_partner/sales_partner.json
+msgid "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission."
+msgstr ""
+
 #. Option for the 'Blood Group' (Select) field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -1256,7 +1289,7 @@
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
 msgid "A-"
-msgstr ""
+msgstr "A-"
 
 #. Option for the 'Cheque Size' (Select) field in DocType 'Cheque Print
 #. Template'
@@ -1275,112 +1308,112 @@
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
 msgid "AB-"
-msgstr ""
+msgstr "AB-"
 
 #. Option for the 'Naming Series' (Select) field in DocType 'Asset Depreciation
 #. Schedule'
 #: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.json
 msgctxt "Asset Depreciation Schedule"
 msgid "ACC-ADS-.YYYY.-"
-msgstr ""
+msgstr "ACC ADS-.AAA.-"
 
 #. Option for the 'Series' (Select) field in DocType 'Asset Maintenance Log'
 #: assets/doctype/asset_maintenance_log/asset_maintenance_log.json
 msgctxt "Asset Maintenance Log"
 msgid "ACC-AML-.YYYY.-"
-msgstr ""
+msgstr "ACC-AML-.YYYY.-"
 
 #. Option for the 'Naming Series' (Select) field in DocType 'Asset Shift
 #. Allocation'
 #: assets/doctype/asset_shift_allocation/asset_shift_allocation.json
 msgctxt "Asset Shift Allocation"
 msgid "ACC-ASA-.YYYY.-"
-msgstr ""
+msgstr "ACC-ASA-.YYYY.-"
 
 #. Option for the 'Series' (Select) field in DocType 'Asset Capitalization'
 #: assets/doctype/asset_capitalization/asset_capitalization.json
 msgctxt "Asset Capitalization"
 msgid "ACC-ASC-.YYYY.-"
-msgstr ""
+msgstr "ACC-ASC-.YYYY.-"
 
 #. Option for the 'Series' (Select) field in DocType 'Asset Repair'
 #: assets/doctype/asset_repair/asset_repair.json
 msgctxt "Asset Repair"
 msgid "ACC-ASR-.YYYY.-"
-msgstr ""
+msgstr "ACC-ASR-.YYYY.-"
 
 #. Option for the 'Naming Series' (Select) field in DocType 'Asset'
 #: assets/doctype/asset/asset.json
 msgctxt "Asset"
 msgid "ACC-ASS-.YYYY.-"
-msgstr ""
+msgstr "ACC-ASS-.YYYY.-"
 
 #. Option for the 'Series' (Select) field in DocType 'Bank Transaction'
 #: accounts/doctype/bank_transaction/bank_transaction.json
 msgctxt "Bank Transaction"
 msgid "ACC-BTN-.YYYY.-"
-msgstr ""
+msgstr "ACC-BTN-.YYYY.-"
 
 #. Option for the 'Series' (Select) field in DocType 'Journal Entry'
 #: accounts/doctype/journal_entry/journal_entry.json
 msgctxt "Journal Entry"
 msgid "ACC-JV-.YYYY.-"
-msgstr ""
+msgstr "ACC-JV-.YYYY.-"
 
 #. Option for the 'Series' (Select) field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
 msgid "ACC-PAY-.YYYY.-"
-msgstr ""
+msgstr "ACC-PAY-.YYYY.-"
 
 #. Option for the 'Invoice Series' (Select) field in DocType 'Import Supplier
 #. Invoice'
 #: regional/doctype/import_supplier_invoice/import_supplier_invoice.json
 msgctxt "Import Supplier Invoice"
 msgid "ACC-PINV-.YYYY.-"
-msgstr ""
+msgstr "ACC-PINV-.YYYY.-"
 
 #. Option for the 'Series' (Select) field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "ACC-PINV-.YYYY.-"
-msgstr ""
+msgstr "ACC-PINV-.YYYY.-"
 
 #. Option for the 'Series' (Select) field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "ACC-PINV-RET-.YYYY.-"
-msgstr ""
+msgstr "ACC-PINV-RET-.YYYY.-"
 
 #. Option for the 'Series' (Select) field in DocType 'Payment Request'
 #: accounts/doctype/payment_request/payment_request.json
 msgctxt "Payment Request"
 msgid "ACC-PRQ-.YYYY.-"
-msgstr ""
+msgstr "ACC-PRQ-.YYYY.-"
 
 #. Option for the 'Series' (Select) field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
 msgid "ACC-PSINV-.YYYY.-"
-msgstr ""
+msgstr "ACC-PSINV-.YYYY.-"
 
 #. Option for the 'naming_series' (Select) field in DocType 'Shareholder'
 #: accounts/doctype/shareholder/shareholder.json
 msgctxt "Shareholder"
 msgid "ACC-SH-.YYYY.-"
-msgstr ""
+msgstr "ACC-SH-.YYYY.-"
 
 #. Option for the 'Series' (Select) field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "ACC-SINV-.YYYY.-"
-msgstr ""
+msgstr "ACC-SINV-.YYYY.-"
 
 #. Option for the 'Series' (Select) field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "ACC-SINV-RET-.YYYY.-"
-msgstr ""
+msgstr "ACC-SINV-RET-.YYYY.-"
 
 #. Label of a Date field in DocType 'Serial No'
 #: stock/doctype/serial_no/serial_no.json
@@ -1430,7 +1463,7 @@
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
 msgid "AWB Number"
-msgstr ""
+msgstr "Número AWB"
 
 #. Label of a Data field in DocType 'Company'
 #: setup/doctype/company/company.json
@@ -1444,11 +1477,11 @@
 msgid "Abbreviation"
 msgstr "Abreviación"
 
-#: setup/doctype/company/company.py:164
+#: setup/doctype/company/company.py:163
 msgid "Abbreviation already used for another company"
 msgstr "Abreviatura ya utilizada para otra empresa"
 
-#: setup/doctype/company/company.py:159
+#: setup/doctype/company/company.py:158
 msgid "Abbreviation is mandatory"
 msgstr "La abreviatura es obligatoria"
 
@@ -1462,15 +1495,15 @@
 msgid "About Us Settings"
 msgstr "Configuración de información de la compañía"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:39
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
 msgid "About {0} minute remaining"
 msgstr "Quedan aproximadamente {0} minutos"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:40
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:38
 msgid "About {0} minutes remaining"
 msgstr "Quedan aproximadamente {0} minutos"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:35
 msgid "About {0} seconds remaining"
 msgstr "Quedan aproximadamente {0} segundos"
 
@@ -1538,7 +1571,7 @@
 msgid "Accepted Qty in Stock UOM"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2124
+#: public/js/controllers/transaction.js:2167
 msgid "Accepted Quantity"
 msgstr "Cantidad Aceptada"
 
@@ -1590,7 +1623,7 @@
 msgid "Access Key"
 msgstr ""
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:48
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:49
 msgid "Access Key is required for Service Provider: {0}"
 msgstr ""
 
@@ -1612,13 +1645,13 @@
 #: 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_ledger/general_ledger.js:38
-#: accounts/report/general_ledger/general_ledger.py:565
-#: accounts/report/payment_ledger/payment_ledger.js:31
+#: accounts/report/general_ledger/general_ledger.py:578
+#: 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_for_party/trial_balance_for_party.js:70
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:16
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:16
+#: 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
 msgid "Account"
 msgstr "Cuenta"
 
@@ -1771,12 +1804,6 @@
 msgid "Account Balance"
 msgstr "Balance de la cuenta"
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Account Balance"
-msgstr "Balance de la cuenta"
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -1920,8 +1947,8 @@
 msgid "Account Manager"
 msgstr "Gerente de cuentas"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
-#: controllers/accounts_controller.py:1908
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
+#: controllers/accounts_controller.py:2000
 msgid "Account Missing"
 msgstr "Cuenta Faltante"
 
@@ -1949,11 +1976,11 @@
 msgid "Account Name"
 msgstr "Nombre de la Cuenta"
 
-#: accounts/doctype/account/account.py:306
+#: accounts/doctype/account/account.py:325
 msgid "Account Not Found"
 msgstr "Cuenta no encontrada"
 
-#: accounts/doctype/account/account_tree.js:108
+#: accounts/doctype/account/account_tree.js:131
 msgid "Account Number"
 msgstr "Número de cuenta"
 
@@ -1963,7 +1990,7 @@
 msgid "Account Number"
 msgstr "Número de cuenta"
 
-#: accounts/doctype/account/account.py:458
+#: accounts/doctype/account/account.py:477
 msgid "Account Number {0} already used in account {1}"
 msgstr "Número de cuenta {0} ya usado en la cuenta {1}"
 
@@ -2001,8 +2028,8 @@
 msgid "Account Subtype"
 msgstr "Subtipo de cuenta"
 
-#: accounts/doctype/account/account_tree.js:115
-#: accounts/report/account_balance/account_balance.js:35
+#: accounts/doctype/account/account_tree.js:152
+#: accounts/report/account_balance/account_balance.js:34
 msgid "Account Type"
 msgstr "Tipo de cuenta"
 
@@ -2046,11 +2073,11 @@
 msgid "Account Value"
 msgstr "Valor de la cuenta"
 
-#: accounts/doctype/account/account.py:279
+#: accounts/doctype/account/account.py:298
 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 msgstr "Balance de la cuenta ya en Crédito, no le está permitido establecer 'Balance Debe Ser' como 'Débito'"
 
-#: accounts/doctype/account/account.py:273
+#: accounts/doctype/account/account.py:292
 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
 msgstr "Balance de la cuenta ya en Débito, no le está permitido establecer \"Balance Debe Ser\" como \"Crédito\""
 
@@ -2072,7 +2099,7 @@
 msgid "Account for Change Amount"
 msgstr "Cuenta para Monto de Cambio"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:44
+#: accounts/doctype/bank_clearance/bank_clearance.py:46
 msgid "Account is mandatory to get payment entries"
 msgstr "La cuenta es obligatoria para obtener entradas de pago"
 
@@ -2080,28 +2107,28 @@
 msgid "Account is not set for the dashboard chart {0}"
 msgstr "La cuenta no está configurada para el cuadro de mandos {0}"
 
-#: assets/doctype/asset/asset.py:677
+#: assets/doctype/asset/asset.py:679
 msgid "Account not Found"
 msgstr "Cuenta no encontrada"
 
-#: accounts/doctype/account/account.py:360
+#: accounts/doctype/account/account.py:379
 msgid "Account with child nodes cannot be converted to ledger"
 msgstr "Una cuenta con nodos hijos no puede convertirse en libro mayor"
 
-#: accounts/doctype/account/account.py:252
+#: accounts/doctype/account/account.py:271
 msgid "Account with child nodes cannot be set as ledger"
 msgstr "Una cuenta con nodos hijos no puede ser establecida como libro mayor"
 
-#: accounts/doctype/account/account.py:371
+#: accounts/doctype/account/account.py:390
 msgid "Account with existing transaction can not be converted to group."
 msgstr "Cuenta con transacción existente no se puede convertir al grupo."
 
-#: accounts/doctype/account/account.py:400
+#: accounts/doctype/account/account.py:419
 msgid "Account with existing transaction can not be deleted"
 msgstr "Cuenta con transacción existente no se puede eliminar"
 
-#: accounts/doctype/account/account.py:247
-#: accounts/doctype/account/account.py:362
+#: accounts/doctype/account/account.py:266
+#: accounts/doctype/account/account.py:381
 msgid "Account with existing transaction cannot be converted to ledger"
 msgstr "Cuenta con una transacción existente no se puede convertir en el libro mayor"
 
@@ -2109,7 +2136,7 @@
 msgid "Account {0} added multiple times"
 msgstr "Cuenta {0} agregada varias veces"
 
-#: setup/doctype/company/company.py:187
+#: setup/doctype/company/company.py:186
 msgid "Account {0} does not belong to company: {1}"
 msgstr "Cuenta {0} no pertenece a la compañía: {1}"
 
@@ -2117,7 +2144,7 @@
 msgid "Account {0} does not belongs to company {1}"
 msgstr "La cuenta {0} no pertenece a la compañía {1}"
 
-#: accounts/doctype/account/account.py:532
+#: accounts/doctype/account/account.py:551
 msgid "Account {0} does not exist"
 msgstr "Cuenta {0} no existe"
 
@@ -2133,7 +2160,7 @@
 msgid "Account {0} does not match with Company {1} in Mode of Account: {2}"
 msgstr "Cuenta {0} no coincide con la Compañía {1} en Modo de Cuenta: {2}"
 
-#: accounts/doctype/account/account.py:490
+#: accounts/doctype/account/account.py:509
 msgid "Account {0} exists in parent company {1}."
 msgstr "La cuenta {0} existe en la empresa matriz {1}."
 
@@ -2141,51 +2168,51 @@
 msgid "Account {0} has been entered multiple times"
 msgstr "Cuenta {0} se ha introducido varias veces"
 
-#: accounts/doctype/account/account.py:344
+#: accounts/doctype/account/account.py:363
 msgid "Account {0} is added in the child company {1}"
 msgstr "La cuenta {0} se agrega en la empresa secundaria {1}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:443
+#: accounts/doctype/gl_entry/gl_entry.py:397
 msgid "Account {0} is frozen"
 msgstr "La cuenta {0} está congelada"
 
-#: controllers/accounts_controller.py:1032
+#: controllers/accounts_controller.py:1096
 msgid "Account {0} is invalid. Account Currency must be {1}"
 msgstr "La cuenta {0} no es válida. La divisa de la cuenta debe ser {1}"
 
-#: accounts/doctype/account/account.py:150
+#: accounts/doctype/account/account.py:151
 msgid "Account {0}: Parent account {1} can not be a ledger"
 msgstr "Cuenta {0}: la cuenta padre {1} no puede ser una cuenta de libro mayor"
 
-#: accounts/doctype/account/account.py:156
+#: accounts/doctype/account/account.py:157
 msgid "Account {0}: Parent account {1} does not belong to company: {2}"
 msgstr "Cuenta {0}: la cuenta padre {1} no pertenece a la empresa: {2}"
 
-#: accounts/doctype/account/account.py:144
+#: accounts/doctype/account/account.py:145
 msgid "Account {0}: Parent account {1} does not exist"
 msgstr "Cuenta {0}: la cuenta padre {1} no existe"
 
-#: accounts/doctype/account/account.py:147
+#: accounts/doctype/account/account.py:148
 msgid "Account {0}: You can not assign itself as parent account"
 msgstr "Cuenta {0}: no puede asignarse a sí misma como cuenta padre"
 
-#: accounts/general_ledger.py:403
+#: accounts/general_ledger.py:412
 msgid "Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry"
 msgstr "Cuenta: <b>{0}</b> es capital Trabajo en progreso y no puede actualizarse mediante Entrada de diario"
 
-#: accounts/doctype/journal_entry/journal_entry.py:243
+#: accounts/doctype/journal_entry/journal_entry.py:259
 msgid "Account: {0} can only be updated via Stock Transactions"
 msgstr "Cuenta: {0} sólo puede ser actualizada mediante transacciones de inventario"
 
-#: accounts/report/general_ledger/general_ledger.py:325
+#: accounts/report/general_ledger/general_ledger.py:338
 msgid "Account: {0} does not exist"
 msgstr "Cuenta {0} no existe"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2098
+#: accounts/doctype/payment_entry/payment_entry.py:2117
 msgid "Account: {0} is not permitted under Payment Entry"
 msgstr "Cuenta: {0} no está permitido en Entrada de pago"
 
-#: controllers/accounts_controller.py:2591
+#: controllers/accounts_controller.py:2676
 msgid "Account: {0} with currency: {1} can not be selected"
 msgstr "Cuenta: {0} con divisa: {1} no puede ser seleccionada"
 
@@ -2345,12 +2372,12 @@
 msgid "Accounting Dimension"
 msgstr "Dimensión contable"
 
-#: accounts/doctype/gl_entry/gl_entry.py:206
+#: accounts/doctype/gl_entry/gl_entry.py:196
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:153
 msgid "Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}."
 msgstr "La dimensión contable <b>{0}</b> es necesaria para la cuenta &#39;Balance&#39; {1}."
 
-#: accounts/doctype/gl_entry/gl_entry.py:193
+#: accounts/doctype/gl_entry/gl_entry.py:183
 #: 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 "La dimensión contable <b>{0}</b> es necesaria para la cuenta &#39;Ganancias y pérdidas&#39; {1}."
@@ -2666,53 +2693,54 @@
 msgid "Accounting Entries"
 msgstr "Asientos contables"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:82
+#: accounts/doctype/sales_invoice/sales_invoice.js:86
 msgid "Accounting Entries are reposted"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:42
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
 msgid "Accounting Entries are reposted."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:709 assets/doctype/asset/asset.py:724
-#: assets/doctype/asset_capitalization/asset_capitalization.py:572
+#: assets/doctype/asset/asset.py:713 assets/doctype/asset/asset.py:728
+#: assets/doctype/asset_capitalization/asset_capitalization.py:578
 msgid "Accounting Entry for Asset"
 msgstr "Entrada Contable para Activos"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:738
+#: stock/doctype/purchase_receipt/purchase_receipt.py:737
 msgid "Accounting Entry for Service"
 msgstr "Entrada contable para servicio"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:906
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:926
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:942
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:959
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:978
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1126
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1266
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1284
-#: controllers/stock_controller.py:168 controllers/stock_controller.py:183
-#: stock/doctype/purchase_receipt/purchase_receipt.py:839
-#: stock/doctype/stock_entry/stock_entry.py:1464
-#: stock/doctype/stock_entry/stock_entry.py:1478
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:519
+#: 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
 msgid "Accounting Entry for Stock"
 msgstr "Asiento contable para inventario"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:658
+#: stock/doctype/purchase_receipt/purchase_receipt.py:659
 msgid "Accounting Entry for {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:1950
+#: controllers/accounts_controller.py:2042
 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}"
 msgstr "Asiento contable para {0}: {1} sólo puede realizarse con la divisa: {2}"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:192
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:193
 #: buying/doctype/supplier/supplier.js:85
-#: public/js/controllers/stock_controller.js:72
-#: public/js/utils/ledger_preview.js:7 selling/doctype/customer/customer.js:159
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:43
+#: public/js/controllers/stock_controller.js:84
+#: public/js/utils/ledger_preview.js:8 selling/doctype/customer/customer.js:164
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:48
 msgid "Accounting Ledger"
 msgstr "Libro de contabilidad"
 
@@ -2743,15 +2771,19 @@
 msgid "Accounting entries are frozen up to this date. Nobody can create or modify entries except users with the role specified below"
 msgstr "Los asientos contables están congelados hasta esta fecha. Nadie puede crear o modificar entradas excepto los usuarios con el rol especificado a continuación"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:69
+#: accounts/doctype/journal_entry/journal_entry.js:30
+msgid "Accounting entries for this Journal Entry need to be reposted. Please click on 'Repost' button to update."
+msgstr ""
+
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:82
 msgid "Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:72
+#: accounts/doctype/sales_invoice/sales_invoice.js:73
 msgid "Accounting entries for this invoice needs to be reposted. Please click on 'Repost' button to update."
 msgstr ""
 
-#: setup/doctype/company/company.py:317
+#: setup/doctype/company/company.py:316
 msgid "Accounts"
 msgstr "Cuentas"
 
@@ -2926,7 +2958,7 @@
 msgid "Accounts Manager"
 msgstr "Gerente de Cuentas"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:343
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:341
 msgid "Accounts Missing Error"
 msgstr ""
 
@@ -2936,9 +2968,9 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:85
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117
 #: accounts/report/accounts_payable/accounts_payable.json
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:122
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:125
 #: accounts/workspace/payables/payables.json
-#: buying/doctype/supplier/supplier.js:90
+#: buying/doctype/supplier/supplier.js:97
 msgid "Accounts Payable"
 msgstr "Cuentas por pagar"
 
@@ -2951,7 +2983,7 @@
 
 #. Name of a report
 #. Label of a Link in the Payables Workspace
-#: accounts/report/accounts_payable/accounts_payable.js:175
+#: accounts/report/accounts_payable/accounts_payable.js:176
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.json
 #: accounts/workspace/payables/payables.json
 msgid "Accounts Payable Summary"
@@ -2964,10 +2996,10 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:12
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:12
 #: accounts/report/accounts_receivable/accounts_receivable.json
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:150
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:153
 #: accounts/workspace/accounting/accounting.json
 #: accounts/workspace/receivables/receivables.json
-#: selling/doctype/customer/customer.js:155
+#: selling/doctype/customer/customer.js:153
 msgid "Accounts Receivable"
 msgstr "Cuentas por cobrar"
 
@@ -3126,7 +3158,7 @@
 msgid "Accounts User"
 msgstr "Cuentas de Usuario"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1153
+#: accounts/doctype/journal_entry/journal_entry.py:1180
 msgid "Accounts table cannot be blank."
 msgstr "Tabla de cuentas no puede estar vacía."
 
@@ -3143,7 +3175,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:33
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:46
-#: accounts/report/account_balance/account_balance.js:38
+#: accounts/report/account_balance/account_balance.js:37
 msgid "Accumulated Depreciation"
 msgstr "Depreciación acumulada"
 
@@ -3166,7 +3198,7 @@
 msgstr "Cuenta de depreciación acumulada"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:155
-#: assets/doctype/asset/asset.js:242
+#: assets/doctype/asset/asset.js:277
 msgid "Accumulated Depreciation Amount"
 msgstr "Depreciación acumulada Importe"
 
@@ -3181,17 +3213,17 @@
 msgid "Accumulated Depreciation as on"
 msgstr "La depreciación acumulada como en"
 
-#: accounts/doctype/budget/budget.py:243
+#: accounts/doctype/budget/budget.py:250
 msgid "Accumulated Monthly"
 msgstr "acumulado Mensual"
 
-#: accounts/report/balance_sheet/balance_sheet.js:27
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:13
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:28
+#: accounts/report/balance_sheet/balance_sheet.js:22
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:8
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:23
 msgid "Accumulated Values"
 msgstr "Valores acumulados"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:101
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:125
 msgid "Accumulated Values in Group Company"
 msgstr "Valores Acumulados en el Grupo de la Empresa"
 
@@ -3206,7 +3238,7 @@
 msgstr "Fecha de Adquisición"
 
 #: crm/doctype/lead/lead.js:42
-#: public/js/bank_reconciliation_tool/dialog_manager.js:171
+#: public/js/bank_reconciliation_tool/dialog_manager.js:175
 msgid "Action"
 msgstr "Acción"
 
@@ -3228,7 +3260,7 @@
 msgid "Action If Same Rate is Not Maintained"
 msgstr ""
 
-#: quality_management/doctype/quality_review/quality_review_list.js:9
+#: quality_management/doctype/quality_review/quality_review_list.js:7
 msgid "Action Initialised"
 msgstr "Acción inicializada"
 
@@ -3274,23 +3306,24 @@
 msgid "Action if Same Rate is Not Maintained Throughout Sales Cycle"
 msgstr ""
 
-#: accounts/doctype/account/account.js:55
-#: accounts/doctype/account/account.js:62
-#: accounts/doctype/account/account.js:91
-#: accounts/doctype/account/account.js:116
-#: accounts/doctype/journal_entry/journal_entry.js:35
-#: accounts/doctype/payment_entry/payment_entry.js:160
+#: accounts/doctype/account/account.js:50
+#: accounts/doctype/account/account.js:57
+#: accounts/doctype/account/account.js:89
+#: accounts/doctype/account/account.js:117
+#: accounts/doctype/journal_entry/journal_entry.js:77
+#: accounts/doctype/payment_entry/payment_entry.js:190
 #: accounts/doctype/subscription/subscription.js:38
 #: accounts/doctype/subscription/subscription.js:44
 #: accounts/doctype/subscription/subscription.js:50
-#: buying/doctype/supplier/supplier.js:104
-#: buying/doctype/supplier/supplier.js:109
-#: projects/doctype/project/project.js:69
-#: projects/doctype/project/project.js:73
-#: projects/doctype/project/project.js:134
-#: public/js/bank_reconciliation_tool/data_table_manager.js:93
-#: public/js/utils/unreconcile.js:22 selling/doctype/customer/customer.js:170
-#: selling/doctype/customer/customer.js:175 stock/doctype/item/item.js:419
+#: buying/doctype/supplier/supplier.js:128
+#: buying/doctype/supplier/supplier.js:137
+#: projects/doctype/project/project.js:78
+#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:160
+#: public/js/bank_reconciliation_tool/data_table_manager.js:88
+#: public/js/bank_reconciliation_tool/data_table_manager.js:121
+#: public/js/utils/unreconcile.js:28 selling/doctype/customer/customer.js:184
+#: selling/doctype/customer/customer.js:193 stock/doctype/item/item.js:486
 #: templates/pages/order.html:20
 msgid "Actions"
 msgstr "Acciones"
@@ -3327,7 +3360,7 @@
 msgstr "Acciones realizadas"
 
 #: accounts/doctype/subscription/subscription_list.js:6
-#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:11
+#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:18
 #: stock/doctype/putaway_rule/putaway_rule_list.js:7
 msgid "Active"
 msgstr "Activo"
@@ -3373,6 +3406,12 @@
 msgid "Active Leads"
 msgstr "Leads activos"
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Active Status"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -3417,14 +3456,14 @@
 msgid "Activity Cost exists for Employee {0} against Activity Type - {1}"
 msgstr "Existe un coste de actividad para el empleado {0} contra el tipo de actividad - {1}"
 
-#: projects/doctype/activity_type/activity_type.js:7
+#: projects/doctype/activity_type/activity_type.js:10
 msgid "Activity Cost per Employee"
 msgstr "Coste de actividad por empleado"
 
 #. Name of a DocType
 #: projects/doctype/activity_type/activity_type.json
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:32
-#: public/js/projects/timer.js:8
+#: public/js/projects/timer.js:9 templates/pages/timelog_info.html:25
 msgid "Activity Type"
 msgstr "Tipo de actividad"
 
@@ -3564,46 +3603,47 @@
 msgid "Actual Posting"
 msgstr ""
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:21
 #: stock/report/product_bundle_balance/product_bundle_balance.py:96
 #: stock/report/stock_projected_qty/stock_projected_qty.py:136
 msgid "Actual Qty"
-msgstr "Cantidad Real"
+msgstr "Cant. Real"
 
 #. Label of a Float field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "Actual Qty"
-msgstr "Cantidad Real"
+msgstr "Cant. Real"
 
 #. Label of a Float field in DocType 'Material Request Item'
 #: stock/doctype/material_request_item/material_request_item.json
 msgctxt "Material Request Item"
 msgid "Actual Qty"
-msgstr "Cantidad Real"
+msgstr "Cant. Real"
 
 #. Label of a Float field in DocType 'Packed Item'
 #: stock/doctype/packed_item/packed_item.json
 msgctxt "Packed Item"
 msgid "Actual Qty"
-msgstr "Cantidad Real"
+msgstr "Cant. Real"
 
 #. Label of a Float field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgctxt "Production Plan Sub Assembly Item"
 msgid "Actual Qty"
-msgstr "Cantidad Real"
+msgstr "Cant. Real"
 
 #. Label of a Float field in DocType 'Quotation Item'
 #: selling/doctype/quotation_item/quotation_item.json
 msgctxt "Quotation Item"
 msgid "Actual Qty"
-msgstr "Cantidad Real"
+msgstr "Cant. Real"
 
 #. Label of a Float field in DocType 'Sales Order Item'
 #: selling/doctype/sales_order_item/sales_order_item.json
 msgctxt "Sales Order Item"
 msgid "Actual Qty"
-msgstr "Cantidad Real"
+msgstr "Cant. Real"
 
 #. Label of a Float field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -3617,10 +3657,19 @@
 msgid "Actual Qty in Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:185
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:196
 msgid "Actual Qty is mandatory"
 msgstr "La cantidad real es obligatoria"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:37
+#: stock/dashboard/item_dashboard_list.html:28
+msgid "Actual Qty {0} / Waiting Qty {1}"
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Actual Qty: Quantity available in the warehouse."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:95
 msgid "Actual Quantity"
 msgstr "Cantidad real"
@@ -3687,18 +3736,20 @@
 msgid "Actual qty in stock"
 msgstr "Cantidad real en stock"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1223
+#: accounts/doctype/payment_entry/payment_entry.js:1470
 #: public/js/controllers/accounts.js:176
 msgid "Actual type tax cannot be included in Item rate in row {0}"
 msgstr "El tipo de impuesto real no puede incluirse en la tarifa del artículo en la fila {0}"
 
-#: crm/doctype/lead/lead.js:82
-#: public/js/bom_configurator/bom_configurator.bundle.js:225
-#: public/js/bom_configurator/bom_configurator.bundle.js:237
-#: public/js/bom_configurator/bom_configurator.bundle.js:291
-#: public/js/utils/crm_activities.js:168
+#: crm/doctype/lead/lead.js:85
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:55
+#: public/js/bom_configurator/bom_configurator.bundle.js:231
+#: public/js/bom_configurator/bom_configurator.bundle.js:244
+#: public/js/bom_configurator/bom_configurator.bundle.js:329
+#: public/js/utils/crm_activities.js:170
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/dashboard/item_dashboard_list.html:59
 msgid "Add"
 msgstr "Agregar"
 
@@ -3716,11 +3767,11 @@
 msgid "Add"
 msgstr "Agregar"
 
-#: stock/doctype/item/item.js:417 stock/doctype/price_list/price_list.js:7
+#: stock/doctype/item/item.js:482 stock/doctype/price_list/price_list.js:8
 msgid "Add / Edit Prices"
-msgstr "Añadir / editar precios"
+msgstr "Añadir / Editar precios"
 
-#: accounts/doctype/account/account_tree.js:176
+#: accounts/doctype/account/account_tree.js:256
 msgid "Add Child"
 msgstr "Agregar hijo"
 
@@ -3728,27 +3779,36 @@
 msgid "Add Columns in Transaction Currency"
 msgstr ""
 
+#: templates/pages/task_info.html:94 templates/pages/task_info.html:96
+msgid "Add Comment"
+msgstr ""
+
 #. Label of a Check field in DocType 'Manufacturing Settings'
 #: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
 msgctxt "Manufacturing Settings"
 msgid "Add Corrective Operation Cost in Finished Good Valuation"
 msgstr ""
 
-#: public/js/event.js:19
+#: public/js/event.js:24
 msgid "Add Customers"
 msgstr "Agregar Clientes"
 
-#: public/js/event.js:27
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:411
+msgid "Add Discount"
+msgstr ""
+
+#: public/js/event.js:40
 msgid "Add Employees"
 msgstr "Añadir empleados"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:224
-#: selling/doctype/sales_order/sales_order.js:207
-#: stock/dashboard/item_dashboard.js:205
+#: public/js/bom_configurator/bom_configurator.bundle.js:230
+#: selling/doctype/sales_order/sales_order.js:228
+#: stock/dashboard/item_dashboard.js:212
 msgid "Add Item"
 msgstr "Añadir artículo"
 
-#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:33
+#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:35
 msgid "Add Items"
 msgstr "Añadir los artículos"
 
@@ -3756,11 +3816,11 @@
 msgid "Add Items in the Purpose Table"
 msgstr ""
 
-#: crm/doctype/lead/lead.js:82
+#: crm/doctype/lead/lead.js:84
 msgid "Add Lead to Prospect"
 msgstr ""
 
-#: public/js/event.js:15
+#: public/js/event.js:16
 msgid "Add Leads"
 msgstr "Añadir Prospectos"
 
@@ -3790,12 +3850,12 @@
 msgid "Add Or Deduct"
 msgstr "Añadir o deducir"
 
-#: selling/page/point_of_sale/pos_item_cart.js:269
+#: selling/page/point_of_sale/pos_item_cart.js:267
 msgid "Add Order Discount"
 msgstr "Agregar descuento de pedido"
 
-#: public/js/event.js:17 public/js/event.js:21 public/js/event.js:25
-#: public/js/event.js:29 public/js/event.js:33
+#: public/js/event.js:20 public/js/event.js:28 public/js/event.js:36
+#: public/js/event.js:44 public/js/event.js:52
 msgid "Add Participants"
 msgstr "Agregar Participantes"
 
@@ -3805,7 +3865,7 @@
 msgid "Add Quote"
 msgstr "Añadir Cita"
 
-#: public/js/event.js:31
+#: public/js/event.js:48
 msgid "Add Sales Partners"
 msgstr "Añadir socios de ventas"
 
@@ -3839,17 +3899,21 @@
 msgid "Add Serial / Batch No (Rejected Qty)"
 msgstr "Añadir Nro Serie/Lote (Cant Rechazada)"
 
-#: public/js/utils.js:61
+#: public/js/utils.js:71
 msgid "Add Serial No"
 msgstr "Agregar No. de serie"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:231
-#: public/js/bom_configurator/bom_configurator.bundle.js:280
+#: manufacturing/doctype/plant_floor/plant_floor.js:172
+msgid "Add Stock"
+msgstr ""
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:238
+#: public/js/bom_configurator/bom_configurator.bundle.js:318
 msgid "Add Sub Assembly"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:433
-#: public/js/event.js:23
+#: buying/doctype/request_for_quotation/request_for_quotation.js:472
+#: public/js/event.js:32
 msgid "Add Suppliers"
 msgstr "Añadir Proveedores"
 
@@ -3857,7 +3921,7 @@
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
 msgid "Add Template"
-msgstr ""
+msgstr "Añadir plantilla"
 
 #: utilities/activation.py:125
 msgid "Add Timesheets"
@@ -3869,7 +3933,7 @@
 msgid "Add Weekly Holidays"
 msgstr "Añadir Vacaciones Semanales"
 
-#: public/js/utils/crm_activities.js:140
+#: public/js/utils/crm_activities.js:142
 msgid "Add a Note"
 msgstr "Añadir Nota"
 
@@ -3888,7 +3952,7 @@
 msgstr "Añadir detalles"
 
 #: stock/doctype/pick_list/pick_list.js:71
-#: stock/doctype/pick_list/pick_list.py:614
+#: stock/doctype/pick_list/pick_list.py:654
 msgid "Add items in the Item Locations table"
 msgstr "Agregar elementos en la tabla Ubicaciones de elementos"
 
@@ -3924,10 +3988,14 @@
 msgid "Add to Transit"
 msgstr "Agregar al tránsito"
 
-#: accounts/doctype/coupon_code/coupon_code.js:39
+#: accounts/doctype/coupon_code/coupon_code.js:36
 msgid "Add/Edit Coupon Conditions"
 msgstr "Agregar / editar condiciones de cupón"
 
+#: templates/includes/footer/footer_extension.html:26
+msgid "Added"
+msgstr ""
+
 #. Label of a Link field in DocType 'CRM Note'
 #: crm/doctype/crm_note/crm_note.json
 msgctxt "CRM Note"
@@ -3944,7 +4012,7 @@
 msgid "Added Supplier Role to User {0}."
 msgstr ""
 
-#: public/js/utils/item_selector.js:66 public/js/utils/item_selector.js:80
+#: public/js/utils/item_selector.js:70 public/js/utils/item_selector.js:86
 msgid "Added {0} ({1})"
 msgstr "Añadido: {0} ({1})"
 
@@ -3952,10 +4020,14 @@
 msgid "Added {1} Role to User {0}."
 msgstr ""
 
-#: crm/doctype/lead/lead.js:80
+#: crm/doctype/lead/lead.js:81
 msgid "Adding Lead to Prospect..."
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "Additional"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Asset'
 #: assets/doctype/asset/asset.json
 msgctxt "Asset"
@@ -4283,6 +4355,10 @@
 msgid "Additional Info"
 msgstr "Información Adicional"
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Additional Information"
+msgstr "Información Adicional"
+
 #. Label of a Section Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -4607,7 +4683,7 @@
 msgid "Address HTML"
 msgstr "Dirección HTML"
 
-#: public/js/utils/contact_address_quick_entry.js:58
+#: public/js/utils/contact_address_quick_entry.js:61
 msgid "Address Line 1"
 msgstr "Dirección línea 1"
 
@@ -4617,7 +4693,7 @@
 msgid "Address Line 1"
 msgstr "Dirección línea 1"
 
-#: public/js/utils/contact_address_quick_entry.js:63
+#: public/js/utils/contact_address_quick_entry.js:66
 msgid "Address Line 2"
 msgstr "Dirección línea 2"
 
@@ -4716,15 +4792,15 @@
 msgid "Addresses"
 msgstr "Direcciones"
 
-#: assets/doctype/asset/asset.js:116
+#: assets/doctype/asset/asset.js:144
 msgid "Adjust Asset Value"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:996
+#: accounts/doctype/sales_invoice/sales_invoice.js:1072
 msgid "Adjustment Against"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:581
+#: stock/doctype/purchase_receipt/purchase_receipt.py:582
 msgid "Adjustment based on Purchase Invoice rate"
 msgstr ""
 
@@ -4741,7 +4817,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:303
+#: stock/reorder_item.py:388
 msgid "Administrator"
 msgstr "Administrador"
 
@@ -4773,8 +4849,8 @@
 msgid "Advance Paid"
 msgstr "Pago Anticipado"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:47
-#: selling/doctype/sales_order/sales_order_list.js:61
+#: buying/doctype/purchase_order/purchase_order_list.js:65
+#: selling/doctype/sales_order/sales_order_list.js:105
 msgid "Advance Payment"
 msgstr ""
 
@@ -4790,7 +4866,7 @@
 msgid "Advance Payment Status"
 msgstr ""
 
-#: controllers/accounts_controller.py:214
+#: controllers/accounts_controller.py:224
 msgid "Advance Payments"
 msgstr "Pagos adelantados"
 
@@ -4821,13 +4897,13 @@
 #. Name of a DocType
 #: accounts/doctype/advance_tax/advance_tax.json
 msgid "Advance Tax"
-msgstr ""
+msgstr "Impuesto anticipado"
 
 #. Label of a Table field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Advance Tax"
-msgstr ""
+msgstr "Impuesto anticipado"
 
 #. Name of a DocType
 #: accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
@@ -4846,11 +4922,11 @@
 msgid "Advance amount"
 msgstr "Importe Anticipado"
 
-#: controllers/taxes_and_totals.py:743
+#: controllers/taxes_and_totals.py:744
 msgid "Advance amount cannot be greater than {0} {1}"
 msgstr "Cantidad de avance no puede ser mayor que {0} {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:741
+#: accounts/doctype/journal_entry/journal_entry.py:768
 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
 msgstr ""
 
@@ -4898,6 +4974,10 @@
 msgid "Affected Transactions"
 msgstr ""
 
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:23
+msgid "Against"
+msgstr "Contra"
+
 #. Label of a Text field in DocType 'GL Entry'
 #: accounts/doctype/gl_entry/gl_entry.json
 msgctxt "GL Entry"
@@ -4906,7 +4986,7 @@
 
 #: 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:631
+#: accounts/report/general_ledger/general_ledger.py:644
 msgid "Against Account"
 msgstr "Contra la cuenta"
 
@@ -4940,11 +5020,11 @@
 msgid "Against Blanket Order"
 msgstr "Contra la orden general"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:945
+#: accounts/doctype/sales_invoice/sales_invoice.py:962
 msgid "Against Customer Order {0} dated {1}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:967
+#: selling/doctype/sales_order/sales_order.js:1127
 msgid "Against Default Supplier"
 msgstr "Contra proveedor predeterminado"
 
@@ -5002,12 +5082,12 @@
 msgid "Against Income Account"
 msgstr "Contra cuenta de ingresos"
 
-#: accounts/doctype/journal_entry/journal_entry.py:609
-#: accounts/doctype/payment_entry/payment_entry.py:669
+#: accounts/doctype/journal_entry/journal_entry.py:636
+#: accounts/doctype/payment_entry/payment_entry.py:678
 msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
 msgstr "El asiento contable {0} no tiene ninguna entrada {1} que vincular"
 
-#: accounts/doctype/gl_entry/gl_entry.py:410
+#: accounts/doctype/gl_entry/gl_entry.py:364
 msgid "Against Journal Entry {0} is already adjusted against some other voucher"
 msgstr "El asiento contable {0} ya se encuentra ajustado contra el importe de otro comprobante"
 
@@ -5041,11 +5121,11 @@
 msgid "Against Stock Entry"
 msgstr "Contra entrada de stock"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
 msgid "Against Supplier Invoice {0} dated {1}"
 msgstr "Contra factura de proveedor {0} con fecha{1}"
 
-#: accounts/report/general_ledger/general_ledger.py:650
+#: accounts/report/general_ledger/general_ledger.py:663
 msgid "Against Voucher"
 msgstr "Contra comprobante"
 
@@ -5056,7 +5136,7 @@
 msgstr "Contra comprobante"
 
 #: accounts/report/general_ledger/general_ledger.js:57
-#: accounts/report/payment_ledger/payment_ledger.js:71
+#: accounts/report/payment_ledger/payment_ledger.js:70
 #: accounts/report/payment_ledger/payment_ledger.py:185
 msgid "Against Voucher No"
 msgstr ""
@@ -5067,7 +5147,7 @@
 msgid "Against Voucher No"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:648
+#: accounts/report/general_ledger/general_ledger.py:661
 #: accounts/report/payment_ledger/payment_ledger.py:176
 msgid "Against Voucher Type"
 msgstr "Tipo de comprobante"
@@ -5085,14 +5165,15 @@
 msgstr "Tipo de comprobante"
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:117
-#: manufacturing/report/work_order_summary/work_order_summary.js:59
+#: manufacturing/report/work_order_summary/work_order_summary.js:58
 #: manufacturing/report/work_order_summary/work_order_summary.py:259
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:96
 msgid "Age"
 msgstr "Edad"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:151
-#: accounts/report/accounts_receivable/accounts_receivable.py:1134
+#: accounts/report/accounts_receivable/accounts_receivable.html:133
+#: accounts/report/accounts_receivable/accounts_receivable.py:1142
 msgid "Age (Days)"
 msgstr "Edad (Días)"
 
@@ -5102,7 +5183,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:58
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:21
-#: accounts/report/accounts_receivable/accounts_receivable.js:83
+#: accounts/report/accounts_receivable/accounts_receivable.js:86
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:21
 msgid "Ageing Based On"
 msgstr "Antigüedad basada en"
@@ -5115,7 +5196,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:65
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:28
-#: accounts/report/accounts_receivable/accounts_receivable.js:90
+#: accounts/report/accounts_receivable/accounts_receivable.js:93
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:28
 #: stock/report/stock_ageing/stock_ageing.js:49
 msgid "Ageing Range 1"
@@ -5123,7 +5204,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:72
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:35
-#: accounts/report/accounts_receivable/accounts_receivable.js:97
+#: accounts/report/accounts_receivable/accounts_receivable.js:100
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:35
 #: stock/report/stock_ageing/stock_ageing.js:56
 msgid "Ageing Range 2"
@@ -5131,7 +5212,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:79
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:42
-#: accounts/report/accounts_receivable/accounts_receivable.js:104
+#: accounts/report/accounts_receivable/accounts_receivable.js:107
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:42
 #: stock/report/stock_ageing/stock_ageing.js:63
 msgid "Ageing Range 3"
@@ -5139,7 +5220,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:86
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:49
-#: accounts/report/accounts_receivable/accounts_receivable.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:49
 msgid "Ageing Range 4"
 msgstr "Rango de envejecimiento 4"
@@ -5203,6 +5284,11 @@
 msgid "Agents"
 msgstr "Agentes"
 
+#. Description of a DocType
+#: selling/doctype/product_bundle/product_bundle.json
+msgid "Aggregate a group of Items into another Item. This is useful if you are maintaining the stock of the packed items and not the bundled item"
+msgstr ""
+
 #. Name of a role
 #: assets/doctype/location/location.json
 msgid "Agriculture Manager"
@@ -5234,10 +5320,10 @@
 msgid "All"
 msgstr "Todos"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:148
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:168
+#: 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:1324 public/js/setup_wizard.js:163
+#: accounts/utils.py:1293 public/js/setup_wizard.js:174
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
@@ -5311,14 +5397,14 @@
 #: 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:310 setup/doctype/company/company.py:313
-#: setup/doctype/company/company.py:318 setup/doctype/company/company.py:324
-#: setup/doctype/company/company.py:330 setup/doctype/company/company.py:336
-#: setup/doctype/company/company.py:342 setup/doctype/company/company.py:348
-#: setup/doctype/company/company.py:354 setup/doctype/company/company.py:360
-#: setup/doctype/company/company.py:366 setup/doctype/company/company.py:372
-#: setup/doctype/company/company.py:378 setup/doctype/company/company.py:384
-#: setup/doctype/company/company.py:390
+#: 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
 msgid "All Departments"
 msgstr "Todos los departamentos"
 
@@ -5339,6 +5425,10 @@
 msgid "All Item Groups"
 msgstr "Todos los grupos de artículos"
 
+#: selling/page/point_of_sale/pos_item_selector.js:25
+msgid "All Items"
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5357,6 +5447,11 @@
 msgid "All Sales Person"
 msgstr "Todos los vendedores"
 
+#. Description of a DocType
+#: setup/doctype/sales_person/sales_person.json
+msgid "All Sales Transactions can be tagged against multiple Sales Persons so that you can set and monitor targets."
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5386,7 +5481,7 @@
 msgid "All Territories"
 msgstr "Todos los territorios"
 
-#: setup/doctype/company/company.py:259 setup/doctype/company/company.py:275
+#: setup/doctype/company/company.py:258 setup/doctype/company/company.py:274
 msgid "All Warehouses"
 msgstr "Todos los almacenes"
 
@@ -5397,19 +5492,19 @@
 msgid "All allocations have been successfully reconciled"
 msgstr ""
 
-#: support/doctype/issue/issue.js:97
+#: support/doctype/issue/issue.js:107
 msgid "All communications including and above this shall be moved into the new Issue"
 msgstr "Todas las comunicaciones incluidas y superiores se incluirán en el nuevo Issue"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:1170
+#: stock/doctype/purchase_receipt/purchase_receipt.py:1172
 msgid "All items have already been Invoiced/Returned"
 msgstr "Todos los artículos ya han sido facturados / devueltos"
 
-#: stock/doctype/stock_entry/stock_entry.py:2191
+#: stock/doctype/stock_entry/stock_entry.py:2222
 msgid "All items have already been transferred for this Work Order."
 msgstr "Todos los artículos ya han sido transferidos para esta Orden de Trabajo."
 
-#: public/js/controllers/transaction.js:2210
+#: public/js/controllers/transaction.js:2253
 msgid "All items in this document already have a linked Quality Inspection."
 msgstr ""
 
@@ -5420,17 +5515,17 @@
 msgid "All the Comments and Emails will be copied from one document to another newly created document(Lead -> Opportunity -> Quotation) throughout the CRM documents."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:847
+#: manufacturing/doctype/work_order/work_order.js:916
 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:899
+#: stock/doctype/delivery_note/delivery_note.py:960
 msgid "All these items have already been Invoiced/Returned"
 msgstr "Todos estos artículos ya han sido facturados / devueltos"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:83
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:95
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:84
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:85
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:92
 msgid "Allocate"
 msgstr "Asignar"
 
@@ -5446,7 +5541,7 @@
 msgid "Allocate Advances Automatically (FIFO)"
 msgstr "Asignar adelantos automáticamente (FIFO)"
 
-#: accounts/doctype/payment_entry/payment_entry.js:679
+#: accounts/doctype/payment_entry/payment_entry.js:831
 msgid "Allocate Payment Amount"
 msgstr "Distribuir el Importe de Pago"
 
@@ -5469,7 +5564,7 @@
 msgstr "Numerado"
 
 #: accounts/report/gross_profit/gross_profit.py:314
-#: public/js/utils/unreconcile.js:62
+#: public/js/utils/unreconcile.js:86
 msgid "Allocated Amount"
 msgstr "Monto asignado"
 
@@ -5528,21 +5623,25 @@
 msgid "Allocated Entries"
 msgstr ""
 
+#: public/js/templates/crm_activities.html:49
+msgid "Allocated To:"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Invoice Advance'
 #: accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
 msgctxt "Sales Invoice Advance"
 msgid "Allocated amount"
 msgstr "Monto asignado"
 
-#: accounts/utils.py:614
+#: accounts/utils.py:623
 msgid "Allocated amount cannot be greater than unadjusted amount"
 msgstr "La cantidad asignada no puede ser mayor que la cantidad no ajustada"
 
-#: accounts/utils.py:612
+#: accounts/utils.py:621
 msgid "Allocated amount cannot be negative"
 msgstr "La cantidad asignada no puede ser negativa"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:258
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:262
 msgid "Allocation"
 msgstr "Asignación"
 
@@ -5552,7 +5651,7 @@
 msgid "Allocation"
 msgstr "Asignación"
 
-#: public/js/utils/unreconcile.js:67
+#: public/js/utils/unreconcile.js:97
 msgid "Allocations"
 msgstr ""
 
@@ -5581,7 +5680,7 @@
 msgid "Allow"
 msgstr "Permitir"
 
-#: accounts/doctype/account/account.py:488
+#: accounts/doctype/account/account.py:507
 #: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68
 msgid "Allow Account Creation Against Child Company"
 msgstr "Permitir creación de cuenta contra empresa infantil"
@@ -5686,7 +5785,7 @@
 msgid "Allow Material Transfer from Purchase Receipt to Purchase Invoice"
 msgstr "Permitir la transferencia de material desde el recibo de compra a la factura de compra"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:9
 msgid "Allow Multiple Material Consumption"
 msgstr "Permitir el Consumo de Material Múltiple"
 
@@ -5963,7 +6062,7 @@
 msgid "Allows to keep aside a specific quantity of inventory for a particular order."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:721
+#: stock/doctype/pick_list/pick_list.py:792
 msgid "Already Picked"
 msgstr ""
 
@@ -5975,9 +6074,9 @@
 msgid "Already set default in pos profile {0} for user {1}, kindly disabled default"
 msgstr "Ya se configuró por defecto en el perfil de pos {0} para el usuario {1}, amablemente desactivado por defecto"
 
-#: manufacturing/doctype/bom/bom.js:141
-#: manufacturing/doctype/work_order/work_order.js:162 public/js/utils.js:466
-#: stock/doctype/stock_entry/stock_entry.js:224
+#: manufacturing/doctype/bom/bom.js:152
+#: manufacturing/doctype/work_order/work_order.js:169 public/js/utils.js:519
+#: stock/doctype/stock_entry/stock_entry.js:245
 msgid "Alternate Item"
 msgstr "Artículo Alternativo"
 
@@ -5993,6 +6092,10 @@
 msgid "Alternative Item Name"
 msgstr "Nombre Alternativo del Artículo"
 
+#: selling/doctype/quotation/quotation.js:360
+msgid "Alternative Items"
+msgstr ""
+
 #: stock/doctype/item_alternative/item_alternative.py:37
 msgid "Alternative item must not be same as item code"
 msgstr "El artículo alternativo no debe ser el mismo que el código del artículo"
@@ -6463,7 +6566,7 @@
 msgid "Amended From"
 msgstr "Modificado Desde"
 
-#: accounts/doctype/journal_entry/journal_entry.js:529
+#: accounts/doctype/journal_entry/journal_entry.js:579
 #: 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
@@ -6477,16 +6580,20 @@
 #: 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
-#: selling/doctype/quotation/quotation.js:286
+#: 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
 #: selling/report/sales_order_analysis/sales_order_analysis.py:290
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:46
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:69
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:67
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:108
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:109
 #: stock/report/delayed_item_report/delayed_item_report.py:152
 #: stock/report/delayed_order_report/delayed_order_report.py:71
-#: templates/pages/order.html:92 templates/pages/rfq.html:46
+#: templates/form_grid/bank_reconciliation_grid.html:4
+#: templates/form_grid/item_grid.html:9
+#: templates/form_grid/stock_entry_grid.html:11 templates/pages/order.html:104
+#: templates/pages/rfq.html:46
 msgid "Amount"
 msgstr "Importe"
 
@@ -7004,19 +7111,19 @@
 msgid "Amount in customer's currency"
 msgstr "Monto en divisa del cliente"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1119
+#: accounts/doctype/payment_entry/payment_entry.py:1128
 msgid "Amount {0} {1} against {2} {3}"
 msgstr "Monto {0} {1} {2} contra {3}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1127
+#: accounts/doctype/payment_entry/payment_entry.py:1136
 msgid "Amount {0} {1} deducted against {2}"
 msgstr "Monto {0} {1} deducido contra {2}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1095
+#: accounts/doctype/payment_entry/payment_entry.py:1104
 msgid "Amount {0} {1} transferred from {2} to {3}"
 msgstr "Monto {0} {1} transferido desde {2} a {3}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1102
+#: accounts/doctype/payment_entry/payment_entry.py:1111
 msgid "Amount {0} {1} {2} {3}"
 msgstr "Monto {0} {1} {2} {3}"
 
@@ -7025,7 +7132,12 @@
 msgid "Amt"
 msgstr "Monto"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:393
+#. Description of a DocType
+#: setup/doctype/item_group/item_group.json
+msgid "An Item Group is a way to classify items based on types."
+msgstr ""
+
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:408
 msgid "An error has been appeared while reposting item valuation via {0}"
 msgstr ""
 
@@ -7034,19 +7146,19 @@
 msgid "An error has occurred during {0}. Check {1} for more details"
 msgstr ""
 
-#: public/js/controllers/buying.js:297 public/js/utils/sales_common.js:364
+#: public/js/controllers/buying.js:292 public/js/utils/sales_common.js:408
 msgid "An error occurred during the update process"
 msgstr "Se produjo un error durante el proceso de actualización"
 
-#: stock/reorder_item.py:287
+#: stock/reorder_item.py:372
 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:232
+#: accounts/doctype/budget/budget.py:239
 msgid "Annual"
 msgstr "Anual"
 
-#: public/js/utils.js:103
+#: public/js/utils.js:120
 msgid "Annual Billing: {0}"
 msgstr "Facturación anual: {0}"
 
@@ -7118,6 +7230,10 @@
 msgid "Applicable Dimension"
 msgstr ""
 
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:221
+msgid "Applicable For"
+msgstr "Aplicable para"
+
 #. Label of a Tab Break field in DocType 'Inventory Dimension'
 #: stock/doctype/inventory_dimension/inventory_dimension.json
 msgctxt "Inventory Dimension"
@@ -7398,6 +7514,12 @@
 msgid "Apply Recursion Over (As Per Transaction UOM)"
 msgstr ""
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Apply Recursion Over (As Per Transaction UOM)"
+msgstr ""
+
 #. Label of a Table field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -7513,7 +7635,7 @@
 msgid "Appointment Confirmation"
 msgstr "Confirmación de la cita"
 
-#: www/book_appointment/index.js:229
+#: www/book_appointment/index.js:237
 msgid "Appointment Created Successfully"
 msgstr ""
 
@@ -7578,11 +7700,11 @@
 msgid "Are you sure you want to clear all demo data?"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:325
+#: public/js/bom_configurator/bom_configurator.bundle.js:363
 msgid "Are you sure you want to delete this Item?"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.js:70
+#: accounts/doctype/subscription/subscription.js:69
 msgid "Are you sure you want to restart this subscription?"
 msgstr ""
 
@@ -7602,13 +7724,13 @@
 msgid "Arrival Quantity"
 msgstr "Cantidad de llegada"
 
-#: stock/report/serial_no_ledger/serial_no_ledger.js:58
+#: 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:31
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:30
 msgid "As On Date"
 msgstr "A la fecha"
 
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:16
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:15
 msgid "As on Date"
 msgstr ""
 
@@ -7631,20 +7753,24 @@
 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}."
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:195
+#: stock/doctype/stock_settings/stock_settings.py:198
 msgid "As there are negative stock, you can not enable {0}."
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:209
+#: stock/doctype/stock_settings/stock_settings.py:212
 msgid "As there are reserved stock, you cannot disable {0}."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1600
+#: manufacturing/doctype/production_plan/production_plan.py:915
+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
 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
 msgstr "Como hay suficientes materias primas, la Solicitud de material no es necesaria para Almacén {0}."
 
-#: stock/doctype/stock_settings/stock_settings.py:164
-#: stock/doctype/stock_settings/stock_settings.py:178
+#: stock/doctype/stock_settings/stock_settings.py:167
+#: stock/doctype/stock_settings/stock_settings.py:181
 msgid "As {0} is enabled, you can not enable {1}."
 msgstr ""
 
@@ -7655,13 +7781,13 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/account_balance/account_balance.js:26
+#: accounts/report/account_balance/account_balance.js:25
 #: 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
 #: assets/doctype/asset/asset.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:177
+#: stock/doctype/purchase_receipt/purchase_receipt.js:200
 msgid "Asset"
 msgstr "Activo"
 
@@ -7811,7 +7937,7 @@
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:37
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:355
 #: assets/doctype/asset_category/asset_category.json
-#: assets/report/fixed_asset_register/fixed_asset_register.js:24
+#: assets/report/fixed_asset_register/fixed_asset_register.js:23
 #: assets/report/fixed_asset_register/fixed_asset_register.py:418
 msgid "Asset Category"
 msgstr "Categoría de activos"
@@ -7908,8 +8034,8 @@
 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:898
-#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:944
+#: 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
 msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
 msgstr ""
@@ -7922,7 +8048,7 @@
 msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:181
+#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:183
 msgid "Asset Depreciation Schedules created:<br>{0}<br><br>Please check, edit if needed, and submit the Asset."
 msgstr ""
 
@@ -7946,7 +8072,7 @@
 
 #: assets/report/fixed_asset_register/fixed_asset_register.py:410
 msgid "Asset ID"
-msgstr ""
+msgstr "Id de Activo"
 
 #. Label of a Link field in DocType 'Purchase Invoice Item'
 #: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -8017,7 +8143,7 @@
 
 #. Name of a DocType
 #: assets/doctype/asset_movement/asset_movement.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:184
+#: stock/doctype/purchase_receipt/purchase_receipt.js:211
 msgid "Asset Movement"
 msgstr "Movimiento de Activo"
 
@@ -8032,7 +8158,7 @@
 msgid "Asset Movement Item"
 msgstr "Elemento de movimiento de activos"
 
-#: assets/doctype/asset/asset.py:901
+#: assets/doctype/asset/asset.py:905
 msgid "Asset Movement record {0} created"
 msgstr "Movimiento de activo {0} creado"
 
@@ -8104,11 +8230,11 @@
 #: assets/doctype/asset/asset.json
 msgctxt "Asset"
 msgid "Asset Quantity"
-msgstr ""
+msgstr "Cantidad de Activos"
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:91
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:127
-#: accounts/report/account_balance/account_balance.js:39
+#: accounts/report/account_balance/account_balance.js:38
 msgid "Asset Received But Not Billed"
 msgstr "Activo recibido pero no facturado"
 
@@ -8218,37 +8344,37 @@
 msgid "Asset Value Analytics"
 msgstr "Análisis de valor de activos"
 
-#: assets/doctype/asset/asset.py:172
+#: assets/doctype/asset/asset.py:174
 msgid "Asset cancelled"
-msgstr ""
+msgstr "Activo cancelado"
 
-#: assets/doctype/asset/asset.py:506
+#: assets/doctype/asset/asset.py:508
 msgid "Asset cannot be cancelled, as it is already {0}"
 msgstr "Activo no se puede cancelar, como ya es {0}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:687
+#: assets/doctype/asset_capitalization/asset_capitalization.py:693
 msgid "Asset capitalized after Asset Capitalization {0} was submitted"
-msgstr ""
+msgstr "Activo capitalizado después de que la Capitalización de Activos {0} fue enviada"
 
-#: assets/doctype/asset/asset.py:194
+#: assets/doctype/asset/asset.py:196
 msgid "Asset created"
-msgstr ""
+msgstr "Activo creado"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:633
+#: assets/doctype/asset_capitalization/asset_capitalization.py:639
 msgid "Asset created after Asset Capitalization {0} was submitted"
-msgstr ""
+msgstr "Recurso creado después de la Capitalización de Activos {0} fue enviada"
 
-#: assets/doctype/asset/asset.py:1156
+#: assets/doctype/asset/asset.py:1160
 msgid "Asset created after being split from Asset {0}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:695
+#: assets/doctype/asset_capitalization/asset_capitalization.py:701
 msgid "Asset decapitalized after Asset Capitalization {0} was submitted"
-msgstr ""
+msgstr "Activo descapitalizado después de la Capitalización de Activos {0} fue enviada"
 
-#: assets/doctype/asset/asset.py:197
+#: assets/doctype/asset/asset.py:199
 msgid "Asset deleted"
-msgstr ""
+msgstr "Activo eliminado"
 
 #: assets/doctype/asset_movement/asset_movement.py:172
 msgid "Asset issued to Employee {0}"
@@ -8262,31 +8388,31 @@
 msgid "Asset received at Location {0} and issued to Employee {1}"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:509
+#: assets/doctype/asset/depreciation.py:507
 msgid "Asset restored"
-msgstr ""
+msgstr "Activo restituido"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:703
+#: assets/doctype/asset_capitalization/asset_capitalization.py:709
 msgid "Asset restored after Asset Capitalization {0} was cancelled"
-msgstr ""
+msgstr "Activo restituido después de la Capitalización de Activos {0} fue cancelada"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1320
+#: accounts/doctype/sales_invoice/sales_invoice.py:1331
 msgid "Asset returned"
-msgstr ""
+msgstr "Activo devuelto"
 
-#: assets/doctype/asset/depreciation.py:483
+#: assets/doctype/asset/depreciation.py:481
 msgid "Asset scrapped"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:485
+#: assets/doctype/asset/depreciation.py:483
 msgid "Asset scrapped via Journal Entry {0}"
 msgstr "Activos desechado a través de entrada de diario {0}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1365
 msgid "Asset sold"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:160
+#: assets/doctype/asset/asset.py:161
 msgid "Asset submitted"
 msgstr ""
 
@@ -8294,7 +8420,7 @@
 msgid "Asset transferred to Location {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1080
+#: assets/doctype/asset/asset.py:1084
 msgid "Asset updated after being split into Asset {0}"
 msgstr ""
 
@@ -8310,11 +8436,11 @@
 msgid "Asset {0} cannot be received at a location and given to an employee in a single movement"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:449
+#: assets/doctype/asset/depreciation.py:447
 msgid "Asset {0} cannot be scrapped, as it is already {1}"
 msgstr "Activo {0} no puede ser desechado, debido a que ya es {1}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:237
+#: assets/doctype/asset_capitalization/asset_capitalization.py:243
 msgid "Asset {0} does not belong to Item {1}"
 msgstr ""
 
@@ -8330,20 +8456,20 @@
 msgid "Asset {0} does not belongs to the location {1}"
 msgstr "El activo {0} no pertenece a la ubicación {1}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:759
-#: assets/doctype/asset_capitalization/asset_capitalization.py:859
+#: assets/doctype/asset_capitalization/asset_capitalization.py:765
+#: assets/doctype/asset_capitalization/asset_capitalization.py:865
 msgid "Asset {0} does not exist"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:639
+#: assets/doctype/asset_capitalization/asset_capitalization.py:645
 msgid "Asset {0} has been created. Please set the depreciation details if any and submit it."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:661
+#: assets/doctype/asset_capitalization/asset_capitalization.py:667
 msgid "Asset {0} has been updated. Please set the depreciation details if any and submit it."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:446
+#: assets/doctype/asset/depreciation.py:444
 msgid "Asset {0} must be submitted"
 msgstr "Activo {0} debe ser enviado"
 
@@ -8385,7 +8511,7 @@
 msgid "Assets"
 msgstr "Bienes"
 
-#: controllers/buying_controller.py:732
+#: controllers/buying_controller.py:757
 msgid "Assets not created for {0}. You will have to create asset manually."
 msgstr "Activos no creados para {0}. Tendrá que crear el activo manualmente."
 
@@ -8394,11 +8520,11 @@
 msgid "Assets, Depreciations, Repairs, and more."
 msgstr ""
 
-#: controllers/buying_controller.py:720
+#: controllers/buying_controller.py:745
 msgid "Asset{} {assets_link} created for {}"
 msgstr "Activo {} {assets_link} creado para {}"
 
-#: manufacturing/doctype/job_card/job_card.js:249
+#: manufacturing/doctype/job_card/job_card.js:281
 msgid "Assign Job to Employee"
 msgstr ""
 
@@ -8420,9 +8546,9 @@
 msgid "Assign to Name"
 msgstr "Asignar a nombre"
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:33
-#: support/report/issue_analytics/issue_analytics.js:82
-#: support/report/issue_summary/issue_summary.js:70
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:32
+#: support/report/issue_analytics/issue_analytics.js:81
+#: support/report/issue_summary/issue_summary.js:69
 msgid "Assigned To"
 msgstr "Asignado a"
 
@@ -8436,7 +8562,7 @@
 msgid "Assignment Conditions"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1011
+#: assets/doctype/asset/asset.py:1015
 msgid "At least one asset has to be selected."
 msgstr ""
 
@@ -8449,7 +8575,7 @@
 msgstr ""
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:405
-#: accounts/doctype/sales_invoice/sales_invoice.py:509
+#: accounts/doctype/sales_invoice/sales_invoice.py:522
 msgid "At least one mode of payment is required for POS invoice."
 msgstr "Se requiere al menos un modo de pago de la factura POS."
 
@@ -8461,7 +8587,7 @@
 msgid "At least one of the Selling or Buying must be selected"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:643
+#: stock/doctype/stock_entry/stock_entry.py:598
 msgid "At least one warehouse is mandatory"
 msgstr ""
 
@@ -8469,22 +8595,26 @@
 msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}"
 msgstr "En la fila n.º {0}: el ID de secuencia {1} no puede ser menor que el ID de secuencia de fila anterior {2}"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:582
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
 msgid "At row {0}: Batch No is mandatory for Item {1}"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:574
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:569
 msgid "At row {0}: Serial No is mandatory for Item {1}"
 msgstr ""
 
+#: controllers/stock_controller.py:301
+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 ""
+
 #. Description of the 'File to Rename' (Attach) field in DocType 'Rename Tool'
 #: utilities/doctype/rename_tool/rename_tool.json
 msgctxt "Rename Tool"
 msgid "Attach .csv file with two columns, one for the old name and one for the new name"
 msgstr "Adjuntar archivo .csv con dos columnas, una para el nombre antiguo y la otra para el nombre nuevo."
 
-#: public/js/utils/serial_no_batch_selector.js:246
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:66
+#: public/js/utils/serial_no_batch_selector.js:250
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:69
 msgid "Attach CSV File"
 msgstr ""
 
@@ -8500,7 +8630,7 @@
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: templates/pages/order.html:125 templates/pages/projects.html:83
+#: templates/pages/order.html:137 templates/pages/projects.html:83
 msgid "Attachments"
 msgstr "Adjuntos"
 
@@ -8654,7 +8784,7 @@
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
 msgid "Auto Create Subcontracting Order"
-msgstr ""
+msgstr "Crear orden de subcontratación automáticamente"
 
 #. Label of a Check field in DocType 'Fiscal Year'
 #: accounts/doctype/fiscal_year/fiscal_year.json
@@ -8680,7 +8810,7 @@
 msgid "Auto Email Report"
 msgstr "Reporte de Correo Electrónico Automático"
 
-#: public/js/utils/serial_no_batch_selector.js:316
+#: public/js/utils/serial_no_batch_selector.js:322
 msgid "Auto Fetch"
 msgstr "Búsqueda automática"
 
@@ -8696,7 +8826,7 @@
 msgid "Auto Material Request"
 msgstr "Requisición de Materiales Automática"
 
-#: stock/reorder_item.py:242
+#: stock/reorder_item.py:327
 msgid "Auto Material Requests Generated"
 msgstr "Solicitudes de Material Automáticamente Generadas"
 
@@ -8720,7 +8850,7 @@
 msgid "Auto Opt In (For all customers)"
 msgstr "Auto Opt In (para todos los clientes)"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:67
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:61
 msgid "Auto Reconcile"
 msgstr ""
 
@@ -8730,7 +8860,7 @@
 msgid "Auto Reconcile Payments"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:414
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:413
 msgid "Auto Reconciliation"
 msgstr ""
 
@@ -8854,7 +8984,7 @@
 msgid "Auto re-order"
 msgstr "Ordenar Automáticamente"
 
-#: public/js/controllers/buying.js:295 public/js/utils/sales_common.js:362
+#: public/js/controllers/buying.js:290 public/js/utils/sales_common.js:403
 msgid "Auto repeat document updated"
 msgstr "Documento automático editado"
 
@@ -8939,15 +9069,15 @@
 msgstr "Disponible para uso Fecha"
 
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:82
-#: public/js/utils.js:522 stock/report/stock_ageing/stock_ageing.py:156
+#: public/js/utils.js:579 stock/report/stock_ageing/stock_ageing.py:156
 msgid "Available Qty"
-msgstr "Cantidad disponible"
+msgstr "Cant. disponible"
 
 #. Label of a Section Break field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
 msgctxt "Delivery Note Item"
 msgid "Available Qty"
-msgstr "Cantidad disponible"
+msgstr "Cant. disponible"
 
 #. Label of a Float field in DocType 'Purchase Receipt Item Supplied'
 #: buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
@@ -9030,15 +9160,15 @@
 msgid "Available Stock for Packing Items"
 msgstr "Inventario Disponible de Artículos de Embalaje"
 
-#: assets/doctype/asset/asset.py:270
+#: assets/doctype/asset/asset.py:272
 msgid "Available for use date is required"
 msgstr "Disponible para la fecha de uso es obligatorio"
 
-#: stock/doctype/stock_entry/stock_entry.py:772
+#: stock/doctype/stock_entry/stock_entry.py:727
 msgid "Available quantity is {0}, you need {1}"
 msgstr "La cantidad disponible es {0}, necesita {1}"
 
-#: stock/dashboard/item_dashboard.js:239
+#: stock/dashboard/item_dashboard.js:247
 msgid "Available {0}"
 msgstr "Disponible {0}"
 
@@ -9048,13 +9178,13 @@
 msgid "Available-for-use Date"
 msgstr "Fecha disponible para usar"
 
-#: assets/doctype/asset/asset.py:355
+#: assets/doctype/asset/asset.py:357
 msgid "Available-for-use Date should be after purchase date"
 msgstr "La fecha de uso disponible debe ser posterior a la fecha de compra."
 
 #: stock/report/stock_ageing/stock_ageing.py:157
 #: stock/report/stock_ageing/stock_ageing.py:191
-#: stock/report/stock_balance/stock_balance.py:477
+#: stock/report/stock_balance/stock_balance.py:485
 msgid "Average Age"
 msgstr "Edad promedio"
 
@@ -9094,7 +9224,7 @@
 msgid "Avg Rate"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:197
+#: stock/report/stock_ledger/stock_ledger.py:270
 msgid "Avg Rate (Balance Stock)"
 msgstr ""
 
@@ -9120,7 +9250,7 @@
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
 msgid "B-"
-msgstr ""
+msgstr "B-"
 
 #. Option for the 'Algorithm' (Select) field in DocType 'Bisect Accounting
 #. Statements'
@@ -9137,14 +9267,14 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/bom/bom.json manufacturing/doctype/bom/bom_tree.js:8
-#: manufacturing/report/bom_explorer/bom_explorer.js:9
+#: manufacturing/report/bom_explorer/bom_explorer.js:8
 #: manufacturing/report/bom_explorer/bom_explorer.py:56
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:9
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:8
 #: manufacturing/report/bom_stock_report/bom_stock_report.js:5
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
-#: selling/doctype/sales_order/sales_order.js:810
-#: stock/doctype/material_request/material_request.js:243
-#: stock/doctype/stock_entry/stock_entry.js:545
+#: 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/report/bom_search/bom_search.py:38
 msgid "BOM"
 msgstr "LdM"
@@ -9215,7 +9345,7 @@
 msgid "BOM 1"
 msgstr "LdM 1"
 
-#: manufacturing/doctype/bom/bom.py:1348
+#: manufacturing/doctype/bom/bom.py:1347
 msgid "BOM 1 {0} and BOM 2 {1} should not be same"
 msgstr "BOM 1 {0} y BOM 2 {1} no deben ser iguales"
 
@@ -9297,7 +9427,7 @@
 msgid "BOM Explosion Item"
 msgstr "Desplegar lista de materiales (LdM) del producto"
 
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:21
+#: manufacturing/report/bom_operations_time/bom_operations_time.js:20
 #: manufacturing/report/bom_operations_time/bom_operations_time.py:101
 msgid "BOM ID"
 msgstr "ID de lista de materiales"
@@ -9306,7 +9436,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "BOM Info"
-msgstr ""
+msgstr "Información de LdM"
 
 #. Name of a DocType
 #: manufacturing/doctype/bom_item/bom_item.json
@@ -9318,7 +9448,7 @@
 msgid "BOM Level"
 msgstr ""
 
-#: manufacturing/report/bom_variance_report/bom_variance_report.js:9
+#: manufacturing/report/bom_variance_report/bom_variance_report.js:8
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:31
 msgid "BOM No"
 msgstr "Lista de materiales (LdM) No."
@@ -9429,6 +9559,7 @@
 #. Name of a report
 #. Label of a Link in the Manufacturing Workspace
 #. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:1
 #: manufacturing/report/bom_stock_report/bom_stock_report.json
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "BOM Stock Report"
@@ -9449,7 +9580,7 @@
 msgid "BOM Update Batch"
 msgstr ""
 
-#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:82
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:84
 msgid "BOM Update Initiated"
 msgstr ""
 
@@ -9469,6 +9600,11 @@
 msgid "BOM Update Tool"
 msgstr "Herramienta de actualización de Lista de Materiales (BOM)"
 
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_log/bom_update_log.json
+msgid "BOM Update Tool Log with job status maintained"
+msgstr ""
+
 #: manufacturing/doctype/bom_update_log/bom_update_log.py:99
 msgid "BOM Updation already in progress. Please wait until {0} is complete."
 msgstr ""
@@ -9492,12 +9628,12 @@
 msgid "BOM Website Operation"
 msgstr "Operación de Página Web de lista de materiales"
 
-#: stock/doctype/stock_entry/stock_entry.js:1000
+#: stock/doctype/stock_entry/stock_entry.js:1145
 msgid "BOM and Manufacturing Quantity are required"
 msgstr "Se requiere la lista de materiales (LdM) y cantidad a manufacturar."
 
-#: stock/doctype/material_request/material_request.js:264
-#: stock/doctype/stock_entry/stock_entry.js:581
+#: stock/doctype/material_request/material_request.js:332
+#: stock/doctype/stock_entry/stock_entry.js:669
 msgid "BOM does not contain any stock item"
 msgstr "BOM no contiene ningún artículo de stock"
 
@@ -9509,15 +9645,15 @@
 msgid "BOM recursion: {1} cannot be parent or child of {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1223
+#: manufacturing/doctype/bom/bom.py:1222
 msgid "BOM {0} does not belong to Item {1}"
 msgstr "La lista de materiales (LdM) {0} no pertenece al producto {1}"
 
-#: manufacturing/doctype/bom/bom.py:1205
+#: manufacturing/doctype/bom/bom.py:1204
 msgid "BOM {0} must be active"
 msgstr "La lista de materiales (LdM) {0} debe estar activa"
 
-#: manufacturing/doctype/bom/bom.py:1208
+#: manufacturing/doctype/bom/bom.py:1207
 msgid "BOM {0} must be submitted"
 msgstr "La lista de materiales (LdM) {0} debe ser validada"
 
@@ -9539,11 +9675,11 @@
 msgid "BOMs creation has been enqueued, kindly check the status after some time"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:323
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:334
 msgid "Backdated Stock Entry"
 msgstr "Entrada de stock retroactiva"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:15
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
 msgid "Backflush Raw Materials"
 msgstr "Materias primas de retrolavado"
 
@@ -9570,15 +9706,16 @@
 #: accounts/report/sales_register/sales_register.py:276
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:47
 msgid "Balance"
-msgstr ""
+msgstr "Balance"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:41
+#: accounts/report/general_ledger/general_ledger.html:32
 msgid "Balance (Dr - Cr)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:584
+#: accounts/report/general_ledger/general_ledger.py:597
 msgid "Balance ({0})"
-msgstr ""
+msgstr "Balance ({0})"
 
 #. Label of a Currency field in DocType 'Exchange Rate Revaluation Account'
 #: accounts/doctype/exchange_rate_revaluation_account/exchange_rate_revaluation_account.json
@@ -9593,8 +9730,8 @@
 msgstr "Saldo en Moneda Base"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:82
-#: stock/report/stock_balance/stock_balance.py:405
-#: stock/report/stock_ledger/stock_ledger.py:153
+#: stock/report/stock_balance/stock_balance.py:413
+#: stock/report/stock_ledger/stock_ledger.py:226
 msgid "Balance Qty"
 msgstr "Balance"
 
@@ -9602,10 +9739,6 @@
 msgid "Balance Qty (Stock)"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:259
-msgid "Balance Serial No"
-msgstr "No de serie de la balanza"
-
 #. Name of a report
 #. Label of a Link in the Financial Reports Workspace
 #: accounts/report/balance_sheet/balance_sheet.json
@@ -9638,18 +9771,22 @@
 msgid "Balance Sheet Summary"
 msgstr ""
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:13
+msgid "Balance Stock Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "Balance Stock Value"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:412
-#: stock/report/stock_ledger/stock_ledger.py:217
+#: stock/report/stock_balance/stock_balance.py:420
+#: stock/report/stock_ledger/stock_ledger.py:290
 msgid "Balance Value"
 msgstr "Valor de balance"
 
-#: accounts/doctype/gl_entry/gl_entry.py:355
+#: accounts/doctype/gl_entry/gl_entry.py:309
 msgid "Balance for Account {0} must always be {1}"
 msgstr "El balance para la cuenta {0} siempre debe ser {1}"
 
@@ -9661,7 +9798,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/bank/bank.json
-#: accounts/report/account_balance/account_balance.js:40
+#: accounts/report/account_balance/account_balance.js:39
 msgid "Bank"
 msgstr "Banco"
 
@@ -9741,7 +9878,7 @@
 #: accounts/doctype/bank_account/bank_account.json
 #: 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:94
+#: buying/doctype/supplier/supplier.js:108
 #: setup/setup_wizard/operations/install_fixtures.py:492
 msgid "Bank Account"
 msgstr "Cuenta bancaria"
@@ -9983,6 +10120,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:4
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Bank Reconciliation Statement"
@@ -10041,23 +10179,23 @@
 msgid "Bank Transaction Payments"
 msgstr "Pagos de transacciones bancarias"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:496
+#: public/js/bank_reconciliation_tool/dialog_manager.js:485
 msgid "Bank Transaction {0} Matched"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:544
+#: public/js/bank_reconciliation_tool/dialog_manager.js:533
 msgid "Bank Transaction {0} added as Journal Entry"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:520
+#: public/js/bank_reconciliation_tool/dialog_manager.js:508
 msgid "Bank Transaction {0} added as Payment Entry"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:124
+#: accounts/doctype/bank_transaction/bank_transaction.py:127
 msgid "Bank Transaction {0} is already fully reconciled"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:563
+#: public/js/bank_reconciliation_tool/dialog_manager.js:553
 msgid "Bank Transaction {0} updated"
 msgstr ""
 
@@ -10065,15 +10203,15 @@
 msgid "Bank account cannot be named as {0}"
 msgstr "La cuenta bancaria no puede nombrarse como {0}"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:130
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:146
 msgid "Bank account {0} already exists and could not be created again"
 msgstr "La cuenta bancaria {0} ya existe y no se pudo volver a crear"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:134
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:153
 msgid "Bank accounts added"
 msgstr "Cuentas bancarias agregadas"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:297
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:313
 msgid "Bank transaction creation error"
 msgstr "Error de creación de transacción bancaria"
 
@@ -10081,11 +10219,11 @@
 #: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
 msgctxt "Process Payment Reconciliation"
 msgid "Bank/Cash Account"
-msgstr ""
+msgstr "Cuenta Banco/Efectivo"
 
 #: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.py:54
 msgid "Bank/Cash Account {0} doesn't belong to company {1}"
-msgstr ""
+msgstr "La Cuenta Banco/Efectivo {0} no pertenece a la compañía {1}"
 
 #. Label of a Card Break in the Accounting Workspace
 #: accounts/workspace/accounting/accounting.json
@@ -10098,7 +10236,7 @@
 msgid "Banking"
 msgstr "Banca"
 
-#: public/js/utils/barcode_scanner.js:273
+#: public/js/utils/barcode_scanner.js:282
 msgid "Barcode"
 msgstr "Código de barras"
 
@@ -10225,9 +10363,9 @@
 msgid "Base Tax Withholding Net Total"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:239
 msgid "Base Total"
-msgstr ""
+msgstr "Total base"
 
 #. Label of a Currency field in DocType 'Timesheet'
 #: projects/doctype/timesheet/timesheet.json
@@ -10253,18 +10391,18 @@
 msgid "Base URL"
 msgstr "URL Base"
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:28
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:27
 #: accounts/report/profitability_analysis/profitability_analysis.js:16
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:9
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:45
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:39
-#: manufacturing/report/production_planning_report/production_planning_report.js:17
-#: manufacturing/report/work_order_summary/work_order_summary.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:8
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:44
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:38
+#: manufacturing/report/production_planning_report/production_planning_report.js:16
+#: manufacturing/report/work_order_summary/work_order_summary.js:15
 #: public/js/purchase_trends_filters.js:45 public/js/sales_trends_filters.js:20
-#: stock/report/delayed_item_report/delayed_item_report.js:55
-#: stock/report/delayed_order_report/delayed_order_report.js:55
-#: support/report/issue_analytics/issue_analytics.js:17
-#: support/report/issue_summary/issue_summary.js:17
+#: stock/report/delayed_item_report/delayed_item_report.js:54
+#: stock/report/delayed_order_report/delayed_order_report.js:54
+#: support/report/issue_analytics/issue_analytics.js:16
+#: support/report/issue_summary/issue_summary.js:16
 msgid "Based On"
 msgstr "Basado en"
 
@@ -10280,18 +10418,18 @@
 msgid "Based On"
 msgstr "Basado en"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:47
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:46
 msgid "Based On Data ( in years )"
 msgstr "Basado en datos (en años)"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:31
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:30
 msgid "Based On Document"
 msgstr "Basado en documento"
 
-#: accounts/report/accounts_payable/accounts_payable.js:134
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:111
-#: accounts/report/accounts_receivable/accounts_receivable.js:156
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:137
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:114
+#: accounts/report/accounts_receivable/accounts_receivable.js:159
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:132
 msgid "Based On Payment Terms"
 msgstr "Basada en Término de Pago"
 
@@ -10363,7 +10501,7 @@
 #: 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/stock_ledger/stock_ledger.py:239
+#: 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
 msgid "Batch"
@@ -10404,11 +10542,11 @@
 msgid "Batch Item Expiry Status"
 msgstr "Estado de Caducidad de Lote de Productos"
 
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:88
+#: 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:2150
-#: public/js/utils/barcode_scanner.js:251
-#: public/js/utils/serial_no_batch_selector.js:367
+#: public/js/controllers/transaction.js:2193
+#: 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
@@ -10536,15 +10674,15 @@
 msgid "Batch No"
 msgstr "Lote Nro."
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:585
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:580
 msgid "Batch No is mandatory"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2118
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2137
 msgid "Batch No {0} does not exists"
 msgstr "Lote núm. {0} no existe"
 
-#: stock/utils.py:643
+#: stock/utils.py:638
 msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
 msgstr ""
 
@@ -10554,13 +10692,13 @@
 msgid "Batch No."
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Batch Nos"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1113
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1120
 msgid "Batch Nos are created successfully"
 msgstr ""
 
@@ -10580,7 +10718,7 @@
 msgid "Batch Quantity"
 msgstr "Cantidad de lote"
 
-#: manufacturing/doctype/work_order/work_order.js:256
+#: manufacturing/doctype/work_order/work_order.js:271
 msgid "Batch Size"
 msgstr "Tamaño del lote"
 
@@ -10620,7 +10758,7 @@
 msgid "Batch and Serial No"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:485
+#: manufacturing/doctype/work_order/work_order.py:496
 msgid "Batch not created for item {} since it does not have a batch series."
 msgstr ""
 
@@ -10628,12 +10766,12 @@
 msgid "Batch {0} and Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2345
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:272
+#: stock/doctype/stock_entry/stock_entry.py:2379
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:283
 msgid "Batch {0} of Item {1} has expired."
 msgstr "El lote {0} del producto {1} ha expirado."
 
-#: stock/doctype/stock_entry/stock_entry.py:2347
+#: stock/doctype/stock_entry/stock_entry.py:2381
 msgid "Batch {0} of Item {1} is disabled."
 msgstr "El lote {0} del elemento {1} está deshabilitado."
 
@@ -10673,7 +10811,7 @@
 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:1061
+#: accounts/report/accounts_receivable/accounts_receivable.py:1069
 #: accounts/report/purchase_register/purchase_register.py:214
 msgid "Bill Date"
 msgstr "Fecha de factura"
@@ -10690,7 +10828,7 @@
 msgid "Bill Date"
 msgstr "Fecha de factura"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1060
+#: accounts/report/accounts_receivable/accounts_receivable.py:1068
 #: accounts/report/purchase_register/purchase_register.py:213
 msgid "Bill No"
 msgstr "Factura No."
@@ -10715,11 +10853,11 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Manufacturing Workspace
-#: manufacturing/doctype/bom/bom.py:1089
+#: manufacturing/doctype/bom/bom.py:1088
 #: 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:533
+#: stock/doctype/stock_entry/stock_entry.js:599
 msgid "Bill of Materials"
 msgstr "Lista de materiales"
 
@@ -11123,8 +11261,8 @@
 msgid "Blanket Order Rate"
 msgstr "Tasa de orden general"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:101
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:265
 msgid "Block Invoice"
 msgstr "Factura en Bloque"
 
@@ -11263,7 +11401,7 @@
 msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
 msgstr ""
 
-#: accounts/general_ledger.py:685
+#: accounts/general_ledger.py:694
 msgid "Books have been closed till the period ending on {0}"
 msgstr ""
 
@@ -11329,11 +11467,11 @@
 #: accounts/report/gross_profit/gross_profit.py:243
 #: 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:41 public/js/stock_analytics.js:62
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:48
+#: public/js/stock_analytics.js:58 public/js/stock_analytics.js:93
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:47
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:61
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:100
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:101
 #: setup/doctype/brand/brand.json
 #: stock/report/item_price_stock/item_price_stock.py:25
 #: stock/report/item_prices/item_prices.py:53
@@ -11343,10 +11481,10 @@
 #: 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_analytics/stock_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:34
 #: stock/report/stock_analytics/stock_analytics.py:45
-#: stock/report/stock_ledger/stock_ledger.js:65
-#: stock/report/stock_ledger/stock_ledger.py:181
+#: 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
 #: stock/report/stock_projected_qty/stock_projected_qty.py:115
 msgid "Brand"
@@ -11505,16 +11643,16 @@
 msgid "Breakdown"
 msgstr "Desglose"
 
-#: manufacturing/doctype/bom/bom.js:103
+#: manufacturing/doctype/bom/bom.js:102
 msgid "Browse BOM"
 msgstr "Explorar la lista de materiales"
 
 #. Name of a DocType
 #: accounts/doctype/budget/budget.json
-#: accounts/doctype/cost_center/cost_center.js:44
-#: accounts/doctype/cost_center/cost_center_tree.js:42
-#: accounts/doctype/cost_center/cost_center_tree.js:46
-#: accounts/doctype/cost_center/cost_center_tree.js:50
+#: accounts/doctype/cost_center/cost_center.js:45
+#: accounts/doctype/cost_center/cost_center_tree.js:65
+#: accounts/doctype/cost_center/cost_center_tree.js:73
+#: 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
@@ -11538,7 +11676,7 @@
 msgid "Budget Accounts"
 msgstr "Cuentas de Presupuesto"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:82
+#: accounts/report/budget_variance_report/budget_variance_report.js:80
 msgid "Budget Against"
 msgstr "Contra Presupuesto"
 
@@ -11560,17 +11698,17 @@
 msgid "Budget Detail"
 msgstr "Detalle del Presupuesto"
 
-#: accounts/doctype/budget/budget.py:278 accounts/doctype/budget/budget.py:280
+#: accounts/doctype/budget/budget.py:285 accounts/doctype/budget/budget.py:287
 msgid "Budget Exceeded"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center_tree.js:40
+#: accounts/doctype/cost_center/cost_center_tree.js:61
 msgid "Budget List"
 msgstr "Lista de Presupuesto"
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/cost_center/cost_center_tree.js:48
+#: accounts/doctype/cost_center/cost_center_tree.js:77
 #: accounts/report/budget_variance_report/budget_variance_report.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Budget Variance Report"
@@ -11626,7 +11764,7 @@
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Bundle Items"
-msgstr ""
+msgstr "Conjunto de Productos"
 
 #: stock/report/product_bundle_balance/product_bundle_balance.py:95
 msgid "Bundle Qty"
@@ -11643,6 +11781,11 @@
 msgid "Buy"
 msgstr "Comprar"
 
+#. Description of a DocType
+#: selling/doctype/customer/customer.json
+msgid "Buyer of Goods and Services."
+msgstr ""
+
 #. Name of a Workspace
 #. Label of a Card Break in the Buying Workspace
 #: buying/workspace/buying/buying.json
@@ -11702,7 +11845,7 @@
 #: setup/doctype/company/company.json
 msgctxt "Company"
 msgid "Buying & Selling Settings"
-msgstr ""
+msgstr "Configuración de Compra y Venta"
 
 #: accounts/report/gross_profit/gross_profit.py:280
 msgid "Buying Amount"
@@ -11721,7 +11864,7 @@
 #: buying/doctype/buying_settings/buying_settings.json
 #: buying/onboarding_step/introduction_to_buying/introduction_to_buying.json
 msgid "Buying Settings"
-msgstr "Configuración de compras"
+msgstr "Configuración de Compras"
 
 #. Label of a Link in the Buying Workspace
 #. Label of a Link in the Settings Workspace
@@ -11729,7 +11872,7 @@
 #: buying/workspace/buying/buying.json setup/workspace/settings/settings.json
 msgctxt "Buying Settings"
 msgid "Buying Settings"
-msgstr "Configuración de compras"
+msgstr "Configuración de Compras"
 
 #. Label of a Tab Break field in DocType 'Company'
 #: setup/doctype/company/company.json
@@ -11741,7 +11884,7 @@
 msgid "Buying must be checked, if Applicable For is selected as {0}"
 msgstr "'Compras' debe ser seleccionada, si la opción: 'Aplicable para' esta seleccionado como {0}"
 
-#: buying/doctype/buying_settings/buying_settings.js:14
+#: buying/doctype/buying_settings/buying_settings.js:13
 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a <a href='https://docs.erpnext.com/docs/user/manual/en/setting-up/settings/naming-series' target='_blank'>Naming Series</a> choose the 'Naming Series' option."
 msgstr ""
 
@@ -11760,7 +11903,7 @@
 #: stock/doctype/closing_stock_balance/closing_stock_balance.json
 msgctxt "Closing Stock Balance"
 msgid "CBAL-.#####"
-msgstr ""
+msgstr "CBAL-.#####"
 
 #. Label of a Link field in DocType 'Process Statement Of Accounts'
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
@@ -11935,12 +12078,12 @@
 msgid "Call Routing"
 msgstr ""
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:57
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:58
 #: telephony/doctype/incoming_call_settings/incoming_call_settings.py:49
 msgid "Call Schedule Row {0}: To time slot should always be ahead of From time slot."
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:153
+#: public/js/call_popup/call_popup.js:164
 #: telephony/doctype/call_log/call_log.py:135
 msgid "Call Summary"
 msgstr "Resumen de llamadas"
@@ -11951,6 +12094,10 @@
 msgid "Call Summary"
 msgstr "Resumen de llamadas"
 
+#: public/js/call_popup/call_popup.js:186
+msgid "Call Summary Saved"
+msgstr ""
+
 #. Label of a Data field in DocType 'Telephony Call Type'
 #: telephony/doctype/telephony_call_type/telephony_call_type.json
 msgctxt "Telephony Call Type"
@@ -11965,7 +12112,7 @@
 #. Label of a Card Break in the CRM Workspace
 #: crm/doctype/campaign/campaign.json crm/workspace/crm/crm.json
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Label of a Section Break field in DocType 'Campaign'
 #. Label of a Link in the CRM Workspace
@@ -11974,50 +12121,50 @@
 #: selling/workspace/selling/selling.json
 msgctxt "Campaign"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Label of a Link field in DocType 'Campaign Item'
 #: accounts/doctype/campaign_item/campaign_item.json
 msgctxt "Campaign Item"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Label of a Link field in DocType 'Delivery Note'
 #: stock/doctype/delivery_note/delivery_note.json
 msgctxt "Delivery Note"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Label of a Link field in DocType 'Email Campaign'
 #: crm/doctype/email_campaign/email_campaign.json
 msgctxt "Email Campaign"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Label of a Link field in DocType 'Opportunity'
 #: crm/doctype/opportunity/opportunity.json
 msgctxt "Opportunity"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Label of a Link field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Label of a Link field in DocType 'POS Profile'
 #: accounts/doctype/pos_profile/pos_profile.json
 msgctxt "POS Profile"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Option for the 'Applicable For' (Select) field in DocType 'Pricing Rule'
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Option for the 'Applicable For' (Select) field in DocType 'Promotional
 #. Scheme'
@@ -12025,25 +12172,25 @@
 #: accounts/doctype/promotional_scheme/promotional_scheme.json
 msgctxt "Promotional Scheme"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Label of a Link field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Label of a Link field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Label of a Link field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
 msgid "Campaign"
-msgstr ""
+msgstr "Campaña"
 
 #. Name of a report
 #. Label of a Link in the CRM Workspace
@@ -12097,7 +12244,7 @@
 msgid "Can be approved by {0}"
 msgstr "Puede ser aprobado por {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:1451
+#: manufacturing/doctype/work_order/work_order.py:1465
 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
 msgstr ""
 
@@ -12125,20 +12272,24 @@
 msgid "Can not filter based on Voucher No, if grouped by Voucher"
 msgstr "No se puede filtrar en función al 'No. de comprobante', si esta agrupado por el nombre"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1226
-#: accounts/doctype/payment_entry/payment_entry.py:2229
+#: accounts/doctype/journal_entry/journal_entry.py:1240
+#: accounts/doctype/payment_entry/payment_entry.py:2254
 msgid "Can only make payment against unbilled {0}"
 msgstr "Sólo se puede crear el pago contra {0} impagado"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1199
-#: controllers/accounts_controller.py:2500 public/js/controllers/accounts.js:90
+#: accounts/doctype/payment_entry/payment_entry.js:1438
+#: controllers/accounts_controller.py:2585 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 "Puede referirse a la línea, sólo si el tipo de importe es 'previo al importe' o 'previo al total'"
 
-#: stock/doctype/stock_settings/stock_settings.py:133
+#: stock/doctype/stock_settings/stock_settings.py:136
 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method"
 msgstr ""
 
+#: templates/pages/task_info.html:24
+msgid "Cancel"
+msgstr "Cancelar"
+
 #. Label of a Check field in DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
 msgctxt "Subscription"
@@ -12169,8 +12320,8 @@
 msgid "Cancelation Date"
 msgstr "Fecha de Cancelación"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:18
-#: stock/doctype/stock_entry/stock_entry_list.js:19
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:13
+#: stock/doctype/stock_entry/stock_entry_list.js:25
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -12187,11 +12338,12 @@
 msgstr "Cancelado"
 
 #: accounts/doctype/bank_transaction/bank_transaction_list.js:8
-#: accounts/doctype/payment_request/payment_request_list.js:20
+#: accounts/doctype/payment_request/payment_request_list.js:18
 #: accounts/doctype/subscription/subscription_list.js:14
 #: assets/doctype/asset_repair/asset_repair_list.js:9
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:11
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle_list.js:8
+#: templates/pages/task_info.html:77
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -12446,6 +12598,13 @@
 msgid "Cancelled"
 msgstr "Cancelado"
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Cancelled"
+msgstr "Cancelado"
+
 #. Option for the 'Status' (Select) field in DocType 'Warranty Claim'
 #: support/doctype/warranty_claim/warranty_claim.json
 msgctxt "Warranty Claim"
@@ -12458,7 +12617,7 @@
 msgid "Cancelled"
 msgstr "Cancelado"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:76
+#: stock/doctype/delivery_trip/delivery_trip.js:89
 #: stock/doctype/delivery_trip/delivery_trip.py:189
 msgid "Cannot Calculate Arrival Time as Driver Address is Missing."
 msgstr "No se puede calcular la hora de llegada porque falta la dirección del conductor."
@@ -12468,7 +12627,7 @@
 msgid "Cannot Merge"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:105
+#: stock/doctype/delivery_trip/delivery_trip.js:122
 msgid "Cannot Optimize Route as Driver Address is Missing."
 msgstr "No se puede optimizar la ruta porque falta la dirección del conductor."
 
@@ -12484,7 +12643,7 @@
 msgid "Cannot amend {0} {1}, please create a new one instead."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:257
+#: accounts/doctype/journal_entry/journal_entry.py:273
 msgid "Cannot apply TDS against multiple parties in one entry"
 msgstr ""
 
@@ -12492,23 +12651,23 @@
 msgid "Cannot be a fixed asset item as Stock Ledger is created."
 msgstr "No puede ser un elemento de Activo Fijo ya que se creo un Libro de Stock ."
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:222
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:217
 msgid "Cannot cancel as processing of cancelled documents is pending."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:641
+#: manufacturing/doctype/work_order/work_order.py:655
 msgid "Cannot cancel because submitted Stock Entry {0} exists"
 msgstr "No se puede cancelar debido a que existe una entrada en el almacén {0}"
 
-#: stock/stock_ledger.py:196
+#: stock/stock_ledger.py:198
 msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet."
 msgstr ""
 
-#: controllers/buying_controller.py:811
+#: controllers/buying_controller.py:836
 msgid "Cannot cancel this document as it is linked with submitted asset {0}. Please cancel it to continue."
 msgstr "No se puede cancelar este documento porque está vinculado con el activo enviado {0}. Cancele para continuar."
 
-#: stock/doctype/stock_entry/stock_entry.py:365
+#: stock/doctype/stock_entry/stock_entry.py:320
 msgid "Cannot cancel transaction for Completed Work Order."
 msgstr "No se puede cancelar la transacción para la orden de trabajo completada."
 
@@ -12520,7 +12679,7 @@
 msgid "Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."
 msgstr "No se puede cambiar la 'Fecha de Inicio' y la 'Fecha Final' del año fiscal una vez que ha sido guardado."
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:66
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:70
 msgid "Cannot change Reference Document Type."
 msgstr ""
 
@@ -12532,7 +12691,7 @@
 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this."
 msgstr "No se pueden cambiar las propiedades de la Variante después de una transacción de stock. Deberá crear un nuevo ítem para hacer esto."
 
-#: setup/doctype/company/company.py:209
+#: setup/doctype/company/company.py:208
 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."
 msgstr "No se puede cambiar la divisa/moneda por defecto de la compañía, porque existen transacciones, estas deben ser canceladas antes de cambiarla"
 
@@ -12544,32 +12703,32 @@
 msgid "Cannot convert Cost Center to ledger as it has child nodes"
 msgstr "No se puede convertir de 'Centros de Costos' a una cuenta del libro mayor, ya que tiene sub-grupos"
 
-#: projects/doctype/task/task.js:48
+#: projects/doctype/task/task.js:50
 msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}."
 msgstr ""
 
-#: accounts/doctype/account/account.py:373
+#: accounts/doctype/account/account.py:392
 msgid "Cannot convert to Group because Account Type is selected."
 msgstr ""
 
-#: accounts/doctype/account/account.py:250
+#: accounts/doctype/account/account.py:269
 msgid "Cannot covert to Group because Account Type is selected."
 msgstr "No se puede convertir a 'Grupo' porque se seleccionó 'Tipo de Cuenta'."
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:914
+#: stock/doctype/purchase_receipt/purchase_receipt.py:916
 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note_list.js:25
+#: stock/doctype/delivery_note/delivery_note_list.js:35
 msgid "Cannot create a Delivery Trip from Draft documents."
 msgstr "No se puede crear un viaje de entrega a partir de documentos de borrador."
 
-#: selling/doctype/sales_order/sales_order.py:1576
-#: stock/doctype/pick_list/pick_list.py:104
+#: selling/doctype/sales_order/sales_order.py:1599
+#: stock/doctype/pick_list/pick_list.py:108
 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 ""
 
-#: accounts/general_ledger.py:127
+#: accounts/general_ledger.py:131
 msgid "Cannot create accounting entries against disabled accounts: {0}"
 msgstr ""
 
@@ -12590,32 +12749,40 @@
 msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
 msgstr "No se puede eliminar el No. de serie {0}, ya que esta siendo utilizado en transacciones de stock"
 
-#: selling/doctype/sales_order/sales_order.py:638
-#: selling/doctype/sales_order/sales_order.py:661
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:101
+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
 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
 msgstr "No se puede garantizar la entrega por número de serie ya que el artículo {0} se agrega con y sin Asegurar entrega por número de serie"
 
-#: public/js/utils/barcode_scanner.js:51
+#: public/js/utils/barcode_scanner.js:54
 msgid "Cannot find Item with this Barcode"
 msgstr "No se puede encontrar el artículo con este código de barras"
 
-#: controllers/accounts_controller.py:3023
+#: controllers/accounts_controller.py:3114
 msgid "Cannot find {} for item {}. Please set the same in Item Master or Stock Settings."
 msgstr "No se puede encontrar {} para el artículo {}. Establezca lo mismo en Item Master o Stock Settings."
 
-#: controllers/accounts_controller.py:1774
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:506
+msgid "Cannot make any transactions until the deletion job is completed"
+msgstr ""
+
+#: controllers/accounts_controller.py:1863
 msgid "Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings"
 msgstr "No se puede facturar en exceso el artículo {0} en la fila {1} más de {2}. Para permitir una facturación excesiva, configure la asignación en la Configuración de cuentas"
 
-#: manufacturing/doctype/work_order/work_order.py:292
+#: manufacturing/doctype/work_order/work_order.py:296
 msgid "Cannot produce more Item {0} than Sales Order quantity {1}"
 msgstr "No se puede producir una cantidad mayor del producto {0} que lo requerido en el pedido de venta {1}"
 
-#: manufacturing/doctype/work_order/work_order.py:962
+#: manufacturing/doctype/work_order/work_order.py:976
 msgid "Cannot produce more item for {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:966
+#: manufacturing/doctype/work_order/work_order.py:980
 msgid "Cannot produce more than {0} items for {1}"
 msgstr ""
 
@@ -12623,8 +12790,8 @@
 msgid "Cannot receive from customer against negative outstanding"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1209
-#: controllers/accounts_controller.py:2515
+#: accounts/doctype/payment_entry/payment_entry.js:1455
+#: controllers/accounts_controller.py:2600
 #: public/js/controllers/accounts.js:100
 msgid "Cannot refer row number greater than or equal to current row number for this Charge type"
 msgstr "No se puede referenciar a una línea mayor o igual al numero de línea actual."
@@ -12633,14 +12800,14 @@
 msgid "Cannot retrieve link token for update. Check Error Log for more information"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:60
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:63
 msgid "Cannot retrieve link token. Check Error Log for more information"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1203
-#: accounts/doctype/payment_entry/payment_entry.js:1374
-#: accounts/doctype/payment_entry/payment_entry.py:1579
-#: controllers/accounts_controller.py:2505 public/js/controllers/accounts.js:94
+#: 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
 #: 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 "No se puede seleccionar el tipo de cargo como 'Importe de línea anterior' o ' Total de línea anterior' para la primera linea"
@@ -12657,11 +12824,11 @@
 msgid "Cannot set multiple Item Defaults for a company."
 msgstr "No se pueden establecer varios valores predeterminados de artículos para una empresa."
 
-#: controllers/accounts_controller.py:3173
+#: controllers/accounts_controller.py:3264
 msgid "Cannot set quantity less than delivered quantity"
 msgstr "No se puede establecer una cantidad menor que la cantidad entregada"
 
-#: controllers/accounts_controller.py:3178
+#: controllers/accounts_controller.py:3269
 msgid "Cannot set quantity less than received quantity"
 msgstr "No se puede establecer una cantidad menor que la cantidad recibida"
 
@@ -12669,7 +12836,7 @@
 msgid "Cannot set the field <b>{0}</b> for copying in variants"
 msgstr "No se puede establecer el campo <b>{0}</b> para copiar en variantes"
 
-#: accounts/doctype/payment_entry/payment_entry.js:876
+#: accounts/doctype/payment_entry/payment_entry.js:1050
 msgid "Cannot {0} {1} {2} without any negative outstanding invoice"
 msgstr "No se puede {0} {1} {2} sin ninguna factura pendiente negativa"
 
@@ -12689,7 +12856,7 @@
 msgid "Capacity Planning"
 msgstr "Planificación de capacidad"
 
-#: manufacturing/doctype/work_order/work_order.py:627
+#: manufacturing/doctype/work_order/work_order.py:641
 msgid "Capacity Planning Error, planned start time can not be same as end time"
 msgstr "Error de planificación de capacidad, la hora de inicio planificada no puede ser la misma que la hora de finalización"
 
@@ -12731,7 +12898,7 @@
 msgid "Capital Work In Progress Account"
 msgstr "Cuenta Capital Work In Progress"
 
-#: accounts/report/account_balance/account_balance.js:43
+#: accounts/report/account_balance/account_balance.js:42
 msgid "Capital Work in Progress"
 msgstr "Trabajo de capital en progreso"
 
@@ -12753,7 +12920,7 @@
 msgid "Capitalization Method"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:155
+#: assets/doctype/asset/asset.js:194
 msgid "Capitalize Asset"
 msgstr ""
 
@@ -12795,7 +12962,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:14
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:18
-#: accounts/report/account_balance/account_balance.js:41
+#: accounts/report/account_balance/account_balance.js:40
 #: setup/setup_wizard/operations/install_fixtures.py:208
 msgid "Cash"
 msgstr "Efectivo"
@@ -12859,7 +13026,7 @@
 msgid "Cash In Hand"
 msgstr "Efectivo en caja"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:322
 msgid "Cash or Bank Account is mandatory for making payment entry"
 msgstr "'Cuenta de Efectivo' o 'Cuenta Bancaria' es obligatoria para hacer una entrada de pago"
 
@@ -12881,7 +13048,7 @@
 msgid "Cash/Bank Account"
 msgstr "Cuenta de caja / banco"
 
-#: accounts/report/pos_register/pos_register.js:39
+#: accounts/report/pos_register/pos_register.js:38
 #: accounts/report/pos_register/pos_register.py:126
 #: accounts/report/pos_register/pos_register.py:200
 msgid "Cashier"
@@ -12943,7 +13110,7 @@
 msgid "Category-wise Asset Value"
 msgstr "Valor del activo por categoría"
 
-#: buying/doctype/purchase_order/purchase_order.py:313
+#: buying/doctype/purchase_order/purchase_order.py:314
 #: buying/doctype/request_for_quotation/request_for_quotation.py:99
 msgid "Caution"
 msgstr "Precaución"
@@ -12988,7 +13155,7 @@
 msgid "Certificate Required"
 msgstr "Certificado Requerido"
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "Change"
 msgstr "Cambio"
 
@@ -13004,7 +13171,7 @@
 msgid "Change Amount"
 msgstr "Importe de Cambio"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:90
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:108
 msgid "Change Release Date"
 msgstr "Cambiar fecha de lanzamiento"
 
@@ -13024,7 +13191,7 @@
 msgid "Change in Stock Value"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:885
+#: accounts/doctype/sales_invoice/sales_invoice.py:902
 msgid "Change the account type to Receivable or select a different account."
 msgstr "Cambie el tipo de cuenta a Cobrar o seleccione una cuenta diferente."
 
@@ -13045,7 +13212,11 @@
 msgid "Changes"
 msgstr ""
 
-#: stock/doctype/item/item.js:235
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Changes in {0}"
+msgstr ""
+
+#: stock/doctype/item/item.js:277
 msgid "Changing Customer Group for the selected Customer is not allowed."
 msgstr "No se permite cambiar el grupo de clientes para el cliente seleccionado."
 
@@ -13055,12 +13226,12 @@
 msgid "Channel Partner"
 msgstr "Canal de socio"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1634
-#: controllers/accounts_controller.py:2568
+#: accounts/doctype/payment_entry/payment_entry.py:1653
+#: controllers/accounts_controller.py:2653
 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:42
+#: accounts/report/account_balance/account_balance.js:41
 msgid "Chargeable"
 msgstr "Devengable"
 
@@ -13076,7 +13247,15 @@
 msgid "Charges Incurred"
 msgstr "Cargos Incurridos"
 
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges are updated in Purchase Receipt against each item"
+msgstr ""
+
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges will be distributed proportionately based on item qty or amount, as per your selection"
+msgstr ""
+
+#: selling/page/sales_funnel/sales_funnel.js:45
 msgid "Chart"
 msgstr "Gráfico"
 
@@ -13104,10 +13283,10 @@
 msgid "Chart Tree"
 msgstr "Árbol de cartas"
 
-#: accounts/doctype/account/account.js:75
+#: accounts/doctype/account/account.js:70
 #: accounts/doctype/account/account_tree.js:5
-#: accounts/doctype/cost_center/cost_center_tree.js:35
-#: public/js/setup_wizard.js:36 setup/doctype/company/company.js:92
+#: accounts/doctype/cost_center/cost_center_tree.js:52
+#: public/js/setup_wizard.js:37 setup/doctype/company/company.js:96
 msgid "Chart of Accounts"
 msgstr "Catálogo de cuentas"
 
@@ -13143,7 +13322,7 @@
 msgid "Chart of Accounts Importer"
 msgstr "Importador de plan de cuentas"
 
-#: accounts/doctype/account/account_tree.js:133
+#: accounts/doctype/account/account_tree.js:181
 #: accounts/doctype/cost_center/cost_center.js:41
 msgid "Chart of Cost Centers"
 msgstr "Centros de costos"
@@ -13154,7 +13333,7 @@
 msgid "Chart of Cost Centers"
 msgstr "Centros de costos"
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:65
+#: manufacturing/report/work_order_summary/work_order_summary.js:64
 msgid "Charts Based On"
 msgstr "Gráficos basados en"
 
@@ -13169,7 +13348,7 @@
 #: communication/doctype/communication_medium/communication_medium.json
 msgctxt "Communication Medium"
 msgid "Chat"
-msgstr ""
+msgstr "Chat"
 
 #. Title of an Onboarding Step
 #. Label of an action in the Onboarding Step 'Check Stock Ledger'
@@ -13232,7 +13411,12 @@
 msgid "Checking this will round off the tax amount to the nearest integer"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:252
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:148
+msgid "Checkout"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:250
 msgid "Checkout Order / Submit Order / New Order"
 msgstr "Realizar pedido / Enviar pedido / Nuevo pedido"
 
@@ -13281,7 +13465,7 @@
 msgid "Cheque Width"
 msgstr "Ancho Cheque"
 
-#: public/js/controllers/transaction.js:2061
+#: public/js/controllers/transaction.js:2104
 msgid "Cheque/Reference Date"
 msgstr "Cheque / Fecha de referencia"
 
@@ -13302,6 +13486,7 @@
 msgstr "Cheque / No. de Referencia"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:131
+#: accounts/report/accounts_receivable/accounts_receivable.html:113
 msgid "Cheques Required"
 msgstr "Cheques requeridos"
 
@@ -13319,7 +13504,7 @@
 msgid "Child Task exists for this Task. You can not delete this Task."
 msgstr "Existe Tarea Hija para esta Tarea. No puedes eliminar esta Tarea."
 
-#: stock/doctype/warehouse/warehouse_tree.js:17
+#: stock/doctype/warehouse/warehouse_tree.js:21
 msgid "Child nodes can be only created under 'Group' type nodes"
 msgstr "Los nodos hijos sólo pueden ser creados bajo los nodos de tipo &quot;grupo&quot;"
 
@@ -13338,7 +13523,7 @@
 msgid "Circular Reference Error"
 msgstr "Error de referencia circular"
 
-#: public/js/utils/contact_address_quick_entry.js:76
+#: public/js/utils/contact_address_quick_entry.js:79
 msgid "City"
 msgstr "Ciudad"
 
@@ -13366,12 +13551,27 @@
 msgid "Class / Percentage"
 msgstr "Clase / Porcentaje"
 
+#. Description of a DocType
+#: setup/doctype/territory/territory.json
+msgid "Classification of Customers by region"
+msgstr ""
+
 #. Label of a Text Editor field in DocType 'Bank Guarantee'
 #: accounts/doctype/bank_guarantee/bank_guarantee.json
 msgctxt "Bank Guarantee"
 msgid "Clauses and Conditions"
 msgstr "Cláusulas y Condiciones"
 
+#: public/js/utils/demo.js:11
+msgid "Clear Demo Data"
+msgstr ""
+
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Clear Notifications"
+msgstr ""
+
 #. Label of a Button field in DocType 'Holiday List'
 #: setup/doctype/holiday_list/holiday_list.json
 msgctxt "Holiday List"
@@ -13379,7 +13579,9 @@
 msgstr "Borrar tabla"
 
 #: 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
+#: templates/form_grid/bank_reconciliation_grid.html:7
 msgid "Clearance Date"
 msgstr "Fecha de liquidación"
 
@@ -13419,11 +13621,11 @@
 msgid "Clearance Date"
 msgstr "Fecha de liquidación"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:115
+#: accounts/doctype/bank_clearance/bank_clearance.py:117
 msgid "Clearance Date not mentioned"
 msgstr "Fecha de liquidación no definida"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:113
+#: accounts/doctype/bank_clearance/bank_clearance.py:115
 msgid "Clearance Date updated"
 msgstr "Fecha de liquidación actualizada"
 
@@ -13431,7 +13633,7 @@
 msgid "Clearing Demo Data..."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:535
+#: manufacturing/doctype/production_plan/production_plan.js:577
 msgid "Click on 'Get Finished Goods for Manufacture' to fetch the items from the above Sales Orders. Items only for which a BOM is present will be fetched."
 msgstr ""
 
@@ -13439,7 +13641,7 @@
 msgid "Click on Add to Holidays. This will populate the holidays table with all the dates that fall on the selected weekly off. Repeat the process for populating the dates for all your weekly holidays"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:530
+#: manufacturing/doctype/production_plan/production_plan.js:572
 msgid "Click on Get Sales Orders to fetch sales orders based on the above filters."
 msgstr ""
 
@@ -13454,6 +13656,10 @@
 msgid "Click on the link below to verify your email and confirm the appointment"
 msgstr "Haga clic en el enlace a continuación para verificar su correo electrónico y confirmar la cita"
 
+#: selling/page/point_of_sale/pos_item_cart.js:468
+msgid "Click to add email / phone"
+msgstr ""
+
 #. Option for the 'Lead Type' (Select) field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -13472,19 +13678,19 @@
 msgid "Client Secret"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order_list.js:30
-#: crm/doctype/opportunity/opportunity.js:108
-#: manufacturing/doctype/production_plan/production_plan.js:101
-#: manufacturing/doctype/work_order/work_order.js:559
-#: quality_management/doctype/quality_meeting/quality_meeting_list.js:8
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/doctype/sales_order/sales_order_list.js:45
-#: stock/doctype/delivery_note/delivery_note.js:209
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/doctype/issue/issue.js:17
+#: buying/doctype/purchase_order/purchase_order.js:327
+#: buying/doctype/purchase_order/purchase_order_list.js:49
+#: crm/doctype/opportunity/opportunity.js:118
+#: manufacturing/doctype/production_plan/production_plan.js:111
+#: manufacturing/doctype/work_order/work_order.js:589
+#: quality_management/doctype/quality_meeting/quality_meeting_list.js:7
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:588
+#: selling/doctype/sales_order/sales_order_list.js:58
+#: stock/doctype/delivery_note/delivery_note.js:248
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:112
+#: support/doctype/issue/issue.js:21
 msgid "Close"
 msgstr "Cerrar"
 
@@ -13494,7 +13700,7 @@
 msgid "Close Issue After Days"
 msgstr "Cerrar Problema Después Días"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:67
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:69
 msgid "Close Loan"
 msgstr "Préstamo cerrado"
 
@@ -13504,17 +13710,18 @@
 msgid "Close Replied Opportunity After Days"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:178
+#: selling/page/point_of_sale/pos_controller.js:200
 msgid "Close the POS"
 msgstr "Cierre el POS"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:6
-#: selling/doctype/sales_order/sales_order_list.js:7
-#: stock/doctype/delivery_note/delivery_note_list.js:8
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:8
-#: support/report/issue_analytics/issue_analytics.js:59
-#: support/report/issue_summary/issue_summary.js:47
+#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: selling/doctype/sales_order/sales_order_list.js:18
+#: stock/doctype/delivery_note/delivery_note_list.js:18
+#: 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
+#: templates/pages/task_info.html:76
 msgid "Closed"
 msgstr "Cerrado"
 
@@ -13621,11 +13828,11 @@
 msgid "Closed Documents"
 msgstr "Documentos Cerrados"
 
-#: manufacturing/doctype/work_order/work_order.py:1395
+#: manufacturing/doctype/work_order/work_order.py:1409
 msgid "Closed Work Order can not be stopped or Re-opened"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:420
+#: selling/doctype/sales_order/sales_order.py:423
 msgid "Closed order cannot be cancelled. Unclose to cancel."
 msgstr "Orden cerrada no se puede cancelar. Abrir para cancelar."
 
@@ -13730,7 +13937,7 @@
 msgid "Code"
 msgstr "Código"
 
-#: public/js/setup_wizard.js:174
+#: public/js/setup_wizard.js:190
 msgid "Collapse All"
 msgstr "Desplegar todo"
 
@@ -13798,10 +14005,15 @@
 msgid "Column in Bank File"
 msgstr "Columna en archivo bancario"
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:389
+msgid "Column {0}"
+msgstr "Columna {0}"
+
 #: accounts/doctype/payment_terms_template/payment_terms_template.py:40
 msgid "Combined invoice portion must equal 100%"
 msgstr ""
 
+#: templates/pages/task_info.html:86
 #: utilities/report/youtube_interactions/youtube_interactions.py:28
 msgid "Comments"
 msgstr "Comentarios"
@@ -13953,7 +14165,7 @@
 msgid "Communication Medium Type"
 msgstr "Tipo de medio de comunicación"
 
-#: setup/install.py:111
+#: setup/install.py:92
 msgid "Compact Item Print"
 msgstr "Impresión Compacta de Artículo"
 
@@ -13966,10 +14178,10 @@
 #. Name of a DocType
 #: accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js:8
 #: accounts/doctype/account/account_tree.js:12
-#: accounts/doctype/account/account_tree.js:149
-#: accounts/doctype/cost_center/cost_center_tree.js:8
-#: accounts/doctype/journal_entry/journal_entry.js:72
-#: accounts/report/account_balance/account_balance.js:9
+#: accounts/doctype/account/account_tree.js:212
+#: accounts/doctype/cost_center/cost_center_tree.js:9
+#: accounts/doctype/journal_entry/journal_entry.js:128
+#: accounts/report/account_balance/account_balance.js:8
 #: accounts/report/accounts_payable/accounts_payable.js:8
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:8
 #: accounts/report/accounts_receivable/accounts_receivable.js:10
@@ -13977,13 +14189,13 @@
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:8
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:8
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:8
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:8
-#: accounts/report/budget_variance_report/budget_variance_report.js:74
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:9
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:9
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:9
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:7
+#: accounts/report/budget_variance_report/budget_variance_report.js:72
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:8
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:8
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:8
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:80
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:9
+#: 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
@@ -13994,9 +14206,9 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:227
 #: 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/payment_ledger/payment_ledger.js:9
+#: 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:9
+#: accounts/report/pos_register/pos_register.js:8
 #: accounts/report/pos_register/pos_register.py:110
 #: accounts/report/profitability_analysis/profitability_analysis.js:8
 #: accounts/report/purchase_register/purchase_register.js:33
@@ -14004,78 +14216,79 @@
 #: accounts/report/sales_payment_summary/sales_payment_summary.js:22
 #: accounts/report/sales_register/sales_register.js:33
 #: accounts/report/share_ledger/share_ledger.py:58
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:9
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:9
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:9
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:8
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:8
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:8
 #: accounts/report/trial_balance/trial_balance.js:8
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:8
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:9
-#: assets/report/fixed_asset_register/fixed_asset_register.js:9
-#: buying/report/procurement_tracker/procurement_tracker.js:9
-#: buying/report/purchase_analytics/purchase_analytics.js:50
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:9
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:8
+#: assets/report/fixed_asset_register/fixed_asset_register.js:8
+#: 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/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:9
+#: 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/subcontract_order_summary/subcontract_order_summary.js:8
+#: 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:9
+#: crm/report/lead_details/lead_details.js:8
 #: crm/report/lead_details/lead_details.py:52
-#: crm/report/lost_opportunity/lost_opportunity.js:9
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:59
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:52
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:119
-#: manufacturing/doctype/bom_creator/bom_creator.js:52
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:9
-#: manufacturing/report/job_card_summary/job_card_summary.js:8
-#: manufacturing/report/process_loss_report/process_loss_report.js:8
-#: manufacturing/report/production_analytics/production_analytics.js:9
-#: manufacturing/report/production_planning_report/production_planning_report.js:9
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:8
-#: manufacturing/report/work_order_summary/work_order_summary.js:8
-#: projects/report/project_summary/project_summary.js:9
+#: crm/report/lost_opportunity/lost_opportunity.js:8
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:51
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:128
+#: manufacturing/doctype/bom_creator/bom_creator.js:51
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:2
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:8
+#: manufacturing/report/job_card_summary/job_card_summary.js:7
+#: manufacturing/report/process_loss_report/process_loss_report.js:7
+#: manufacturing/report/production_analytics/production_analytics.js:8
+#: manufacturing/report/production_planning_report/production_planning_report.js:8
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:7
+#: manufacturing/report/work_order_summary/work_order_summary.js:7
+#: projects/report/project_summary/project_summary.js:8
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:44
 #: public/js/financial_statements.js:153 public/js/purchase_trends_filters.js:8
-#: public/js/sales_trends_filters.js:55
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:28
+#: public/js/sales_trends_filters.js:51
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:27
 #: regional/report/irs_1099/irs_1099.js:8
-#: regional/report/uae_vat_201/uae_vat_201.js:9
-#: regional/report/vat_audit_report/vat_audit_report.js:9
-#: selling/page/point_of_sale/pos_controller.js:64
-#: selling/page/sales_funnel/sales_funnel.js:30
+#: regional/report/uae_vat_201/uae_vat_201.js:8
+#: regional/report/vat_audit_report/vat_audit_report.js:8
+#: selling/page/point_of_sale/pos_controller.js:72
+#: selling/page/sales_funnel/sales_funnel.js:33
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:16
 #: selling/report/customer_credit_balance/customer_credit_balance.js:8
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:9
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:8
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:114
 #: selling/report/lost_quotations/lost_quotations.js:8
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:9
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:8
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:46
-#: selling/report/sales_analytics/sales_analytics.js:50
-#: selling/report/sales_order_analysis/sales_order_analysis.js:9
+#: selling/report/sales_analytics/sales_analytics.js:57
+#: selling/report/sales_order_analysis/sales_order_analysis.js:8
 #: selling/report/sales_order_analysis/sales_order_analysis.py:343
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:35
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:9
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:34
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:9
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:33
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:8
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:33
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:8
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:9
-#: selling/report/territory_wise_sales/territory_wise_sales.js:17
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:8
+#: selling/report/territory_wise_sales/territory_wise_sales.js:18
 #: setup/doctype/company/company.json setup/doctype/company/company_tree.js:10
 #: setup/doctype/department/department_tree.js:10
 #: setup/doctype/employee/employee_tree.js:8
 #: stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.js:8
-#: stock/doctype/warehouse/warehouse_tree.js:10
+#: stock/doctype/warehouse/warehouse_tree.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:12
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:8
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:9
-#: stock/report/delayed_item_report/delayed_item_report.js:9
-#: stock/report/delayed_order_report/delayed_order_report.js:9
-#: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:8
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js: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_stock_value_report/incorrect_stock_value_report.js:8
-#: stock/report/item_shortage_report/item_shortage_report.js:9
+#: 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
 #: stock/report/product_bundle_balance/product_bundle_balance.py:115
 #: stock/report/reserved_stock/reserved_stock.js:8
@@ -14084,20 +14297,20 @@
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:73
 #: stock/report/serial_no_ledger/serial_no_ledger.py:37
 #: stock/report/stock_ageing/stock_ageing.js:8
-#: stock/report/stock_analytics/stock_analytics.js:42
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:8
+#: 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:466
+#: stock/report/stock_balance/stock_balance.py:474
 #: stock/report/stock_ledger/stock_ledger.js:8
-#: stock/report/stock_ledger/stock_ledger.py:268
+#: 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:9
-#: stock/report/total_stock_summary/total_stock_summary.js:18
+#: 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/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:9
-#: support/report/issue_analytics/issue_analytics.js:9
-#: support/report/issue_summary/issue_summary.js:9
+#: 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
 msgid "Company"
 msgstr "Compañía"
 
@@ -14555,6 +14768,12 @@
 msgid "Company"
 msgstr "Compañía"
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Company"
+msgstr "Compañía"
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -14849,7 +15068,7 @@
 msgid "Company Abbreviation"
 msgstr "Abreviatura de la compañia"
 
-#: public/js/setup_wizard.js:155
+#: public/js/setup_wizard.js:164
 msgid "Company Abbreviation cannot have more than 5 characters"
 msgstr "La abreviatura de la Empresa no puede tener más de 5 caracteres"
 
@@ -15033,7 +15252,7 @@
 msgid "Company Name as per Imported Tally Data"
 msgstr "Nombre de la empresa según los datos de conteo importados"
 
-#: public/js/setup_wizard.js:63
+#: public/js/setup_wizard.js:67
 msgid "Company Name cannot be Company"
 msgstr "Nombre de la empresa no puede ser Company"
 
@@ -15075,28 +15294,28 @@
 msgid "Company and Posting Date is mandatory"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2203
+#: accounts/doctype/sales_invoice/sales_invoice.py:2172
 msgid "Company currencies of both the companies should match for Inter Company Transactions."
 msgstr "Las monedas de la empresa de ambas compañías deben coincidir para las Transacciones entre empresas."
 
-#: stock/doctype/material_request/material_request.js:258
-#: stock/doctype/stock_entry/stock_entry.js:575
+#: stock/doctype/material_request/material_request.js:326
+#: stock/doctype/stock_entry/stock_entry.js:663
 msgid "Company field is required"
 msgstr "Campo de la empresa es obligatorio"
 
-#: accounts/doctype/bank_account/bank_account.py:58
+#: accounts/doctype/bank_account/bank_account.py:72
 msgid "Company is mandatory for company account"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:413
-msgid "Company is mandatory was generating invoice. Please set default company in Global Defaults."
+#: accounts/doctype/subscription/subscription.py:412
+msgid "Company is mandatory for generating an invoice. Please set a default company in Global Defaults."
 msgstr ""
 
-#: setup/doctype/company/company.js:161
+#: setup/doctype/company/company.js:191
 msgid "Company name not same"
 msgstr "El nombre de la empresa no es el mismo"
 
-#: assets/doctype/asset/asset.py:206
+#: assets/doctype/asset/asset.py:208
 msgid "Company of asset {0} and purchase document {1} doesn't matches."
 msgstr "La empresa del activo {0} y el documento de compra {1} no coinciden."
 
@@ -15127,15 +15346,15 @@
 msgid "Company which internal supplier represents"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:80
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:85
 msgid "Company {0} already exists. Continuing will overwrite the Company and Chart of Accounts"
 msgstr "La empresa {0} ya existe. Continuar sobrescribirá la empresa y el plan de cuentas."
 
-#: accounts/doctype/account/account.py:443
+#: accounts/doctype/account/account.py:462
 msgid "Company {0} does not exist"
 msgstr "Compañía {0} no existe"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:76
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:80
 msgid "Company {0} is added more than once"
 msgstr ""
 
@@ -15176,7 +15395,7 @@
 msgid "Competitor Name"
 msgstr "Nombre del Competidor"
 
-#: public/js/utils/sales_common.js:417
+#: public/js/utils/sales_common.js:476
 msgid "Competitors"
 msgstr "Competidores"
 
@@ -15192,7 +15411,9 @@
 msgid "Competitors"
 msgstr "Competidores"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:61
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:67
+#: manufacturing/doctype/workstation/workstation_job_card.html:68
+#: public/js/projects/timer.js:32
 msgid "Complete"
 msgstr "Completar"
 
@@ -15208,23 +15429,26 @@
 msgid "Complete"
 msgstr "Completar"
 
-#: manufacturing/doctype/job_card/job_card.js:263
+#: manufacturing/doctype/job_card/job_card.js:296
 msgid "Complete Job"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Complete Order"
+msgstr ""
+
 #: accounts/doctype/subscription/subscription_list.js:8
 #: assets/doctype/asset_repair/asset_repair_list.js:7
-#: buying/doctype/purchase_order/purchase_order_list.js:24
+#: buying/doctype/purchase_order/purchase_order_list.js:43
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:9
 #: manufacturing/report/job_card_summary/job_card_summary.py:93
 #: manufacturing/report/work_order_summary/work_order_summary.py:151
 #: projects/doctype/timesheet/timesheet_list.js:13
 #: projects/report/project_summary/project_summary.py:95
-#: selling/doctype/sales_order/sales_order_list.js:12
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:9
-#: stock/doctype/delivery_note/delivery_note_list.js:14
+#: selling/doctype/sales_order/sales_order_list.js:23
+#: stock/doctype/delivery_note/delivery_note_list.js:24
 #: stock/doctype/material_request/material_request_list.js:13
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:25
 msgid "Completed"
 msgstr "Completado"
 
@@ -15463,31 +15687,32 @@
 #: manufacturing/doctype/job_card_operation/job_card_operation.json
 msgctxt "Job Card Operation"
 msgid "Completed Qty"
-msgstr "Cantidad completada"
+msgstr "Cant. completada"
 
 #. Label of a Float field in DocType 'Job Card Time Log'
 #: manufacturing/doctype/job_card_time_log/job_card_time_log.json
 msgctxt "Job Card Time Log"
 msgid "Completed Qty"
-msgstr "Cantidad completada"
+msgstr "Cant. completada"
 
 #. Label of a Float field in DocType 'Material Request Item'
 #: stock/doctype/material_request_item/material_request_item.json
 msgctxt "Material Request Item"
 msgid "Completed Qty"
-msgstr "Cantidad completada"
+msgstr "Cant. completada"
 
 #. Label of a Float field in DocType 'Work Order Operation'
 #: manufacturing/doctype/work_order_operation/work_order_operation.json
 msgctxt "Work Order Operation"
 msgid "Completed Qty"
-msgstr "Cantidad completada"
+msgstr "Cant. completada"
 
-#: manufacturing/doctype/work_order/work_order.py:885
+#: manufacturing/doctype/work_order/work_order.py:899
 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
 msgstr "La cantidad completa no puede ser mayor que la &#39;Cantidad para fabricar&#39;"
 
-#: manufacturing/doctype/job_card/job_card.js:277
+#: manufacturing/doctype/job_card/job_card.js:313
+#: manufacturing/doctype/workstation/workstation.js:199
 msgid "Completed Quantity"
 msgstr "Cantidad completada"
 
@@ -15622,7 +15847,7 @@
 msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained."
 msgstr ""
 
-#: buying/doctype/buying_settings/buying_settings.js:19
+#: buying/doctype/buying_settings/buying_settings.js:20
 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List."
 msgstr "Configure la lista de precios predeterminada al crear una nueva transacción de compra. Los precios de los artículos se obtendrán de esta lista de precios."
 
@@ -15632,12 +15857,12 @@
 msgid "Confirmation Date"
 msgstr "Fecha de confirmación"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:37
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:45
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:43
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:51
 msgid "Connect to Quickbooks"
 msgstr "Conectarse a Quickbooks"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:59
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:65
 msgid "Connected to QuickBooks"
 msgstr "Conectado a QuickBooks"
 
@@ -15647,7 +15872,7 @@
 msgid "Connected to QuickBooks"
 msgstr "Conectado a QuickBooks"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:58
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:64
 msgid "Connecting to QuickBooks"
 msgstr "Conectando a QuickBooks"
 
@@ -15661,97 +15886,103 @@
 #: manufacturing/doctype/bom/bom.json
 msgctxt "BOM"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'BOM Creator'
 #: manufacturing/doctype/bom_creator/bom_creator.json
 msgctxt "BOM Creator"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Delivery Note'
 #: stock/doctype/delivery_note/delivery_note.json
 msgctxt "Delivery Note"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Job Card'
 #: manufacturing/doctype/job_card/job_card.json
 msgctxt "Job Card"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Material Request'
 #: stock/doctype/material_request/material_request.json
 msgctxt "Material Request"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Opportunity'
 #: crm/doctype/opportunity/opportunity.json
 msgctxt "Opportunity"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Purchase Order'
 #: buying/doctype/purchase_order/purchase_order.json
 msgctxt "Purchase Order"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Purchase Receipt'
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 msgctxt "Purchase Receipt"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
 
 #. Label of a Tab Break field in DocType 'Work Order'
 #: manufacturing/doctype/work_order/work_order.json
 msgctxt "Work Order"
 msgid "Connections"
-msgstr ""
+msgstr "Conexiones"
+
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Connections"
+msgstr "Conexiones"
 
 #: accounts/report/general_ledger/general_ledger.js:172
 msgid "Consider Accounting Dimensions"
@@ -15769,6 +16000,12 @@
 msgid "Consider Minimum Order Qty"
 msgstr ""
 
+#. Label of a Check field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Consider Rejected Warehouses"
+msgstr ""
+
 #. Label of a Select field in DocType 'Purchase Taxes and Charges'
 #: accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
 msgctxt "Purchase Taxes and Charges"
@@ -15866,7 +16103,7 @@
 msgid "Consumed Amount"
 msgstr "Monto consumido"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:318
+#: assets/doctype/asset_capitalization/asset_capitalization.py:324
 msgid "Consumed Asset Items is mandatory for Decapitalization"
 msgstr ""
 
@@ -15937,7 +16174,7 @@
 msgid "Consumed Stock Items"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:321
+#: assets/doctype/asset_capitalization/asset_capitalization.py:327
 msgid "Consumed Stock Items or Consumed Asset Items is mandatory for Capitalization"
 msgstr ""
 
@@ -16472,9 +16709,9 @@
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
-#: public/js/controllers/transaction.js:2074
-#: selling/doctype/quotation/quotation.js:344
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:157
+#: public/js/controllers/transaction.js:2117
+#: selling/doctype/quotation/quotation.js:356
 msgid "Continue"
 msgstr "Continuar"
 
@@ -16560,7 +16797,7 @@
 msgstr "Términos y Condiciones del Contrato"
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:76
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:121
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:122
 msgid "Contribution %"
 msgstr "Contribución %"
 
@@ -16571,10 +16808,14 @@
 msgstr "Contribución (%)"
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:88
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:123
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
 msgid "Contribution Amount"
 msgstr "Importe de contribución"
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:124
+msgid "Contribution Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Team'
 #: selling/doctype/sales_team/sales_team.json
 msgctxt "Sales Team"
@@ -16593,7 +16834,7 @@
 msgid "Control Historical Stock Transactions"
 msgstr ""
 
-#: public/js/utils.js:684
+#: public/js/utils.js:749
 msgid "Conversion Factor"
 msgstr "Factor de conversión"
 
@@ -16693,7 +16934,7 @@
 msgid "Conversion Factor"
 msgstr "Factor de conversión"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:86
+#: manufacturing/doctype/bom_creator/bom_creator.js:85
 msgid "Conversion Rate"
 msgstr "Tasa de conversión"
 
@@ -16719,7 +16960,7 @@
 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}"
 msgstr "El factor de conversión de la unidad de medida (UdM) en la línea {0} debe ser 1"
 
-#: controllers/accounts_controller.py:2384
+#: controllers/accounts_controller.py:2476
 msgid "Conversion rate cannot be 0 or 1"
 msgstr "La tasa de conversión no puede ser 0 o 1"
 
@@ -16729,12 +16970,12 @@
 msgid "Convert Item Description to Clean HTML in Transactions"
 msgstr ""
 
-#: accounts/doctype/account/account.js:106
-#: accounts/doctype/cost_center/cost_center.js:119
+#: accounts/doctype/account/account.js:107
+#: accounts/doctype/cost_center/cost_center.js:123
 msgid "Convert to Group"
 msgstr "Convertir a grupo"
 
-#: stock/doctype/warehouse/warehouse.js:61
+#: stock/doctype/warehouse/warehouse.js:58
 msgctxt "Warehouse"
 msgid "Convert to Group"
 msgstr "Convertir a grupo"
@@ -16743,17 +16984,17 @@
 msgid "Convert to Item Based Reposting"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.js:60
+#: stock/doctype/warehouse/warehouse.js:57
 msgctxt "Warehouse"
 msgid "Convert to Ledger"
 msgstr ""
 
-#: accounts/doctype/account/account.js:83
-#: accounts/doctype/cost_center/cost_center.js:116
+#: accounts/doctype/account/account.js:79
+#: accounts/doctype/cost_center/cost_center.js:121
 msgid "Convert to Non-Group"
 msgstr "Convertir a 'Sin-Grupo'"
 
-#: crm/report/lead_details/lead_details.js:41
+#: crm/report/lead_details/lead_details.js:40
 #: selling/page/sales_funnel/sales_funnel.py:58
 msgid "Converted"
 msgstr "Convertido"
@@ -16800,11 +17041,11 @@
 msgid "Corrective Action"
 msgstr "Acción correctiva"
 
-#: manufacturing/doctype/job_card/job_card.js:146
+#: manufacturing/doctype/job_card/job_card.js:155
 msgid "Corrective Job Card"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:151
+#: manufacturing/doctype/job_card/job_card.js:162
 msgid "Corrective Operation"
 msgstr ""
 
@@ -16837,23 +17078,23 @@
 #: 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:1047
+#: accounts/report/accounts_receivable/accounts_receivable.py:1055
 #: 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:643
+#: accounts/report/general_ledger/general_ledger.py:656
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:300
 #: 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/trial_balance/trial_balance.js:49
-#: assets/report/fixed_asset_register/fixed_asset_register.js:30
+#: assets/report/fixed_asset_register/fixed_asset_register.js:29
 #: assets/report/fixed_asset_register/fixed_asset_register.py:461
-#: buying/report/procurement_tracker/procurement_tracker.js:16
+#: buying/report/procurement_tracker/procurement_tracker.js:15
 #: buying/report/procurement_tracker/procurement_tracker.py:32
-#: public/js/financial_statements.js:237
+#: public/js/financial_statements.js:246
 msgid "Cost Center"
 msgstr "Centro de costos"
 
@@ -17229,7 +17470,7 @@
 msgid "Cost Center Allocation Percentages"
 msgstr ""
 
-#: public/js/utils/sales_common.js:383
+#: public/js/utils/sales_common.js:435
 msgid "Cost Center For Item with Item Code {0} has been Changed to {1}"
 msgstr ""
 
@@ -17239,7 +17480,7 @@
 msgid "Cost Center Name"
 msgstr "Nombre del centro de costos"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:25
+#: accounts/doctype/cost_center/cost_center_tree.js:38
 msgid "Cost Center Number"
 msgstr "Número de centro de costo"
 
@@ -17258,8 +17499,8 @@
 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:1235
-#: stock/doctype/purchase_receipt/purchase_receipt.py:788
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1287
+#: stock/doctype/purchase_receipt/purchase_receipt.py:790
 msgid "Cost Center is required in row {0} in Taxes table for type {1}"
 msgstr "Centro de costos requerido para la línea {0} en la tabla Impuestos para el tipo {1}"
 
@@ -17279,11 +17520,11 @@
 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:246
+#: assets/doctype/asset/asset.py:248
 msgid "Cost Center {} doesn't belong to Company {}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:253
+#: assets/doctype/asset/asset.py:255
 msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
 msgstr ""
 
@@ -17323,7 +17564,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:45
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:64
-#: accounts/report/account_balance/account_balance.js:44
+#: accounts/report/account_balance/account_balance.js:43
 msgid "Cost of Goods Sold"
 msgstr "Costo sobre ventas"
 
@@ -17435,11 +17676,11 @@
 msgid "Could not auto update shifts. Shift with shift factor {0} needed."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:737
+#: stock/doctype/delivery_note/delivery_note.py:798
 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
 msgstr "No se pudo crear una Nota de Crédito automáticamente, desmarque 'Emitir Nota de Crédito' y vuelva a enviarla"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:339
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:355
 msgid "Could not detect the Company for updating Bank Accounts"
 msgstr ""
 
@@ -17461,10 +17702,6 @@
 msgid "Could not solve weighted score function. Make sure the formula is valid."
 msgstr "No se pudo resolver la función de puntuación ponderada. Asegúrese de que la fórmula es válida."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1030
-msgid "Could not update stock, invoice contains drop shipping item."
-msgstr "No se pudo actualizar valores, factura contiene los artículos con envío triangulado."
-
 #. Label of a Int field in DocType 'Shipment Parcel'
 #: stock/doctype/shipment_parcel/shipment_parcel.json
 msgctxt "Shipment Parcel"
@@ -17472,7 +17709,7 @@
 msgstr "Contar"
 
 #: crm/report/lead_details/lead_details.py:63
-#: public/js/utils/contact_address_quick_entry.js:86
+#: public/js/utils/contact_address_quick_entry.js:89
 msgid "Country"
 msgstr "País"
 
@@ -17571,6 +17808,12 @@
 msgid "Coupon Code"
 msgstr "Código promocional"
 
+#. Label of a Link field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Coupon Code"
+msgstr "Código promocional"
+
 #. Label of a Link field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
@@ -17601,147 +17844,149 @@
 msgid "Coupon Type"
 msgstr "Tipo de cupón"
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Cr"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:148
-#: accounts/doctype/account/account_tree.js:151
-#: accounts/doctype/dunning/dunning.js:54
-#: accounts/doctype/dunning/dunning.js:56
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:31
-#: accounts/doctype/journal_entry/journal_entry.js:85
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/pos_invoice/pos_invoice.js:51
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:97
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:103
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:114
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: accounts/doctype/account/account_tree.js:209
+#: accounts/doctype/account/account_tree.js:216
+#: accounts/doctype/dunning/dunning.js:55
+#: accounts/doctype/dunning/dunning.js:57
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:34
+#: accounts/doctype/journal_entry/journal_entry.js:139
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/pos_invoice/pos_invoice.js:55
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:127
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:189
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:609
-#: accounts/doctype/sales_invoice/sales_invoice.js:106
-#: accounts/doctype/sales_invoice/sales_invoice.js:108
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:134
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:225
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:654
+#: accounts/doctype/sales_invoice/sales_invoice.js:109
+#: accounts/doctype/sales_invoice/sales_invoice.js:110
 #: accounts/doctype/sales_invoice/sales_invoice.js:121
 #: accounts/doctype/sales_invoice/sales_invoice.js:122
-#: accounts/doctype/sales_invoice/sales_invoice.js:135
-#: accounts/doctype/sales_invoice/sales_invoice.js:142
-#: accounts/doctype/sales_invoice/sales_invoice.js:146
-#: accounts/doctype/sales_invoice/sales_invoice.js:157
-#: accounts/doctype/sales_invoice/sales_invoice.js:164
-#: accounts/doctype/sales_invoice/sales_invoice.js:184
-#: buying/doctype/purchase_order/purchase_order.js:94
-#: buying/doctype/purchase_order/purchase_order.js:310
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: buying/doctype/purchase_order/purchase_order.js:324
-#: buying/doctype/purchase_order/purchase_order.js:330
-#: buying/doctype/purchase_order/purchase_order.js:336
-#: buying/doctype/purchase_order/purchase_order.js:348
+#: accounts/doctype/sales_invoice/sales_invoice.js:136
+#: accounts/doctype/sales_invoice/sales_invoice.js:147
+#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:168
+#: 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/request_for_quotation/request_for_quotation.js:43
-#: buying/doctype/request_for_quotation/request_for_quotation.js:146
-#: buying/doctype/request_for_quotation/request_for_quotation.js:169
-#: buying/doctype/supplier/supplier.js:96
-#: buying/doctype/supplier/supplier.js:100
-#: buying/doctype/supplier_quotation/supplier_quotation.js:24
+#: 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:421
+#: 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
+#: buying/doctype/supplier/supplier.js:112
+#: buying/doctype/supplier/supplier.js:120
 #: buying/doctype/supplier_quotation/supplier_quotation.js:25
+#: buying/doctype/supplier_quotation/supplier_quotation.js:26
 #: buying/doctype/supplier_quotation/supplier_quotation.js:27
-#: crm/doctype/lead/lead.js:35 crm/doctype/lead/lead.js:38
+#: crm/doctype/lead/lead.js:31 crm/doctype/lead/lead.js:37
 #: crm/doctype/lead/lead.js:39 crm/doctype/lead/lead.js:41
-#: crm/doctype/lead/lead.js:220 crm/doctype/opportunity/opportunity.js:85
-#: crm/doctype/opportunity/opportunity.js:90
-#: crm/doctype/opportunity/opportunity.js:97
+#: crm/doctype/lead/lead.js:230 crm/doctype/opportunity/opportunity.js:85
+#: crm/doctype/opportunity/opportunity.js:93
 #: crm/doctype/opportunity/opportunity.js:103
-#: crm/doctype/prospect/prospect.js:12 crm/doctype/prospect/prospect.js:20
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:151
-#: manufacturing/doctype/blanket_order/blanket_order.js:31
-#: manufacturing/doctype/blanket_order/blanket_order.js:41
-#: manufacturing/doctype/blanket_order/blanket_order.js:53
-#: manufacturing/doctype/bom/bom.js:121 manufacturing/doctype/bom/bom.js:126
-#: manufacturing/doctype/bom/bom.js:132 manufacturing/doctype/bom/bom.js:135
-#: manufacturing/doctype/bom/bom.js:344
-#: manufacturing/doctype/bom_creator/bom_creator.js:93
-#: manufacturing/doctype/production_plan/production_plan.js:109
-#: manufacturing/doctype/production_plan/production_plan.js:115
-#: manufacturing/doctype/production_plan/production_plan.js:121
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/doctype/work_order/work_order.js:726
-#: projects/doctype/task/task_tree.js:77 public/js/communication.js:16
-#: public/js/communication.js:24 public/js/communication.js:30
-#: public/js/controllers/transaction.js:300
-#: public/js/controllers/transaction.js:301
-#: public/js/controllers/transaction.js:2188
-#: selling/doctype/customer/customer.js:165
-#: selling/doctype/quotation/quotation.js:119
-#: selling/doctype/quotation/quotation.js:129
-#: selling/doctype/sales_order/sales_order.js:548
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order.js:560
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order.js:570
-#: selling/doctype/sales_order/sales_order.js:571
-#: selling/doctype/sales_order/sales_order.js:576
-#: selling/doctype/sales_order/sales_order.js:581
-#: selling/doctype/sales_order/sales_order.js:582
-#: selling/doctype/sales_order/sales_order.js:587
-#: selling/doctype/sales_order/sales_order.js:599
-#: selling/doctype/sales_order/sales_order.js:605
-#: selling/doctype/sales_order/sales_order.js:606
-#: selling/doctype/sales_order/sales_order.js:608
-#: selling/doctype/sales_order/sales_order.js:739
-#: selling/doctype/sales_order/sales_order.js:847
-#: stock/doctype/delivery_note/delivery_note.js:89
-#: stock/doctype/delivery_note/delivery_note.js:90
-#: stock/doctype/delivery_note/delivery_note.js:104
-#: stock/doctype/delivery_note/delivery_note.js:167
-#: stock/doctype/delivery_note/delivery_note.js:172
-#: stock/doctype/delivery_note/delivery_note.js:176
-#: stock/doctype/delivery_note/delivery_note.js:181
-#: stock/doctype/delivery_note/delivery_note.js:190
-#: stock/doctype/delivery_note/delivery_note.js:196
-#: stock/doctype/delivery_note/delivery_note.js:223
-#: stock/doctype/item/item.js:105 stock/doctype/item/item.js:108
-#: stock/doctype/item/item.js:112 stock/doctype/item/item.js:449
-#: stock/doctype/item/item.js:651
-#: stock/doctype/material_request/material_request.js:114
-#: stock/doctype/material_request/material_request.js:120
-#: stock/doctype/material_request/material_request.js:123
-#: stock/doctype/material_request/material_request.js:128
-#: stock/doctype/material_request/material_request.js:133
-#: stock/doctype/material_request/material_request.js:138
-#: stock/doctype/material_request/material_request.js:143
+#: crm/doctype/opportunity/opportunity.js:112
+#: crm/doctype/prospect/prospect.js:15 crm/doctype/prospect/prospect.js:27
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:159
+#: manufacturing/doctype/blanket_order/blanket_order.js:34
+#: manufacturing/doctype/blanket_order/blanket_order.js:48
+#: manufacturing/doctype/blanket_order/blanket_order.js:64
+#: manufacturing/doctype/bom/bom.js:123 manufacturing/doctype/bom/bom.js:132
+#: manufacturing/doctype/bom/bom.js:142 manufacturing/doctype/bom/bom.js:146
+#: manufacturing/doctype/bom/bom.js:360
+#: manufacturing/doctype/bom_creator/bom_creator.js:92
+#: manufacturing/doctype/plant_floor/plant_floor.js:240
+#: manufacturing/doctype/production_plan/production_plan.js:125
+#: manufacturing/doctype/production_plan/production_plan.js:139
+#: manufacturing/doctype/production_plan/production_plan.js:146
+#: manufacturing/doctype/work_order/work_order.js:301
+#: manufacturing/doctype/work_order/work_order.js:782
+#: projects/doctype/task/task_tree.js:81 public/js/communication.js:19
+#: 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
+#: selling/doctype/customer/customer.js:176
+#: selling/doctype/quotation/quotation.js:125
+#: selling/doctype/quotation/quotation.js:134
+#: selling/doctype/sales_order/sales_order.js:601
+#: selling/doctype/sales_order/sales_order.js:621
+#: selling/doctype/sales_order/sales_order.js:626
+#: selling/doctype/sales_order/sales_order.js:635
+#: selling/doctype/sales_order/sales_order.js:647
+#: selling/doctype/sales_order/sales_order.js:652
+#: selling/doctype/sales_order/sales_order.js:661
+#: selling/doctype/sales_order/sales_order.js:670
+#: selling/doctype/sales_order/sales_order.js:675
+#: selling/doctype/sales_order/sales_order.js:681
+#: selling/doctype/sales_order/sales_order.js:698
+#: selling/doctype/sales_order/sales_order.js:711
+#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:715
+#: selling/doctype/sales_order/sales_order.js:853
+#: selling/doctype/sales_order/sales_order.js:992
+#: stock/doctype/delivery_note/delivery_note.js:91
+#: stock/doctype/delivery_note/delivery_note.js:93
+#: stock/doctype/delivery_note/delivery_note.js:112
+#: stock/doctype/delivery_note/delivery_note.js:185
+#: stock/doctype/delivery_note/delivery_note.js:195
+#: stock/doctype/delivery_note/delivery_note.js:204
+#: stock/doctype/delivery_note/delivery_note.js:214
+#: stock/doctype/delivery_note/delivery_note.js:228
+#: stock/doctype/delivery_note/delivery_note.js:234
+#: stock/doctype/delivery_note/delivery_note.js:270
+#: stock/doctype/item/item.js:135 stock/doctype/item/item.js:142
+#: stock/doctype/item/item.js:150 stock/doctype/item/item.js:517
+#: stock/doctype/item/item.js:725
+#: stock/doctype/material_request/material_request.js:117
+#: stock/doctype/material_request/material_request.js:126
+#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:140
 #: stock/doctype/material_request/material_request.js:148
-#: stock/doctype/material_request/material_request.js:153
 #: stock/doctype/material_request/material_request.js:156
-#: stock/doctype/material_request/material_request.js:314
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/pick_list/pick_list.js:104
-#: stock/doctype/purchase_receipt/purchase_receipt.js:78
-#: stock/doctype/purchase_receipt/purchase_receipt.js:79
-#: stock/doctype/purchase_receipt/purchase_receipt.js:88
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
-#: stock/doctype/purchase_receipt/purchase_receipt.js:234
-#: stock/doctype/stock_entry/stock_entry.js:146
-#: stock/doctype/stock_entry/stock_entry.js:147
-#: stock/doctype/stock_entry/stock_entry.js:217
-#: stock/doctype/stock_entry/stock_entry.js:1065
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:159
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:193
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:63
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
+#: stock/doctype/material_request/material_request.js:164
+#: stock/doctype/material_request/material_request.js:172
+#: stock/doctype/material_request/material_request.js:180
+#: stock/doctype/material_request/material_request.js:184
+#: stock/doctype/material_request/material_request.js:384
+#: stock/doctype/pick_list/pick_list.js:112
+#: stock/doctype/pick_list/pick_list.js:118
+#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/purchase_receipt/purchase_receipt.js:85
+#: stock/doctype/purchase_receipt/purchase_receipt.js:97
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
+#: stock/doctype/purchase_receipt/purchase_receipt.js:263
+#: stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: 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
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:169
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:202
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:212
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:74
-#: support/doctype/issue/issue.js:27
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:88
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:90
+#: support/doctype/issue/issue.js:34
 msgid "Create"
 msgstr "Crear"
 
-#: manufacturing/doctype/work_order/work_order.js:179
+#: manufacturing/doctype/work_order/work_order.js:190
 msgid "Create BOM"
 msgstr "Crear lista de materiales"
 
@@ -17751,14 +17996,18 @@
 msgid "Create Chart Of Accounts Based On"
 msgstr "Crear plan de cuentas basado en"
 
-#: stock/doctype/delivery_note/delivery_note_list.js:59
+#: stock/doctype/delivery_note/delivery_note_list.js:68
 msgid "Create Delivery Trip"
 msgstr "Crear Ruta de entrega"
 
-#: assets/doctype/asset/asset.js:122
+#: assets/doctype/asset/asset.js:154
 msgid "Create Depreciation Entry"
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:316
+msgid "Create Document"
+msgstr ""
+
 #: utilities/activation.py:138
 msgid "Create Employee"
 msgstr "Crear empleado"
@@ -17777,15 +18026,15 @@
 msgid "Create Grouped Asset"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:48
+#: accounts/doctype/journal_entry/journal_entry.js:96
 msgid "Create Inter Company Journal Entry"
 msgstr "Crear entrada de diario entre empresas"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:45
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:49
 msgid "Create Invoices"
 msgstr "Crear facturas"
 
-#: manufacturing/doctype/work_order/work_order.js:152
+#: manufacturing/doctype/work_order/work_order.js:159
 msgid "Create Job Card"
 msgstr "Crear tarjeta de trabajo"
 
@@ -17795,7 +18044,7 @@
 msgid "Create Job Card based on Batch Size"
 msgstr ""
 
-#: accounts/doctype/share_transfer/share_transfer.js:20
+#: accounts/doctype/share_transfer/share_transfer.js:18
 msgid "Create Journal Entry"
 msgstr "Crear entrada de diario"
 
@@ -17814,8 +18063,8 @@
 msgid "Create Ledger Entries for Change Amount"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:191
-#: selling/doctype/customer/customer.js:236
+#: buying/doctype/supplier/supplier.js:224
+#: selling/doctype/customer/customer.js:257
 msgid "Create Link"
 msgstr ""
 
@@ -17825,45 +18074,45 @@
 msgid "Create Missing Party"
 msgstr "Crear una Parte Perdida"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:150
+#: manufacturing/doctype/bom_creator/bom_creator.js:146
 msgid "Create Multi-level BOM"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:119
+#: public/js/call_popup/call_popup.js:122
 msgid "Create New Contact"
 msgstr "Crear nuevo contacto"
 
-#: public/js/call_popup/call_popup.js:124
+#: public/js/call_popup/call_popup.js:128
 msgid "Create New Customer"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:129
+#: public/js/call_popup/call_popup.js:134
 msgid "Create New Lead"
 msgstr "Crear nuevo cliente potencial"
 
 #. Title of an Onboarding Step
-#: crm/doctype/lead/lead.js:198
+#: crm/doctype/lead/lead.js:208
 #: crm/onboarding_step/create_opportunity/create_opportunity.json
 msgid "Create Opportunity"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:60
+#: selling/page/point_of_sale/pos_controller.js:67
 msgid "Create POS Opening Entry"
 msgstr "Crear entrada de apertura de punto de venta"
 
-#: accounts/doctype/payment_order/payment_order.js:31
+#: accounts/doctype/payment_order/payment_order.js:39
 msgid "Create Payment Entries"
 msgstr "Crear entradas de pago"
 
-#: accounts/doctype/payment_request/payment_request.js:46
+#: accounts/doctype/payment_request/payment_request.js:58
 msgid "Create Payment Entry"
 msgstr "Crear entrada de pago"
 
-#: manufacturing/doctype/work_order/work_order.js:588
+#: manufacturing/doctype/work_order/work_order.js:627
 msgid "Create Pick List"
 msgstr "Crear lista de selección"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Create Print Format"
 msgstr "Crear formato de impresión"
 
@@ -17894,20 +18143,20 @@
 msgid "Create Receiver List"
 msgstr "Crear Lista de Receptores"
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:45
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:81
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:44
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:76
 msgid "Create Reposting Entries"
 msgstr ""
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:53
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:52
 msgid "Create Reposting Entry"
 msgstr ""
 
 #: projects/doctype/timesheet/timesheet.js:54
-#: projects/doctype/timesheet/timesheet.js:203
-#: projects/doctype/timesheet/timesheet.js:207
+#: projects/doctype/timesheet/timesheet.js:230
+#: projects/doctype/timesheet/timesheet.js:234
 msgid "Create Sales Invoice"
-msgstr "Crear factura de ventas"
+msgstr "Crear Factura de Venta"
 
 #. Label of an action in the Onboarding Step 'Create a Sales Order'
 #: selling/onboarding_step/create_a_sales_order/create_a_sales_order.json
@@ -17919,24 +18168,24 @@
 msgid "Create Sales Orders to help you plan your work and deliver on-time"
 msgstr "Cree pedidos de ventas para ayudarlo a planificar su trabajo y entregarlo a tiempo"
 
-#: stock/doctype/stock_entry/stock_entry.js:346
+#: stock/doctype/stock_entry/stock_entry.js:399
 msgid "Create Sample Retention Stock Entry"
 msgstr "Crear entrada de stock de retención de muestra"
 
-#: public/js/utils/serial_no_batch_selector.js:220
+#: public/js/utils/serial_no_batch_selector.js:223
 msgid "Create Serial Nos"
-msgstr ""
+msgstr "Crear Nro. de Serie"
 
-#: stock/dashboard/item_dashboard.js:271
-#: stock/doctype/material_request/material_request.js:376
+#: stock/dashboard/item_dashboard.js:279
+#: stock/doctype/material_request/material_request.js:446
 msgid "Create Stock Entry"
-msgstr ""
+msgstr "Crear entrada de stock"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:153
+#: buying/doctype/request_for_quotation/request_for_quotation.js:163
 msgid "Create Supplier Quotation"
 msgstr "Crear presupuesto de proveedor"
 
-#: setup/doctype/company/company.js:110
+#: setup/doctype/company/company.js:130
 msgid "Create Tax Template"
 msgstr "Crear plantilla de impuestos"
 
@@ -17964,11 +18213,11 @@
 msgid "Create Users"
 msgstr "Crear Usuarios"
 
-#: stock/doctype/item/item.js:647
+#: stock/doctype/item/item.js:721
 msgid "Create Variant"
 msgstr "Crear variante"
 
-#: stock/doctype/item/item.js:495 stock/doctype/item/item.js:530
+#: stock/doctype/item/item.js:563 stock/doctype/item/item.js:597
 msgid "Create Variants"
 msgstr "Crear variantes"
 
@@ -18075,7 +18324,7 @@
 msgid "Create an Item"
 msgstr "Crear Producto"
 
-#: stock/stock_ledger.py:1684
+#: stock/stock_ledger.py:1704
 msgid "Create an incoming stock transaction for the Item."
 msgstr "Cree una transacción de stock entrante para el artículo."
 
@@ -18132,7 +18381,7 @@
 msgid "Created {0} scorecards for {1} between:"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:126
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:140
 msgid "Creating Accounts..."
 msgstr "Creando Cuentas ..."
 
@@ -18140,11 +18389,11 @@
 msgid "Creating Company and Importing Chart of Accounts"
 msgstr "Creación de empresa e importación de plan de cuentas"
 
-#: selling/doctype/sales_order/sales_order.js:912
+#: selling/doctype/sales_order/sales_order.js:1069
 msgid "Creating Delivery Note ..."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:137
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:143
 msgid "Creating Dimensions..."
 msgstr "Creando Dimensiones ..."
 
@@ -18152,34 +18401,34 @@
 msgid "Creating Packing Slip ..."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:1026
+#: selling/doctype/sales_order/sales_order.js:1194
 msgid "Creating Purchase Order ..."
 msgstr "Creando orden de compra ..."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: buying/doctype/purchase_order/purchase_order.js:414
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:709
+#: buying/doctype/purchase_order/purchase_order.js:482
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:71
 msgid "Creating Purchase Receipt ..."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:81
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:146
+#: buying/doctype/purchase_order/purchase_order.js:85
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:155
 msgid "Creating Stock Entry"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:429
+#: buying/doctype/purchase_order/purchase_order.js:497
 msgid "Creating Subcontracting Order ..."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:226
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:247
 msgid "Creating Subcontracting Receipt ..."
 msgstr ""
 
-#: setup/doctype/employee/employee.js:85
+#: setup/doctype/employee/employee.js:87
 msgid "Creating User..."
 msgstr ""
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:52
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:56
 msgid "Creating {0} Invoice"
 msgstr "Creando {0} Factura"
 
@@ -18199,22 +18448,24 @@
 msgid "Creation Document No"
 msgstr "Creación del documento No"
 
-#: utilities/bulk_transaction.py:173
+#: utilities/bulk_transaction.py:185
 msgid "Creation of <b><a href='/app/{0}'>{1}(s)</a></b> successful"
 msgstr ""
 
-#: utilities/bulk_transaction.py:190
+#: utilities/bulk_transaction.py:202
 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:181
+#: utilities/bulk_transaction.py:193
 msgid "Creation of {0} partially successful.\n"
 "\t\t\t\tCheck <b><a href=\"/app/bulk-transaction-log\">Bulk Transaction Log</a></b>"
 msgstr ""
 
 #: 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/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
@@ -18236,15 +18487,15 @@
 msgid "Credit"
 msgstr "Haber"
 
-#: accounts/report/general_ledger/general_ledger.py:601
+#: accounts/report/general_ledger/general_ledger.py:614
 msgid "Credit (Transaction)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:578
+#: accounts/report/general_ledger/general_ledger.py:591
 msgid "Credit ({0})"
 msgstr "Crédito ({0})"
 
-#: accounts/doctype/journal_entry/journal_entry.js:536
+#: accounts/doctype/journal_entry/journal_entry.js:593
 msgid "Credit Account"
 msgstr "Cuenta de crédito"
 
@@ -18312,6 +18563,7 @@
 msgstr "Días de Crédito"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:49
+#: accounts/report/accounts_receivable/accounts_receivable.html:36
 #: selling/report/customer_credit_balance/customer_credit_balance.py:65
 msgid "Credit Limit"
 msgstr "Límite de crédito"
@@ -18346,7 +18598,7 @@
 msgid "Credit Limit"
 msgstr "Límite de crédito"
 
-#: selling/doctype/customer/customer.py:546
+#: selling/doctype/customer/customer.py:558
 msgid "Credit Limit Crossed"
 msgstr ""
 
@@ -18387,7 +18639,8 @@
 msgstr "Meses de Crédito"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:173
-#: accounts/report/accounts_receivable/accounts_receivable.py:1070
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1078
 #: controllers/sales_and_purchase_return.py:328
 #: setup/setup_wizard/operations/install_fixtures.py:256
 #: stock/doctype/delivery_note/delivery_note.js:84
@@ -18414,10 +18667,11 @@
 msgstr "Nota de crédito"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:200
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Credit Note Amount"
 msgstr "Monto de Nota de Credito"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:254
+#: accounts/doctype/sales_invoice/sales_invoice.py:259
 msgid "Credit Note Issued"
 msgstr "Nota de crédito emitida"
 
@@ -18433,7 +18687,14 @@
 msgid "Credit Note Issued"
 msgstr "Nota de crédito emitida"
 
-#: stock/doctype/delivery_note/delivery_note.py:734
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+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
 msgid "Credit Note {0} has been created automatically"
 msgstr "Nota de crédito {0} se ha creado automáticamente"
 
@@ -18449,16 +18710,16 @@
 msgid "Credit in Company Currency"
 msgstr "Divisa por defecto de la cuenta de credito"
 
-#: selling/doctype/customer/customer.py:512
-#: selling/doctype/customer/customer.py:566
+#: selling/doctype/customer/customer.py:524
+#: selling/doctype/customer/customer.py:579
 msgid "Credit limit has been crossed for customer {0} ({1}/{2})"
 msgstr "Se ha cruzado el límite de crédito para el Cliente {0} ({1} / {2})"
 
-#: selling/doctype/customer/customer.py:328
+#: selling/doctype/customer/customer.py:340
 msgid "Credit limit is already defined for the Company {0}"
 msgstr "El límite de crédito ya está definido para la Compañía {0}"
 
-#: selling/doctype/customer/customer.py:565
+#: selling/doctype/customer/customer.py:578
 msgid "Credit limit reached for customer {0}"
 msgstr "Se alcanzó el límite de crédito para el cliente {0}"
 
@@ -18527,25 +18788,31 @@
 msgid "Criteria weights must add up to 100%"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/website_item_group/website_item_group.json
+msgid "Cross Listing of Item in multiple groups"
+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 "Umbral de Transacción Acumulativo"
 
-#: accounts/doctype/account/account_tree.js:121
+#: accounts/doctype/account/account_tree.js:166
 #: accounts/report/account_balance/account_balance.py:28
-#: accounts/report/accounts_receivable/accounts_receivable.py:1079
+#: 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/consolidated_financial_statement/consolidated_financial_statement.js:94
+#: 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/financial_statements.html:29
 #: accounts/report/financial_statements.py:631
 #: 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:644
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:650
 #: accounts/report/payment_ledger/payment_ledger.py:213
 #: accounts/report/profitability_analysis/profitability_analysis.py:175
 #: accounts/report/purchase_register/purchase_register.py:229
@@ -18554,12 +18821,12 @@
 #: 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
-#: manufacturing/doctype/bom_creator/bom_creator.js:77
-#: public/js/financial_statements.js:231 public/js/utils/unreconcile.js:63
+#: 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
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:72
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:85
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:137
 msgid "Currency"
 msgstr "Divisa / Moneda"
 
@@ -18847,12 +19114,12 @@
 msgid "Currency and Price List"
 msgstr "Divisa y listas de precios"
 
-#: accounts/doctype/account/account.py:295
+#: accounts/doctype/account/account.py:314
 msgid "Currency can not be changed after making entries using some other currency"
 msgstr "El tipo de moneda/divisa no se puede cambiar después de crear la entrada contable"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1360
-#: accounts/doctype/payment_entry/payment_entry.py:1422 accounts/utils.py:2091
+#: accounts/doctype/payment_entry/payment_entry.py:1379
+#: accounts/doctype/payment_entry/payment_entry.py:1441 accounts/utils.py:2059
 msgid "Currency for {0} must be {1}"
 msgstr "Moneda para {0} debe ser {1}"
 
@@ -19065,57 +19332,57 @@
 
 #. Name of a DocType
 #. Name of a role
-#: accounts/doctype/sales_invoice/sales_invoice.js:265
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
+#: 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/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:45
+#: 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/sales_register/sales_register.js:21
 #: accounts/report/sales_register/sales_register.py:185
-#: buying/doctype/supplier/supplier.js:162 crm/doctype/lead/lead.js:35
-#: crm/doctype/opportunity/opportunity.js:94 crm/doctype/prospect/prospect.js:7
+#: 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
-#: projects/doctype/timesheet/timesheet.js:195
+#: projects/doctype/timesheet/timesheet.js:222
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:45
-#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:42
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:22
+#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:39
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:21
 #: selling/doctype/customer/customer.json
 #: selling/doctype/sales_order/sales_order_calendar.js:18
-#: selling/page/point_of_sale/pos_item_cart.js:309
+#: selling/page/point_of_sale/pos_item_cart.js:307
 #: 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:8
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:7
 #: selling/report/inactive_customers/inactive_customers.py:78
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:48
+#: 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:38
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:37
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:19
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:41
 #: selling/report/sales_order_analysis/sales_order_analysis.py:230
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:42
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:40
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:32
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:54
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:53
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:32
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:42
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:40
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:53
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:53
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:64
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:65
 #: setup/doctype/customer_group/customer_group.json
 #: setup/doctype/territory/territory.json
-#: stock/doctype/delivery_note/delivery_note.js:359
-#: stock/doctype/stock_entry/stock_entry.js:300
-#: stock/report/delayed_item_report/delayed_item_report.js:37
+#: stock/doctype/delivery_note/delivery_note.js:405
+#: stock/doctype/stock_entry/stock_entry.js:342
+#: stock/report/delayed_item_report/delayed_item_report.js:36
 #: stock/report/delayed_item_report/delayed_item_report.py:117
-#: stock/report/delayed_order_report/delayed_order_report.js:37
+#: stock/report/delayed_order_report/delayed_order_report.js:36
 #: stock/report/delayed_order_report/delayed_order_report.py:46
-#: support/report/issue_analytics/issue_analytics.js:70
+#: support/report/issue_analytics/issue_analytics.js:69
 #: support/report/issue_analytics/issue_analytics.py:37
-#: support/report/issue_summary/issue_summary.js:58
+#: support/report/issue_summary/issue_summary.js:57
 #: support/report/issue_summary/issue_summary.py:34
 msgid "Customer"
 msgstr "Cliente"
@@ -19484,7 +19751,7 @@
 msgid "Customer Code"
 msgstr "Código de Cliente"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1027
+#: accounts/report/accounts_receivable/accounts_receivable.py:1035
 msgid "Customer Contact"
 msgstr "Contacto del Cliente"
 
@@ -19564,11 +19831,11 @@
 msgstr "Comentarios de cliente"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:118
-#: accounts/report/accounts_receivable/accounts_receivable.py:1097
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:99
+#: accounts/report/accounts_receivable/accounts_receivable.js:121
+#: accounts/report/accounts_receivable/accounts_receivable.py:1105
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:102
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:188
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
+#: 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/item_wise_sales_register/item_wise_sales_register.py:208
@@ -19577,10 +19844,10 @@
 #: public/js/sales_trends_filters.js:26
 #: selling/report/inactive_customers/inactive_customers.py:81
 #: 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:31
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:30
 #: setup/doctype/customer_group/customer_group.json
-#: stock/report/delayed_item_report/delayed_item_report.js:43
-#: stock/report/delayed_order_report/delayed_order_report.js:43
+#: stock/report/delayed_item_report/delayed_item_report.js:42
+#: stock/report/delayed_order_report/delayed_order_report.js:42
 msgid "Customer Group"
 msgstr "Categoría de Cliente"
 
@@ -19743,7 +20010,7 @@
 msgid "Customer Group Name"
 msgstr "Nombre de la categoría de cliente"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1197
+#: accounts/report/accounts_receivable/accounts_receivable.py:1205
 msgid "Customer Group: {0} does not exist"
 msgstr ""
 
@@ -19764,11 +20031,12 @@
 msgid "Customer Items"
 msgstr "Partidas de deudores"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1088
+#: accounts/report/accounts_receivable/accounts_receivable.py:1096
 msgid "Customer LPO"
 msgstr "Cliente LPO"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:182
+#: accounts/report/accounts_receivable/accounts_receivable.html:152
 msgid "Customer LPO No."
 msgstr "Cliente LPO Nro."
 
@@ -19777,7 +20045,7 @@
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.json
 #: accounts/workspace/financial_reports/financial_reports.json
 msgid "Customer Ledger Summary"
-msgstr "Resumen del Libro mayor de clientes"
+msgstr "Resumen del Libro Mayor de Clientes"
 
 #. Label of a Small Text field in DocType 'Purchase Order'
 #: buying/doctype/purchase_order/purchase_order.json
@@ -19785,9 +20053,9 @@
 msgid "Customer Mobile No"
 msgstr "Numero de móvil de cliente"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1034
+#: accounts/report/accounts_receivable/accounts_receivable.py:1042
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:92
+#: 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
@@ -19939,7 +20207,7 @@
 msgid "Customer PO Details"
 msgstr "Detalles de la OC del Cliente"
 
-#: public/js/utils/contact_address_quick_entry.js:92
+#: public/js/utils/contact_address_quick_entry.js:95
 msgid "Customer POS Id"
 msgstr "id de POS del Cliente"
 
@@ -19986,7 +20254,7 @@
 msgid "Customer Provided"
 msgstr "Proporcionado por el cliente"
 
-#: setup/doctype/company/company.py:359
+#: setup/doctype/company/company.py:358
 msgid "Customer Service"
 msgstr "Servicio al cliente"
 
@@ -20014,7 +20282,7 @@
 msgid "Customer Warehouse (Optional)"
 msgstr "Almacén del cliente (opcional)"
 
-#: selling/page/point_of_sale/pos_item_cart.js:924
+#: selling/page/point_of_sale/pos_item_cart.js:956
 msgid "Customer contact updated successfully."
 msgstr "El contacto del cliente se actualizó correctamente."
 
@@ -20037,9 +20305,9 @@
 msgid "Customer required for 'Customerwise Discount'"
 msgstr "Se requiere un cliente para el descuento"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:986
-#: selling/doctype/sales_order/sales_order.py:335
-#: stock/doctype/delivery_note/delivery_note.py:354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1003
+#: selling/doctype/sales_order/sales_order.py:338
+#: stock/doctype/delivery_note/delivery_note.py:408
 msgid "Customer {0} does not belong to project {1}"
 msgstr "Cliente {0} no pertenece al proyecto {1}"
 
@@ -20201,7 +20469,7 @@
 msgid "DUNN-.MM.-.YY.-"
 msgstr "DUNN-.MM .-. YY.-"
 
-#: public/js/stock_analytics.js:51
+#: public/js/stock_analytics.js:81
 msgid "Daily"
 msgstr "Diario"
 
@@ -20310,7 +20578,7 @@
 msgid "Dashboard"
 msgstr "Tablero"
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:15
 msgid "Data Based On"
 msgstr ""
 
@@ -20331,17 +20599,19 @@
 msgid "Data exported from Tally that consists of the Chart of Accounts, Customers, Suppliers, Addresses, Items and UOMs"
 msgstr "Datos exportados de Tally que consisten en el plan de cuentas, clientes, proveedores, direcciones, artículos y unidades de medida"
 
-#: accounts/doctype/journal_entry/journal_entry.js:542
+#: accounts/doctype/journal_entry/journal_entry.js:603
 #: 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:16
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:37
+#: accounts/report/account_balance/account_balance.js:15
+#: accounts/report/accounts_receivable/accounts_receivable.html:132
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:38
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:26
+#: accounts/report/general_ledger/general_ledger.html:27
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:26
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:22
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:38
-#: accounts/report/share_balance/share_balance.js:10
-#: accounts/report/share_ledger/share_ledger.js:10
+#: 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
@@ -20349,12 +20619,12 @@
 #: 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
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:19
-#: public/js/bank_reconciliation_tool/data_table_manager.js:40
+#: public/js/bank_reconciliation_tool/data_table_manager.js:39
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:34
 #: selling/report/sales_order_analysis/sales_order_analysis.py:220
 #: stock/report/product_bundle_balance/product_bundle_balance.js:8
 #: stock/report/reserved_stock/reserved_stock.py:89
-#: stock/report/stock_ledger/stock_ledger.py:107
+#: stock/report/stock_ledger/stock_ledger.py:180
 #: support/report/first_response_time_for_issues/first_response_time_for_issues.py:11
 #: support/report/support_hour_distribution/support_hour_distribution.py:68
 msgid "Date"
@@ -20534,7 +20804,7 @@
 msgid "Date "
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:98
+#: assets/report/fixed_asset_register/fixed_asset_register.js:97
 msgid "Date Based On"
 msgstr "Fecha basada en"
 
@@ -20571,7 +20841,7 @@
 msgid "Date of Commencement"
 msgstr "Fecha de Comienzo"
 
-#: setup/doctype/company/company.js:70
+#: setup/doctype/company/company.js:69
 msgid "Date of Commencement should be greater than Date of Incorporation"
 msgstr "La fecha de inicio debe ser mayor que la fecha de incorporación"
 
@@ -20599,7 +20869,7 @@
 msgid "Date of Joining"
 msgstr "Fecha de Ingreso"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:265
 msgid "Date of Transaction"
 msgstr "Fecha de la Transacción"
 
@@ -20704,7 +20974,7 @@
 msgid "Days Since Last Order"
 msgstr "Días desde el último pedido"
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:35
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:34
 msgid "Days Since Last order"
 msgstr "Días desde la última orden"
 
@@ -20737,12 +21007,14 @@
 msgid "Dear"
 msgstr "Estimado"
 
-#: stock/reorder_item.py:285
+#: stock/reorder_item.py:370
 msgid "Dear System Manager,"
 msgstr "Estimado administrador del sistema,"
 
 #: 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/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
@@ -20764,15 +21036,15 @@
 msgid "Debit"
 msgstr "Debe"
 
-#: accounts/report/general_ledger/general_ledger.py:594
+#: accounts/report/general_ledger/general_ledger.py:607
 msgid "Debit (Transaction)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:572
+#: accounts/report/general_ledger/general_ledger.py:585
 msgid "Debit ({0})"
 msgstr "Débito ({0})"
 
-#: accounts/doctype/journal_entry/journal_entry.js:530
+#: accounts/doctype/journal_entry/journal_entry.js:583
 msgid "Debit Account"
 msgstr "Cuenta de debito"
 
@@ -20807,10 +21079,11 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:175
-#: accounts/report/accounts_receivable/accounts_receivable.py:1073
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1081
 #: controllers/sales_and_purchase_return.py:332
 #: setup/setup_wizard/operations/install_fixtures.py:257
-#: stock/doctype/purchase_receipt/purchase_receipt.js:73
+#: stock/doctype/purchase_receipt/purchase_receipt.js:76
 msgid "Debit Note"
 msgstr "Nota de debito"
 
@@ -20828,6 +21101,7 @@
 msgstr "Nota de debito"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:202
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Debit Note Amount"
 msgstr "Monto de Nota de Debito"
 
@@ -20837,6 +21111,13 @@
 msgid "Debit Note Issued"
 msgstr "Nota de débito emitida"
 
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Debit Note will update it's own outstanding amount, even if \"Return Against\" is specified."
+msgstr ""
+
 #. Label of a Link field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -20849,11 +21130,11 @@
 msgid "Debit To"
 msgstr "Debitar a"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
 msgid "Debit To is required"
 msgstr "Débito Para es requerido"
 
-#: accounts/general_ledger.py:465
+#: accounts/general_ledger.py:474
 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
 msgstr "El Débito y Crédito no es igual para {0} # {1}. La diferencia es {2}."
 
@@ -20893,7 +21174,7 @@
 msgid "Decapitalized"
 msgstr ""
 
-#: public/js/utils/sales_common.js:444
+#: public/js/utils/sales_common.js:503
 msgid "Declare Lost"
 msgstr "Declarar perdido"
 
@@ -21025,15 +21306,15 @@
 msgid "Default BOM ({0}) must be active for this item or its template"
 msgstr "La lista de materiales (LdM) por defecto ({0}) debe estar activa para este producto o plantilla"
 
-#: manufacturing/doctype/work_order/work_order.py:1234
+#: manufacturing/doctype/work_order/work_order.py:1248
 msgid "Default BOM for {0} not found"
 msgstr "BOM por defecto para {0} no encontrado"
 
-#: controllers/accounts_controller.py:3216
+#: controllers/accounts_controller.py:3307
 msgid "Default BOM not found for FG Item {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1231
+#: manufacturing/doctype/work_order/work_order.py:1245
 msgid "Default BOM not found for Item {0} and Project {1}"
 msgstr "La lista de materiales predeterminada no se encontró para el Elemento {0} y el Proyecto {1}"
 
@@ -21491,11 +21772,11 @@
 msgid "Default Unit of Measure"
 msgstr "Unidad de Medida (UdM) predeterminada"
 
-#: stock/doctype/item/item.py:1233
+#: stock/doctype/item/item.py:1234
 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:1216
+#: stock/doctype/item/item.py:1217
 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 "Unidad de medida predeterminada para el artículo {0} no se puede cambiar directamente porque ya ha realizado alguna transacción (s) con otra UOM. Usted tendrá que crear un nuevo elemento a utilizar un UOM predeterminado diferente."
 
@@ -21582,7 +21863,12 @@
 msgid "Default account will be automatically updated in POS Invoice when this mode is selected."
 msgstr "La Cuenta predeterminada se actualizará automáticamente en Factura de POS cuando se seleccione este modo."
 
-#: setup/doctype/company/company.js:133
+#. Description of a DocType
+#: stock/doctype/stock_settings/stock_settings.json
+msgid "Default settings for your stock-related transactions"
+msgstr ""
+
+#: setup/doctype/company/company.js:160
 msgid "Default tax templates for sales, purchase and items are created."
 msgstr ""
 
@@ -21763,7 +22049,7 @@
 msgid "Delayed Tasks Summary"
 msgstr ""
 
-#: setup/doctype/company/company.js:176
+#: setup/doctype/company/company.js:207
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -21773,21 +22059,39 @@
 msgid "Delete Accounting and Stock Ledger Entries on deletion of Transaction"
 msgstr ""
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Bins"
+msgstr ""
+
 #. Label of a Check field in DocType 'Repost Accounting Ledger'
 #: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
 msgctxt "Repost Accounting Ledger"
 msgid "Delete Cancelled Ledger Entries"
 msgstr ""
 
-#: stock/doctype/inventory_dimension/inventory_dimension.js:50
+#: stock/doctype/inventory_dimension/inventory_dimension.js:66
 msgid "Delete Dimension"
 msgstr ""
 
-#: setup/doctype/company/company.js:117
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Leads and Addresses"
+msgstr ""
+
+#: setup/doctype/company/company.js:141
 msgid "Delete Transactions"
 msgstr ""
 
-#: setup/doctype/company/company.js:176
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Transactions"
+msgstr ""
+
+#: setup/doctype/company/company.js:206
 msgid "Delete all the Transactions for this Company"
 msgstr "Eliminar todas las transacciones para esta compañía"
 
@@ -21797,12 +22101,16 @@
 msgid "Deleted Documents"
 msgstr "Documentos Eliminados"
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:489
+msgid "Deletion in Progress!"
+msgstr ""
+
 #: regional/__init__.py:14
 msgid "Deletion is not permitted for country {0}"
 msgstr "La eliminación no está permitida para el país {0}"
 
-#: buying/doctype/purchase_order/purchase_order.js:297
-#: buying/doctype/purchase_order/purchase_order_list.js:10
+#: 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
 msgid "Delivered"
@@ -21859,37 +22167,37 @@
 #: stock/report/reserved_stock/reserved_stock.py:131
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:64
 msgid "Delivered Qty"
-msgstr "Cantidad entregada"
+msgstr "Cant. Entregada"
 
 #. Label of a Float field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
 msgid "Delivered Qty"
-msgstr "Cantidad entregada"
+msgstr "Cant. Entregada"
 
 #. Label of a Float field in DocType 'Sales Invoice Item'
 #: accounts/doctype/sales_invoice_item/sales_invoice_item.json
 msgctxt "Sales Invoice Item"
 msgid "Delivered Qty"
-msgstr "Cantidad entregada"
+msgstr "Cant. Entregada"
 
 #. Label of a Float field in DocType 'Sales Order Item'
 #: selling/doctype/sales_order_item/sales_order_item.json
 msgctxt "Sales Order Item"
 msgid "Delivered Qty"
-msgstr "Cantidad entregada"
+msgstr "Cant. Entregada"
 
 #. Label of a Float field in DocType 'Serial and Batch Entry'
 #: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
 msgctxt "Serial and Batch Entry"
 msgid "Delivered Qty"
-msgstr "Cantidad entregada"
+msgstr "Cant. Entregada"
 
 #. Label of a Float field in DocType 'Stock Reservation Entry'
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 msgctxt "Stock Reservation Entry"
 msgid "Delivered Qty"
-msgstr "Cantidad entregada"
+msgstr "Cant. Entregada"
 
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:101
 msgid "Delivered Quantity"
@@ -21915,7 +22223,7 @@
 msgid "Delivery"
 msgstr "Entregar"
 
-#: public/js/utils.js:678
+#: public/js/utils.js:742 selling/doctype/sales_order/sales_order.js:1012
 #: selling/report/sales_order_analysis/sales_order_analysis.py:321
 msgid "Delivery Date"
 msgstr "Fecha de entrega"
@@ -21948,17 +22256,17 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:281
-#: accounts/doctype/sales_invoice/sales_invoice_list.js:27
+#: 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
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order_list.js:57
+#: selling/doctype/sales_order/sales_order.js:619
+#: selling/doctype/sales_order/sales_order_list.js:70
 #: stock/doctype/delivery_note/delivery_note.json
-#: stock/doctype/delivery_trip/delivery_trip.js:51
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/delivery_trip/delivery_trip.js:52
+#: stock/doctype/pick_list/pick_list.js:110
+#: stock/doctype/purchase_receipt/purchase_receipt.js:90
 msgid "Delivery Note"
 msgstr "Nota de entrega"
 
@@ -22074,16 +22382,16 @@
 msgid "Delivery Note Trends"
 msgstr "Evolución de las notas de entrega"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1148
+#: accounts/doctype/sales_invoice/sales_invoice.py:1155
 msgid "Delivery Note {0} is not submitted"
 msgstr "La nota de entrega {0} no está validada"
 
-#: stock/doctype/pick_list/pick_list.py:885
+#: stock/doctype/pick_list/pick_list.py:1005
 msgid "Delivery Note(s) created for the Pick List"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1092
-#: stock/doctype/delivery_trip/delivery_trip.js:67
+#: accounts/report/accounts_receivable/accounts_receivable.py:1100
+#: stock/doctype/delivery_trip/delivery_trip.js:72
 msgid "Delivery Notes"
 msgstr "Notas de entrega"
 
@@ -22130,7 +22438,7 @@
 msgstr "Entregar a"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:180
+#: stock/doctype/delivery_note/delivery_note.js:210
 #: stock/doctype/delivery_trip/delivery_trip.json
 msgid "Delivery Trip"
 msgstr "Viaje de entrega"
@@ -22162,7 +22470,7 @@
 msgid "Delivery to"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:351
+#: selling/doctype/sales_order/sales_order.py:354
 msgid "Delivery warehouse required for stock item {0}"
 msgstr "Almacén de entrega requerido para el inventrio del producto {0}"
 
@@ -22281,7 +22589,7 @@
 msgid "Depends on Tasks"
 msgstr "Depende de Tareas"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:61
+#: public/js/bank_reconciliation_tool/data_table_manager.js:60
 msgid "Deposit"
 msgstr ""
 
@@ -22323,7 +22631,7 @@
 
 #: 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:45
+#: accounts/report/account_balance/account_balance.js:44
 #: accounts/report/cash_flow/cash_flow.py:129
 msgid "Depreciation"
 msgstr "DEPRECIACIONES"
@@ -22342,7 +22650,7 @@
 msgstr "DEPRECIACIONES"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:149
-#: assets/doctype/asset/asset.js:241
+#: assets/doctype/asset/asset.js:276
 msgid "Depreciation Amount"
 msgstr "Monto de la depreciación"
 
@@ -22405,7 +22713,7 @@
 msgid "Depreciation Expense Account"
 msgstr "Cuenta de gastos de depreciación"
 
-#: assets/doctype/asset/depreciation.py:390
+#: assets/doctype/asset/depreciation.py:388
 msgid "Depreciation Expense Account should be an Income or Expense Account."
 msgstr ""
 
@@ -22439,19 +22747,19 @@
 msgid "Depreciation Posting Date"
 msgstr "Fecha de contabilización de la depreciación"
 
-#: assets/doctype/asset/asset.js:661
+#: assets/doctype/asset/asset.js:780
 msgid "Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:491
+#: assets/doctype/asset/asset.py:493
 msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
 msgstr "Fila de Depreciación {0}: el valor esperado después de la vida útil debe ser mayor o igual que {1}"
 
-#: assets/doctype/asset/asset.py:460
+#: assets/doctype/asset/asset.py:462
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date"
 msgstr "Fila de depreciación {0}: la siguiente fecha de depreciación no puede ser anterior Fecha disponible para usar"
 
-#: assets/doctype/asset/asset.py:451
+#: assets/doctype/asset/asset.py:453
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date"
 msgstr "Fila de depreciación {0}: la siguiente fecha de depreciación no puede ser anterior a la fecha de compra"
 
@@ -22486,7 +22794,7 @@
 msgid "Depreciation Schedule View"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:347
+#: assets/doctype/asset/asset.py:349
 msgid "Depreciation cannot be calculated for fully depreciated assets"
 msgstr ""
 
@@ -22496,12 +22804,15 @@
 #: 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
+#: manufacturing/doctype/bom/bom_item_preview.html:12
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:58
+#: 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:56
-#: public/js/controllers/transaction.js:2138
-#: selling/doctype/quotation/quotation.js:279
+#: public/js/bank_reconciliation_tool/data_table_manager.js:55
+#: public/js/controllers/transaction.js:2181
+#: 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
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:26
@@ -22512,7 +22823,7 @@
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:59
 #: stock/report/product_bundle_balance/product_bundle_balance.py:112
 #: stock/report/stock_ageing/stock_ageing.py:126
-#: stock/report/stock_ledger/stock_ledger.py:187
+#: 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
@@ -23078,7 +23389,7 @@
 msgid "Desk User"
 msgstr "Usuario de Escritorio"
 
-#: public/js/utils/sales_common.js:423
+#: public/js/utils/sales_common.js:482
 msgid "Detailed Reason"
 msgstr "Motivo detallado"
 
@@ -23094,6 +23405,10 @@
 msgid "Detailed Reason"
 msgstr "Motivo detallado"
 
+#: templates/pages/task_info.html:49
+msgid "Details"
+msgstr "Detalles"
+
 #. Label of a Long Text field in DocType 'Appointment'
 #: crm/doctype/appointment/appointment.json
 msgctxt "Appointment"
@@ -23154,6 +23469,12 @@
 msgid "Details"
 msgstr "Detalles"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Details"
+msgstr "Detalles"
+
 #. Label of a Select field in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
 msgctxt "Accounts Settings"
@@ -23167,7 +23488,7 @@
 msgstr ""
 
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:175
-#: public/js/bank_reconciliation_tool/number_card.js:31
+#: 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
 msgid "Difference"
@@ -23197,7 +23518,7 @@
 msgid "Difference (Dr - Cr)"
 msgstr "Diferencia (Deb - Cred)"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:287
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:294
 msgid "Difference Account"
 msgstr "Cuenta para la Diferencia"
 
@@ -23226,15 +23547,15 @@
 msgid "Difference Account"
 msgstr "Cuenta para la Diferencia"
 
-#: stock/doctype/stock_entry/stock_entry.py:573
+#: stock/doctype/stock_entry/stock_entry.py:528
 msgid "Difference Account must be a Asset/Liability type account, since this Stock Entry is an Opening Entry"
 msgstr "La cuenta de diferencia debe ser una cuenta de tipo activo / pasivo, ya que esta entrada de stock es una entrada de apertura"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:714
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:768
 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"
 msgstr "Una cuenta distinta debe ser del tipo Activo / Pasivo, ya que la reconciliación del stock es una entrada de apertura"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:301
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:309
 msgid "Difference Amount"
 msgstr "Diferencia"
 
@@ -23298,7 +23619,7 @@
 msgid "Difference Value"
 msgstr "Valor de diferencia"
 
-#: stock/doctype/delivery_note/delivery_note.js:366
+#: stock/doctype/delivery_note/delivery_note.js:414
 msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
 msgstr ""
 
@@ -23318,7 +23639,7 @@
 msgid "Dimension Details"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:94
+#: accounts/report/budget_variance_report/budget_variance_report.js:92
 msgid "Dimension Filter"
 msgstr "Filtro de dimensiones"
 
@@ -23488,7 +23809,7 @@
 msgstr ""
 
 #: selling/report/customer_credit_balance/customer_credit_balance.py:70
-#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:8
+#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:16
 #: stock/doctype/putaway_rule/putaway_rule_list.js:5
 msgid "Disabled"
 msgstr "Deshabilitado"
@@ -23637,19 +23958,19 @@
 msgid "Disabled"
 msgstr "Deshabilitado"
 
-#: accounts/general_ledger.py:128
+#: accounts/general_ledger.py:132
 msgid "Disabled Account Selected"
 msgstr ""
 
-#: stock/utils.py:454
+#: stock/utils.py:449
 msgid "Disabled Warehouse {0} cannot be used for this transaction."
 msgstr ""
 
-#: controllers/accounts_controller.py:550
+#: controllers/accounts_controller.py:594
 msgid "Disabled pricing rules since this {} is an internal transfer"
-msgstr ""
+msgstr "Deshabilitado las reglas de precios ya que esta {} es una transferencia interna"
 
-#: controllers/accounts_controller.py:564
+#: controllers/accounts_controller.py:608
 msgid "Disabled tax included prices since this {} is an internal transfer"
 msgstr ""
 
@@ -23664,11 +23985,11 @@
 msgid "Disables auto-fetching of existing quantity"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:62
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:64
 msgid "Disburse Loan"
 msgstr "Préstamo de desembolso"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:12
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
 msgid "Disbursed"
 msgstr "Desembolsado"
 
@@ -23678,7 +23999,8 @@
 msgid "Disbursed"
 msgstr "Desembolsado"
 
-#: selling/page/point_of_sale/pos_item_cart.js:380
+#: selling/page/point_of_sale/pos_item_cart.js:387
+#: templates/form_grid/item_grid.html:71
 msgid "Discount"
 msgstr "Descuento"
 
@@ -23944,7 +24266,7 @@
 msgid "Discount and Margin"
 msgstr "Descuento y Margen"
 
-#: selling/page/point_of_sale/pos_item_cart.js:761
+#: selling/page/point_of_sale/pos_item_cart.js:791
 msgid "Discount cannot be greater than 100%"
 msgstr ""
 
@@ -23952,7 +24274,7 @@
 msgid "Discount must be less than 100"
 msgstr "El descuento debe ser inferior a 100"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2532
+#: accounts/doctype/payment_entry/payment_entry.py:2561
 msgid "Discount of {} applied as per Payment Term"
 msgstr ""
 
@@ -24038,7 +24360,7 @@
 msgid "Dislikes"
 msgstr "No me gusta"
 
-#: setup/doctype/company/company.py:353
+#: setup/doctype/company/company.py:352
 msgid "Dispatch"
 msgstr "Despacho"
 
@@ -24146,6 +24468,11 @@
 msgid "Distinct Item and Warehouse"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/serial_no/serial_no.json
+msgid "Distinct unit of an Item"
+msgstr ""
+
 #. Label of a Select field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
@@ -24192,7 +24519,7 @@
 msgid "Divorced"
 msgstr "Divorciado"
 
-#: crm/report/lead_details/lead_details.js:42
+#: crm/report/lead_details/lead_details.js:41
 msgid "Do Not Contact"
 msgstr "No contactar"
 
@@ -24214,6 +24541,12 @@
 msgid "Do Not Explode"
 msgstr ""
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Do Not Update Serial / Batch on Creation of Auto Bundle"
+msgstr ""
+
 #. Description of the 'Hide Currency Symbol' (Select) field in DocType 'Global
 #. Defaults'
 #: setup/doctype/global_defaults/global_defaults.json
@@ -24227,29 +24560,49 @@
 msgid "Do not update variants on save"
 msgstr "No actualice las variantes al guardar"
 
-#: assets/doctype/asset/asset.js:683
+#: assets/doctype/asset/asset.js:800
 msgid "Do you really want to restore this scrapped asset?"
 msgstr "¿Realmente desea restaurar este activo desechado?"
 
-#: assets/doctype/asset/asset.js:669
+#: assets/doctype/asset/asset.js:788
 msgid "Do you really want to scrap this asset?"
 msgstr "¿Realmente desea desechar este activo?"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:134
+#: public/js/controllers/transaction.js:978
+msgid "Do you want to clear the selected {0}?"
+msgstr ""
+
+#: stock/doctype/delivery_trip/delivery_trip.js:155
 msgid "Do you want to notify all the customers by email?"
 msgstr "¿Desea notificar a todos los clientes por correo electrónico?"
 
-#: manufacturing/doctype/production_plan/production_plan.js:196
+#: manufacturing/doctype/production_plan/production_plan.js:221
 msgid "Do you want to submit the material request"
 msgstr "¿Quieres enviar la solicitud de material?"
 
+#. Label of a Data field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocField"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "DocType"
+msgstr ""
+
+#. Label of a Link field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocType"
+msgstr ""
+
 #. Label of a Link field in DocType 'Transaction Deletion Record Item'
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgctxt "Transaction Deletion Record Item"
 msgid "DocType"
 msgstr ""
 
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:45
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:69
 msgid "DocTypes should not be added manually to the 'Excluded DocTypes' table. You are only allowed to remove entries from it."
 msgstr ""
 
@@ -24268,9 +24621,9 @@
 msgstr ""
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:141
-#: manufacturing/report/production_planning_report/production_planning_report.js:43
+#: manufacturing/report/production_planning_report/production_planning_report.js:42
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:102
-#: public/js/bank_reconciliation_tool/dialog_manager.js:104
+#: public/js/bank_reconciliation_tool/dialog_manager.js:111
 msgid "Document Name"
 msgstr "Nombre de Documento"
 
@@ -24288,15 +24641,15 @@
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:134
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:100
-#: public/js/bank_reconciliation_tool/dialog_manager.js:99
-#: public/js/bank_reconciliation_tool/dialog_manager.js:182
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:16
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:15
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:23
+#: public/js/bank_reconciliation_tool/dialog_manager.js:106
+#: public/js/bank_reconciliation_tool/dialog_manager.js:186
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:14
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:22
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:14
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:14
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:22
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:14
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:23
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:22
 msgid "Document Type"
 msgstr "Tipo de Documento"
 
@@ -24342,11 +24695,11 @@
 msgid "Document Type "
 msgstr "Tipo de Documento"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:56
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:60
 msgid "Document Type already used as a dimension"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.js:64
+#: accounts/doctype/bank_transaction/bank_transaction.js:59
 msgid "Document {0} successfully uncleared"
 msgstr "El documento {0} no se ha borrado correctamente"
 
@@ -24356,7 +24709,7 @@
 msgid "Documents"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:200
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:202
 msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
 msgstr ""
 
@@ -24393,9 +24746,15 @@
 #: 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
-#: public/js/utils/crm_activities.js:211
+#: public/js/utils/crm_activities.js:212
 msgid "Done"
-msgstr ""
+msgstr "Hecho"
+
+#. Label of a Check field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "Done"
+msgstr "Hecho"
 
 #. Label of a Check field in DocType 'Sales Taxes and Charges'
 #: accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
@@ -24429,8 +24788,8 @@
 msgid "Double Declining Balance"
 msgstr "Doble Disminución de Saldo"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:84
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:93
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:27
 msgid "Download"
 msgstr "Descargar"
 
@@ -24439,7 +24798,7 @@
 msgid "Download Backups"
 msgstr "Descargar Backups"
 
-#: public/js/utils/serial_no_batch_selector.js:237
+#: public/js/utils/serial_no_batch_selector.js:241
 msgid "Download CSV Template"
 msgstr "Descargar la plantilla CSV"
 
@@ -24455,11 +24814,11 @@
 msgid "Download Materials Request Plan Section"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:60
+#: buying/doctype/request_for_quotation/request_for_quotation.js:70
 msgid "Download PDF"
 msgstr "Descargar PDF"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:31
 msgid "Download Template"
 msgstr "Descargar plantilla"
 
@@ -24515,18 +24874,17 @@
 msgid "Downtime Reason"
 msgstr "Razón del tiempo de inactividad"
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Dr"
 msgstr "Dr."
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:6
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:5
 #: accounts/doctype/payment_request/payment_request_list.js:5
-#: assets/doctype/asset/asset_list.js:35
+#: assets/doctype/asset/asset_list.js:25
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:5
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:7
-#: stock/doctype/stock_entry/stock_entry_list.js:10
+#: stock/doctype/stock_entry/stock_entry_list.js:18
 msgid "Draft"
 msgstr "Borrador"
 
@@ -24723,13 +25081,6 @@
 msgid "Draft"
 msgstr "Borrador"
 
-#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
-#. Record'
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-msgctxt "Transaction Deletion Record"
-msgid "Draft"
-msgstr "Borrador"
-
 #. Option for the 'Status' (Select) field in DocType 'Work Order'
 #: manufacturing/doctype/work_order/work_order.json
 msgctxt "Work Order"
@@ -24828,7 +25179,7 @@
 msgid "Due / Reference Date cannot be after {0}"
 msgstr "Vencimiento / Fecha de referencia no puede ser posterior a {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.js:649
+#: accounts/doctype/payment_entry/payment_entry.js:795
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:40
 msgid "Due Date"
 msgstr "Fecha de vencimiento"
@@ -24910,14 +25261,14 @@
 msgid "Due Date cannot be before Posting / Supplier Invoice Date"
 msgstr "La fecha de vencimiento no puede ser anterior a la fecha de contabilización / factura del proveedor"
 
-#: controllers/accounts_controller.py:576
+#: controllers/accounts_controller.py:628
 msgid "Due Date is mandatory"
 msgstr "La fecha de vencimiento es obligatoria"
 
 #. Name of a DocType
 #. Label of a Card Break in the Receivables Workspace
 #: accounts/doctype/dunning/dunning.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:164
 #: accounts/workspace/receivables/receivables.json
 msgid "Dunning"
 msgstr "Reclamación"
@@ -24994,7 +25345,7 @@
 msgid "Dunning Type"
 msgstr "Tipo de reclamación"
 
-#: stock/doctype/item/item.js:135 stock/doctype/putaway_rule/putaway_rule.py:55
+#: stock/doctype/item/item.js:178 stock/doctype/putaway_rule/putaway_rule.py:55
 msgid "Duplicate"
 msgstr "Duplicar"
 
@@ -25010,7 +25361,7 @@
 msgid "Duplicate Entry. Please check Authorization Rule {0}"
 msgstr "Entrada duplicada. Por favor consulte la regla de autorización {0}"
 
-#: assets/doctype/asset/asset.py:301
+#: assets/doctype/asset/asset.py:303
 msgid "Duplicate Finance Book"
 msgstr ""
 
@@ -25023,7 +25374,7 @@
 msgid "Duplicate POS Invoices found"
 msgstr ""
 
-#: projects/doctype/project/project.js:67
+#: projects/doctype/project/project.js:74
 msgid "Duplicate Project with Tasks"
 msgstr "Proyecto duplicado con tareas"
 
@@ -25039,7 +25390,7 @@
 msgid "Duplicate item group found in the item group table"
 msgstr "Se encontró grupo de artículos duplicado  en la table de grupo de artículos"
 
-#: projects/doctype/project/project.js:146
+#: projects/doctype/project/project.js:174
 msgid "Duplicate project has been created"
 msgstr "Se ha creado un proyecto duplicado"
 
@@ -25140,7 +25491,7 @@
 msgid "Earliest"
 msgstr "Primeras"
 
-#: stock/report/stock_balance/stock_balance.py:478
+#: stock/report/stock_balance/stock_balance.py:486
 msgid "Earliest Age"
 msgstr "Edad más temprana"
 
@@ -25154,19 +25505,27 @@
 msgid "Edit"
 msgstr "Editar"
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.html:37
+msgid "Edit Capacity"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Edit Cart"
+msgstr ""
+
 #: public/js/utils/serial_no_batch_selector.js:30
 msgid "Edit Full Form"
-msgstr ""
+msgstr "Editar formulario completo"
 
 #: controllers/item_variant.py:158
 msgid "Edit Not Allowed"
 msgstr "Editar no permitido"
 
-#: public/js/utils/crm_activities.js:182
+#: public/js/utils/crm_activities.js:184
 msgid "Edit Note"
 msgstr "Editar Nota"
 
-#: stock/doctype/delivery_note/delivery_note.js:370
+#: stock/doctype/delivery_note/delivery_note.js:418
 msgid "Edit Posting Date and Time"
 msgstr "Editar fecha y hora de envío"
 
@@ -25224,15 +25583,15 @@
 msgid "Edit Posting Date and Time"
 msgstr "Editar fecha y hora de envío"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:366
+#: public/js/bom_configurator/bom_configurator.bundle.js:405
 msgid "Edit Qty"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:238
+#: selling/page/point_of_sale/pos_past_order_summary.js:247
 msgid "Edit Receipt"
 msgstr "Editar recibo"
 
-#: selling/page/point_of_sale/pos_item_cart.js:717
+#: selling/page/point_of_sale/pos_item_cart.js:745
 msgid "Editing {0} is not allowed as per POS Profile settings"
 msgstr ""
 
@@ -25248,7 +25607,7 @@
 msgid "Educational Qualification"
 msgstr "Formación académica"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
 msgid "Either 'Selling' or 'Buying' must be selected"
 msgstr ""
 
@@ -25302,9 +25661,9 @@
 msgid "Electronic Invoice Register"
 msgstr "Registro Electrónico de Facturas"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:231
+#: 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:874
+#: selling/page/point_of_sale/pos_item_cart.js:904
 msgid "Email"
 msgstr "Correo electrónico"
 
@@ -25458,7 +25817,7 @@
 msgid "Email Group"
 msgstr "Grupo de Correo Electrónico"
 
-#: public/js/utils/contact_address_quick_entry.js:39
+#: public/js/utils/contact_address_quick_entry.js:42
 msgid "Email Id"
 msgstr "Id de Correo Electrónico"
 
@@ -25486,7 +25845,7 @@
 msgid "Email Sent"
 msgstr "Correo Electrónico Enviado"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:289
+#: buying/doctype/request_for_quotation/request_for_quotation.py:313
 msgid "Email Sent to Supplier {0}"
 msgstr "Correo electrónico enviado al proveedor {0}"
 
@@ -25514,15 +25873,15 @@
 msgid "Email Template"
 msgstr "Plantilla de Correo Electrónico"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:269
+#: selling/page/point_of_sale/pos_past_order_summary.js:278
 msgid "Email not sent to {0} (unsubscribed / disabled)"
 msgstr "Correo electrónico no enviado a {0} (dado de baja / desactivado)"
 
-#: stock/doctype/shipment/shipment.js:153
+#: stock/doctype/shipment/shipment.js:174
 msgid "Email or Phone/Mobile of the Contact are mandatory to continue."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:273
+#: selling/page/point_of_sale/pos_past_order_summary.js:283
 msgid "Email sent successfully."
 msgstr "Correo electrónico enviado correctamente."
 
@@ -25572,7 +25931,7 @@
 #: projects/doctype/timesheet/timesheet_calendar.js:28
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:27
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:10
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:50
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:45
 #: quality_management/doctype/non_conformance/non_conformance.json
 #: setup/doctype/company/company.json setup/doctype/employee/employee.json
 #: setup/doctype/sales_person/sales_person_tree.js:7
@@ -25775,7 +26134,7 @@
 msgid "Empty"
 msgstr "Vacío"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1042
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1044
 msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
 msgstr ""
 
@@ -25813,6 +26172,12 @@
 msgid "Enable Common Party Accounting"
 msgstr ""
 
+#. Label of a Check field in DocType 'Selling Settings'
+#: selling/doctype/selling_settings/selling_settings.json
+msgctxt "Selling Settings"
+msgid "Enable Cut-Off Date on Bulk Delivery Note Creation"
+msgstr ""
+
 #. Label of a Check field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
@@ -25885,6 +26250,13 @@
 msgid "Enable YouTube Tracking"
 msgstr "Habilitar el seguimiento de YouTube"
 
+#. Description of the 'Consider Rejected Warehouses' (Check) field in DocType
+#. 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Enable it if users want to consider rejected materials to dispatch."
+msgstr ""
+
 #: support/doctype/service_level_agreement/service_level_agreement.js:34
 msgid "Enable to apply SLA on every {0}"
 msgstr ""
@@ -25964,14 +26336,14 @@
 msgid "Encashment Date"
 msgstr "Fecha de Cobro"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:41
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:41
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:49
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:49
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:23
-#: accounts/report/payment_ledger/payment_ledger.js:24
-#: assets/report/fixed_asset_register/fixed_asset_register.js:75
+#: accounts/report/payment_ledger/payment_ledger.js:23
+#: assets/report/fixed_asset_register/fixed_asset_register.js:74
 #: projects/report/project_summary/project_summary.py:74
-#: public/js/financial_statements.js:191 public/js/setup_wizard.js:42
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:24
+#: public/js/financial_statements.js:200 public/js/setup_wizard.js:44
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:23
 #: templates/pages/projects.html:47
 msgid "End Date"
 msgstr "Fecha Final"
@@ -26040,6 +26412,10 @@
 msgid "End Date cannot be before Start Date."
 msgstr "La fecha de finalización no puede ser anterior a la fecha de inicio."
 
+#: manufacturing/doctype/workstation/workstation.js:206
+msgid "End Time"
+msgstr "Hora de finalización"
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -26064,15 +26440,15 @@
 msgid "End Time"
 msgstr "Hora de finalización"
 
-#: stock/doctype/stock_entry/stock_entry.js:241
+#: stock/doctype/stock_entry/stock_entry.js:268
 msgid "End Transit"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
 #: accounts/report/financial_ratios/financial_ratios.js:25
-#: assets/report/fixed_asset_register/fixed_asset_register.js:90
-#: public/js/financial_statements.js:206
+#: assets/report/fixed_asset_register/fixed_asset_register.js:89
+#: public/js/financial_statements.js:215
 msgid "End Year"
 msgstr "Fin de año"
 
@@ -26080,7 +26456,7 @@
 msgid "End Year cannot be before Start Year"
 msgstr "Año de finalización no puede ser anterior al Año de Inicio"
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:43
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:48
 #: accounts/doctype/process_deferred_accounting/process_deferred_accounting.py:37
 msgid "End date cannot be before start date"
 msgstr "La fecha de finalización no puede ser anterior a la fecha de inicio"
@@ -26104,6 +26480,8 @@
 msgid "End of the current subscription period"
 msgstr ""
 
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:13
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:23
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:31
 msgid "Enough Parts to Build"
 msgstr "Piezas suficiente para construir"
@@ -26118,27 +26496,29 @@
 msgid "Enter API key in Google Settings."
 msgstr "Ingrese la clave API en la Configuración de Google."
 
-#: setup/doctype/employee/employee.js:102
+#: setup/doctype/employee/employee.js:103
 msgid "Enter First and Last name of Employee, based on Which Full Name will be updated. IN transactions, it will be Full Name which will be fetched."
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:208
+#: public/js/utils/serial_no_batch_selector.js:211
 msgid "Enter Serial Nos"
-msgstr ""
+msgstr "Ingrese Serial Nro."
 
-#: stock/doctype/material_request/material_request.js:313
+#: stock/doctype/material_request/material_request.js:383
 msgid "Enter Supplier"
 msgstr "Introducir Proveedor"
 
-#: manufacturing/doctype/job_card/job_card.js:280
+#: manufacturing/doctype/job_card/job_card.js:320
+#: manufacturing/doctype/workstation/workstation.js:189
+#: manufacturing/doctype/workstation/workstation.js:236
 msgid "Enter Value"
 msgstr "Ingrese el Valor"
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:91
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:96
 msgid "Enter Visit Details"
 msgstr ""
 
-#: manufacturing/doctype/routing/routing.js:77
+#: manufacturing/doctype/routing/routing.js:78
 msgid "Enter a name for Routing."
 msgstr ""
 
@@ -26150,31 +26530,31 @@
 msgid "Enter a name for this Holiday List."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:499
+#: selling/page/point_of_sale/pos_payment.js:527
 msgid "Enter amount to be redeemed."
 msgstr "Ingrese el monto a canjear."
 
-#: stock/doctype/item/item.js:804
+#: stock/doctype/item/item.js:882
 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:877
+#: selling/page/point_of_sale/pos_item_cart.js:907
 msgid "Enter customer's email"
 msgstr "Ingrese el correo electrónico del cliente"
 
-#: selling/page/point_of_sale/pos_item_cart.js:882
+#: selling/page/point_of_sale/pos_item_cart.js:913
 msgid "Enter customer's phone number"
 msgstr "Ingrese el número de teléfono del cliente"
 
-#: assets/doctype/asset/asset.py:345
+#: assets/doctype/asset/asset.py:347
 msgid "Enter depreciation details"
 msgstr "Ingrese detalles de depreciación"
 
-#: selling/page/point_of_sale/pos_item_cart.js:382
+#: selling/page/point_of_sale/pos_item_cart.js:389
 msgid "Enter discount percentage."
 msgstr "Ingrese el porcentaje de descuento."
 
-#: public/js/utils/serial_no_batch_selector.js:211
+#: public/js/utils/serial_no_batch_selector.js:214
 msgid "Enter each serial no in a new line"
 msgstr ""
 
@@ -26188,7 +26568,7 @@
 msgid "Enter the Bank Guarantee Number before submitting."
 msgstr ""
 
-#: manufacturing/doctype/routing/routing.js:82
+#: manufacturing/doctype/routing/routing.js:83
 msgid "Enter the Operation, the table will fetch the Operation details like Hourly Rate, Workstation automatically.\n\n"
 " After that, set the Operation Time in minutes and the table will calculate the Operation Costs based on the Hourly Rate and Operation Time."
 msgstr ""
@@ -26201,19 +26581,19 @@
 msgid "Enter the name of the bank or lending institution before submitting."
 msgstr ""
 
-#: stock/doctype/item/item.js:824
+#: stock/doctype/item/item.js:908
 msgid "Enter the opening stock units."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:730
+#: manufacturing/doctype/bom/bom.js:761
 msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:817
+#: manufacturing/doctype/work_order/work_order.js:878
 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:392
+#: selling/page/point_of_sale/pos_payment.js:411
 msgid "Enter {0} amount."
 msgstr "Ingrese {0} monto."
 
@@ -26228,7 +26608,7 @@
 msgid "Entity"
 msgstr "Entidad"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:203
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:123
 msgid "Entity Type"
 msgstr "Tipo de Entidad"
@@ -26253,8 +26633,8 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:102
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:150
-#: accounts/report/account_balance/account_balance.js:30
-#: accounts/report/account_balance/account_balance.js:46
+#: accounts/report/account_balance/account_balance.js:29
+#: accounts/report/account_balance/account_balance.js:45
 #: accounts/report/balance_sheet/balance_sheet.py:242
 #: setup/setup_wizard/operations/install_fixtures.py:259
 msgid "Equity"
@@ -26279,35 +26659,35 @@
 msgid "Equity/Liability Account"
 msgstr "Cuenta de Patrimonio / Pasivo"
 
-#: accounts/doctype/payment_request/payment_request.py:410
-#: manufacturing/doctype/job_card/job_card.py:773
+#: 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
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. Option for the 'Status' (Select) field in DocType 'Bank Statement Import'
 #: accounts/doctype/bank_statement_import/bank_statement_import.json
 msgctxt "Bank Statement Import"
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. Option for the 'Status' (Select) field in DocType 'Ledger Merge'
 #: accounts/doctype/ledger_merge/ledger_merge.json
 msgctxt "Ledger Merge"
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. Label of a Small Text field in DocType 'POS Closing Entry'
 #: accounts/doctype/pos_closing_entry/pos_closing_entry.json
 msgctxt "POS Closing Entry"
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. Label of a Section Break field in DocType 'Repost Item Valuation'
 #: stock/doctype/repost_item_valuation/repost_item_valuation.json
 msgctxt "Repost Item Valuation"
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #. Label of a Long Text field in DocType 'Asset Repair'
 #: assets/doctype/asset_repair/asset_repair.json
@@ -26345,6 +26725,16 @@
 msgid "Error Log"
 msgstr "Registro de Errores"
 
+#. Label of a Long Text field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Error Log"
+msgstr "Registro de Errores"
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+msgid "Error Message"
+msgstr "Mensaje de error"
+
 #. Label of a Text field in DocType 'Period Closing Voucher'
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgctxt "Period Closing Voucher"
@@ -26367,7 +26757,7 @@
 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:406
+#: assets/doctype/asset/depreciation.py:404
 msgid "Error while posting depreciation entries"
 msgstr ""
 
@@ -26375,11 +26765,15 @@
 msgid "Error while processing deferred accounting for {0}"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:389
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:404
 msgid "Error while reposting item valuation"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:720
+#: templates/includes/footer/footer_extension.html:29
+msgid "Error: Not a valid id?"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.js:883
 msgid "Error: {0} is mandatory field"
 msgstr "Error: {0} es un campo obligatorio"
 
@@ -26447,7 +26841,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 "Ejemplo: ABCD. #####. Si se establece una serie y no se menciona el No de lote en las transacciones, se creará un número de lote automático basado en esta serie. Si siempre quiere mencionar explícitamente el No de lote para este artículo, déjelo en blanco. Nota: esta configuración tendrá prioridad sobre el Prefijo de denominación de serie en Configuración de stock."
 
-#: stock/stock_ledger.py:1976
+#: stock/stock_ledger.py:1983
 msgid "Example: Serial No {0} reserved in {1}."
 msgstr ""
 
@@ -26457,11 +26851,11 @@
 msgid "Exception Budget Approver Role"
 msgstr "Rol de aprobación de presupuesto de excepción"
 
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:56
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:55
 msgid "Excess Materials Consumed"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:869
+#: manufacturing/doctype/job_card/job_card.py:876
 msgid "Excess Transfer"
 msgstr ""
 
@@ -26485,7 +26879,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:517
+#: setup/doctype/company/company.py:516
 msgid "Exchange Gain/Loss"
 msgstr "Ganancia/Pérdida en Cambio"
 
@@ -26507,8 +26901,8 @@
 msgid "Exchange Gain/Loss"
 msgstr "Ganancia/Pérdida en Cambio"
 
-#: controllers/accounts_controller.py:1313
-#: controllers/accounts_controller.py:1394
+#: controllers/accounts_controller.py:1382
+#: controllers/accounts_controller.py:1463
 msgid "Exchange Gain/Loss amount has been booked through {0}"
 msgstr ""
 
@@ -26692,7 +27086,7 @@
 msgid "Excise Entry"
 msgstr "Registro de impuestos especiales"
 
-#: stock/doctype/stock_entry/stock_entry.js:1060
+#: stock/doctype/stock_entry/stock_entry.js:1213
 msgid "Excise Invoice"
 msgstr "Factura con impuestos especiales"
 
@@ -26741,9 +27135,9 @@
 msgid "Exit Interview Held On"
 msgstr "Entrevista de salida retenida"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:138
-#: public/js/bom_configurator/bom_configurator.bundle.js:179
-#: public/js/setup_wizard.js:168
+#: public/js/bom_configurator/bom_configurator.bundle.js:140
+#: public/js/bom_configurator/bom_configurator.bundle.js:183
+#: public/js/setup_wizard.js:181
 msgid "Expand All"
 msgstr "Expandir todo"
 
@@ -26801,11 +27195,13 @@
 msgid "Expected Delivery Date"
 msgstr "Fecha prevista de entrega"
 
-#: selling/doctype/sales_order/sales_order.py:316
+#: selling/doctype/sales_order/sales_order.py:319
 msgid "Expected Delivery Date should be after Sales Order Date"
 msgstr "La fecha de entrega esperada debe ser posterior a la fecha del pedido de cliente"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:44
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:104
+#: templates/pages/task_info.html:64
 msgid "Expected End Date"
 msgstr "Fecha prevista de finalización"
 
@@ -26831,7 +27227,7 @@
 msgid "Expected End Date should be less than or equal to parent task's Expected End Date {0}."
 msgstr ""
 
-#: public/js/projects/timer.js:12
+#: public/js/projects/timer.js:16
 msgid "Expected Hrs"
 msgstr "Horas esperadas"
 
@@ -26841,7 +27237,9 @@
 msgid "Expected Hrs"
 msgstr "Horas esperadas"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:40
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:98
+#: templates/pages/task_info.html:59
 msgid "Expected Start Date"
 msgstr "Fecha prevista de inicio"
 
@@ -26891,8 +27289,8 @@
 msgid "Expected Value After Useful Life"
 msgstr "Valor esperado después de la Vida Útil"
 
-#: accounts/report/account_balance/account_balance.js:29
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:81
+#: 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/profitability_analysis/profitability_analysis.py:189
 msgid "Expense"
@@ -26923,11 +27321,11 @@
 msgid "Expense"
 msgstr "Gastos"
 
-#: controllers/stock_controller.py:359
+#: controllers/stock_controller.py:541
 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
 msgstr "La cuenta de Gastos/Diferencia ({0}) debe ser una cuenta de 'utilidad o pérdida \""
 
-#: accounts/report/account_balance/account_balance.js:47
+#: accounts/report/account_balance/account_balance.js:46
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:248
 msgid "Expense Account"
 msgstr "Cuenta de costos"
@@ -27010,7 +27408,7 @@
 msgid "Expense Account"
 msgstr "Cuenta de costos"
 
-#: controllers/stock_controller.py:339
+#: controllers/stock_controller.py:521
 msgid "Expense Account Missing"
 msgstr "Falta la cuenta de gastos"
 
@@ -27027,13 +27425,13 @@
 msgid "Expense Head"
 msgstr "Cuenta de gastos"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:510
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:528
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:514
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:532
 msgid "Expense Head Changed"
 msgstr "Cabeza de gastos cambiada"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:552
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:556
 msgid "Expense account is mandatory for item {0}"
 msgstr "La cuenta de gastos es obligatoria para el elemento {0}"
 
@@ -27044,7 +27442,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:46
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:65
-#: accounts/report/account_balance/account_balance.js:48
+#: accounts/report/account_balance/account_balance.js:49
 msgid "Expenses Included In Asset Valuation"
 msgstr "Gastos incluidos en la valoración de activos"
 
@@ -27056,7 +27454,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:49
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:69
-#: accounts/report/account_balance/account_balance.js:49
+#: accounts/report/account_balance/account_balance.js:51
 msgid "Expenses Included In Valuation"
 msgstr "GASTOS DE VALORACIÓN"
 
@@ -27067,8 +27465,8 @@
 msgstr "GASTOS DE VALORACIÓN"
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:9
-#: selling/doctype/quotation/quotation_list.js:35
-#: stock/doctype/batch/batch_list.js:9 stock/doctype/item/item_list.js:10
+#: selling/doctype/quotation/quotation_list.js:34
+#: stock/doctype/batch/batch_list.js:13 stock/doctype/item/item_list.js:18
 msgid "Expired"
 msgstr "Expirado"
 
@@ -27090,13 +27488,13 @@
 msgid "Expired"
 msgstr "Expirado"
 
-#: stock/doctype/stock_entry/stock_entry.js:316
+#: stock/doctype/stock_entry/stock_entry.js:362
 msgid "Expired Batches"
 msgstr "Lotes Vencidos"
 
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:37
 msgid "Expires On"
-msgstr ""
+msgstr "Expira el"
 
 #. Option for the 'Pick Serial / Batch Based On' (Select) field in DocType
 #. 'Stock Settings'
@@ -27160,11 +27558,11 @@
 msgid "Export Data"
 msgstr "Exportar Datos"
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:35
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:34
 msgid "Export E-Invoices"
 msgstr "Exportar facturas electrónicas"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:106
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:93
 msgid "Export Errored Rows"
 msgstr "Exportar filas con errores"
 
@@ -27256,7 +27654,7 @@
 msgid "FIFO Stock Queue (qty, rate)"
 msgstr ""
 
-#. Label of a Text field in DocType 'Stock Ledger Entry'
+#. Label of a Long Text field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "FIFO Stock Queue (qty, rate)"
@@ -27268,7 +27666,8 @@
 msgid "FIFO/LIFO Queue"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:62
+#: 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
 msgid "Failed"
 msgstr "Falló"
@@ -27381,7 +27780,14 @@
 msgid "Failed"
 msgstr "Falló"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:9
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Failed"
+msgstr "Falló"
+
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:17
 msgid "Failed Entries"
 msgstr "Entradas fallidas"
 
@@ -27416,11 +27822,11 @@
 msgid "Failed to setup defaults"
 msgstr "Error al cambiar a default"
 
-#: setup/doctype/company/company.py:699
+#: setup/doctype/company/company.py:698
 msgid "Failed to setup defaults for country {0}. Please contact support."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Failure"
 msgstr "Fracaso"
 
@@ -27436,6 +27842,10 @@
 msgid "Failure Description"
 msgstr "Descripción del fallo"
 
+#: accounts/doctype/payment_request/payment_request.js:29
+msgid "Failure: {0}"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -27446,19 +27856,19 @@
 #: setup/doctype/company/company.json
 msgctxt "Company"
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. Label of a Data field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. Label of a Data field in DocType 'Prospect'
 #: crm/doctype/prospect/prospect.json
 msgctxt "Prospect"
 msgid "Fax"
-msgstr ""
+msgstr "Fax"
 
 #. Label of a Card Break in the Quality Workspace
 #: quality_management/workspace/quality/quality.json
@@ -27497,7 +27907,7 @@
 msgid "Fees"
 msgstr "Matrícula"
 
-#: public/js/utils/serial_no_batch_selector.js:332
+#: public/js/utils/serial_no_batch_selector.js:338
 msgid "Fetch Based On"
 msgstr ""
 
@@ -27507,7 +27917,7 @@
 msgid "Fetch Customers"
 msgstr "Obtener clientes"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:50
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:56
 msgid "Fetch Data"
 msgstr "Obtener datos"
 
@@ -27515,7 +27925,7 @@
 msgid "Fetch Items from Warehouse"
 msgstr "Obtener artículos del almacén"
 
-#: accounts/doctype/dunning/dunning.js:60
+#: accounts/doctype/dunning/dunning.js:61
 msgid "Fetch Overdue Payments"
 msgstr ""
 
@@ -27523,8 +27933,8 @@
 msgid "Fetch Subscription Updates"
 msgstr "Obtener actualizaciones de suscripción"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:952
-#: accounts/doctype/sales_invoice/sales_invoice.js:954
+#: accounts/doctype/sales_invoice/sales_invoice.js:1028
+#: accounts/doctype/sales_invoice/sales_invoice.js:1030
 msgid "Fetch Timesheet"
 msgstr ""
 
@@ -27534,8 +27944,8 @@
 msgid "Fetch Value From"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:252
-#: stock/doctype/stock_entry/stock_entry.js:554
+#: stock/doctype/material_request/material_request.js:318
+#: stock/doctype/stock_entry/stock_entry.js:640
 msgid "Fetch exploded BOM (including sub-assemblies)"
 msgstr "Buscar lista de materiales (LdM) incluyendo subconjuntos"
 
@@ -27546,11 +27956,20 @@
 msgid "Fetch items based on Default Supplier."
 msgstr "Obtenga artículos según el proveedor predeterminado."
 
-#: accounts/doctype/dunning/dunning.js:131
-#: public/js/controllers/transaction.js:1083
+#: accounts/doctype/dunning/dunning.js:135
+#: public/js/controllers/transaction.js:1138
 msgid "Fetching exchange rates ..."
 msgstr ""
 
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:72
+msgid "Fetching..."
+msgstr ""
+
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:106
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Field"
+msgstr "Campo"
+
 #. Label of a Select field in DocType 'POS Search Fields'
 #: accounts/doctype/pos_search_fields/pos_search_fields.json
 msgctxt "POS Search Fields"
@@ -27624,8 +28043,8 @@
 msgid "File to Rename"
 msgstr "Archivo a renombrar"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:17
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:17
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:16
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:16
 #: public/js/financial_statements.js:167
 msgid "Filter Based On"
 msgstr "Filtro basado en"
@@ -27636,7 +28055,7 @@
 msgid "Filter Duration (Months)"
 msgstr "Duración del filtro (meses)"
 
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:46
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:45
 msgid "Filter Total Zero Qty"
 msgstr ""
 
@@ -27644,7 +28063,7 @@
 #: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.json
 msgctxt "Bank Reconciliation Tool"
 msgid "Filter by Reference Date"
-msgstr ""
+msgstr "Filtrar por Fecha de Referencia"
 
 #: selling/page/point_of_sale/pos_past_order_list.js:63
 msgid "Filter by invoice status"
@@ -27662,8 +28081,8 @@
 msgid "Filter on Payment"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:696
-#: public/js/bank_reconciliation_tool/dialog_manager.js:192
+#: accounts/doctype/payment_entry/payment_entry.js:858
+#: public/js/bank_reconciliation_tool/dialog_manager.js:196
 msgid "Filters"
 msgstr "Filtros"
 
@@ -27722,13 +28141,13 @@
 #: accounts/report/accounts_receivable/accounts_receivable.js:24
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:56
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:48
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:32
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:52
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:104
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:31
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:51
 #: accounts/report/general_ledger/general_ledger.js:16
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:32
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:31
 #: accounts/report/trial_balance/trial_balance.js:70
-#: assets/report/fixed_asset_register/fixed_asset_register.js:49
+#: assets/report/fixed_asset_register/fixed_asset_register.js:48
 #: public/js/financial_statements.js:161
 msgid "Finance Book"
 msgstr "Libro de finanzas"
@@ -27854,14 +28273,14 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Financial Reports Workspace
-#: accounts/doctype/account/account_tree.js:158
+#: accounts/doctype/account/account_tree.js:234
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/workspace/financial_reports/financial_reports.json
 #: public/js/financial_statements.js:129
 msgid "Financial Statements"
 msgstr "Estados financieros"
 
-#: public/js/setup_wizard.js:40
+#: public/js/setup_wizard.js:42
 msgid "Financial Year Begins On"
 msgstr ""
 
@@ -27872,13 +28291,13 @@
 msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) "
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:627
-#: manufacturing/doctype/work_order/work_order.js:642
-#: manufacturing/doctype/work_order/work_order.js:651
+#: manufacturing/doctype/work_order/work_order.js:675
+#: manufacturing/doctype/work_order/work_order.js:690
+#: manufacturing/doctype/work_order/work_order.js:699
 msgid "Finish"
 msgstr "Terminar"
 
-#: buying/doctype/purchase_order/purchase_order.js:176
+#: buying/doctype/purchase_order/purchase_order.js:182
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:43
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:119
 msgid "Finished Good"
@@ -27914,7 +28333,7 @@
 msgid "Finished Good BOM"
 msgstr ""
 
-#: public/js/utils.js:698
+#: public/js/utils.js:768
 msgid "Finished Good Item"
 msgstr ""
 
@@ -27928,7 +28347,7 @@
 msgid "Finished Good Item Code"
 msgstr "Código de artículo bueno terminado"
 
-#: public/js/utils.js:715
+#: public/js/utils.js:786
 msgid "Finished Good Item Qty"
 msgstr ""
 
@@ -27938,15 +28357,15 @@
 msgid "Finished Good Item Quantity"
 msgstr ""
 
-#: controllers/accounts_controller.py:3204
+#: controllers/accounts_controller.py:3295
 msgid "Finished Good Item is not specified for service item {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:3219
+#: controllers/accounts_controller.py:3310
 msgid "Finished Good Item {0} Qty can not be zero"
 msgstr ""
 
-#: controllers/accounts_controller.py:3213
+#: controllers/accounts_controller.py:3304
 msgid "Finished Good Item {0} must be a sub-contracted item"
 msgstr ""
 
@@ -27990,15 +28409,15 @@
 msgid "Finished Good {0} must be a sub-contracted item."
 msgstr ""
 
-#: setup/doctype/company/company.py:262
+#: setup/doctype/company/company.py:261
 msgid "Finished Goods"
 msgstr "Productos terminados"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:25
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
 msgid "Finished Goods Warehouse"
 msgstr "Almacén de productos terminados"
 
-#: stock/doctype/stock_entry/stock_entry.py:1264
+#: stock/doctype/stock_entry/stock_entry.py:1273
 msgid "Finished Item {0} does not match with Work Order {1}"
 msgstr ""
 
@@ -28085,16 +28504,17 @@
 
 #. Name of a DocType
 #: accounts/doctype/fiscal_year/fiscal_year.json
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:17
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:1
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:16
 #: accounts/report/profitability_analysis/profitability_analysis.js:38
 #: accounts/report/trial_balance/trial_balance.js:16
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:16
-#: manufacturing/report/job_card_summary/job_card_summary.js:17
-#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:48
+#: manufacturing/report/job_card_summary/job_card_summary.js:16
+#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:44
 #: regional/report/irs_1099/irs_1099.js:17
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:16
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:16
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:15
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:15
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:15
 msgid "Fiscal Year"
 msgstr "Año fiscal"
 
@@ -28172,7 +28592,7 @@
 msgid "Fixed"
 msgstr "Fijo"
 
-#: accounts/report/account_balance/account_balance.js:50
+#: accounts/report/account_balance/account_balance.js:52
 msgid "Fixed Asset"
 msgstr "Activo fijo"
 
@@ -28246,11 +28666,23 @@
 msgid "Fleet Manager"
 msgstr "Gerente de Fota"
 
-#: selling/page/point_of_sale/pos_item_selector.js:303
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor"
+msgstr ""
+
+#. Label of a Data field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor Name"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_selector.js:300
 msgid "Focus on Item Group filter"
 msgstr "Centrarse en el filtro de grupo de artículos"
 
-#: selling/page/point_of_sale/pos_item_selector.js:294
+#: selling/page/point_of_sale/pos_item_selector.js:291
 msgid "Focus on search input"
 msgstr "Centrarse en la entrada de búsqueda"
 
@@ -28270,15 +28702,15 @@
 msgid "Following Material Requests have been raised automatically based on Item's re-order level"
 msgstr "Las Solicitudes de Materiales siguientes se han planteado de forma automática según el nivel de re-pedido del articulo"
 
-#: selling/doctype/customer/customer.py:740
+#: selling/doctype/customer/customer.py:751
 msgid "Following fields are mandatory to create address:"
 msgstr "Los siguientes campos son obligatorios para crear una dirección:"
 
-#: controllers/buying_controller.py:906
+#: controllers/buying_controller.py:932
 msgid "Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr "El siguiente artículo {0} no está marcado como {1} elemento. Puede habilitarlos como {1} elemento desde su Maestro de artículos"
 
-#: controllers/buying_controller.py:902
+#: controllers/buying_controller.py:928
 msgid "Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr "Los siguientes elementos {0} no están marcados como {1} elemento. Puede habilitarlos como {1} elemento desde su Maestro de artículos"
 
@@ -28286,7 +28718,7 @@
 msgid "For"
 msgstr "por"
 
-#: public/js/utils/sales_common.js:274
+#: public/js/utils/sales_common.js:309
 msgid "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table."
 msgstr "Para 'Paquete de Productos' el Almacén, No. de Serie y No. de lote serán considerados desde el 'Packing List'. Si el Almacén y No. de lote son los mismos para todos los productos empaquetados, los valores podrán ser ingresados en la tabla principal del artículo, estos valores serán copiados al 'Packing List'"
 
@@ -28302,11 +28734,16 @@
 msgid "For Company"
 msgstr "Para la empresa"
 
-#: stock/doctype/material_request/material_request.js:293
+#: stock/doctype/material_request/material_request.js:361
 msgid "For Default Supplier (Optional)"
 msgstr "Para el proveedor predeterminado (opcional)"
 
-#: controllers/stock_controller.py:770
+#: manufacturing/doctype/plant_floor/plant_floor.js:159
+#: manufacturing/doctype/plant_floor/plant_floor.js:183
+msgid "For Item"
+msgstr ""
+
+#: controllers/stock_controller.py:953
 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
 msgstr ""
 
@@ -28316,7 +28753,7 @@
 msgid "For Job Card"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:160
+#: manufacturing/doctype/job_card/job_card.js:175
 msgid "For Operation"
 msgstr ""
 
@@ -28341,23 +28778,28 @@
 msgid "For Production"
 msgstr "Por producción"
 
-#: stock/doctype/stock_entry/stock_entry.py:657
+#: stock/doctype/stock_entry/stock_entry.py:612
 msgid "For Quantity (Manufactured Qty) is mandatory"
 msgstr "Por cantidad (cantidad fabricada) es obligatoria"
 
+#: controllers/accounts_controller.py:1070
+msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}"
+msgstr ""
+
 #. Label of a Check field in DocType 'Currency Exchange'
 #: setup/doctype/currency_exchange/currency_exchange.json
 msgctxt "Currency Exchange"
 msgid "For Selling"
 msgstr "Para la Venta"
 
-#: accounts/doctype/payment_order/payment_order.js:98
+#: accounts/doctype/payment_order/payment_order.js:106
 msgid "For Supplier"
 msgstr "De proveedor"
 
-#: manufacturing/doctype/production_plan/production_plan.js:331
-#: selling/doctype/sales_order/sales_order.js:808
-#: stock/doctype/material_request/material_request.js:247
+#: manufacturing/doctype/production_plan/production_plan.js:358
+#: selling/doctype/sales_order/sales_order.js:933
+#: stock/doctype/material_request/material_request.js:310
+#: templates/form_grid/material_request_grid.html:36
 msgid "For Warehouse"
 msgstr "Para el almacén"
 
@@ -28367,11 +28809,11 @@
 msgid "For Warehouse"
 msgstr "Para el almacén"
 
-#: manufacturing/doctype/work_order/work_order.py:427
+#: manufacturing/doctype/work_order/work_order.py:438
 msgid "For Warehouse is required before Submit"
 msgstr "Para el almacén es requerido antes de enviar"
 
-#: public/js/utils/serial_no_batch_selector.js:116
+#: public/js/utils/serial_no_batch_selector.js:119
 msgid "For Work Order"
 msgstr "Para Orden de Trabajo"
 
@@ -28413,15 +28855,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:384
+#: stock/doctype/stock_entry/stock_entry.py:339
 msgid "For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry"
 msgstr "Para la tarjeta de trabajo {0}, solo puede realizar la entrada de stock del tipo &#39;Transferencia de material para fabricación&#39;"
 
-#: manufacturing/doctype/work_order/work_order.py:1523
+#: manufacturing/doctype/work_order/work_order.py:1537
 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1302
+#: stock/doctype/stock_entry/stock_entry.py:1311
 msgid "For quantity {0} should not be greater than allowed quantity {1}"
 msgstr ""
 
@@ -28431,12 +28873,12 @@
 msgid "For reference"
 msgstr "Para referencia"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1229
+#: accounts/doctype/payment_entry/payment_entry.js:1477
 #: public/js/controllers/accounts.js:182
 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
 msgstr "Para la línea {0} en {1}. incluir {2} en la tasa del producto, las lineas {3} también deben ser incluidas"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1498
+#: manufacturing/doctype/production_plan/production_plan.py:1520
 msgid "For row {0}: Enter Planned Qty"
 msgstr "Para la fila {0}: ingrese cantidad planificada"
 
@@ -28444,6 +28886,11 @@
 msgid "For the 'Apply Rule On Other' condition the field {0} is mandatory"
 msgstr "Para la condición &quot;Aplicar regla a otros&quot;, el campo {0} es obligatorio."
 
+#. Description of a DocType
+#: stock/doctype/item_customer_detail/item_customer_detail.json
+msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes"
+msgstr ""
+
 #. Label of a shortcut in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "Forecasting"
@@ -28626,7 +29073,7 @@
 msgid "Friday"
 msgstr "Viernes"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:957
+#: accounts/doctype/sales_invoice/sales_invoice.js:1033
 #: templates/pages/projects.html:67
 msgid "From"
 msgstr "Desde"
@@ -28678,13 +29125,13 @@
 msgid "From Customer"
 msgstr "Desde cliente"
 
-#: accounts/doctype/payment_entry/payment_entry.js:645
-#: accounts/doctype/payment_entry/payment_entry.js:650
+#: accounts/doctype/payment_entry/payment_entry.js:789
+#: accounts/doctype/payment_entry/payment_entry.js:796
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:16
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:16
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:8
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:16
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:38
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:15
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:37
 #: accounts/report/financial_ratios/financial_ratios.js:41
 #: accounts/report/general_ledger/general_ledger.js:22
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -28692,77 +29139,77 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:8
 #: 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:17
+#: accounts/report/pos_register/pos_register.js:16
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:8
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:16
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:47
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:47
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:15
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:46
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:46
 #: accounts/report/trial_balance/trial_balance.js:37
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:37
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:15
-#: buying/report/procurement_tracker/procurement_tracker.js:28
-#: buying/report/purchase_analytics/purchase_analytics.js:36
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:18
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:18
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:16
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:23
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:23
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:14
+#: buying/report/procurement_tracker/procurement_tracker.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:35
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:17
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:17
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:15
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:22
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:22
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:16
 #: crm/report/campaign_efficiency/campaign_efficiency.js:7
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:9
-#: crm/report/lead_conversion_time/lead_conversion_time.js:9
-#: crm/report/lead_details/lead_details.js:17
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:8
+#: crm/report/lead_conversion_time/lead_conversion_time.js:8
+#: crm/report/lead_details/lead_details.js:16
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:7
-#: crm/report/lost_opportunity/lost_opportunity.js:17
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:23
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:16
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:16
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:17
-#: manufacturing/report/process_loss_report/process_loss_report.js:30
-#: manufacturing/report/production_analytics/production_analytics.js:17
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:8
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:16
+#: crm/report/lost_opportunity/lost_opportunity.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:22
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:15
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:15
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:16
+#: manufacturing/report/process_loss_report/process_loss_report.js:29
+#: manufacturing/report/production_analytics/production_analytics.js:16
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:7
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:15
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:8
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:9
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:8
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:28
-#: public/js/stock_analytics.js:47
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:9
-#: regional/report/uae_vat_201/uae_vat_201.js:17
-#: regional/report/vat_audit_report/vat_audit_report.js:17
-#: selling/page/sales_funnel/sales_funnel.js:39
+#: public/js/stock_analytics.js:74
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:8
+#: regional/report/uae_vat_201/uae_vat_201.js:16
+#: regional/report/vat_audit_report/vat_audit_report.js:16
+#: selling/page/sales_funnel/sales_funnel.js:43
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:24
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:18
-#: selling/report/sales_analytics/sales_analytics.js:36
-#: selling/report/sales_order_analysis/sales_order_analysis.js:18
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:22
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:23
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:17
+#: selling/report/sales_analytics/sales_analytics.js:43
+#: selling/report/sales_order_analysis/sales_order_analysis.js:17
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:21
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:21
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:21
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:21
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:8
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:16
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:17
-#: stock/report/delayed_item_report/delayed_item_report.js:17
-#: stock/report/delayed_order_report/delayed_order_report.js:17
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:21
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:31
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:15
+#: stock/report/delayed_item_report/delayed_item_report.js:16
+#: stock/report/delayed_order_report/delayed_order_report.js:16
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:20
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:30
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:8
 #: stock/report/reserved_stock/reserved_stock.js:16
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:16
-#: stock/report/stock_analytics/stock_analytics.js:63
+#: stock/report/stock_analytics/stock_analytics.js:62
 #: stock/report/stock_balance/stock_balance.js:16
 #: stock/report/stock_ledger/stock_ledger.js:16
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:15
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:9
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:9
-#: support/report/issue_analytics/issue_analytics.js:25
-#: support/report/issue_summary/issue_summary.js:25
-#: support/report/support_hour_distribution/support_hour_distribution.js:8
-#: utilities/report/youtube_interactions/youtube_interactions.js:9
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:8
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:8
+#: support/report/issue_analytics/issue_analytics.js:24
+#: support/report/issue_summary/issue_summary.js:24
+#: support/report/support_hour_distribution/support_hour_distribution.js:7
+#: utilities/report/youtube_interactions/youtube_interactions.js:8
 msgid "From Date"
 msgstr "Desde la fecha"
 
@@ -28868,7 +29315,7 @@
 msgid "From Date"
 msgstr "Desde la fecha"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:41
+#: accounts/doctype/bank_clearance/bank_clearance.py:43
 msgid "From Date and To Date are Mandatory"
 msgstr "Desde la fecha y hasta la fecha son obligatorios"
 
@@ -28914,7 +29361,7 @@
 msgid "From Delivery Date"
 msgstr ""
 
-#: selling/doctype/installation_note/installation_note.js:58
+#: selling/doctype/installation_note/installation_note.js:59
 msgid "From Delivery Note"
 msgstr "Desde nota de entrega"
 
@@ -28924,7 +29371,7 @@
 msgid "From Doctype"
 msgstr ""
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:80
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:78
 msgid "From Due Date"
 msgstr ""
 
@@ -28934,7 +29381,7 @@
 msgid "From Employee"
 msgstr "Desde Empleado"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:45
+#: accounts/report/budget_variance_report/budget_variance_report.js:43
 msgid "From Fiscal Year"
 msgstr "Del año fiscal"
 
@@ -28998,8 +29445,8 @@
 msgid "From Payment Date"
 msgstr ""
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:37
-#: manufacturing/report/work_order_summary/work_order_summary.js:23
+#: manufacturing/report/job_card_summary/job_card_summary.js:36
+#: manufacturing/report/work_order_summary/work_order_summary.js:22
 msgid "From Posting Date"
 msgstr "Desde la fecha de publicación"
 
@@ -29045,6 +29492,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:91
 #: manufacturing/report/job_card_summary/job_card_summary.py:179
+#: templates/pages/timelog_info.html:31
 msgid "From Time"
 msgstr "Desde hora"
 
@@ -29130,7 +29578,7 @@
 msgid "From Voucher Detail No"
 msgstr ""
 
-#: stock/report/reserved_stock/reserved_stock.js:106
+#: stock/report/reserved_stock/reserved_stock.js:103
 #: stock/report/reserved_stock/reserved_stock.py:164
 msgid "From Voucher No"
 msgstr ""
@@ -29141,7 +29589,7 @@
 msgid "From Voucher No"
 msgstr ""
 
-#: stock/report/reserved_stock/reserved_stock.js:95
+#: stock/report/reserved_stock/reserved_stock.js:92
 #: stock/report/reserved_stock/reserved_stock.py:158
 msgid "From Voucher Type"
 msgstr ""
@@ -29192,7 +29640,7 @@
 msgid "From and To dates are required"
 msgstr ""
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:47
+#: manufacturing/doctype/blanket_order/blanket_order.py:48
 msgid "From date cannot be greater than To date"
 msgstr "La fecha 'Desde' no puede ser mayor que la fecha 'Hasta'"
 
@@ -29380,30 +29828,33 @@
 msgid "Furniture and Fixtures"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/account/account_tree.js:138
 msgid "Further accounts can be made under Groups, but entries can be made against non-Groups"
 msgstr "Las futuras cuentas se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 
-#: accounts/doctype/cost_center/cost_center_tree.js:24
+#: accounts/doctype/cost_center/cost_center_tree.js:31
 msgid "Further cost centers can be made under Groups but entries can be made against non-Groups"
 msgstr "Los centros de costos se pueden crear bajo grupos, pero las entradas se crearán dentro de las subcuentas."
 
-#: setup/doctype/sales_person/sales_person_tree.js:10
+#: setup/doctype/sales_person/sales_person_tree.js:15
 msgid "Further nodes can be only created under 'Group' type nodes"
 msgstr "Sólo se pueden crear más nodos bajo nodos de tipo 'Grupo'"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:185
-#: accounts/report/accounts_receivable/accounts_receivable.py:1084
+#: 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
 msgid "Future Payment Amount"
 msgstr "Monto de pago futuro"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:184
-#: accounts/report/accounts_receivable/accounts_receivable.py:1083
+#: accounts/report/accounts_receivable/accounts_receivable.html:154
+#: accounts/report/accounts_receivable/accounts_receivable.py:1091
 msgid "Future Payment Ref"
 msgstr "Ref. De pago futuro"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:120
+#: accounts/report/accounts_receivable/accounts_receivable.html:102
 msgid "Future Payments"
 msgstr "Pagos futuros"
 
@@ -29419,7 +29870,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/gl_entry/gl_entry.json
-#: accounts/report/general_ledger/general_ledger.py:557
+#: accounts/report/general_ledger/general_ledger.py:570
 msgid "GL Entry"
 msgstr "Entrada GL"
 
@@ -29480,11 +29931,11 @@
 
 #: 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:525
+#: setup/doctype/company/company.py:524
 msgid "Gain/Loss on Asset Disposal"
 msgstr "Ganancia/Pérdida por enajenación de activos fijos"
 
-#: projects/doctype/project/project.js:79
+#: projects/doctype/project/project.js:93
 msgid "Gantt Chart"
 msgstr "Diagrama Gantt"
 
@@ -29520,7 +29971,7 @@
 #. Name of a report
 #. Label of a shortcut in the Accounting Workspace
 #. Label of a Link in the Financial Reports Workspace
-#: accounts/doctype/account/account.js:95
+#: accounts/doctype/account/account.js:93
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/report/general_ledger/general_ledger.json
 #: accounts/workspace/accounting/accounting.json
@@ -29541,7 +29992,7 @@
 msgid "General Ledger"
 msgstr "Balance general"
 
-#: stock/doctype/warehouse/warehouse.js:74
+#: stock/doctype/warehouse/warehouse.js:68
 msgctxt "Warehouse"
 msgid "General Ledger"
 msgstr "Balance general"
@@ -29561,7 +30012,7 @@
 msgid "Generate Closing Stock Balance"
 msgstr ""
 
-#: public/js/setup_wizard.js:46
+#: public/js/setup_wizard.js:48
 msgid "Generate Demo Data for Exploration"
 msgstr ""
 
@@ -29587,6 +30038,11 @@
 msgid "Generate Schedule"
 msgstr "Generar planificación"
 
+#. Description of a DocType
+#: stock/doctype/packing_slip/packing_slip.json
+msgid "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight."
+msgstr ""
+
 #. Label of a Check field in DocType 'Bisect Nodes'
 #: accounts/doctype/bisect_nodes/bisect_nodes.json
 msgctxt "Bisect Nodes"
@@ -29633,7 +30089,7 @@
 msgid "Get Current Stock"
 msgstr "Verificar inventario actual"
 
-#: selling/doctype/customer/customer.js:168
+#: selling/doctype/customer/customer.js:180
 msgid "Get Customer Group Details"
 msgstr ""
 
@@ -29649,12 +30105,12 @@
 msgid "Get Finished Goods for Manufacture"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:55
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:157
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:57
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:159
 msgid "Get Invoices"
 msgstr "Obtenga facturas"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:102
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:104
 msgid "Get Invoices based on Filters"
 msgstr "Obtenga facturas basadas en filtros"
 
@@ -29664,11 +30120,11 @@
 msgid "Get Item Locations"
 msgstr "Obtener ubicaciones de artículos"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:351
-#: manufacturing/doctype/production_plan/production_plan.js:342
-#: stock/doctype/pick_list/pick_list.js:161
-#: stock/doctype/pick_list/pick_list.js:202
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: buying/doctype/request_for_quotation/request_for_quotation.js:377
+#: manufacturing/doctype/production_plan/production_plan.js:369
+#: stock/doctype/pick_list/pick_list.js:193
+#: stock/doctype/pick_list/pick_list.js:236
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:163
 msgid "Get Items"
 msgstr "Obtener artículos"
 
@@ -29678,37 +30134,37 @@
 msgid "Get Items"
 msgstr "Obtener artículos"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:147
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:165
-#: accounts/doctype/sales_invoice/sales_invoice.js:252
-#: accounts/doctype/sales_invoice/sales_invoice.js:276
-#: accounts/doctype/sales_invoice/sales_invoice.js:304
-#: buying/doctype/purchase_order/purchase_order.js:456
-#: buying/doctype/purchase_order/purchase_order.js:473
-#: buying/doctype/request_for_quotation/request_for_quotation.js:315
-#: buying/doctype/request_for_quotation/request_for_quotation.js:334
-#: buying/doctype/request_for_quotation/request_for_quotation.js:375
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:195
+#: 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/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
 #: buying/doctype/supplier_quotation/supplier_quotation.js:49
-#: buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:78
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:96
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:112
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:132
-#: public/js/controllers/buying.js:267
-#: selling/doctype/quotation/quotation.js:160
-#: selling/doctype/sales_order/sales_order.js:132
-#: selling/doctype/sales_order/sales_order.js:643
-#: stock/doctype/delivery_note/delivery_note.js:160
-#: stock/doctype/material_request/material_request.js:100
-#: stock/doctype/material_request/material_request.js:162
-#: stock/doctype/purchase_receipt/purchase_receipt.js:130
-#: stock/doctype/purchase_receipt/purchase_receipt.js:217
-#: stock/doctype/stock_entry/stock_entry.js:275
-#: stock/doctype/stock_entry/stock_entry.js:312
-#: stock/doctype/stock_entry/stock_entry.js:336
-#: stock/doctype/stock_entry/stock_entry.js:387
-#: stock/doctype/stock_entry/stock_entry.js:535
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
+#: buying/doctype/supplier_quotation/supplier_quotation.js:82
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:80
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:100
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:119
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:142
+#: public/js/controllers/buying.js:262
+#: selling/doctype/quotation/quotation.js:167
+#: selling/doctype/sales_order/sales_order.js:158
+#: selling/doctype/sales_order/sales_order.js:743
+#: stock/doctype/delivery_note/delivery_note.js:173
+#: stock/doctype/material_request/material_request.js:101
+#: stock/doctype/material_request/material_request.js:192
+#: stock/doctype/purchase_receipt/purchase_receipt.js:145
+#: stock/doctype/purchase_receipt/purchase_receipt.js:249
+#: 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:119
 msgid "Get Items From"
 msgstr "Obtener artículos de"
 
@@ -29724,13 +30180,13 @@
 msgid "Get Items From Purchase Receipts"
 msgstr "Obtener productos desde recibo de compra"
 
-#: stock/doctype/material_request/material_request.js:241
-#: stock/doctype/stock_entry/stock_entry.js:555
-#: stock/doctype/stock_entry/stock_entry.js:568
+#: stock/doctype/material_request/material_request.js:295
+#: stock/doctype/stock_entry/stock_entry.js:643
+#: stock/doctype/stock_entry/stock_entry.js:656
 msgid "Get Items from BOM"
 msgstr "Obtener productos desde lista de materiales (LdM)"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:348
+#: buying/doctype/request_for_quotation/request_for_quotation.js:374
 msgid "Get Items from Material Requests against this Supplier"
 msgstr "Obtener artículos de solicitudes de material contra este proveedor"
 
@@ -29740,7 +30196,7 @@
 msgid "Get Items from Open Material Requests"
 msgstr "Obtener elementos de solicitudes de materiales abiertas"
 
-#: public/js/controllers/buying.js:507
+#: public/js/controllers/buying.js:504
 msgid "Get Items from Product Bundle"
 msgstr "Obtener Productos del Paquete de Productos"
 
@@ -29774,18 +30230,24 @@
 msgid "Get Outstanding Orders"
 msgstr ""
 
+#: accounts/doctype/bank_clearance/bank_clearance.js:38
 #: accounts/doctype/bank_clearance/bank_clearance.js:40
-#: accounts/doctype/bank_clearance/bank_clearance.js:44
-#: accounts/doctype/bank_clearance/bank_clearance.js:56
-#: accounts/doctype/bank_clearance/bank_clearance.js:75
+#: accounts/doctype/bank_clearance/bank_clearance.js:52
+#: accounts/doctype/bank_clearance/bank_clearance.js:71
 msgid "Get Payment Entries"
 msgstr "Obtener registros de pago"
 
-#: accounts/doctype/payment_order/payment_order.js:20
-#: accounts/doctype/payment_order/payment_order.js:24
+#: accounts/doctype/payment_order/payment_order.js:23
+#: accounts/doctype/payment_order/payment_order.js:31
 msgid "Get Payments from"
 msgstr "Obtener pagos de"
 
+#. Label of a Check field in DocType 'Manufacturing Settings'
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+msgctxt "Manufacturing Settings"
+msgid "Get Raw Materials Cost from Consumption Entry"
+msgstr ""
+
 #. Label of a Button field in DocType 'Production Plan'
 #: manufacturing/doctype/production_plan/production_plan.json
 msgctxt "Production Plan"
@@ -29816,7 +30278,7 @@
 msgid "Get Started Sections"
 msgstr "Obtener Secciones Comenzadas"
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:432
 msgid "Get Stock"
 msgstr ""
 
@@ -29826,29 +30288,29 @@
 msgid "Get Sub Assembly Items"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:102
+#: buying/doctype/supplier/supplier.js:124
 msgid "Get Supplier Group Details"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:384
-#: buying/doctype/request_for_quotation/request_for_quotation.js:402
+#: buying/doctype/request_for_quotation/request_for_quotation.js:416
+#: buying/doctype/request_for_quotation/request_for_quotation.js:436
 msgid "Get Suppliers"
 msgstr "Obtener proveedores"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:405
+#: buying/doctype/request_for_quotation/request_for_quotation.js:440
 msgid "Get Suppliers By"
 msgstr "Obtener proveedores por"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:989
+#: accounts/doctype/sales_invoice/sales_invoice.js:1065
 msgid "Get Timesheets"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:81
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:84
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:77
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:80
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:87
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:94
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:75
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:81
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:91
 msgid "Get Unreconciled Entries"
 msgstr "Verificar entradas no conciliadas"
 
@@ -29856,11 +30318,11 @@
 msgid "Get Updates"
 msgstr "Obtener actualizaciones"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:65
+#: stock/doctype/delivery_trip/delivery_trip.js:68
 msgid "Get stops from"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:125
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:149
 msgid "Getting Scrap Items"
 msgstr ""
 
@@ -29877,6 +30339,13 @@
 msgid "Give free item for every N quantity"
 msgstr ""
 
+#. Description of the 'Recurse Every (As Per Transaction UOM)' (Float) field in
+#. DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Give free item for every N quantity"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/global_defaults/global_defaults.json
 msgid "Global Defaults"
@@ -29893,7 +30362,7 @@
 msgid "Go back"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:113
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:97
 msgid "Go to {0} List"
 msgstr "Ir a la lista {0}"
 
@@ -29932,16 +30401,16 @@
 msgid "Goods"
 msgstr ""
 
-#: setup/doctype/company/company.py:263
-#: stock/doctype/stock_entry/stock_entry_list.js:14
+#: setup/doctype/company/company.py:262
+#: stock/doctype/stock_entry/stock_entry_list.js:21
 msgid "Goods In Transit"
 msgstr "Las mercancías en tránsito"
 
-#: stock/doctype/stock_entry/stock_entry_list.js:17
+#: stock/doctype/stock_entry/stock_entry_list.js:23
 msgid "Goods Transferred"
 msgstr "Bienes transferidos"
 
-#: stock/doctype/stock_entry/stock_entry.py:1618
+#: stock/doctype/stock_entry/stock_entry.py:1627
 msgid "Goods are already received against the outward entry {0}"
 msgstr "Las mercancías ya se reciben contra la entrada exterior {0}"
 
@@ -29965,7 +30434,12 @@
 #: accounts/report/pos_register/pos_register.py:207
 #: 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:253
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:251
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:154
+#: selling/page/point_of_sale/pos_payment.js:590
 #: templates/includes/order/order_taxes.html:105 templates/pages/rfq.html:58
 msgid "Grand Total"
 msgstr "Total"
@@ -30187,7 +30661,7 @@
 msgid "Grant Commission"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:654
+#: accounts/doctype/payment_entry/payment_entry.js:802
 msgid "Greater Than Amount"
 msgstr "Mayor que la cantidad"
 
@@ -30296,11 +30770,11 @@
 msgid "Gross Purchase Amount"
 msgstr "Importe Bruto de Compra"
 
-#: assets/doctype/asset/asset.py:317
+#: assets/doctype/asset/asset.py:319
 msgid "Gross Purchase Amount is mandatory"
 msgstr "Importe Bruto de Compra es obligatorio"
 
-#: assets/doctype/asset/asset.py:362
+#: assets/doctype/asset/asset.py:364
 msgid "Gross Purchase Amount should be <b>equal</b> to purchase amount of one single Asset."
 msgstr ""
 
@@ -30329,11 +30803,11 @@
 #: accounts/report/gross_profit/gross_profit.js:36
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:52
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:58
-#: assets/report/fixed_asset_register/fixed_asset_register.js:36
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
+#: assets/report/fixed_asset_register/fixed_asset_register.js:35
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:41
 #: public/js/purchase_trends_filters.js:61 public/js/sales_trends_filters.js:37
 #: selling/report/lost_quotations/lost_quotations.js:33
-#: stock/report/total_stock_summary/total_stock_summary.js:9
+#: stock/report/total_stock_summary/total_stock_summary.js:8
 msgid "Group By"
 msgstr "Agrupar por"
 
@@ -30343,15 +30817,15 @@
 msgid "Group By"
 msgstr "Agrupar por"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:151
+#: accounts/report/accounts_receivable/accounts_receivable.js:154
 msgid "Group By Customer"
 msgstr "Agrupar por cliente"
 
-#: accounts/report/accounts_payable/accounts_payable.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:132
 msgid "Group By Supplier"
 msgstr "Agrupar por proveedor"
 
-#: setup/doctype/sales_person/sales_person_tree.js:9
+#: setup/doctype/sales_person/sales_person_tree.js:14
 msgid "Group Node"
 msgstr "Agrupar por nota"
 
@@ -30361,12 +30835,12 @@
 msgid "Group Same Items"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:112
+#: stock/doctype/stock_settings/stock_settings.py:115
 msgid "Group Warehouses cannot be used in transactions. Please change the value of {0}"
 msgstr "Los Almacenes de grupo no se pueden usar en transacciones. Cambie el valor de {0}"
 
 #: accounts/report/general_ledger/general_ledger.js:115
-#: accounts/report/pos_register/pos_register.js:57
+#: accounts/report/pos_register/pos_register.js:56
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:78
 msgid "Group by"
 msgstr "Agrupar por"
@@ -30375,34 +30849,34 @@
 msgid "Group by Account"
 msgstr "Agrupar por cuenta"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:82
 msgid "Group by Item"
 msgstr "Agrupar por artículo"
 
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:62
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:61
 msgid "Group by Material Request"
 msgstr "Agrupar por solicitud de material"
 
 #: accounts/report/general_ledger/general_ledger.js:132
-#: accounts/report/payment_ledger/payment_ledger.js:83
+#: accounts/report/payment_ledger/payment_ledger.js:82
 msgid "Group by Party"
 msgstr "Agrupar por Tercero"
 
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:71
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:70
 msgid "Group by Purchase Order"
 msgstr "Agrupar por orden de compra"
 
-#: selling/report/sales_order_analysis/sales_order_analysis.js:73
+#: selling/report/sales_order_analysis/sales_order_analysis.js:72
 msgid "Group by Sales Order"
 msgstr "Agrupar por orden de venta"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:81
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:84
 msgid "Group by Supplier"
 msgstr "Agrupar por proveedor"
 
-#: accounts/report/accounts_payable/accounts_payable.js:159
-#: accounts/report/accounts_receivable/accounts_receivable.js:191
+#: accounts/report/accounts_payable/accounts_payable.js:162
+#: accounts/report/accounts_receivable/accounts_receivable.js:194
 #: accounts/report/general_ledger/general_ledger.js:120
 msgid "Group by Voucher"
 msgstr "Agrupar por Comprobante"
@@ -30425,7 +30899,7 @@
 msgid "Group by Voucher (Consolidated)"
 msgstr "Agrupar por Comprobante (Consolidado)"
 
-#: stock/utils.py:448
+#: stock/utils.py:443
 msgid "Group node warehouse is not allowed to select for transactions"
 msgstr "No se permite seleccionar el almacén de nodos de grupo para operaciones"
 
@@ -30487,8 +30961,8 @@
 msgid "Groups"
 msgstr "Grupos"
 
-#: accounts/report/balance_sheet/balance_sheet.js:18
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:18
+#: accounts/report/balance_sheet/balance_sheet.js:14
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
 msgid "Growth View"
 msgstr ""
 
@@ -30534,14 +31008,14 @@
 msgid "Half Yearly"
 msgstr "Semestral"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:66
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:69
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
-#: public/js/financial_statements.js:219
+#: accounts/report/budget_variance_report/budget_variance_report.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
+#: public/js/financial_statements.js:228
 #: public/js/purchase_trends_filters.js:21 public/js/sales_trends_filters.js:13
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
 msgid "Half-Yearly"
 msgstr "Semestral"
 
@@ -30700,6 +31174,11 @@
 msgid "Have Default Naming Series for Batch ID?"
 msgstr ""
 
+#. Description of a DocType
+#: accounts/doctype/account/account.json
+msgid "Heads (or groups) against which Accounting Entries are made and balances are maintained."
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -30724,7 +31203,7 @@
 msgid "Height (cm)"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:412
+#: assets/doctype/asset/depreciation.py:410
 msgid "Hello,"
 msgstr ""
 
@@ -30758,11 +31237,16 @@
 msgid "Help Text"
 msgstr "Texto de Ayuda"
 
-#: assets/doctype/asset/depreciation.py:419
+#. Description of a DocType
+#: accounts/doctype/monthly_distribution/monthly_distribution.json
+msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
+msgstr ""
+
+#: assets/doctype/asset/depreciation.py:417
 msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
 msgstr ""
 
-#: stock/stock_ledger.py:1669
+#: stock/stock_ledger.py:1689
 msgid "Here are the options to proceed:"
 msgstr ""
 
@@ -30779,15 +31263,15 @@
 msgid "Here you can maintain height, weight, allergies, medical concerns etc"
 msgstr "Aquí usted puede ingresar la altura, el peso, alergias, problemas médicos, etc."
 
-#: setup/doctype/employee/employee.js:122
+#: setup/doctype/employee/employee.js:129
 msgid "Here, you can select a senior of this Employee. Based on this, Organization Chart will be populated."
 msgstr ""
 
-#: setup/doctype/holiday_list/holiday_list.js:75
+#: setup/doctype/holiday_list/holiday_list.js:77
 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:391
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:406
 msgid "Hi,"
 msgstr "Hola,"
 
@@ -30849,12 +31333,12 @@
 msgid "History In Company"
 msgstr "Historia en la Compañia"
 
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: selling/doctype/sales_order/sales_order.js:539
+#: buying/doctype/purchase_order/purchase_order.js:315
+#: selling/doctype/sales_order/sales_order.js:582
 msgid "Hold"
 msgstr "Mantener"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
 msgid "Hold Invoice"
 msgstr "Retener Factura"
 
@@ -30960,6 +31444,13 @@
 msgstr "Cada Hora"
 
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:31
+#: templates/pages/timelog_info.html:37
+msgid "Hours"
+msgstr "Horas"
+
+#. Label of a Float field in DocType 'Workstation Working Hour'
+#: manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
+msgctxt "Workstation Working Hour"
 msgid "Hours"
 msgstr "Horas"
 
@@ -30998,7 +31489,7 @@
 msgid "Hrs"
 msgstr "Hrs"
 
-#: setup/doctype/company/company.py:365
+#: setup/doctype/company/company.py:364
 msgid "Human Resources"
 msgstr "Recursos Humanos"
 
@@ -31036,8 +31527,8 @@
 msgid "IBAN"
 msgstr "IBAN"
 
-#: accounts/doctype/bank_account/bank_account.py:84
-#: accounts/doctype/bank_account/bank_account.py:87
+#: accounts/doctype/bank_account/bank_account.py:98
+#: accounts/doctype/bank_account/bank_account.py:101
 msgid "IBAN is not valid"
 msgstr "IBAN no es válido"
 
@@ -31112,6 +31603,12 @@
 msgid "Identifying Decision Makers"
 msgstr "Identificando a los Tomadores de Decisiones"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Idle"
+msgstr ""
+
 #. Description of the 'Book Deferred Entries Based On' (Select) field in
 #. DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31119,6 +31616,10 @@
 msgid "If \"Months\" is selected, a fixed amount will be booked as deferred revenue or expense for each month irrespective of the number of days in a month. It will be prorated if deferred revenue or expense is not booked for an entire month"
 msgstr "Si se selecciona &quot;Meses&quot;, se registrará una cantidad fija como ingreso o gasto diferido para cada mes, independientemente de la cantidad de días en un mes. Se prorrateará si los ingresos o gastos diferidos no se registran durante un mes completo."
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)"
+msgstr ""
+
 #. Description of the 'Cost Center' (Link) field in DocType 'Journal Entry
 #. Account'
 #: accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -31126,7 +31627,7 @@
 msgid "If Income or Expense"
 msgstr "Indique si es un ingreso o egreso"
 
-#: manufacturing/doctype/operation/operation.js:30
+#: manufacturing/doctype/operation/operation.js:32
 msgid "If an operation is divided into sub operations, they can be added here."
 msgstr ""
 
@@ -31183,7 +31684,7 @@
 msgid "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 msgstr "Si se selecciona, el valor del impuesto se considerará como ya incluido en el importe"
 
-#: public/js/setup_wizard.js:48
+#: public/js/setup_wizard.js:50
 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later."
 msgstr ""
 
@@ -31229,6 +31730,14 @@
 msgid "If enabled, all files attached to this document will be attached to each email"
 msgstr ""
 
+#. Description of the 'Do Not Update Serial / Batch on Creation of Auto Bundle'
+#. (Check) field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "If enabled, do not update serial / batch values in the stock transactions on creation of auto Serial \n"
+" / Batch Bundle. "
+msgstr ""
+
 #. Description of the 'Create Ledger Entries for Change Amount' (Check) field
 #. in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31269,7 +31778,7 @@
 msgid "If more than one package of the same type (for print)"
 msgstr "Si es más de un paquete del mismo tipo (para impresión)"
 
-#: stock/stock_ledger.py:1679
+#: stock/stock_ledger.py:1699
 msgid "If not, you can Cancel / Submit this entry"
 msgstr ""
 
@@ -31287,7 +31796,7 @@
 msgid "If subcontracted to a vendor"
 msgstr "Si es sub-contratado a un proveedor"
 
-#: manufacturing/doctype/work_order/work_order.js:842
+#: manufacturing/doctype/work_order/work_order.js:911
 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."
 msgstr ""
 
@@ -31297,11 +31806,11 @@
 msgid "If the account is frozen, entries are allowed to restricted users."
 msgstr "Si la cuenta está congelado, las entradas estarán permitidas a los usuarios restringidos."
 
-#: stock/stock_ledger.py:1672
+#: stock/stock_ledger.py:1692
 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 "Si el artículo está realizando transacciones como un artículo de tasa de valoración cero en esta entrada, habilite &quot;Permitir tasa de valoración cero&quot; en la {0} tabla de artículos."
 
-#: manufacturing/doctype/work_order/work_order.js:857
+#: manufacturing/doctype/work_order/work_order.js:930
 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
 msgstr ""
 
@@ -31347,7 +31856,7 @@
 msgid "If this is unchecked, direct GL entries will be created to book deferred revenue or expense"
 msgstr "Si no se marca esta opción, se crearán entradas directas de libro mayor para registrar los ingresos o gastos diferidos"
 
-#: accounts/doctype/payment_entry/payment_entry.py:638
+#: accounts/doctype/payment_entry/payment_entry.py:647
 msgid "If this is undesirable please cancel the corresponding Payment Entry."
 msgstr ""
 
@@ -31357,23 +31866,34 @@
 msgid "If this item has variants, then it cannot be selected in sales orders etc."
 msgstr "Si este producto tiene variantes, entonces no podrá ser seleccionado en los pedidos de venta, etc."
 
-#: buying/doctype/buying_settings/buying_settings.js:24
+#: buying/doctype/buying_settings/buying_settings.js:27
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master."
 msgstr "Si esta opción está configurada como &#39;Sí&#39;, ERPNext le impedirá crear una Factura o Recibo de Compra sin crear primero una Orden de Compra. Esta configuración se puede anular para un proveedor en particular activando la casilla de verificación &#39;Permitir la creación de facturas de compra sin orden de compra&#39; en el maestro de proveedores."
 
-#: buying/doctype/buying_settings/buying_settings.js:29
+#: buying/doctype/buying_settings/buying_settings.js:34
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master."
 msgstr "Si esta opción está configurada como &#39;Sí&#39;, ERPNext le impedirá crear una Factura de Compra sin crear primero un Recibo de Compra. Esta configuración se puede anular para un proveedor en particular activando la casilla de verificación &quot;Permitir la creación de facturas de compra sin recibo de compra&quot; en el maestro de proveedores."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:11
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
 msgid "If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured."
 msgstr "Si está marcado, se pueden usar varios materiales para una sola orden de trabajo. Esto es útil si se fabrican uno o más productos que requieren mucho tiempo."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:36
 msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
 msgstr "Si se marca, el costo de la lista de materiales se actualizará automáticamente en función de la tasa de valoración / tasa de lista de precios / última tasa de compra de materias primas."
 
-#: stock/doctype/item/item.js:814
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
+msgstr ""
+
+#. Description of the 'Is Rejected Warehouse' (Check) field in DocType
+#. 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "If yes, then this warehouse will be used to store rejected materials"
+msgstr ""
+
+#: stock/doctype/item/item.js:894
 msgid "If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item."
 msgstr ""
 
@@ -31384,7 +31904,11 @@
 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:1605
+#: manufacturing/doctype/production_plan/production_plan.py:920
+msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.py:1625
 msgid "If you still want to proceed, please enable {0}."
 msgstr ""
 
@@ -31451,17 +31975,21 @@
 msgid "Ignore Empty Stock"
 msgstr "Ignorar Stock Vacío"
 
+#: accounts/report/general_ledger/general_ledger.js:209
+msgid "Ignore Exchange Rate Revaluation Journals"
+msgstr "Ignorar los Diarios de Revaluación del Tipo de Cambio"
+
 #. Label of a Check field in DocType 'Process Statement Of Accounts'
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 msgctxt "Process Statement Of Accounts"
 msgid "Ignore Exchange Rate Revaluation Journals"
 msgstr "Ignorar los Diarios de Revaluación del Tipo de Cambio"
 
-#: selling/doctype/sales_order/sales_order.js:800
+#: selling/doctype/sales_order/sales_order.js:916
 msgid "Ignore Existing Ordered Qty"
 msgstr "Ignorar la existencia ordenada Qty"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1597
+#: manufacturing/doctype/production_plan/production_plan.py:1617
 msgid "Ignore Existing Projected Quantity"
 msgstr "Ignorar la cantidad proyectada existente"
 
@@ -31525,7 +32053,7 @@
 msgid "Ignore Pricing Rule"
 msgstr "Ignorar la Regla Precios"
 
-#: selling/page/point_of_sale/pos_payment.js:187
+#: selling/page/point_of_sale/pos_payment.js:188
 msgid "Ignore Pricing Rule is enabled. Cannot apply coupon code."
 msgstr ""
 
@@ -31848,10 +32376,15 @@
 msgid "Image View"
 msgstr "Vista de Imagen"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:118
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:132
 msgid "Import"
 msgstr "Importar / Exportar"
 
+#. Description of a DocType
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json
+msgid "Import Chart of Accounts from a csv file"
+msgstr ""
+
 #. Label of a Link in the Home Workspace
 #. Label of a Link in the Settings Workspace
 #: setup/workspace/home/home.json setup/workspace/settings/settings.json
@@ -31864,7 +32397,7 @@
 msgid "Import Data from Spreadsheet"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:66
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:71
 msgid "Import Day Book Data"
 msgstr "Importar datos del libro diario"
 
@@ -31904,7 +32437,7 @@
 msgid "Import Log Preview"
 msgstr "Vista previa de registro de importación"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:54
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:59
 msgid "Import Master Data"
 msgstr "Importar datos maestros"
 
@@ -31914,11 +32447,11 @@
 msgid "Import Preview"
 msgstr "Vista previa de importación"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:61
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
 msgid "Import Progress"
 msgstr "Progreso de importación"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:130
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:144
 msgid "Import Successful"
 msgstr "Importación Exitosa"
 
@@ -31939,8 +32472,8 @@
 msgid "Import Type"
 msgstr "Tipo de importación"
 
-#: public/js/utils/serial_no_batch_selector.js:197
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:77
+#: public/js/utils/serial_no_batch_selector.js:200
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:80
 msgid "Import Using CSV file"
 msgstr ""
 
@@ -31956,7 +32489,7 @@
 msgid "Import from Google Sheets"
 msgstr "Importar desde Google Sheets"
 
-#: stock/doctype/item_price/item_price.js:27
+#: stock/doctype/item_price/item_price.js:29
 msgid "Import in Bulk"
 msgstr "Importar en Masa"
 
@@ -31968,7 +32501,7 @@
 msgid "Importing Parties and Addresses"
 msgstr "Importando Partes y Direcciones"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:47
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:45
 msgid "Importing {0} of {1}, {2}"
 msgstr "Importar {0} de {1}, {2}"
 
@@ -31979,7 +32512,7 @@
 msgid "In House"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:20
+#: assets/doctype/asset/asset_list.js:15
 msgid "In Maintenance"
 msgstr "En mantenimiento"
 
@@ -32007,8 +32540,8 @@
 msgid "In Minutes"
 msgstr "En Minutos"
 
-#: accounts/report/accounts_payable/accounts_payable.js:149
-#: accounts/report/accounts_receivable/accounts_receivable.js:181
+#: accounts/report/accounts_payable/accounts_payable.js:152
+#: accounts/report/accounts_receivable/accounts_receivable.js:184
 msgid "In Party Currency"
 msgstr ""
 
@@ -32055,10 +32588,10 @@
 msgid "In Production"
 msgstr "En producción"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:65
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:52
 #: accounts/doctype/ledger_merge/ledger_merge.js:19
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:36
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:60
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:40
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:66
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:7
 msgid "In Progress"
 msgstr "En Progreso"
@@ -32119,11 +32652,17 @@
 msgstr "En Progreso"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:80
-#: stock/report/stock_balance/stock_balance.py:433
-#: stock/report/stock_ledger/stock_ledger.py:139
+#: stock/report/stock_balance/stock_balance.py:441
+#: stock/report/stock_ledger/stock_ledger.py:212
 msgid "In Qty"
 msgstr "En Cant."
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "In Stock"
+msgstr ""
+
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:12
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:22
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:30
 msgid "In Stock Qty"
 msgstr "En Cantidad de Stock"
@@ -32145,15 +32684,15 @@
 msgid "In Transit"
 msgstr "En Transito"
 
-#: stock/doctype/material_request/material_request.js:375
+#: stock/doctype/material_request/material_request.js:445
 msgid "In Transit Transfer"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:344
+#: stock/doctype/material_request/material_request.js:414
 msgid "In Transit Warehouse"
 msgstr "Almacén en Tránsito"
 
-#: stock/report/stock_balance/stock_balance.py:439
+#: stock/report/stock_balance/stock_balance.py:447
 msgid "In Value"
 msgstr "En valor"
 
@@ -32338,7 +32877,7 @@
 msgid "In minutes"
 msgstr "En minutos"
 
-#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:7
+#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:8
 msgid "In row {0} of Appointment Booking Slots: \"To Time\" must be later than \"From Time\"."
 msgstr ""
 
@@ -32353,7 +32892,11 @@
 msgid "In the case of 'Use Multi-Level BOM' in a work order, if the user wishes to add sub-assembly costs to Finished Goods items without using a job card as well the scrap items, then this option needs to be enable."
 msgstr ""
 
-#: stock/doctype/item/item.js:839
+#: accounts/doctype/loyalty_program/loyalty_program.js:12
+msgid "In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent"
+msgstr ""
+
+#: stock/doctype/item/item.js:927
 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc."
 msgstr ""
 
@@ -32389,6 +32932,12 @@
 msgid "Inactive Sales Items"
 msgstr "Artículos de venta inactivos"
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Inactive Status"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:93
 msgid "Incentives"
 msgstr "Incentivos"
@@ -32399,7 +32948,7 @@
 msgid "Incentives"
 msgstr "Incentivos"
 
-#: accounts/report/payment_ledger/payment_ledger.js:77
+#: accounts/report/payment_ledger/payment_ledger.js:76
 msgid "Include Account Currency"
 msgstr ""
 
@@ -32410,27 +32959,27 @@
 msgstr "Incluir resumen de envejecimiento"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:54
-#: assets/report/fixed_asset_register/fixed_asset_register.js:55
+#: assets/report/fixed_asset_register/fixed_asset_register.js:54
 msgid "Include Default FB Assets"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:34
-#: accounts/report/cash_flow/cash_flow.js:20
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:107
+#: accounts/report/balance_sheet/balance_sheet.js:29
+#: 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/trial_balance/trial_balance.js:98
+#: accounts/report/trial_balance/trial_balance.js:104
 msgid "Include Default FB Entries"
 msgstr "Incluir entradas de libro predeterminadas"
 
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:60
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:55
 msgid "Include Disabled"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:85
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:88
 msgid "Include Expired"
 msgstr "Incluir caducado"
 
-#: selling/doctype/sales_order/sales_order.js:798
+#: selling/doctype/sales_order/sales_order.js:912
 msgid "Include Exploded Items"
 msgstr "Incluir Elementos Estallados"
 
@@ -32500,7 +33049,7 @@
 msgid "Include Non Stock Items"
 msgstr "Incluir Elementos no Disponibles"
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:44
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:45
 msgid "Include POS Transactions"
 msgstr "Incluir transacciones POS"
 
@@ -32534,7 +33083,7 @@
 msgid "Include Safety Stock in Required Qty Calculation"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:88
+#: manufacturing/report/production_planning_report/production_planning_report.js:87
 msgid "Include Sub-assembly Raw Materials"
 msgstr "Incluir materias primas de subensamblaje"
 
@@ -32544,12 +33093,12 @@
 msgid "Include Subcontracted Items"
 msgstr "Incluir Artículos Subcontratados"
 
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:57
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
 msgid "Include Timesheets in Draft Status"
 msgstr ""
 
 #: stock/report/stock_balance/stock_balance.js:84
-#: stock/report/stock_ledger/stock_ledger.js:82
+#: stock/report/stock_ledger/stock_ledger.js:90
 #: stock/report/stock_projected_qty/stock_projected_qty.js:51
 msgid "Include UOM"
 msgstr "Incluir UOM"
@@ -32580,10 +33129,10 @@
 
 #: 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:28
+#: accounts/report/account_balance/account_balance.js:27
 #: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:172
 #: accounts/report/profitability_analysis/profitability_analysis.py:182
-#: public/js/financial_statements.js:35
+#: public/js/financial_statements.js:36
 msgid "Income"
 msgstr "Ingresos"
 
@@ -32606,7 +33155,7 @@
 msgid "Income"
 msgstr "Ingresos"
 
-#: accounts/report/account_balance/account_balance.js:51
+#: 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
 msgid "Income Account"
@@ -32679,7 +33228,7 @@
 msgstr ""
 
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:163
-#: stock/report/stock_ledger/stock_ledger.py:189
+#: 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
 msgid "Incoming Rate"
@@ -32703,12 +33252,6 @@
 msgid "Incoming Rate"
 msgstr "Tasa Entrante"
 
-#. Label of a Float field in DocType 'Serial and Batch Entry'
-#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
-msgctxt "Serial and Batch Entry"
-msgid "Incoming Rate"
-msgstr "Tasa Entrante"
-
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
@@ -32730,16 +33273,16 @@
 msgid "Incorrect Balance Qty After Transaction"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:710
+#: controllers/subcontracting_controller.py:714
 msgid "Incorrect Batch Consumed"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:278
+#: assets/doctype/asset/asset.py:280
 #: assets/doctype/asset_value_adjustment/asset_value_adjustment.py:74
 msgid "Incorrect Date"
 msgstr "Fecha incorrecta"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:99
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:120
 msgid "Incorrect Invoice"
 msgstr ""
 
@@ -32752,12 +33295,16 @@
 msgid "Incorrect Payment Type"
 msgstr ""
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+msgid "Incorrect Reference Document (Purchase Receipt Item)"
+msgstr ""
+
 #. Name of a report
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.json
 msgid "Incorrect Serial No Valuation"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:723
+#: controllers/subcontracting_controller.py:727
 msgid "Incorrect Serial Number Consumed"
 msgstr ""
 
@@ -32766,15 +33313,15 @@
 msgid "Incorrect Stock Value Report"
 msgstr ""
 
-#: stock/serial_batch_bundle.py:95
+#: stock/serial_batch_bundle.py:96
 msgid "Incorrect Type of Transaction"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:115
+#: stock/doctype/stock_settings/stock_settings.py:118
 msgid "Incorrect Warehouse"
 msgstr "Almacén incorrecto"
 
-#: accounts/general_ledger.py:47
+#: accounts/general_ledger.py:51
 msgid "Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction."
 msgstr "Se encontró un número incorrecto de entradas del libro mayor. Es posible que haya seleccionado una cuenta equivocada en la transacción."
 
@@ -32925,11 +33472,11 @@
 msgid "Individual"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:336
+#: accounts/doctype/gl_entry/gl_entry.py:290
 msgid "Individual GL Entry cannot be cancelled."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:326
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:337
 msgid "Individual Stock Ledger Entry cannot be cancelled."
 msgstr ""
 
@@ -32974,7 +33521,13 @@
 msgid "Initial Email Notification Sent"
 msgstr "Notificación Inicial de Correo Electrónico Enviada"
 
-#: accounts/doctype/payment_request/payment_request_list.js:11
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Initialize Summary Table"
+msgstr ""
+
+#: accounts/doctype/payment_request/payment_request_list.js:10
 msgid "Initiated"
 msgstr "Iniciado"
 
@@ -33005,7 +33558,7 @@
 msgid "Insert New Records"
 msgstr "Insertar nuevos registros"
 
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:34
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:33
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:109
 msgid "Inspected By"
 msgstr "Inspeccionado por"
@@ -33016,11 +33569,11 @@
 msgid "Inspected By"
 msgstr "Inspeccionado por"
 
-#: controllers/stock_controller.py:666
+#: controllers/stock_controller.py:849
 msgid "Inspection Rejected"
 msgstr "Inspección Rechazada"
 
-#: controllers/stock_controller.py:636 controllers/stock_controller.py:638
+#: controllers/stock_controller.py:819 controllers/stock_controller.py:821
 msgid "Inspection Required"
 msgstr "Inspección Requerida"
 
@@ -33042,7 +33595,7 @@
 msgid "Inspection Required before Purchase"
 msgstr "Inspección Requerida antes de Compra"
 
-#: controllers/stock_controller.py:653
+#: controllers/stock_controller.py:836
 msgid "Inspection Submission"
 msgstr ""
 
@@ -33064,7 +33617,7 @@
 
 #. Name of a DocType
 #: selling/doctype/installation_note/installation_note.json
-#: stock/doctype/delivery_note/delivery_note.js:171
+#: stock/doctype/delivery_note/delivery_note.js:191
 msgid "Installation Note"
 msgstr "Nota de Instalación"
 
@@ -33081,7 +33634,7 @@
 msgid "Installation Note Item"
 msgstr "Nota de instalación de elementos"
 
-#: stock/doctype/delivery_note/delivery_note.py:688
+#: stock/doctype/delivery_note/delivery_note.py:749
 msgid "Installation Note {0} has already been submitted"
 msgstr "La nota de instalación {0} ya se ha validado"
 
@@ -33146,19 +33699,19 @@
 msgid "Insufficient Capacity"
 msgstr "Capacidad Insuficiente"
 
-#: controllers/accounts_controller.py:3130
-#: controllers/accounts_controller.py:3154
+#: controllers/accounts_controller.py:3221
+#: controllers/accounts_controller.py:3245
 msgid "Insufficient Permissions"
 msgstr "Permisos Insuficientes"
 
-#: stock/doctype/pick_list/pick_list.py:705
-#: stock/doctype/stock_entry/stock_entry.py:776
-#: stock/serial_batch_bundle.py:880 stock/stock_ledger.py:1369
-#: stock/stock_ledger.py:1840
+#: stock/doctype/pick_list/pick_list.py:776
+#: stock/doctype/stock_entry/stock_entry.py:731
+#: stock/serial_batch_bundle.py:899 stock/stock_ledger.py:1395
+#: stock/stock_ledger.py:1847
 msgid "Insufficient Stock"
 msgstr "Insuficiente Stock"
 
-#: stock/stock_ledger.py:1855
+#: stock/stock_ledger.py:1862
 msgid "Insufficient Stock for Batch"
 msgstr ""
 
@@ -33299,11 +33852,11 @@
 msgid "Interest"
 msgstr "Interesar"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2339
+#: accounts/doctype/payment_entry/payment_entry.py:2364
 msgid "Interest and/or dunning fee"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:40
+#: crm/report/lead_details/lead_details.js:39
 msgid "Interested"
 msgstr "Interesado"
 
@@ -33315,7 +33868,7 @@
 
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:29
 msgid "Internal"
-msgstr ""
+msgstr "Interno"
 
 #. Label of a Section Break field in DocType 'Customer'
 #: selling/doctype/customer/customer.json
@@ -33327,11 +33880,11 @@
 msgid "Internal Customer for company {0} already exists"
 msgstr ""
 
-#: controllers/accounts_controller.py:533
+#: controllers/accounts_controller.py:577
 msgid "Internal Sale or Delivery Reference missing."
 msgstr ""
 
-#: controllers/accounts_controller.py:535
+#: controllers/accounts_controller.py:579
 msgid "Internal Sales Reference Missing"
 msgstr ""
 
@@ -33380,7 +33933,7 @@
 msgid "Internal Transfer"
 msgstr "Transferencia Interna"
 
-#: controllers/accounts_controller.py:544
+#: controllers/accounts_controller.py:588
 msgid "Internal Transfer Reference Missing"
 msgstr ""
 
@@ -33394,7 +33947,7 @@
 msgid "Internal Work History"
 msgstr "Historial de trabajo interno"
 
-#: controllers/stock_controller.py:735
+#: controllers/stock_controller.py:918
 msgid "Internal transfers can only be done in company's default currency"
 msgstr ""
 
@@ -33429,14 +33982,14 @@
 msgid "Invalid"
 msgstr "Inválido"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:377
-#: accounts/doctype/sales_invoice/sales_invoice.py:876
-#: accounts/doctype/sales_invoice/sales_invoice.py:886
+#: 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:2531
-#: controllers/accounts_controller.py:2537
+#: controllers/accounts_controller.py:2616
+#: controllers/accounts_controller.py:2622
 msgid "Invalid Account"
 msgstr "Cuenta no válida"
 
@@ -33444,7 +33997,7 @@
 msgid "Invalid Attribute"
 msgstr "Atributo Inválido"
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 msgid "Invalid Auto Repeat Date"
 msgstr ""
 
@@ -33452,7 +34005,7 @@
 msgid "Invalid Barcode. There is no Item attached to this barcode."
 msgstr "Código de barras inválido. No hay ningún elemento adjunto a este código de barras."
 
-#: public/js/controllers/transaction.js:2360
+#: public/js/controllers/transaction.js:2413
 msgid "Invalid Blanket Order for the selected Customer and Item"
 msgstr "Pedido de manta inválido para el cliente y el artículo seleccionado"
 
@@ -33460,12 +34013,12 @@
 msgid "Invalid Child Procedure"
 msgstr "Procedimiento de niño no válido"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1977
+#: accounts/doctype/sales_invoice/sales_invoice.py:1946
 msgid "Invalid Company for Inter Company Transaction."
 msgstr "Empresa inválida para transacciones entre empresas."
 
-#: assets/doctype/asset/asset.py:249 assets/doctype/asset/asset.py:256
-#: controllers/accounts_controller.py:2552
+#: assets/doctype/asset/asset.py:251 assets/doctype/asset/asset.py:258
+#: controllers/accounts_controller.py:2637
 msgid "Invalid Cost Center"
 msgstr ""
 
@@ -33473,11 +34026,11 @@
 msgid "Invalid Credentials"
 msgstr "Credenciales no válidas"
 
-#: selling/doctype/sales_order/sales_order.py:318
+#: selling/doctype/sales_order/sales_order.py:321
 msgid "Invalid Delivery Date"
 msgstr "Fecha de Entrega Inválida"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:88
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
 msgid "Invalid Document"
 msgstr ""
 
@@ -33490,7 +34043,7 @@
 msgid "Invalid Formula"
 msgstr "Fórmula Inválida"
 
-#: assets/doctype/asset/asset.py:367
+#: assets/doctype/asset/asset.py:369
 msgid "Invalid Gross Purchase Amount"
 msgstr "Importe de compra bruta no válido"
 
@@ -33502,12 +34055,12 @@
 msgid "Invalid Item"
 msgstr "Artículo Inválido"
 
-#: stock/doctype/item/item.py:1371
+#: stock/doctype/item/item.py:1372
 msgid "Invalid Item Defaults"
 msgstr ""
 
 #: accounts/doctype/pos_closing_entry/pos_closing_entry.py:59
-#: accounts/general_ledger.py:677
+#: accounts/general_ledger.py:686
 msgid "Invalid Opening Entry"
 msgstr "Entrada de apertura no válida"
 
@@ -33515,11 +34068,11 @@
 msgid "Invalid POS Invoices"
 msgstr "Facturas POS no válidas"
 
-#: accounts/doctype/account/account.py:320
+#: accounts/doctype/account/account.py:339
 msgid "Invalid Parent Account"
 msgstr "Cuenta principal no válida"
 
-#: public/js/controllers/buying.js:338
+#: public/js/controllers/buying.js:333
 msgid "Invalid Part Number"
 msgstr "Número de pieza no válido"
 
@@ -33539,24 +34092,24 @@
 msgid "Invalid Process Loss Configuration"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:599
+#: accounts/doctype/payment_entry/payment_entry.py:608
 msgid "Invalid Purchase Invoice"
-msgstr ""
+msgstr "Factura de Compra no válida"
 
-#: controllers/accounts_controller.py:3169
+#: controllers/accounts_controller.py:3260
 msgid "Invalid Qty"
-msgstr ""
+msgstr "Cant. inválida"
 
-#: controllers/accounts_controller.py:1021
+#: controllers/accounts_controller.py:1085
 msgid "Invalid Quantity"
 msgstr "Cantidad inválida"
 
-#: assets/doctype/asset/asset.py:411 assets/doctype/asset/asset.py:417
-#: assets/doctype/asset/asset.py:444
+#: assets/doctype/asset/asset.py:413 assets/doctype/asset/asset.py:419
+#: assets/doctype/asset/asset.py:446
 msgid "Invalid Schedule"
 msgstr "Programación no válida"
 
-#: controllers/selling_controller.py:225
+#: controllers/selling_controller.py:226
 msgid "Invalid Selling Price"
 msgstr "Precio de venta no válido"
 
@@ -33589,22 +34142,21 @@
 msgid "Invalid reference {0} {1}"
 msgstr "Referencia inválida {0} {1}"
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:101
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:102
 msgid "Invalid result key. Response:"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:229
-#: accounts/doctype/gl_entry/gl_entry.py:239
 #: 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
 msgid "Invalid value {0} for {1} against account {2}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:569
+#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:642
 msgid "Invalid {0}"
 msgstr "Inválido {0}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1975
+#: accounts/doctype/sales_invoice/sales_invoice.py:1944
 msgid "Invalid {0} for Inter Company Transaction."
 msgstr "No válido {0} para la transacción entre empresas."
 
@@ -33624,7 +34176,7 @@
 msgid "Inventory Dimension"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:147
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:157
 msgid "Inventory Dimension Negative Stock"
 msgstr ""
 
@@ -33682,7 +34234,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/invoice_discounting/invoice_discounting.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:144
+#: accounts/doctype/sales_invoice/sales_invoice.js:151
 msgid "Invoice Discounting"
 msgstr "Descuento de facturas"
 
@@ -33693,7 +34245,7 @@
 msgid "Invoice Discounting"
 msgstr "Descuento de facturas"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1065
+#: accounts/report/accounts_receivable/accounts_receivable.py:1073
 msgid "Invoice Grand Total"
 msgstr "Factura Gran Total"
 
@@ -33770,7 +34322,8 @@
 msgid "Invoice Status"
 msgstr "Estado de la factura"
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:7
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:85
 msgid "Invoice Type"
 msgstr "Tipo de factura"
 
@@ -33805,7 +34358,7 @@
 msgid "Invoice Type"
 msgstr "Tipo de factura"
 
-#: projects/doctype/timesheet/timesheet.py:376
+#: projects/doctype/timesheet/timesheet.py:386
 msgid "Invoice already created for all billing hours"
 msgstr "Factura ya creada para todas las horas de facturación"
 
@@ -33815,12 +34368,13 @@
 msgid "Invoice and Billing"
 msgstr ""
 
-#: projects/doctype/timesheet/timesheet.py:373
+#: projects/doctype/timesheet/timesheet.py:383
 msgid "Invoice can't be made for zero billing hour"
 msgstr "No se puede facturar por cero horas de facturación"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:168
-#: accounts/report/accounts_receivable/accounts_receivable.py:1067
+#: 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
 msgid "Invoiced Amount"
@@ -33828,9 +34382,9 @@
 
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:77
 msgid "Invoiced Qty"
-msgstr ""
+msgstr "Cant. Facturada"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2028
+#: accounts/doctype/sales_invoice/sales_invoice.py:1997
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
 msgid "Invoices"
 msgstr "Facturas"
@@ -33912,7 +34466,7 @@
 msgid "Is Account Payable"
 msgstr "Es cuenta por pagar"
 
-#: projects/report/project_summary/project_summary.js:17
+#: projects/report/project_summary/project_summary.js:16
 msgid "Is Active"
 msgstr "Está activo"
 
@@ -33971,7 +34525,7 @@
 msgid "Is Advance"
 msgstr "Es Anticipo"
 
-#: selling/doctype/quotation/quotation.js:294
+#: selling/doctype/quotation/quotation.js:306
 msgid "Is Alternative"
 msgstr "Es Alternativo"
 
@@ -34279,9 +34833,9 @@
 msgid "Is Fully Depreciated"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:110
-#: accounts/doctype/cost_center/cost_center_tree.js:23
-#: stock/doctype/warehouse/warehouse_tree.js:16
+#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/cost_center/cost_center_tree.js:30
+#: stock/doctype/warehouse/warehouse_tree.js:20
 msgid "Is Group"
 msgstr "Es un grupo"
 
@@ -34555,7 +35109,13 @@
 msgid "Is Rejected"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.js:64
+#. Label of a Check field in DocType 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "Is Rejected Warehouse"
+msgstr ""
+
+#: accounts/report/pos_register/pos_register.js:63
 #: accounts/report/pos_register/pos_register.py:226
 msgid "Is Return"
 msgstr "Es un retorno"
@@ -34705,7 +35265,7 @@
 msgstr "¿Está incluido este impuesto en el precio base?"
 
 #. Name of a DocType
-#: assets/doctype/asset/asset_list.js:26 public/js/communication.js:12
+#: assets/doctype/asset/asset_list.js:19 public/js/communication.js:13
 #: support/doctype/issue/issue.json
 msgid "Issue"
 msgstr "Incidencia"
@@ -34770,15 +35330,15 @@
 msgid "Issue Date"
 msgstr "Fecha de emisión"
 
-#: stock/doctype/material_request/material_request.js:127
+#: stock/doctype/material_request/material_request.js:138
 msgid "Issue Material"
 msgstr "Distribuir materiales"
 
 #. Name of a DocType
 #: support/doctype/issue_priority/issue_priority.json
-#: support/report/issue_analytics/issue_analytics.js:64
+#: support/report/issue_analytics/issue_analytics.js:63
 #: support/report/issue_analytics/issue_analytics.py:64
-#: support/report/issue_summary/issue_summary.js:52
+#: support/report/issue_summary/issue_summary.js:51
 #: support/report/issue_summary/issue_summary.py:61
 msgid "Issue Priority"
 msgstr "Prioridad de emisión"
@@ -34826,7 +35386,7 @@
 msgid "Issue a debit note with 0 qty against an existing Sales Invoice"
 msgstr ""
 
-#: stock/doctype/material_request/material_request_list.js:29
+#: stock/doctype/material_request/material_request_list.js:33
 msgid "Issued"
 msgstr "Emitido"
 
@@ -34878,70 +35438,79 @@
 msgid "It can take upto few hours for accurate stock values to be visible after merging items."
 msgstr ""
 
-#: public/js/controllers/transaction.js:1839
+#: public/js/controllers/transaction.js:1882
 msgid "It is needed to fetch Item Details."
 msgstr "Se necesita a buscar Detalles del artículo."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:135
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:156
 msgid "It's not possible to distribute charges equally when total amount is zero, please set 'Distribute Charges Based On' as 'Quantity'"
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:16
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:15
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:32
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:22
 #: buying/report/procurement_tracker/procurement_tracker.py:60
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:50
+#: 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:1018
+#: controllers/taxes_and_totals.py:1019
+#: 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_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:67
-#: manufacturing/report/process_loss_report/process_loss_report.js:16
+#: 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
-#: public/js/bom_configurator/bom_configurator.bundle.js:202
-#: public/js/bom_configurator/bom_configurator.bundle.js:270
+#: 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
 #: public/js/purchase_trends_filters.js:48
-#: public/js/purchase_trends_filters.js:65 public/js/sales_trends_filters.js:23
-#: public/js/sales_trends_filters.js:41 public/js/stock_analytics.js:61
-#: selling/doctype/sales_order/sales_order.js:977
-#: selling/report/customer_wise_item_price/customer_wise_item_price.js:15
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:37
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:63
-#: stock/dashboard/item_dashboard.js:208 stock/doctype/item/item.json
+#: public/js/purchase_trends_filters.js:63 public/js/sales_trends_filters.js:23
+#: public/js/sales_trends_filters.js:39 public/js/stock_analytics.js:92
+#: selling/doctype/sales_order/sales_order.js:1139
+#: selling/page/point_of_sale/pos_item_cart.js:46
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:14
+#: 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/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
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:24
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:32
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:74
-#: stock/report/item_price_stock/item_price_stock.js:9
+#: stock/report/item_price_stock/item_price_stock.js:8
 #: 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:11
+#: stock/report/item_variant_details/item_variant_details.js:10
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55
 #: 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:33
+#: stock/report/reserved_stock/reserved_stock.js:30
 #: stock/report/reserved_stock/reserved_stock.py:103
 #: 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:16
+#: stock/report/stock_analytics/stock_analytics.js:15
 #: stock/report/stock_analytics/stock_analytics.py:30
 #: stock/report/stock_balance/stock_balance.js:39
-#: stock/report/stock_balance/stock_balance.py:361
+#: stock/report/stock_balance/stock_balance.py:369
 #: stock/report/stock_ledger/stock_ledger.js:42
-#: stock/report/stock_ledger/stock_ledger.py:109
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:32
+#: 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 templates/generators/bom.html:19
-#: templates/pages/material_request_info.html:42 templates/pages/order.html:83
+#: templates/emails/reorder_item.html:8
+#: templates/form_grid/material_request_grid.html:6
+#: templates/form_grid/stock_entry_grid.html:8 templates/generators/bom.html:19
+#: templates/pages/material_request_info.html:42 templates/pages/order.html:95
 msgid "Item"
 msgstr "Producto"
 
@@ -35135,6 +35704,10 @@
 msgid "Item Barcode"
 msgstr "Código de Barras del Producto"
 
+#: selling/page/point_of_sale/pos_item_cart.js:46
+msgid "Item Cart"
+msgstr ""
+
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:69
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:36
 #: accounts/report/gross_profit/gross_profit.py:224
@@ -35144,40 +35717,41 @@
 #: 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/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:9
+#: 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/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:76
+#: 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/quality_inspection_summary/quality_inspection_summary.js:28
+#: 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:187
-#: public/js/controllers/transaction.js:2112 public/js/utils.js:459
-#: public/js/utils.js:606 selling/doctype/quotation/quotation.js:268
-#: selling/doctype/sales_order/sales_order.js:291
-#: selling/doctype/sales_order/sales_order.js:392
-#: selling/doctype/sales_order/sales_order.js:682
-#: selling/doctype/sales_order/sales_order.js:806
+#: 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
+#: selling/doctype/sales_order/sales_order.js:318
+#: selling/doctype/sales_order/sales_order.js:422
+#: selling/doctype/sales_order/sales_order.js:784
+#: selling/doctype/sales_order/sales_order.js:926
 #: selling/report/customer_wise_item_price/customer_wise_item_price.py:29
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:27
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:19
 #: selling/report/sales_order_analysis/sales_order_analysis.py:241
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:86
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:16
+#: 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:8
+#: 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/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:8
+#: stock/report/serial_no_ledger/serial_no_ledger.js:7
 #: stock/report/stock_ageing/stock_ageing.py:119
 #: 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
@@ -35569,7 +36143,7 @@
 msgid "Item Code"
 msgstr "Código del Producto"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:61
+#: manufacturing/doctype/bom_creator/bom_creator.js:60
 msgid "Item Code (Final Product)"
 msgstr ""
 
@@ -35577,12 +36151,12 @@
 msgid "Item Code cannot be changed for Serial No."
 msgstr "El código del producto no se puede cambiar por un número de serie"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:444
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:448
 msgid "Item Code required at Row No {0}"
 msgstr "Código del producto requerido en la línea: {0}"
 
-#: selling/page/point_of_sale/pos_controller.js:672
-#: selling/page/point_of_sale/pos_item_details.js:251
+#: selling/page/point_of_sale/pos_controller.js:704
+#: selling/page/point_of_sale/pos_item_details.js:262
 msgid "Item Code: {0} is not available under warehouse {1}."
 msgstr "Código de artículo: {0} no está disponible en el almacén {1}."
 
@@ -35650,6 +36224,10 @@
 msgid "Item Description"
 msgstr "Descripción del Producto"
 
+#: selling/page/point_of_sale/pos_item_details.js:28
+msgid "Item Details"
+msgstr "Detalles del artículo"
+
 #. Label of a Section Break field in DocType 'Production Plan Sub Assembly
 #. Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -35658,9 +36236,9 @@
 msgstr "Detalles del artículo"
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:43
+#: accounts/report/gross_profit/gross_profit.js:44
 #: accounts/report/gross_profit/gross_profit.py:237
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:22
+#: 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
@@ -35668,36 +36246,38 @@
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:181
 #: accounts/report/purchase_register/purchase_register.js:58
 #: accounts/report/sales_register/sales_register.js:70
+#: manufacturing/doctype/plant_floor/plant_floor.js:100
+#: manufacturing/doctype/workstation/workstation_job_card.html:94
 #: public/js/purchase_trends_filters.js:49 public/js/sales_trends_filters.js:24
-#: selling/page/point_of_sale/pos_item_selector.js:159
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:31
+#: selling/page/point_of_sale/pos_item_selector.js:156
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:30
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:35
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:55
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:54
 #: selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:89
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:42
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:41
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:54
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:41
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:93
+#: 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/delayed_item_report/delayed_item_report.js:49
-#: stock/report/delayed_order_report/delayed_order_report.js:49
+#: 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/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_analytics/stock_analytics.js:9
+#: stock/report/stock_analytics/stock_analytics.js:8
 #: stock/report/stock_analytics/stock_analytics.py:39
 #: stock/report/stock_balance/stock_balance.js:32
-#: stock/report/stock_balance/stock_balance.py:369
+#: stock/report/stock_balance/stock_balance.py:377
 #: stock/report/stock_ledger/stock_ledger.js:53
-#: stock/report/stock_ledger/stock_ledger.py:174
+#: stock/report/stock_ledger/stock_ledger.py:247
 #: stock/report/stock_projected_qty/stock_projected_qty.js:39
 #: stock/report/stock_projected_qty/stock_projected_qty.py:108
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:25
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:24
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:94
 msgid "Item Group"
 msgstr "Grupo de Productos"
@@ -35917,7 +36497,7 @@
 msgid "Item Group Name"
 msgstr "Nombre del grupo de productos"
 
-#: setup/doctype/item_group/item_group.js:65
+#: setup/doctype/item_group/item_group.js:82
 msgid "Item Group Tree"
 msgstr "Árbol de Productos"
 
@@ -35983,7 +36563,8 @@
 #: 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
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:95
+#: 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
@@ -35992,7 +36573,7 @@
 #: manufacturing/report/production_planning_report/production_planning_report.py:356
 #: 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:2118
+#: public/js/controllers/transaction.js:2161
 #: 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
@@ -36006,8 +36587,8 @@
 #: 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:367
-#: stock/report/stock_ledger/stock_ledger.py:115
+#: stock/report/stock_balance/stock_balance.py:375
+#: 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
@@ -36390,15 +36971,15 @@
 msgid "Item Price Stock"
 msgstr "Artículo Stock de Precios"
 
-#: stock/get_item_details.py:878
+#: stock/get_item_details.py:889
 msgid "Item Price added for {0} in Price List {1}"
 msgstr "Precio del producto añadido para {0} en Lista de Precios {1}"
 
-#: stock/doctype/item_price/item_price.py:142
+#: stock/doctype/item_price/item_price.py:136
 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:862
+#: stock/get_item_details.py:873
 msgid "Item Price updated for {0} in Price List {1}"
 msgstr "Precio del producto actualizado para {0} en Lista de Precios {1}"
 
@@ -36442,7 +37023,7 @@
 msgid "Item Reorder"
 msgstr "Reabastecer producto"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:130
 msgid "Item Row {0}: {1} {2} does not exist in above '{1}' table"
 msgstr "La fila de elemento {0}: {1} {2} no existe en la tabla &#39;{1}&#39; anterior"
 
@@ -36656,7 +37237,7 @@
 msgstr "Detalles de la Variante del Artículo"
 
 #. Name of a DocType
-#: stock/doctype/item/item.js:94
+#: stock/doctype/item/item.js:114
 #: stock/doctype/item_variant_settings/item_variant_settings.json
 msgid "Item Variant Settings"
 msgstr "Configuraciones de Variante de Artículo"
@@ -36667,7 +37248,7 @@
 msgid "Item Variant Settings"
 msgstr "Configuraciones de Variante de Artículo"
 
-#: stock/doctype/item/item.js:667
+#: stock/doctype/item/item.js:744
 msgid "Item Variant {0} already exists with same attributes"
 msgstr "Artículo Variant {0} ya existe con los mismos atributos"
 
@@ -36762,7 +37343,7 @@
 msgid "Item and Warranty Details"
 msgstr "Producto y detalles de garantía"
 
-#: stock/doctype/stock_entry/stock_entry.py:2325
+#: stock/doctype/stock_entry/stock_entry.py:2359
 msgid "Item for row {0} does not match Material Request"
 msgstr "El artículo de la fila {0} no coincide con la solicitud de material"
 
@@ -36770,16 +37351,16 @@
 msgid "Item has variants."
 msgstr "El producto tiene variantes."
 
-#: selling/page/point_of_sale/pos_item_details.js:110
+#: selling/page/point_of_sale/pos_item_details.js:108
 msgid "Item is removed since no serial / batch no selected."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:105
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:126
 msgid "Item must be added using 'Get Items from Purchase Receipts' button"
 msgstr "El producto debe ser agregado utilizando el botón 'Obtener productos desde recibos de compra'"
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: selling/doctype/sales_order/sales_order.js:984
+#: selling/doctype/sales_order/sales_order.js:1146
 msgid "Item name"
 msgstr "Nombre del producto"
 
@@ -36789,11 +37370,11 @@
 msgid "Item operation"
 msgstr "Operación del artículo"
 
-#: controllers/accounts_controller.py:3196
+#: controllers/accounts_controller.py:3287
 msgid "Item qty can not be updated as raw materials are already processed."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:857
+#: stock/doctype/stock_entry/stock_entry.py:813
 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
 msgstr ""
 
@@ -36803,7 +37384,11 @@
 msgid "Item to be manufactured or repacked"
 msgstr "Producto a manufacturar o re-empacar"
 
-#: stock/utils.py:564
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Item valuation rate is recalculated considering landed cost voucher amount"
+msgstr ""
+
+#: stock/utils.py:559
 msgid "Item valuation reposting in progress. Report might show incorrect item valuation."
 msgstr ""
 
@@ -36815,11 +37400,11 @@
 msgid "Item {0} cannot be added as a sub-assembly of itself"
 msgstr ""
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:146
+#: manufacturing/doctype/blanket_order/blanket_order.py:189
 msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:231 stock/doctype/item/item.py:603
+#: assets/doctype/asset/asset.py:233 stock/doctype/item/item.py:603
 msgid "Item {0} does not exist"
 msgstr "El elemento {0} no existe"
 
@@ -36827,7 +37412,7 @@
 msgid "Item {0} does not exist in the system or has expired"
 msgstr "El elemento {0} no existe en el sistema o ha expirado"
 
-#: controllers/selling_controller.py:655
+#: controllers/selling_controller.py:679
 msgid "Item {0} entered multiple times."
 msgstr ""
 
@@ -36835,11 +37420,11 @@
 msgid "Item {0} has already been returned"
 msgstr "El producto {0} ya ha sido devuelto"
 
-#: assets/doctype/asset/asset.py:233
+#: assets/doctype/asset/asset.py:235
 msgid "Item {0} has been disabled"
 msgstr "Elemento {0} ha sido desactivado"
 
-#: selling/doctype/sales_order/sales_order.py:645
+#: selling/doctype/sales_order/sales_order.py:651
 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No"
 msgstr ""
 
@@ -36847,7 +37432,7 @@
 msgid "Item {0} has reached its end of life on {1}"
 msgstr "El producto {0} ha llegado al fin de la vida útil el {1}"
 
-#: stock/stock_ledger.py:111
+#: stock/stock_ledger.py:113
 msgid "Item {0} ignored since it is not a stock item"
 msgstr "El producto {0} ha sido ignorado ya que no es un elemento de stock"
 
@@ -36871,43 +37456,43 @@
 msgid "Item {0} is not a stock Item"
 msgstr "El producto {0} no es un producto de stock"
 
-#: stock/doctype/stock_entry/stock_entry.py:1538
+#: stock/doctype/stock_entry/stock_entry.py:1547
 msgid "Item {0} is not active or end of life has been reached"
 msgstr "El producto {0} no está activo o ha llegado al final de la vida útil"
 
-#: assets/doctype/asset/asset.py:235
+#: assets/doctype/asset/asset.py:237
 msgid "Item {0} must be a Fixed Asset Item"
 msgstr "Elemento {0} debe ser un elemento de activo fijo"
 
-#: stock/get_item_details.py:228
+#: stock/get_item_details.py:233
 msgid "Item {0} must be a Non-Stock Item"
 msgstr ""
 
-#: stock/get_item_details.py:225
+#: stock/get_item_details.py:230
 msgid "Item {0} must be a Sub-contracted Item"
 msgstr "El elemento: {0} debe ser un producto sub-contratado"
 
-#: assets/doctype/asset/asset.py:237
+#: assets/doctype/asset/asset.py:239
 msgid "Item {0} must be a non-stock item"
 msgstr "Elemento {0} debe ser un elemento de no-stock"
 
-#: stock/doctype/stock_entry/stock_entry.py:1086
+#: stock/doctype/stock_entry/stock_entry.py:1095
 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}"
 msgstr ""
 
-#: stock/doctype/item_price/item_price.py:57
+#: stock/doctype/item_price/item_price.py:56
 msgid "Item {0} not found."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:342
+#: buying/doctype/purchase_order/purchase_order.py:343
 msgid "Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item)."
 msgstr "El producto {0}: Con la cantidad ordenada {1} no puede ser menor que el pedido mínimo {2} (definido en el producto)."
 
-#: manufacturing/doctype/production_plan/production_plan.js:418
+#: manufacturing/doctype/production_plan/production_plan.js:453
 msgid "Item {0}: {1} qty produced. "
 msgstr "Elemento {0}: {1} cantidad producida."
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1131
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1190
 msgid "Item {} does not exist."
 msgstr ""
 
@@ -36953,9 +37538,12 @@
 msgid "Item: {0} does not exist in the system"
 msgstr "El producto: {0} no existe en el sistema"
 
-#: public/js/utils.js:442 setup/doctype/item_group/item_group.js:70
-#: stock/doctype/delivery_note/delivery_note.js:364
-#: templates/generators/bom.html:38 templates/pages/rfq.html:37
+#: public/js/utils.js:489
+#: 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
+#: templates/form_grid/item_grid.html:6 templates/generators/bom.html:38
+#: templates/pages/rfq.html:37
 msgid "Items"
 msgstr "Productos"
 
@@ -37115,19 +37703,19 @@
 #. Label of a Card Break in the Buying Workspace
 #: buying/workspace/buying/buying.json
 msgid "Items & Pricing"
-msgstr ""
+msgstr "Productos y Precios"
 
 #. Label of a Card Break in the Stock Workspace
 #: stock/workspace/stock/stock.json
 msgid "Items Catalogue"
-msgstr ""
+msgstr "Catálogo de Productos"
 
 #: stock/report/item_prices/item_prices.js:8
 msgid "Items Filter"
 msgstr "Artículos Filtra"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1462
-#: selling/doctype/sales_order/sales_order.js:1018
+#: manufacturing/doctype/production_plan/production_plan.py:1484
+#: selling/doctype/sales_order/sales_order.js:1182
 msgid "Items Required"
 msgstr "Elementos requeridos"
 
@@ -37143,15 +37731,15 @@
 msgid "Items and Pricing"
 msgstr "Productos y Precios"
 
-#: controllers/accounts_controller.py:3416
+#: controllers/accounts_controller.py:3507
 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:824
+#: selling/doctype/sales_order/sales_order.js:962
 msgid "Items for Raw Material Request"
 msgstr "Artículos para solicitud de materia prima"
 
-#: stock/doctype/stock_entry/stock_entry.py:853
+#: stock/doctype/stock_entry/stock_entry.py:809
 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}"
 msgstr ""
 
@@ -37161,20 +37749,20 @@
 msgid "Items to Be Repost"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1461
+#: manufacturing/doctype/production_plan/production_plan.py:1483
 msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
 msgstr "Los artículos a fabricar están obligados a extraer las materias primas asociadas."
 
 #. Label of a Link in the Buying Workspace
 #: buying/workspace/buying/buying.json
 msgid "Items to Order and Receive"
-msgstr ""
+msgstr "Productos para Ordenar y Recibir"
 
-#: selling/doctype/sales_order/sales_order.js:252
+#: selling/doctype/sales_order/sales_order.js:278
 msgid "Items to Reserve"
 msgstr ""
 
-#. Description of the 'Parent Warehouse' (Link) field in DocType 'Pick List'
+#. Description of the 'Warehouse' (Link) field in DocType 'Pick List'
 #: stock/doctype/pick_list/pick_list.json
 msgctxt "Pick List"
 msgid "Items under this warehouse will be suggested"
@@ -37199,11 +37787,18 @@
 msgid "JAN"
 msgstr ""
 
+#. Label of a Int field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Capacity"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/job_card/job_card.json
-#: manufacturing/doctype/job_card/job_card.py:765
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:28
+#: manufacturing/doctype/job_card/job_card.py:772
+#: 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
 msgid "Job Card"
 msgstr "Tarjeta de trabajo"
@@ -37307,11 +37902,17 @@
 msgid "Job Card Time Log"
 msgstr "Registro de tiempo de tarjeta de trabajo"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:94
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Cards"
+msgstr ""
+
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:95
 msgid "Job Paused"
 msgstr ""
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:54
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:53
 msgid "Job Started"
 msgstr "Trabajo comenzó"
 
@@ -37333,11 +37934,11 @@
 msgid "Job Title"
 msgstr "Título del trabajo"
 
-#: manufacturing/doctype/work_order/work_order.py:1562
+#: manufacturing/doctype/work_order/work_order.py:1576
 msgid "Job card {0} created"
 msgstr "Tarjeta de trabajo {0} creada"
 
-#: utilities/bulk_transaction.py:48
+#: utilities/bulk_transaction.py:52
 msgid "Job: {0} has been triggered for processing failed transactions"
 msgstr ""
 
@@ -37351,19 +37952,20 @@
 msgid "Joining"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:29
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:30
 msgid "Journal Entries"
 msgstr ""
 
-#: accounts/utils.py:866
+#: accounts/utils.py:875
 msgid "Journal Entries {0} are un-linked"
 msgstr "Los asientos contables {0} no están enlazados"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:146
+#: accounts/doctype/account/account_tree.js:205
 #: accounts/doctype/journal_entry/journal_entry.json
 #: accounts/print_format/journal_auditing_voucher/journal_auditing_voucher.html:10
-#: assets/doctype/asset/asset.js:246 assets/doctype/asset/asset.js:249
+#: assets/doctype/asset/asset.js:282 assets/doctype/asset/asset.js:291
+#: templates/form_grid/bank_reconciliation_grid.html:3
 msgid "Journal Entry"
 msgstr "Asiento contable"
 
@@ -37448,7 +38050,7 @@
 msgid "Journal Entry Type"
 msgstr "Tipo de entrada de diario"
 
-#: accounts/doctype/journal_entry/journal_entry.py:471
+#: accounts/doctype/journal_entry/journal_entry.py:487
 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset."
 msgstr ""
 
@@ -37458,11 +38060,11 @@
 msgid "Journal Entry for Scrap"
 msgstr "Entrada de diario para desguace"
 
-#: accounts/doctype/journal_entry/journal_entry.py:232
+#: accounts/doctype/journal_entry/journal_entry.py:248
 msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:597
+#: accounts/doctype/journal_entry/journal_entry.py:624
 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
 msgstr "El asiento {0} no tiene cuenta de {1} o ya esta enlazado con otro comprobante"
 
@@ -37472,14 +38074,19 @@
 msgid "Journals"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:95
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:99
 msgid "Journals have been created"
 msgstr ""
 
-#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:104
 msgid "Kanban Board"
 msgstr "Tablero Kanban"
 
+#. Description of a DocType
+#: crm/doctype/campaign/campaign.json
+msgid "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. "
+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"
@@ -37500,11 +38107,11 @@
 msgid "Key Reports"
 msgstr "Reportes clave"
 
-#: manufacturing/doctype/job_card/job_card.py:768
+#: manufacturing/doctype/job_card/job_card.py:775
 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}."
 msgstr ""
 
-#: public/js/utils/party.js:221
+#: public/js/utils/party.js:264
 msgid "Kindly select the company first"
 msgstr "Por favor seleccione primero la empresa"
 
@@ -37644,7 +38251,7 @@
 msgid "Last Name"
 msgstr "Apellido"
 
-#: stock/doctype/shipment/shipment.js:247
+#: stock/doctype/shipment/shipment.js:275
 msgid "Last Name, Email or Phone/Mobile of the user are mandatory to continue."
 msgstr ""
 
@@ -37687,7 +38294,7 @@
 msgid "Last Purchase Rate"
 msgstr "Tasa de cambio de última compra"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:313
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:324
 msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
 msgstr "La última transacción de existencias para el artículo {0} en el almacén {1} fue el {2}."
 
@@ -37699,7 +38306,7 @@
 msgid "Latest"
 msgstr "Más reciente"
 
-#: stock/report/stock_balance/stock_balance.py:479
+#: stock/report/stock_balance/stock_balance.py:487
 msgid "Latest Age"
 msgstr "Última edad"
 
@@ -37716,11 +38323,11 @@
 msgstr "Latitud"
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:34
+#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:33
 #: crm/report/lead_details/lead_details.py:18
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:8
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:28
-#: public/js/communication.js:20
+#: public/js/communication.js:25
 msgid "Lead"
 msgstr "Iniciativa"
 
@@ -37985,9 +38592,9 @@
 msgid "Leave blank to use the standard Delivery Note format"
 msgstr "Deje en blanco para usar el formato estándar de Nota de entrega"
 
-#: accounts/doctype/journal_entry/journal_entry.js:18
-#: accounts/doctype/payment_entry/payment_entry.js:265
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:24
+#: accounts/doctype/journal_entry/journal_entry.js:54
+#: accounts/doctype/payment_entry/payment_entry.js:343
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:25
 msgid "Ledger"
 msgstr ""
 
@@ -38030,10 +38637,15 @@
 msgid "Left Index"
 msgstr "Índice izquierdo"
 
-#: setup/doctype/company/company.py:389
+#: setup/doctype/company/company.py:388
 msgid "Legal"
 msgstr "Legal"
 
+#. Description of a DocType
+#: setup/doctype/company/company.json
+msgid "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization."
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:59
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:84
 msgid "Legal Expenses"
@@ -38059,7 +38671,7 @@
 msgid "Length (cm)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:657
+#: accounts/doctype/payment_entry/payment_entry.js:807
 msgid "Less Than Amount"
 msgstr "Menos de la cantidad"
 
@@ -38072,37 +38684,37 @@
 #. Title of the Module Onboarding 'Accounts'
 #: accounts/module_onboarding/accounts/accounts.json
 msgid "Let's Set Up Your Accounts and Taxes."
-msgstr ""
+msgstr "Configuremos sus Cuentas e Impuestos."
 
 #. Title of the Module Onboarding 'CRM'
 #: crm/module_onboarding/crm/crm.json
 msgid "Let's Set Up Your CRM."
-msgstr ""
+msgstr "Configuremos su CRM."
 
 #. Title of the Module Onboarding 'Assets'
 #: assets/module_onboarding/assets/assets.json
 msgid "Let's Set Up the Assets Module."
-msgstr ""
+msgstr "Configuremos el Módulo de Activos."
 
 #. Title of the Module Onboarding 'Buying'
 #: buying/module_onboarding/buying/buying.json
 msgid "Let's Set Up the Buying Module."
-msgstr ""
+msgstr "Configuremos el Módulo de Compras."
 
 #. Title of the Module Onboarding 'Manufacturing'
 #: manufacturing/module_onboarding/manufacturing/manufacturing.json
 msgid "Let's Set Up the Manufacturing Module."
-msgstr ""
+msgstr "Configuremos el Módulo de Manufactura."
 
 #. Title of the Module Onboarding 'Selling'
 #: selling/module_onboarding/selling/selling.json
 msgid "Let's Set Up the Selling Module."
-msgstr ""
+msgstr "Configuremos el Módulo de Venta."
 
 #. Title of the Module Onboarding 'Stock'
 #: stock/module_onboarding/stock/stock.json
 msgid "Let's Set Up the Stock Module."
-msgstr ""
+msgstr "Configuremos el Módulo de Inventario."
 
 #. Title of the Module Onboarding 'Home'
 #: setup/module_onboarding/home/home.json
@@ -38334,7 +38946,7 @@
 #. Label of an action in the Onboarding Step 'Setup Your Letterhead'
 #: setup/onboarding_step/letterhead/letterhead.json
 msgid "Let’s setup your first Letter Head"
-msgstr ""
+msgstr "Configuremos su primer Membrete"
 
 #. Label of an action in the Onboarding Step 'Selling Settings'
 #: selling/onboarding_step/selling_settings/selling_settings.json
@@ -38380,7 +38992,7 @@
 msgid "Liabilities"
 msgstr "Pasivo"
 
-#: accounts/report/account_balance/account_balance.js:27
+#: accounts/report/account_balance/account_balance.js:26
 msgid "Liability"
 msgstr "Obligaciones"
 
@@ -38477,20 +39089,20 @@
 msgid "Link existing Quality Procedure."
 msgstr "Enlace Procedimiento de calidad existente."
 
-#: buying/doctype/purchase_order/purchase_order.js:487
+#: buying/doctype/purchase_order/purchase_order.js:564
 msgid "Link to Material Request"
 msgstr "Enlace a la solicitud de material"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:378
-#: buying/doctype/supplier_quotation/supplier_quotation.js:52
+#: buying/doctype/request_for_quotation/request_for_quotation.js:407
+#: buying/doctype/supplier_quotation/supplier_quotation.js:54
 msgid "Link to Material Requests"
 msgstr "Enlace a solicitudes de material"
 
-#: buying/doctype/supplier/supplier.js:107
+#: buying/doctype/supplier/supplier.js:133
 msgid "Link with Customer"
 msgstr ""
 
-#: selling/doctype/customer/customer.js:173
+#: selling/doctype/customer/customer.js:189
 msgid "Link with Supplier"
 msgstr ""
 
@@ -38515,16 +39127,16 @@
 msgid "Linked with submitted documents"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:185
-#: selling/doctype/customer/customer.js:230
+#: buying/doctype/supplier/supplier.js:218
+#: selling/doctype/customer/customer.js:251
 msgid "Linking Failed"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:184
+#: buying/doctype/supplier/supplier.js:217
 msgid "Linking to Customer Failed. Please try again."
 msgstr ""
 
-#: selling/doctype/customer/customer.js:229
+#: selling/doctype/customer/customer.js:250
 msgid "Linking to Supplier Failed. Please try again."
 msgstr ""
 
@@ -38546,7 +39158,7 @@
 msgid "Load All Criteria"
 msgstr "Cargar todos los criterios"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:298
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:276
 msgid "Loading import file..."
 msgstr "Cargando archivo de importación..."
 
@@ -38655,6 +39267,11 @@
 msgid "Log Entries"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/item_price/item_price.json
+msgid "Log the selling and buying rate of an Item"
+msgstr ""
+
 #. Label of a Attach Image field in DocType 'Manufacturer'
 #: stock/doctype/manufacturer/manufacturer.json
 msgctxt "Manufacturer"
@@ -38680,7 +39297,7 @@
 msgstr "Longitud"
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:7
-#: selling/doctype/quotation/quotation_list.js:33
+#: selling/doctype/quotation/quotation_list.js:32
 msgid "Lost"
 msgstr "Perdido"
 
@@ -38707,7 +39324,7 @@
 msgid "Lost Opportunity"
 msgstr "Oportunidad perdida"
 
-#: crm/report/lead_details/lead_details.js:39
+#: crm/report/lead_details/lead_details.js:38
 msgid "Lost Quotation"
 msgstr "Presupuesto perdido"
 
@@ -38727,7 +39344,7 @@
 msgid "Lost Quotations %"
 msgstr "Cotizaciones perdidas %"
 
-#: crm/report/lost_opportunity/lost_opportunity.js:31
+#: crm/report/lost_opportunity/lost_opportunity.js:30
 #: selling/report/lost_quotations/lost_quotations.py:24
 msgid "Lost Reason"
 msgstr "Razón de la pérdida"
@@ -38744,7 +39361,7 @@
 msgstr "Detalle de razón perdida"
 
 #: crm/report/lost_opportunity/lost_opportunity.py:49
-#: public/js/utils/sales_common.js:410
+#: public/js/utils/sales_common.js:466
 msgid "Lost Reasons"
 msgstr "Razones perdidas"
 
@@ -38762,7 +39379,7 @@
 msgid "Lost Reasons"
 msgstr "Razones perdidas"
 
-#: crm/doctype/opportunity/opportunity.js:29
+#: crm/doctype/opportunity/opportunity.js:28
 msgid "Lost Reasons are required in case opportunity is Lost."
 msgstr ""
 
@@ -38840,7 +39457,7 @@
 msgid "Loyalty Point Entry Redemption"
 msgstr "Redención de entrada al punto de lealtad"
 
-#: selling/page/point_of_sale/pos_item_cart.js:891
+#: selling/page/point_of_sale/pos_item_cart.js:924
 msgid "Loyalty Points"
 msgstr "Puntos de lealtad"
 
@@ -38887,14 +39504,18 @@
 msgid "Loyalty Points Redemption"
 msgstr "Redención de Puntos de Lealtad"
 
-#: public/js/utils.js:109
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+msgid "Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned."
+msgstr ""
+
+#: public/js/utils.js:136
 msgid "Loyalty Points: {0}"
 msgstr "Puntos de fidelidad: {0}"
 
 #. Name of a DocType
 #: accounts/doctype/loyalty_program/loyalty_program.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:1041
-#: selling/page/point_of_sale/pos_item_cart.js:885
+#: accounts/doctype/sales_invoice/sales_invoice.js:1117
+#: selling/page/point_of_sale/pos_item_cart.js:917
 msgid "Loyalty Program"
 msgstr "Programa de fidelidad"
 
@@ -39077,11 +39698,16 @@
 msgid "MFG-WO-.YYYY.-"
 msgstr ""
 
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:22
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:23
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:78
+#: public/js/plant_floor_visual/visual_plant.js:86
 msgid "Machine"
 msgstr "Máquina"
 
+#: public/js/plant_floor_visual/visual_plant.js:70
+msgid "Machine Type"
+msgstr ""
+
 #. Option for the 'Stop Reason' (Select) field in DocType 'Downtime Entry'
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 msgctxt "Downtime Entry"
@@ -39094,8 +39720,8 @@
 msgid "Machine operator errors"
 msgstr "Errores del operador de la máquina"
 
-#: setup/doctype/company/company.py:563 setup/doctype/company/company.py:578
-#: setup/doctype/company/company.py:579 setup/doctype/company/company.py:580
+#: setup/doctype/company/company.py:562 setup/doctype/company/company.py:577
+#: setup/doctype/company/company.py:578 setup/doctype/company/company.py:579
 msgid "Main"
 msgstr "Principal"
 
@@ -39109,7 +39735,7 @@
 msgid "Main Cost Center {0} cannot be entered in the child table"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:102
+#: assets/doctype/asset/asset.js:118
 msgid "Maintain Asset"
 msgstr ""
 
@@ -39166,6 +39792,12 @@
 msgid "Maintenance"
 msgstr "Mantenimiento"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Maintenance"
+msgstr "Mantenimiento"
+
 #. Label of a Date field in DocType 'Maintenance Visit'
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
 msgctxt "Maintenance Visit"
@@ -39178,7 +39810,7 @@
 msgid "Maintenance Details"
 msgstr ""
 
-#: assets/doctype/asset_maintenance/asset_maintenance.js:43
+#: assets/doctype/asset_maintenance/asset_maintenance.js:41
 msgid "Maintenance Log"
 msgstr "Registro de mantenimiento"
 
@@ -39225,10 +39857,10 @@
 msgstr "Rol de Mantenimiento"
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:162
+#: accounts/doctype/sales_invoice/sales_invoice.js:175
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.json
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:78
-#: selling/doctype/sales_order/sales_order.js:582
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
+#: selling/doctype/sales_order/sales_order.js:673
 msgid "Maintenance Schedule"
 msgstr "Calendario de Mantenimiento"
 
@@ -39371,10 +40003,10 @@
 msgstr "Mantenimiento por usuario"
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:83
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:87
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
-#: selling/doctype/sales_order/sales_order.js:581
-#: support/doctype/warranty_claim/warranty_claim.js:50
+#: selling/doctype/sales_order/sales_order.js:668
+#: support/doctype/warranty_claim/warranty_claim.js:47
 msgid "Maintenance Visit"
 msgstr "Visita de mantenimiento"
 
@@ -39407,16 +40039,16 @@
 msgid "Major/Optional Subjects"
 msgstr "Principales / Asignaturas Optativas"
 
-#: accounts/doctype/journal_entry/journal_entry.js:51
-#: manufacturing/doctype/job_card/job_card.js:174
+#: accounts/doctype/journal_entry/journal_entry.js:100
+#: manufacturing/doctype/job_card/job_card.js:196
 msgid "Make"
 msgstr "Crear"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:56
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:54
 msgid "Make "
 msgstr "Crear "
 
-#: assets/doctype/asset/asset_list.js:39
+#: assets/doctype/asset/asset_list.js:29
 msgid "Make Asset Movement"
 msgstr ""
 
@@ -39440,13 +40072,13 @@
 
 #: templates/pages/order.html:27
 msgid "Make Purchase Invoice"
-msgstr "Hacer factura de compra"
+msgstr "Hacer Factura de Compra"
 
 #: templates/pages/rfq.html:19
 msgid "Make Quotation"
 msgstr "Hacer Cotización"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:335
 msgid "Make Return Entry"
 msgstr ""
 
@@ -39462,7 +40094,7 @@
 msgid "Make Serial No / Batch from Work Order"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
+#: stock/doctype/purchase_receipt/purchase_receipt.js:261
 msgid "Make Stock Entry"
 msgstr "Hacer entrada de stock"
 
@@ -39470,20 +40102,20 @@
 msgid "Make project from a template."
 msgstr "Hacer proyecto a partir de una plantilla."
 
-#: stock/doctype/item/item.js:502
+#: stock/doctype/item/item.js:569
 msgid "Make {0} Variant"
 msgstr ""
 
-#: stock/doctype/item/item.js:504
+#: stock/doctype/item/item.js:571
 msgid "Make {0} Variants"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:85 assets/doctype/asset/asset.js:89
-#: assets/doctype/asset/asset.js:93 assets/doctype/asset/asset.js:98
-#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:109
-#: assets/doctype/asset/asset.js:113 assets/doctype/asset/asset.js:118
-#: assets/doctype/asset/asset.js:124 assets/doctype/asset/asset.js:136
-#: setup/doctype/company/company.js:112 setup/doctype/company/company.js:119
+#: assets/doctype/asset/asset.js:88 assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:112
+#: assets/doctype/asset/asset.js:122 assets/doctype/asset/asset.js:131
+#: assets/doctype/asset/asset.js:139 assets/doctype/asset/asset.js:148
+#: assets/doctype/asset/asset.js:158 assets/doctype/asset/asset.js:174
+#: setup/doctype/company/company.js:134 setup/doctype/company/company.js:145
 msgid "Manage"
 msgstr "Gestionar"
 
@@ -39507,22 +40139,22 @@
 msgid "Manage your orders"
 msgstr "Gestionar sus Pedidos"
 
-#: setup/doctype/company/company.py:371
+#: setup/doctype/company/company.py:370
 msgid "Management"
 msgstr "Gerencia"
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
-#: manufacturing/doctype/bom/bom.js:71 manufacturing/doctype/bom/bom.js:482
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: 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
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484 public/js/utils/party.js:273
-#: stock/doctype/delivery_note/delivery_note.js:138
-#: stock/doctype/purchase_receipt/purchase_receipt.js:113
-#: stock/doctype/purchase_receipt/purchase_receipt.js:198
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
+#: public/js/controllers/transaction.js:2537 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:99
 msgid "Mandatory"
 msgstr "Obligatorio"
 
@@ -39548,7 +40180,7 @@
 msgid "Mandatory Depends On"
 msgstr "Obligatorio depende de"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
 msgid "Mandatory Field"
 msgstr ""
 
@@ -39568,11 +40200,11 @@
 msgid "Mandatory Missing"
 msgstr "Falta obligatoria"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:587
 msgid "Mandatory Purchase Order"
 msgstr "Orden de compra obligatoria"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
 msgid "Mandatory Purchase Receipt"
 msgstr "Recibo de compra obligatorio"
 
@@ -39640,7 +40272,7 @@
 msgid "Manual Inspection"
 msgstr ""
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:34
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:36
 msgid "Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again"
 msgstr "¡No se puede crear una entrada manual! Deshabilite la entrada automática para contabilidad diferida en la configuración de cuentas e intente nuevamente"
 
@@ -39736,7 +40368,7 @@
 msgid "Manufacture against Material Request"
 msgstr "Fabricación contra Pedido de Material"
 
-#: stock/doctype/material_request/material_request_list.js:33
+#: stock/doctype/material_request/material_request_list.js:37
 msgid "Manufactured"
 msgstr "Fabricado"
 
@@ -39868,10 +40500,15 @@
 msgid "Manufacturer Part Number"
 msgstr "Número de componente del fabricante"
 
-#: public/js/controllers/buying.js:337
+#: public/js/controllers/buying.js:332
 msgid "Manufacturer Part Number <b>{0}</b> is invalid"
 msgstr "El número de pieza del fabricante <b>{0}</b> no es válido."
 
+#. Description of a DocType
+#: stock/doctype/manufacturer/manufacturer.json
+msgid "Manufacturers used in Items"
+msgstr ""
+
 #. Name of a Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: selling/doctype/sales_order/sales_order_dashboard.py:26
@@ -39918,7 +40555,7 @@
 msgid "Manufacturing Manager"
 msgstr "Gerente de Producción"
 
-#: stock/doctype/stock_entry/stock_entry.py:1689
+#: stock/doctype/stock_entry/stock_entry.py:1698
 msgid "Manufacturing Quantity is mandatory"
 msgstr "La cantidad a producir es obligatoria"
 
@@ -39982,15 +40619,15 @@
 msgid "Manufacturing module is all set up!"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:148
+#: stock/doctype/purchase_receipt/purchase_receipt.js:168
 msgid "Mapping Purchase Receipt ..."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:98
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:97
 msgid "Mapping Subcontracting Order ..."
 msgstr ""
 
-#: public/js/utils.js:843
+#: public/js/utils.js:913
 msgid "Mapping {0} ..."
 msgstr ""
 
@@ -40126,7 +40763,7 @@
 msgid "Margin Type"
 msgstr "Tipo de Margen"
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:19
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:15
 msgid "Margin View"
 msgstr ""
 
@@ -40136,6 +40773,15 @@
 msgid "Marital Status"
 msgstr "Estado Civil"
 
+#: public/js/templates/crm_activities.html:39
+#: public/js/templates/crm_activities.html:82
+msgid "Mark As Closed"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:323
+msgid "Mark as unresolved"
+msgstr ""
+
 #. Name of a DocType
 #: crm/doctype/market_segment/market_segment.json
 msgid "Market Segment"
@@ -40171,7 +40817,7 @@
 msgid "Market Segment"
 msgstr "Sector de Mercado"
 
-#: setup/doctype/company/company.py:323
+#: setup/doctype/company/company.py:322
 msgid "Marketing"
 msgstr "Márketing"
 
@@ -40209,9 +40855,9 @@
 
 #: projects/doctype/project/project_dashboard.py:14
 msgid "Material"
-msgstr ""
+msgstr "Material"
 
-#: manufacturing/doctype/work_order/work_order.js:613
+#: manufacturing/doctype/work_order/work_order.js:655
 msgid "Material Consumption"
 msgstr "Material de consumo"
 
@@ -40227,7 +40873,7 @@
 msgid "Material Consumption for Manufacture"
 msgstr "Consumo de Material para Fabricación"
 
-#: stock/doctype/stock_entry/stock_entry.js:420
+#: stock/doctype/stock_entry/stock_entry.js:480
 msgid "Material Consumption is not set in Manufacturing Settings."
 msgstr "El Consumo de Material no está configurado en Configuraciones de Fabricación."
 
@@ -40269,7 +40915,7 @@
 msgid "Material Issue"
 msgstr "Expedición de Material"
 
-#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:146
 msgid "Material Receipt"
 msgstr "Recepción de Materiales"
 
@@ -40286,20 +40932,21 @@
 msgstr "Recepción de Materiales"
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:435
-#: buying/doctype/request_for_quotation/request_for_quotation.js:297
-#: buying/doctype/supplier_quotation/supplier_quotation.js:31
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:34
+#: buying/doctype/purchase_order/purchase_order.js:504
+#: 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
-#: manufacturing/doctype/job_card/job_card.js:57
-#: manufacturing/doctype/production_plan/production_plan.js:113
-#: selling/doctype/sales_order/sales_order.js:570
+#: 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/stock_entry/stock_entry.js:192
-#: stock/doctype/stock_entry/stock_entry.js:277
+#: stock/doctype/stock_entry/stock_entry.js:210
+#: stock/doctype/stock_entry/stock_entry.js:313
 msgid "Material Request"
 msgstr "Solicitud de Materiales"
 
@@ -40517,13 +41164,17 @@
 msgid "Material Request Planning"
 msgstr "Planificación de Solicitud de Material"
 
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:1
+msgid "Material Request Type"
+msgstr "Tipo de Requisición"
+
 #. Label of a Select field in DocType 'Item Reorder'
 #: stock/doctype/item_reorder/item_reorder.json
 msgctxt "Item Reorder"
 msgid "Material Request Type"
 msgstr "Tipo de Requisición"
 
-#: selling/doctype/sales_order/sales_order.py:1521
+#: selling/doctype/sales_order/sales_order.py:1544
 msgid "Material Request not created, as quantity for Raw Materials already available."
 msgstr "Requerimiento de material no creado, debido a que la cantidad de materia prima ya está disponible."
 
@@ -40538,11 +41189,11 @@
 msgid "Material Request used to make this Stock Entry"
 msgstr "Solicitud de materiales usados para crear esta entrada del inventario"
 
-#: controllers/subcontracting_controller.py:974
+#: controllers/subcontracting_controller.py:979
 msgid "Material Request {0} is cancelled or stopped"
 msgstr "Requisición de materiales {0} cancelada o detenida"
 
-#: selling/doctype/sales_order/sales_order.js:839
+#: selling/doctype/sales_order/sales_order.js:978
 msgid "Material Request {0} submitted."
 msgstr "Requerimiento de material {0} enviado."
 
@@ -40558,7 +41209,7 @@
 msgid "Material Requests"
 msgstr "Solicitudes de Material"
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Material Requests Required"
 msgstr "Solicitudes de material requeridas"
 
@@ -40569,12 +41220,12 @@
 msgid "Material Requests for which Supplier Quotations are not created"
 msgstr "Solicitudes de Material para los que no hay Presupuestos de Proveedor creados"
 
-#: stock/doctype/stock_entry/stock_entry_list.js:7
+#: stock/doctype/stock_entry/stock_entry_list.js:13
 msgid "Material Returned from WIP"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:67
-#: stock/doctype/material_request/material_request.js:119
+#: manufacturing/doctype/job_card/job_card.js:64
+#: stock/doctype/material_request/material_request.js:124
 msgid "Material Transfer"
 msgstr "Transferencia de material"
 
@@ -40615,7 +41266,7 @@
 msgid "Material Transfer"
 msgstr "Transferencia de material"
 
-#: stock/doctype/material_request/material_request.js:122
+#: stock/doctype/material_request/material_request.js:130
 msgid "Material Transfer (In Transit)"
 msgstr ""
 
@@ -40669,8 +41320,8 @@
 msgid "Material Transferred for Subcontract"
 msgstr "Material Transferido para Subcontrato"
 
-#: buying/doctype/purchase_order/purchase_order.js:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:360
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:206
 msgid "Material to Supplier"
 msgstr "Materiales de Proveedor"
 
@@ -40680,11 +41331,11 @@
 msgid "Materials Required (Exploded)"
 msgstr "Materiales Necesarios (Despiece)"
 
-#: controllers/subcontracting_controller.py:1164
+#: controllers/subcontracting_controller.py:1169
 msgid "Materials are already received against the {0} {1}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:636
+#: manufacturing/doctype/job_card/job_card.py:643
 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}"
 msgstr ""
 
@@ -40728,13 +41379,13 @@
 #: accounts/doctype/promotional_scheme_price_discount/promotional_scheme_price_discount.json
 msgctxt "Promotional Scheme Price Discount"
 msgid "Max Qty"
-msgstr "Cantidad Máxima"
+msgstr "Cant. Máxima"
 
 #. Label of a Float field in DocType 'Promotional Scheme Product Discount'
 #: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
 msgctxt "Promotional Scheme Product Discount"
 msgid "Max Qty"
-msgstr "Cantidad Máxima"
+msgstr "Cant. Máxima"
 
 #. Label of a Float field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
@@ -40764,8 +41415,8 @@
 msgid "Max discount allowed for item: {0} is {1}%"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:715
-#: stock/doctype/pick_list/pick_list.js:147
+#: manufacturing/doctype/work_order/work_order.js:768
+#: stock/doctype/pick_list/pick_list.js:176
 msgid "Max: {0}"
 msgstr "Máximo: {0}"
 
@@ -40787,11 +41438,11 @@
 msgid "Maximum Payment Amount"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2842
+#: stock/doctype/stock_entry/stock_entry.py:2878
 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
 msgstr "Las muestras máximas - {0} se pueden conservar para el lote {1} y el elemento {2}."
 
-#: stock/doctype/stock_entry/stock_entry.py:2833
+#: stock/doctype/stock_entry/stock_entry.py:2869
 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
 msgstr "Las muestras máximas - {0} ya se han conservado para el lote {1} y el elemento {2} en el lote {3}."
 
@@ -40813,11 +41464,11 @@
 msgid "Maximum Value"
 msgstr ""
 
-#: controllers/selling_controller.py:194
+#: controllers/selling_controller.py:195
 msgid "Maximum discount for Item {0} is {1}%"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:94
+#: public/js/utils/barcode_scanner.js:99
 msgid "Maximum quantity scanned for item {0}."
 msgstr ""
 
@@ -40855,7 +41506,7 @@
 msgid "Meeting"
 msgstr "Reunión"
 
-#: stock/stock_ledger.py:1685
+#: stock/stock_ledger.py:1705
 msgid "Mention Valuation Rate in the Item master."
 msgstr "Mencione Tasa de valoración en el maestro de artículos."
 
@@ -40883,11 +41534,11 @@
 msgid "Mention if non-standard receivable account applicable"
 msgstr "Indique si una cuenta por cobrar no estándar es  aplicable"
 
-#: accounts/doctype/account/account.js:151
+#: accounts/doctype/account/account.js:152
 msgid "Merge"
 msgstr "Unir"
 
-#: accounts/doctype/account/account.js:51
+#: accounts/doctype/account/account.js:46
 msgid "Merge Account"
 msgstr "Fusionar cuenta"
 
@@ -40907,15 +41558,15 @@
 msgid "Merge Similar Account Heads"
 msgstr ""
 
-#: public/js/utils.js:873
+#: public/js/utils.js:943
 msgid "Merge taxes from multiple documents"
 msgstr ""
 
-#: accounts/doctype/account/account.js:123
+#: accounts/doctype/account/account.js:124
 msgid "Merge with Existing Account"
 msgstr "Fusionar con Cuenta Existente"
 
-#: accounts/doctype/cost_center/cost_center.js:66
+#: accounts/doctype/cost_center/cost_center.js:68
 msgid "Merge with existing"
 msgstr "Combinar con existente"
 
@@ -40925,7 +41576,7 @@
 msgid "Merged"
 msgstr ""
 
-#: accounts/doctype/account/account.py:546
+#: accounts/doctype/account/account.py:565
 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency"
 msgstr ""
 
@@ -40933,6 +41584,10 @@
 msgid "Merging {0} of {1}"
 msgstr ""
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Message"
+msgstr "Mensaje"
+
 #. Label of a Text field in DocType 'Payment Request'
 #: accounts/doctype/payment_request/payment_request.json
 msgctxt "Payment Request"
@@ -40963,7 +41618,7 @@
 msgid "Message Examples"
 msgstr "Ejemplos de Mensaje"
 
-#: accounts/doctype/payment_request/payment_request.js:38
+#: accounts/doctype/payment_request/payment_request.js:47
 #: setup/doctype/email_digest/email_digest.js:26
 msgid "Message Sent"
 msgstr "Mensaje enviado"
@@ -40992,6 +41647,10 @@
 msgid "Messages greater than 160 characters will be split into multiple messages"
 msgstr "Los mensajes con más de 160 caracteres se dividirá en varios envios"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Meta Data"
+msgstr ""
+
 #: setup/setup_wizard/operations/install_fixtures.py:263
 #: setup/setup_wizard/operations/install_fixtures.py:379
 msgid "Middle Income"
@@ -41158,32 +41817,32 @@
 msgid "Mismatch"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1132
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1191
 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:548
-#: accounts/doctype/sales_invoice/sales_invoice.py:2044
-#: accounts/doctype/sales_invoice/sales_invoice.py:2602
+#: 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
 msgid "Missing Account"
 msgstr "Cuenta faltante"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1403
+#: accounts/doctype/sales_invoice/sales_invoice.py:1414
 msgid "Missing Asset"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:179 assets/doctype/asset/asset.py:265
+#: accounts/doctype/gl_entry/gl_entry.py:169 assets/doctype/asset/asset.py:267
 msgid "Missing Cost Center"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:309
+#: assets/doctype/asset/asset.py:311
 msgid "Missing Finance Book"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1280
+#: stock/doctype/stock_entry/stock_entry.py:1289
 msgid "Missing Finished Good"
 msgstr ""
 
@@ -41203,7 +41862,7 @@
 msgid "Missing Serial No Bundle"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:743
+#: selling/doctype/customer/customer.py:754
 msgid "Missing Values Required"
 msgstr "Valores faltantes requeridos"
 
@@ -41211,12 +41870,12 @@
 msgid "Missing Warehouse"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:132
+#: stock/doctype/delivery_trip/delivery_trip.js:153
 msgid "Missing email template for dispatch. Please set one in Delivery Settings."
 msgstr "Falta la plantilla de correo electrónico para el envío. Por favor, establezca uno en la configuración de entrega."
 
 #: manufacturing/doctype/bom/bom.py:957
-#: manufacturing/doctype/work_order/work_order.py:979
+#: manufacturing/doctype/work_order/work_order.py:993
 msgid "Missing value"
 msgstr ""
 
@@ -41356,7 +42015,7 @@
 msgid "Mobile No"
 msgstr "Nº Móvil"
 
-#: public/js/utils/contact_address_quick_entry.js:48
+#: public/js/utils/contact_address_quick_entry.js:51
 msgid "Mobile Number"
 msgstr "Número de teléfono móvil"
 
@@ -41369,7 +42028,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/mode_of_payment/mode_of_payment.json
-#: accounts/doctype/payment_order/payment_order.js:109
+#: accounts/doctype/payment_order/payment_order.js:124
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:40
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:47
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:35
@@ -41609,21 +42268,21 @@
 msgid "Month(s) after the end of the invoice month"
 msgstr "Mes(es) después del final del mes de la factura"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:67
+#: 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
-#: buying/report/purchase_analytics/purchase_analytics.js:62
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
-#: manufacturing/report/production_analytics/production_analytics.js:35
-#: public/js/financial_statements.js:217
+#: 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
+#: public/js/financial_statements.js:226
 #: public/js/purchase_trends_filters.js:19 public/js/sales_trends_filters.js:11
-#: public/js/stock_analytics.js:53
-#: selling/report/sales_analytics/sales_analytics.js:62
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
-#: stock/report/stock_analytics/stock_analytics.js:81
-#: support/report/issue_analytics/issue_analytics.js:43
+#: public/js/stock_analytics.js:83
+#: selling/report/sales_analytics/sales_analytics.js:69
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:32
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:32
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:32
+#: stock/report/stock_analytics/stock_analytics.js:80
+#: support/report/issue_analytics/issue_analytics.js:42
 msgid "Monthly"
 msgstr "Mensual"
 
@@ -41673,7 +42332,7 @@
 msgstr "Órdenes de trabajo mensuales completadas"
 
 #. Name of a DocType
-#: accounts/doctype/cost_center/cost_center_tree.js:44
+#: accounts/doctype/cost_center/cost_center_tree.js:69
 #: accounts/doctype/monthly_distribution/monthly_distribution.json
 msgid "Monthly Distribution"
 msgstr "Distribución mensual"
@@ -41919,14 +42578,20 @@
 msgid "More columns found than expected. Please compare the uploaded file with standard template"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:111 stock/doctype/batch/batch_dashboard.py:10
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:58
+#: stock/dashboard/item_dashboard_list.html:52 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:128 stock/doctype/batch/batch_dashboard.py:10
 msgid "Move"
 msgstr "Mover"
 
-#: stock/dashboard/item_dashboard.js:205
+#: stock/dashboard/item_dashboard.js:212
 msgid "Move Item"
 msgstr "Mover elemento"
 
+#: manufacturing/doctype/plant_floor/plant_floor.js:211
+msgid "Move Stock"
+msgstr ""
+
 #: templates/includes/macros.html:169
 msgid "Move to Cart"
 msgstr ""
@@ -41969,11 +42634,11 @@
 msgid "Multi Currency"
 msgstr "Multi moneda"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:42
+#: manufacturing/doctype/bom_creator/bom_creator.js:41
 msgid "Multi-level BOM Creator"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:369
+#: selling/doctype/customer/customer.py:381
 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually."
 msgstr ""
 
@@ -41988,7 +42653,7 @@
 msgid "Multiple Tier Program"
 msgstr "Programa de niveles múltiples"
 
-#: stock/doctype/item/item.js:106
+#: stock/doctype/item/item.js:138
 msgid "Multiple Variants"
 msgstr "Multiples Variantes"
 
@@ -41996,11 +42661,11 @@
 msgid "Multiple Warehouse Accounts"
 msgstr ""
 
-#: controllers/accounts_controller.py:899
+#: controllers/accounts_controller.py:951
 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
 msgstr "Existen varios ejercicios para la fecha {0}. Por favor, establece la compañía en el año fiscal"
 
-#: stock/doctype/stock_entry/stock_entry.py:1287
+#: stock/doctype/stock_entry/stock_entry.py:1296
 msgid "Multiple items cannot be marked as finished item"
 msgstr ""
 
@@ -42037,9 +42702,9 @@
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.py:86
 #: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:357
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:29
-#: manufacturing/doctype/bom_creator/bom_creator.js:45
-#: public/js/utils/serial_no_batch_selector.js:404
-#: selling/doctype/quotation/quotation.js:261
+#: manufacturing/doctype/bom_creator/bom_creator.js:44
+#: public/js/utils/serial_no_batch_selector.js:413
+#: selling/doctype/quotation/quotation.js:273
 msgid "Name"
 msgstr "Nombre"
 
@@ -42097,7 +42762,7 @@
 msgid "Name of Beneficiary"
 msgstr "Nombre del Beneficiario"
 
-#: accounts/doctype/account/account_tree.js:107
+#: accounts/doctype/account/account_tree.js:124
 msgid "Name of new Account. Note: Please don't create accounts for Customers and Suppliers"
 msgstr "Nombre de la nueva cuenta. Nota: Por favor no crear cuentas de clientes y proveedores"
 
@@ -42264,7 +42929,7 @@
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
 msgid "Naming Series and Price Defaults"
-msgstr ""
+msgstr "Series de Nombres y Precios por Defecto"
 
 #. Option for the 'Fuel Type' (Select) field in DocType 'Vehicle'
 #: setup/doctype/vehicle/vehicle.json
@@ -42276,11 +42941,11 @@
 msgid "Needs Analysis"
 msgstr "Necesita Anáisis"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:431
 msgid "Negative Quantity is not allowed"
 msgstr "No se permiten cantidades negativas"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:381
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:435
 msgid "Negative Valuation Rate is not allowed"
 msgstr "La valoración negativa no está permitida"
 
@@ -42577,6 +43242,10 @@
 #: 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
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:124
 #: templates/includes/order/order_taxes.html:5
 msgid "Net Total"
 msgstr "Total neto"
@@ -42764,15 +43433,15 @@
 msgid "Net Weight UOM"
 msgstr "Unidad de medida para el peso neto"
 
-#: controllers/accounts_controller.py:1210
+#: controllers/accounts_controller.py:1277
 msgid "Net total calculation precision loss"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:164
+#: accounts/doctype/account/account_tree.js:241
 msgid "New"
 msgstr "Nuevo"
 
-#: accounts/doctype/account/account_tree.js:106
+#: accounts/doctype/account/account_tree.js:122
 msgid "New Account Name"
 msgstr "Nombre de la nueva cuenta"
 
@@ -42786,7 +43455,7 @@
 msgid "New Assets (This Year)"
 msgstr "Nuevos activos (este año)"
 
-#: manufacturing/doctype/bom/bom_tree.js:56
+#: manufacturing/doctype/bom/bom_tree.js:55
 msgid "New BOM"
 msgstr "Nueva Solicitud de Materiales"
 
@@ -42814,21 +43483,21 @@
 msgid "New Balance In Base Currency"
 msgstr "Nuevo Saldo en Moneda Base"
 
-#: stock/doctype/batch/batch.js:127
+#: stock/doctype/batch/batch.js:146
 msgid "New Batch ID (Optional)"
 msgstr "Nuevo ID de lote (opcional)"
 
-#: stock/doctype/batch/batch.js:121
+#: stock/doctype/batch/batch.js:140
 msgid "New Batch Qty"
 msgstr "Nueva cantidad de lote"
 
-#: accounts/doctype/account/account_tree.js:100
-#: accounts/doctype/cost_center/cost_center_tree.js:16
+#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/cost_center/cost_center_tree.js:18
 #: setup/doctype/company/company_tree.js:23
 msgid "New Company"
 msgstr "Nueva compañia"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:22
+#: accounts/doctype/cost_center/cost_center_tree.js:26
 msgid "New Cost Center Name"
 msgstr "Nombre del nuevo centro de costes"
 
@@ -42848,7 +43517,8 @@
 msgid "New Employee"
 msgstr "Nuevo empleado"
 
-#: public/js/utils/crm_activities.js:81
+#: public/js/templates/crm_activities.html:14
+#: public/js/utils/crm_activities.js:85
 msgid "New Event"
 msgstr "Nuevo Evento"
 
@@ -42874,11 +43544,15 @@
 msgid "New Location"
 msgstr "Nueva ubicacion"
 
+#: public/js/templates/crm_notes.html:7
+msgid "New Note"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
 msgid "New Purchase Invoice"
-msgstr "Nueva factura de compra"
+msgstr "Nueva Factura de Compra"
 
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
@@ -42900,7 +43574,7 @@
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
 msgid "New Sales Invoice"
-msgstr "Nueva factura de venta"
+msgstr "Nueva Factura de Venta"
 
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
@@ -42908,7 +43582,7 @@
 msgid "New Sales Orders"
 msgstr "Nueva orden de venta (OV)"
 
-#: setup/doctype/sales_person/sales_person_tree.js:5
+#: setup/doctype/sales_person/sales_person_tree.js:3
 msgid "New Sales Person Name"
 msgstr "Nombre nuevo encargado de ventas"
 
@@ -42916,15 +43590,16 @@
 msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
 msgstr "El número de serie no tiene almacén asignado. El almacén debe establecerse por entradas de inventario o recibos de compra"
 
-#: public/js/utils/crm_activities.js:63
+#: public/js/templates/crm_activities.html:8
+#: public/js/utils/crm_activities.js:67
 msgid "New Task"
 msgstr "Nueva Tarea"
 
-#: manufacturing/doctype/bom/bom.js:112
+#: manufacturing/doctype/bom/bom.js:111
 msgid "New Version"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse_tree.js:15
+#: stock/doctype/warehouse/warehouse_tree.js:16
 msgid "New Warehouse Name"
 msgstr "Almacén nuevo nombre"
 
@@ -42934,10 +43609,14 @@
 msgid "New Workplace"
 msgstr "Nuevo lugar de trabajo"
 
-#: selling/doctype/customer/customer.py:338
+#: selling/doctype/customer/customer.py:350
 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}"
 msgstr "Nuevo límite de crédito es menor que la cantidad pendiente actual para el cliente. límite de crédito tiene que ser al menos {0}"
 
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:3
+msgid "New fiscal year created :- "
+msgstr ""
+
 #. Description of the 'Generate New Invoices Past Due Date' (Check) field in
 #. DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
@@ -42945,7 +43624,7 @@
 msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
 msgstr "Las nuevas facturas se generarán según el cronograma incluso si las facturas actuales están impagas o vencidas"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:218
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:255
 msgid "New release date should be in the future"
 msgstr "La nueva fecha de lanzamiento debe estar en el futuro"
 
@@ -42953,7 +43632,7 @@
 msgid "New task"
 msgstr "Nueva tarea"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:211
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:213
 msgid "New {0} pricing rules are created"
 msgstr "Se crean nuevas {0} reglas de precios"
 
@@ -43095,7 +43774,7 @@
 msgid "No Account matched these filters: {}"
 msgstr "Ninguna cuenta coincide con estos filtros: {}"
 
-#: quality_management/doctype/quality_review/quality_review_list.js:6
+#: quality_management/doctype/quality_review/quality_review_list.js:5
 msgid "No Action"
 msgstr "Ninguna acción"
 
@@ -43103,46 +43782,54 @@
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
 msgid "No Answer"
-msgstr ""
+msgstr "Sin respuesta"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2146
+#: accounts/doctype/sales_invoice/sales_invoice.py:2115
 msgid "No Customer found for Inter Company Transactions which represents company {0}"
 msgstr "No se encontró ningún cliente para transacciones entre empresas que representen a la empresa {0}"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:118
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:362
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:115
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:350
 msgid "No Customers found with selected options."
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:48
+#: selling/page/sales_funnel/sales_funnel.js:59
 msgid "No Data"
 msgstr "No hay datos"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:122
+#: stock/doctype/delivery_trip/delivery_trip.js:143
 msgid "No Delivery Note selected for Customer {}"
 msgstr "No se ha seleccionado ninguna Nota de Entrega para el Cliente {}"
 
-#: stock/get_item_details.py:199
+#: stock/get_item_details.py:204
 msgid "No Item with Barcode {0}"
 msgstr "Ningún producto con código de barras {0}"
 
-#: stock/get_item_details.py:203
+#: stock/get_item_details.py:208
 msgid "No Item with Serial No {0}"
 msgstr "Ningún producto con numero de serie {0}"
 
-#: controllers/subcontracting_controller.py:1084
+#: controllers/subcontracting_controller.py:1089
 msgid "No Items selected for transfer."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:668
+#: selling/doctype/sales_order/sales_order.js:769
 msgid "No Items with Bill of Materials to Manufacture"
 msgstr "No hay artículos con la lista de materiales para la fabricación de"
 
-#: selling/doctype/sales_order/sales_order.js:782
+#: selling/doctype/sales_order/sales_order.js:898
 msgid "No Items with Bill of Materials."
 msgstr "No hay artículos con lista de materiales."
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:213
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:15
+msgid "No Matching Bank Transactions Found"
+msgstr ""
+
+#: public/js/templates/crm_notes.html:44
+msgid "No Notes"
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:219
 msgid "No Outstanding Invoices found for this party"
 msgstr ""
 
@@ -43150,28 +43837,32 @@
 msgid "No POS Profile found. Please create a New POS Profile first"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1420
-#: accounts/doctype/journal_entry/journal_entry.py:1486
-#: accounts/doctype/journal_entry/journal_entry.py:1509
-#: stock/doctype/item/item.py:1332
+#: 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
 msgid "No Permission"
 msgstr "Sin permiso"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:23
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:38
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:22
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:39
 msgid "No Records for these settings."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
-#: accounts/doctype/sales_invoice/sales_invoice.py:949
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:337
+#: accounts/doctype/sales_invoice/sales_invoice.py:966
 msgid "No Remarks"
 msgstr "No hay observaciones"
 
-#: stock/dashboard/item_dashboard.js:147
+#: stock/dashboard/item_dashboard.js:150
 msgid "No Stock Available Currently"
+msgstr "No hay existencias disponibles actualmente"
+
+#: public/js/templates/call_link.html:30
+msgid "No Summary"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2130
+#: accounts/doctype/sales_invoice/sales_invoice.py:2099
 msgid "No Supplier found for Inter Company Transactions which represents company {0}"
 msgstr "No se encontró ningún proveedor para transacciones entre empresas que represente a la empresa {0}"
 
@@ -43183,32 +43874,32 @@
 msgid "No Terms"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:211
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:216
 msgid "No Unreconciled Invoices and Payments found for this party and account"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:215
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:221
 msgid "No Unreconciled Payments found for this party"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:682
+#: manufacturing/doctype/production_plan/production_plan.py:691
 msgid "No Work Orders were created"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:727
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:606
+#: stock/doctype/purchase_receipt/purchase_receipt.py:726
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:607
 msgid "No accounting entries for the following warehouses"
 msgstr "No hay asientos contables para los siguientes almacenes"
 
-#: selling/doctype/sales_order/sales_order.py:651
+#: selling/doctype/sales_order/sales_order.py:657
 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured"
 msgstr "No se encontró ninguna lista de materiales activa para el artículo {0}. No se puede garantizar la entrega por número de serie"
 
-#: stock/doctype/item_variant_settings/item_variant_settings.js:31
+#: stock/doctype/item_variant_settings/item_variant_settings.js:46
 msgid "No additional fields available"
 msgstr ""
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:429
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:417
 msgid "No billing email found for customer: {0}"
 msgstr ""
 
@@ -43216,7 +43907,7 @@
 msgid "No contacts with email IDs found."
 msgstr "No se encontraron contactos con ID de correo electrónico."
 
-#: selling/page/sales_funnel/sales_funnel.js:115
+#: selling/page/sales_funnel/sales_funnel.js:130
 msgid "No data for this period"
 msgstr "No hay datos para este período."
 
@@ -43224,7 +43915,7 @@
 msgid "No data found. Seems like you uploaded a blank file"
 msgstr ""
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:38
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:37
 msgid "No data to export"
 msgstr "No hay datos para exportar"
 
@@ -43236,11 +43927,15 @@
 msgid "No employee was scheduled for call popup"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1064
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:486
+msgid "No failed logs"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.js:1289
 msgid "No gain or loss in the exchange rate"
 msgstr "No hay ganancia o pérdida en el tipo de cambio"
 
-#: controllers/subcontracting_controller.py:1005
+#: controllers/subcontracting_controller.py:1010
 msgid "No item available for transfer."
 msgstr ""
 
@@ -43253,30 +43948,40 @@
 msgid "No items are available in the sales order {0} for production"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_selector.js:320
+#: selling/page/point_of_sale/pos_item_selector.js:317
 msgid "No items found. Scan barcode again."
 msgstr "No se encontraron artículos. Escanee el código de barras nuevamente."
 
+#: selling/page/point_of_sale/pos_item_cart.js:76
+msgid "No items in cart"
+msgstr ""
+
 #: setup/doctype/email_digest/email_digest.py:168
 msgid "No items to be received are overdue"
 msgstr "No hay elementos para ser recibidos están vencidos"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:424
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:423
 msgid "No matches occurred via auto reconciliation"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:879
+#: manufacturing/doctype/production_plan/production_plan.py:888
 msgid "No material request created"
 msgstr "No se ha creado ninguna solicitud material"
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:198
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:199
 msgid "No more children on Left"
 msgstr ""
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:212
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:213
 msgid "No more children on Right"
 msgstr ""
 
+#. Label of a Int field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "No of Docs"
+msgstr ""
+
 #. Label of a Select field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -43328,6 +44033,14 @@
 msgid "No of Visits"
 msgstr "Número de visitas"
 
+#: public/js/templates/crm_activities.html:104
+msgid "No open event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:57
+msgid "No open task"
+msgstr ""
+
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:315
 msgid "No outstanding invoices found"
 msgstr "No se encontraron facturas pendientes"
@@ -43336,15 +44049,15 @@
 msgid "No outstanding invoices require exchange rate revaluation"
 msgstr "No hay facturas pendientes requieren revalorización del tipo de cambio"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1801
+#: accounts/doctype/payment_entry/payment_entry.py:1820
 msgid "No outstanding {0} found for the {1} {2} which qualify the filters you have specified."
 msgstr ""
 
-#: public/js/controllers/buying.js:439
+#: public/js/controllers/buying.js:436
 msgid "No pending Material Requests found to link for the given items."
 msgstr "No se encontraron solicitudes de material pendientes de vincular para los artículos dados."
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:436
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:424
 msgid "No primary email found for customer: {0}"
 msgstr ""
 
@@ -43358,15 +44071,15 @@
 msgid "No record found"
 msgstr "No se han encontraron registros"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:677
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:687
 msgid "No records found in Allocation table"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:579
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:584
 msgid "No records found in the Invoices table"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:582
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:587
 msgid "No records found in the Payments table"
 msgstr ""
 
@@ -43377,7 +44090,7 @@
 msgid "No stock transactions can be created or modified before this date."
 msgstr ""
 
-#: controllers/accounts_controller.py:2435
+#: controllers/accounts_controller.py:2520
 msgid "No updates pending for reposting"
 msgstr ""
 
@@ -43385,15 +44098,15 @@
 msgid "No values"
 msgstr "Sin valores"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:340
 msgid "No {0} Accounts found for this company."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2197
+#: accounts/doctype/sales_invoice/sales_invoice.py:2166
 msgid "No {0} found for Inter Company Transactions."
 msgstr "No se ha encontrado {0} para transacciones entre empresas."
 
-#: assets/doctype/asset/asset.js:239
+#: assets/doctype/asset/asset.js:274
 msgid "No."
 msgstr ""
 
@@ -43403,7 +44116,7 @@
 msgid "No. of Employees"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.js:42
+#: manufacturing/doctype/workstation/workstation.js:66
 msgid "No. of parallel job cards which can be allowed on this workstation. Example: 2 would mean this workstation can process production for two Work Orders at a time."
 msgstr ""
 
@@ -43429,7 +44142,7 @@
 msgid "Non Profit"
 msgstr "Sin fines de lucro"
 
-#: manufacturing/doctype/bom/bom.py:1305
+#: manufacturing/doctype/bom/bom.py:1304
 msgid "Non stock items"
 msgstr "Artículos sin stock"
 
@@ -43440,7 +44153,7 @@
 msgid "None"
 msgstr "Ninguna"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:315
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:369
 msgid "None of the items have any change in quantity or value."
 msgstr "Ninguno de los productos tiene cambios en el valor o en la existencias."
 
@@ -43453,11 +44166,11 @@
 
 #: 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:525
-#: assets/doctype/asset/asset.js:530 assets/doctype/asset/asset.js:547
+#: accounts/doctype/sales_invoice/sales_invoice.py:538
+#: assets/doctype/asset/asset.js:603 assets/doctype/asset/asset.js:620
 #: controllers/buying_controller.py:206
 #: selling/doctype/product_bundle/product_bundle.py:71
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:48
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:72
 msgid "Not Allowed"
 msgstr "No permitido"
 
@@ -43473,8 +44186,8 @@
 msgid "Not Applicable"
 msgstr "No aplicable"
 
-#: selling/page/point_of_sale/pos_controller.js:671
-#: selling/page/point_of_sale/pos_controller.js:694
+#: selling/page/point_of_sale/pos_controller.js:703
+#: selling/page/point_of_sale/pos_controller.js:732
 msgid "Not Available"
 msgstr "No disponible"
 
@@ -43497,8 +44210,8 @@
 msgid "Not Initiated"
 msgstr "No iniciado"
 
-#: buying/doctype/purchase_order/purchase_order.py:744
-#: templates/pages/material_request_info.py:21 templates/pages/order.py:32
+#: buying/doctype/purchase_order/purchase_order.py:747
+#: templates/pages/material_request_info.py:21 templates/pages/order.py:34
 #: templates/pages/rfq.py:48
 msgid "Not Permitted"
 msgstr "No permitido"
@@ -43518,7 +44231,7 @@
 msgstr "No especificado"
 
 #: manufacturing/doctype/production_plan/production_plan_list.js:7
-#: manufacturing/doctype/work_order/work_order_list.js:7
+#: manufacturing/doctype/work_order/work_order_list.js:15
 #: stock/doctype/material_request/material_request_list.js:9
 msgid "Not Started"
 msgstr "No iniciado"
@@ -43550,11 +44263,11 @@
 msgid "Not allow to set alternative item for the item {0}"
 msgstr "No permitir establecer un elemento alternativo para el Artículo {0}"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:48
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:52
 msgid "Not allowed to create accounting dimension for {0}"
 msgstr "No se permite crear una dimensión contable para {0}"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:254
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:265
 msgid "Not allowed to update stock transactions older than {0}"
 msgstr "No tiene permisos para actualizar las transacciones de stock mayores al  {0}"
 
@@ -43562,31 +44275,37 @@
 msgid "Not authorized since {0} exceeds limits"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:445
+#: accounts/doctype/gl_entry/gl_entry.py:399
 msgid "Not authorized to edit frozen Account {0}"
 msgstr "No autorizado para editar la cuenta congelada {0}"
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "Not in Stock"
+msgstr ""
+
 #: templates/includes/products_as_grid.html:20
 msgid "Not in stock"
 msgstr "No disponible en stock"
 
-#: buying/doctype/purchase_order/purchase_order.py:667
-#: manufacturing/doctype/work_order/work_order.py:1256
-#: manufacturing/doctype/work_order/work_order.py:1390
-#: manufacturing/doctype/work_order/work_order.py:1440
-#: selling/doctype/sales_order/sales_order.py:755
-#: selling/doctype/sales_order/sales_order.py:1504
+#: 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
 msgid "Not permitted"
 msgstr "No permitido"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:240
+#: 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:1607
-#: public/js/controllers/buying.js:440 selling/doctype/customer/customer.py:125
-#: selling/doctype/sales_order/sales_order.js:957
-#: stock/doctype/item/item.js:426 stock/doctype/item/item.py:539
-#: stock/doctype/stock_entry/stock_entry.py:1288
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:732
+#: 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
+#: 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
+#: templates/pages/timelog_info.html:43
 msgid "Note"
 msgstr "Nota"
 
@@ -43623,15 +44342,15 @@
 msgid "Note: Email will not be sent to disabled users"
 msgstr "Nota: El correo electrónico no se enviará a los usuarios deshabilitados"
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:53
+#: manufacturing/doctype/blanket_order/blanket_order.py:91
 msgid "Note: Item {0} added multiple times"
 msgstr "Nota: elemento {0} agregado varias veces"
 
-#: controllers/accounts_controller.py:450
+#: controllers/accounts_controller.py:494
 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
 msgstr "Nota : El registro del pago no se creará hasta que la cuenta del tipo 'Banco o Cajas' sea definida"
 
-#: accounts/doctype/cost_center/cost_center.js:32
+#: accounts/doctype/cost_center/cost_center.js:30
 msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups."
 msgstr "Nota: este centro de costes es una categoría. No se pueden crear asientos contables en las categorías."
 
@@ -43639,10 +44358,12 @@
 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:895
+#: accounts/doctype/journal_entry/journal_entry.py:922
 msgid "Note: {0}"
 msgstr "Nota: {0}"
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
 #: www/book_appointment/index.html:55
 msgid "Notes"
 msgstr "Notas"
@@ -43834,12 +44555,6 @@
 msgid "Number of Depreciations Booked"
 msgstr "Cantidad de Depreciaciones Reservadas"
 
-#. Label of a Data field in DocType 'Transaction Deletion Record Item'
-#: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
-msgctxt "Transaction Deletion Record Item"
-msgid "Number of Docs"
-msgstr ""
-
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:14
 msgid "Number of Interaction"
 msgstr "Número de Interacciones"
@@ -43874,11 +44589,11 @@
 msgid "Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days"
 msgstr "Número de intervalos para el campo de intervalo, por ejemplo, si el intervalo es &#39;Días&#39; y el recuento del intervalo de facturación es 3, las facturas se generarán cada 3 días"
 
-#: accounts/doctype/account/account_tree.js:109
+#: accounts/doctype/account/account_tree.js:132
 msgid "Number of new Account, it will be included in the account name as a prefix"
 msgstr "Número de Cuenta Nueva, se incluirá en el nombre de la cuenta como prefijo"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:26
+#: accounts/doctype/cost_center/cost_center_tree.js:39
 msgid "Number of new Cost Center, it will be included in the cost center name as a prefix"
 msgstr "Número de centro de coste nuevo: se incluirá en el nombre del centro de coste como prefijo."
 
@@ -43953,6 +44668,12 @@
 msgid "Odometer Value (Last)"
 msgstr "Valor del cuentakilómetros (Última)"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Off"
+msgstr "Apagado"
+
 #. Label of a Date field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -43980,7 +44701,7 @@
 msgid "Offsetting Account"
 msgstr ""
 
-#: accounts/general_ledger.py:77
+#: accounts/general_ledger.py:81
 msgid "Offsetting for Accounting Dimension"
 msgstr ""
 
@@ -44030,11 +44751,11 @@
 msgid "On Converting Opportunity"
 msgstr "Sobre la oportunidad de conversión"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:31
-#: buying/doctype/purchase_order/purchase_order_list.js:8
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:27
+#: buying/doctype/purchase_order/purchase_order_list.js:17
 #: buying/doctype/supplier/supplier_list.js:5
-#: selling/doctype/sales_order/sales_order_list.js:10
-#: support/report/issue_summary/issue_summary.js:45
+#: 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
 msgid "On Hold"
 msgstr ""
@@ -44151,10 +44872,17 @@
 msgid "On Track"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:540
+#: manufacturing/doctype/production_plan/production_plan.js:584
 msgid "On expanding a row in the Items to Manufacture table, you'll see an option to 'Include Exploded Items'. Ticking this includes raw materials of the sub-assembly items in the production process."
 msgstr ""
 
+#. Description of the 'Use Serial / Batch Fields' (Check) field in DocType
+#. 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "On submission of the stock transaction, system will auto create the Serial and Batch Bundle based on the Serial No / Batch fields."
+msgstr ""
+
 #: setup/default_energy_point_rules.py:43
 msgid "On {0} Creation"
 msgstr "En {0} Creación"
@@ -44171,10 +44899,14 @@
 msgid "Once set, this invoice will be on hold till the set date"
 msgstr "Una vez configurado, esta factura estará en espera hasta la fecha establecida"
 
-#: manufacturing/doctype/work_order/work_order.js:560
+#: manufacturing/doctype/work_order/work_order.js:591
 msgid "Once the Work Order is Closed. It can't be resumed."
 msgstr ""
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:16
+msgid "One customer can be part of only single Loyalty Program."
+msgstr ""
+
 #: manufacturing/dashboard_fixtures.py:228
 msgid "Ongoing Job Cards"
 msgstr "Tarjetas de trabajo en curso"
@@ -44201,11 +44933,11 @@
 msgid "Only Include Allocated Payments"
 msgstr ""
 
-#: accounts/doctype/account/account.py:134
+#: accounts/doctype/account/account.py:135
 msgid "Only Parent can be of type {0}"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:44
+#: assets/report/fixed_asset_register/fixed_asset_register.js:43
 msgid "Only existing assets"
 msgstr ""
 
@@ -44225,6 +44957,10 @@
 msgid "Only one Subcontracting Order can be created against a Purchase Order, cancel the existing Subcontracting Order to create a new one."
 msgstr ""
 
+#: stock/doctype/stock_entry/stock_entry.py:898
+msgid "Only one {0} entry can be created against the Work Order {1}"
+msgstr ""
+
 #. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
 #: accounts/doctype/pos_profile/pos_profile.json
 msgctxt "POS Profile"
@@ -44249,13 +44985,14 @@
 msgid "Only {0} are supported"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:35
+#: crm/report/lead_details/lead_details.js:34
 #: manufacturing/report/job_card_summary/job_card_summary.py:92
 #: quality_management/doctype/quality_meeting/quality_meeting_list.js:5
-#: selling/doctype/quotation/quotation_list.js:27
-#: support/report/issue_analytics/issue_analytics.js:56
-#: support/report/issue_summary/issue_summary.js:43
+#: 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
+#: templates/pages/task_info.html:72
 msgid "Open"
 msgstr "Abrir/Abierto"
 
@@ -44386,11 +45123,27 @@
 msgid "Open Activities HTML"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:114
+#: manufacturing/doctype/bom/bom_item_preview.html:21
+msgid "Open BOM {0}"
+msgstr ""
+
+#: public/js/templates/call_link.html:11
+msgid "Open Call Log"
+msgstr ""
+
+#: public/js/call_popup/call_popup.js:116
 msgid "Open Contact"
 msgstr "Contacto abierto"
 
-#: selling/page/point_of_sale/pos_controller.js:172
+#: public/js/templates/crm_activities.html:76
+msgid "Open Event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:63
+msgid "Open Events"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_controller.js:189
 msgid "Open Form View"
 msgstr "Abrir vista de formulario"
 
@@ -44404,6 +45157,11 @@
 msgid "Open Issues "
 msgstr "Incidencias Abiertas"
 
+#: manufacturing/doctype/bom/bom_item_preview.html:25
+#: manufacturing/doctype/work_order/work_order_preview.html:28
+msgid "Open Item {0}"
+msgstr ""
+
 #: setup/doctype/email_digest/templates/default.html:154
 msgid "Open Notifications"
 msgstr "Abrir notificaciones"
@@ -44439,6 +45197,14 @@
 msgid "Open Sales Orders"
 msgstr ""
 
+#: public/js/templates/crm_activities.html:33
+msgid "Open Task"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:21
+msgid "Open Tasks"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
@@ -44449,6 +45215,10 @@
 msgid "Open To Do "
 msgstr "Lista de tareas abiertas"
 
+#: manufacturing/doctype/work_order/work_order_preview.html:24
+msgid "Open Work Order {0}"
+msgstr ""
+
 #. Name of a report
 #: manufacturing/report/open_work_orders/open_work_orders.json
 msgid "Open Work Orders"
@@ -44459,7 +45229,7 @@
 msgstr "Abra un nuevo ticket"
 
 #: accounts/report/general_ledger/general_ledger.py:56
-#: public/js/stock_analytics.js:64
+#: public/js/stock_analytics.js:97
 msgid "Opening"
 msgstr "Apertura"
 
@@ -44497,7 +45267,7 @@
 msgid "Opening Accumulated Depreciation"
 msgstr "Apertura de la depreciación acumulada"
 
-#: assets/doctype/asset/asset.py:428
+#: assets/doctype/asset/asset.py:430
 msgid "Opening Accumulated Depreciation must be less than or equal to {0}"
 msgstr ""
 
@@ -44547,7 +45317,7 @@
 msgid "Opening Entry"
 msgstr "Asiento de apertura"
 
-#: accounts/general_ledger.py:676
+#: accounts/general_ledger.py:685
 msgid "Opening Entry can not be created after Period Closing Voucher is created."
 msgstr ""
 
@@ -44556,7 +45326,7 @@
 msgstr "Creación de factura de apertura en curso"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/account/account_tree.js:189
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
 msgid "Opening Invoice Creation Tool"
 msgstr "Herramienta de Apertura de Creación de Facturas"
@@ -44577,12 +45347,16 @@
 msgid "Opening Invoice Item"
 msgstr "Abrir el Artículo de la Factura"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:125
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:8
+msgid "Opening Invoices"
+msgstr ""
+
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:128
 msgid "Opening Invoices Summary"
 msgstr "Resumen de Facturas de Apertura"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:79
-#: stock/report/stock_balance/stock_balance.py:419
+#: stock/report/stock_balance/stock_balance.py:427
 msgid "Opening Qty"
 msgstr "Cant. de Apertura"
 
@@ -44608,7 +45382,7 @@
 msgid "Opening Time"
 msgstr "Hora de Apertura"
 
-#: stock/report/stock_balance/stock_balance.py:426
+#: stock/report/stock_balance/stock_balance.py:434
 msgid "Opening Value"
 msgstr "Valor de apertura"
 
@@ -44617,7 +45391,7 @@
 msgid "Opening and Closing"
 msgstr "Abriendo y cerrando"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:30
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:31
 msgid "Opening {0} Invoices created"
 msgstr ""
 
@@ -44649,7 +45423,7 @@
 msgid "Operating Cost Per BOM Quantity"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1321
+#: manufacturing/doctype/bom/bom.py:1320
 msgid "Operating Cost as per Work Order / BOM"
 msgstr "Costo operativo según la orden de trabajo / BOM"
 
@@ -44673,14 +45447,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/bom/bom.js:319
+#: manufacturing/doctype/bom/bom.js:332
 #: manufacturing/doctype/operation/operation.json
-#: manufacturing/doctype/work_order/work_order.js:225
+#: manufacturing/doctype/work_order/work_order.js:240
 #: 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:48
+#: 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/job_card_summary/job_card_summary.js:79
+#: manufacturing/report/job_card_summary/job_card_summary.js:78
 #: manufacturing/report/job_card_summary/job_card_summary.py:167
 msgid "Operation"
 msgstr "Operación"
@@ -44775,7 +45549,7 @@
 msgid "Operation ID"
 msgstr "ID de operación"
 
-#: manufacturing/doctype/work_order/work_order.js:239
+#: manufacturing/doctype/work_order/work_order.js:254
 msgid "Operation Id"
 msgstr "ID de operación"
 
@@ -44803,7 +45577,7 @@
 msgid "Operation Time "
 msgstr "Tiempo de operacion"
 
-#: manufacturing/doctype/work_order/work_order.py:985
+#: manufacturing/doctype/work_order/work_order.py:999
 msgid "Operation Time must be greater than 0 for Operation {0}"
 msgstr "El tiempo de operación debe ser mayor que 0 para {0}"
 
@@ -44820,20 +45594,20 @@
 msgid "Operation time does not depend on quantity to produce"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:215
+#: manufacturing/doctype/job_card/job_card.js:238
 msgid "Operation {0} added multiple times in the work order {1}"
 msgstr "Operación {0} agregada varias veces en la orden de trabajo {1}"
 
-#: manufacturing/doctype/job_card/job_card.py:975
+#: manufacturing/doctype/job_card/job_card.py:990
 msgid "Operation {0} does not belong to the work order {1}"
 msgstr "La operación {0} no pertenece a la orden de trabajo {1}"
 
-#: manufacturing/doctype/workstation/workstation.py:179
+#: manufacturing/doctype/workstation/workstation.py:335
 msgid "Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations"
 msgstr "La operación {0} tomará mas tiempo que la capacidad de producción de la estación {1}, por favor divida la tarea en varias operaciones"
 
-#: manufacturing/doctype/work_order/work_order.js:220
-#: setup/doctype/company/company.py:341 templates/generators/bom.html:61
+#: manufacturing/doctype/work_order/work_order.js:235
+#: setup/doctype/company/company.py:340 templates/generators/bom.html:61
 msgid "Operations"
 msgstr "Operaciones"
 
@@ -44863,6 +45637,7 @@
 msgid "Operations cannot be left blank"
 msgstr "Las operaciones no pueden dejarse en blanco"
 
+#: manufacturing/doctype/workstation/workstation.js:165
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:85
 msgid "Operator"
 msgstr "Operador"
@@ -44894,17 +45669,17 @@
 msgid "Opportunities"
 msgstr "Oportunidades"
 
-#: selling/page/sales_funnel/sales_funnel.js:43
+#: selling/page/sales_funnel/sales_funnel.js:48
 msgid "Opportunities by lead source"
 msgstr "Oportunidades por fuente de iniciativa"
 
 #. Name of a DocType
-#: buying/doctype/request_for_quotation/request_for_quotation.js:318
-#: crm/doctype/lead/lead.js:36 crm/doctype/opportunity/opportunity.json
-#: crm/doctype/prospect/prospect.js:15
-#: crm/report/lead_details/lead_details.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: crm/doctype/lead/lead.js:33 crm/doctype/opportunity/opportunity.json
+#: crm/doctype/prospect/prospect.js:20
+#: crm/report/lead_details/lead_details.js:36
 #: crm/report/lost_opportunity/lost_opportunity.py:17
-#: public/js/communication.js:26 selling/doctype/quotation/quotation.js:133
+#: public/js/communication.js:35 selling/doctype/quotation/quotation.js:139
 msgid "Opportunity"
 msgstr "Oportunidad"
 
@@ -44973,7 +45748,7 @@
 msgid "Opportunity Date"
 msgstr "Fecha de oportunidad"
 
-#: crm/report/lost_opportunity/lost_opportunity.js:43
+#: crm/report/lost_opportunity/lost_opportunity.js:42
 #: crm/report/lost_opportunity/lost_opportunity.py:24
 msgid "Opportunity From"
 msgstr "Oportunidad desde"
@@ -45018,7 +45793,7 @@
 msgstr "Detalle de motivo de pérdida de oportunidad"
 
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:32
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:55
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:57
 msgid "Opportunity Owner"
 msgstr ""
 
@@ -45028,8 +45803,8 @@
 msgid "Opportunity Owner"
 msgstr ""
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:47
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:59
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:45
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:58
 msgid "Opportunity Source"
 msgstr ""
 
@@ -45046,9 +45821,9 @@
 #. Name of a DocType
 #: crm/doctype/opportunity_type/opportunity_type.json
 #: crm/report/lost_opportunity/lost_opportunity.py:44
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:53
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:51
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:48
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:65
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:64
 msgid "Opportunity Type"
 msgstr "Tipo de oportunidad"
 
@@ -45064,7 +45839,7 @@
 msgid "Opportunity Value"
 msgstr ""
 
-#: public/js/communication.js:86
+#: public/js/communication.js:102
 msgid "Opportunity {0} created"
 msgstr "Oportunidad {0} creada"
 
@@ -45074,11 +45849,11 @@
 msgid "Optimize Route"
 msgstr "Optimizar Ruta"
 
-#: accounts/doctype/account/account_tree.js:122
+#: accounts/doctype/account/account_tree.js:168
 msgid "Optional. Sets company's default currency, if not specified."
 msgstr "Opcional. Establece moneda por defecto de la empresa, si no se especifica."
 
-#: accounts/doctype/account/account_tree.js:117
+#: accounts/doctype/account/account_tree.js:155
 msgid "Optional. This setting will be used to filter in various transactions."
 msgstr "Opcional. Esta configuración es utilizada para filtrar la cuenta de otras transacciones"
 
@@ -45106,7 +45881,7 @@
 msgid "Order Amount"
 msgstr "Total de la orden"
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:81
+#: manufacturing/report/production_planning_report/production_planning_report.js:80
 msgid "Order By"
 msgstr "Ordenar por"
 
@@ -45151,9 +45926,13 @@
 msgid "Order Status"
 msgstr ""
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:30
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:8
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:8
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:4
+msgid "Order Summary"
+msgstr ""
+
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:29
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:7
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:7
 msgid "Order Type"
 msgstr "Tipo de orden"
 
@@ -45186,8 +45965,8 @@
 msgstr ""
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:5
-#: selling/doctype/quotation/quotation_list.js:31
-#: stock/doctype/material_request/material_request_list.js:25
+#: selling/doctype/quotation/quotation_list.js:30
+#: stock/doctype/material_request/material_request_list.js:29
 msgid "Ordered"
 msgstr "Ordenado/a"
 
@@ -45208,37 +45987,41 @@
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:49
 #: stock/report/stock_projected_qty/stock_projected_qty.py:157
 msgid "Ordered Qty"
-msgstr "Cantidad ordenada"
+msgstr "Cant. ordenada"
 
 #. Label of a Float field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "Ordered Qty"
-msgstr "Cantidad ordenada"
+msgstr "Cant. ordenada"
 
 #. Label of a Float field in DocType 'Material Request Plan Item'
 #: manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
 msgctxt "Material Request Plan Item"
 msgid "Ordered Qty"
-msgstr "Cantidad ordenada"
+msgstr "Cant. ordenada"
 
 #. Label of a Float field in DocType 'Packed Item'
 #: stock/doctype/packed_item/packed_item.json
 msgctxt "Packed Item"
 msgid "Ordered Qty"
-msgstr "Cantidad ordenada"
+msgstr "Cant. ordenada"
 
 #. Label of a Float field in DocType 'Production Plan Item'
 #: manufacturing/doctype/production_plan_item/production_plan_item.json
 msgctxt "Production Plan Item"
 msgid "Ordered Qty"
-msgstr "Cantidad ordenada"
+msgstr "Cant. ordenada"
 
 #. Label of a Float field in DocType 'Sales Order Item'
 #: selling/doctype/sales_order_item/sales_order_item.json
 msgctxt "Sales Order Item"
 msgid "Ordered Qty"
-msgstr "Cantidad ordenada"
+msgstr "Cant. ordenada"
+
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Ordered Qty: Quantity ordered for purchase, but not received."
+msgstr ""
 
 #: stock/report/item_shortage_report/item_shortage_report.py:102
 msgid "Ordered Quantity"
@@ -45252,7 +46035,7 @@
 
 #: buying/doctype/supplier/supplier_dashboard.py:14
 #: selling/doctype/customer/customer_dashboard.py:21
-#: selling/doctype/sales_order/sales_order.py:745
+#: selling/doctype/sales_order/sales_order.py:751
 #: setup/doctype/company/company_dashboard.py:23
 msgid "Orders"
 msgstr "Órdenes"
@@ -45384,12 +46167,12 @@
 msgstr "Otros ajustes"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:81
-#: stock/report/stock_balance/stock_balance.py:441
-#: stock/report/stock_ledger/stock_ledger.py:146
+#: stock/report/stock_balance/stock_balance.py:449
+#: stock/report/stock_ledger/stock_ledger.py:219
 msgid "Out Qty"
 msgstr "Cant. enviada"
 
-#: stock/report/stock_balance/stock_balance.py:447
+#: stock/report/stock_balance/stock_balance.py:455
 msgid "Out Value"
 msgstr "Fuera de Valor"
 
@@ -45406,7 +46189,7 @@
 msgid "Out of AMC"
 msgstr "Fuera de CMA (Contrato de mantenimiento anual)"
 
-#: assets/doctype/asset/asset_list.js:23
+#: assets/doctype/asset/asset_list.js:17
 msgid "Out of Order"
 msgstr "Fuera de servicio"
 
@@ -45416,7 +46199,7 @@
 msgid "Out of Order"
 msgstr "Fuera de servicio"
 
-#: stock/doctype/pick_list/pick_list.py:386
+#: stock/doctype/pick_list/pick_list.py:426
 msgid "Out of Stock"
 msgstr "Agotado"
 
@@ -45487,9 +46270,10 @@
 msgid "Outstanding"
 msgstr "Excepcional"
 
-#: accounts/doctype/payment_entry/payment_entry.js:653
+#: 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.py:1074
+#: 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/purchase_register/purchase_register.py:289
 #: accounts/report/sales_register/sales_register.py:317
@@ -45546,7 +46330,7 @@
 msgid "Outstanding Cheques and Deposits to clear"
 msgstr "Cheques pendientes y Depósitos para despejar"
 
-#: accounts/doctype/gl_entry/gl_entry.py:422
+#: accounts/doctype/gl_entry/gl_entry.py:376
 msgid "Outstanding for {0} cannot be less than zero ({1})"
 msgstr "El pago pendiente para {0} no puede ser menor que cero ({1})"
 
@@ -45595,7 +46379,7 @@
 msgid "Over Delivery/Receipt Allowance (%)"
 msgstr ""
 
-#: controllers/stock_controller.py:896
+#: controllers/stock_controller.py:1082
 msgid "Over Receipt"
 msgstr ""
 
@@ -45619,13 +46403,14 @@
 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role."
 msgstr ""
 
-#: controllers/accounts_controller.py:1713
+#: controllers/accounts_controller.py:1802
 msgid "Overbilling of {} ignored because you have {} role."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:261
+#: accounts/doctype/sales_invoice/sales_invoice.py:266
 #: projects/report/project_summary/project_summary.py:94
-#: selling/doctype/sales_order/sales_order_list.js:18
+#: selling/doctype/sales_order/sales_order_list.js:29
+#: templates/pages/task_info.html:75
 msgid "Overdue"
 msgstr "Atrasado"
 
@@ -45835,11 +46620,11 @@
 msgid "POS Closing Entry Taxes"
 msgstr "Impuestos de entrada al cierre de POS"
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:30
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:31
 msgid "POS Closing Failed"
 msgstr ""
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:54
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:55
 msgid "POS Closing failed while running in a background process. You can resolve the {0} and retry the process again."
 msgstr ""
 
@@ -45986,10 +46771,10 @@
 
 #. Name of a DocType
 #: accounts/doctype/pos_profile/pos_profile.json
-#: accounts/report/pos_register/pos_register.js:33
+#: accounts/report/pos_register/pos_register.js:32
 #: accounts/report/pos_register/pos_register.py:120
 #: accounts/report/pos_register/pos_register.py:193
-#: selling/page/point_of_sale/pos_controller.js:68
+#: selling/page/point_of_sale/pos_controller.js:80
 msgid "POS Profile"
 msgstr "Perfil de POS"
 
@@ -46026,7 +46811,7 @@
 msgid "POS Profile doesn't matches {}"
 msgstr "El perfil de POS no coincide {}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1119
+#: accounts/doctype/sales_invoice/sales_invoice.py:1135
 msgid "POS Profile required to make POS Entry"
 msgstr "Se requiere un perfil de TPV para crear entradas en el punto de venta"
 
@@ -46077,7 +46862,7 @@
 msgid "POS Transactions"
 msgstr "Transacciones POS"
 
-#: selling/page/point_of_sale/pos_controller.js:363
+#: selling/page/point_of_sale/pos_controller.js:392
 msgid "POS invoice {0} created successfully"
 msgstr ""
 
@@ -46150,7 +46935,7 @@
 msgid "Package Weight Details"
 msgstr "Detalles del peso del paquete"
 
-#: stock/doctype/delivery_note/delivery_note_list.js:65
+#: stock/doctype/delivery_note/delivery_note_list.js:74
 msgid "Packaging Slip From Delivery Note"
 msgstr ""
 
@@ -46183,7 +46968,7 @@
 msgid "Packed Items"
 msgstr "Productos Empacados"
 
-#: controllers/stock_controller.py:739
+#: controllers/stock_controller.py:922
 msgid "Packed Items cannot be transferred internally"
 msgstr ""
 
@@ -46224,7 +47009,7 @@
 msgstr "Lista de Embalaje"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:186
+#: stock/doctype/delivery_note/delivery_note.js:221
 #: stock/doctype/packing_slip/packing_slip.json
 msgid "Packing Slip"
 msgstr "Lista de embalaje"
@@ -46240,7 +47025,7 @@
 msgid "Packing Slip Item"
 msgstr "Lista de embalaje del producto"
 
-#: stock/doctype/delivery_note/delivery_note.py:704
+#: stock/doctype/delivery_note/delivery_note.py:765
 msgid "Packing Slip(s) cancelled"
 msgstr "Lista(s) de embalaje cancelada(s)"
 
@@ -46350,8 +47135,8 @@
 msgid "Page {0} of {1}"
 msgstr "Página {0} de {1}"
 
-#: accounts/doctype/payment_request/payment_request_list.js:17
-#: accounts/doctype/sales_invoice/sales_invoice.py:267
+#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/sales_invoice/sales_invoice.py:272
 msgid "Paid"
 msgstr "Pagado"
 
@@ -46380,10 +47165,12 @@
 msgstr "Pagado"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:170
-#: accounts/report/accounts_receivable/accounts_receivable.py:1068
+#: 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
+#: 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"
 msgstr "Cantidad Pagada"
@@ -46460,7 +47247,7 @@
 msgid "Paid Amount After Tax (Company Currency)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:881
+#: accounts/doctype/payment_entry/payment_entry.js:1059
 msgid "Paid Amount cannot be greater than total negative outstanding amount {0}"
 msgstr "La cantidad pagada no puede ser superior a cantidad pendiente negativa total de {0}"
 
@@ -46482,8 +47269,8 @@
 msgid "Paid To Account Type"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:324
-#: accounts/doctype/sales_invoice/sales_invoice.py:994
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:328
+#: accounts/doctype/sales_invoice/sales_invoice.py:1011
 msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
 msgstr "El total de la cantidad pagada + desajuste, no puede ser mayor que el gran total"
 
@@ -46627,7 +47414,7 @@
 msgid "Parent Company"
 msgstr "Empresa Matriz"
 
-#: setup/doctype/company/company.py:460
+#: setup/doctype/company/company.py:459
 msgid "Parent Company must be a group company"
 msgstr "La empresa matriz debe ser una empresa grupal"
 
@@ -46737,12 +47524,6 @@
 msgid "Parent Warehouse"
 msgstr "Almacén Padre"
 
-#. Label of a Link field in DocType 'Pick List'
-#: stock/doctype/pick_list/pick_list.json
-msgctxt "Pick List"
-msgid "Parent Warehouse"
-msgstr "Almacén Padre"
-
 #. Label of a Link field in DocType 'Warehouse'
 #: stock/doctype/warehouse/warehouse.json
 msgctxt "Warehouse"
@@ -46755,7 +47536,7 @@
 msgid "Partial Material Transferred"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1043
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1045
 msgid "Partial Stock Reservation"
 msgstr ""
 
@@ -46798,7 +47579,7 @@
 msgid "Partially Delivered"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:8
+#: assets/doctype/asset/asset_list.js:7
 msgid "Partially Depreciated"
 msgstr "Despreciables Parcialmente"
 
@@ -46814,7 +47595,7 @@
 msgid "Partially Fulfilled"
 msgstr "Parcialmente Cumplido"
 
-#: selling/doctype/quotation/quotation_list.js:29
+#: selling/doctype/quotation/quotation_list.js:28
 msgid "Partially Ordered"
 msgstr "Parcialmente ordenado"
 
@@ -46830,7 +47611,7 @@
 msgid "Partially Ordered"
 msgstr "Parcialmente ordenado"
 
-#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/payment_request/payment_request_list.js:12
 msgid "Partially Paid"
 msgstr "Parcialmente pagado"
 
@@ -46854,7 +47635,7 @@
 msgid "Partially Paid"
 msgstr "Parcialmente pagado"
 
-#: stock/doctype/material_request/material_request_list.js:21
+#: stock/doctype/material_request/material_request_list.js:25
 msgid "Partially Received"
 msgstr "Parcialmente recibido"
 
@@ -46900,7 +47681,7 @@
 msgid "Parties"
 msgstr "Fiestas"
 
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:14
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:23
 msgid "Partly Billed"
 msgstr "Parcialmente facturado"
 
@@ -46958,30 +47739,38 @@
 msgid "Partnership"
 msgstr ""
 
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Parts Per Hour"
+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
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:193
 #: accounts/doctype/tax_category/tax_category_dashboard.py:11
-#: accounts/report/accounts_payable/accounts_payable.js:109
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:86
-#: accounts/report/accounts_receivable/accounts_receivable.js:54
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:86
+#: accounts/report/accounts_payable/accounts_payable.js:112
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:89
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.js:74
-#: accounts/report/general_ledger/general_ledger.py:633
-#: accounts/report/payment_ledger/payment_ledger.js:52
+#: accounts/report/general_ledger/general_ledger.py:646
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:92
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:27
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:27
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:26
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:26
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:57
-#: crm/report/lost_opportunity/lost_opportunity.js:56
+#: crm/report/lost_opportunity/lost_opportunity.js:55
 #: crm/report/lost_opportunity/lost_opportunity.py:31
-#: public/js/bank_reconciliation_tool/data_table_manager.js:51
-#: public/js/bank_reconciliation_tool/dialog_manager.js:128
+#: public/js/bank_reconciliation_tool/data_table_manager.js:50
+#: public/js/bank_reconciliation_tool/dialog_manager.js:135
 msgid "Party"
 msgstr "Tercero"
 
@@ -47123,16 +47912,10 @@
 msgid "Party Account No. (Bank Statement)"
 msgstr ""
 
-#: controllers/accounts_controller.py:1983
+#: controllers/accounts_controller.py:2075
 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same"
 msgstr ""
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Party Balance"
-msgstr "Saldo de tercero/s"
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47175,13 +47958,19 @@
 msgid "Party Information"
 msgstr "Información del partido"
 
+#. Label of a Data field in DocType 'Blanket Order Item'
+#: manufacturing/doctype/blanket_order_item/blanket_order_item.json
+msgctxt "Blanket Order Item"
+msgid "Party Item Code"
+msgstr ""
+
 #. Name of a DocType
 #: accounts/doctype/party_link/party_link.json
 msgid "Party Link"
 msgstr ""
 
 #: accounts/report/general_ledger/general_ledger.js:109
-#: selling/report/address_and_contacts/address_and_contacts.js:23
+#: selling/report/address_and_contacts/address_and_contacts.js:22
 msgid "Party Name"
 msgstr "Nombre de Parte"
 
@@ -47234,16 +48023,16 @@
 #: 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/general_ledger/general_ledger.js:65
-#: accounts/report/general_ledger/general_ledger.py:632
-#: accounts/report/payment_ledger/payment_ledger.js:42
+#: accounts/report/general_ledger/general_ledger.py:645
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:16
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:16
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:15
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:15
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:49
-#: public/js/bank_reconciliation_tool/data_table_manager.js:46
-#: selling/report/address_and_contacts/address_and_contacts.js:10
+#: public/js/bank_reconciliation_tool/data_table_manager.js:45
+#: selling/report/address_and_contacts/address_and_contacts.js:9
 #: setup/doctype/party_type/party_type.json
 msgid "Party Type"
 msgstr "Tipo de entidad"
@@ -47348,7 +48137,7 @@
 msgid "Party Type and Party is mandatory for {0} account"
 msgstr "Tipo de Tercero y Tercero es obligatorio para la Cuenta {0}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:162
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:161
 msgid "Party Type and Party is required for Receivable / Payable account {0}"
 msgstr ""
 
@@ -47362,7 +48151,7 @@
 msgid "Party User"
 msgstr "Usuario Tercero"
 
-#: accounts/doctype/payment_entry/payment_entry.js:308
+#: accounts/doctype/payment_entry/payment_entry.js:390
 msgid "Party can only be one of {0}"
 msgstr ""
 
@@ -47416,7 +48205,7 @@
 msgid "Path"
 msgstr "Camino"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:84
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:85
 msgid "Pause"
 msgstr "Pausa"
 
@@ -47426,7 +48215,7 @@
 msgid "Pause"
 msgstr "Pausa"
 
-#: manufacturing/doctype/job_card/job_card.js:259
+#: manufacturing/doctype/job_card/job_card.js:292
 msgid "Pause Job"
 msgstr ""
 
@@ -47449,6 +48238,10 @@
 msgid "Paused"
 msgstr ""
 
+#: templates/pages/order.html:43
+msgid "Pay"
+msgstr "Pagar"
+
 #. Option for the 'Payment Type' (Select) field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47461,7 +48254,7 @@
 msgid "Pay To / Recd From"
 msgstr "Pagar a / Recibido de"
 
-#: accounts/report/account_balance/account_balance.js:52
+#: accounts/report/account_balance/account_balance.js:54
 msgid "Payable"
 msgstr "Pagadero"
 
@@ -47510,15 +48303,15 @@
 
 #: accounts/doctype/dunning/dunning.js:51
 #: accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:110
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:65
-#: accounts/doctype/sales_invoice/sales_invoice.js:104
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:52
+#: 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:31
-#: buying/doctype/purchase_order/purchase_order.js:328
+#: accounts/doctype/sales_invoice/sales_invoice_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:385
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:20
-#: selling/doctype/sales_order/sales_order.js:606
+#: selling/doctype/sales_order/sales_order.js:713
 #: selling/doctype/sales_order/sales_order_dashboard.py:28
 msgid "Payment"
 msgstr "Pago"
@@ -47626,15 +48419,16 @@
 msgid "Payment Entries"
 msgstr "Entradas de Pago"
 
-#: accounts/utils.py:937
+#: accounts/utils.py:946
 msgid "Payment Entries {0} are un-linked"
 msgstr "Las entradas de pago {0} estan no-relacionadas"
 
 #. Name of a DocType
 #: accounts/doctype/payment_entry/payment_entry.json
-#: accounts/doctype/payment_order/payment_order.js:22
+#: accounts/doctype/payment_order/payment_order.js:27
 #: accounts/print_format/bank_and_cash_payment_voucher/bank_and_cash_payment_voucher.html:12
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.py:29
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:11
 msgid "Payment Entry"
 msgstr "Entrada de pago"
 
@@ -47687,23 +48481,24 @@
 msgid "Payment Entry Reference"
 msgstr "Referencia de Entrada de Pago"
 
-#: accounts/doctype/payment_request/payment_request.py:410
+#: accounts/doctype/payment_request/payment_request.py:413
 msgid "Payment Entry already exists"
 msgstr "Entrada de pago ya existe"
 
-#: accounts/utils.py:604
+#: accounts/utils.py:613
 msgid "Payment Entry has been modified after you pulled it. Please pull it again."
 msgstr "El registro del pago ha sido modificado antes de su modificación. Por favor, inténtelo de nuevo."
 
-#: accounts/doctype/payment_request/payment_request.py:568
+#: accounts/doctype/payment_request/payment_request.py:111
+#: accounts/doctype/payment_request/payment_request.py:460
 msgid "Payment Entry is already created"
 msgstr "Entrada de Pago ya creada"
 
-#: controllers/accounts_controller.py:1164
+#: controllers/accounts_controller.py:1231
 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:261
+#: selling/page/point_of_sale/pos_payment.js:271
 msgid "Payment Failed"
 msgstr "Pago Fallido"
 
@@ -47754,7 +48549,7 @@
 msgid "Payment Gateway Account"
 msgstr "Cuenta de Pasarela de Pago"
 
-#: accounts/utils.py:1227
+#: accounts/utils.py:1196
 msgid "Payment Gateway Account not created, please create one manually."
 msgstr "Cuenta de Pasarela de Pago no creada, por favor crear una manualmente."
 
@@ -47784,9 +48579,10 @@
 msgid "Payment Limit"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.js:51
+#: accounts/report/pos_register/pos_register.js:50
 #: accounts/report/pos_register/pos_register.py:129
 #: accounts/report/pos_register/pos_register.py:221
+#: selling/page/point_of_sale/pos_payment.js:19
 msgid "Payment Method"
 msgstr "Método de pago"
 
@@ -47878,7 +48674,7 @@
 msgid "Payment Receipt Note"
 msgstr "Nota de Recibo de Pago"
 
-#: selling/page/point_of_sale/pos_payment.js:248
+#: selling/page/point_of_sale/pos_payment.js:252
 msgid "Payment Received"
 msgstr "Pago recibido"
 
@@ -47911,7 +48707,7 @@
 msgid "Payment Reconciliation Invoice"
 msgstr "Factura para reconciliación de pago"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:120
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:123
 msgid "Payment Reconciliation Job: {0} is running for this party. Can't reconcile now."
 msgstr ""
 
@@ -47939,12 +48735,12 @@
 msgstr "Referencias del Pago"
 
 #. Name of a DocType
-#: accounts/doctype/payment_order/payment_order.js:18
+#: accounts/doctype/payment_order/payment_order.js:19
 #: accounts/doctype/payment_request/payment_request.json
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:125
-#: accounts/doctype/sales_invoice/sales_invoice.js:140
-#: buying/doctype/purchase_order/purchase_order.js:335
-#: selling/doctype/sales_order/sales_order.js:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:145
+#: accounts/doctype/sales_invoice/sales_invoice.js:143
+#: buying/doctype/purchase_order/purchase_order.js:393
+#: selling/doctype/sales_order/sales_order.js:709
 msgid "Payment Request"
 msgstr "Solicitud de pago"
 
@@ -47973,15 +48769,15 @@
 msgid "Payment Request Type"
 msgstr "Tipo de Solicitud de Pago"
 
-#: accounts/doctype/payment_request/payment_request.py:502
+#: accounts/doctype/payment_request/payment_request.py:507
 msgid "Payment Request for {0}"
 msgstr "Solicitud de pago para {0}"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:268
+#: accounts/doctype/pos_invoice/pos_invoice.js:289
 msgid "Payment Request took too long to respond. Please try requesting for payment again."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:450
+#: accounts/doctype/payment_request/payment_request.py:453
 msgid "Payment Requests cannot be created against: {0}"
 msgstr ""
 
@@ -48032,13 +48828,9 @@
 msgid "Payment Schedule"
 msgstr "Calendario de Pago"
 
-#: public/js/controllers/transaction.js:925
-msgid "Payment Schedule Table"
-msgstr ""
-
 #. Name of a DocType
 #: accounts/doctype/payment_term/payment_term.json
-#: accounts/report/accounts_receivable/accounts_receivable.py:1064
+#: accounts/report/accounts_receivable/accounts_receivable.py:1072
 #: accounts/report/gross_profit/gross_profit.py:348
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
 msgid "Payment Term"
@@ -48081,6 +48873,7 @@
 msgstr "Nombre del Término de Pago"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:44
+#: accounts/report/accounts_receivable/accounts_receivable.html:31
 msgid "Payment Terms"
 msgstr "Términos de pago"
 
@@ -48134,11 +48927,11 @@
 #. Name of a DocType
 #: accounts/doctype/payment_terms_template/payment_terms_template.json
 #: accounts/report/accounts_payable/accounts_payable.js:93
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:99
-#: accounts/report/accounts_receivable/accounts_receivable.js:127
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:105
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:62
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:62
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:102
+#: accounts/report/accounts_receivable/accounts_receivable.js:130
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:108
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:61
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:61
 msgid "Payment Terms Template"
 msgstr "Plantilla de Términos de Pago"
 
@@ -48206,15 +48999,15 @@
 msgid "Payment Type"
 msgstr "Tipo de pago"
 
-#: accounts/doctype/payment_entry/payment_entry.py:501
+#: accounts/doctype/payment_entry/payment_entry.py:510
 msgid "Payment Type must be one of Receive, Pay and Internal Transfer"
 msgstr "Tipo de pago debe ser uno de Recibir, Pagar y Transferencia Interna"
 
-#: accounts/utils.py:927
+#: accounts/utils.py:936
 msgid "Payment Unlink Error"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:764
+#: accounts/doctype/journal_entry/journal_entry.py:791
 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
 msgstr "El pago para {0} {1} no puede ser mayor que el pago pendiente {2}"
 
@@ -48226,12 +49019,12 @@
 msgid "Payment methods are mandatory. Please add at least one payment method."
 msgstr "Los métodos de pago son obligatorios. Agregue al menos un método de pago."
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:277
-#: selling/page/point_of_sale/pos_payment.js:252
+#: accounts/doctype/pos_invoice/pos_invoice.js:301
+#: selling/page/point_of_sale/pos_payment.js:259
 msgid "Payment of {0} received successfully."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:257
+#: selling/page/point_of_sale/pos_payment.js:266
 msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
 msgstr ""
 
@@ -48239,11 +49032,11 @@
 msgid "Payment related to {0} is not completed"
 msgstr "El pago relacionado con {0} no se completó"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:259
+#: accounts/doctype/pos_invoice/pos_invoice.js:278
 msgid "Payment request failed"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:713
+#: accounts/doctype/payment_entry/payment_entry.py:722
 msgid "Payment term {0} not used in {1}"
 msgstr ""
 
@@ -48258,6 +49051,7 @@
 #: accounts/workspace/receivables/receivables.json
 #: buying/doctype/supplier/supplier_dashboard.py:15
 #: selling/doctype/customer/customer_dashboard.py:22
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Payments"
 msgstr "Pagos."
 
@@ -48322,11 +49116,11 @@
 msgstr "Recibo de Sueldo"
 
 #: assets/doctype/asset_repair/asset_repair_list.js:5
-#: buying/doctype/request_for_quotation/request_for_quotation.py:314
+#: buying/doctype/request_for_quotation/request_for_quotation.py:338
 #: 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
-#: templates/pages/order.html:56
+#: templates/pages/order.html:68
 msgid "Pending"
 msgstr "Pendiente"
 
@@ -48404,9 +49198,9 @@
 msgstr "Monto pendiente"
 
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:218
-#: manufacturing/doctype/work_order/work_order.js:244
+#: 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:991
+#: selling/doctype/sales_order/sales_order.js:1153
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
 msgid "Pending Qty"
 msgstr "Cantidad pendiente"
@@ -48422,6 +49216,10 @@
 msgid "Pending Quantity"
 msgstr "Cantidad pendiente"
 
+#: templates/pages/task_info.html:74
+msgid "Pending Review"
+msgstr "Pendiente de revisar"
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -48443,7 +49241,7 @@
 msgid "Pending activities for today"
 msgstr "Actividades pendientes para hoy"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:224
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:219
 msgid "Pending processing"
 msgstr ""
 
@@ -48596,25 +49394,25 @@
 msgid "Perception Analysis"
 msgstr "Análisis de percepción"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:61
+#: accounts/report/budget_variance_report/budget_variance_report.js:59
 #: public/js/purchase_trends_filters.js:16 public/js/sales_trends_filters.js:8
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:30
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:30
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:30
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:29
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:29
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:29
 msgid "Period"
 msgstr "Período"
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:61
+#: assets/report/fixed_asset_register/fixed_asset_register.js:60
 msgid "Period Based On"
 msgstr "Periodo basado en"
 
-#: accounts/general_ledger.py:690
+#: accounts/general_ledger.py:699
 msgid "Period Closed"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.js:82
-msgid "Period Closing Entry"
-msgstr "Asiento de cierre de período"
+#: accounts/report/trial_balance/trial_balance.js:88
+msgid "Period Closing Entry For Current Period"
+msgstr ""
 
 #. Label of a Section Break field in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -48623,7 +49421,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:141
+#: accounts/doctype/account/account_tree.js:197
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgid "Period Closing Voucher"
 msgstr "Cierre de período"
@@ -48710,10 +49508,10 @@
 msgid "Period_from_date"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:72
 #: accounts/report/financial_ratios/financial_ratios.js:33
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:55
-#: public/js/financial_statements.js:214
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:54
+#: public/js/financial_statements.js:223
 msgid "Periodicity"
 msgstr "Periodo"
 
@@ -48848,7 +49646,7 @@
 msgid "Phone No"
 msgstr "Teléfono No."
 
-#: selling/page/point_of_sale/pos_item_cart.js:880
+#: selling/page/point_of_sale/pos_item_cart.js:911
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
@@ -48858,13 +49656,13 @@
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
-#: public/js/utils.js:64
+#: public/js/utils.js:78
 msgid "Pick Batch No"
 msgstr ""
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:548
-#: stock/doctype/material_request/material_request.js:113
+#: selling/doctype/sales_order/sales_order.js:599
+#: stock/doctype/material_request/material_request.js:115
 #: stock/doctype/pick_list/pick_list.json
 msgid "Pick List"
 msgstr "Lista de selección"
@@ -48894,7 +49692,7 @@
 msgid "Pick List"
 msgstr "Lista de selección"
 
-#: stock/doctype/pick_list/pick_list.py:116
+#: stock/doctype/pick_list/pick_list.py:120
 msgid "Pick List Incomplete"
 msgstr ""
 
@@ -48975,7 +49773,7 @@
 msgid "Pickup Date"
 msgstr ""
 
-#: stock/doctype/shipment/shipment.js:364
+#: stock/doctype/shipment/shipment.js:398
 msgid "Pickup Date cannot be before this day"
 msgstr ""
 
@@ -49009,7 +49807,7 @@
 msgid "Pickup to"
 msgstr ""
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:9
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:8
 msgid "Pipeline By"
 msgstr ""
 
@@ -49037,16 +49835,16 @@
 msgid "Plaid Environment"
 msgstr "Ambiente a cuadros"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:136
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:160
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:152
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:176
 msgid "Plaid Link Failed"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:238
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:254
 msgid "Plaid Link Refresh Required"
 msgstr ""
 
-#: accounts/doctype/bank/bank.js:121
+#: accounts/doctype/bank/bank.js:131
 msgid "Plaid Link Updated"
 msgstr ""
 
@@ -49067,7 +49865,7 @@
 msgid "Plaid Settings"
 msgstr "Configuración de cuadros"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:211
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:227
 msgid "Plaid transactions sync error"
 msgstr "Error de sincronización de transacciones a cuadros"
 
@@ -49154,19 +49952,23 @@
 
 #: stock/report/stock_projected_qty/stock_projected_qty.py:143
 msgid "Planned Qty"
-msgstr "Cantidad planificada"
+msgstr "Cant. planificada"
 
 #. Label of a Float field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "Planned Qty"
-msgstr "Cantidad planificada"
+msgstr "Cant. planificada"
 
 #. Label of a Float field in DocType 'Production Plan Item'
 #: manufacturing/doctype/production_plan_item/production_plan_item.json
 msgctxt "Production Plan Item"
 msgid "Planned Qty"
-msgstr "Cantidad planificada"
+msgstr "Cant. planificada"
+
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured."
+msgstr ""
 
 #: stock/report/item_shortage_report/item_shortage_report.py:109
 msgid "Planned Quantity"
@@ -49223,12 +50025,36 @@
 msgid "Plans"
 msgstr "Planes"
 
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Plant Dashboard"
+msgstr ""
+
+#. Name of a DocType
+#: manufacturing/doctype/plant_floor/plant_floor.json
+#: public/js/plant_floor_visual/visual_plant.js:53
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/workspace/manufacturing/manufacturing.json
+msgctxt "Plant Floor"
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Plant Floor"
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:30
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:43
 msgid "Plants and Machineries"
 msgstr "Plantas y maquinarias"
 
-#: stock/doctype/pick_list/pick_list.py:383
+#: stock/doctype/pick_list/pick_list.py:423
 msgid "Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List."
 msgstr "Reponga artículos y actualice la lista de selección para continuar. Para descontinuar, cancele la Lista de selección."
 
@@ -49236,17 +50062,17 @@
 msgid "Please Select a Company"
 msgstr "Seleccione una empresa"
 
-#: selling/page/sales_funnel/sales_funnel.js:94
+#: selling/page/sales_funnel/sales_funnel.js:109
 msgid "Please Select a Company."
 msgstr "Seleccione una empresa."
 
-#: stock/doctype/delivery_note/delivery_note.js:139
+#: stock/doctype/delivery_note/delivery_note.js:151
 msgid "Please Select a Customer"
 msgstr "Seleccione un cliente"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:114
-#: stock/doctype/purchase_receipt/purchase_receipt.js:199
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:82
+#: stock/doctype/purchase_receipt/purchase_receipt.js:128
+#: stock/doctype/purchase_receipt/purchase_receipt.js:230
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
 msgid "Please Select a Supplier"
 msgstr "Seleccione un proveedor"
 
@@ -49254,7 +50080,7 @@
 msgid "Please Set Supplier Group in Buying Settings."
 msgstr "Por favor, configure el grupo de proveedores en las configuraciones de compra."
 
-#: accounts/doctype/payment_entry/payment_entry.js:1071
+#: accounts/doctype/payment_entry/payment_entry.js:1297
 msgid "Please Specify Account"
 msgstr ""
 
@@ -49262,7 +50088,7 @@
 msgid "Please add 'Supplier' role to user {0}."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:87
+#: selling/page/point_of_sale/pos_controller.js:101
 msgid "Please add Mode of payments and opening balance details."
 msgstr "Agregue el modo de pago y los detalles del saldo inicial."
 
@@ -49278,7 +50104,7 @@
 msgid "Please add a Temporary Opening account in Chart of Accounts"
 msgstr "Agregue una Cuenta de Apertura Temporal en el Plan de Cuentas"
 
-#: public/js/utils/serial_no_batch_selector.js:535
+#: public/js/utils/serial_no_batch_selector.js:542
 msgid "Please add atleast one Serial No / Batch No"
 msgstr ""
 
@@ -49286,11 +50112,11 @@
 msgid "Please add the Bank Account column"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:168
+#: accounts/doctype/account/account_tree.js:246
 msgid "Please add the account to root level Company - {0}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:215
+#: accounts/doctype/account/account.py:234
 msgid "Please add the account to root level Company - {}"
 msgstr "Agregue la cuenta a la empresa de nivel raíz - {}"
 
@@ -49298,28 +50124,28 @@
 msgid "Please add {1} role to user {0}."
 msgstr ""
 
-#: controllers/stock_controller.py:909
+#: controllers/stock_controller.py:1095
 msgid "Please adjust the qty or edit {0} to proceed."
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:121
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:124
 msgid "Please attach CSV file"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2735
+#: accounts/doctype/sales_invoice/sales_invoice.py:2704
 msgid "Please cancel and amend the Payment Entry"
 msgstr ""
 
-#: accounts/utils.py:926
+#: accounts/utils.py:935
 msgid "Please cancel payment entry manually first"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:337
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:327
+#: accounts/doctype/gl_entry/gl_entry.py:291
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:338
 msgid "Please cancel related transaction."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:836
+#: accounts/doctype/journal_entry/journal_entry.py:863
 msgid "Please check Multi Currency option to allow accounts with other currency"
 msgstr "Por favor, consulte la opción Multi moneda para permitir cuentas con otra divisa"
 
@@ -49327,11 +50153,11 @@
 msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:71
+#: manufacturing/doctype/bom/bom.js:70
 msgid "Please check either with operations or FG Based Operating Cost."
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:397
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:412
 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again."
 msgstr ""
 
@@ -49339,14 +50165,10 @@
 msgid "Please check your Plaid client ID and secret values"
 msgstr "Verifique su ID de cliente de Plaid y sus valores secretos"
 
-#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:227
+#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:235
 msgid "Please check your email to confirm the appointment"
 msgstr ""
 
-#: public/js/controllers/transaction.js:917
-msgid "Please clear the"
-msgstr ""
-
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:377
 msgid "Please click on 'Generate Schedule'"
 msgstr "Por favor, haga clic en 'Generar planificación'"
@@ -49359,19 +50181,19 @@
 msgid "Please click on 'Generate Schedule' to get schedule"
 msgstr "Por favor, haga clic en 'Generar planificación' para obtener las tareas"
 
-#: selling/doctype/customer/customer.py:538
+#: selling/doctype/customer/customer.py:550
 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:321
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:332
 msgid "Please contact any of the following users to {} this transaction."
 msgstr ""
 
-#: selling/doctype/customer/customer.py:531
+#: selling/doctype/customer/customer.py:543
 msgid "Please contact your administrator to extend the credit limits for {0}."
 msgstr ""
 
-#: accounts/doctype/account/account.py:317
+#: accounts/doctype/account/account.py:336
 msgid "Please convert the parent account in corresponding child company to a group account."
 msgstr "Convierta la cuenta principal de la empresa secundaria correspondiente en una cuenta de grupo."
 
@@ -49379,19 +50201,19 @@
 msgid "Please create Customer from Lead {0}."
 msgstr "Cree un cliente a partir de un cliente potencial {0}."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:96
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:117
 msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:67
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:71
 msgid "Please create a new Accounting Dimension if required."
 msgstr ""
 
-#: controllers/accounts_controller.py:534
+#: controllers/accounts_controller.py:578
 msgid "Please create purchase from internal sale or delivery document itself"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:327
+#: assets/doctype/asset/asset.py:329
 msgid "Please create purchase receipt or purchase invoice for the item {0}"
 msgstr "Cree un recibo de compra o una factura de compra para el artículo {0}"
 
@@ -49399,7 +50221,7 @@
 msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:366
+#: assets/doctype/asset/asset.py:368
 msgid "Please do not book expense of multiple assets against one single Asset."
 msgstr ""
 
@@ -49415,8 +50237,12 @@
 msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses"
 msgstr "Habilite la opción Aplicable en el pedido y aplicable a los gastos reales de reserva"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:135
-#: public/js/utils/serial_no_batch_selector.js:289
+#: stock/doctype/pick_list/pick_list.py:143
+msgid "Please enable Use Old Serial / Batch Fields to make_bundle"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:145
+#: public/js/utils/serial_no_batch_selector.js:295
 #: regional/report/electronic_invoice_register/electronic_invoice_register.js:49
 msgid "Please enable pop-ups"
 msgstr "Por favor, active los pop-ups"
@@ -49425,32 +50251,32 @@
 msgid "Please enable {0} in the {1}."
 msgstr ""
 
-#: controllers/selling_controller.py:657
+#: controllers/selling_controller.py:681
 msgid "Please enable {} in {} to allow same item in multiple rows"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:871
+#: accounts/doctype/sales_invoice/sales_invoice.py:888
 msgid "Please ensure {} account is a Balance Sheet account."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:366
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:370
 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 "Asegúrese de que la cuenta {} sea una cuenta de balance. Puede cambiar la cuenta principal a una cuenta de balance o seleccionar una cuenta diferente."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:374
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:378
 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:880
+#: accounts/doctype/sales_invoice/sales_invoice.py:897
 msgid "Please ensure {} account {} is a Receivable account."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:563
+#: stock/doctype/stock_entry/stock_entry.py:518
 msgid "Please enter <b>Difference Account</b> or set default <b>Stock Adjustment Account</b> for company {0}"
 msgstr "Ingrese la <b>cuenta de diferencia</b> o configure la <b>cuenta de ajuste de stock</b> predeterminada para la compañía {0}"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:430
-#: accounts/doctype/sales_invoice/sales_invoice.py:1024
+#: accounts/doctype/sales_invoice/sales_invoice.py:1046
 msgid "Please enter Account for Change Amount"
 msgstr "Por favor, introduzca la cuenta para el importe de cambio"
 
@@ -49458,32 +50284,32 @@
 msgid "Please enter Approving Role or Approving User"
 msgstr "Por favor, introduzca 'Función para aprobar' o 'Usuario de aprobación'---"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:697
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:751
 msgid "Please enter Cost Center"
 msgstr "Por favor, introduzca el centro de costos"
 
-#: selling/doctype/sales_order/sales_order.py:322
+#: selling/doctype/sales_order/sales_order.py:325
 msgid "Please enter Delivery Date"
 msgstr "Por favor, introduzca la Fecha de Entrega"
 
-#: setup/doctype/sales_person/sales_person_tree.js:8
+#: setup/doctype/sales_person/sales_person_tree.js:9
 msgid "Please enter Employee Id of this sales person"
 msgstr "Por favor, Introduzca ID de empleado para este vendedor"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:708
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:762
 msgid "Please enter Expense Account"
 msgstr "Por favor, ingrese la Cuenta de Gastos"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.js:87
-#: stock/doctype/stock_entry/stock_entry.js:82
+#: assets/doctype/asset_capitalization/asset_capitalization.js:89
+#: stock/doctype/stock_entry/stock_entry.js:87
 msgid "Please enter Item Code to get Batch Number"
 msgstr "Por favor, introduzca el código de artículo para obtener el número de lote"
 
-#: public/js/controllers/transaction.js:2236
+#: public/js/controllers/transaction.js:2289
 msgid "Please enter Item Code to get batch no"
 msgstr "Por favor, ingrese el código del producto para obtener el numero de lote"
 
-#: manufacturing/doctype/production_plan/production_plan.js:67
+#: manufacturing/doctype/production_plan/production_plan.js:66
 msgid "Please enter Item first"
 msgstr "Por favor, introduzca primero un producto"
 
@@ -49495,27 +50321,27 @@
 msgid "Please enter Planned Qty for Item {0} at row {1}"
 msgstr "Por favor, ingrese la cantidad planeada para el producto {0} en la fila {1}"
 
-#: setup/doctype/employee/employee.js:76
+#: setup/doctype/employee/employee.js:78
 msgid "Please enter Preferred Contact Email"
 msgstr "Por favor, introduzca el contacto de correo electrónico preferido"
 
-#: manufacturing/doctype/work_order/work_order.js:71
+#: manufacturing/doctype/work_order/work_order.js:73
 msgid "Please enter Production Item first"
 msgstr "Por favor, ingrese primero el producto a fabricar"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:74
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:76
 msgid "Please enter Purchase Receipt first"
 msgstr "Por favor, ingrese primero el recibo de compra"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:77
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:98
 msgid "Please enter Receipt Document"
 msgstr "Por favor, introduzca recepción de documentos"
 
-#: accounts/doctype/journal_entry/journal_entry.py:901
+#: accounts/doctype/journal_entry/journal_entry.py:928
 msgid "Please enter Reference date"
 msgstr "Por favor, introduzca la fecha de referencia"
 
-#: controllers/buying_controller.py:851
+#: controllers/buying_controller.py:877
 msgid "Please enter Reqd by Date"
 msgstr "Ingrese Requerido por Fecha"
 
@@ -49523,7 +50349,7 @@
 msgid "Please enter Root Type for account- {0}"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:258
+#: public/js/utils/serial_no_batch_selector.js:262
 msgid "Please enter Serial Nos"
 msgstr ""
 
@@ -49535,7 +50361,7 @@
 msgid "Please enter Stock Items consumed during the Repair."
 msgstr ""
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:29
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:30
 msgid "Please enter Warehouse and Date"
 msgstr "Por favor, introduzca el almacén y la fecha"
 
@@ -49543,20 +50369,20 @@
 msgid "Please enter Warehouse from which Stock Items consumed during the Repair were taken."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
-#: accounts/doctype/sales_invoice/sales_invoice.py:1020
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:613
+#: accounts/doctype/sales_invoice/sales_invoice.py:1042
 msgid "Please enter Write Off Account"
 msgstr "Por favor, ingrese la cuenta de desajuste"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:23
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:26
 msgid "Please enter company first"
 msgstr "Por favor, ingrese primero la compañía"
 
-#: accounts/doctype/cost_center/cost_center.js:109
+#: accounts/doctype/cost_center/cost_center.js:114
 msgid "Please enter company name first"
 msgstr "Por favor, ingrese el nombre de la compañia"
 
-#: controllers/accounts_controller.py:2378
+#: controllers/accounts_controller.py:2470
 msgid "Please enter default currency in Company Master"
 msgstr "Por favor, ingrese la divisa por defecto en la compañía principal"
 
@@ -49564,7 +50390,7 @@
 msgid "Please enter message before sending"
 msgstr "Por favor, ingrese el mensaje antes de enviarlo"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:247
+#: accounts/doctype/pos_invoice/pos_invoice.js:266
 msgid "Please enter mobile number first."
 msgstr ""
 
@@ -49572,7 +50398,7 @@
 msgid "Please enter parent cost center"
 msgstr "Por favor, ingrese el centro de costos principal"
 
-#: public/js/utils/barcode_scanner.js:160
+#: public/js/utils/barcode_scanner.js:165
 msgid "Please enter quantity for item {0}"
 msgstr ""
 
@@ -49580,11 +50406,11 @@
 msgid "Please enter relieving date."
 msgstr "Por favor, introduzca la fecha de relevo"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:125
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:128
 msgid "Please enter serial nos"
 msgstr ""
 
-#: setup/doctype/company/company.js:155
+#: setup/doctype/company/company.js:183
 msgid "Please enter the company name to confirm"
 msgstr "Ingrese el nombre de la empresa para confirmar"
 
@@ -49592,19 +50418,23 @@
 msgid "Please enter the phone number first"
 msgstr "Primero ingrese el número de teléfono"
 
-#: public/js/setup_wizard.js:83
+#: public/js/setup_wizard.js:87
 msgid "Please enter valid Financial Year Start and End Dates"
 msgstr "Por favor, introduzca fecha de Inicio y Fin válidas para el Año Fiscal"
 
+#: templates/includes/footer/footer_extension.html:37
+msgid "Please enter valid email address"
+msgstr ""
+
 #: setup/doctype/employee/employee.py:225
 msgid "Please enter {0}"
 msgstr "Ingrese {0}"
 
-#: public/js/utils/party.js:273
+#: public/js/utils/party.js:317
 msgid "Please enter {0} first"
 msgstr "Por favor, introduzca {0} primero"
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Please fill the Material Requests table"
 msgstr "Complete la tabla de solicitudes de material"
 
@@ -49612,11 +50442,11 @@
 msgid "Please fill the Sales Orders table"
 msgstr "Por favor complete la tabla de Órdenes de Venta"
 
-#: stock/doctype/shipment/shipment.js:248
+#: stock/doctype/shipment/shipment.js:277
 msgid "Please first set Last Name, Email and Phone for the user"
 msgstr ""
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:92
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:94
 msgid "Please fix overlapping time slots for {0}"
 msgstr ""
 
@@ -49628,6 +50458,10 @@
 msgid "Please import accounts against parent company or enable {} in company master."
 msgstr ""
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:175
+msgid "Please keep one Applicable Charges, when 'Distribute Charges Based On' is 'Distribute Manually'. For more charges, please create another Landed Cost Voucher."
+msgstr ""
+
 #: setup/doctype/employee/employee.py:184
 msgid "Please make sure the employees above report to another Active employee."
 msgstr "Asegúrese de que los empleados anteriores denuncien a otro empleado activo."
@@ -49636,19 +50470,19 @@
 msgid "Please make sure the file you are using has 'Parent Account' column present in the header."
 msgstr ""
 
-#: setup/doctype/company/company.js:157
+#: setup/doctype/company/company.js:185
 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone."
 msgstr "Por favor, asegurate de que realmente desea borrar todas las transacciones de esta compañía. Sus datos maestros permanecerán intactos. Esta acción no se puede deshacer."
 
-#: stock/doctype/item/item.js:425
+#: stock/doctype/item/item.js:493
 msgid "Please mention 'Weight UOM' along with Weight."
 msgstr ""
 
-#: accounts/general_ledger.py:555
+#: accounts/general_ledger.py:564
 msgid "Please mention Round Off Account in Company"
 msgstr "Por favor, indique la cuenta que utilizará para el redondeo"
 
-#: accounts/general_ledger.py:558
+#: accounts/general_ledger.py:567
 msgid "Please mention Round Off Cost Center in Company"
 msgstr "Por favor, indique las centro de costos de redondeo"
 
@@ -49664,16 +50498,16 @@
 msgid "Please pull items from Delivery Note"
 msgstr "Por favor, extraiga los productos de la nota de entrega"
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:444
 msgid "Please rectify and try again."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:237
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:253
 msgid "Please refresh or reset the Plaid linking of the Bank {}."
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:12
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:29
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
 msgid "Please save before proceeding."
 msgstr ""
 
@@ -49681,16 +50515,16 @@
 msgid "Please save first"
 msgstr "Por favor guarde primero"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:70
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:79
 msgid "Please select <b>Template Type</b> to download template"
 msgstr "Seleccione <b>Tipo de plantilla</b> para descargar la plantilla"
 
-#: controllers/taxes_and_totals.py:651
+#: controllers/taxes_and_totals.py:652
 #: public/js/controllers/taxes_and_totals.js:688
 msgid "Please select Apply Discount On"
 msgstr "Por favor seleccione 'Aplicar descuento en'"
 
-#: selling/doctype/sales_order/sales_order.py:1469
+#: selling/doctype/sales_order/sales_order.py:1492
 msgid "Please select BOM against item {0}"
 msgstr "Seleccione la Lista de Materiales contra el Artículo {0}"
 
@@ -49702,25 +50536,26 @@
 msgid "Please select BOM in BOM field for Item {0}"
 msgstr "Por favor, seleccione la lista de materiales (LdM) para el producto {0}"
 
-#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:12
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:13
 msgid "Please select Category first"
 msgstr "Por favor, seleccione primero la categoría"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1195
+#: accounts/doctype/payment_entry/payment_entry.js:1429
 #: public/js/controllers/accounts.js:86 public/js/controllers/accounts.js:124
 msgid "Please select Charge Type first"
 msgstr "Por favor, seleccione primero el tipo de cargo"
 
-#: accounts/doctype/journal_entry/journal_entry.js:401
+#: accounts/doctype/journal_entry/journal_entry.js:443
 msgid "Please select Company"
 msgstr "Por favor, seleccione la empresa"
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:135
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:141
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:75
 msgid "Please select Company and Posting Date to getting entries"
 msgstr "Seleccione Empresa y Fecha de publicación para obtener entradas"
 
-#: accounts/doctype/journal_entry/journal_entry.js:606
+#: accounts/doctype/journal_entry/journal_entry.js:688
+#: manufacturing/doctype/plant_floor/plant_floor.js:12
 msgid "Please select Company first"
 msgstr "Por favor, seleccione primero la compañía"
 
@@ -49728,12 +50563,12 @@
 msgid "Please select Completion Date for Completed Asset Maintenance Log"
 msgstr "Seleccione Fecha de Finalización para el Registro de Mantenimiento de Activos Completado"
 
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:116
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:84
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:125
 msgid "Please select Customer first"
 msgstr "Por favor seleccione Cliente primero"
 
-#: setup/doctype/company/company.py:407
+#: setup/doctype/company/company.py:406
 msgid "Please select Existing Company for creating Chart of Accounts"
 msgstr "Por favor, seleccione empresa ya existente para la creación del plan de cuentas"
 
@@ -49741,7 +50576,7 @@
 msgid "Please select Finished Good Item for Service Item {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:531 assets/doctype/asset/asset.js:548
+#: assets/doctype/asset/asset.js:604 assets/doctype/asset/asset.js:621
 msgid "Please select Item Code first"
 msgstr "Seleccione primero el código del artículo"
 
@@ -49750,18 +50585,18 @@
 msgstr "Seleccione Estado de Mantenimiento como Completado o elimine Fecha de Finalización"
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:52
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:33
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:33
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:32
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:32
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:63
-#: selling/report/address_and_contacts/address_and_contacts.js:28
+#: selling/report/address_and_contacts/address_and_contacts.js:27
 msgid "Please select Party Type first"
 msgstr "Por favor, seleccione primero el tipo de entidad"
 
-#: accounts/doctype/payment_entry/payment_entry.js:342
+#: accounts/doctype/payment_entry/payment_entry.js:429
 msgid "Please select Posting Date before selecting Party"
 msgstr "Por favor, seleccione fecha de publicación antes de seleccionar la Parte"
 
-#: accounts/doctype/journal_entry/journal_entry.js:607
+#: accounts/doctype/journal_entry/journal_entry.js:689
 msgid "Please select Posting Date first"
 msgstr "Por favor, seleccione fecha de publicación primero"
 
@@ -49769,7 +50604,7 @@
 msgid "Please select Price List"
 msgstr "Por favor, seleccione la lista de precios"
 
-#: selling/doctype/sales_order/sales_order.py:1471
+#: selling/doctype/sales_order/sales_order.py:1494
 msgid "Please select Qty against item {0}"
 msgstr "Seleccione Cant. contra el Elemento {0}"
 
@@ -49785,15 +50620,15 @@
 msgid "Please select Start Date and End Date for Item {0}"
 msgstr "Por favor, seleccione Fecha de inicio y Fecha de finalización para el elemento {0}"
 
-#: stock/doctype/stock_entry/stock_entry.py:1202
+#: stock/doctype/stock_entry/stock_entry.py:1211
 msgid "Please select Subcontracting Order instead of Purchase Order {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2288
+#: controllers/accounts_controller.py:2380
 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1229
+#: manufacturing/doctype/bom/bom.py:1228
 msgid "Please select a BOM"
 msgstr "Seleccione una Lista de Materiales"
 
@@ -49801,10 +50636,10 @@
 msgid "Please select a Company"
 msgstr "Por favor, seleccione la compañía"
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: manufacturing/doctype/bom/bom.js:482 manufacturing/doctype/bom/bom.py:245
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: manufacturing/doctype/bom/bom.js:499 manufacturing/doctype/bom/bom.py:245
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484
+#: public/js/controllers/transaction.js:2537
 msgid "Please select a Company first."
 msgstr "Primero seleccione una empresa."
 
@@ -49820,11 +50655,15 @@
 msgid "Please select a Subcontracting Purchase Order."
 msgstr ""
 
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
+#: buying/doctype/supplier_quotation/supplier_quotation.js:65
 msgid "Please select a Supplier"
 msgstr "Seleccione un proveedor"
 
-#: manufacturing/doctype/job_card/job_card.py:1063
+#: public/js/utils/serial_no_batch_selector.js:546
+msgid "Please select a Warehouse"
+msgstr ""
+
+#: manufacturing/doctype/job_card/job_card.py:1084
 msgid "Please select a Work Order first."
 msgstr ""
 
@@ -49836,11 +50675,11 @@
 msgid "Please select a customer for fetching payments."
 msgstr ""
 
-#: www/book_appointment/index.js:63
+#: www/book_appointment/index.js:67
 msgid "Please select a date"
 msgstr ""
 
-#: www/book_appointment/index.js:48
+#: www/book_appointment/index.js:52
 msgid "Please select a date and time"
 msgstr ""
 
@@ -49848,11 +50687,11 @@
 msgid "Please select a default mode of payment"
 msgstr "Seleccione una forma de pago predeterminada"
 
-#: selling/page/point_of_sale/pos_item_cart.js:753
+#: selling/page/point_of_sale/pos_item_cart.js:783
 msgid "Please select a field to edit from numpad"
 msgstr "Por favor, seleccione un campo para editar desde numpad"
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:68
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:67
 msgid "Please select a row to create a Reposting Entry"
 msgstr ""
 
@@ -49868,11 +50707,11 @@
 msgid "Please select a valid Purchase Order that is configured for Subcontracting."
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:220
+#: selling/doctype/quotation/quotation.js:229
 msgid "Please select a value for {0} quotation_to {1}"
 msgstr "Por favor, seleccione un valor para {0} quotation_to {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1570
+#: accounts/doctype/journal_entry/journal_entry.py:1574
 msgid "Please select correct account"
 msgstr "Por favor, seleccione la cuenta correcta"
 
@@ -49889,12 +50728,12 @@
 msgid "Please select item code"
 msgstr "Por favor, seleccione el código del producto"
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:71
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:69
 msgid "Please select only one row to create a Reposting Entry"
 msgstr ""
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:60
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:96
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:59
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:91
 msgid "Please select rows to create Reposting Entries"
 msgstr ""
 
@@ -49902,7 +50741,7 @@
 msgid "Please select the Company"
 msgstr "Por favor seleccione la Compañía"
 
-#: accounts/doctype/loyalty_program/loyalty_program.js:57
+#: accounts/doctype/loyalty_program/loyalty_program.js:65
 msgid "Please select the Multiple Tier Program type for more than one collection rules."
 msgstr "Seleccione el tipo de Programa de niveles múltiples para más de una reglas de recopilación."
 
@@ -49913,7 +50752,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:21
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:21
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:42
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:53
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:54
 msgid "Please select the document type first"
 msgstr "Por favor, seleccione primero el tipo de documento"
 
@@ -49929,25 +50768,25 @@
 msgid "Please select weekly off day"
 msgstr "Por favor seleccione el día libre de la semana"
 
-#: public/js/utils.js:891
+#: public/js/utils.js:961
 msgid "Please select {0}"
 msgstr "Por favor, seleccione {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.js:991
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:575
+#: 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
 msgid "Please select {0} first"
 msgstr "Por favor, seleccione primero {0}"
 
-#: public/js/controllers/transaction.js:76
+#: public/js/controllers/transaction.js:77
 msgid "Please set 'Apply Additional Discount On'"
 msgstr "Por favor, establece \"Aplicar descuento adicional en\""
 
-#: assets/doctype/asset/depreciation.py:790
+#: assets/doctype/asset/depreciation.py:788
 msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
 msgstr "Ajuste &#39;Centro de la amortización del coste del activo&#39; en la empresa {0}"
 
-#: assets/doctype/asset/depreciation.py:787
+#: assets/doctype/asset/depreciation.py:785
 msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
 msgstr "Por favor, fije \"Ganancia/Pérdida en la venta de activos\" en la empresa {0}."
 
@@ -49955,6 +50794,10 @@
 msgid "Please set Account"
 msgstr ""
 
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
+msgid "Please set Account for Change Amount"
+msgstr ""
+
 #: stock/__init__.py:88
 msgid "Please set Account in Warehouse {0} or Default Inventory Account in Company {1}"
 msgstr "Configure la cuenta en el almacén {0} o la cuenta de inventario predeterminada en la compañía {1}"
@@ -49965,23 +50808,23 @@
 
 #: accounts/doctype/ledger_merge/ledger_merge.js:23
 #: accounts/doctype/ledger_merge/ledger_merge.js:34
-#: accounts/doctype/pos_profile/pos_profile.js:27
-#: accounts/doctype/pos_profile/pos_profile.js:50
-#: accounts/doctype/pos_profile/pos_profile.js:64
-#: accounts/doctype/pos_profile/pos_profile.js:78
-#: accounts/doctype/pos_profile/pos_profile.js:91
-#: accounts/doctype/sales_invoice/sales_invoice.js:707
-#: accounts/doctype/sales_invoice/sales_invoice.js:721
-#: selling/doctype/quotation/quotation.js:28
-#: selling/doctype/sales_order/sales_order.js:28
+#: accounts/doctype/pos_profile/pos_profile.js:25
+#: accounts/doctype/pos_profile/pos_profile.js:48
+#: accounts/doctype/pos_profile/pos_profile.js:62
+#: accounts/doctype/pos_profile/pos_profile.js:76
+#: accounts/doctype/pos_profile/pos_profile.js:89
+#: accounts/doctype/sales_invoice/sales_invoice.js:763
+#: accounts/doctype/sales_invoice/sales_invoice.js:777
+#: selling/doctype/quotation/quotation.js:29
+#: selling/doctype/sales_order/sales_order.js:31
 msgid "Please set Company"
 msgstr "Por favor seleccione Compañía"
 
-#: assets/doctype/asset/depreciation.py:372
+#: assets/doctype/asset/depreciation.py:370
 msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
 msgstr "Por favor establezca Cuentas relacionadas con la depreciación en la Categoría de Activo {0} o Compañía {1}."
 
-#: stock/doctype/shipment/shipment.js:154
+#: stock/doctype/shipment/shipment.js:176
 msgid "Please set Email/Phone for the contact"
 msgstr ""
 
@@ -49995,11 +50838,11 @@
 msgid "Please set Fiscal Code for the public administration '%s'"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:547
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:551
 msgid "Please set Fixed Asset Account in {} against {}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:435
+#: assets/doctype/asset/asset.py:437
 msgid "Please set Number of Depreciations Booked"
 msgstr "Por favor, ajuste el número de amortizaciones Reservados"
 
@@ -50029,11 +50872,11 @@
 msgid "Please set a Company"
 msgstr "Establezca una empresa"
 
-#: assets/doctype/asset/asset.py:262
+#: assets/doctype/asset/asset.py:264
 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:1260
+#: selling/doctype/sales_order/sales_order.py:1283
 msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
 msgstr "Establezca un Proveedor contra los Artículos que se considerarán en la Orden de Compra."
 
@@ -50045,7 +50888,7 @@
 msgid "Please set a default Holiday List for Employee {0} or Company {1}"
 msgstr "Por favor, establece una lista predeterminada de feriados para Empleado {0} o de su empresa {1}"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:991
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1019
 msgid "Please set account in Warehouse {0}"
 msgstr "Configura la Cuenta en Almacén {0}"
 
@@ -50054,7 +50897,7 @@
 msgid "Please set an Address on the Company '%s'"
 msgstr ""
 
-#: controllers/stock_controller.py:334
+#: controllers/stock_controller.py:516
 msgid "Please set an Expense Account in the Items table"
 msgstr ""
 
@@ -50066,23 +50909,23 @@
 msgid "Please set at least one row in the Taxes and Charges Table"
 msgstr "Establezca al menos una fila en la Tabla de impuestos y cargos"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2041
+#: accounts/doctype/sales_invoice/sales_invoice.py:2010
 msgid "Please set default Cash or Bank account in Mode of Payment {0}"
 msgstr "Por favor, defina la cuenta de bancos o caja predeterminados en el método de pago {0}"
 
 #: 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:2599
+#: accounts/doctype/sales_invoice/sales_invoice.py:2568
 msgid "Please set default Cash or Bank account in Mode of Payment {}"
 msgstr "Establezca una cuenta bancaria o en efectivo predeterminada en el modo de pago {}"
 
 #: 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:2601
+#: accounts/doctype/sales_invoice/sales_invoice.py:2570
 msgid "Please set default Cash or Bank account in Mode of Payments {}"
 msgstr "Establezca la cuenta bancaria o en efectivo predeterminada en el modo de pago {}"
 
-#: accounts/utils.py:2086
+#: accounts/utils.py:2054
 msgid "Please set default Exchange Gain/Loss Account in Company {}"
 msgstr ""
 
@@ -50094,11 +50937,11 @@
 msgid "Please set default UOM in Stock Settings"
 msgstr "Configure la UOM predeterminada en la configuración de stock"
 
-#: controllers/stock_controller.py:204
+#: controllers/stock_controller.py:386
 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:946
+#: accounts/utils.py:955
 msgid "Please set default {0} in Company {1}"
 msgstr "Por favor seleccione el valor por defecto {0} en la empresa {1}"
 
@@ -50115,11 +50958,11 @@
 msgid "Please set filters"
 msgstr "Por favor, defina los filtros"
 
-#: controllers/accounts_controller.py:1896
+#: controllers/accounts_controller.py:1988
 msgid "Please set one of the following:"
 msgstr ""
 
-#: public/js/controllers/transaction.js:1967
+#: public/js/controllers/transaction.js:2010
 msgid "Please set recurring after saving"
 msgstr "Por favor configura recurrente después de guardar"
 
@@ -50131,7 +50974,7 @@
 msgid "Please set the Default Cost Center in {0} company."
 msgstr "Configure el Centro de Costo predeterminado en la empresa {0}."
 
-#: manufacturing/doctype/work_order/work_order.js:487
+#: manufacturing/doctype/work_order/work_order.js:512
 msgid "Please set the Item Code first"
 msgstr "Configure primero el Código del Artículo"
 
@@ -50139,7 +50982,7 @@
 msgid "Please set the Payment Schedule"
 msgstr "Por favor establezca el calendario de pagos"
 
-#: accounts/doctype/gl_entry/gl_entry.py:175
+#: accounts/doctype/gl_entry/gl_entry.py:165
 msgid "Please set the cost center field in {0} or setup a default Cost Center for the Company."
 msgstr ""
 
@@ -50147,8 +50990,8 @@
 msgid "Please set up the Campaign Schedule in the Campaign {0}"
 msgstr "Configure la programación de la campaña en la campaña {0}"
 
-#: public/js/queries.js:39 public/js/queries.js:49 public/js/queries.js:66
-#: public/js/queries.js:95 stock/report/reserved_stock/reserved_stock.py:26
+#: public/js/queries.js:32 public/js/queries.js:44 public/js/queries.js:64
+#: public/js/queries.js:96 stock/report/reserved_stock/reserved_stock.py:26
 msgid "Please set {0}"
 msgstr "Por favor, configure {0}"
 
@@ -50164,34 +51007,34 @@
 msgid "Please set {0} in BOM Creator {1}"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:95
-msgid "Please setup a default bank account for company {0}"
-msgstr "Configure una cuenta bancaria predeterminada para la empresa {0}"
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:97
+msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
+msgstr ""
 
-#: assets/doctype/asset/depreciation.py:424
+#: assets/doctype/asset/depreciation.py:422
 msgid "Please share this email with your support team so that they can find and fix the issue."
 msgstr ""
 
-#: public/js/controllers/transaction.js:1837
+#: public/js/controllers/transaction.js:1880
 msgid "Please specify"
 msgstr "Por favor, especifique"
 
-#: stock/get_item_details.py:210
+#: stock/get_item_details.py:215
 msgid "Please specify Company"
 msgstr "Por favor, especifique la compañía"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:81
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:380
-#: accounts/doctype/sales_invoice/sales_invoice.js:452
+#: accounts/doctype/pos_invoice/pos_invoice.js:88
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:420
+#: accounts/doctype/sales_invoice/sales_invoice.js:501
 msgid "Please specify Company to proceed"
 msgstr "Por favor, especifique la compañía para continuar"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1206
-#: controllers/accounts_controller.py:2511 public/js/controllers/accounts.js:97
+#: accounts/doctype/payment_entry/payment_entry.js:1452
+#: controllers/accounts_controller.py:2596 public/js/controllers/accounts.js:97
 msgid "Please specify a valid Row ID for row {0} in table {1}"
 msgstr "Por favor, especifique un ID de fila válida para la línea {0} en la tabla {1}"
 
-#: public/js/queries.js:104
+#: public/js/queries.js:106
 msgid "Please specify a {0}"
 msgstr ""
 
@@ -50199,7 +51042,7 @@
 msgid "Please specify at least one attribute in the Attributes table"
 msgstr "Por favor, especifique al menos un atributo en la tabla"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:372
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:426
 msgid "Please specify either Quantity or Valuation Rate or both"
 msgstr "Por favor indique la Cantidad o el Tipo de Valoración, o ambos"
 
@@ -50207,11 +51050,11 @@
 msgid "Please specify from/to range"
 msgstr "Por favor, especifique el rango (desde / hasta)"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:35
+#: buying/doctype/request_for_quotation/request_for_quotation.js:37
 msgid "Please supply the specified items at the best possible rates"
 msgstr "Por favor suministrar los elementos especificados en las mejores tasas posibles"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:223
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:218
 msgid "Please try again in an hour."
 msgstr ""
 
@@ -50268,7 +51111,7 @@
 msgid "Portrait"
 msgstr "Retrato"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:337
+#: buying/doctype/request_for_quotation/request_for_quotation.js:362
 msgid "Possible Supplier"
 msgstr "Posible proveedor"
 
@@ -50335,17 +51178,18 @@
 msgid "Postal Expenses"
 msgstr "Gastos postales"
 
-#: accounts/doctype/payment_entry/payment_entry.js:644
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: 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/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:563
+#: 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/item_wise_sales_register/item_wise_sales_register.py:200
@@ -50360,7 +51204,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:45
 #: 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:84
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:89
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:129
@@ -50370,6 +51214,7 @@
 #: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
 #: 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
 msgid "Posting Date"
 msgstr "Fecha de Contabilización"
 
@@ -50554,11 +51399,17 @@
 msgid "Posting Date cannot be future date"
 msgstr "Fecha de entrada no puede ser fecha futura"
 
+#. Label of a Datetime field in DocType 'Stock Ledger Entry'
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+msgctxt "Stock Ledger Entry"
+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
-#: stock/report/serial_no_ledger/serial_no_ledger.js:64
+#: 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_ledger_invariant_check/stock_ledger_invariant_check.py:126
@@ -50656,7 +51507,7 @@
 msgid "Posting Time"
 msgstr "Hora de Contabilización"
 
-#: stock/doctype/stock_entry/stock_entry.py:1641
+#: stock/doctype/stock_entry/stock_entry.py:1650
 msgid "Posting date and posting time is mandatory"
 msgstr "La fecha y hora de contabilización son obligatorias"
 
@@ -50664,6 +51515,11 @@
 msgid "Posting timestamp must be after {0}"
 msgstr "Fecha y hora de contabilización deberá ser posterior a {0}"
 
+#. Description of a DocType
+#: crm/doctype/opportunity/opportunity.json
+msgid "Potential Sales Deal"
+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
@@ -50762,7 +51618,7 @@
 msgid "Preventive Maintenance"
 msgstr "Mantenimiento Preventivo"
 
-#: public/js/utils/ledger_preview.js:20 public/js/utils/ledger_preview.js:40
+#: public/js/utils/ledger_preview.js:28 public/js/utils/ledger_preview.js:57
 msgid "Preview"
 msgstr "Vista Previa"
 
@@ -50778,7 +51634,7 @@
 msgid "Preview"
 msgstr "Vista Previa"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:205
+#: buying/doctype/request_for_quotation/request_for_quotation.js:223
 msgid "Preview Email"
 msgstr "Vista previa del correo electrónico"
 
@@ -50799,7 +51655,7 @@
 msgid "Previous Work Experience"
 msgstr "Experiencia laboral previa"
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:152
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:153
 msgid "Previous Year is not closed, please close it first"
 msgstr ""
 
@@ -51010,7 +51866,7 @@
 msgid "Price List Currency"
 msgstr "Divisa de la lista de precios"
 
-#: stock/get_item_details.py:1029
+#: stock/get_item_details.py:1040
 msgid "Price List Currency not selected"
 msgstr "El tipo de divisa para la lista de precios no ha sido seleccionado"
 
@@ -51098,6 +51954,12 @@
 msgid "Price List Rate"
 msgstr "Tarifa de la lista de precios"
 
+#. Label of a Currency field in DocType 'Material Request Item'
+#: stock/doctype/material_request_item/material_request_item.json
+msgctxt "Material Request Item"
+msgid "Price List Rate"
+msgstr "Tarifa de la lista de precios"
+
 #. Label of a Currency field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
@@ -51218,7 +52080,7 @@
 msgid "Price Per Unit ({0})"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:553
+#: selling/page/point_of_sale/pos_controller.js:581
 msgid "Price is not set for the item."
 msgstr ""
 
@@ -51232,7 +52094,7 @@
 msgid "Price or Product Discount"
 msgstr "Precio o descuento del producto"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:145
 msgid "Price or product discount slabs are required"
 msgstr "Se requieren losas de descuento de precio o producto"
 
@@ -51248,7 +52110,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/pricing_rule/pricing_rule.json
-#: buying/doctype/supplier/supplier.js:98
+#: buying/doctype/supplier/supplier.js:116
 msgid "Pricing Rule"
 msgstr "Regla de precios"
 
@@ -51365,7 +52227,7 @@
 msgid "Pricing Rule Item Group"
 msgstr "Grupo de elementos de regla de precios"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:208
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:210
 msgid "Pricing Rule {0} is updated"
 msgstr "La regla de precios {0} se actualiza"
 
@@ -51489,7 +52351,7 @@
 msgid "Primary Address"
 msgstr "Dirección Primaria"
 
-#: public/js/utils/contact_address_quick_entry.js:54
+#: public/js/utils/contact_address_quick_entry.js:57
 msgid "Primary Address Details"
 msgstr "Detalles de la Dirección Primaria"
 
@@ -51511,7 +52373,7 @@
 msgid "Primary Contact"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:35
+#: public/js/utils/contact_address_quick_entry.js:38
 msgid "Primary Contact Details"
 msgstr "Detalles de Contacto Principal"
 
@@ -51540,7 +52402,7 @@
 msgid "Primary Settings"
 msgstr "Ajustes Primarios"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:69
+#: selling/page/point_of_sale/pos_past_order_summary.js:67
 #: templates/pages/material_request_info.html:15 templates/pages/order.html:33
 msgid "Print"
 msgstr "Impresión"
@@ -51571,115 +52433,115 @@
 #. Name of a DocType
 #: setup/doctype/print_heading/print_heading.json
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Delivery Note'
 #: stock/doctype/delivery_note/delivery_note.json
 msgctxt "Delivery Note"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Journal Entry'
 #: accounts/doctype/journal_entry/journal_entry.json
 msgctxt "Journal Entry"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Material Request'
 #: stock/doctype/material_request/material_request.json
 msgctxt "Material Request"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'POS Profile'
 #: accounts/doctype/pos_profile/pos_profile.json
 msgctxt "POS Profile"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Data field in DocType 'Print Heading'
 #: setup/doctype/print_heading/print_heading.json
 msgctxt "Print Heading"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Purchase Order'
 #: buying/doctype/purchase_order/purchase_order.json
 msgctxt "Purchase Order"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Purchase Receipt'
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 msgctxt "Purchase Receipt"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Request for Quotation'
 #: buying/doctype/request_for_quotation/request_for_quotation.json
 msgctxt "Request for Quotation"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Subcontracting Receipt'
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgctxt "Subcontracting Receipt"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #. Label of a Link field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Print Heading"
-msgstr ""
+msgstr "Imprimir Encabezado"
 
 #: regional/report/irs_1099/irs_1099.js:36
 msgid "Print IRS 1099 Forms"
@@ -51781,7 +52643,7 @@
 msgid "Print Preferences"
 msgstr "Preferencias de impresión"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:223
+#: selling/page/point_of_sale/pos_past_order_summary.js:231
 msgid "Print Receipt"
 msgstr "Imprimir el recibo"
 
@@ -51846,7 +52708,7 @@
 msgid "Print Style"
 msgstr "Estilo de Impresión"
 
-#: setup/install.py:118
+#: setup/install.py:99
 msgid "Print UOM after Quantity"
 msgstr "Imprimir UOM después de Cantidad"
 
@@ -51861,15 +52723,16 @@
 msgid "Print and Stationery"
 msgstr "Impresión y Papelería"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:73
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:75
 msgid "Print settings updated in respective print format"
 msgstr "Los ajustes de impresión actualizados en formato de impresión respectivo"
 
-#: setup/install.py:125
+#: setup/install.py:106
 msgid "Print taxes with zero amount"
 msgstr "Imprimir impuestos con importe nulo"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:364
+#: accounts/report/accounts_receivable/accounts_receivable.html:285
 msgid "Printed On "
 msgstr "Impreso en"
 
@@ -51950,9 +52813,10 @@
 msgid "Priorities"
 msgstr "Prioridades"
 
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:19
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:18
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:93
-#: projects/report/project_summary/project_summary.js:37
+#: projects/report/project_summary/project_summary.js:36
+#: templates/pages/task_info.html:54
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -52040,6 +52904,12 @@
 msgid "Problem"
 msgstr "Problema"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Problem"
+msgstr "Problema"
+
 #. Label of a Link field in DocType 'Non Conformance'
 #: quality_management/doctype/non_conformance/non_conformance.json
 msgctxt "Non Conformance"
@@ -52064,7 +52934,7 @@
 msgid "Procedure"
 msgstr "Procedimiento"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:70
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:75
 msgid "Process Day Book Data"
 msgstr "Procesar datos del libro de día"
 
@@ -52150,7 +53020,7 @@
 msgid "Process Loss Value"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:58
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:63
 msgid "Process Master Data"
 msgstr "Procesar datos maestros"
 
@@ -52202,6 +53072,12 @@
 msgid "Process Subscription"
 msgstr ""
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Process in Single Transaction"
+msgstr ""
+
 #. Label of a Long Text field in DocType 'BOM Update Log'
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 msgctxt "BOM Update Log"
@@ -52232,7 +53108,7 @@
 msgid "Processing Party Addresses"
 msgstr "Procesamiento de direcciones de fiestas"
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:115
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:122
 msgid "Processing Sales! Please Wait..."
 msgstr ""
 
@@ -52305,7 +53181,7 @@
 msgstr "Producto"
 
 #. Name of a DocType
-#: public/js/controllers/buying.js:265 public/js/controllers/buying.js:511
+#: public/js/controllers/buying.js:260 public/js/controllers/buying.js:508
 #: selling/doctype/product_bundle/product_bundle.json
 msgid "Product Bundle"
 msgstr "Conjunto / paquete de productos"
@@ -52409,7 +53285,13 @@
 
 #. Label of a Card Break in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
-#: setup/doctype/company/company.py:347
+#: setup/doctype/company/company.py:346
+msgid "Production"
+msgstr "Producción"
+
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
 msgid "Production"
 msgstr "Producción"
 
@@ -52420,18 +53302,18 @@
 msgid "Production Analytics"
 msgstr "Análisis de Producción"
 
-#. Label of a Int field in DocType 'Workstation'
+#. Label of a Section Break field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Production Capacity"
 msgstr "Capacidad de producción"
 
 #: manufacturing/doctype/work_order/work_order_calendar.js:38
-#: manufacturing/report/job_card_summary/job_card_summary.js:65
+#: manufacturing/report/job_card_summary/job_card_summary.js:64
 #: manufacturing/report/job_card_summary/job_card_summary.py:152
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:43
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:42
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:113
-#: manufacturing/report/work_order_summary/work_order_summary.js:51
+#: manufacturing/report/work_order_summary/work_order_summary.js:50
 #: manufacturing/report/work_order_summary/work_order_summary.py:208
 msgid "Production Item"
 msgstr "Elemento de producción"
@@ -52456,7 +53338,7 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/production_plan/production_plan.json
-#: manufacturing/report/production_plan_summary/production_plan_summary.js:9
+#: manufacturing/report/production_plan_summary/production_plan_summary.js:8
 msgid "Production Plan"
 msgstr "Plan de Producción"
 
@@ -52663,7 +53545,7 @@
 msgid "Profitability Analysis"
 msgstr "Cuenta de Resultados"
 
-#: templates/pages/projects.html:25
+#: projects/doctype/task/task_list.js:52 templates/pages/projects.html:25
 msgid "Progress"
 msgstr "Progreso"
 
@@ -52683,10 +53565,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:973
+#: 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:634
+#: 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
@@ -52694,30 +53576,31 @@
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:73
 #: accounts/report/sales_register/sales_register.py:228
 #: accounts/report/trial_balance/trial_balance.js:64
-#: buying/report/procurement_tracker/procurement_tracker.js:22
+#: 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:34
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:33
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:182
 #: projects/doctype/project/project.json
 #: projects/doctype/project/project_dashboard.py:11
 #: projects/doctype/task/task_calendar.js:19
-#: projects/doctype/task/task_tree.js:11
+#: projects/doctype/task/task_list.js:45 projects/doctype/task/task_tree.js:11
 #: projects/doctype/timesheet/timesheet_calendar.js:22
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:34
 #: projects/report/project_summary/project_summary.py:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:19
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:51
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:25
-#: public/js/financial_statements.js:247 public/js/projects/timer.js:10
+#: public/js/financial_statements.js:256 public/js/projects/timer.js:14
 #: public/js/purchase_trends_filters.js:52 public/js/sales_trends_filters.js:28
-#: selling/doctype/sales_order/sales_order.js:587
+#: selling/doctype/sales_order/sales_order.js:681
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:94
-#: stock/report/reserved_stock/reserved_stock.js:139
+#: stock/report/reserved_stock/reserved_stock.js:130
 #: stock/report/reserved_stock/reserved_stock.py:184
-#: stock/report/stock_ledger/stock_ledger.js:76
-#: stock/report/stock_ledger/stock_ledger.py:261
-#: support/report/issue_analytics/issue_analytics.js:76
-#: support/report/issue_summary/issue_summary.js:64
+#: stock/report/stock_ledger/stock_ledger.js:84
+#: stock/report/stock_ledger/stock_ledger.py:333
+#: support/report/issue_analytics/issue_analytics.js:75
+#: support/report/issue_summary/issue_summary.js:63
+#: templates/pages/task_info.html:39 templates/pages/timelog_info.html:22
 msgid "Project"
 msgstr "Proyecto"
 
@@ -52782,6 +53665,12 @@
 msgid "Project"
 msgstr "Proyecto"
 
+#. Label of a Link field in DocType 'Installation Note'
+#: selling/doctype/installation_note/installation_note.json
+msgctxt "Installation Note"
+msgid "Project"
+msgstr "Proyecto"
+
 #. Label of a Link field in DocType 'Issue'
 #: support/doctype/issue/issue.json
 msgctxt "Issue"
@@ -53087,7 +53976,7 @@
 
 #. Name of a DocType
 #: projects/doctype/project_type/project_type.json
-#: projects/report/project_summary/project_summary.js:31
+#: projects/report/project_summary/project_summary.js:30
 msgid "Project Type"
 msgstr "Tipo de proyecto"
 
@@ -53163,58 +54052,64 @@
 msgid "Project-wise data is not available for Quotation"
 msgstr "Los datos del proyecto no están disponibles para el presupuesto"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:46
+#: stock/dashboard/item_dashboard_list.html:37
 #: stock/report/item_shortage_report/item_shortage_report.py:73
 #: stock/report/stock_projected_qty/stock_projected_qty.py:199
 #: templates/emails/reorder_item.html:12
 msgid "Projected Qty"
-msgstr "Cantidad proyectada"
+msgstr "Cant. proyectada"
 
 #. Label of a Float field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "Projected Qty"
-msgstr "Cantidad proyectada"
+msgstr "Cant. proyectada"
 
 #. Label of a Float field in DocType 'Material Request Item'
 #: stock/doctype/material_request_item/material_request_item.json
 msgctxt "Material Request Item"
 msgid "Projected Qty"
-msgstr "Cantidad proyectada"
+msgstr "Cant. proyectada"
 
 #. Label of a Float field in DocType 'Material Request Plan Item'
 #: manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
 msgctxt "Material Request Plan Item"
 msgid "Projected Qty"
-msgstr "Cantidad proyectada"
+msgstr "Cant. proyectada"
 
 #. Label of a Float field in DocType 'Packed Item'
 #: stock/doctype/packed_item/packed_item.json
 msgctxt "Packed Item"
 msgid "Projected Qty"
-msgstr "Cantidad proyectada"
+msgstr "Cant. proyectada"
 
 #. Label of a Float field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgctxt "Production Plan Sub Assembly Item"
 msgid "Projected Qty"
-msgstr "Cantidad proyectada"
+msgstr "Cant. proyectada"
 
 #. Label of a Float field in DocType 'Quotation Item'
 #: selling/doctype/quotation_item/quotation_item.json
 msgctxt "Quotation Item"
 msgid "Projected Qty"
-msgstr "Cantidad proyectada"
+msgstr "Cant. proyectada"
 
 #. Label of a Float field in DocType 'Sales Order Item'
 #: selling/doctype/sales_order_item/sales_order_item.json
 msgctxt "Sales Order Item"
 msgid "Projected Qty"
-msgstr "Cantidad proyectada"
+msgstr "Cant. proyectada"
 
 #: stock/report/item_shortage_report/item_shortage_report.py:130
 msgid "Projected Quantity"
 msgstr "Cantidad proyectada"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Projected Quantity Formula"
+msgstr ""
+
 #: stock/page/stock_balance/stock_balance.js:51
 msgid "Projected qty"
 msgstr "Cantidad proyectada"
@@ -53345,7 +54240,7 @@
 msgstr "Prorratear"
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:61
+#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:62
 #: crm/doctype/prospect/prospect.json
 msgid "Prospect"
 msgstr ""
@@ -53440,7 +54335,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:335
+#: setup/doctype/company/company.py:334
 msgid "Purchase"
 msgstr "Compra"
 
@@ -53533,75 +54428,75 @@
 #. Name of a DocType
 #: 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:23
+#: 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:323
-#: buying/doctype/purchase_order/purchase_order_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:378
+#: 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:110
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:22
-#: stock/doctype/stock_entry/stock_entry.js:262
+#: stock/doctype/purchase_receipt/purchase_receipt.js:123
+#: stock/doctype/purchase_receipt/purchase_receipt.js:268
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:30
+#: stock/doctype/stock_entry/stock_entry.js:294
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Label of a Link field in DocType 'Asset'
 #: assets/doctype/asset/asset.json
 msgctxt "Asset"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Label of a Link field in DocType 'Asset Repair'
 #: assets/doctype/asset_repair/asset_repair.json
 msgctxt "Asset Repair"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule'
 #: setup/doctype/authorization_rule/authorization_rule.json
 msgctxt "Authorization Rule"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Option for the 'Document Type' (Select) field in DocType 'Contract'
 #: crm/doctype/contract/contract.json
 msgctxt "Contract"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Linked DocType in Incoterm's connections
 #: setup/doctype/incoterm/incoterm.json
 msgctxt "Incoterm"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Option for the 'Reference Type' (Select) field in DocType 'Journal Entry
 #. Account'
 #: accounts/doctype/journal_entry_account/journal_entry_account.json
 msgctxt "Journal Entry Account"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Option for the 'Receipt Document Type' (Select) field in DocType 'Landed
 #. Cost Item'
 #: stock/doctype/landed_cost_item/landed_cost_item.json
 msgctxt "Landed Cost Item"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Option for the 'Receipt Document Type' (Select) field in DocType 'Landed
 #. Cost Purchase Receipt'
 #: stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
 msgctxt "Landed Cost Purchase Receipt"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Option for the 'Invoice Type' (Select) field in DocType 'Payment
 #. Reconciliation Invoice'
 #: accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
 msgctxt "Payment Reconciliation Invoice"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Label of a shortcut in the Accounting Workspace
 #. Label of a Link in the Payables Workspace
@@ -53612,26 +54507,26 @@
 #: buying/workspace/buying/buying.json
 msgctxt "Purchase Invoice"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Label of a Link field in DocType 'Purchase Receipt Item'
 #: stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 msgctxt "Purchase Receipt Item"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Option for the 'Reference Type' (Select) field in DocType 'Quality
 #. Inspection'
 #: stock/doctype/quality_inspection/quality_inspection.json
 msgctxt "Quality Inspection"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Linked DocType in Subscription's connections
 #: accounts/doctype/subscription/subscription.json
 msgctxt "Subscription"
 msgid "Purchase Invoice"
-msgstr "Factura de compra"
+msgstr "Factura de Compra"
 
 #. Name of a DocType
 #: accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
@@ -53641,19 +54536,19 @@
 #. Name of a DocType
 #: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
 msgid "Purchase Invoice Item"
-msgstr "Factura de compra del producto"
+msgstr "Producto de la Factura de Compra"
 
 #. Label of a Data field in DocType 'Purchase Invoice Item'
 #: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
 msgctxt "Purchase Invoice Item"
 msgid "Purchase Invoice Item"
-msgstr "Factura de compra del producto"
+msgstr "Producto de la Factura de Compra"
 
 #. Label of a Data field in DocType 'Purchase Receipt Item'
 #: stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 msgctxt "Purchase Receipt Item"
 msgid "Purchase Invoice Item"
-msgstr "Factura de compra del producto"
+msgstr "Producto de la Factura de Compra"
 
 #. Name of a report
 #. Label of a Link in the Financial Reports Workspace
@@ -53664,16 +54559,16 @@
 msgid "Purchase Invoice Trends"
 msgstr "Tendencias de compras"
 
-#: assets/doctype/asset/asset.py:213
+#: assets/doctype/asset/asset.py:215
 msgid "Purchase Invoice cannot be made against an existing asset {0}"
 msgstr "La factura de compra no se puede realizar contra un activo existente {0}"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:389
-#: stock/doctype/purchase_receipt/purchase_receipt.py:403
+#: stock/doctype/purchase_receipt/purchase_receipt.py:390
+#: stock/doctype/purchase_receipt/purchase_receipt.py:404
 msgid "Purchase Invoice {0} is already submitted"
-msgstr "La factura de compra {0} ya existe o se encuentra validada"
+msgstr "La Factura de Compra {0} ya existe o se encuentra validada"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1769
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1828
 msgid "Purchase Invoices"
 msgstr "Facturas de compra"
 
@@ -53691,6 +54586,7 @@
 #: setup/doctype/supplier_group/supplier_group.json stock/doctype/bin/bin.json
 #: stock/doctype/material_request/material_request.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgid "Purchase Manager"
 msgstr "Gerente de compras"
@@ -53705,21 +54601,21 @@
 msgstr "Director de compras"
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:131
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:155
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:234
 #: accounts/report/purchase_register/purchase_register.py:216
 #: buying/doctype/purchase_order/purchase_order.json
-#: buying/doctype/supplier_quotation/supplier_quotation.js:23
+#: 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:41
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:40
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:167
-#: controllers/buying_controller.py:624
-#: manufacturing/doctype/blanket_order/blanket_order.js:45
-#: selling/doctype/sales_order/sales_order.js:112
-#: selling/doctype/sales_order/sales_order.js:576
-#: stock/doctype/material_request/material_request.js:137
-#: stock/doctype/purchase_receipt/purchase_receipt.js:194
+#: controllers/buying_controller.py:649
+#: manufacturing/doctype/blanket_order/blanket_order.js:54
+#: selling/doctype/sales_order/sales_order.js:136
+#: selling/doctype/sales_order/sales_order.js:659
+#: stock/doctype/material_request/material_request.js:154
+#: stock/doctype/purchase_receipt/purchase_receipt.js:225
 msgid "Purchase Order"
 msgstr "Orden de compra (OC)"
 
@@ -53890,7 +54786,7 @@
 msgid "Purchase Order Item Supplied"
 msgstr "Producto suministrado desde orden de compra"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:684
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:685
 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}"
 msgstr ""
 
@@ -53904,11 +54800,11 @@
 msgid "Purchase Order Pricing Rule"
 msgstr "Regla de precios de orden de compra"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:579
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
 msgid "Purchase Order Required"
 msgstr "Orden de compra requerida"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:576
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:580
 msgid "Purchase Order Required for item {}"
 msgstr "Se requiere orden de compra para el artículo {}"
 
@@ -53920,7 +54816,7 @@
 msgid "Purchase Order Trends"
 msgstr "Tendencias de ordenes de compra"
 
-#: selling/doctype/sales_order/sales_order.js:957
+#: selling/doctype/sales_order/sales_order.js:1115
 msgid "Purchase Order already created for all Sales Order items"
 msgstr "Orden de compra ya creada para todos los artículos de orden de venta"
 
@@ -53928,11 +54824,11 @@
 msgid "Purchase Order number required for Item {0}"
 msgstr "Se requiere el numero de orden de compra para el producto {0}"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:618
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:622
 msgid "Purchase Order {0} is not submitted"
 msgstr "La orden de compra {0} no se encuentra validada"
 
-#: buying/doctype/purchase_order/purchase_order.py:824
+#: buying/doctype/purchase_order/purchase_order.py:827
 msgid "Purchase Orders"
 msgstr "Ordenes de compra"
 
@@ -53942,7 +54838,7 @@
 msgid "Purchase Orders Items Overdue"
 msgstr "Órdenes de compra Artículos vencidos"
 
-#: buying/doctype/purchase_order/purchase_order.py:301
+#: buying/doctype/purchase_order/purchase_order.py:302
 msgid "Purchase Orders are not allowed for {0} due to a scorecard standing of {1}."
 msgstr "Las órdenes de compra no están permitidas para {0} debido a una tarjeta de puntuación de {1}."
 
@@ -53958,7 +54854,7 @@
 msgid "Purchase Orders to Receive"
 msgstr "Órdenes de compra para recibir"
 
-#: controllers/accounts_controller.py:1517
+#: controllers/accounts_controller.py:1606
 msgid "Purchase Orders {0} are un-linked"
 msgstr ""
 
@@ -53967,17 +54863,17 @@
 msgstr "Lista de precios para las compras"
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:607
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:613
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: 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/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:310
-#: buying/doctype/purchase_order/purchase_order_list.js:43
+#: buying/doctype/purchase_order/purchase_order.js:352
+#: buying/doctype/purchase_order/purchase_order_list.js:61
 #: stock/doctype/purchase_receipt/purchase_receipt.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:56
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:65
 msgid "Purchase Receipt"
 msgstr "Recibo de compra"
 
@@ -54094,11 +54990,11 @@
 msgid "Purchase Receipt No"
 msgstr "Recibo de compra No."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:601
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
 msgid "Purchase Receipt Required"
 msgstr "Recibo de compra requerido"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:600
 msgid "Purchase Receipt Required for item {}"
 msgstr "Se requiere recibo de compra para el artículo {}"
 
@@ -54111,15 +55007,15 @@
 msgid "Purchase Receipt Trends"
 msgstr "Tendencias de recibos de compra"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:314
+#: stock/doctype/purchase_receipt/purchase_receipt.js:363
 msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
 msgstr "El recibo de compra no tiene ningún artículo para el que esté habilitada la opción Conservar muestra."
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:702
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:703
 msgid "Purchase Receipt {0} created."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:628
 msgid "Purchase Receipt {0} is not submitted"
 msgstr "El recibo de compra {0} no esta validado"
 
@@ -54136,11 +55032,11 @@
 msgid "Purchase Register"
 msgstr "Registro de compras"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
 msgid "Purchase Return"
 msgstr "Devolución de compra"
 
-#: setup/doctype/company/company.js:104
+#: setup/doctype/company/company.js:118
 msgid "Purchase Tax Template"
 msgstr "Plantilla de Impuestos sobre compras"
 
@@ -54257,6 +55153,7 @@
 #: stock/doctype/price_list/price_list.json
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -54322,7 +55219,7 @@
 msgid "Purple"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:287
+#: stock/doctype/stock_entry/stock_entry.js:329
 msgid "Purpose"
 msgstr "Propósito"
 
@@ -54362,7 +55259,7 @@
 msgid "Purpose"
 msgstr "Propósito"
 
-#: stock/doctype/stock_entry/stock_entry.py:380
+#: stock/doctype/stock_entry/stock_entry.py:335
 msgid "Purpose must be one of {0}"
 msgstr "Propósito debe ser uno de {0}"
 
@@ -54403,167 +55300,170 @@
 #: controllers/trends.py:240 controllers/trends.py:252
 #: controllers/trends.py:257
 #: manufacturing/report/bom_explorer/bom_explorer.py:57
-#: public/js/bom_configurator/bom_configurator.bundle.js:203
-#: public/js/bom_configurator/bom_configurator.bundle.js:266
-#: public/js/bom_configurator/bom_configurator.bundle.js:271
-#: public/js/bom_configurator/bom_configurator.bundle.js:344
-#: public/js/utils.js:660 selling/doctype/sales_order/sales_order.js:315
-#: selling/doctype/sales_order/sales_order.js:410
-#: selling/doctype/sales_order/sales_order.js:698
-#: selling/doctype/sales_order/sales_order.js:815
+#: 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
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:106
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:166
 #: 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
+#: templates/form_grid/stock_entry_grid.html:10
 #: templates/generators/bom.html:50 templates/pages/rfq.html:40
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Asset Capitalization Service Item'
 #: assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
 msgctxt "Asset Capitalization Service Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Asset Capitalization Stock Item'
 #: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
 msgctxt "Asset Capitalization Stock Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'BOM Creator Item'
 #: manufacturing/doctype/bom_creator_item/bom_creator_item.json
 msgctxt "BOM Creator Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'BOM Item'
 #: manufacturing/doctype/bom_item/bom_item.json
 msgctxt "BOM Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'BOM Scrap Item'
 #: manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
 msgctxt "BOM Scrap Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'BOM Website Item'
 #: manufacturing/doctype/bom_website_item/bom_website_item.json
 msgctxt "BOM Website Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Section Break field in DocType 'Job Card Item'
 #: manufacturing/doctype/job_card_item/job_card_item.json
 msgctxt "Job Card Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Job Card Scrap Item'
 #: manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
 msgctxt "Job Card Scrap Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Landed Cost Item'
 #: stock/doctype/landed_cost_item/landed_cost_item.json
 msgctxt "Landed Cost Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Option for the 'Distribute Charges Based On' (Select) field in DocType
 #. 'Landed Cost Voucher'
 #: stock/doctype/landed_cost_voucher/landed_cost_voucher.json
 msgctxt "Landed Cost Voucher"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Opportunity Item'
 #: crm/doctype/opportunity_item/opportunity_item.json
 msgctxt "Opportunity Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Packed Item'
 #: stock/doctype/packed_item/packed_item.json
 msgctxt "Packed Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Pick List Item'
 #: stock/doctype/pick_list_item/pick_list_item.json
 msgctxt "Pick List Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Product Bundle Item'
 #: selling/doctype/product_bundle_item/product_bundle_item.json
 msgctxt "Product Bundle Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Data field in DocType 'Production Plan Item Reference'
 #: manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
 msgctxt "Production Plan Item Reference"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Promotional Scheme Product Discount'
 #: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
 msgctxt "Promotional Scheme Product Discount"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Serial and Batch Entry'
 #: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
 msgctxt "Serial and Batch Entry"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Float field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Option for the 'Reservation Based On' (Select) field in DocType 'Stock
 #. Reservation Entry'
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 msgctxt "Stock Reservation Entry"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Option for the 'Distribute Additional Costs Based On ' (Select) field in
 #. DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Option for the 'Distribute Additional Costs Based On ' (Select) field in
 #. DocType 'Subcontracting Receipt'
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgctxt "Subcontracting Receipt"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
 #. Label of a Section Break field in DocType 'Work Order Item'
 #: manufacturing/doctype/work_order_item/work_order_item.json
 msgctxt "Work Order Item"
 msgid "Qty"
-msgstr "Cantidad"
+msgstr "Cant."
 
-#: templates/pages/order.html:167
+#: templates/pages/order.html:179
 msgid "Qty "
-msgstr ""
+msgstr "Cant. "
 
 #. Label of a Float field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -54605,13 +55505,13 @@
 #: manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
 msgctxt "Material Request Plan Item"
 msgid "Qty In Stock"
-msgstr ""
+msgstr "Cant en existencia"
 
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:76
 msgid "Qty Per Unit"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:237
+#: manufacturing/doctype/bom/bom.js:256
 #: manufacturing/report/process_loss_report/process_loss_report.py:83
 msgid "Qty To Manufacture"
 msgstr "Cantidad para producción"
@@ -54702,7 +55602,14 @@
 msgid "Qty for which recursion isn't applicable."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:713
+#. Description of the 'Apply Recursion Over (As Per Transaction UOM)' (Float)
+#. field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Qty for which recursion isn't applicable."
+msgstr ""
+
+#: manufacturing/doctype/work_order/work_order.js:766
 msgid "Qty for {0}"
 msgstr "Cantidad de {0}"
 
@@ -54722,7 +55629,7 @@
 msgid "Qty in Stock UOM"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.js:145
+#: stock/doctype/pick_list/pick_list.js:174
 msgid "Qty of Finished Goods Item"
 msgstr "Cantidad de artículos terminados"
 
@@ -54732,7 +55639,7 @@
 msgid "Qty of Finished Goods Item"
 msgstr "Cantidad de artículos terminados"
 
-#: stock/doctype/pick_list/pick_list.py:430
+#: stock/doctype/pick_list/pick_list.py:470
 msgid "Qty of Finished Goods Item should be greater than 0."
 msgstr ""
 
@@ -54762,11 +55669,12 @@
 msgid "Qty to Deliver"
 msgstr "Cantidad a entregar"
 
-#: public/js/utils/serial_no_batch_selector.js:321
+#: public/js/utils/serial_no_batch_selector.js:327
 msgid "Qty to Fetch"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:668
+#: manufacturing/doctype/job_card/job_card.py:675
+#: manufacturing/doctype/workstation/workstation_job_card.html:56
 msgid "Qty to Manufacture"
 msgstr "Cantidad para producción"
 
@@ -54947,7 +55855,7 @@
 msgstr "Objetivo de calidad Objetivo"
 
 #. Name of a DocType
-#: manufacturing/doctype/bom/bom.js:130
+#: manufacturing/doctype/bom/bom.js:138
 #: stock/doctype/quality_inspection/quality_inspection.json
 msgid "Quality Inspection"
 msgstr "Inspeccion de calidad"
@@ -55107,12 +56015,12 @@
 msgid "Quality Inspection Template Name"
 msgstr "Nombre de Plantilla de Inspección de Calidad"
 
-#: public/js/controllers/transaction.js:298
-#: stock/doctype/stock_entry/stock_entry.js:143
+#: public/js/controllers/transaction.js:324
+#: stock/doctype/stock_entry/stock_entry.js:157
 msgid "Quality Inspection(s)"
 msgstr ""
 
-#: setup/doctype/company/company.py:377
+#: setup/doctype/company/company.py:376
 msgid "Quality Management"
 msgstr "Gestión de Calidad"
 
@@ -55211,23 +56119,26 @@
 
 #: 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:29
+#: buying/report/purchase_analytics/purchase_analytics.js:28
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:215
-#: manufacturing/doctype/bom/bom.js:306
-#: manufacturing/doctype/bom_creator/bom_creator.js:69
-#: public/js/controllers/buying.js:518 public/js/stock_analytics.js:37
-#: public/js/utils/serial_no_batch_selector.js:393
+#: 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/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
-#: selling/report/sales_analytics/sales_analytics.js:29
+#: selling/report/sales_analytics/sales_analytics.js:36
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:67
-#: stock/dashboard/item_dashboard.js:236
-#: stock/doctype/material_request/material_request.js:249
-#: stock/doctype/stock_entry/stock_entry.js:551
+#: stock/dashboard/item_dashboard.js:244
+#: stock/doctype/material_request/material_request.js:314
+#: stock/doctype/stock_entry/stock_entry.js:636
 #: 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:28
+#: stock/report/stock_analytics/stock_analytics.js:27
 #: templates/emails/reorder_item.html:10 templates/generators/bom.html:30
-#: templates/pages/material_request_info.html:48 templates/pages/order.html:86
+#: templates/pages/material_request_info.html:48 templates/pages/order.html:98
 msgid "Quantity"
 msgstr "Cantidad"
 
@@ -55466,16 +56377,20 @@
 msgid "Quantity and Warehouse"
 msgstr "Cantidad y Almacén"
 
-#: stock/doctype/stock_entry/stock_entry.py:1270
+#: stock/doctype/stock_entry/stock_entry.py:1279
 msgid "Quantity in row {0} ({1}) must be same as manufactured quantity {2}"
 msgstr "La cantidad en la línea {0} ({1}) debe ser la misma que la cantidad producida {2}"
 
-#: stock/dashboard/item_dashboard.js:273
+#: manufacturing/doctype/plant_floor/plant_floor.js:246
+msgid "Quantity is required"
+msgstr ""
+
+#: stock/dashboard/item_dashboard.js:281
 msgid "Quantity must be greater than zero, and less or equal to {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:721
-#: stock/doctype/pick_list/pick_list.js:152
+#: manufacturing/doctype/work_order/work_order.js:775
+#: stock/doctype/pick_list/pick_list.js:182
 msgid "Quantity must not be more than {0}"
 msgstr "La cantidad no debe ser más de {0}"
 
@@ -55490,26 +56405,27 @@
 msgstr "Cantidad requerida para el producto {0} en la línea {1}"
 
 #: manufacturing/doctype/bom/bom.py:568
+#: manufacturing/doctype/workstation/workstation.js:216
 msgid "Quantity should be greater than 0"
 msgstr "Cantidad debe ser mayor que 0"
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:22
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:21
 msgid "Quantity to Make"
 msgstr "Cantidad para Hacer"
 
-#: manufacturing/doctype/work_order/work_order.js:249
+#: manufacturing/doctype/work_order/work_order.js:264
 msgid "Quantity to Manufacture"
 msgstr "Cantidad a fabricar"
 
-#: manufacturing/doctype/work_order/work_order.py:1516
+#: manufacturing/doctype/work_order/work_order.py:1530
 msgid "Quantity to Manufacture can not be zero for the operation {0}"
 msgstr "La cantidad a fabricar no puede ser cero para la operación {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:934
+#: manufacturing/doctype/work_order/work_order.py:948
 msgid "Quantity to Manufacture must be greater than 0."
 msgstr "La cantidad a producir debe ser mayor que 0."
 
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:21
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:24
 msgid "Quantity to Produce"
 msgstr "Cantidad a Producir"
 
@@ -55517,7 +56433,7 @@
 msgid "Quantity to Produce should be greater than zero."
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:227
+#: public/js/utils/barcode_scanner.js:236
 msgid "Quantity to Scan"
 msgstr ""
 
@@ -55526,20 +56442,20 @@
 msgid "Quarter {0} {1}"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:65
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:68
-#: buying/report/purchase_analytics/purchase_analytics.js:63
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
-#: manufacturing/report/production_analytics/production_analytics.js:36
-#: public/js/financial_statements.js:218
+#: accounts/report/budget_variance_report/budget_variance_report.js:63
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:76
+#: buying/report/purchase_analytics/purchase_analytics.js:62
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
+#: manufacturing/report/production_analytics/production_analytics.js:35
+#: public/js/financial_statements.js:227
 #: public/js/purchase_trends_filters.js:20 public/js/sales_trends_filters.js:12
-#: public/js/stock_analytics.js:54
-#: selling/report/sales_analytics/sales_analytics.js:63
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
-#: stock/report/stock_analytics/stock_analytics.js:82
-#: support/report/issue_analytics/issue_analytics.js:44
+#: public/js/stock_analytics.js:84
+#: selling/report/sales_analytics/sales_analytics.js:70
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
+#: stock/report/stock_analytics/stock_analytics.js:81
+#: support/report/issue_analytics/issue_analytics.js:43
 msgid "Quarterly"
 msgstr "Trimestral"
 
@@ -55627,11 +56543,18 @@
 msgid "Queued"
 msgstr "En cola"
 
-#: accounts/doctype/journal_entry/journal_entry.js:39
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Queued"
+msgstr "En cola"
+
+#: accounts/doctype/journal_entry/journal_entry.js:82
 msgid "Quick Entry"
 msgstr "Entrada Rápida"
 
-#: accounts/doctype/journal_entry/journal_entry.js:527
+#: accounts/doctype/journal_entry/journal_entry.js:577
 msgid "Quick Journal Entry"
 msgstr "Asiento Contable Rápido"
 
@@ -55668,13 +56591,14 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:257
-#: buying/doctype/supplier_quotation/supplier_quotation.js:26
-#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:100
-#: crm/report/lead_details/lead_details.js:38
-#: manufacturing/doctype/blanket_order/blanket_order.js:33
+#: accounts/doctype/sales_invoice/sales_invoice.js:287
+#: buying/doctype/supplier_quotation/supplier_quotation.js:27
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
+#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:108
+#: crm/report/lead_details/lead_details.js:37
+#: manufacturing/doctype/blanket_order/blanket_order.js:38
 #: selling/doctype/quotation/quotation.json
-#: selling/doctype/sales_order/sales_order.js:613
+#: selling/doctype/sales_order/sales_order.js:721
 msgid "Quotation"
 msgstr "Cotización"
 
@@ -55782,11 +56706,11 @@
 msgid "Quotation Trends"
 msgstr "Tendencias de Presupuestos"
 
-#: selling/doctype/sales_order/sales_order.py:383
+#: selling/doctype/sales_order/sales_order.py:386
 msgid "Quotation {0} is cancelled"
 msgstr "El presupuesto {0} se ha cancelado"
 
-#: selling/doctype/sales_order/sales_order.py:300
+#: selling/doctype/sales_order/sales_order.py:303
 msgid "Quotation {0} not of type {1}"
 msgstr "El presupuesto {0} no es del tipo {1}"
 
@@ -55842,13 +56766,13 @@
 msgid "Random"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:58
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:26
-#: manufacturing/report/production_analytics/production_analytics.js:31
-#: public/js/stock_analytics.js:49
-#: selling/report/sales_analytics/sales_analytics.js:58
-#: stock/report/stock_analytics/stock_analytics.js:77
-#: support/report/issue_analytics/issue_analytics.js:39
+#: buying/report/purchase_analytics/purchase_analytics.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:25
+#: manufacturing/report/production_analytics/production_analytics.js:30
+#: public/js/stock_analytics.js:78
+#: selling/report/sales_analytics/sales_analytics.js:65
+#: stock/report/stock_analytics/stock_analytics.js:76
+#: support/report/issue_analytics/issue_analytics.js:38
 msgid "Range"
 msgstr "Rango"
 
@@ -55868,12 +56792,13 @@
 #: 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:669
+#: accounts/report/share_ledger/share_ledger.py:56 public/js/utils.js:732
 #: 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:243
+#: stock/dashboard/item_dashboard.js:251
 #: stock/report/delayed_item_report/delayed_item_report.py:151
-#: templates/pages/order.html:89 templates/pages/rfq.html:43
+#: templates/form_grid/item_grid.html:8 templates/pages/order.html:101
+#: templates/pages/rfq.html:43
 msgid "Rate"
 msgstr "Precio"
 
@@ -56483,6 +57408,7 @@
 msgstr ""
 
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:52
+#: public/js/bom_configurator/bom_configurator.bundle.js:118
 #: setup/setup_wizard/operations/install_fixtures.py:46
 #: setup/setup_wizard/operations/install_fixtures.py:167
 msgid "Raw Material"
@@ -56552,12 +57478,13 @@
 msgid "Raw Material Value"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:66
+#: manufacturing/report/production_planning_report/production_planning_report.js:65
 msgid "Raw Material Warehouse"
 msgstr "Almacén de materia prima"
 
-#: manufacturing/doctype/bom/bom.js:274
-#: public/js/bom_configurator/bom_configurator.bundle.js:268
+#: manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/workstation/workstation_job_card.html:76
+#: public/js/bom_configurator/bom_configurator.bundle.js:289
 msgid "Raw Materials"
 msgstr "Materias primas"
 
@@ -56643,12 +57570,12 @@
 msgid "Raw Materials cannot be blank."
 msgstr "'Materias primas' no puede estar en blanco."
 
-#: buying/doctype/purchase_order/purchase_order.js:304
-#: manufacturing/doctype/production_plan/production_plan.js:97
-#: manufacturing/doctype/work_order/work_order.js:574
-#: selling/doctype/sales_order/sales_order.js:526
-#: selling/doctype/sales_order/sales_order_list.js:49
-#: stock/doctype/material_request/material_request.js:166
+#: buying/doctype/purchase_order/purchase_order.js:342
+#: manufacturing/doctype/production_plan/production_plan.js:103
+#: manufacturing/doctype/work_order/work_order.js:610
+#: selling/doctype/sales_order/sales_order.js:563
+#: selling/doctype/sales_order/sales_order_list.js:62
+#: stock/doctype/material_request/material_request.js:197
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 msgid "Re-open"
 msgstr "Re-Abrir"
@@ -56665,7 +57592,7 @@
 msgid "Re-order Qty"
 msgstr "Cantidad mínima para ordenar"
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:226
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:227
 msgid "Reached Root"
 msgstr ""
 
@@ -56752,11 +57679,11 @@
 msgid "Readings"
 msgstr "Lecturas"
 
-#: support/doctype/issue/issue.js:44
+#: support/doctype/issue/issue.js:51
 msgid "Reason"
 msgstr "Razón"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:242
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:279
 msgid "Reason For Putting On Hold"
 msgstr "Motivo de Poner en Espera"
 
@@ -56766,8 +57693,14 @@
 msgid "Reason For Putting On Hold"
 msgstr "Motivo de Poner en Espera"
 
-#: buying/doctype/purchase_order/purchase_order.js:565
-#: selling/doctype/sales_order/sales_order.js:1112
+#. Label of a Data field in DocType 'Payment Request'
+#: accounts/doctype/payment_request/payment_request.json
+msgctxt "Payment Request"
+msgid "Reason for Failure"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:661
+#: selling/doctype/sales_order/sales_order.js:1274
 msgid "Reason for Hold"
 msgstr "Motivo de espera"
 
@@ -56777,13 +57710,13 @@
 msgid "Reason for Leaving"
 msgstr "Razones de renuncia"
 
-#: selling/doctype/sales_order/sales_order.js:1127
+#: selling/doctype/sales_order/sales_order.js:1289
 msgid "Reason for hold:"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:144
+#: manufacturing/doctype/bom_creator/bom_creator.js:140
 msgid "Rebuild Tree"
-msgstr ""
+msgstr "Reconstruir el árbol"
 
 #: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.js:93
 msgid "Rebuilding BTree for period ..."
@@ -56795,11 +57728,11 @@
 msgid "Recalculate Incoming/Outgoing Rate"
 msgstr ""
 
-#: projects/doctype/project/project.js:104
+#: projects/doctype/project/project.js:128
 msgid "Recalculating Purchase Cost against this Project..."
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:29
+#: assets/doctype/asset/asset_list.js:21
 msgid "Receipt"
 msgstr "Recibo"
 
@@ -56845,7 +57778,7 @@
 msgid "Receipt Document Type"
 msgstr "Tipo de Recibo de Documento"
 
-#: accounts/report/account_balance/account_balance.js:53
+#: accounts/report/account_balance/account_balance.js:55
 msgid "Receivable"
 msgstr "A cobrar"
 
@@ -56874,7 +57807,7 @@
 msgid "Receivable / Payable Account"
 msgstr "Cuenta por Cobrar / Pagar"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:67
+#: 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
@@ -56908,10 +57841,10 @@
 msgid "Receive"
 msgstr "Recibir/Recibido"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:297
+#: buying/doctype/request_for_quotation/request_for_quotation.py:321
 #: buying/doctype/supplier_quotation/supplier_quotation.py:175
-#: stock/doctype/material_request/material_request_list.js:23
-#: stock/doctype/material_request/material_request_list.js:31
+#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:35
 msgid "Received"
 msgstr "Recibido"
 
@@ -56952,7 +57885,7 @@
 msgid "Received Amount After Tax (Company Currency)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:891
+#: accounts/doctype/payment_entry/payment_entry.py:900
 msgid "Received Amount cannot be greater than Paid Amount"
 msgstr ""
 
@@ -56977,43 +57910,43 @@
 #: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.py:247
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:143
 msgid "Received Qty"
-msgstr "Cantidad recibida"
+msgstr "Cant. Recibida"
 
 #. Label of a Float field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
 msgctxt "Delivery Note Item"
 msgid "Received Qty"
-msgstr "Cantidad recibida"
+msgstr "Cant. Recibida"
 
 #. Label of a Float field in DocType 'Material Request Item'
 #: stock/doctype/material_request_item/material_request_item.json
 msgctxt "Material Request Item"
 msgid "Received Qty"
-msgstr "Cantidad recibida"
+msgstr "Cant. Recibida"
 
 #. Label of a Float field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgctxt "Production Plan Sub Assembly Item"
 msgid "Received Qty"
-msgstr "Cantidad recibida"
+msgstr "Cant. Recibida"
 
 #. Label of a Float field in DocType 'Purchase Invoice Item'
 #: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
 msgctxt "Purchase Invoice Item"
 msgid "Received Qty"
-msgstr "Cantidad recibida"
+msgstr "Cant. Recibida"
 
 #. Label of a Float field in DocType 'Purchase Order Item'
 #: buying/doctype/purchase_order_item/purchase_order_item.json
 msgctxt "Purchase Order Item"
 msgid "Received Qty"
-msgstr "Cantidad recibida"
+msgstr "Cant. Recibida"
 
 #. Label of a Float field in DocType 'Subcontracting Order Item'
 #: subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
 msgctxt "Subcontracting Order Item"
 msgid "Received Qty"
-msgstr "Cantidad recibida"
+msgstr "Cant. Recibida"
 
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:263
 msgid "Received Qty Amount"
@@ -57026,6 +57959,7 @@
 msgstr ""
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:50
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:9
 msgid "Received Quantity"
 msgstr "Cantidad recibida"
 
@@ -57041,7 +57975,7 @@
 msgid "Received Quantity"
 msgstr "Cantidad recibida"
 
-#: stock/doctype/stock_entry/stock_entry.js:250
+#: stock/doctype/stock_entry/stock_entry.js:278
 msgid "Received Stock Entries"
 msgstr "Entradas de stock recibidas"
 
@@ -57074,6 +58008,10 @@
 msgid "Receiving"
 msgstr "Recepción"
 
+#: selling/page/point_of_sale/pos_past_order_list.js:17
+msgid "Recent Orders"
+msgstr ""
+
 #. Label of a Dynamic Link field in DocType 'Email Campaign'
 #: crm/doctype/email_campaign/email_campaign.json
 msgctxt "Email Campaign"
@@ -57104,8 +58042,8 @@
 msgid "Recipients"
 msgstr "Destinatarios"
 
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:89
 #: accounts/doctype/payment_reconciliation/payment_reconciliation.js:90
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:93
 msgid "Reconcile"
 msgstr "Conciliar"
 
@@ -57115,11 +58053,11 @@
 msgid "Reconcile"
 msgstr "Conciliar"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:325
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:341
 msgid "Reconcile Entries"
 msgstr "Conciliar entradas"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:217
+#: public/js/bank_reconciliation_tool/dialog_manager.js:221
 msgid "Reconcile the Bank Transaction"
 msgstr ""
 
@@ -57196,6 +58134,12 @@
 msgid "Recurse Every (As Per Transaction UOM)"
 msgstr ""
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Recurse Every (As Per Transaction UOM)"
+msgstr ""
+
 #: accounts/doctype/pricing_rule/pricing_rule.py:232
 msgid "Recurse Over Qty cannot be less than 0"
 msgstr ""
@@ -57224,7 +58168,7 @@
 msgid "Redeem Against"
 msgstr "Canjear Contra"
 
-#: selling/page/point_of_sale/pos_payment.js:497
+#: selling/page/point_of_sale/pos_payment.js:525
 msgid "Redeem Loyalty Points"
 msgstr "Canjear Puntos de Lealtad"
 
@@ -57305,7 +58249,12 @@
 #: accounts/doctype/promotional_scheme/promotional_scheme_dashboard.py:7
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:22
 #: accounts/doctype/sales_invoice/sales_invoice_dashboard.py:34
+#: accounts/report/accounts_receivable/accounts_receivable.html:136
+#: 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/general_ledger/general_ledger.html:28
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:22
 #: buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:15
 #: manufacturing/doctype/job_card/job_card_dashboard.py:10
@@ -57459,11 +58408,12 @@
 msgid "Reference"
 msgstr "Referencia"
 
-#: accounts/doctype/journal_entry/journal_entry.py:899
+#: accounts/doctype/journal_entry/journal_entry.py:926
 msgid "Reference #{0} dated {1}"
 msgstr "Referencia #{0} con fecha {1}"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:112
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:27
+#: public/js/bank_reconciliation_tool/dialog_manager.js:119
 msgid "Reference Date"
 msgstr "Fecha de referencia"
 
@@ -57473,7 +58423,7 @@
 msgid "Reference Date"
 msgstr "Fecha de referencia"
 
-#: public/js/controllers/transaction.js:2073
+#: public/js/controllers/transaction.js:2116
 msgid "Reference Date for Early Payment Discount"
 msgstr ""
 
@@ -57495,7 +58445,7 @@
 msgid "Reference Doctype"
 msgstr "Referencia a 'DocType'"
 
-#: accounts/doctype/payment_entry/payment_entry.py:555
+#: accounts/doctype/payment_entry/payment_entry.py:564
 msgid "Reference Doctype must be one of {0}"
 msgstr "Doctype de referencia debe ser uno de {0}"
 
@@ -57664,24 +58614,30 @@
 msgid "Reference Name"
 msgstr "Nombre Referencia"
 
-#: accounts/doctype/journal_entry/journal_entry.py:532
+#. Label of a Data field in DocType 'Sales Invoice Payment'
+#: accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
+msgctxt "Sales Invoice Payment"
+msgid "Reference No"
+msgstr ""
+
+#: accounts/doctype/journal_entry/journal_entry.py:548
 msgid "Reference No & Reference Date is required for {0}"
 msgstr "Se requiere de No. de referencia y fecha para {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1087
+#: accounts/doctype/payment_entry/payment_entry.py:1096
 msgid "Reference No and Reference Date is mandatory for Bank transaction"
 msgstr "Nro de referencia y fecha de referencia es obligatoria para las transacciones bancarias"
 
-#: accounts/doctype/journal_entry/journal_entry.py:537
+#: accounts/doctype/journal_entry/journal_entry.py:553
 msgid "Reference No is mandatory if you entered Reference Date"
 msgstr "El No. de referencia es obligatoria si usted introdujo la fecha"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
 msgid "Reference No."
 msgstr "Numero de referencia."
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:88
-#: public/js/bank_reconciliation_tool/dialog_manager.js:123
+#: public/js/bank_reconciliation_tool/data_table_manager.js:83
+#: public/js/bank_reconciliation_tool/dialog_manager.js:130
 msgid "Reference Number"
 msgstr "Número de referencia"
 
@@ -57857,7 +58813,15 @@
 msgid "References"
 msgstr "Referencias"
 
-#: accounts/doctype/payment_entry/payment_entry.py:631
+#: stock/doctype/delivery_note/delivery_note.py:395
+msgid "References to Sales Invoices are Incomplete"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:371
+msgid "References to Sales Orders are Incomplete"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.py:640
 msgid "References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount."
 msgstr ""
 
@@ -57873,7 +58837,8 @@
 msgid "Referral Sales Partner"
 msgstr "Socio de ventas de referencia"
 
-#: selling/page/sales_funnel/sales_funnel.js:44
+#: public/js/plant_floor_visual/visual_plant.js:151
+#: selling/page/sales_funnel/sales_funnel.js:51
 msgid "Refresh"
 msgstr "Actualizar"
 
@@ -57883,7 +58848,7 @@
 msgid "Refresh Google Sheet"
 msgstr "Actualizar hoja de Google"
 
-#: accounts/doctype/bank/bank.js:22
+#: accounts/doctype/bank/bank.js:21
 msgid "Refresh Plaid Link"
 msgstr ""
 
@@ -57893,7 +58858,7 @@
 msgid "Refresh Token"
 msgstr "Actualizar Token"
 
-#: stock/reorder_item.py:303
+#: stock/reorder_item.py:388
 msgid "Regards,"
 msgstr "Saludos,"
 
@@ -58035,8 +59000,8 @@
 msgid "Relation"
 msgstr "Relación"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:234
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:278
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:271
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:315
 msgid "Release Date"
 msgstr "Fecha de lanzamiento"
 
@@ -58052,7 +59017,7 @@
 msgid "Release Date"
 msgstr "Fecha de lanzamiento"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:314
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
 msgid "Release date must be in the future"
 msgstr "La fecha de lanzamiento debe ser en el futuro"
 
@@ -58062,17 +59027,18 @@
 msgid "Relieving Date"
 msgstr "Fecha de relevo"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:118
+#: public/js/bank_reconciliation_tool/dialog_manager.js:125
 msgid "Remaining"
 msgstr "Restante"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:186
-#: accounts/report/accounts_receivable/accounts_receivable.py:1085
+#: 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
 msgid "Remaining Balance"
 msgstr "Balance restante"
 
-#: selling/page/point_of_sale/pos_payment.js:350
+#: selling/page/point_of_sale/pos_payment.js:367
 msgid "Remark"
 msgstr "Observación"
 
@@ -58095,8 +59061,14 @@
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:240
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:311
 #: accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:11
-#: accounts/report/accounts_receivable/accounts_receivable.py:1117
-#: accounts/report/general_ledger/general_ledger.py:661
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.html:29
+#: accounts/report/general_ledger/general_ledger.html:51
+#: accounts/report/general_ledger/general_ledger.py:674
 #: 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
@@ -58219,11 +59191,15 @@
 msgid "Remarks Column Length"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:323
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Remove item if charges is not applicable to that item"
+msgstr ""
+
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
 msgid "Removed items with no change in quantity or value."
 msgstr "Elementos eliminados que no han sido afectados en cantidad y valor"
 
-#: utilities/doctype/rename_tool/rename_tool.js:25
+#: utilities/doctype/rename_tool/rename_tool.js:24
 msgid "Rename"
 msgstr "Renombrar"
 
@@ -58240,7 +59216,7 @@
 msgid "Rename Log"
 msgstr "Cambiar el nombre de sesión"
 
-#: accounts/doctype/account/account.py:502
+#: accounts/doctype/account/account.py:521
 msgid "Rename Not Allowed"
 msgstr "Cambiar nombre no permitido"
 
@@ -58249,7 +59225,7 @@
 msgid "Rename Tool"
 msgstr "Herramienta para renombrar"
 
-#: accounts/doctype/account/account.py:494
+#: accounts/doctype/account/account.py:513
 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch."
 msgstr "Solo se permite cambiar el nombre a través de la empresa matriz {0}, para evitar discrepancias."
 
@@ -58272,11 +59248,11 @@
 msgid "Rented"
 msgstr "Arrendado"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:34
-#: crm/doctype/opportunity/opportunity.js:113
-#: stock/doctype/delivery_note/delivery_note.js:228
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: support/doctype/issue/issue.js:30
+#: buying/doctype/purchase_order/purchase_order_list.js:53
+#: crm/doctype/opportunity/opportunity.js:123
+#: stock/doctype/delivery_note/delivery_note.js:277
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: support/doctype/issue/issue.js:37
 msgid "Reopen"
 msgstr "Reabrir"
 
@@ -58287,7 +59263,7 @@
 
 #: stock/report/stock_projected_qty/stock_projected_qty.py:213
 msgid "Reorder Qty"
-msgstr "Cantidad a reabastecer"
+msgstr "Cant. a reabastecer"
 
 #. Label of a Table field in DocType 'Item'
 #: stock/doctype/item/item.json
@@ -58313,7 +59289,7 @@
 msgid "Repair"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:107
+#: assets/doctype/asset/asset.js:127
 msgid "Repair Asset"
 msgstr ""
 
@@ -58361,9 +59337,15 @@
 msgid "Replace BOM"
 msgstr "Sustituir la Lista de Materiales (BOM)"
 
-#: crm/report/lead_details/lead_details.js:36
-#: support/report/issue_analytics/issue_analytics.js:57
-#: support/report/issue_summary/issue_summary.js:44
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.json
+msgid "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM.\n"
+"It also updates latest price in all the BOMs."
+msgstr ""
+
+#: 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
 msgid "Replied"
 msgstr "Respondido"
@@ -58392,7 +59374,7 @@
 msgid "Replied"
 msgstr "Respondido"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:86
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:110
 msgid "Report"
 msgstr "Reporte"
 
@@ -58412,7 +59394,7 @@
 msgid "Report Date"
 msgstr "Fecha del reporte"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:213
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:192
 msgid "Report Error"
 msgstr ""
 
@@ -58428,12 +59410,12 @@
 msgid "Report Type"
 msgstr "Tipo de reporte"
 
-#: accounts/doctype/account/account.py:395
+#: accounts/doctype/account/account.py:414
 msgid "Report Type is mandatory"
 msgstr "El tipo de reporte es obligatorio"
 
-#: accounts/report/balance_sheet/balance_sheet.js:17
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:17
+#: accounts/report/balance_sheet/balance_sheet.js:13
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:13
 msgid "Report View"
 msgstr "Vista de Reporte"
 
@@ -58467,8 +59449,9 @@
 msgid "Reports to"
 msgstr "Enviar Informes a"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:70
-#: accounts/doctype/sales_invoice/sales_invoice.js:73
+#: accounts/doctype/journal_entry/journal_entry.js:34
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:87
+#: accounts/doctype/sales_invoice/sales_invoice.js:78
 msgid "Repost Accounting Entries"
 msgstr ""
 
@@ -58513,6 +59496,12 @@
 msgid "Repost Payment Ledger Items"
 msgstr ""
 
+#. Label of a Check field in DocType 'Journal Entry'
+#: accounts/doctype/journal_entry/journal_entry.json
+msgctxt "Journal Entry"
+msgid "Repost Required"
+msgstr ""
+
 #. Label of a Check field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
@@ -58531,11 +59520,11 @@
 msgid "Repost Status"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:137
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:138
 msgid "Repost has started in the background"
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:38
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:40
 msgid "Repost in background"
 msgstr ""
 
@@ -58543,7 +59532,7 @@
 msgid "Repost started in the background"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:105
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:115
 msgid "Reposting Completed {0}%"
 msgstr ""
 
@@ -58559,7 +59548,7 @@
 msgid "Reposting Info"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:113
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:123
 msgid "Reposting Progress"
 msgstr ""
 
@@ -58568,16 +59557,17 @@
 msgid "Reposting entries created: {0}"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:89
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:99
 msgid "Reposting has been started in the background."
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:47
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:49
 msgid "Reposting in the background."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:76
-#: accounts/doctype/sales_invoice/sales_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:39
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/sales_invoice/sales_invoice.js:83
 msgid "Reposting..."
 msgstr ""
 
@@ -58635,11 +59625,20 @@
 msgid "Represents Company"
 msgstr "Representa a la Compañía"
 
-#: public/js/utils.js:678
+#. Description of a DocType
+#: accounts/doctype/fiscal_year/fiscal_year.json
+msgid "Represents a Financial Year. All accounting entries and other major transactions are tracked against the Fiscal Year."
+msgstr ""
+
+#: templates/form_grid/material_request_grid.html:25
+msgid "Reqd By Date"
+msgstr ""
+
+#: public/js/utils.js:742
 msgid "Reqd by date"
 msgstr "Requerido por fecha"
 
-#: crm/doctype/opportunity/opportunity.js:87
+#: crm/doctype/opportunity/opportunity.js:89
 msgid "Request For Quotation"
 msgstr "Solicitud de presupuesto"
 
@@ -58649,7 +59648,7 @@
 msgid "Request Parameters"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:269
+#: accounts/doctype/pos_invoice/pos_invoice.js:292
 msgid "Request Timeout"
 msgstr ""
 
@@ -58673,11 +59672,11 @@
 
 #. Name of a DocType
 #: buying/doctype/request_for_quotation/request_for_quotation.json
-#: buying/doctype/request_for_quotation/request_for_quotation.py:346
-#: buying/doctype/supplier_quotation/supplier_quotation.js:57
+#: buying/doctype/request_for_quotation/request_for_quotation.py:370
+#: 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
-#: stock/doctype/material_request/material_request.js:142
+#: stock/doctype/material_request/material_request.js:162
 msgid "Request for Quotation"
 msgstr "Solicitud de Cotización"
 
@@ -58715,7 +59714,7 @@
 msgid "Request for Quotation Supplier"
 msgstr "Proveedor de Solicitud de Presupuesto"
 
-#: selling/doctype/sales_order/sales_order.js:571
+#: selling/doctype/sales_order/sales_order.js:650
 msgid "Request for Raw Materials"
 msgstr "Solicitud de materias primas"
 
@@ -58771,6 +59770,10 @@
 msgid "Requested Qty"
 msgstr "Cant. Solicitada"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Requested Qty: Quantity requested for purchase, but not ordered."
+msgstr ""
+
 #: buying/report/procurement_tracker/procurement_tracker.py:46
 msgid "Requesting Site"
 msgstr "Sitio solicitante"
@@ -58857,8 +59860,15 @@
 msgid "Required Items"
 msgstr "Artículos Requeridos"
 
+#: templates/form_grid/material_request_grid.html:7
+msgid "Required On"
+msgstr ""
+
 #: 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_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
@@ -58935,7 +59945,7 @@
 msgid "Research"
 msgstr "Investigación"
 
-#: setup/doctype/company/company.py:383
+#: setup/doctype/company/company.py:382
 msgid "Research & Development"
 msgstr "Investigación y desarrollo"
 
@@ -58967,11 +59977,11 @@
 msgid "Reselect, if the chosen contact is edited after save"
 msgstr "Vuelva a seleccionar, si el contacto elegido se edita después de guardar"
 
-#: accounts/doctype/payment_request/payment_request.js:30
+#: accounts/doctype/payment_request/payment_request.js:39
 msgid "Resend Payment Email"
 msgstr "Vuelva a enviar el pago por correo electrónico"
 
-#: stock/report/reserved_stock/reserved_stock.js:121
+#: stock/report/reserved_stock/reserved_stock.js:118
 msgid "Reservation Based On"
 msgstr ""
 
@@ -58981,12 +59991,12 @@
 msgid "Reservation Based On"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: stock/doctype/pick_list/pick_list.js:110
+#: selling/doctype/sales_order/sales_order.js:80
+#: stock/doctype/pick_list/pick_list.js:126
 msgid "Reserve"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:322
+#: selling/doctype/sales_order/sales_order.js:347
 msgid "Reserve Stock"
 msgstr ""
 
@@ -59020,6 +60030,8 @@
 msgid "Reserved"
 msgstr "Reservado"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:29
+#: stock/dashboard/item_dashboard_list.html:20
 #: stock/report/reserved_stock/reserved_stock.py:124
 #: stock/report/stock_projected_qty/stock_projected_qty.py:164
 msgid "Reserved Qty"
@@ -59059,16 +60071,28 @@
 msgid "Reserved Qty for Production Plan"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Production: Raw materials quantity to make manufacturing items."
+msgstr ""
+
 #. Label of a Float field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "Reserved Qty for Subcontract"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
+msgstr ""
+
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:497
 msgid "Reserved Qty should be greater than Delivered Qty."
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty: Quantity ordered for sale, but not delivered."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:116
 msgid "Reserved Quantity"
 msgstr "Cantidad Reservada"
@@ -59077,26 +60101,28 @@
 msgid "Reserved Quantity for Production"
 msgstr "Cantidad reservada para producción"
 
-#: stock/stock_ledger.py:1982
+#: stock/stock_ledger.py:1989
 msgid "Reserved Serial No."
 msgstr ""
 
 #. Name of a report
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:374
-#: stock/doctype/pick_list/pick_list.js:120
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:24
+#: selling/doctype/sales_order/sales_order.js:99
+#: selling/doctype/sales_order/sales_order.js:404
+#: 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:459 stock/stock_ledger.py:1962
+#: stock/report/stock_balance/stock_balance.py:467 stock/stock_ledger.py:1969
 msgid "Reserved Stock"
-msgstr ""
+msgstr "Existencias Reservadas"
 
 #. Label of a Float field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "Reserved Stock"
-msgstr ""
+msgstr "Existencias Reservadas"
 
-#: stock/stock_ledger.py:2012
+#: stock/stock_ledger.py:2019
 msgid "Reserved Stock for Batch"
 msgstr ""
 
@@ -59128,21 +60154,27 @@
 msgid "Reserved for sub contracting"
 msgstr "Reservado para Subcontratación"
 
-#: selling/doctype/sales_order/sales_order.js:335
-#: stock/doctype/pick_list/pick_list.js:237
+#: selling/doctype/sales_order/sales_order.js:360
+#: stock/doctype/pick_list/pick_list.js:271
 msgid "Reserving Stock..."
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:139
-#: support/doctype/issue/issue.js:48
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:155
+#: support/doctype/issue/issue.js:55
 msgid "Reset"
 msgstr "Reiniciar"
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Reset Company Default Values"
+msgstr ""
+
 #: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:19
 msgid "Reset Plaid Link"
 msgstr ""
 
-#: support/doctype/issue/issue.js:39
+#: support/doctype/issue/issue.js:46
 msgid "Reset Service Level Agreement"
 msgstr "Restablecer acuerdo de nivel de servicio"
 
@@ -59152,7 +60184,7 @@
 msgid "Reset Service Level Agreement"
 msgstr "Restablecer acuerdo de nivel de servicio"
 
-#: support/doctype/issue/issue.js:56
+#: support/doctype/issue/issue.js:63
 msgid "Resetting Service Level Agreement."
 msgstr "Restablecimiento del acuerdo de nivel de servicio."
 
@@ -59241,8 +60273,8 @@
 msgstr "Resolver"
 
 #: accounts/doctype/dunning/dunning_list.js:4
-#: support/report/issue_analytics/issue_analytics.js:58
-#: support/report/issue_summary/issue_summary.js:46
+#: support/report/issue_analytics/issue_analytics.js:57
+#: support/report/issue_summary/issue_summary.js:45
 #: support/report/issue_summary/issue_summary.py:366
 msgid "Resolved"
 msgstr "Resuelto"
@@ -59322,7 +60354,7 @@
 msgid "Rest Of The World"
 msgstr "Resto del mundo"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:72
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:82
 msgid "Restart"
 msgstr ""
 
@@ -59330,7 +60362,7 @@
 msgid "Restart Subscription"
 msgstr "Reiniciar Suscripción"
 
-#: assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:108
 msgid "Restore Asset"
 msgstr ""
 
@@ -59377,12 +60409,12 @@
 msgid "Result Title Field"
 msgstr "Campo de título del resultado"
 
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: selling/doctype/sales_order/sales_order.js:515
+#: buying/doctype/purchase_order/purchase_order.js:321
+#: selling/doctype/sales_order/sales_order.js:549
 msgid "Resume"
 msgstr "Reanudar"
 
-#: manufacturing/doctype/job_card/job_card.js:255
+#: manufacturing/doctype/job_card/job_card.js:288
 msgid "Resume Job"
 msgstr ""
 
@@ -59409,11 +60441,11 @@
 msgid "Retained Earnings"
 msgstr "UTILIDADES RETENIDAS"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: stock/doctype/purchase_receipt/purchase_receipt.js:274
 msgid "Retention Stock Entry"
 msgstr "Entrada de Retención de Acciones"
 
-#: stock/doctype/stock_entry/stock_entry.js:450
+#: stock/doctype/stock_entry/stock_entry.js:510
 msgid "Retention Stock Entry already created or Sample Quantity not provided"
 msgstr "Entrada de Inventario de Retención ya creada o Cantidad de muestra no proporcionada"
 
@@ -59423,20 +60455,21 @@
 msgid "Retried"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:134
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 #: accounts/doctype/ledger_merge/ledger_merge.js:72
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:65
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:66
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
 msgid "Retry"
 msgstr "Reintentar"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:13
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:27
 msgid "Retry Failed Transactions"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/sales_invoice/sales_invoice.py:263
-#: stock/doctype/delivery_note/delivery_note_list.js:6
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:6
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/sales_invoice/sales_invoice.py:268
+#: stock/doctype/delivery_note/delivery_note_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:15
 msgid "Return"
 msgstr "Retornar"
 
@@ -59464,11 +60497,11 @@
 msgid "Return"
 msgstr "Retornar"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:120
+#: accounts/doctype/sales_invoice/sales_invoice.js:121
 msgid "Return / Credit Note"
 msgstr "Devolución / Nota de Crédito"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
 msgid "Return / Debit Note"
 msgstr "Retorno / Nota de Crédito"
 
@@ -59500,7 +60533,7 @@
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Return Against Purchase Invoice"
-msgstr "Devolución contra factura de compra"
+msgstr "Devolución contra Factura de Compra"
 
 #. Label of a Link field in DocType 'Purchase Receipt'
 #: stock/doctype/purchase_receipt/purchase_receipt.json
@@ -59514,12 +60547,12 @@
 msgid "Return Against Subcontracting Receipt"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:194
+#: manufacturing/doctype/work_order/work_order.js:205
 msgid "Return Components"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note_list.js:10
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:10
+#: stock/doctype/delivery_note/delivery_note_list.js:20
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:19
 msgid "Return Issued"
 msgstr ""
 
@@ -59541,16 +60574,16 @@
 msgid "Return Issued"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:334
 msgid "Return Qty"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:265
+#: stock/doctype/purchase_receipt/purchase_receipt.js:310
 msgid "Return Qty from Rejected Warehouse"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:77
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:142
+#: buying/doctype/purchase_order/purchase_order.js:80
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:150
 msgid "Return of Components"
 msgstr ""
 
@@ -59630,7 +60663,7 @@
 msgid "Returned Qty in Stock UOM"
 msgstr ""
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:103
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:104
 msgid "Returned exchange rate is neither integer not float."
 msgstr ""
 
@@ -59648,14 +60681,14 @@
 msgid "Returns"
 msgstr "Devoluciones"
 
-#: accounts/report/accounts_payable/accounts_payable.js:154
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:116
-#: accounts/report/accounts_receivable/accounts_receivable.js:186
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:144
+#: accounts/report/accounts_payable/accounts_payable.js:157
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:119
+#: accounts/report/accounts_receivable/accounts_receivable.js:189
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:147
 msgid "Revaluation Journals"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
 msgid "Revenue"
 msgstr ""
 
@@ -59665,7 +60698,7 @@
 msgid "Reversal Of"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:33
+#: accounts/doctype/journal_entry/journal_entry.js:73
 msgid "Reverse Journal Entry"
 msgstr "Invertir Entrada de Diario"
 
@@ -59822,12 +60855,12 @@
 msgid "Root"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:41
+#: accounts/doctype/account/account_tree.js:47
 msgid "Root Company"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:112
-#: accounts/report/account_balance/account_balance.js:23
+#: accounts/doctype/account/account_tree.js:145
+#: accounts/report/account_balance/account_balance.js:22
 msgid "Root Type"
 msgstr "Tipo de root"
 
@@ -59847,11 +60880,11 @@
 msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity"
 msgstr ""
 
-#: accounts/doctype/account/account.py:392
+#: accounts/doctype/account/account.py:411
 msgid "Root Type is mandatory"
 msgstr "tipo de root es obligatorio"
 
-#: accounts/doctype/account/account.py:195
+#: accounts/doctype/account/account.py:214
 msgid "Root cannot be edited."
 msgstr "Usuario root no se puede editar."
 
@@ -59867,7 +60900,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:66
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:90
-#: accounts/report/account_balance/account_balance.js:54
+#: accounts/report/account_balance/account_balance.js:56
 msgid "Round Off"
 msgstr "REDONDEOS"
 
@@ -60128,12 +61161,12 @@
 msgid "Rounding Loss Allowance"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:41
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:45
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:48
 msgid "Rounding Loss Allowance should be between 0 and 1"
 msgstr ""
 
-#: controllers/stock_controller.py:216 controllers/stock_controller.py:231
+#: controllers/stock_controller.py:398 controllers/stock_controller.py:413
 msgid "Rounding gain/loss Entry for Stock Transfer"
 msgstr ""
 
@@ -60174,11 +61207,11 @@
 msgid "Routing Name"
 msgstr "Nombre de Enrutamiento"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:428
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:482
 msgid "Row #"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:334
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:388
 msgid "Row # {0}:"
 msgstr ""
 
@@ -60195,12 +61228,12 @@
 msgstr "Fila n.º {0}: el artículo devuelto {1} no existe en {2} {3}"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:439
-#: accounts/doctype/sales_invoice/sales_invoice.py:1715
+#: accounts/doctype/sales_invoice/sales_invoice.py:1684
 msgid "Row #{0} (Payment Table): Amount must be negative"
 msgstr "Fila #{0} (Tabla de pagos): El importe debe ser negativo"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:437
-#: accounts/doctype/sales_invoice/sales_invoice.py:1710
+#: accounts/doctype/sales_invoice/sales_invoice.py:1679
 msgid "Row #{0} (Payment Table): Amount must be positive"
 msgstr "Fila #{0} (Tabla de pagos): El importe debe ser positivo"
 
@@ -60217,7 +61250,7 @@
 msgstr ""
 
 #: controllers/subcontracting_controller.py:72
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:413
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:414
 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same"
 msgstr ""
 
@@ -60225,11 +61258,11 @@
 msgid "Row #{0}: Accepted Warehouse and Supplier Warehouse cannot be same"
 msgstr "Fila #{0}: Almacén Aceptado y Almacén de Proveedores no pueden ser iguales"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:406
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:407
 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
 msgstr ""
 
-#: controllers/accounts_controller.py:887
+#: controllers/accounts_controller.py:939
 msgid "Row #{0}: Account {1} does not belong to company {2}"
 msgstr "Fila #{0}: La Cuenta {1} no pertenece a la Empresa {2}"
 
@@ -60242,15 +61275,15 @@
 msgid "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:309
+#: assets/doctype/asset_capitalization/asset_capitalization.py:315
 msgid "Row #{0}: Amount must be a positive number"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:375
+#: accounts/doctype/sales_invoice/sales_invoice.py:386
 msgid "Row #{0}: Asset {1} cannot be submitted, it is already {2}"
 msgstr "Fila  #{0}: el elemento {1} no puede ser presentado, ya es {2}"
 
-#: buying/doctype/purchase_order/purchase_order.py:351
+#: buying/doctype/purchase_order/purchase_order.py:352
 msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
 msgstr ""
 
@@ -60258,27 +61291,27 @@
 msgid "Row #{0}: Batch No {1} is already selected."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:736
+#: accounts/doctype/payment_entry/payment_entry.py:745
 msgid "Row #{0}: Cannot allocate more than {1} against payment term {2}"
 msgstr ""
 
-#: controllers/accounts_controller.py:3064
+#: controllers/accounts_controller.py:3155
 msgid "Row #{0}: Cannot delete item {1} which has already been billed."
 msgstr "Fila # {0}: no se puede eliminar el elemento {1} que ya se ha facturado."
 
-#: controllers/accounts_controller.py:3038
+#: controllers/accounts_controller.py:3129
 msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
 msgstr "Fila # {0}: no se puede eliminar el elemento {1} que ya se entregó"
 
-#: controllers/accounts_controller.py:3057
+#: controllers/accounts_controller.py:3148
 msgid "Row #{0}: Cannot delete item {1} which has already been received"
 msgstr "Fila # {0}: no se puede eliminar el elemento {1} que ya se ha recibido"
 
-#: controllers/accounts_controller.py:3044
+#: controllers/accounts_controller.py:3135
 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
 msgstr "Fila # {0}: No se puede eliminar el elemento {1} que tiene una orden de trabajo asignada."
 
-#: controllers/accounts_controller.py:3050
+#: controllers/accounts_controller.py:3141
 msgid "Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order."
 msgstr "Fila # {0}: No se puede eliminar el artículo {1} que se asigna a la orden de compra del cliente."
 
@@ -60286,11 +61319,11 @@
 msgid "Row #{0}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor"
 msgstr "Fila # {0}: No se puede seleccionar el Almacén del proveedor mientras se suministran materias primas al subcontratista"
 
-#: controllers/accounts_controller.py:3309
+#: controllers/accounts_controller.py:3400
 msgid "Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}."
 msgstr "Fila # {0}: no se puede establecer el precio si el monto es mayor que el importe facturado para el elemento {1}."
 
-#: manufacturing/doctype/job_card/job_card.py:864
+#: manufacturing/doctype/job_card/job_card.py:871
 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
 msgstr ""
 
@@ -60298,31 +61331,31 @@
 msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
 msgstr "Fila n.º {0}: el elemento secundario no debe ser un paquete de productos. Elimine el elemento {1} y guarde"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:97
+#: accounts/doctype/bank_clearance/bank_clearance.py:99
 msgid "Row #{0}: Clearance date {1} cannot be before Cheque Date {2}"
 msgstr "Fila #{0}: Fecha de Liquidación {1} no puede ser anterior a la Fecha de Cheque {2}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:286
+#: assets/doctype/asset_capitalization/asset_capitalization.py:292
 msgid "Row #{0}: Consumed Asset {1} cannot be Draft"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:288
+#: assets/doctype/asset_capitalization/asset_capitalization.py:294
 msgid "Row #{0}: Consumed Asset {1} cannot be cancelled"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:273
+#: assets/doctype/asset_capitalization/asset_capitalization.py:279
 msgid "Row #{0}: Consumed Asset {1} cannot be the same as the Target Asset"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:282
+#: assets/doctype/asset_capitalization/asset_capitalization.py:288
 msgid "Row #{0}: Consumed Asset {1} cannot be {2}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:292
+#: assets/doctype/asset_capitalization/asset_capitalization.py:298
 msgid "Row #{0}: Consumed Asset {1} does not belong to company {2}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:385
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:105
 msgid "Row #{0}: Cost Center {1} does not belong to company {2}"
 msgstr "Fila # {0}: el centro de costos {1} no pertenece a la compañía {2}"
 
@@ -60334,7 +61367,7 @@
 msgid "Row #{0}: Dates overlapping with other row"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:375
+#: buying/doctype/purchase_order/purchase_order.py:376
 msgid "Row #{0}: Default BOM not found for FG Item {1}"
 msgstr ""
 
@@ -60342,35 +61375,35 @@
 msgid "Row #{0}: Duplicate entry in References {1} {2}"
 msgstr "Fila #{0}: Entrada duplicada en Referencias {1} {2}"
 
-#: selling/doctype/sales_order/sales_order.py:237
+#: selling/doctype/sales_order/sales_order.py:239
 msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
 msgstr "Fila #{0}: La fecha de entrega esperada no puede ser anterior a la fecha de la orden de compra"
 
-#: controllers/stock_controller.py:336
+#: controllers/stock_controller.py:518
 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:378
+#: buying/doctype/purchase_order/purchase_order.py:379
 msgid "Row #{0}: Finished Good Item Qty can not be zero"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:362
+#: buying/doctype/purchase_order/purchase_order.py:363
 msgid "Row #{0}: Finished Good Item is not specified for service item {1}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:369
+#: buying/doctype/purchase_order/purchase_order.py:370
 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:394
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:395
 msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:571
+#: accounts/doctype/journal_entry/journal_entry.py:594
 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:577
+#: accounts/doctype/journal_entry/journal_entry.py:604
 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
 msgstr ""
 
@@ -60378,7 +61411,7 @@
 msgid "Row #{0}: From Date cannot be before To Date"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:489
+#: public/js/utils/barcode_scanner.js:394
 msgid "Row #{0}: Item added"
 msgstr "Fila # {0}: Elemento agregado"
 
@@ -60386,23 +61419,23 @@
 msgid "Row #{0}: Item {1} does not exist"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:949
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:951
 msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:491
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:545
 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it."
 msgstr "Fila # {0}: el artículo {1} no es un artículo serializado / en lote. No puede tener un No de serie / No de lote en su contra."
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:303
+#: assets/doctype/asset_capitalization/asset_capitalization.py:309
 msgid "Row #{0}: Item {1} is not a service item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:261
+#: assets/doctype/asset_capitalization/asset_capitalization.py:267
 msgid "Row #{0}: Item {1} is not a stock item"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:657
+#: accounts/doctype/payment_entry/payment_entry.py:666
 msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
 msgstr "Fila #{0}: Asiento {1} no tiene cuenta {2} o ya compara con otro bono"
 
@@ -60410,48 +61443,48 @@
 msgid "Row #{0}: Maximum Net Rate cannot be greater than Minimum Net Rate"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:535
+#: selling/doctype/sales_order/sales_order.py:541
 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
 msgstr "Fila #{0}: No se permite cambiar de proveedores debido a que la Orden de Compra ya existe"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1032
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1034
 msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:687
+#: stock/doctype/stock_entry/stock_entry.py:642
 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 "Fila # {0}: la operación {1} no se completa para {2} cantidad de productos terminados en la orden de trabajo {3}. Actualice el estado de la operación a través de la Tarjeta de trabajo {4}."
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:93
+#: accounts/doctype/bank_clearance/bank_clearance.py:95
 msgid "Row #{0}: Payment document is required to complete the transaction"
 msgstr "Fila # {0}: se requiere un documento de pago para completar la transacción"
 
-#: manufacturing/doctype/production_plan/production_plan.py:892
+#: manufacturing/doctype/production_plan/production_plan.py:901
 msgid "Row #{0}: Please select Item Code in Assembly Items"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:895
+#: manufacturing/doctype/production_plan/production_plan.py:904
 msgid "Row #{0}: Please select the BOM No in Assembly Items"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:889
-msgid "Row #{0}: Please select the FG Warehouse in Assembly Items"
+#: manufacturing/doctype/production_plan/production_plan.py:898
+msgid "Row #{0}: Please select the Sub Assembly Warehouse"
 msgstr ""
 
 #: stock/doctype/item/item.py:487
 msgid "Row #{0}: Please set reorder quantity"
 msgstr "Fila  #{0}: Configure la cantidad de pedido"
 
-#: controllers/accounts_controller.py:367
+#: controllers/accounts_controller.py:411
 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:487
+#: public/js/utils/barcode_scanner.js:392
 msgid "Row #{0}: Qty increased by {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:264
-#: assets/doctype/asset_capitalization/asset_capitalization.py:306
+#: assets/doctype/asset_capitalization/asset_capitalization.py:270
+#: assets/doctype/asset_capitalization/asset_capitalization.py:312
 msgid "Row #{0}: Qty must be a positive number"
 msgstr ""
 
@@ -60459,12 +61492,12 @@
 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:1018
-#: controllers/accounts_controller.py:3166
+#: controllers/accounts_controller.py:1082
+#: controllers/accounts_controller.py:3257
 msgid "Row #{0}: Quantity for Item {1} cannot be zero."
 msgstr "Fila # {0}: La cantidad del artículo {1} no puede ser cero."
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1017
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1019
 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
 msgstr ""
 
@@ -60476,11 +61509,11 @@
 msgid "Row #{0}: Received Qty must be equal to Accepted + Rejected Qty for Item {1}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1016
+#: accounts/doctype/payment_entry/payment_entry.js:1234
 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry"
 msgstr "Fila #{0}: Tipo de documento de referencia debe ser uno de la orden de compra, factura de compra o de entrada de diario"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1008
+#: accounts/doctype/payment_entry/payment_entry.js:1220
 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning"
 msgstr "Fila # {0}: el tipo de documento de referencia debe ser pedido de cliente, factura de venta, asiento de diario o reclamación."
 
@@ -60488,7 +61521,7 @@
 msgid "Row #{0}: Rejected Qty can not be entered in Purchase Return"
 msgstr "Fila #{0}: La cantidad rechazada no se puede introducir en el campo 'retorno de compras'"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:387
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:388
 msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}."
 msgstr ""
 
@@ -60496,22 +61529,22 @@
 msgid "Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}"
 msgstr ""
 
-#: controllers/buying_controller.py:849
+#: controllers/buying_controller.py:875
 msgid "Row #{0}: Reqd by Date cannot be before Transaction Date"
 msgstr "Fila# {0}: Requerido por fecha no puede ser anterior a Fecha de Transacción"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:382
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:383
 msgid "Row #{0}: Scrap Item Qty cannot be zero"
 msgstr ""
 
-#: controllers/selling_controller.py:212
+#: controllers/selling_controller.py:213
 msgid "Row #{0}: Selling rate for item {1} is lower than its {2}.\n"
 "\t\t\t\t\tSelling {3} should be atleast {4}.<br><br>Alternatively,\n"
 "\t\t\t\t\tyou can disable selling price validation in {5} to bypass\n"
 "\t\t\t\t\tthis validation."
 msgstr ""
 
-#: controllers/stock_controller.py:97
+#: controllers/stock_controller.py:129
 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
 msgstr "Fila # {0}: El número de serie {1} no pertenece al lote {2}"
 
@@ -60523,27 +61556,35 @@
 msgid "Row #{0}: Serial No {1} is already selected."
 msgstr ""
 
-#: controllers/accounts_controller.py:395
+#: controllers/accounts_controller.py:439
 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date"
 msgstr "Fila n.º {0}: la fecha de finalización del servicio no puede ser anterior a la fecha de contabilización de facturas"
 
-#: controllers/accounts_controller.py:391
+#: controllers/accounts_controller.py:435
 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date"
 msgstr "Fila n.º {0}: la fecha de inicio del servicio no puede ser mayor que la fecha de finalización del servicio"
 
-#: controllers/accounts_controller.py:387
+#: controllers/accounts_controller.py:431
 msgid "Row #{0}: Service Start and End Date is required for deferred accounting"
 msgstr "Fila n.º {0}: se requiere la fecha de inicio y finalización del servicio para la contabilidad diferida"
 
-#: selling/doctype/sales_order/sales_order.py:391
+#: selling/doctype/sales_order/sales_order.py:394
 msgid "Row #{0}: Set Supplier for item {1}"
 msgstr "Fila #{0}: Asignar Proveedor para el elemento {1}"
 
+#: manufacturing/doctype/workstation/workstation.py:80
+msgid "Row #{0}: Start Time and End Time are required"
+msgstr ""
+
+#: manufacturing/doctype/workstation/workstation.py:83
+msgid "Row #{0}: Start Time must be before End Time"
+msgstr ""
+
 #: stock/doctype/quality_inspection/quality_inspection.py:120
 msgid "Row #{0}: Status is mandatory"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:381
+#: accounts/doctype/journal_entry/journal_entry.py:397
 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
 msgstr "Fila # {0}: El estado debe ser {1} para el descuento de facturas {2}"
 
@@ -60551,19 +61592,19 @@
 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:962
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:964
 msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:975
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:977
 msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:989
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:991
 msgid "Row #{0}: Stock is already reserved for the Item {1}."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:605
+#: stock/doctype/delivery_note/delivery_note.py:666
 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
 msgstr ""
 
@@ -60571,19 +61612,19 @@
 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:1003
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1005
 msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
 msgstr ""
 
-#: controllers/stock_controller.py:110
+#: controllers/stock_controller.py:142
 msgid "Row #{0}: The batch {1} has already expired."
 msgstr "Fila nº {0}: el lote {1} ya ha caducado."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1687
-msgid "Row #{0}: The following Serial Nos are not present in Delivery Note {1}:"
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:150
+msgid "Row #{0}: The following serial numbers are not present in Delivery Note {1}:"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.py:116
+#: manufacturing/doctype/workstation/workstation.py:137
 msgid "Row #{0}: Timings conflicts with row {1}"
 msgstr "Línea #{0}: tiene conflictos de tiempo con la linea {1}"
 
@@ -60591,15 +61632,11 @@
 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:1402
+#: accounts/doctype/sales_invoice/sales_invoice.py:1413
 msgid "Row #{0}: You must select an Asset for Item {1}."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1696
-msgid "Row #{0}: {1} Serial numbers required for Item {2}. You have provided {3}."
-msgstr ""
-
-#: controllers/buying_controller.py:483 public/js/controllers/buying.js:208
+#: controllers/buying_controller.py:483 public/js/controllers/buying.js:203
 msgid "Row #{0}: {1} can not be negative for item {2}"
 msgstr "Fila #{0}: {1} no puede ser negativo para el elemento {2}"
 
@@ -60615,6 +61652,10 @@
 msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account."
 msgstr ""
 
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:161
+msgid "Row #{0}: {1} serial numbers are required for Item {2}. You have provided {3} serial numbers."
+msgstr ""
+
 #: buying/utils.py:106
 msgid "Row #{1}: Warehouse is mandatory for stock Item {0}"
 msgstr ""
@@ -60623,11 +61664,11 @@
 msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
 msgstr "Fila # {}: la moneda de {} - {} no coincide con la moneda de la empresa."
 
-#: assets/doctype/asset/asset.py:275
+#: assets/doctype/asset/asset.py:277
 msgid "Row #{}: Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr "Fila # {}: la fecha de contabilización de la depreciación no debe ser igual a la fecha de disponibilidad para uso."
 
-#: assets/doctype/asset/asset.py:308
+#: assets/doctype/asset/asset.py:310
 msgid "Row #{}: Finance Book should not be empty since you're using multiple."
 msgstr ""
 
@@ -60655,7 +61696,7 @@
 msgid "Row #{}: Please assign task to a member."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:300
+#: assets/doctype/asset/asset.py:302
 msgid "Row #{}: Please use a different Finance Book."
 msgstr ""
 
@@ -60671,7 +61712,7 @@
 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:83
+#: stock/doctype/pick_list/pick_list.py:87
 msgid "Row #{}: item {} has been picked already."
 msgstr ""
 
@@ -60683,39 +61724,47 @@
 msgid "Row #{}: {} {} does not exist."
 msgstr "Fila # {}: {} {} no existe."
 
-#: stock/doctype/item/item.py:1364
+#: stock/doctype/item/item.py:1365
 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:433
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:437
 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:599
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Row Number"
+msgstr ""
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:376
+msgid "Row {0}"
+msgstr "Fila {0}"
+
+#: manufacturing/doctype/job_card/job_card.py:606
 msgid "Row {0} : Operation is required against the raw material item {1}"
 msgstr "Fila {0}: se requiere operación contra el artículo de materia prima {1}"
 
-#: stock/doctype/pick_list/pick_list.py:113
+#: stock/doctype/pick_list/pick_list.py:117
 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1135
+#: stock/doctype/stock_entry/stock_entry.py:1144
 msgid "Row {0}# Item {1} cannot be transferred more than {2} against {3} {4}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1159
+#: stock/doctype/stock_entry/stock_entry.py:1168
 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:190
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:191
 msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:509
+#: accounts/doctype/journal_entry/journal_entry.py:525
 msgid "Row {0}: Account {1} and Party Type {2} have different account types"
 msgstr ""
 
-#: controllers/accounts_controller.py:2536
+#: controllers/accounts_controller.py:2621
 msgid "Row {0}: Account {1} is a Group Account"
 msgstr ""
 
@@ -60723,43 +61772,47 @@
 msgid "Row {0}: Activity Type is mandatory."
 msgstr "Fila {0}: Tipo de actividad es obligatoria."
 
-#: accounts/doctype/journal_entry/journal_entry.py:561
+#: accounts/doctype/journal_entry/journal_entry.py:577
 msgid "Row {0}: Advance against Customer must be credit"
 msgstr "Fila {0}: Avance contra el Cliente debe ser de crédito"
 
-#: accounts/doctype/journal_entry/journal_entry.py:563
+#: accounts/doctype/journal_entry/journal_entry.py:579
 msgid "Row {0}: Advance against Supplier must be debit"
 msgstr "Fila {0}: Avance contra el Proveedor debe ser debito"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:671
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:681
 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:663
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:673
 msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:763
+#: stock/doctype/stock_entry/stock_entry.py:884
+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
 msgid "Row {0}: Bill of Materials not found for the Item {1}"
 msgstr "Fila {0}: Lista de materiales no se encuentra para el elemento {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:796
+#: accounts/doctype/journal_entry/journal_entry.py:823
 msgid "Row {0}: Both Debit and Credit values cannot be zero"
 msgstr ""
 
-#: controllers/buying_controller.py:438 controllers/selling_controller.py:204
+#: controllers/buying_controller.py:438 controllers/selling_controller.py:205
 msgid "Row {0}: Conversion Factor is mandatory"
 msgstr "Línea {0}: El factor de conversión es obligatorio"
 
-#: controllers/accounts_controller.py:2549
+#: controllers/accounts_controller.py:2634
 msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:116
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:137
 msgid "Row {0}: Cost center is required for an item {1}"
 msgstr "Fila {0}: Centro de Costos es necesario para un elemento {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:647
+#: accounts/doctype/journal_entry/journal_entry.py:674
 msgid "Row {0}: Credit entry can not be linked with a {1}"
 msgstr "Línea {0}: La entrada de crédito no puede vincularse con {1}"
 
@@ -60767,19 +61820,19 @@
 msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
 msgstr "Fila {0}: Divisa de la lista de materiales # {1} debe ser igual a la moneda seleccionada {2}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:642
+#: accounts/doctype/journal_entry/journal_entry.py:669
 msgid "Row {0}: Debit entry can not be linked with a {1}"
 msgstr "Línea {0}: La entrada de débito no puede vincularse con {1}"
 
-#: controllers/selling_controller.py:679
+#: controllers/selling_controller.py:703
 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
 msgstr "Fila {0}: el almacén de entrega ({1}) y el almacén del cliente ({2}) no pueden ser iguales"
 
-#: assets/doctype/asset/asset.py:417
+#: assets/doctype/asset/asset.py:419
 msgid "Row {0}: Depreciation Start Date is required"
 msgstr "Fila {0}: se requiere la Fecha de Inicio de Depreciación"
 
-#: controllers/accounts_controller.py:2209
+#: controllers/accounts_controller.py:2301
 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
 msgstr "Fila {0}: la fecha de vencimiento en la tabla de condiciones de pago no puede ser anterior a la fecha de publicación."
 
@@ -60787,28 +61840,28 @@
 msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
 msgstr ""
 
-#: controllers/buying_controller.py:742
+#: controllers/buying_controller.py:767
 msgid "Row {0}: Enter location for the asset item {1}"
 msgstr "Fila {0}: ingrese la ubicación para el artículo del activo {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:886
-#: controllers/taxes_and_totals.py:1115
+#: accounts/doctype/journal_entry/journal_entry.py:913
+#: controllers/taxes_and_totals.py:1116
 msgid "Row {0}: Exchange Rate is mandatory"
 msgstr "Fila {0}: Tipo de cambio es obligatorio"
 
-#: assets/doctype/asset/asset.py:408
+#: assets/doctype/asset/asset.py:410
 msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
 msgstr "Fila {0}: valor esperado después de la vida útil debe ser menor que el importe de compra bruta"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:523
 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:482
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:486
 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 ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:505
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:509
 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
 msgstr ""
 
@@ -60825,7 +61878,7 @@
 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
 msgstr "Fila {0}: Tiempo Desde y Tiempo Hasta de {1} se solapan con {2}"
 
-#: controllers/stock_controller.py:730
+#: controllers/stock_controller.py:913
 msgid "Row {0}: From Warehouse is mandatory for internal transfers"
 msgstr ""
 
@@ -60837,17 +61890,17 @@
 msgid "Row {0}: Hours value must be greater than zero."
 msgstr "Fila {0}: valor Horas debe ser mayor que cero."
 
-#: accounts/doctype/journal_entry/journal_entry.py:665
+#: accounts/doctype/journal_entry/journal_entry.py:692
 msgid "Row {0}: Invalid reference {1}"
 msgstr "Fila {0}: Referencia no válida {1}"
 
-#: controllers/taxes_and_totals.py:128
+#: controllers/taxes_and_totals.py:129
 msgid "Row {0}: Item Tax template updated as per validity and rate applied"
 msgstr ""
 
-#: controllers/buying_controller.py:400 controllers/selling_controller.py:479
+#: controllers/buying_controller.py:400 controllers/selling_controller.py:484
 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer"
-msgstr ""
+msgstr "Fila {0}: La tarifa del artículo se ha actualizado según la tarifa de valoración, ya que se trata de una transferencia de stock interna"
 
 #: controllers/subcontracting_controller.py:98
 msgid "Row {0}: Item {1} must be a stock item."
@@ -60857,7 +61910,7 @@
 msgid "Row {0}: Item {1} must be a subcontracted item."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:661
+#: stock/doctype/delivery_note/delivery_note.py:722
 msgid "Row {0}: Packed Qty must be equal to {1} Qty."
 msgstr ""
 
@@ -60865,11 +61918,11 @@
 msgid "Row {0}: Packing Slip is already created for Item {1}."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:687
+#: accounts/doctype/journal_entry/journal_entry.py:714
 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
 msgstr "Línea {0}: Socio / Cuenta no coincide con {1} / {2} en {3} {4}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:500
+#: accounts/doctype/journal_entry/journal_entry.py:516
 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}"
 msgstr "Línea {0}: el tipo de entidad se requiere para la cuenta por cobrar/pagar {1}"
 
@@ -60877,11 +61930,11 @@
 msgid "Row {0}: Payment Term is mandatory"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:554
+#: accounts/doctype/journal_entry/journal_entry.py:570
 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
 msgstr "Línea {0}: El pago para la compra/venta siempre debe estar marcado como anticipo"
 
-#: accounts/doctype/journal_entry/journal_entry.py:547
+#: accounts/doctype/journal_entry/journal_entry.py:563
 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
 msgstr "Línea {0}: Por favor, verifique 'Es un anticipo' para la cuenta {1} si se trata de una entrada de pago anticipado."
 
@@ -60917,7 +61970,7 @@
 msgid "Row {0}: Project must be same as the one set in the Timesheet: {1}."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:114
 msgid "Row {0}: Purchase Invoice {1} has no stock impact."
 msgstr ""
 
@@ -60925,7 +61978,7 @@
 msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Row {0}: Qty in Stock UOM can not be zero."
 msgstr ""
 
@@ -60933,7 +61986,7 @@
 msgid "Row {0}: Qty must be greater than 0."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:762
+#: stock/doctype/stock_entry/stock_entry.py:717
 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})"
 msgstr "Fila {0}: Cantidad no disponible para {4} en el almacén {1} al momento de contabilizar la entrada ({2} {3})"
 
@@ -60941,15 +61994,15 @@
 msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1170
+#: stock/doctype/stock_entry/stock_entry.py:1179
 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
 msgstr "Fila {0}: el artículo subcontratado es obligatorio para la materia prima {1}"
 
-#: controllers/stock_controller.py:721
+#: controllers/stock_controller.py:904
 msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
-msgstr ""
+msgstr "Fila {0}: El almacén de destino es obligatorio para las transferencias internas"
 
-#: stock/doctype/stock_entry/stock_entry.py:450
+#: stock/doctype/stock_entry/stock_entry.py:405
 msgid "Row {0}: The item {1}, quantity must be positive number"
 msgstr "Fila {0}: el artículo {1}, la cantidad debe ser un número positivo"
 
@@ -60957,15 +62010,15 @@
 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:441
+#: assets/doctype/asset/asset.py:443
 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:401
+#: stock/doctype/stock_entry/stock_entry.py:356
 msgid "Row {0}: UOM Conversion Factor is mandatory"
 msgstr "Línea {0}: El factor de conversión de (UdM) es obligatorio"
 
-#: controllers/accounts_controller.py:786
+#: controllers/accounts_controller.py:838
 msgid "Row {0}: user has not applied the rule {1} on the item {2}"
 msgstr "Fila {0}: el usuario no ha aplicado la regla {1} en el elemento {2}"
 
@@ -60977,15 +62030,19 @@
 msgid "Row {0}: {1} must be greater than 0"
 msgstr "Fila {0}: {1} debe ser mayor que 0"
 
-#: controllers/accounts_controller.py:511
+#: controllers/accounts_controller.py:555
 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:701
+#: accounts/doctype/journal_entry/journal_entry.py:728
 msgid "Row {0}: {1} {2} does not match with {3}"
 msgstr "Línea {0}: {1} {2} no coincide con {3}"
 
-#: controllers/accounts_controller.py:2528
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:87
+msgid "Row {0}: {2} Item {1} does not exist in {2} {3}"
+msgstr ""
+
+#: controllers/accounts_controller.py:2613
 msgid "Row {0}: {3} Account {1} does not belong to Company {2}"
 msgstr ""
 
@@ -60993,7 +62050,7 @@
 msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}."
 msgstr "Fila {1}: la cantidad ({0}) no puede ser una fracción. Para permitir esto, deshabilite &#39;{2}&#39; en UOM {3}."
 
-#: controllers/buying_controller.py:726
+#: controllers/buying_controller.py:751
 msgid "Row {}: Asset Naming Series is mandatory for the auto creation for item {}"
 msgstr "Fila {}: la serie de nombres de activos es obligatoria para la creación automática del artículo {}"
 
@@ -61005,11 +62062,11 @@
 msgid "Row({0}): {1} is already discounted in {2}"
 msgstr "Fila ({0}): {1} ya está descontada en {2}"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:193
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:200
 msgid "Rows Added in {0}"
 msgstr "Filas agregadas en {0}"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:194
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:201
 msgid "Rows Removed in {0}"
 msgstr "Filas eliminadas en {0}"
 
@@ -61020,15 +62077,15 @@
 msgid "Rows with Same Account heads will be merged on Ledger"
 msgstr ""
 
-#: controllers/accounts_controller.py:2218
+#: controllers/accounts_controller.py:2310
 msgid "Rows with duplicate due dates in other rows were found: {0}"
 msgstr "Se encontraron filas con fechas de vencimiento duplicadas en otras filas: {0}"
 
-#: accounts/doctype/journal_entry/journal_entry.js:61
+#: accounts/doctype/journal_entry/journal_entry.js:115
 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually."
 msgstr ""
 
-#: controllers/accounts_controller.py:211
+#: controllers/accounts_controller.py:221
 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry."
 msgstr ""
 
@@ -61056,6 +62113,12 @@
 msgid "Rule Description"
 msgstr "Descripción de la regla"
 
+#. Description of the 'Job Capacity' (Int) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Run parallel job cards in a workstation"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Process Payment
 #. Reconciliation'
 #: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
@@ -61070,6 +62133,13 @@
 msgid "Running"
 msgstr ""
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Running"
+msgstr ""
+
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:28
 msgid "S.O. No."
 msgstr "OV No."
@@ -61134,7 +62204,7 @@
 msgid "SLA Paused On"
 msgstr ""
 
-#: public/js/utils.js:1015
+#: public/js/utils.js:1098
 msgid "SLA is on hold since {0}"
 msgstr "El SLA está en espera desde {0}"
 
@@ -61173,6 +62243,10 @@
 msgid "SO Qty"
 msgstr "Cant. OV"
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:107
+msgid "SO Total Qty"
+msgstr ""
+
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:16
 msgid "STATEMENTS OF ACCOUNTS"
 msgstr ""
@@ -61267,7 +62341,7 @@
 #: 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:329 setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:328 setup/doctype/company/company.py:491
 #: setup/doctype/company/company_dashboard.py:9
 #: setup/doctype/sales_person/sales_person_dashboard.py:12
 #: setup/setup_wizard/operations/install_fixtures.py:250
@@ -61305,7 +62379,7 @@
 msgid "Sales"
 msgstr "Ventas"
 
-#: setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:491
 msgid "Sales Account"
 msgstr "Cuenta de ventas"
 
@@ -61339,7 +62413,7 @@
 #. Label of a Link in the CRM Workspace
 #. Label of a Link in the Selling Workspace
 #: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:7
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: selling/page/sales_funnel/sales_funnel.js:46
 #: selling/workspace/selling/selling.json
 msgid "Sales Funnel"
 msgstr "\"Embudo\" de ventas"
@@ -61350,70 +62424,70 @@
 #: accounts/report/gross_profit/gross_profit.js:30
 #: accounts/report/gross_profit/gross_profit.py:199
 #: accounts/report/gross_profit/gross_profit.py:206
-#: selling/doctype/quotation/quotation_list.js:20
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order_list.js:53
-#: stock/doctype/delivery_note/delivery_note.js:222
-#: stock/doctype/delivery_note/delivery_note_list.js:61
+#: selling/doctype/quotation/quotation_list.js:19
+#: selling/doctype/sales_order/sales_order.js:633
+#: selling/doctype/sales_order/sales_order_list.js:66
+#: stock/doctype/delivery_note/delivery_note.js:266
+#: stock/doctype/delivery_note/delivery_note_list.js:70
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Option for the 'Transaction' (Select) field in DocType 'Authorization Rule'
 #: setup/doctype/authorization_rule/authorization_rule.json
 msgctxt "Authorization Rule"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Option for the 'Document Type' (Select) field in DocType 'Contract'
 #: crm/doctype/contract/contract.json
 msgctxt "Contract"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Linked DocType in Incoterm's connections
 #: setup/doctype/incoterm/incoterm.json
 msgctxt "Incoterm"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Option for the 'Reference Type' (Select) field in DocType 'Journal Entry
 #. Account'
 #: accounts/doctype/journal_entry_account/journal_entry_account.json
 msgctxt "Journal Entry Account"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Label of a Data field in DocType 'Loyalty Point Entry Redemption'
 #: accounts/doctype/loyalty_point_entry_redemption/loyalty_point_entry_redemption.json
 msgctxt "Loyalty Point Entry Redemption"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Label of a Link field in DocType 'Overdue Payment'
 #: accounts/doctype/overdue_payment/overdue_payment.json
 msgctxt "Overdue Payment"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Linked DocType in POS Profile's connections
 #: accounts/doctype/pos_profile/pos_profile.json
 msgctxt "POS Profile"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Option for the 'Invoice Type' (Select) field in DocType 'Payment
 #. Reconciliation Invoice'
 #: accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
 msgctxt "Payment Reconciliation Invoice"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Option for the 'Reference Type' (Select) field in DocType 'Quality
 #. Inspection'
 #: stock/doctype/quality_inspection/quality_inspection.json
 msgctxt "Quality Inspection"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Label of a shortcut in the Accounting Workspace
 #. Label of a Link in the Receivables Workspace
@@ -61425,25 +62499,25 @@
 #: selling/workspace/selling/selling.json setup/workspace/home/home.json
 msgctxt "Sales Invoice"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Linked DocType in Subscription's connections
 #: accounts/doctype/subscription/subscription.json
 msgctxt "Subscription"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Label of a Link field in DocType 'Timesheet'
 #: projects/doctype/timesheet/timesheet.json
 msgctxt "Timesheet"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Label of a Link field in DocType 'Timesheet Detail'
 #: projects/doctype/timesheet_detail/timesheet_detail.json
 msgctxt "Timesheet Detail"
 msgid "Sales Invoice"
-msgstr "Factura de venta"
+msgstr "Factura de Venta"
 
 #. Name of a DocType
 #: accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
@@ -61504,11 +62578,11 @@
 msgid "Sales Invoice Trends"
 msgstr "Tendencias de ventas"
 
-#: stock/doctype/delivery_note/delivery_note.py:679
+#: stock/doctype/delivery_note/delivery_note.py:740
 msgid "Sales Invoice {0} has already been submitted"
 msgstr "La factura {0} ya ha sido validada"
 
-#: selling/doctype/sales_order/sales_order.py:472
+#: selling/doctype/sales_order/sales_order.py:475
 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order"
 msgstr ""
 
@@ -61542,6 +62616,7 @@
 #: setup/doctype/sales_person/sales_person.json
 #: setup/doctype/territory/territory.json stock/doctype/bin/bin.json
 #: stock/doctype/packing_slip/packing_slip.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 msgid "Sales Manager"
 msgstr "Gerente de ventas"
 
@@ -61571,36 +62646,36 @@
 msgid "Sales Monthly History"
 msgstr "Historial Mensual de Ventas"
 
-#: selling/page/sales_funnel/sales_funnel.js:129
+#: selling/page/sales_funnel/sales_funnel.js:144
 msgid "Sales Opportunities by Source"
 msgstr ""
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: accounts/doctype/sales_invoice/sales_invoice.js:236
+#: 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:421
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:64
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:113
-#: manufacturing/doctype/blanket_order/blanket_order.js:23
+#: controllers/selling_controller.py:422
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:65
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:122
+#: manufacturing/doctype/blanket_order/blanket_order.js:24
 #: manufacturing/doctype/work_order/work_order_calendar.js:32
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:127
 #: manufacturing/report/work_order_summary/work_order_summary.py:217
-#: selling/doctype/quotation/quotation.js:117
+#: selling/doctype/quotation/quotation.js:125
 #: selling/doctype/quotation/quotation_dashboard.py:11
-#: selling/doctype/quotation/quotation_list.js:16
+#: selling/doctype/quotation/quotation_list.js:15
 #: selling/doctype/sales_order/sales_order.json
 #: selling/onboarding_step/sales_order/sales_order.json
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:59
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13
-#: selling/report/sales_order_analysis/sales_order_analysis.js:34
+#: selling/report/sales_order_analysis/sales_order_analysis.js:33
 #: selling/report/sales_order_analysis/sales_order_analysis.py:222
-#: stock/doctype/delivery_note/delivery_note.js:134
-#: stock/doctype/material_request/material_request.js:161
-#: stock/report/delayed_item_report/delayed_item_report.js:31
+#: stock/doctype/delivery_note/delivery_note.js:146
+#: stock/doctype/material_request/material_request.js:190
+#: stock/report/delayed_item_report/delayed_item_report.js:30
 #: stock/report/delayed_item_report/delayed_item_report.py:155
-#: stock/report/delayed_order_report/delayed_order_report.js:31
+#: stock/report/delayed_order_report/delayed_order_report.js:30
 #: stock/report/delayed_order_report/delayed_order_report.py:74
 msgid "Sales Order"
 msgstr "Orden de venta (OV)"
@@ -61751,8 +62826,8 @@
 msgstr "Fecha de las órdenes de venta"
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:260
-#: selling/doctype/sales_order/sales_order.js:704
+#: selling/doctype/sales_order/sales_order.js:286
+#: selling/doctype/sales_order/sales_order.js:809
 #: selling/doctype/sales_order_item/sales_order_item.json
 msgid "Sales Order Item"
 msgstr "Producto de la orden de venta"
@@ -61841,11 +62916,11 @@
 msgid "Sales Order required for Item {0}"
 msgstr "Orden de venta requerida para el producto {0}"
 
-#: selling/doctype/sales_order/sales_order.py:258
+#: selling/doctype/sales_order/sales_order.py:261
 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:1142
+#: accounts/doctype/sales_invoice/sales_invoice.py:1149
 msgid "Sales Order {0} is not submitted"
 msgstr "La órden de venta {0} no esta validada"
 
@@ -61853,12 +62928,12 @@
 msgid "Sales Order {0} is not valid"
 msgstr "Orden de venta {0} no es válida"
 
-#: controllers/selling_controller.py:402
+#: controllers/selling_controller.py:403
 #: manufacturing/doctype/work_order/work_order.py:223
 msgid "Sales Order {0} is {1}"
 msgstr "Orden de Venta {0} es {1}"
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:42
 msgid "Sales Orders"
 msgstr "Ordenes de venta"
 
@@ -61886,14 +62961,14 @@
 msgstr "Órdenes de Ventas para Enviar"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:133
-#: accounts/report/accounts_receivable/accounts_receivable.py:1106
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:117
+#: accounts/report/accounts_receivable/accounts_receivable.js:136
+#: accounts/report/accounts_receivable/accounts_receivable.py:1114
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:197
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:74
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:10
+#: 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
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:9
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:8
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:71
 #: setup/doctype/sales_partner/sales_partner.json
 msgid "Sales Partner"
@@ -62036,17 +63111,18 @@
 
 #. Name of a DocType
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:155
-#: accounts/report/accounts_receivable/accounts_receivable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.py:1103
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:123
+#: 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_summary/accounts_receivable_summary.js:126
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:194
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
-#: accounts/report/gross_profit/gross_profit.js:49
+#: 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
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:10
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:115
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:116
 #: setup/doctype/sales_person/sales_person.json
 msgid "Sales Person"
 msgstr "Persona de ventas"
@@ -62122,7 +63198,7 @@
 msgstr "Resumen de transacciones por vendedor"
 
 #. Label of a Card Break in the CRM Workspace
-#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:42
+#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:47
 msgid "Sales Pipeline"
 msgstr "Flujo de ventas"
 
@@ -62133,7 +63209,7 @@
 msgid "Sales Pipeline Analytics"
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:131
+#: selling/page/sales_funnel/sales_funnel.js:146
 msgid "Sales Pipeline by Stage"
 msgstr ""
 
@@ -62149,14 +63225,14 @@
 msgstr "Registro de ventas"
 
 #: accounts/report/gross_profit/gross_profit.py:777
-#: stock/doctype/delivery_note/delivery_note.js:175
+#: stock/doctype/delivery_note/delivery_note.js:200
 msgid "Sales Return"
 msgstr "Devoluciones de ventas"
 
 #. Name of a DocType
 #: crm/doctype/sales_stage/sales_stage.json
 #: crm/report/lost_opportunity/lost_opportunity.py:51
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:59
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:61
 msgid "Sales Stage"
 msgstr "Etapa de Ventas"
 
@@ -62176,7 +63252,7 @@
 msgid "Sales Summary"
 msgstr "Resumen de ventas"
 
-#: setup/doctype/company/company.js:98
+#: setup/doctype/company/company.js:106
 msgid "Sales Tax Template"
 msgstr "Plantilla de impuesto sobre ventas"
 
@@ -62363,6 +63439,7 @@
 #: stock/doctype/delivery_note/delivery_note.json stock/doctype/item/item.json
 #: stock/doctype/packing_slip/packing_slip.json
 #: stock/doctype/price_list/price_list.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
@@ -62422,7 +63499,7 @@
 msgid "Same Item"
 msgstr "Mismo articulo"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:350
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:404
 msgid "Same item and warehouse combination already entered."
 msgstr ""
 
@@ -62453,7 +63530,7 @@
 msgstr "Almacenamiento de Muestras de Retención"
 
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: public/js/controllers/transaction.js:2131
+#: public/js/controllers/transaction.js:2174
 msgid "Sample Size"
 msgstr "Tamaño de muestra"
 
@@ -62463,11 +63540,11 @@
 msgid "Sample Size"
 msgstr "Tamaño de muestra"
 
-#: stock/doctype/stock_entry/stock_entry.py:2824
+#: stock/doctype/stock_entry/stock_entry.py:2860
 msgid "Sample quantity {0} cannot be more than received quantity {1}"
 msgstr "La Cantidad de Muestra {0} no puede ser más que la Cantidad Recibida {1}"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:7
 msgid "Sanctioned"
 msgstr "Sancionada"
 
@@ -62536,16 +63613,16 @@
 msgid "Saturday"
 msgstr "Sábado"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:139
-#: accounts/doctype/journal_entry/journal_entry.js:550
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:118
+#: accounts/doctype/journal_entry/journal_entry.js:619
 #: accounts/doctype/ledger_merge/ledger_merge.js:75
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:252
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:288
-#: public/js/call_popup/call_popup.js:157
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:289
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:325
+#: public/js/call_popup/call_popup.js:169
 msgid "Save"
 msgstr "Guardar"
 
-#: selling/page/point_of_sale/pos_controller.js:176
+#: selling/page/point_of_sale/pos_controller.js:198
 msgid "Save as Draft"
 msgstr "Guardar como borrador"
 
@@ -62558,7 +63635,7 @@
 msgid "Savings"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:206
+#: public/js/utils/barcode_scanner.js:215
 msgid "Scan Barcode"
 msgstr "Escanear Código de Barras"
 
@@ -62634,7 +63711,7 @@
 msgid "Scan Barcode"
 msgstr "Escanear Código de Barras"
 
-#: public/js/utils/serial_no_batch_selector.js:151
+#: public/js/utils/serial_no_batch_selector.js:154
 msgid "Scan Batch No"
 msgstr ""
 
@@ -62650,11 +63727,11 @@
 msgid "Scan Mode"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:136
+#: public/js/utils/serial_no_batch_selector.js:139
 msgid "Scan Serial No"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:172
+#: public/js/utils/barcode_scanner.js:179
 msgid "Scan barcode for item {0}"
 msgstr ""
 
@@ -62668,7 +63745,7 @@
 msgid "Scanned Cheque"
 msgstr "Cheque Scaneado"
 
-#: public/js/utils/barcode_scanner.js:238
+#: public/js/utils/barcode_scanner.js:247
 msgid "Scanned Quantity"
 msgstr ""
 
@@ -62678,7 +63755,7 @@
 msgid "Schedule"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:240
+#: assets/doctype/asset/asset.js:275
 msgid "Schedule Date"
 msgstr "Fecha de programa"
 
@@ -62713,15 +63790,15 @@
 msgid "Scheduled"
 msgstr "Programado."
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:111
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:118
 msgid "Scheduled Date"
-msgstr "Fecha prevista."
+msgstr "Fecha prevista"
 
 #. Label of a Date field in DocType 'Maintenance Schedule Detail'
 #: maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
 msgctxt "Maintenance Schedule Detail"
 msgid "Scheduled Date"
-msgstr "Fecha prevista."
+msgstr "Fecha prevista"
 
 #. Label of a Datetime field in DocType 'Appointment'
 #: crm/doctype/appointment/appointment.json
@@ -62741,7 +63818,7 @@
 msgid "Scheduled Time Logs"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: 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
@@ -62760,7 +63837,7 @@
 msgid "Scheduler is inactive. Cannot enqueue job."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:232
 msgid "Scheduler is inactive. Cannot import data."
 msgstr "El programador está inactivo. No se pueden importar datos."
@@ -62842,7 +63919,7 @@
 msgid "Scrap & Process Loss"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:87
+#: assets/doctype/asset/asset.js:92
 msgid "Scrap Asset"
 msgstr ""
 
@@ -62896,7 +63973,7 @@
 msgid "Scrap Warehouse"
 msgstr "Almacén de chatarra"
 
-#: assets/doctype/asset/asset_list.js:17
+#: assets/doctype/asset/asset_list.js:13
 msgid "Scrapped"
 msgstr "Desechado"
 
@@ -62906,7 +63983,7 @@
 msgid "Scrapped"
 msgstr "Desechado"
 
-#: selling/page/point_of_sale/pos_item_selector.js:150
+#: selling/page/point_of_sale/pos_item_selector.js:147
 #: selling/page/point_of_sale/pos_past_order_list.js:51
 #: templates/pages/help.html:14
 msgid "Search"
@@ -62929,7 +64006,7 @@
 msgid "Search Term Param Name"
 msgstr "Nombre del Parámetro de Búsqueda"
 
-#: selling/page/point_of_sale/pos_item_cart.js:312
+#: selling/page/point_of_sale/pos_item_cart.js:310
 msgid "Search by customer name, phone, email."
 msgstr "Busque por nombre de cliente, teléfono, correo electrónico."
 
@@ -62937,7 +64014,7 @@
 msgid "Search by invoice id or customer name"
 msgstr "Buscar por ID de factura o nombre de cliente"
 
-#: selling/page/point_of_sale/pos_item_selector.js:152
+#: selling/page/point_of_sale/pos_item_selector.js:149
 msgid "Search by item code, serial number or barcode"
 msgstr ""
 
@@ -62959,7 +64036,7 @@
 msgid "Secondary Role"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:172
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:117
 msgid "Section Code"
 msgstr "Código de sección"
@@ -62982,8 +64059,13 @@
 msgid "See all open tickets"
 msgstr "Ver todos los tickets abiertos"
 
-#: buying/doctype/purchase_order/purchase_order.js:180
-#: selling/doctype/sales_order/sales_order.js:888
+#: stock/report/stock_ledger/stock_ledger.js:104
+msgid "Segregate Serial / Batch Bundle"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:186
+#: selling/doctype/sales_order/sales_order.js:1043
+#: selling/doctype/sales_order/sales_order_list.js:85
 msgid "Select"
 msgstr "Seleccionar"
 
@@ -62991,33 +64073,33 @@
 msgid "Select Accounting Dimension."
 msgstr ""
 
-#: public/js/utils.js:440
+#: public/js/utils.js:487
 msgid "Select Alternate Item"
 msgstr "Seleccionar artículo alternativo"
 
-#: selling/doctype/quotation/quotation.js:312
+#: selling/doctype/quotation/quotation.js:324
 msgid "Select Alternative Items for Sales Order"
 msgstr ""
 
-#: stock/doctype/item/item.js:518
+#: stock/doctype/item/item.js:585
 msgid "Select Attribute Values"
 msgstr "Seleccionar valores de atributo"
 
-#: selling/doctype/sales_order/sales_order.js:689
+#: selling/doctype/sales_order/sales_order.js:792
 msgid "Select BOM"
 msgstr "Seleccione la lista de materiales"
 
-#: selling/doctype/sales_order/sales_order.js:678
+#: selling/doctype/sales_order/sales_order.js:779
 msgid "Select BOM and Qty for Production"
 msgstr "Seleccione la lista de materiales y Cantidad para Producción"
 
-#: selling/doctype/sales_order/sales_order.js:803
+#: selling/doctype/sales_order/sales_order.js:921
 msgid "Select BOM, Qty and For Warehouse"
 msgstr "Seleccionar BOM, Cant. and Almacén destino"
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: selling/page/point_of_sale/pos_item_details.js:212
+#: stock/doctype/pick_list/pick_list.js:352
 msgid "Select Batch No"
 msgstr ""
 
@@ -63033,15 +64115,15 @@
 msgid "Select Billing Address"
 msgstr "Seleccione dirección de facturación"
 
-#: public/js/stock_analytics.js:42
+#: public/js/stock_analytics.js:61
 msgid "Select Brand..."
 msgstr "Seleccione una marca ..."
 
-#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/journal_entry/journal_entry.js:123
 msgid "Select Company"
 msgstr "Seleccionar Compañia"
 
-#: manufacturing/doctype/job_card/job_card.js:173
+#: manufacturing/doctype/job_card/job_card.js:193
 msgid "Select Corrective Operation"
 msgstr ""
 
@@ -63051,24 +64133,24 @@
 msgid "Select Customers By"
 msgstr "Seleccionar clientes por"
 
-#: setup/doctype/employee/employee.js:112
+#: setup/doctype/employee/employee.js:115
 msgid "Select Date of Birth. This will validate Employees age and prevent hiring of under-age staff."
 msgstr ""
 
-#: setup/doctype/employee/employee.js:117
+#: setup/doctype/employee/employee.js:122
 msgid "Select Date of joining. It will have impact on the first salary calculation, Leave allocation on pro-rata bases."
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:111
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:131
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:114
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:138
 msgid "Select Default Supplier"
 msgstr "Elija un proveedor predeterminado"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:252
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:256
 msgid "Select Difference Account"
 msgstr "Seleccionar cuenta de diferencia"
 
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:58
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:57
 msgid "Select Dimension"
 msgstr ""
 
@@ -63078,27 +64160,27 @@
 msgid "Select DocType"
 msgstr "Seleccione un 'DocType'"
 
-#: manufacturing/doctype/job_card/job_card.js:246
+#: manufacturing/doctype/job_card/job_card.js:274
 msgid "Select Employees"
 msgstr "Seleccione los empleados"
 
-#: buying/doctype/purchase_order/purchase_order.js:170
+#: buying/doctype/purchase_order/purchase_order.js:176
 msgid "Select Finished Good"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:962
+#: selling/doctype/sales_order/sales_order.js:1122
 msgid "Select Items"
 msgstr "Seleccionar articulos"
 
-#: selling/doctype/sales_order/sales_order.js:861
+#: selling/doctype/sales_order/sales_order.js:1008
 msgid "Select Items based on Delivery Date"
 msgstr "Seleccionar Elementos según la Fecha de Entrega"
 
-#: public/js/controllers/transaction.js:2159
+#: public/js/controllers/transaction.js:2202
 msgid "Select Items for Quality Inspection"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:820
 msgid "Select Items to Manufacture"
 msgstr "Seleccionar artículos para Fabricación"
 
@@ -63108,27 +64190,31 @@
 msgid "Select Items to Manufacture"
 msgstr "Seleccionar artículos para Fabricación"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1038
-#: selling/page/point_of_sale/pos_item_cart.js:888
+#: selling/doctype/sales_order/sales_order_list.js:76
+msgid "Select Items up to Delivery Date"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.js:1114
+#: selling/page/point_of_sale/pos_item_cart.js:920
 msgid "Select Loyalty Program"
 msgstr "Seleccionar un Programa de Lealtad"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: buying/doctype/request_for_quotation/request_for_quotation.js:366
 msgid "Select Possible Supplier"
 msgstr "Seleccionar Posible Proveedor"
 
-#: manufacturing/doctype/work_order/work_order.js:726
-#: stock/doctype/pick_list/pick_list.js:161
+#: manufacturing/doctype/work_order/work_order.js:781
+#: stock/doctype/pick_list/pick_list.js:192
 msgid "Select Quantity"
 msgstr "Seleccione cantidad"
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: 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:328 stock/doctype/pick_list/pick_list.js:321
+#: public/js/utils/sales_common.js:364 stock/doctype/pick_list/pick_list.js:355
 msgid "Select Serial and Batch"
 msgstr ""
 
@@ -63156,40 +64242,40 @@
 msgid "Select Supplier Address"
 msgstr "Seleccionar dirección del proveedor"
 
-#: stock/doctype/batch/batch.js:110
+#: stock/doctype/batch/batch.js:127
 msgid "Select Target Warehouse"
 msgstr "Seleccionar Almacén Objetivo"
 
-#: www/book_appointment/index.js:69
+#: www/book_appointment/index.js:73
 msgid "Select Time"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:14
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
+#: accounts/report/balance_sheet/balance_sheet.js:10
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:10
 msgid "Select View"
 msgstr "Seleccione Vista"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:248
+#: public/js/bank_reconciliation_tool/dialog_manager.js:251
 msgid "Select Vouchers to Match"
 msgstr ""
 
-#: public/js/stock_analytics.js:46
+#: public/js/stock_analytics.js:72
 msgid "Select Warehouse..."
 msgstr "Seleccione Almacén ..."
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:431
 msgid "Select Warehouses to get Stock for Materials Planning"
 msgstr ""
 
-#: public/js/communication.js:67
+#: public/js/communication.js:80
 msgid "Select a Company"
 msgstr "Seleccione una empresa"
 
-#: setup/doctype/employee/employee.js:107
+#: setup/doctype/employee/employee.js:110
 msgid "Select a Company this Employee belongs to."
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:160
+#: buying/doctype/supplier/supplier.js:188
 msgid "Select a Customer"
 msgstr ""
 
@@ -63197,19 +64283,19 @@
 msgid "Select a Default Priority."
 msgstr "Seleccione una prioridad predeterminada."
 
-#: selling/doctype/customer/customer.js:205
+#: selling/doctype/customer/customer.js:221
 msgid "Select a Supplier"
 msgstr "Seleccione un proveedor"
 
-#: stock/doctype/material_request/material_request.js:297
+#: stock/doctype/material_request/material_request.js:365
 msgid "Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only."
 msgstr "Seleccione un proveedor de los proveedores predeterminados de los artículos a continuación. En la selección, se realizará una orden de compra contra los artículos que pertenecen al proveedor seleccionado únicamente."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:156
 msgid "Select a company"
 msgstr "Selecciona una empresa"
 
-#: stock/doctype/item/item.js:809
+#: stock/doctype/item/item.js:889
 msgid "Select an Item Group."
 msgstr ""
 
@@ -63217,15 +64303,19 @@
 msgid "Select an account to print in account currency"
 msgstr "Seleccione una cuenta para imprimir en la moneda de la cuenta"
 
-#: selling/doctype/quotation/quotation.js:327
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
+msgid "Select an invoice to load summary data"
+msgstr ""
+
+#: selling/doctype/quotation/quotation.js:339
 msgid "Select an item from each set to be used in the Sales Order."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
-msgid "Select change amount account"
-msgstr "Seleccione la cuenta de cambio"
+#: stock/doctype/item/item.js:590
+msgid "Select at least one value from each of the attributes."
+msgstr ""
 
-#: public/js/utils/party.js:305
+#: public/js/utils/party.js:352
 msgid "Select company first"
 msgstr "Seleccione primero la Compañia"
 
@@ -63236,15 +64326,15 @@
 msgid "Select company name first."
 msgstr "Seleccione primero el nombre de la empresa."
 
-#: controllers/accounts_controller.py:2394
+#: controllers/accounts_controller.py:2486
 msgid "Select finance book for the item {0} at row {1}"
 msgstr "Seleccione el libro de finanzas para el artículo {0} en la fila {1}"
 
-#: selling/page/point_of_sale/pos_item_selector.js:162
+#: selling/page/point_of_sale/pos_item_selector.js:159
 msgid "Select item group"
 msgstr "Seleccionar grupo de artículos"
 
-#: manufacturing/doctype/bom/bom.js:293
+#: manufacturing/doctype/bom/bom.js:306
 msgid "Select template item"
 msgstr "Seleccionar elemento de plantilla"
 
@@ -63258,16 +64348,16 @@
 msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:807
+#: manufacturing/doctype/work_order/work_order.js:866
 msgid "Select the Item to be manufactured."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:725
+#: manufacturing/doctype/bom/bom.js:754
 msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:294
-#: manufacturing/doctype/production_plan/production_plan.js:305
+#: manufacturing/doctype/production_plan/production_plan.js:319
+#: manufacturing/doctype/production_plan/production_plan.js:332
 msgid "Select the Warehouse"
 msgstr ""
 
@@ -63279,15 +64369,15 @@
 msgid "Select the date and your timezone"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:740
+#: manufacturing/doctype/bom/bom.js:773
 msgid "Select the raw materials (Items) required to manufacture the Item"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:338
+#: manufacturing/doctype/bom/bom.js:353
 msgid "Select variant item code for the template item {0}"
 msgstr "Seleccione el código de artículo de variante para el artículo de plantilla {0}"
 
-#: manufacturing/doctype/production_plan/production_plan.js:525
+#: manufacturing/doctype/production_plan/production_plan.js:565
 msgid "Select whether to get items from a Sales Order or a Material Request. For now select <b>Sales Order</b>.\n"
 " A Production Plan can also be created manually where you can select the Items to manufacture."
 msgstr ""
@@ -63307,7 +64397,7 @@
 msgid "Selected POS Opening Entry should be open."
 msgstr "La entrada de apertura de POS seleccionada debe estar abierta."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2192
+#: accounts/doctype/sales_invoice/sales_invoice.py:2161
 msgid "Selected Price List should have buying and selling fields checked."
 msgstr "La Lista de Precios seleccionada debe tener los campos de compra y venta marcados."
 
@@ -63321,7 +64411,7 @@
 msgid "Selected date is"
 msgstr ""
 
-#: public/js/bulk_transaction_processing.js:26
+#: public/js/bulk_transaction_processing.js:34
 msgid "Selected document must be in submitted state"
 msgstr ""
 
@@ -63336,7 +64426,7 @@
 msgid "Sell"
 msgstr "Vender"
 
-#: assets/doctype/asset/asset.js:91
+#: assets/doctype/asset/asset.js:100
 msgid "Sell Asset"
 msgstr ""
 
@@ -63466,7 +64556,7 @@
 msgid "Send Emails"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:46
+#: buying/doctype/request_for_quotation/request_for_quotation.js:53
 msgid "Send Emails to Suppliers"
 msgstr "Enviar correos electrónicos a proveedores"
 
@@ -63474,7 +64564,7 @@
 msgid "Send Now"
 msgstr "Enviar ahora"
 
-#: public/js/controllers/transaction.js:440
+#: public/js/controllers/transaction.js:479
 msgid "Send SMS"
 msgstr "Enviar mensaje SMS"
 
@@ -63496,6 +64586,11 @@
 msgid "Send To Primary Contact"
 msgstr "Enviar a contacto principal"
 
+#. Description of a DocType
+#: setup/doctype/email_digest/email_digest.json
+msgid "Send regular summary reports via Email."
+msgstr ""
+
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
@@ -63526,7 +64621,7 @@
 msgid "Sender"
 msgstr "Remitente"
 
-#: accounts/doctype/payment_request/payment_request.js:35
+#: accounts/doctype/payment_request/payment_request.js:44
 msgid "Sending"
 msgstr "Enviando"
 
@@ -63548,15 +64643,15 @@
 msgid "Sequence ID"
 msgstr "ID de secuencia"
 
-#: manufacturing/doctype/work_order/work_order.js:262
+#: manufacturing/doctype/work_order/work_order.js:277
 msgid "Sequence Id"
-msgstr ""
+msgstr "Id de secuencia"
 
 #. Label of a Int field in DocType 'Job Card'
 #: manufacturing/doctype/job_card/job_card.json
 msgctxt "Job Card"
 msgid "Sequence Id"
-msgstr ""
+msgstr "Id de secuencia"
 
 #. Option for the 'Call Routing' (Select) field in DocType 'Incoming Call
 #. Settings'
@@ -63599,26 +64694,26 @@
 msgid "Serial / Batch No"
 msgstr ""
 
-#: public/js/utils.js:124
+#: public/js/utils.js:153
 msgid "Serial / Batch Nos"
 msgstr ""
 
 #. Name of a DocType
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:73
+#: 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:2144
-#: public/js/utils/serial_no_batch_selector.js:350
+#: public/js/controllers/transaction.js:2187
+#: 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/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_no_ledger/serial_no_ledger.js:39
+#: 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:246
+#: stock/report/stock_ledger/stock_ledger.py:319
 msgid "Serial No"
 msgstr "Número de serie"
 
-#. Label of a Small Text field in DocType 'Asset Capitalization Stock Item'
+#. Label of a Text field in DocType 'Asset Capitalization Stock Item'
 #: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
 msgctxt "Asset Capitalization Stock Item"
 msgid "Serial No"
@@ -63666,7 +64761,7 @@
 msgid "Serial No"
 msgstr "Número de serie"
 
-#. Label of a Small Text field in DocType 'POS Invoice Item'
+#. Label of a Text field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
 msgid "Serial No"
@@ -63702,7 +64797,7 @@
 msgid "Serial No"
 msgstr "Número de serie"
 
-#. Label of a Small Text field in DocType 'Sales Invoice Item'
+#. Label of a Text field in DocType 'Sales Invoice Item'
 #: accounts/doctype/sales_invoice_item/sales_invoice_item.json
 msgctxt "Sales Invoice Item"
 msgid "Serial No"
@@ -63723,7 +64818,7 @@
 msgid "Serial No"
 msgstr "Número de serie"
 
-#. Label of a Small Text field in DocType 'Stock Entry Detail'
+#. Label of a Text field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
 msgid "Serial No"
@@ -63818,7 +64913,7 @@
 msgid "Serial No and Batch for Finished Good"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:572
 msgid "Serial No is mandatory"
 msgstr ""
 
@@ -63826,11 +64921,11 @@
 msgid "Serial No is mandatory for Item {0}"
 msgstr "No. de serie es obligatoria para el producto {0}"
 
-#: public/js/utils/serial_no_batch_selector.js:480
+#: public/js/utils/serial_no_batch_selector.js:488
 msgid "Serial No {0} already exists"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:311
+#: public/js/utils/barcode_scanner.js:321
 msgid "Serial No {0} already scanned"
 msgstr ""
 
@@ -63847,16 +64942,11 @@
 msgid "Serial No {0} does not exist"
 msgstr "El número de serie {0} no existe"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2112
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2131
 msgid "Serial No {0} does not exists"
 msgstr ""
 
 #: public/js/utils/barcode_scanner.js:402
-msgid "Serial No {0} has already scanned."
-msgstr ""
-
-#: public/js/utils/barcode_scanner.js:499
-#: public/js/utils/barcode_scanner.js:506
 msgid "Serial No {0} is already added"
 msgstr ""
 
@@ -63872,23 +64962,23 @@
 msgid "Serial No {0} not found"
 msgstr "Número de serie {0} no encontrado"
 
-#: selling/page/point_of_sale/pos_controller.js:695
+#: selling/page/point_of_sale/pos_controller.js:734
 msgid "Serial No: {0} has already been transacted into another POS Invoice."
 msgstr "Número de serie: {0} ya se ha transferido a otra factura de punto de venta."
 
-#: public/js/utils/barcode_scanner.js:262
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/barcode_scanner.js:271
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Serial Nos"
 msgstr ""
 
 #: public/js/utils/serial_no_batch_selector.js:20
-#: public/js/utils/serial_no_batch_selector.js:183
+#: public/js/utils/serial_no_batch_selector.js:185
 msgid "Serial Nos / Batch Nos"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1692
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:157
 msgid "Serial Nos Mismatch"
 msgstr ""
 
@@ -63898,11 +64988,11 @@
 msgid "Serial Nos and Batches"
 msgstr "Números de serie y lotes"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1074
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1081
 msgid "Serial Nos are created successfully"
 msgstr ""
 
-#: stock/stock_ledger.py:1972
+#: stock/stock_ledger.py:1979
 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
 msgstr ""
 
@@ -63928,7 +65018,7 @@
 #. Name of a DocType
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:80
-#: stock/report/stock_ledger/stock_ledger.py:253
+#: stock/report/stock_ledger/stock_ledger.py:326
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:154
 msgid "Serial and Batch Bundle"
 msgstr ""
@@ -64023,14 +65113,18 @@
 msgid "Serial and Batch Bundle"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1253
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1260
 msgid "Serial and Batch Bundle created"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1295
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1309
 msgid "Serial and Batch Bundle updated"
 msgstr ""
 
+#: controllers/stock_controller.py:82
+msgid "Serial and Batch Bundle {0} is already used in {1} {2}."
+msgstr ""
+
 #. Label of a Section Break field in DocType 'Subcontracting Receipt Item'
 #: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
 msgctxt "Subcontracting Receipt Item"
@@ -64054,7 +65148,7 @@
 msgid "Serial and Batch No"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:51
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:49
 msgid "Serial and Batch Nos"
 msgstr ""
 
@@ -64082,11 +65176,11 @@
 msgid "Serial and Batch Summary"
 msgstr ""
 
-#: stock/utils.py:427
+#: stock/utils.py:422
 msgid "Serial number {0} entered more than once"
 msgstr "Número de serie {0} ha sido ingresado mas de una vez"
 
-#: accounts/doctype/journal_entry/journal_entry.js:545
+#: accounts/doctype/journal_entry/journal_entry.js:611
 msgid "Series"
 msgstr "Secuencia"
 
@@ -64544,7 +65638,7 @@
 msgid "Service Level Agreement has been changed to {0}."
 msgstr "El acuerdo de nivel de servicio se ha cambiado a {0}."
 
-#: support/doctype/issue/issue.js:67
+#: support/doctype/issue/issue.js:77
 msgid "Service Level Agreement was reset."
 msgstr "Se restableció el acuerdo de nivel de servicio."
 
@@ -64625,11 +65719,11 @@
 msgid "Service Stop Date"
 msgstr "Fecha de Finalización del Servicio"
 
-#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1239
+#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1298
 msgid "Service Stop Date cannot be after Service End Date"
 msgstr "La Fecha de Detención del Servicio no puede ser posterior a la Fecha de Finalización del Servicio"
 
-#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1236
+#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1295
 msgid "Service Stop Date cannot be before Service Start Date"
 msgstr "La Fecha de Detención del Servicio no puede ser anterior a la Decha de Inicio del Servicio"
 
@@ -64662,7 +65756,7 @@
 msgid "Set Basic Rate Manually"
 msgstr "Establecer tarifa básica manualmente"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:150
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:157
 msgid "Set Default Supplier"
 msgstr ""
 
@@ -64703,11 +65797,11 @@
 msgid "Set Landed Cost Based on Purchase Invoice Rate"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1050
+#: accounts/doctype/sales_invoice/sales_invoice.js:1126
 msgid "Set Loyalty Program"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:272
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:309
 msgid "Set New Release Date"
 msgstr "Establecer nueva fecha de lanzamiento"
 
@@ -64723,27 +65817,31 @@
 msgid "Set Operating Cost Based On BOM Quantity"
 msgstr ""
 
+#: buying/doctype/request_for_quotation/request_for_quotation.py:264
+msgid "Set Password"
+msgstr "Establecer Contraseña"
+
 #. Label of a Check field in DocType 'POS Opening Entry'
 #: accounts/doctype/pos_opening_entry/pos_opening_entry.json
 msgctxt "POS Opening Entry"
 msgid "Set Posting Date"
 msgstr "Establecer fecha de publicación"
 
-#: manufacturing/doctype/bom/bom.js:767
+#: manufacturing/doctype/bom/bom.js:800
 msgid "Set Process Loss Item Quantity"
 msgstr ""
 
-#: projects/doctype/project/project.js:116
-#: projects/doctype/project/project.js:118
-#: projects/doctype/project/project.js:132
+#: projects/doctype/project/project.js:140
+#: projects/doctype/project/project.js:143
+#: projects/doctype/project/project.js:157
 msgid "Set Project Status"
 msgstr ""
 
-#: projects/doctype/project/project.js:154
+#: projects/doctype/project/project.js:182
 msgid "Set Project and all Tasks to status {0}?"
 msgstr "¿Establecer el proyecto y todas las tareas en el estado {0}?"
 
-#: manufacturing/doctype/bom/bom.js:768
+#: manufacturing/doctype/bom/bom.js:801
 msgid "Set Quantity"
 msgstr "Establecer cantidad"
 
@@ -64823,7 +65921,7 @@
 msgid "Set Valuation Rate Based on Source Warehouse"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:184
+#: selling/doctype/sales_order/sales_order.js:207
 msgid "Set Warehouse"
 msgstr ""
 
@@ -64832,25 +65930,25 @@
 msgid "Set as Closed"
 msgstr "Establecer como cerrado/a"
 
-#: projects/doctype/task/task_list.js:12
+#: projects/doctype/task/task_list.js:20
 msgid "Set as Completed"
 msgstr "Establecer como completado"
 
-#: public/js/utils/sales_common.js:406
-#: selling/doctype/quotation/quotation.js:124
+#: public/js/utils/sales_common.js:462
+#: selling/doctype/quotation/quotation.js:129
 msgid "Set as Lost"
 msgstr "Establecer como perdido"
 
 #: crm/doctype/opportunity/opportunity_list.js:13
-#: projects/doctype/task/task_list.js:8 support/doctype/issue/issue_list.js:8
+#: projects/doctype/task/task_list.js:16 support/doctype/issue/issue_list.js:8
 msgid "Set as Open"
 msgstr "Establecer como abierto/a"
 
-#: setup/doctype/company/company.py:419
+#: setup/doctype/company/company.py:418
 msgid "Set default inventory account for perpetual inventory"
 msgstr "Seleccionar la cuenta de inventario por defecto para el inventario perpetuo"
 
-#: setup/doctype/company/company.py:429
+#: setup/doctype/company/company.py:428
 msgid "Set default {0} account for non stock items"
 msgstr ""
 
@@ -64861,7 +65959,7 @@
 msgid "Set fieldname from which you want to fetch the data from the parent form."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:757
+#: manufacturing/doctype/bom/bom.js:790
 msgid "Set quantity of process loss item:"
 msgstr ""
 
@@ -64878,7 +65976,7 @@
 msgid "Set targets Item Group-wise for this Sales Person."
 msgstr "Establecer objetivos en los grupos de productos para este vendedor"
 
-#: manufacturing/doctype/work_order/work_order.js:852
+#: manufacturing/doctype/work_order/work_order.js:923
 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
 msgstr ""
 
@@ -64900,15 +65998,15 @@
 msgid "Set up your Warehouse"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:672
+#: assets/doctype/asset/asset.py:674
 msgid "Set {0} in asset category {1} for company {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:953
+#: assets/doctype/asset/asset.py:957
 msgid "Set {0} in asset category {1} or company {2}"
 msgstr "Establezca {0} en la categoría de activos {1} o en la empresa {2}"
 
-#: assets/doctype/asset/asset.py:949
+#: assets/doctype/asset/asset.py:953
 msgid "Set {0} in company {1}"
 msgstr "Establecer {0} en la empresa {1}"
 
@@ -64989,7 +66087,7 @@
 msgstr "Creando compañía"
 
 #: manufacturing/doctype/bom/bom.py:956
-#: manufacturing/doctype/work_order/work_order.py:978
+#: manufacturing/doctype/work_order/work_order.py:992
 msgid "Setting {} is required"
 msgstr ""
 
@@ -65022,7 +66120,13 @@
 msgid "Settings"
 msgstr "Configuración"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:15
+#. Description of a DocType
+#: crm/doctype/crm_settings/crm_settings.json
+#: selling/doctype/selling_settings/selling_settings.json
+msgid "Settings for Selling Module"
+msgstr ""
+
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:11
 msgid "Settled"
 msgstr "Colocado"
 
@@ -65038,6 +66142,12 @@
 msgid "Settled"
 msgstr "Colocado"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Setup"
+msgstr "Configuración"
+
 #. Title of an Onboarding Step
 #: setup/onboarding_step/letterhead/letterhead.json
 msgid "Setup Your Letterhead"
@@ -65056,7 +66166,7 @@
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
 #: accounts/doctype/share_balance/share_balance.json
-#: accounts/doctype/shareholder/shareholder.js:22
+#: accounts/doctype/shareholder/shareholder.js:21
 #: accounts/report/share_balance/share_balance.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Balance"
@@ -65071,7 +66181,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/shareholder/shareholder.js:28
+#: accounts/doctype/shareholder/shareholder.js:27
 #: accounts/report/share_ledger/share_ledger.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Ledger"
@@ -65115,9 +66225,9 @@
 
 #. Name of a DocType
 #: accounts/doctype/shareholder/shareholder.json
-#: accounts/report/share_balance/share_balance.js:17
+#: accounts/report/share_balance/share_balance.js:16
 #: accounts/report/share_balance/share_balance.py:57
-#: accounts/report/share_ledger/share_ledger.js:17
+#: accounts/report/share_ledger/share_ledger.js:16
 #: accounts/report/share_ledger/share_ledger.py:51
 msgid "Shareholder"
 msgstr "Accionista"
@@ -65134,7 +66244,7 @@
 msgid "Shelf Life In Days"
 msgstr "Vida útil en Días"
 
-#: assets/doctype/asset/asset.js:247
+#: assets/doctype/asset/asset.js:288
 msgid "Shift"
 msgstr ""
 
@@ -65157,7 +66267,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:166
+#: stock/doctype/delivery_note/delivery_note.js:181
 #: stock/doctype/shipment/shipment.json
 msgid "Shipment"
 msgstr ""
@@ -65225,7 +66335,7 @@
 msgid "Shipment details"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:846
+#: stock/doctype/delivery_note/delivery_note.py:907
 msgid "Shipments"
 msgstr "Envíos"
 
@@ -65573,31 +66683,35 @@
 msgid "Show Cancelled Entries"
 msgstr "Mostrar entradas canceladas"
 
-#: templates/pages/projects.js:64
+#: templates/pages/projects.js:61
 msgid "Show Completed"
 msgstr "Mostrar completado"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:107
+#: accounts/report/budget_variance_report/budget_variance_report.js:105
 msgid "Show Cumulative Amount"
 msgstr "Mostrar la cantidad acumulada"
 
-#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:17
+#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:16
 msgid "Show Disabled Warehouses"
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:306
+msgid "Show Document"
+msgstr "Mostrar documento"
+
 #. Label of a Check field in DocType 'Bank Statement Import'
 #: accounts/doctype/bank_statement_import/bank_statement_import.json
 msgctxt "Bank Statement Import"
 msgid "Show Failed Logs"
 msgstr "Mostrar registros fallidos"
 
-#: accounts/report/accounts_payable/accounts_payable.js:144
-#: accounts/report/accounts_receivable/accounts_receivable.js:161
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:134
+#: accounts/report/accounts_payable/accounts_payable.js:147
+#: accounts/report/accounts_receivable/accounts_receivable.js:164
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:137
 msgid "Show Future Payments"
 msgstr "Mostrar pagos futuros"
 
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:139
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:142
 msgid "Show GL Balance"
 msgstr ""
 
@@ -65630,7 +66744,7 @@
 msgid "Show Ledger View"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:166
+#: accounts/report/accounts_receivable/accounts_receivable.js:169
 msgid "Show Linked Delivery Notes"
 msgstr "Mostrar notas de entrega vinculadas"
 
@@ -65644,7 +66758,7 @@
 msgid "Show Net Values in Party Account"
 msgstr ""
 
-#: templates/pages/projects.js:66
+#: templates/pages/projects.js:63
 msgid "Show Open"
 msgstr "Mostrar abiertos"
 
@@ -65676,20 +66790,20 @@
 
 #: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.js:25
 msgid "Show Preview"
-msgstr ""
+msgstr "Mostrar Vista Previa"
 
-#: accounts/report/accounts_payable/accounts_payable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.js:176
+#: accounts/report/accounts_payable/accounts_payable.js:142
+#: accounts/report/accounts_receivable/accounts_receivable.js:179
 #: accounts/report/general_ledger/general_ledger.js:204
 msgid "Show Remarks"
 msgstr ""
 
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:66
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:65
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:65
 msgid "Show Return Entries"
 msgstr "Mostrar Entradas de Devolución"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:171
+#: accounts/report/accounts_receivable/accounts_receivable.js:174
 msgid "Show Sales Person"
 msgstr "Mostrar vendedor"
 
@@ -65703,11 +66817,16 @@
 msgid "Show Taxes as Table in Print"
 msgstr ""
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:456
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:296
+msgid "Show Traceback"
+msgstr ""
+
 #: stock/report/stock_balance/stock_balance.js:90
 msgid "Show Variant Attributes"
 msgstr "Mostrar Atributos de Variantes"
 
-#: stock/doctype/item/item.js:90
+#: stock/doctype/item/item.js:106
 msgid "Show Variants"
 msgstr "Mostrar Variantes"
 
@@ -65715,8 +66834,8 @@
 msgid "Show Warehouse-wise Stock"
 msgstr "Mostrar stock en almacén"
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:29
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:17
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:28
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:19
 msgid "Show exploded view"
 msgstr "Mostrar Vista Explosionada"
 
@@ -65726,7 +66845,7 @@
 msgid "Show in Website"
 msgstr "Mostrar en sitio web"
 
-#: accounts/report/trial_balance/trial_balance.js:104
+#: accounts/report/trial_balance/trial_balance.js:110
 msgid "Show net values in opening and closing columns"
 msgstr ""
 
@@ -65734,30 +66853,30 @@
 msgid "Show only POS"
 msgstr "Mostrar solo POS"
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:108
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:106
 msgid "Show only the Immediate Upcoming Term"
 msgstr ""
 
-#: stock/utils.py:588
+#: stock/utils.py:583
 msgid "Show pending entries"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.js:93
+#: accounts/report/trial_balance/trial_balance.js:99
 msgid "Show unclosed fiscal year's P&L balances"
 msgstr "Mostrar saldos de pérdidas y ganancias del ejercicio no cerrado"
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:96
 msgid "Show with upcoming revenue/expense"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:113
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:137
 #: accounts/report/profitability_analysis/profitability_analysis.js:71
-#: accounts/report/trial_balance/trial_balance.js:88
+#: accounts/report/trial_balance/trial_balance.js:94
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:85
 msgid "Show zero values"
 msgstr "Mostrar valores en cero"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.js:30
+#: accounts/doctype/accounting_dimension/accounting_dimension.js:35
 msgid "Show {0}"
 msgstr "Mostrar {0}"
 
@@ -65841,7 +66960,7 @@
 msgid "Simultaneous"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:551
+#: stock/doctype/stock_entry/stock_entry.py:506
 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 ""
 
@@ -65864,7 +66983,7 @@
 msgid "Single Transaction Threshold"
 msgstr "Umbral de Transacción único"
 
-#: stock/doctype/item/item.js:103
+#: stock/doctype/item/item.js:131
 msgid "Single Variant"
 msgstr "Variante Individual"
 
@@ -65900,7 +67019,7 @@
 msgid "Skipping Tax Withholding Category {0} as there is no associated account set for Company {1} in it."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:49
 msgid "Skipping {0} of {1}, {2}"
 msgstr ""
 
@@ -65914,7 +67033,7 @@
 msgid "Small"
 msgstr "Pequeño"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:68
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:67
 msgid "Smoothing Constant"
 msgstr "Constante de suavizado"
 
@@ -65923,7 +67042,7 @@
 msgid "Software"
 msgstr "Software"
 
-#: assets/doctype/asset/asset_list.js:11
+#: assets/doctype/asset/asset_list.js:9
 msgid "Sold"
 msgstr "Vendido"
 
@@ -65933,24 +67052,29 @@
 msgid "Sold"
 msgstr "Vendido"
 
-#: www/book_appointment/index.js:239
+#: selling/page/point_of_sale/pos_past_order_summary.js:80
+msgid "Sold by"
+msgstr ""
+
+#: www/book_appointment/index.js:248
 msgid "Something went wrong please try again"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:747
+#: accounts/doctype/pricing_rule/utils.py:746
 msgid "Sorry, this coupon code is no longer valid"
 msgstr "Lo sentimos, este código de cupón ya no es válido"
 
-#: accounts/doctype/pricing_rule/utils.py:745
+#: accounts/doctype/pricing_rule/utils.py:744
 msgid "Sorry, this coupon code's validity has expired"
 msgstr "Lo sentimos, la validez de este código de cupón ha expirado"
 
-#: accounts/doctype/pricing_rule/utils.py:742
+#: accounts/doctype/pricing_rule/utils.py:741
 msgid "Sorry, this coupon code's validity has not started"
 msgstr "Lo sentimos, la validez de este código de cupón no ha comenzado"
 
 #: crm/report/lead_details/lead_details.py:40
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:38
+#: templates/form_grid/stock_entry_grid.html:29
 msgid "Source"
 msgstr "Referencia"
 
@@ -66056,10 +67180,10 @@
 msgid "Source Type"
 msgstr "Tipo de Fuente"
 
-#: manufacturing/doctype/bom/bom.js:313
+#: manufacturing/doctype/bom/bom.js:326
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:126
-#: stock/dashboard/item_dashboard.js:215
-#: stock/doctype/stock_entry/stock_entry.js:547
+#: stock/dashboard/item_dashboard.js:223
+#: stock/doctype/stock_entry/stock_entry.js:627
 msgid "Source Warehouse"
 msgstr "Almacén de origen"
 
@@ -66134,11 +67258,11 @@
 msgid "Source and Target Location cannot be same"
 msgstr "La ubicación de origen y destino no puede ser la misma"
 
-#: stock/doctype/stock_entry/stock_entry.py:640
+#: stock/doctype/stock_entry/stock_entry.py:595
 msgid "Source and target warehouse cannot be same for row {0}"
 msgstr "Almacenes de origen y destino no pueden ser los mismos, línea {0}"
 
-#: stock/dashboard/item_dashboard.js:278
+#: stock/dashboard/item_dashboard.js:286
 msgid "Source and target warehouse must be different"
 msgstr "Almacén de Origen y Destino deben ser diferentes"
 
@@ -66147,8 +67271,8 @@
 msgid "Source of Funds (Liabilities)"
 msgstr "Origen de fondos (Pasivo)"
 
-#: stock/doctype/stock_entry/stock_entry.py:617
-#: stock/doctype/stock_entry/stock_entry.py:634
+#: stock/doctype/stock_entry/stock_entry.py:572
+#: stock/doctype/stock_entry/stock_entry.py:589
 msgid "Source warehouse is mandatory for row {0}"
 msgstr "El almacén de origen es obligatorio para la línea {0}"
 
@@ -66186,16 +67310,26 @@
 msgid "Spacer"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:467 stock/doctype/batch/batch.js:143
-#: support/doctype/issue/issue.js:100
+#. Description of a DocType
+#: setup/doctype/currency_exchange/currency_exchange.json
+msgid "Specify Exchange Rate to convert one currency into another"
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/shipping_rule/shipping_rule.json
+msgid "Specify conditions to calculate shipping amount"
+msgstr ""
+
+#: assets/doctype/asset/asset.js:540 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:162 support/doctype/issue/issue.js:112
 msgid "Split"
 msgstr "División"
 
-#: assets/doctype/asset/asset.js:111 assets/doctype/asset/asset.js:451
+#: assets/doctype/asset/asset.js:135 assets/doctype/asset/asset.js:524
 msgid "Split Asset"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:142
+#: stock/doctype/batch/batch.js:161
 msgid "Split Batch"
 msgstr "Lote dividido"
 
@@ -66212,19 +67346,19 @@
 msgid "Split From"
 msgstr ""
 
-#: support/doctype/issue/issue.js:90
+#: support/doctype/issue/issue.js:100
 msgid "Split Issue"
 msgstr "Problema de División"
 
-#: assets/doctype/asset/asset.js:457
+#: assets/doctype/asset/asset.js:530
 msgid "Split Qty"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1050
+#: assets/doctype/asset/asset.py:1054
 msgid "Split qty cannot be grater than or equal to asset qty"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1827
+#: accounts/doctype/payment_entry/payment_entry.py:1846
 msgid "Splitting {0} {1} into {2} rows as per Payment Terms"
 msgstr ""
 
@@ -66287,11 +67421,26 @@
 msgid "Standard Template"
 msgstr "Plantilla estándar"
 
+#. Description of a DocType
+#: setup/doctype/terms_and_conditions/terms_and_conditions.json
+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
 msgid "Standard rated supplies in {0}"
 msgstr ""
 
+#. Description of a DocType
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Purchase Transactions. This template can contain a list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\", etc."
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Sales Transactions. This template can contain a list of tax heads and also other expense/income heads like \"Shipping\", \"Insurance\", \"Handling\" etc."
+msgstr ""
+
 #. Label of a Link field in DocType 'Supplier Scorecard Scoring Standing'
 #: buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
 msgctxt "Supplier Scorecard Scoring Standing"
@@ -66304,23 +67453,25 @@
 msgid "Standing Name"
 msgstr "Nombre en uso"
 
-#: manufacturing/doctype/work_order/work_order.js:591
+#: manufacturing/doctype/work_order/work_order.js:630
+#: manufacturing/doctype/workstation/workstation_job_card.html:67
+#: public/js/projects/timer.js:32
 msgid "Start"
 msgstr "Iniciar"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:44
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:43
 msgid "Start / Resume"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:34
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:34
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:42
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:42
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:16
-#: accounts/report/payment_ledger/payment_ledger.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:68
+#: accounts/report/payment_ledger/payment_ledger.js:16
+#: assets/report/fixed_asset_register/fixed_asset_register.js:67
 #: projects/report/project_summary/project_summary.py:70
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
-#: public/js/financial_statements.js:184
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:17
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:47
+#: public/js/financial_statements.js:193
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:16
 msgid "Start Date"
 msgstr "Fecha de inicio"
 
@@ -66394,11 +67545,16 @@
 msgid "Start Date cannot be before the current date"
 msgstr "La fecha de inicio no puede ser anterior a la fecha actual"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:133
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
+msgid "Start Deletion"
+msgstr ""
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 msgid "Start Import"
 msgstr "Comience a Importar"
 
-#: manufacturing/doctype/job_card/job_card.js:244
+#: manufacturing/doctype/job_card/job_card.js:269
+#: manufacturing/doctype/workstation/workstation.js:190
 msgid "Start Job"
 msgstr ""
 
@@ -66406,10 +67562,14 @@
 msgid "Start Merge"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:85
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:95
 msgid "Start Reposting"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation.js:159
+msgid "Start Time"
+msgstr "Hora de inicio"
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -66438,11 +67598,11 @@
 msgid "Start Time can't be greater than or equal to End Time for {0}."
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:48
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:48
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:56
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
 #: accounts/report/financial_ratios/financial_ratios.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:82
-#: public/js/financial_statements.js:198
+#: assets/report/fixed_asset_register/fixed_asset_register.js:81
+#: public/js/financial_statements.js:207
 msgid "Start Year"
 msgstr "Año de inicio"
 
@@ -66476,7 +67636,7 @@
 msgid "Started Time"
 msgstr "Hora de inicio"
 
-#: utilities/bulk_transaction.py:19
+#: utilities/bulk_transaction.py:22
 msgid "Started a background job to create {1} {0}"
 msgstr ""
 
@@ -66493,7 +67653,7 @@
 msgstr "Posición inicial desde el borde superior de partida"
 
 #: crm/report/lead_details/lead_details.py:59
-#: public/js/utils/contact_address_quick_entry.js:81
+#: public/js/utils/contact_address_quick_entry.js:84
 msgid "State"
 msgstr "Estado"
 
@@ -66521,68 +67681,76 @@
 msgid "Statement Import Log"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:17
+#: accounts/report/general_ledger/general_ledger.html:1
+msgid "Statement of Account"
+msgstr ""
+
+#: 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
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order.js:298
-#: buying/doctype/purchase_order/purchase_order.js:300
-#: buying/doctype/purchase_order/purchase_order.js:304
+#: buying/doctype/purchase_order/purchase_order.js:317
+#: buying/doctype/purchase_order/purchase_order.js:323
+#: buying/doctype/purchase_order/purchase_order.js:329
+#: buying/doctype/purchase_order/purchase_order.js:335
+#: buying/doctype/purchase_order/purchase_order.js:337
+#: 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:53
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:52
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:173
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:134
-#: crm/report/lead_details/lead_details.js:31
+#: crm/report/lead_details/lead_details.js:30
 #: crm/report/lead_details/lead_details.py:25
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:34
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:39
-#: manufacturing/doctype/production_plan/production_plan.js:99
-#: manufacturing/doctype/production_plan/production_plan.js:103
-#: manufacturing/doctype/production_plan/production_plan.js:431
-#: manufacturing/doctype/work_order/work_order.js:352
-#: manufacturing/doctype/work_order/work_order.js:389
-#: manufacturing/doctype/work_order/work_order.js:565
-#: manufacturing/doctype/work_order/work_order.js:572
-#: manufacturing/doctype/work_order/work_order.js:576
-#: manufacturing/report/job_card_summary/job_card_summary.js:51
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:32
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:38
+#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:115
+#: manufacturing/doctype/production_plan/production_plan.js:466
+#: manufacturing/doctype/work_order/work_order.js:371
+#: manufacturing/doctype/work_order/work_order.js:407
+#: manufacturing/doctype/work_order/work_order.js:595
+#: manufacturing/doctype/work_order/work_order.js:606
+#: manufacturing/doctype/work_order/work_order.js:614
+#: 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/production_analytics/production_analytics.py:19
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:22
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:21
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:80
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:50
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:49
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:111
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:138
-#: manufacturing/report/work_order_summary/work_order_summary.js:37
+#: manufacturing/report/work_order_summary/work_order_summary.js:36
 #: manufacturing/report/work_order_summary/work_order_summary.py:202
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:35
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:25
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:24
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:92
-#: projects/report/project_summary/project_summary.js:24
+#: projects/report/project_summary/project_summary.js:23
 #: projects/report/project_summary/project_summary.py:58
-#: selling/doctype/sales_order/sales_order.js:517
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:528
-#: selling/doctype/sales_order/sales_order.js:539
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:90
+#: public/js/plant_floor_visual/visual_plant.js:111
+#: selling/doctype/sales_order/sales_order.js:553
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:567
+#: selling/doctype/sales_order/sales_order.js:584
+#: selling/doctype/sales_order/sales_order.js:590
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:88
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:68
-#: selling/report/sales_order_analysis/sales_order_analysis.js:55
+#: selling/report/sales_order_analysis/sales_order_analysis.js:54
 #: selling/report/sales_order_analysis/sales_order_analysis.py:228
-#: stock/doctype/delivery_note/delivery_note.js:210
-#: stock/doctype/delivery_note/delivery_note.js:229
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: stock/report/reserved_stock/reserved_stock.js:127
+#: stock/doctype/delivery_note/delivery_note.js:252
+#: stock/doctype/delivery_note/delivery_note.js:281
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: stock/report/reserved_stock/reserved_stock.js:124
 #: stock/report/reserved_stock/reserved_stock.py:178
 #: stock/report/serial_no_ledger/serial_no_ledger.py:51
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/report/issue_analytics/issue_analytics.js:52
-#: support/report/issue_summary/issue_summary.js:39
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:114
+#: support/report/issue_analytics/issue_analytics.js:51
+#: support/report/issue_summary/issue_summary.js:38
 #: templates/pages/projects.html:24 templates/pages/projects.html:46
-#: templates/pages/projects.html:66
+#: templates/pages/projects.html:66 templates/pages/task_info.html:69
+#: templates/pages/timelog_info.html:40
 msgid "Status"
 msgstr "Estado"
 
@@ -67050,12 +68218,24 @@
 msgid "Status"
 msgstr "Estado"
 
+#. Label of a Select field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status"
+msgstr "Estado"
+
 #. Label of a Section Break field in DocType 'Service Level Agreement'
 #: support/doctype/service_level_agreement/service_level_agreement.json
 msgctxt "Service Level Agreement"
 msgid "Status Details"
 msgstr ""
 
+#. Label of a Section Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status Illustration"
+msgstr ""
+
 #: projects/doctype/project/project.py:719
 msgid "Status must be Cancelled or Completed"
 msgstr "El estado debe ser cancelado o completado"
@@ -67077,7 +68257,7 @@
 #. Label of a Card Break in the Home Workspace
 #. Name of a Workspace
 #: accounts/doctype/item_tax_template/item_tax_template_dashboard.py:11
-#: accounts/report/account_balance/account_balance.js:55
+#: accounts/report/account_balance/account_balance.js:57
 #: manufacturing/doctype/bom/bom_dashboard.py:14 setup/workspace/home/home.json
 #: stock/doctype/material_request/material_request_dashboard.py:17
 #: stock/workspace/stock/stock.json
@@ -67104,8 +68284,8 @@
 
 #: 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:1187
-#: accounts/report/account_balance/account_balance.js:56
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1239
+#: accounts/report/account_balance/account_balance.js:58
 msgid "Stock Adjustment"
 msgstr "Ajuste de existencias"
 
@@ -67129,7 +68309,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: public/js/stock_analytics.js:8
+#: public/js/stock_analytics.js:7
 #: stock/report/stock_analytics/stock_analytics.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Analytics"
@@ -67147,23 +68327,27 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:52
+#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:49
 #: stock/report/stock_balance/stock_balance.json
 #: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py:107
 #: stock/workspace/stock/stock.json
 msgid "Stock Balance"
-msgstr "Balance de Inventarios."
+msgstr "Balance de Inventarios"
 
 #. Label of a Button field in DocType 'Quotation Item'
 #: selling/doctype/quotation_item/quotation_item.json
 msgctxt "Quotation Item"
 msgid "Stock Balance"
-msgstr "Balance de Inventarios."
+msgstr "Balance de Inventarios"
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:16
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:15
 msgid "Stock Balance Report"
 msgstr "Informe de saldo de existencias"
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:10
+msgid "Stock Capacity"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Stock Settings'
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
@@ -67194,12 +68378,12 @@
 msgid "Stock Details"
 msgstr "Detalles de almacén"
 
-#: stock/doctype/stock_entry/stock_entry.py:730
+#: stock/doctype/stock_entry/stock_entry.py:685
 msgid "Stock Entries already created for Work Order {0}: {1}"
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/pick_list/pick_list.js:104
+#: stock/doctype/pick_list/pick_list.js:116
 #: stock/doctype/stock_entry/stock_entry.json
 msgid "Stock Entry"
 msgstr "Entradas de inventario"
@@ -67260,15 +68444,15 @@
 msgid "Stock Entry Type"
 msgstr "Tipo de entrada de stock"
 
-#: stock/doctype/pick_list/pick_list.py:1020
+#: stock/doctype/pick_list/pick_list.py:1140
 msgid "Stock Entry has been already created against this Pick List"
 msgstr "La entrada de stock ya se ha creado para esta lista de selección"
 
-#: stock/doctype/batch/batch.js:104
+#: stock/doctype/batch/batch.js:115
 msgid "Stock Entry {0} created"
 msgstr "Entrada de stock {0} creada"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1140
+#: accounts/doctype/journal_entry/journal_entry.py:1167
 msgid "Stock Entry {0} is not submitted"
 msgstr "La entrada de stock {0} no esta validada"
 
@@ -67303,14 +68487,18 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: public/js/controllers/stock_controller.js:54
-#: public/js/utils/ledger_preview.js:27 stock/doctype/item/item.js:64
+#: public/js/controllers/stock_controller.js:66
+#: public/js/utils/ledger_preview.js:37 stock/doctype/item/item.js:68
 #: stock/doctype/item/item_dashboard.py:8
 #: stock/report/stock_ledger/stock_ledger.json stock/workspace/stock/stock.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:32
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:33
 msgid "Stock Ledger"
 msgstr "Mayor de Inventarios"
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts"
+msgstr ""
+
 #. 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
@@ -67339,7 +68527,7 @@
 msgid "Stock Ledger report contains every submitted stock transaction. You can use filter to narrow down ledger entries."
 msgstr ""
 
-#: stock/doctype/batch/batch.js:50 stock/doctype/item/item.js:403
+#: stock/doctype/batch/batch.js:58 stock/doctype/item/item.js:467
 msgid "Stock Levels"
 msgstr "Niveles de Stock"
 
@@ -67378,11 +68566,12 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_reconciliation/stock_reconciliation.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Stock Manager"
-msgstr "Gerente de almacén"
+msgstr "Gerente de Almacén"
 
 #: stock/doctype/item/item_dashboard.py:34
 msgid "Stock Movement"
@@ -67396,7 +68585,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: stock/doctype/item/item.js:70
+#: stock/doctype/item/item.js:78
 #: stock/report/stock_projected_qty/stock_projected_qty.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Projected Qty"
@@ -67406,37 +68595,37 @@
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:306
 #: stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.py:34
 msgid "Stock Qty"
-msgstr "Cantidad de existencias"
+msgstr "Cant. de existencias"
 
 #. Label of a Float field in DocType 'BOM Creator Item'
 #: manufacturing/doctype/bom_creator_item/bom_creator_item.json
 msgctxt "BOM Creator Item"
 msgid "Stock Qty"
-msgstr "Cantidad de existencias"
+msgstr "Cant. de existencias"
 
 #. Label of a Float field in DocType 'BOM Explosion Item'
 #: manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
 msgctxt "BOM Explosion Item"
 msgid "Stock Qty"
-msgstr "Cantidad de existencias"
+msgstr "Cant. de existencias"
 
 #. Label of a Float field in DocType 'BOM Item'
 #: manufacturing/doctype/bom_item/bom_item.json
 msgctxt "BOM Item"
 msgid "Stock Qty"
-msgstr "Cantidad de existencias"
+msgstr "Cant. de existencias"
 
 #. Label of a Float field in DocType 'Material Request Item'
 #: stock/doctype/material_request_item/material_request_item.json
 msgctxt "Material Request Item"
 msgid "Stock Qty"
-msgstr "Cantidad de existencias"
+msgstr "Cant. de existencias"
 
 #. Label of a Float field in DocType 'Pick List Item'
 #: stock/doctype/pick_list_item/pick_list_item.json
 msgctxt "Pick List Item"
 msgid "Stock Qty"
-msgstr "Cantidad de existencias"
+msgstr "Cant. de existencias"
 
 #. Name of a report
 #: stock/report/stock_qty_vs_serial_no_count/stock_qty_vs_serial_no_count.json
@@ -67445,7 +68634,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:90
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:123
-#: accounts/report/account_balance/account_balance.js:57
+#: accounts/report/account_balance/account_balance.js:59
 msgid "Stock Received But Not Billed"
 msgstr "Inventario Recibido pero no Facturado"
 
@@ -67496,20 +68685,20 @@
 msgid "Stock Reposting Settings"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: selling/doctype/sales_order/sales_order.js:74
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:178
-#: stock/doctype/pick_list/pick_list.js:110
-#: stock/doctype/pick_list/pick_list.js:119
-#: stock/doctype/pick_list/pick_list.js:120
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:467
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:965
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:978
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:992
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1006
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1020
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1037
+#: selling/doctype/sales_order/sales_order.js:82
+#: selling/doctype/sales_order/sales_order.js:92
+#: selling/doctype/sales_order/sales_order.js:101
+#: selling/doctype/sales_order/sales_order.js:201
+#: 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_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
 msgid "Stock Reservation"
 msgstr ""
 
@@ -67519,18 +68708,18 @@
 msgid "Stock Reservation"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1144
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1146
 msgid "Stock Reservation Entries Cancelled"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1096
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1098
 msgid "Stock Reservation Entries Created"
 msgstr ""
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:383
+#: selling/doctype/sales_order/sales_order.js:413
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: stock/report/reserved_stock/reserved_stock.js:56
+#: stock/report/reserved_stock/reserved_stock.js:53
 #: stock/report/reserved_stock/reserved_stock.py:171
 msgid "Stock Reservation Entry"
 msgstr ""
@@ -67543,7 +68732,7 @@
 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:614
+#: stock/doctype/delivery_note/delivery_note.py:675
 msgid "Stock Reservation Warehouse Mismatch"
 msgstr ""
 
@@ -67563,7 +68752,7 @@
 msgid "Stock Reserved Qty (in Stock UOM)"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1498
+#: stock/doctype/stock_entry/stock_entry.py:1507
 msgid "Stock Return"
 msgstr ""
 
@@ -67591,6 +68780,13 @@
 msgid "Stock Summary"
 msgstr "Resumen de Existencia"
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Stock Summary"
+msgstr "Resumen de Existencia"
+
 #. Label of a Card Break in the Stock Workspace
 #: stock/workspace/stock/stock.json
 msgid "Stock Transactions"
@@ -67608,8 +68804,8 @@
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:232
 #: 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:398
-#: stock/report/stock_ledger/stock_ledger.py:117
+#: stock/report/stock_balance/stock_balance.py:406
+#: stock/report/stock_ledger/stock_ledger.py:190
 msgid "Stock UOM"
 msgstr "Unidad de media utilizada en el almacen"
 
@@ -67787,7 +68983,7 @@
 msgid "Stock UOM Quantity"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:368
+#: selling/doctype/sales_order/sales_order.js:398
 msgid "Stock Unreservation"
 msgstr ""
 
@@ -67854,12 +69050,13 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Stock User"
-msgstr "Usuario de almacén"
+msgstr "Usuario de Almacén"
 
 #. Label of a Tab Break field in DocType 'Stock Settings'
 #: stock/doctype/stock_settings/stock_settings.json
@@ -67894,27 +69091,31 @@
 msgid "Stock cannot be reserved in group warehouse {0}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:908
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:910
 msgid "Stock cannot be reserved in the group warehouse {0}."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1011
-msgid "Stock cannot be updated against Delivery Note {0}"
-msgstr "Inventario no puede actualizarse contra la nota de envío {0}"
-
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:673
 msgid "Stock cannot be updated against Purchase Receipt {0}"
 msgstr "Stock no se puede actualizar en contra recibo de compra {0}"
 
+#: accounts/doctype/sales_invoice/sales_invoice.py:1032
+msgid "Stock cannot be updated against the following Delivery Notes: {0}"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.py:1055
+msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
+msgstr ""
+
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:229
 msgid "Stock not available for Item {0} in Warehouse {1}."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:679
+#: selling/page/point_of_sale/pos_controller.js:714
 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:241
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:252
 msgid "Stock transactions before {0} are frozen"
 msgstr "Las operaciones de inventario antes de {0} se encuentran congeladas"
 
@@ -67932,12 +69133,12 @@
 msgid "Stock will be reserved on submission of <b>Purchase Receipt</b> created against Material Receipt for Sales Order."
 msgstr ""
 
-#: stock/utils.py:579
+#: stock/utils.py:574
 msgid "Stock/Accounts can not be frozen as processing of backdated entries is going on. Please try again later."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:570
-#: stock/doctype/material_request/material_request.js:107
+#: manufacturing/doctype/work_order/work_order.js:602
+#: stock/doctype/material_request/material_request.js:109
 msgid "Stop"
 msgstr ""
 
@@ -68013,11 +69214,11 @@
 msgid "Stopped"
 msgstr "Detenido"
 
-#: manufacturing/doctype/work_order/work_order.py:631
+#: manufacturing/doctype/work_order/work_order.py:645
 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
 msgstr "La Órden de Trabajo detenida no se puede cancelar, desactívela primero para cancelarla"
 
-#: setup/doctype/company/company.py:260
+#: 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
@@ -68054,7 +69255,12 @@
 msgid "Sub Assemblies & Raw Materials"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:264
+#: public/js/bom_configurator/bom_configurator.bundle.js:129
+#: public/js/bom_configurator/bom_configurator.bundle.js:159
+msgid "Sub Assembly"
+msgstr ""
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:271
 msgid "Sub Assembly Item"
 msgstr ""
 
@@ -68126,7 +69332,7 @@
 msgid "Subcontract BOM"
 msgstr ""
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:37
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:36
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:128
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:22
 #: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:22
@@ -68138,7 +69344,7 @@
 msgid "Subcontract Order Summary"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:68
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
 msgid "Subcontract Return"
 msgstr ""
 
@@ -68174,10 +69380,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: controllers/subcontracting_controller.py:806
+#: buying/doctype/purchase_order/purchase_order.js:369
+#: controllers/subcontracting_controller.py:810
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:78
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:95
 msgid "Subcontracting Order"
 msgstr ""
 
@@ -68227,7 +69433,7 @@
 msgid "Subcontracting Order Supplied Item"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:861
+#: buying/doctype/purchase_order/purchase_order.py:864
 msgid "Subcontracting Order {0} created."
 msgstr ""
 
@@ -68238,7 +69444,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:200
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Subcontracting Receipt"
 msgstr ""
@@ -68282,7 +69488,7 @@
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
 msgid "Subcontracting Settings"
-msgstr ""
+msgstr "Configuración de Subcontratación"
 
 #. Label of a Autocomplete field in DocType 'Holiday List'
 #: setup/doctype/holiday_list/holiday_list.json
@@ -68290,10 +69496,10 @@
 msgid "Subdivision"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:219
-#: projects/doctype/task/task_tree.js:62
+#: buying/doctype/request_for_quotation/request_for_quotation.js:237
+#: projects/doctype/task/task_tree.js:65
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:91
-#: support/doctype/issue/issue.js:96
+#: support/doctype/issue/issue.js:106 templates/pages/task_info.html:44
 msgid "Subject"
 msgstr "Asunto"
 
@@ -68345,15 +69551,16 @@
 msgid "Subject"
 msgstr "Asunto"
 
-#: accounts/doctype/payment_order/payment_order.js:120
-#: public/js/payment/payments.js:28
-#: selling/page/point_of_sale/pos_controller.js:101
-#: www/book_appointment/index.html:59
+#: accounts/doctype/payment_order/payment_order.js:137
+#: manufacturing/doctype/workstation/workstation.js:237
+#: public/js/payment/payments.js:30
+#: selling/page/point_of_sale/pos_controller.js:119
+#: templates/pages/task_info.html:101 www/book_appointment/index.html:59
 msgid "Submit"
 msgstr "Validar"
 
-#: buying/doctype/purchase_order/purchase_order.py:857
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:698
+#: buying/doctype/purchase_order/purchase_order.py:860
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:699
 msgid "Submit Action Failed"
 msgstr ""
 
@@ -68381,14 +69588,18 @@
 msgid "Submit Journal Entries"
 msgstr "Enviar entradas de diario"
 
-#: manufacturing/doctype/work_order/work_order.js:135
+#: manufacturing/doctype/work_order/work_order.js:139
 msgid "Submit this Work Order for further processing."
 msgstr "Presente esta Órden de Trabajo para su posterior procesamiento."
 
-#: assets/doctype/asset/asset_list.js:32
+#: buying/doctype/request_for_quotation/request_for_quotation.py:265
+msgid "Submit your Quotation"
+msgstr ""
+
+#: assets/doctype/asset/asset_list.js:23
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:15
-#: stock/doctype/stock_entry/stock_entry_list.js:21
-#: templates/pages/material_request_info.html:24 templates/pages/order.html:58
+#: stock/doctype/stock_entry/stock_entry_list.js:27
+#: templates/pages/material_request_info.html:24 templates/pages/order.html:70
 msgid "Submitted"
 msgstr "Validado"
 
@@ -68652,11 +69863,11 @@
 msgid "Succeeded"
 msgstr ""
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:6
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:7
 msgid "Succeeded Entries"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Success"
 msgstr "Éxito"
 
@@ -68691,11 +69902,11 @@
 msgid "Successful"
 msgstr "Exitoso"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:538
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:543
 msgid "Successfully Reconciled"
 msgstr "Reconciliado exitosamente"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:164
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:171
 msgid "Successfully Set Supplier"
 msgstr "Proveedor establecido con éxito"
 
@@ -68703,31 +69914,31 @@
 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:468
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:430
 msgid "Successfully imported {0}"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:182
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:161
 msgid "Successfully imported {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:166
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:145
 msgid "Successfully imported {0} record."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:178
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:157
 msgid "Successfully imported {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:165
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:144
 msgid "Successfully imported {0} records."
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:177
+#: buying/doctype/supplier/supplier.js:210
 msgid "Successfully linked to Customer"
 msgstr ""
 
-#: selling/doctype/customer/customer.js:222
+#: selling/doctype/customer/customer.js:243
 msgid "Successfully linked to Supplier"
 msgstr ""
 
@@ -68735,23 +69946,23 @@
 msgid "Successfully merged {0} out of {1}."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:478
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:438
 msgid "Successfully updated {0}"
 msgstr "Actualizado exitosamente {0}"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:193
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:172
 msgid "Successfully updated {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:171
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:150
 msgid "Successfully updated {0} record."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:189
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:168
 msgid "Successfully updated {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:170
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:149
 msgid "Successfully updated {0} records."
 msgstr ""
 
@@ -68881,30 +70092,30 @@
 
 #. Name of a DocType
 #. Label of a Card Break in the Buying Workspace
-#: accounts/doctype/payment_order/payment_order.js:100
+#: accounts/doctype/payment_order/payment_order.js:110
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:61
 #: 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/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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:38
-#: buying/doctype/request_for_quotation/request_for_quotation.js:156
-#: buying/doctype/request_for_quotation/request_for_quotation.js:208
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:167
+#: 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/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:16
+#: 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:16
+#: 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/workspace/buying/buying.json public/js/purchase_trends_filters.js:50
-#: public/js/purchase_trends_filters.js:66
+#: public/js/purchase_trends_filters.js:63
 #: regional/report/irs_1099/irs_1099.py:79
-#: selling/doctype/customer/customer.js:207
-#: selling/doctype/sales_order/sales_order.js:1005
+#: 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
 msgid "Supplier"
 msgstr "Proveedor"
@@ -69210,15 +70421,15 @@
 msgstr "Detalles del proveedor"
 
 #. Name of a DocType
-#: accounts/report/accounts_payable/accounts_payable.js:122
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:105
-#: accounts/report/accounts_receivable/accounts_receivable.py:1110
+#: 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/purchase_register/purchase_register.js:27
 #: accounts/report/purchase_register/purchase_register.py:186
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:56
-#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: 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
@@ -69298,9 +70509,9 @@
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Factura de Proveedor"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:216
 msgid "Supplier Invoice Date"
 msgstr "Fecha de factura de proveedor"
 
@@ -69310,13 +70521,14 @@
 msgid "Supplier Invoice Date"
 msgstr "Fecha de factura de proveedor"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1550
 msgid "Supplier Invoice Date cannot be greater than Posting Date"
 msgstr "Fecha de Factura de Proveedor no puede ser mayor que la fecha de publicación"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
-#: accounts/report/general_ledger/general_ledger.py:656
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: 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
 msgid "Supplier Invoice No"
 msgstr "Factura de proveedor No."
 
@@ -69332,7 +70544,7 @@
 msgid "Supplier Invoice No"
 msgstr "Factura de proveedor No."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1575
 msgid "Supplier Invoice No exists in Purchase Invoice {0}"
 msgstr "Factura de proveedor No existe en la factura de compra {0}"
 
@@ -69360,14 +70572,14 @@
 #: accounts/workspace/financial_reports/financial_reports.json
 #: accounts/workspace/payables/payables.json
 msgid "Supplier Ledger Summary"
-msgstr "Resumen del libro mayor de proveedores"
+msgstr "Resumen del Libro Mayor de Proveedores"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1041
+#: accounts/report/accounts_receivable/accounts_receivable.py:1049
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
 #: 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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:74
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:73
 msgid "Supplier Name"
 msgstr "Nombre de proveedor"
 
@@ -69497,14 +70709,14 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:458
-#: buying/doctype/request_for_quotation/request_for_quotation.js:42
+#: buying/doctype/purchase_order/purchase_order.js:529
+#: 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
-#: crm/doctype/opportunity/opportunity.js:82
-#: stock/doctype/material_request/material_request.js:147
+#: crm/doctype/opportunity/opportunity.js:81
+#: stock/doctype/material_request/material_request.js:170
 msgid "Supplier Quotation"
 msgstr "Presupuesto de Proveedor"
 
@@ -69556,7 +70768,7 @@
 msgid "Supplier Quotation Item"
 msgstr "Ítem de Presupuesto de Proveedor"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:409
+#: buying/doctype/request_for_quotation/request_for_quotation.py:433
 msgid "Supplier Quotation {0} Created"
 msgstr "Cotización de proveedor {0} creada"
 
@@ -69684,6 +70896,11 @@
 msgid "Supplier delivers to Customer"
 msgstr "Proveedor entrega al Cliente"
 
+#. Description of a DocType
+#: buying/doctype/supplier/supplier.json
+msgid "Supplier of Goods or Services."
+msgstr ""
+
 #: buying/doctype/supplier_quotation/supplier_quotation.py:167
 msgid "Supplier {0} not found in {1}"
 msgstr "Proveedor {0} no encontrado en {1}"
@@ -69774,7 +70991,7 @@
 msgid "Suspended"
 msgstr "Suspendido"
 
-#: selling/page/point_of_sale/pos_payment.js:308
+#: selling/page/point_of_sale/pos_payment.js:325
 msgid "Switch Between Payment Modes"
 msgstr "Cambiar entre modos de pago"
 
@@ -69870,6 +71087,7 @@
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 #: manufacturing/doctype/job_card/job_card.json
+#: manufacturing/doctype/plant_floor/plant_floor.json
 #: projects/doctype/activity_type/activity_type.json
 #: projects/doctype/project_template/project_template.json
 #: projects/doctype/project_type/project_type.json
@@ -69957,7 +71175,7 @@
 msgid "System will fetch all the entries if limit value is zero."
 msgstr "El sistema buscará todas las entradas si el valor límite es cero."
 
-#: controllers/accounts_controller.py:1673
+#: controllers/accounts_controller.py:1762
 msgid "System will not check over billing since amount for Item {0} in {1} is zero"
 msgstr ""
 
@@ -69968,11 +71186,19 @@
 msgid "System will notify to increase or decrease quantity or amount "
 msgstr "El sistema notificará para aumentar o disminuir la cantidad o cantidad"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TCS Amount"
+msgstr ""
+
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TCS Rate %"
 msgstr ""
 
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TDS Amount"
+msgstr ""
+
 #. Name of a report
 #: accounts/report/tds_computation_summary/tds_computation_summary.json
 msgid "TDS Computation Summary"
@@ -69982,7 +71208,7 @@
 msgid "TDS Payable"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TDS Rate %"
 msgstr ""
@@ -69993,7 +71219,12 @@
 msgid "TS-.YYYY.-"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:427
+#. Description of a DocType
+#: stock/doctype/item_website_specification/item_website_specification.json
+msgid "Table for Item that will be shown in Web Site"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:466
 msgid "Tag"
 msgstr "Etiqueta"
 
@@ -70035,10 +71266,14 @@
 msgid "Tally Migration"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:32
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:34
 msgid "Tally Migration Error"
 msgstr "Error de migración de Tally"
 
+#: templates/form_grid/stock_entry_grid.html:36
+msgid "Target"
+msgstr "Objetivo"
+
 #. Label of a Data field in DocType 'Quality Goal Objective'
 #: quality_management/doctype/quality_goal_objective/quality_goal_objective.json
 msgctxt "Quality Goal Objective"
@@ -70073,23 +71308,23 @@
 msgid "Target Asset Location"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:248
+#: assets/doctype/asset_capitalization/asset_capitalization.py:254
 msgid "Target Asset {0} cannot be cancelled"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:246
+#: assets/doctype/asset_capitalization/asset_capitalization.py:252
 msgid "Target Asset {0} cannot be submitted"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:242
+#: assets/doctype/asset_capitalization/asset_capitalization.py:248
 msgid "Target Asset {0} cannot be {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:252
+#: assets/doctype/asset_capitalization/asset_capitalization.py:258
 msgid "Target Asset {0} does not belong to company {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:233
+#: assets/doctype/asset_capitalization/asset_capitalization.py:239
 msgid "Target Asset {0} needs to be composite asset"
 msgstr ""
 
@@ -70169,15 +71404,15 @@
 msgid "Target Item Name"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:203
+#: assets/doctype/asset_capitalization/asset_capitalization.py:209
 msgid "Target Item {0} is neither a Fixed Asset nor a Stock Item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:207
+#: assets/doctype/asset_capitalization/asset_capitalization.py:213
 msgid "Target Item {0} must be a Fixed Asset item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:209
+#: assets/doctype/asset_capitalization/asset_capitalization.py:215
 msgid "Target Item {0} must be a Stock Item"
 msgstr ""
 
@@ -70199,9 +71434,9 @@
 msgid "Target Location or To Employee is required while receiving Asset {0}"
 msgstr "Se requiere la ubicación de destino o al empleado mientras recibe el activo {0}"
 
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:42
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:42
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:42
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:41
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:41
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:41
 msgid "Target On"
 msgstr "Objetivo en"
 
@@ -70217,7 +71452,7 @@
 msgid "Target Qty"
 msgstr "Cantidad estimada"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:214
+#: assets/doctype/asset_capitalization/asset_capitalization.py:220
 msgid "Target Qty must be a positive number"
 msgstr ""
 
@@ -70227,58 +71462,58 @@
 msgid "Target Serial No"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:222
-#: stock/doctype/stock_entry/stock_entry.js:549
+#: stock/dashboard/item_dashboard.js:230
+#: stock/doctype/stock_entry/stock_entry.js:633
 msgid "Target Warehouse"
-msgstr "Inventario estimado"
+msgstr "Almacén de destino"
 
 #. Label of a Link field in DocType 'Asset Capitalization'
 #: assets/doctype/asset_capitalization/asset_capitalization.json
 msgctxt "Asset Capitalization"
 msgid "Target Warehouse"
-msgstr "Inventario estimado"
+msgstr "Almacén de destino"
 
 #. Label of a Link field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
 msgctxt "Delivery Note Item"
 msgid "Target Warehouse"
-msgstr "Inventario estimado"
+msgstr "Almacén de destino"
 
 #. Label of a Link field in DocType 'Material Request Item'
 #: stock/doctype/material_request_item/material_request_item.json
 msgctxt "Material Request Item"
 msgid "Target Warehouse"
-msgstr "Inventario estimado"
+msgstr "Almacén de destino"
 
 #. Label of a Link field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgctxt "Production Plan Sub Assembly Item"
 msgid "Target Warehouse"
-msgstr "Inventario estimado"
+msgstr "Almacén de destino"
 
 #. Label of a Link field in DocType 'Purchase Order Item'
 #: buying/doctype/purchase_order_item/purchase_order_item.json
 msgctxt "Purchase Order Item"
 msgid "Target Warehouse"
-msgstr "Inventario estimado"
+msgstr "Almacén de destino"
 
 #. Label of a Link field in DocType 'Sales Invoice Item'
 #: accounts/doctype/sales_invoice_item/sales_invoice_item.json
 msgctxt "Sales Invoice Item"
 msgid "Target Warehouse"
-msgstr "Inventario estimado"
+msgstr "Almacén de destino"
 
 #. Label of a Link field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
 msgid "Target Warehouse"
-msgstr "Inventario estimado"
+msgstr "Almacén de destino"
 
 #. Label of a Link field in DocType 'Work Order'
 #: manufacturing/doctype/work_order/work_order.json
 msgctxt "Work Order"
 msgid "Target Warehouse"
-msgstr "Inventario estimado"
+msgstr "Almacén de destino"
 
 #. Label of a Link field in DocType 'Stock Entry'
 #. Label of a Small Text field in DocType 'Stock Entry'
@@ -70287,16 +71522,16 @@
 msgid "Target Warehouse Address"
 msgstr "Dirección del Almacén de Destino"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:224
+#: assets/doctype/asset_capitalization/asset_capitalization.py:230
 msgid "Target Warehouse is mandatory for Decapitalization"
 msgstr ""
 
-#: controllers/selling_controller.py:685
+#: controllers/selling_controller.py:709
 msgid "Target Warehouse is set for some items but the customer is not an internal customer."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:623
-#: stock/doctype/stock_entry/stock_entry.py:630
+#: stock/doctype/stock_entry/stock_entry.py:578
+#: stock/doctype/stock_entry/stock_entry.py:585
 msgid "Target warehouse is mandatory for row {0}"
 msgstr "El almacén de destino es obligatorio para la línea {0}"
 
@@ -70328,8 +71563,8 @@
 #: projects/doctype/task/task.json projects/doctype/task/task_tree.js:17
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:33
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:90
-#: public/js/projects/timer.js:11 support/doctype/issue/issue.js:22
-#: templates/pages/projects.html:56
+#: public/js/projects/timer.js:15 support/doctype/issue/issue.js:27
+#: templates/pages/projects.html:56 templates/pages/timelog_info.html:28
 msgid "Task"
 msgstr "Tarea"
 
@@ -70437,6 +71672,12 @@
 msgid "Tasks"
 msgstr "Tareas"
 
+#. Label of a Section Break field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Tasks"
+msgstr "Tareas"
+
 #: projects/report/project_summary/project_summary.py:62
 msgid "Tasks Completed"
 msgstr "Tareas completadas"
@@ -70445,7 +71686,7 @@
 msgid "Tasks Overdue"
 msgstr "Tareas vencidas"
 
-#: accounts/report/account_balance/account_balance.js:58
+#: accounts/report/account_balance/account_balance.js:60
 msgid "Tax"
 msgstr "Impuesto"
 
@@ -70485,7 +71726,6 @@
 msgid "Tax Account"
 msgstr "Cuenta de Impuestos"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:247
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:137
 msgid "Tax Amount"
 msgstr ""
@@ -70525,55 +71765,55 @@
 #: stock/doctype/delivery_note/delivery_note.json
 msgctxt "Delivery Note"
 msgid "Tax Breakup"
-msgstr "Disolución de Impuestos"
+msgstr "Desglose de impuestos"
 
 #. Label of a Section Break field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
 msgid "Tax Breakup"
-msgstr "Disolución de Impuestos"
+msgstr "Desglose de impuestos"
 
 #. Label of a Section Break field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Tax Breakup"
-msgstr "Disolución de Impuestos"
+msgstr "Desglose de impuestos"
 
 #. Label of a Section Break field in DocType 'Purchase Order'
 #: buying/doctype/purchase_order/purchase_order.json
 msgctxt "Purchase Order"
 msgid "Tax Breakup"
-msgstr "Disolución de Impuestos"
+msgstr "Desglose de impuestos"
 
 #. Label of a Section Break field in DocType 'Purchase Receipt'
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 msgctxt "Purchase Receipt"
 msgid "Tax Breakup"
-msgstr "Disolución de Impuestos"
+msgstr "Desglose de impuestos"
 
 #. Label of a Section Break field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Tax Breakup"
-msgstr "Disolución de Impuestos"
+msgstr "Desglose de impuestos"
 
 #. Label of a Section Break field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "Tax Breakup"
-msgstr "Disolución de Impuestos"
+msgstr "Desglose de impuestos"
 
 #. Label of a Section Break field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
 msgid "Tax Breakup"
-msgstr "Disolución de Impuestos"
+msgstr "Desglose de impuestos"
 
 #. Label of a Section Break field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Tax Breakup"
-msgstr "Disolución de Impuestos"
+msgstr "Desglose de impuestos"
 
 #. Name of a DocType
 #: accounts/doctype/tax_category/tax_category.json
@@ -70708,11 +71948,11 @@
 msgid "Tax ID"
 msgstr "ID de impuesto"
 
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:86
+#: 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/supplier_ledger_summary/supplier_ledger_summary.js:68
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:67
 msgid "Tax Id"
 msgstr "Identificación del impuesto"
 
@@ -70747,6 +71987,8 @@
 msgstr "Identificación del impuesto"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:32
+#: accounts/report/accounts_receivable/accounts_receivable.html:19
+#: accounts/report/general_ledger/general_ledger.html:14
 msgid "Tax Id: "
 msgstr "Identificación del impuesto:"
 
@@ -70755,7 +71997,7 @@
 msgid "Tax Masters"
 msgstr "Maestros Fiscales"
 
-#: accounts/doctype/account/account_tree.js:119
+#: accounts/doctype/account/account_tree.js:160
 msgid "Tax Rate"
 msgstr "Procentaje del impuesto"
 
@@ -70969,7 +72211,7 @@
 msgid "Tax will be withheld only for amount exceeding the cumulative threshold"
 msgstr ""
 
-#: controllers/taxes_and_totals.py:1018
+#: controllers/taxes_and_totals.py:1019
 msgid "Taxable Amount"
 msgstr "Base imponible"
 
@@ -71124,55 +72366,55 @@
 msgid "Taxes and Charges Added (Company Currency)"
 msgstr "Impuestos y cargos adicionales (Divisa por defecto)"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Cálculo de impuestos y cargos"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Cálculo de impuestos y cargos"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Cálculo de impuestos y cargos"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Cálculo de impuestos y cargos"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Cálculo de impuestos y cargos"
 
-#. Label of a Long Text field in DocType 'Quotation'
+#. Label of a Text Editor field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Taxes and Charges Calculation"
 msgstr "Cálculo de impuestos y cargos"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Cálculo de impuestos y cargos"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Cálculo de impuestos y cargos"
 
-#. Label of a Long Text field in DocType 'Supplier Quotation'
+#. Label of a Markdown Editor field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Taxes and Charges Calculation"
@@ -71248,7 +72490,7 @@
 msgid "Telephony Call Type"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:12
+#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:20
 msgid "Template"
 msgstr "Plantilla"
 
@@ -71264,11 +72506,11 @@
 msgid "Template"
 msgstr "Plantilla"
 
-#: manufacturing/doctype/bom/bom.js:279
+#: manufacturing/doctype/bom/bom.js:292
 msgid "Template Item"
 msgstr "Elemento de plantilla"
 
-#: stock/get_item_details.py:219
+#: stock/get_item_details.py:224
 msgid "Template Item Selected"
 msgstr ""
 
@@ -71308,11 +72550,11 @@
 msgid "Template Warnings"
 msgstr "Advertencias de plantilla"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:38
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:29
 msgid "Temporarily on Hold"
 msgstr "Temporalmente en espera"
 
-#: accounts/report/account_balance/account_balance.js:59
+#: accounts/report/account_balance/account_balance.js:61
 msgid "Temporary"
 msgstr "Temporal"
 
@@ -71579,34 +72821,34 @@
 msgstr "Plantillas de términos y condiciones"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:145
-#: accounts/report/accounts_receivable/accounts_receivable.py:1094
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1102
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
+#: 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/inactive_sales_items/inactive_sales_items.js:9
+#: 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
-#: crm/report/lead_details/lead_details.js:47
+#: crm/report/lead_details/lead_details.js:46
 #: crm/report/lead_details/lead_details.py:34
-#: crm/report/lost_opportunity/lost_opportunity.js:37
+#: 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/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:48
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:46
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:39
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:60
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:59
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:39
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:48
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:46
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:60
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:59
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:71
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:72
 #: selling/report/territory_wise_sales/territory_wise_sales.py:22
 #: setup/doctype/territory/territory.json
 msgid "Territory"
@@ -71785,7 +73027,7 @@
 msgid "The 'From Package No.' field must neither be empty nor it's value less than 1."
 msgstr "El campo 'Desde Paquete Nro' no debe estar vacío ni su valor es menor a 1."
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:331
+#: buying/doctype/request_for_quotation/request_for_quotation.py:355
 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings."
 msgstr "El acceso a la solicitud de cotización del portal está deshabilitado. Para permitir el acceso, habilítelo en la configuración del portal."
 
@@ -71831,7 +73073,7 @@
 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:176
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:177
 msgid "The GL Entries will be processed in the background, it can take a few minutes."
 msgstr ""
 
@@ -71839,7 +73081,7 @@
 msgid "The Loyalty Program isn't valid for the selected company"
 msgstr "El Programa de Lealtad no es válido para la Empresa seleccionada"
 
-#: accounts/doctype/payment_request/payment_request.py:747
+#: accounts/doctype/payment_request/payment_request.py:750
 msgid "The Payment Request {0} is already paid, cannot process payment twice"
 msgstr ""
 
@@ -71847,11 +73089,11 @@
 msgid "The Payment Term at row {0} is possibly a duplicate."
 msgstr "El Término de Pago en la fila {0} es posiblemente un duplicado."
 
-#: stock/doctype/pick_list/pick_list.py:132
+#: stock/doctype/pick_list/pick_list.py:167
 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:1761
+#: stock/doctype/stock_entry/stock_entry.py:1770
 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
 msgstr ""
 
@@ -71860,7 +73102,7 @@
 msgid "The Selling Module is all set up!"
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:17
 msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing. <br><br> When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field."
 msgstr "La entrada de existencias de tipo &#39;Fabricación&#39; se conoce como toma retroactiva. Las materias primas que se consumen para fabricar productos terminados se conocen como retrolavado.<br><br> Al crear Entrada de fabricación, los artículos de materia prima se retroalimentan según la lista de materiales del artículo de producción. Si desea que los artículos de materia prima se regulen en función de la entrada de Transferencia de material realizada contra esa Orden de trabajo, puede configurarlo en este campo."
 
@@ -71883,7 +73125,7 @@
 msgid "The accounts are set by the system automatically but do confirm these defaults"
 msgstr "El sistema configura las cuentas automáticamente, pero confirme estos valores predeterminados"
 
-#: accounts/doctype/payment_request/payment_request.py:144
+#: accounts/doctype/payment_request/payment_request.py:147
 msgid "The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document."
 msgstr "El monto de {0} establecido en esta Solicitud de Pago es diferente del monto calculado de todos los planes de pago: {1}. Asegúrese de que esto sea correcto antes de enviar el documento."
 
@@ -71891,7 +73133,7 @@
 msgid "The currency of invoice {} ({}) is different from the currency of this dunning ({})."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:812
+#: manufacturing/doctype/work_order/work_order.js:871
 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM."
 msgstr ""
 
@@ -71928,7 +73170,7 @@
 msgid "The following Items, having Putaway Rules, could not be accomodated:"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:414
+#: assets/doctype/asset/depreciation.py:412
 msgid "The following assets have failed to automatically post depreciation entries: {0}"
 msgstr ""
 
@@ -71940,7 +73182,7 @@
 msgid "The following employees are currently still reporting to {0}:"
 msgstr "Los siguientes empleados todavía están reportando a {0}:"
 
-#: stock/doctype/material_request/material_request.py:773
+#: stock/doctype/material_request/material_request.py:785
 msgid "The following {0} were created: {1}"
 msgstr "Se crearon los siguientes {0}: {1}"
 
@@ -71986,7 +73228,7 @@
 msgid "The parent account {0} does not exists in the uploaded template"
 msgstr "La cuenta principal {0} no existe en la plantilla cargada"
 
-#: accounts/doctype/payment_request/payment_request.py:133
+#: accounts/doctype/payment_request/payment_request.py:136
 msgid "The payment gateway account in plan {0} is different from the payment gateway account in this payment request"
 msgstr "La cuenta de puerta de enlace de pago en el plan {0} es diferente de la cuenta de puerta de enlace de pago en esta solicitud de pago"
 
@@ -72011,15 +73253,15 @@
 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:742
+#: public/js/utils.js:814
 msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.js:116
+#: stock/doctype/pick_list/pick_list.js:137
 msgid "The reserved stock will be released. Are you certain you wish to proceed?"
 msgstr ""
 
-#: accounts/doctype/account/account.py:198
+#: accounts/doctype/account/account.py:217
 msgid "The root account {0} must be a group"
 msgstr "La cuenta raíz {0} debe ser un grupo."
 
@@ -72035,7 +73277,7 @@
 msgid "The selected item cannot have Batch"
 msgstr "El producto seleccionado no puede contener lotes"
 
-#: assets/doctype/asset/asset.js:570
+#: assets/doctype/asset/asset.js:643
 msgid "The selected {0} does not contain the selected Asset Item."
 msgstr ""
 
@@ -72059,7 +73301,7 @@
 msgid "The shares don't exist with the {0}"
 msgstr "Las acciones no existen con el {0}"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:461
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:515
 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 ""
 
@@ -72067,24 +73309,16 @@
 msgid "The sync has started in the background, please check the {0} list for new records."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:155
 #: accounts/doctype/journal_entry/journal_entry.py:162
+#: accounts/doctype/journal_entry/journal_entry.py:169
 msgid "The task has been enqueued as a background job."
 msgstr "La tarea se ha puesto en cola como trabajo en segundo plano."
 
-#: stock/doctype/stock_entry/stock_entry.py:244
-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 Entry and revert to the Draft stage"
-msgstr ""
-
-#: stock/doctype/stock_entry/stock_entry.py:255
-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 Entry and revert to the Submitted stage"
-msgstr ""
-
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:754
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:808
 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 "La tarea se ha puesto en cola como un trabajo en segundo plano. En caso de que haya algún problema con el procesamiento en segundo plano, el sistema agregará un comentario sobre el error en esta Reconciliación de inventario y volverá a la etapa Borrador"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:765
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:819
 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 ""
 
@@ -72111,31 +73345,31 @@
 msgid "The value {0} is already assigned to an existing Item {1}."
 msgstr "El valor {0} ya está asignado a un artículo existente {1}."
 
-#: manufacturing/doctype/work_order/work_order.js:832
+#: manufacturing/doctype/work_order/work_order.js:899
 msgid "The warehouse where you store finished Items before they are shipped."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:827
+#: manufacturing/doctype/work_order/work_order.js:892
 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:837
+#: manufacturing/doctype/work_order/work_order.js:904
 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:671
+#: manufacturing/doctype/job_card/job_card.py:678
 msgid "The {0} ({1}) must be equal to {2} ({3})"
 msgstr "El {0} ({1}) debe ser igual a {2} ({3})"
 
-#: stock/doctype/material_request/material_request.py:779
+#: stock/doctype/material_request/material_request.py:791
 msgid "The {0} {1} created successfully"
 msgstr "El {0} {1} creado exitosamente"
 
-#: manufacturing/doctype/job_card/job_card.py:762
+#: manufacturing/doctype/job_card/job_card.py:769
 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:501
+#: assets/doctype/asset/asset.py:503
 msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
 msgstr "Hay mantenimiento activo o reparaciones contra el activo. Debes completarlos todos antes de cancelar el activo."
 
@@ -72143,19 +73377,27 @@
 msgid "There are inconsistencies between the rate, no of shares and the amount calculated"
 msgstr "Hay inconsistencias entre la tasa, numero de acciones y la cantidad calculada"
 
-#: utilities/bulk_transaction.py:41
+#: accounts/doctype/account/account.py:202
+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
 msgid "There are no Failed transactions"
 msgstr ""
 
-#: www/book_appointment/index.js:89
+#: setup/demo.py:108
+msgid "There are no active Fiscal Years for which Demo Data can be generated."
+msgstr ""
+
+#: www/book_appointment/index.js:95
 msgid "There are no slots available on this date"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:245
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:273
 msgid "There are only {0} asset created or linked to {1}. Please create or link {2} Assets with respective document."
 msgstr ""
 
-#: stock/doctype/item/item.js:829
+#: stock/doctype/item/item.js:913
 msgid "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit <a href='https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/item-valuation-fifo-and-moving-average' target='_blank'>Item Valuation, FIFO and Moving Average.</a>"
 msgstr ""
 
@@ -72163,6 +73405,10 @@
 msgid "There aren't any item variants for the selected item"
 msgstr ""
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:10
+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
 msgid "There can only be 1 Account per Company in {0} {1}"
 msgstr "Sólo puede existir una (1) cuenta por compañía en {0} {1}"
@@ -72187,36 +73433,36 @@
 msgid "There is nothing to edit."
 msgstr "No hay nada que modificar."
 
-#: stock/doctype/stock_entry/stock_entry.py:1279
+#: stock/doctype/stock_entry/stock_entry.py:1288
 msgid "There must be atleast 1 Finished Good in this Stock Entry"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:135
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:151
 msgid "There was an error creating Bank Account while linking with Plaid."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:205
+#: selling/page/point_of_sale/pos_controller.js:228
 msgid "There was an error saving the document."
 msgstr "Hubo un error al guardar el documento."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:236
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:252
 msgid "There was an error syncing transactions."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:157
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:173
 msgid "There was an error updating Bank Account {} while linking with Plaid."
 msgstr ""
 
-#: accounts/doctype/bank/bank.js:113
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:109
+#: accounts/doctype/bank/bank.js:115
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:114
 msgid "There was an issue connecting to Plaid's authentication server. Check browser console for more information"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:279
+#: selling/page/point_of_sale/pos_past_order_summary.js:289
 msgid "There were errors while sending email. Please try again."
 msgstr "Ha ocurrido un error al enviar el correo electrónico. Por favor, inténtelo de nuevo."
 
-#: accounts/utils.py:924
+#: accounts/utils.py:933
 msgid "There were issues unlinking payment entry {0}."
 msgstr ""
 
@@ -72227,11 +73473,11 @@
 msgid "This Account has '0' balance in either Base Currency or Account Currency"
 msgstr ""
 
-#: stock/doctype/item/item.js:88
+#: stock/doctype/item/item.js:99
 msgid "This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set"
 msgstr "Este producto es una plantilla y no se puede utilizar en las transacciones. Los atributos del producto se copiarán sobre las variantes, a menos que la opción 'No copiar' este seleccionada"
 
-#: stock/doctype/item/item.js:118
+#: stock/doctype/item/item.js:158
 msgid "This Item is a Variant of {0} (Template)."
 msgstr "Este elemento es una variante de {0} (plantilla)."
 
@@ -72239,11 +73485,11 @@
 msgid "This Month's Summary"
 msgstr "Resumen de este mes"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:26
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
 msgid "This Warehouse will be auto-updated in the Target Warehouse field of Work Order."
 msgstr "Este almacén se actualizará automáticamente en el campo Almacén de destino de la orden de trabajo."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:21
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:24
 msgid "This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Orders."
 msgstr "Este almacén se actualizará automáticamente en el campo Almacén de trabajo en curso de Órdenes de trabajo."
 
@@ -72267,7 +73513,7 @@
 msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
 msgstr "Este documento está por encima del límite de {0} {1} para el elemento {4}. ¿Estás haciendo otra {3} contra el mismo {2}?"
 
-#: stock/doctype/delivery_note/delivery_note.js:360
+#: stock/doctype/delivery_note/delivery_note.js:406
 msgid "This field is used to set the 'Customer'."
 msgstr ""
 
@@ -72278,7 +73524,7 @@
 msgid "This filter will be applied to Journal Entry."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:158
+#: manufacturing/doctype/bom/bom.js:171
 msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
 msgstr ""
 
@@ -72307,7 +73553,7 @@
 msgid "This is a location where scraped materials are stored."
 msgstr "Esta es una ubicación donde se almacenan los materiales raspados."
 
-#: accounts/doctype/account/account.js:40
+#: accounts/doctype/account/account.js:36
 msgid "This is a root account and cannot be edited."
 msgstr "Esta es una cuenta raíz y no se puede editar."
 
@@ -72319,11 +73565,11 @@
 msgid "This is a root department and cannot be edited."
 msgstr "Este es un departamento raíz y no se puede editar."
 
-#: setup/doctype/item_group/item_group.js:81
+#: setup/doctype/item_group/item_group.js:98
 msgid "This is a root item group and cannot be edited."
 msgstr "Este es un grupo principal y no se puede editar."
 
-#: setup/doctype/sales_person/sales_person.js:36
+#: setup/doctype/sales_person/sales_person.js:46
 msgid "This is a root sales person and cannot be edited."
 msgstr "Este es el vendedor principal y no se puede editar."
 
@@ -72355,19 +73601,19 @@
 msgid "This is based on transactions against this Supplier. See timeline below for details"
 msgstr "Esto se basa en transacciones con este proveedor. Ver cronología abajo para más detalles"
 
-#: stock/doctype/stock_settings/stock_settings.js:24
+#: stock/doctype/stock_settings/stock_settings.js:26
 msgid "This is considered dangerous from accounting point of view."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:529
 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
 msgstr "Esto se hace para manejar la contabilidad de los casos en los que el recibo de compra se crea después de la factura de compra."
 
-#: manufacturing/doctype/work_order/work_order.js:822
+#: manufacturing/doctype/work_order/work_order.js:885
 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox."
 msgstr ""
 
-#: stock/doctype/item/item.js:819
+#: stock/doctype/item/item.js:901
 msgid "This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked."
 msgstr ""
 
@@ -72375,7 +73621,7 @@
 msgid "This item filter has already been applied for the {0}"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.js:371
+#: stock/doctype/delivery_note/delivery_note.js:419
 msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
 msgstr ""
 
@@ -72383,7 +73629,7 @@
 msgid "This schedule was created when Asset {0} was adjusted through Asset Value Adjustment {1}."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:516
+#: assets/doctype/asset_capitalization/asset_capitalization.py:522
 msgid "This schedule was created when Asset {0} was consumed through Asset Capitalization {1}."
 msgstr ""
 
@@ -72391,27 +73637,27 @@
 msgid "This schedule was created when Asset {0} was repaired through Asset Repair {1}."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:674
+#: assets/doctype/asset_capitalization/asset_capitalization.py:680
 msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:496
+#: assets/doctype/asset/depreciation.py:494
 msgid "This schedule was created when Asset {0} was restored."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1325
+#: accounts/doctype/sales_invoice/sales_invoice.py:1336
 msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:454
+#: assets/doctype/asset/depreciation.py:452
 msgid "This schedule was created when Asset {0} was scrapped."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1336
+#: accounts/doctype/sales_invoice/sales_invoice.py:1347
 msgid "This schedule was created when Asset {0} was sold through Sales Invoice {1}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1117
+#: assets/doctype/asset/asset.py:1121
 msgid "This schedule was created when Asset {0} was updated after being split into new Asset {1}."
 msgstr ""
 
@@ -72427,7 +73673,7 @@
 msgid "This schedule was created when Asset {0}'s shifts were adjusted through Asset Shift Allocation {1}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1180
+#: assets/doctype/asset/asset.py:1184
 msgid "This schedule was created when new Asset {0} was split from Asset {1}."
 msgstr ""
 
@@ -72438,10 +73684,15 @@
 msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
 msgstr "Esta sección permite al usuario configurar el cuerpo y el texto de cierre de la carta de reclamación para el tipo de reclamación según el idioma, que se puede utilizar en impresión."
 
-#: stock/doctype/delivery_note/delivery_note.js:365
+#: stock/doctype/delivery_note/delivery_note.js:412
 msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses."
+msgstr ""
+
 #. Description of the 'Abbreviation' (Data) field in DocType 'Item Attribute
 #. Value'
 #: stock/doctype/item_attribute_value/item_attribute_value.json
@@ -72456,7 +73707,7 @@
 msgid "This will restrict user access to other employee records"
 msgstr "Esto restringirá el acceso del usuario a otros registros de empleados"
 
-#: controllers/selling_controller.py:686
+#: controllers/selling_controller.py:710
 msgid "This {} will be treated as material transfer."
 msgstr ""
 
@@ -72682,7 +73933,7 @@
 msgid "Time in mins."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:654
+#: manufacturing/doctype/job_card/job_card.py:661
 msgid "Time logs are required for {0} {1}"
 msgstr "Se requieren registros de tiempo para {0} {1}"
 
@@ -72700,11 +73951,12 @@
 msgid "Timeline"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:31
 #: public/js/projects/timer.js:5
 msgid "Timer"
 msgstr "Temporizador"
 
-#: public/js/projects/timer.js:142
+#: public/js/projects/timer.js:149
 msgid "Timer exceeded the given hours."
 msgstr "El Temporizador excedió las horas dadas."
 
@@ -72746,11 +73998,11 @@
 msgid "Timesheet for tasks."
 msgstr "Tabla de Tiempo para las tareas."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:756
+#: accounts/doctype/sales_invoice/sales_invoice.py:773
 msgid "Timesheet {0} is already completed or cancelled"
 msgstr "Table de Tiempo {0} ya se haya completado o cancelado"
 
-#: projects/doctype/timesheet/timesheet.py:520 templates/pages/projects.html:59
+#: projects/doctype/timesheet/timesheet.py:530 templates/pages/projects.html:59
 msgid "Timesheets"
 msgstr "Tabla de Tiempos"
 
@@ -72949,7 +74201,7 @@
 msgid "Title"
 msgstr "Nombre"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:967
+#: accounts/doctype/sales_invoice/sales_invoice.js:1043
 #: templates/pages/projects.html:68
 msgid "To"
 msgstr "A"
@@ -72972,15 +74224,15 @@
 msgid "To"
 msgstr "A"
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "To Be Paid"
 msgstr "A pagar"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:36
-#: selling/doctype/sales_order/sales_order_list.js:39
-#: stock/doctype/delivery_note/delivery_note_list.js:12
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:12
+#: buying/doctype/purchase_order/purchase_order_list.js:37
+#: selling/doctype/sales_order/sales_order_list.js:50
+#: selling/doctype/sales_order/sales_order_list.js:52
+#: stock/doctype/delivery_note/delivery_note_list.js:22
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:21
 msgid "To Bill"
 msgstr "Por facturar"
 
@@ -73021,13 +74273,13 @@
 msgid "To Currency"
 msgstr "A moneda"
 
-#: accounts/doctype/payment_entry/payment_entry.js:648
-#: accounts/doctype/payment_entry/payment_entry.js:652
+#: accounts/doctype/payment_entry/payment_entry.js:794
+#: accounts/doctype/payment_entry/payment_entry.js:798
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:23
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:23
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:15
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:24
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:45
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:23
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:44
 #: accounts/report/financial_ratios/financial_ratios.js:48
 #: accounts/report/general_ledger/general_ledger.js:30
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -73035,76 +74287,76 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:15
 #: 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:25
+#: accounts/report/pos_register/pos_register.js:24
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:15
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:24
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:55
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:55
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:23
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:54
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:54
 #: accounts/report/trial_balance/trial_balance.js:43
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:43
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:22
-#: buying/report/procurement_tracker/procurement_tracker.js:34
-#: buying/report/purchase_analytics/purchase_analytics.js:43
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:26
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:26
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:23
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:30
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:30
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:21
+#: buying/report/procurement_tracker/procurement_tracker.js:33
+#: buying/report/purchase_analytics/purchase_analytics.js:42
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:25
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:25
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:22
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:29
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:29
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:24
 #: crm/report/campaign_efficiency/campaign_efficiency.js:13
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:16
-#: crm/report/lead_conversion_time/lead_conversion_time.js:16
-#: crm/report/lead_details/lead_details.js:24
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:15
+#: crm/report/lead_conversion_time/lead_conversion_time.js:15
+#: crm/report/lead_details/lead_details.js:23
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:13
-#: crm/report/lost_opportunity/lost_opportunity.js:24
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:29
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:21
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:22
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:15
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:24
-#: manufacturing/report/process_loss_report/process_loss_report.js:37
-#: manufacturing/report/production_analytics/production_analytics.js:24
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:15
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:24
+#: crm/report/lost_opportunity/lost_opportunity.js:23
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:27
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:20
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:23
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:16
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:36
+#: manufacturing/report/production_analytics/production_analytics.js:23
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:14
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:23
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:14
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:14
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:37
-#: public/js/stock_analytics.js:48
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:16
-#: regional/report/uae_vat_201/uae_vat_201.js:24
-#: regional/report/vat_audit_report/vat_audit_report.js:25
-#: selling/page/sales_funnel/sales_funnel.js:40
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:13
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:34
+#: public/js/stock_analytics.js:75
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:15
+#: regional/report/uae_vat_201/uae_vat_201.js:23
+#: regional/report/vat_audit_report/vat_audit_report.js:24
+#: selling/page/sales_funnel/sales_funnel.js:44
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:31
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:26
-#: selling/report/sales_analytics/sales_analytics.js:43
-#: selling/report/sales_order_analysis/sales_order_analysis.js:26
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:29
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:28
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:29
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:25
+#: selling/report/sales_analytics/sales_analytics.js:50
+#: selling/report/sales_order_analysis/sales_order_analysis.js:25
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:27
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:27
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:27
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:27
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:16
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:24
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:24
-#: stock/report/delayed_item_report/delayed_item_report.js:24
-#: stock/report/delayed_order_report/delayed_order_report.js:24
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:28
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:22
+#: stock/report/delayed_item_report/delayed_item_report.js:23
+#: stock/report/delayed_order_report/delayed_order_report.js:23
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:27
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:14
-#: stock/report/reserved_stock/reserved_stock.js:26
+#: stock/report/reserved_stock/reserved_stock.js:23
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:22
-#: stock/report/stock_analytics/stock_analytics.js:70
+#: stock/report/stock_analytics/stock_analytics.js:69
 #: stock/report/stock_balance/stock_balance.js:24
 #: stock/report/stock_ledger/stock_ledger.js:23
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:22
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:17
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:16
-#: support/report/issue_analytics/issue_analytics.js:32
-#: support/report/issue_summary/issue_summary.js:32
-#: support/report/support_hour_distribution/support_hour_distribution.js:15
-#: utilities/report/youtube_interactions/youtube_interactions.js:15
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:16
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:15
+#: support/report/issue_analytics/issue_analytics.js:31
+#: support/report/issue_summary/issue_summary.js:31
+#: support/report/support_hour_distribution/support_hour_distribution.js:14
+#: utilities/report/youtube_interactions/youtube_interactions.js:14
 msgid "To Date"
 msgstr "Hasta la fecha"
 
@@ -73210,7 +74462,7 @@
 msgid "To Date"
 msgstr "Hasta la fecha"
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 #: setup/doctype/holiday_list/holiday_list.py:115
 msgid "To Date cannot be before From Date"
 msgstr "La fecha no puede ser anterior a la fecha actual"
@@ -73239,8 +74491,8 @@
 msgid "To Datetime"
 msgstr "Para fecha y hora"
 
-#: selling/doctype/sales_order/sales_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:30
+#: selling/doctype/sales_order/sales_order_list.js:32
+#: selling/doctype/sales_order/sales_order_list.js:42
 msgid "To Deliver"
 msgstr "Para entregar"
 
@@ -73257,7 +74509,7 @@
 msgid "To Deliver"
 msgstr "Para entregar"
 
-#: selling/doctype/sales_order/sales_order_list.js:26
+#: selling/doctype/sales_order/sales_order_list.js:36
 msgid "To Deliver and Bill"
 msgstr "Para entregar y facturar"
 
@@ -73286,7 +74538,7 @@
 msgid "To Doctype"
 msgstr ""
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:85
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:83
 msgid "To Due Date"
 msgstr ""
 
@@ -73296,7 +74548,7 @@
 msgid "To Employee"
 msgstr "Para el Empleado"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:53
+#: accounts/report/budget_variance_report/budget_variance_report.js:51
 msgid "To Fiscal Year"
 msgstr "Al año fiscal"
 
@@ -73336,8 +74588,8 @@
 msgid "To Package No."
 msgstr "Al paquete No."
 
-#: buying/doctype/purchase_order/purchase_order_list.js:12
-#: selling/doctype/sales_order/sales_order_list.js:14
+#: buying/doctype/purchase_order/purchase_order_list.js:21
+#: selling/doctype/sales_order/sales_order_list.js:25
 msgid "To Pay"
 msgstr "A Pagar"
 
@@ -73359,8 +74611,8 @@
 msgid "To Payment Date"
 msgstr ""
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:44
-#: manufacturing/report/work_order_summary/work_order_summary.js:30
+#: manufacturing/report/job_card_summary/job_card_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:29
 msgid "To Posting Date"
 msgstr "Hasta la fecha de publicación"
 
@@ -73376,7 +74628,7 @@
 msgid "To Range"
 msgstr "A rango"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:18
+#: buying/doctype/purchase_order/purchase_order_list.js:30
 msgid "To Receive"
 msgstr "Recibir"
 
@@ -73386,7 +74638,7 @@
 msgid "To Receive"
 msgstr "Recibir"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: buying/doctype/purchase_order/purchase_order_list.js:25
 msgid "To Receive and Bill"
 msgstr "Para recibir y pagar"
 
@@ -73422,6 +74674,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:92
 #: manufacturing/report/job_card_summary/job_card_summary.py:180
+#: templates/pages/timelog_info.html:34
 msgid "To Time"
 msgstr "Hasta hora"
 
@@ -73503,7 +74756,8 @@
 msgid "To Value"
 msgstr "Para el valor"
 
-#: stock/doctype/batch/batch.js:83
+#: manufacturing/doctype/plant_floor/plant_floor.js:196
+#: stock/doctype/batch/batch.js:93
 msgid "To Warehouse"
 msgstr "Para Almacén"
 
@@ -73513,11 +74767,11 @@
 msgid "To Warehouse (Optional)"
 msgstr "Para almacenes (Opcional)"
 
-#: manufacturing/doctype/bom/bom.js:735
+#: manufacturing/doctype/bom/bom.js:768
 msgid "To add Operations tick the 'With Operations' checkbox."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:550
+#: manufacturing/doctype/production_plan/production_plan.js:598
 msgid "To add subcontracted Item's raw materials if include exploded items is disabled."
 msgstr ""
 
@@ -73542,11 +74796,11 @@
 msgid "To be Delivered to Customer"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:521
+#: accounts/doctype/sales_invoice/sales_invoice.py:534
 msgid "To cancel a {} you need to cancel the POS Closing Entry {}."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:99
+#: accounts/doctype/payment_request/payment_request.py:100
 msgid "To create a Payment Request reference document is required"
 msgstr "Para crear una Solicitud de Pago se requiere el documento de referencia"
 
@@ -73558,12 +74812,12 @@
 msgid "To enable Capital Work in Progress Accounting,"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:545
+#: manufacturing/doctype/production_plan/production_plan.js:591
 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:1625
-#: controllers/accounts_controller.py:2559
+#: accounts/doctype/payment_entry/payment_entry.py:1644
+#: controllers/accounts_controller.py:2644
 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
 msgstr "Para incluir el impuesto en la línea {0} los impuestos de las lineas {1} tambien deben ser incluidos"
 
@@ -73571,7 +74825,7 @@
 msgid "To merge, following properties must be same for both items"
 msgstr "Para fusionar, la siguientes propiedades deben ser las mismas en ambos productos"
 
-#: accounts/doctype/account/account.py:498
+#: accounts/doctype/account/account.py:517
 msgid "To overrule this, enable '{0}' in company {1}"
 msgstr "Para anular esto, habilite &quot;{0}&quot; en la empresa {1}"
 
@@ -73579,11 +74833,11 @@
 msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
 msgstr "Para continuar con la edición de este valor de atributo, habilite {0} en Configuración de variantes de artículo."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:578
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:582
 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:598
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:602
 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
 msgstr ""
 
@@ -73593,12 +74847,12 @@
 msgstr ""
 
 #: accounts/report/financial_statements.py:576
-#: accounts/report/general_ledger/general_ledger.py:273
+#: accounts/report/general_ledger/general_ledger.py:286
 #: accounts/report/trial_balance/trial_balance.py:278
 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:174
+#: selling/page/point_of_sale/pos_controller.js:192
 msgid "Toggle Recent Orders"
 msgstr "Alternar pedidos recientes"
 
@@ -73608,16 +74862,20 @@
 msgid "Token Endpoint"
 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:485
-#: buying/doctype/purchase_order/purchase_order.js:541
-#: buying/doctype/request_for_quotation/request_for_quotation.js:57
-#: buying/doctype/request_for_quotation/request_for_quotation.js:143
-#: buying/doctype/request_for_quotation/request_for_quotation.js:381
-#: buying/doctype/request_for_quotation/request_for_quotation.js:387
-#: buying/doctype/supplier_quotation/supplier_quotation.js:55
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:116
+#: buying/doctype/purchase_order/purchase_order.js:560
+#: buying/doctype/purchase_order/purchase_order.js:636
+#: 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
+#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: buying/doctype/supplier_quotation/supplier_quotation.js:58
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:121
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: stock/workspace/stock/stock.json
 msgid "Tools"
@@ -73632,10 +74890,13 @@
 #: 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/general_ledger/general_ledger.py:56
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:636
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:642
 #: accounts/report/profitability_analysis/profitability_analysis.py:93
 #: accounts/report/profitability_analysis/profitability_analysis.py:98
 #: accounts/report/trial_balance/trial_balance.py:344
@@ -73646,49 +74907,49 @@
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:51
 #: support/report/issue_analytics/issue_analytics.py:79
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Advance Taxes and Charges'
 #: accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
 msgctxt "Advance Taxes and Charges"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Delivery Note'
 #: stock/doctype/delivery_note/delivery_note.json
 msgctxt "Delivery Note"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Opportunity'
 #: crm/doctype/opportunity/opportunity.json
 msgctxt "Opportunity"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Purchase Order'
 #: buying/doctype/purchase_order/purchase_order.json
 msgctxt "Purchase Order"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Purchase Receipt'
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 msgctxt "Purchase Receipt"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Option for the 'Consider Tax or Charge for' (Select) field in DocType
 #. 'Purchase Taxes and Charges'
@@ -73696,49 +74957,49 @@
 #: accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
 msgctxt "Purchase Taxes and Charges"
 msgid "Total"
-msgstr ""
+msgstr "Monto"
 
 #. Label of a Currency field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
 msgctxt "Sales Invoice"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Sales Taxes and Charges'
 #: accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
 msgctxt "Sales Taxes and Charges"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Subcontracting Receipt'
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgctxt "Subcontracting Receipt"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. Label of a Currency field in DocType 'Advance Taxes and Charges'
 #: accounts/doctype/advance_taxes_and_charges/advance_taxes_and_charges.json
@@ -73831,6 +75092,11 @@
 msgid "Total Achieved"
 msgstr "Total Conseguido"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Active Items"
+msgstr ""
+
 #: accounts/report/budget_variance_report/budget_variance_report.py:125
 msgid "Total Actual"
 msgstr ""
@@ -73889,7 +75155,7 @@
 msgid "Total Allocations"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:233
 #: 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
@@ -73933,7 +75199,7 @@
 msgid "Total Amount in Words"
 msgstr "Importe total en letras"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:181
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:209
 msgid "Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges"
 msgstr "Total de comisiones aplicables en la compra Tabla de recibos Los artículos deben ser iguales que las tasas totales y cargos"
 
@@ -74049,7 +75315,7 @@
 msgid "Total Commission"
 msgstr "Comisión Total"
 
-#: manufacturing/doctype/job_card/job_card.py:667
+#: manufacturing/doctype/job_card/job_card.py:674
 #: manufacturing/report/job_card_summary/job_card_summary.py:174
 msgid "Total Completed Qty"
 msgstr "Cantidad total completada"
@@ -74066,11 +75332,11 @@
 msgid "Total Consumed Material Cost (via Stock Entry)"
 msgstr "Costo total del Material Consumido (a través de la Entrada de Stock)"
 
-#: setup/doctype/sales_person/sales_person.js:12
+#: setup/doctype/sales_person/sales_person.js:17
 msgid "Total Contribution Amount Against Invoices: {0}"
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person.js:9
+#: setup/doctype/sales_person/sales_person.js:10
 msgid "Total Contribution Amount Against Orders: {0}"
 msgstr ""
 
@@ -74116,7 +75382,7 @@
 msgid "Total Credit"
 msgstr "Crédito Total"
 
-#: accounts/doctype/journal_entry/journal_entry.py:225
+#: accounts/doctype/journal_entry/journal_entry.py:241
 msgid "Total Credit/ Debit Amount should be same as linked Journal Entry"
 msgstr "La cantidad total de Crédito / Débito debe ser la misma que la entrada de diario vinculada"
 
@@ -74126,7 +75392,7 @@
 msgid "Total Debit"
 msgstr "Débito Total"
 
-#: accounts/doctype/journal_entry/journal_entry.py:802
+#: accounts/doctype/journal_entry/journal_entry.py:829
 msgid "Total Debit must be equal to Total Credit. The difference is {0}"
 msgstr "El débito total debe ser igual al crédito. La diferencia es {0}"
 
@@ -74196,11 +75462,21 @@
 msgid "Total Income This Year"
 msgstr "Ingresos totales este año"
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Total Incoming Value (Receipt)"
-msgstr ""
+msgstr "Valor Total Entrante (Recepción)"
 
 #. Label of a Currency field in DocType 'Dunning'
 #: accounts/doctype/dunning/dunning.json
@@ -74209,6 +75485,7 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:196
+#: accounts/report/accounts_receivable/accounts_receivable.html:160
 msgid "Total Invoiced Amount"
 msgstr "Total Facturado"
 
@@ -74216,6 +75493,10 @@
 msgid "Total Issues"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Total Items"
+msgstr ""
+
 #: accounts/report/balance_sheet/balance_sheet.py:208
 msgid "Total Liability"
 msgstr ""
@@ -74324,7 +75605,7 @@
 msgid "Total Order Value"
 msgstr "Valor total del pedido"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:629
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:635
 msgid "Total Other Charges"
 msgstr ""
 
@@ -74332,13 +75613,25 @@
 msgid "Total Outgoing"
 msgstr "Total saliente"
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Total Outgoing Value (Consumption)"
-msgstr ""
+msgstr "Valor Total Saliente (Consumo)"
 
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:9
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:97
+#: accounts/report/accounts_receivable/accounts_receivable.html:79
 msgid "Total Outstanding"
 msgstr "Total Excepcional"
 
@@ -74349,18 +75642,20 @@
 msgstr "Total Excepcional"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:205
+#: accounts/report/accounts_receivable/accounts_receivable.html:163
 msgid "Total Outstanding Amount"
 msgstr "Monto total pendiente"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:197
+#: accounts/report/accounts_receivable/accounts_receivable.html:161
 msgid "Total Paid Amount"
 msgstr "Importe total pagado"
 
-#: controllers/accounts_controller.py:2266
+#: controllers/accounts_controller.py:2358
 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
 msgstr "El monto total del pago en el cronograma de pago debe ser igual al total / Total Redondeado"
 
-#: accounts/doctype/payment_request/payment_request.py:112
+#: accounts/doctype/payment_request/payment_request.py:115
 msgid "Total Payment Request amount cannot be greater than {0} amount"
 msgstr "El monto total de la solicitud de pago no puede ser mayor que el monto de {0}"
 
@@ -74392,22 +75687,24 @@
 msgid "Total Purchase Cost (via Purchase Invoice)"
 msgstr "Costo total de compra (vía facturas de compra)"
 
-#: projects/doctype/project/project.js:107
+#: projects/doctype/project/project.js:131
 msgid "Total Purchase Cost has been updated"
 msgstr ""
 
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py:66
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:127
 msgid "Total Qty"
-msgstr "Cantidad Total"
+msgstr "Cant. Total"
 
 #. Label of a Float field in DocType 'Serial and Batch Bundle'
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
 msgctxt "Serial and Batch Bundle"
 msgid "Total Qty"
-msgstr "Cantidad Total"
+msgstr "Cant. Total"
 
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:23
+#: selling/page/point_of_sale/pos_item_cart.js:520
+#: selling/page/point_of_sale/pos_item_cart.js:524
 msgid "Total Quantity"
 msgstr "Cantidad total"
 
@@ -74518,17 +75815,22 @@
 msgid "Total Stock Summary"
 msgstr "Resumen de stock total"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Stock Value"
+msgstr ""
+
 #. Label of a Float field in DocType 'Purchase Order Item Supplied'
 #: buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
 msgctxt "Purchase Order Item Supplied"
 msgid "Total Supplied Qty"
-msgstr ""
+msgstr "Cant. Total suministrada"
 
 #. Label of a Float field in DocType 'Subcontracting Order Supplied Item'
 #: subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json
 msgctxt "Subcontracting Order Supplied Item"
 msgid "Total Supplied Qty"
-msgstr ""
+msgstr "Cant. Total suministrada"
 
 #: selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:130
 msgid "Total Target"
@@ -74540,7 +75842,7 @@
 msgid "Total Tasks"
 msgstr "Tareas totales"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:622
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:628
 #: accounts/report/purchase_register/purchase_register.py:263
 msgid "Total Tax"
 msgstr "Impuesto Total"
@@ -74681,7 +75983,7 @@
 msgid "Total Time in Mins"
 msgstr "Tiempo total en minutos"
 
-#: public/js/utils.js:105
+#: public/js/utils.js:129
 msgid "Total Unpaid: {0}"
 msgstr "Total no pagado: {0}"
 
@@ -74710,6 +76012,11 @@
 
 #: utilities/report/youtube_interactions/youtube_interactions.py:70
 msgid "Total Views"
+msgstr "Total de visualizaciones"
+
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Warehouses"
 msgstr ""
 
 #. Label of a Float field in DocType 'Delivery Note Item'
@@ -74772,20 +76079,34 @@
 msgid "Total Working Hours"
 msgstr "Horas de trabajo total"
 
-#: controllers/accounts_controller.py:1838
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Total Working Hours"
+msgstr "Horas de trabajo total"
+
+#: controllers/accounts_controller.py:1930
 msgid "Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})"
 msgstr "Avance total ({0}) contra la Orden {1} no puede ser mayor que el Total ({2})"
 
-#: controllers/selling_controller.py:186
+#: controllers/selling_controller.py:187
 msgid "Total allocated percentage for sales team should be 100"
 msgstr "Porcentaje del total asignado para el equipo de ventas debe ser de 100"
 
+#: manufacturing/doctype/workstation/workstation.py:229
+msgid "Total completed quantity: {0}"
+msgstr ""
+
 #: selling/doctype/customer/customer.py:157
 msgid "Total contribution percentage should be equal to 100"
 msgstr "El porcentaje de contribución total debe ser igual a 100"
 
+#: projects/doctype/project/project_dashboard.html:2
+msgid "Total hours: {0}"
+msgstr ""
+
 #: accounts/doctype/pos_invoice/pos_invoice.py:444
-#: accounts/doctype/sales_invoice/sales_invoice.py:505
+#: accounts/doctype/sales_invoice/sales_invoice.py:518
 msgid "Total payments amount can't be greater than {}"
 msgstr "El monto total de los pagos no puede ser mayor que {}"
 
@@ -74800,7 +76121,7 @@
 msgid "Total {0} ({1})"
 msgstr "Total {0} ({1})"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:162
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:190
 msgid "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'"
 msgstr "Total de {0} para todos los elementos es cero, puede ser que usted debe cambiar en &quot;Distribuir los cargos basados en &#39;"
 
@@ -74813,6 +76134,7 @@
 msgstr "Total (Cantidad)"
 
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.py:88
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Totals"
 msgstr "Totales"
 
@@ -74897,6 +76219,11 @@
 msgid "Track Service Level Agreement"
 msgstr "Seguimiento del acuerdo de nivel de servicio"
 
+#. Description of a DocType
+#: accounts/doctype/cost_center/cost_center.json
+msgid "Track separate Income and Expense for product verticals or divisions."
+msgstr ""
+
 #. Label of a Select field in DocType 'Shipment'
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
@@ -74915,7 +76242,7 @@
 msgid "Tracking URL"
 msgstr "URL de Seguimiento"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: manufacturing/doctype/workstation/workstation_dashboard.py:10
 msgid "Transaction"
 msgstr "Transacción"
@@ -74957,7 +76284,7 @@
 msgstr "moneda de la transacción"
 
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:66
-#: selling/report/territory_wise_sales/territory_wise_sales.js:11
+#: selling/report/territory_wise_sales/territory_wise_sales.js:9
 msgid "Transaction Date"
 msgstr "Fecha de Transacción"
 
@@ -74997,12 +76324,21 @@
 msgid "Transaction Date"
 msgstr "Fecha de Transacción"
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:490
+msgid "Transaction Deletion Document: {0} is running for this Company. {1}"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
 msgid "Transaction Deletion Record"
 msgstr ""
 
 #. Name of a DocType
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgid "Transaction Deletion Record Details"
+msgstr ""
+
+#. Name of a DocType
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgid "Transaction Deletion Record Item"
 msgstr ""
@@ -75035,15 +76371,15 @@
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
 msgid "Transaction Settings"
-msgstr ""
+msgstr "Configuración de Transacciones"
 
 #. Label of a Section Break field in DocType 'Selling Settings'
 #: selling/doctype/selling_settings/selling_settings.json
 msgctxt "Selling Settings"
 msgid "Transaction Settings"
-msgstr ""
+msgstr "Configuración de Transacciones"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:256
 msgid "Transaction Type"
 msgstr "tipo de transacción"
 
@@ -75053,23 +76389,23 @@
 msgid "Transaction Type"
 msgstr "tipo de transacción"
 
-#: accounts/doctype/payment_request/payment_request.py:122
+#: accounts/doctype/payment_request/payment_request.py:125
 msgid "Transaction currency must be same as Payment Gateway currency"
 msgstr "Moneda de la transacción debe ser la misma que la moneda de la pasarela de pago"
 
 #: accounts/doctype/bank_transaction/bank_transaction.py:64
 msgid "Transaction currency: {0} cannot be different from Bank Account({1}) currency: {2}"
-msgstr ""
+msgstr "Moneda de la transacción: {0} no puede ser diferente de la moneda de la cuenta bancaria ({1}): {2}"
 
-#: manufacturing/doctype/job_card/job_card.py:647
+#: manufacturing/doctype/job_card/job_card.py:654
 msgid "Transaction not allowed against stopped Work Order {0}"
 msgstr "Transacción no permitida contra orden de trabajo detenida {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1112
+#: accounts/doctype/payment_entry/payment_entry.py:1121
 msgid "Transaction reference no {0} dated {1}"
 msgstr "Referencia de la transacción nro {0} fechada {1}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: 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
@@ -75084,12 +76420,12 @@
 msgid "Transactions Annual History"
 msgstr "Historial Anual de Transacciones"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:107
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:117
 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:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:364
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:208
 msgid "Transfer"
 msgstr "Transferencia"
 
@@ -75118,11 +76454,11 @@
 msgid "Transfer"
 msgstr "Transferencia"
 
-#: assets/doctype/asset/asset.js:83
+#: assets/doctype/asset/asset.js:84
 msgid "Transfer Asset"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:318
+#: manufacturing/doctype/production_plan/production_plan.js:345
 msgid "Transfer From Warehouses"
 msgstr ""
 
@@ -75138,7 +76474,7 @@
 msgid "Transfer Material Against"
 msgstr "Transferir material contra"
 
-#: manufacturing/doctype/production_plan/production_plan.js:313
+#: manufacturing/doctype/production_plan/production_plan.js:340
 msgid "Transfer Materials For Warehouse {0}"
 msgstr "Transferir materiales para almacén {0}"
 
@@ -75158,7 +76494,7 @@
 msgid "Transfer Type"
 msgstr "Tipo de transferencia"
 
-#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:31
 msgid "Transferred"
 msgstr "Transferido"
 
@@ -75168,6 +76504,7 @@
 msgid "Transferred"
 msgstr "Transferido"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:96
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:131
 msgid "Transferred Qty"
 msgstr "Cantidad Transferida"
@@ -75204,7 +76541,7 @@
 msgid "Transit"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:371
+#: stock/doctype/stock_entry/stock_entry.js:425
 msgid "Transit Entry"
 msgstr ""
 
@@ -75285,8 +76622,8 @@
 msgid "Tree Details"
 msgstr "Detalles del árbol"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:9
-#: selling/report/sales_analytics/sales_analytics.js:9
+#: buying/report/purchase_analytics/purchase_analytics.js:8
+#: selling/report/sales_analytics/sales_analytics.js:8
 msgid "Tree Type"
 msgstr "Tipo de arbol"
 
@@ -75566,10 +76903,11 @@
 #: 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
+#: 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:63 public/js/utils.js:632
-#: selling/doctype/sales_order/sales_order.js:999
+#: public/js/stock_analytics.js:94 public/js/utils.js:693
+#: 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
 #: setup/doctype/uom/uom.json
@@ -75583,235 +76921,235 @@
 #: templates/emails/reorder_item.html:11
 #: templates/includes/rfq/rfq_items.html:17
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Asset Capitalization Service Item'
 #: assets/doctype/asset_capitalization_service_item/asset_capitalization_service_item.json
 msgctxt "Asset Capitalization Service Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'BOM Creator'
 #: manufacturing/doctype/bom_creator/bom_creator.json
 msgctxt "BOM Creator"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'BOM Creator Item'
 #: manufacturing/doctype/bom_creator_item/bom_creator_item.json
 msgctxt "BOM Creator Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'BOM Item'
 #: manufacturing/doctype/bom_item/bom_item.json
 msgctxt "BOM Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
 msgctxt "Delivery Note Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Delivery Stop'
 #: stock/doctype/delivery_stop/delivery_stop.json
 msgctxt "Delivery Stop"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Item Barcode'
 #: stock/doctype/item_barcode/item_barcode.json
 msgctxt "Item Barcode"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Item Price'
 #: stock/doctype/item_price/item_price.json
 msgctxt "Item Price"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Job Card Item'
 #: manufacturing/doctype/job_card_item/job_card_item.json
 msgctxt "Job Card Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Material Request Item'
 #: stock/doctype/material_request_item/material_request_item.json
 msgctxt "Material Request Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Material Request Plan Item'
 #: manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
 msgctxt "Material Request Plan Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Opportunity Item'
 #: crm/doctype/opportunity_item/opportunity_item.json
 msgctxt "Opportunity Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Packed Item'
 #: stock/doctype/packed_item/packed_item.json
 msgctxt "Packed Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Packing Slip Item'
 #: stock/doctype/packing_slip_item/packing_slip_item.json
 msgctxt "Packing Slip Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Pick List Item'
 #: stock/doctype/pick_list_item/pick_list_item.json
 msgctxt "Pick List Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Pricing Rule Brand'
 #: accounts/doctype/pricing_rule_brand/pricing_rule_brand.json
 msgctxt "Pricing Rule Brand"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Pricing Rule Item Code'
 #: accounts/doctype/pricing_rule_item_code/pricing_rule_item_code.json
 msgctxt "Pricing Rule Item Code"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Pricing Rule Item Group'
 #: accounts/doctype/pricing_rule_item_group/pricing_rule_item_group.json
 msgctxt "Pricing Rule Item Group"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Product Bundle Item'
 #: selling/doctype/product_bundle_item/product_bundle_item.json
 msgctxt "Product Bundle Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Production Plan Item'
 #: manufacturing/doctype/production_plan_item/production_plan_item.json
 msgctxt "Production Plan Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgctxt "Production Plan Sub Assembly Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Promotional Scheme Product Discount'
 #: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
 msgctxt "Promotional Scheme Product Discount"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Purchase Invoice Item'
 #: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
 msgctxt "Purchase Invoice Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Purchase Order Item'
 #: buying/doctype/purchase_order_item/purchase_order_item.json
 msgctxt "Purchase Order Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Purchase Receipt Item'
 #: stock/doctype/purchase_receipt_item/purchase_receipt_item.json
 msgctxt "Purchase Receipt Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Putaway Rule'
 #: stock/doctype/putaway_rule/putaway_rule.json
 msgctxt "Putaway Rule"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Quality Goal Objective'
 #: quality_management/doctype/quality_goal_objective/quality_goal_objective.json
 msgctxt "Quality Goal Objective"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Quality Review Objective'
 #: quality_management/doctype/quality_review_objective/quality_review_objective.json
 msgctxt "Quality Review Objective"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Quotation Item'
 #: selling/doctype/quotation_item/quotation_item.json
 msgctxt "Quotation Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Request for Quotation Item'
 #: buying/doctype/request_for_quotation_item/request_for_quotation_item.json
 msgctxt "Request for Quotation Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Sales Invoice Item'
 #: accounts/doctype/sales_invoice_item/sales_invoice_item.json
 msgctxt "Sales Invoice Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Sales Order Item'
 #: selling/doctype/sales_order_item/sales_order_item.json
 msgctxt "Sales Order Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'Supplier Quotation Item'
 #: buying/doctype/supplier_quotation_item/supplier_quotation_item.json
 msgctxt "Supplier Quotation Item"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Label of a Link field in DocType 'UOM Conversion Detail'
 #: stock/doctype/uom_conversion_detail/uom_conversion_detail.json
 msgctxt "UOM Conversion Detail"
 msgid "UOM"
-msgstr ""
+msgstr "UdM"
 
 #. Name of a DocType
 #: stock/doctype/uom_category/uom_category.json
@@ -75900,7 +77238,7 @@
 msgid "UOM Conversion Factor"
 msgstr "Factor de Conversión de Unidad de Medida"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1248
+#: manufacturing/doctype/production_plan/production_plan.py:1270
 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
 msgstr "Factor de conversión de UOM ({0} -&gt; {1}) no encontrado para el artículo: {2}"
 
@@ -75914,7 +77252,7 @@
 msgid "UOM Name"
 msgstr "Nombre de la unidad de medida (UdM)"
 
-#: stock/doctype/stock_entry/stock_entry.py:2773
+#: stock/doctype/stock_entry/stock_entry.py:2809
 msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
 msgstr ""
 
@@ -75958,7 +77296,7 @@
 msgid "URL can only be a string"
 msgstr "La URL solo puede ser una cadena"
 
-#: public/js/utils/unreconcile.js:20
+#: public/js/utils/unreconcile.js:24
 msgid "UnReconcile"
 msgstr ""
 
@@ -75970,15 +77308,15 @@
 msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100"
 msgstr "No se puede encontrar la puntuación a partir de {0}. Usted necesita tener puntuaciones en pie que cubren 0 a 100"
 
-#: manufacturing/doctype/work_order/work_order.py:603
-msgid "Unable to find the time slot in the next {0} days for the operation {1}."
-msgstr "No se puede encontrar el intervalo de tiempo en los próximos {0} días para la operación {1}."
+#: manufacturing/doctype/work_order/work_order.py:613
+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
 msgid "Unable to find variable:"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:79
+#: public/js/bank_reconciliation_tool/data_table_manager.js:74
 msgid "Unallocated Amount"
 msgstr "Monto sin asignar"
 
@@ -75996,9 +77334,9 @@
 
 #: stock/doctype/putaway_rule/putaway_rule.py:313
 msgid "Unassigned Qty"
-msgstr ""
+msgstr "Cant. Sin asignar"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:115
 msgid "Unblock Invoice"
 msgstr "Desbloquear factura"
 
@@ -76047,7 +77385,7 @@
 msgid "Under Warranty"
 msgstr "Bajo garantía"
 
-#: manufacturing/doctype/workstation/workstation.js:52
+#: manufacturing/doctype/workstation/workstation.js:78
 msgid "Under Working Hours table, you can add start and end times for a Workstation. For example, a Workstation may be active from 9 am to 1 pm, then 2 pm to 5 pm. You can also specify the working hours based on shifts. While scheduling a Work Order, the system will check for the availability of the Workstation based on the working hours specified."
 msgstr ""
 
@@ -76078,11 +77416,12 @@
 msgid "Units of Measure"
 msgstr "Unidades de medida"
 
-#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:12
+#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:10
+#: projects/doctype/project/project_dashboard.html:7
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: public/js/call_popup/call_popup.js:109
+#: public/js/call_popup/call_popup.js:110
 msgid "Unknown Caller"
 msgstr "Llamador desconocido"
 
@@ -76098,7 +77437,7 @@
 msgid "Unlink Payment on Cancellation of Invoice"
 msgstr "Desvinculación de Pago en la cancelación de la factura"
 
-#: accounts/doctype/bank_account/bank_account.js:34
+#: accounts/doctype/bank_account/bank_account.js:33
 msgid "Unlink external integrations"
 msgstr "Desvincular integraciones externas"
 
@@ -76108,7 +77447,7 @@
 msgid "Unlinked"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:258
+#: accounts/doctype/sales_invoice/sales_invoice.py:263
 #: accounts/doctype/subscription/subscription_list.js:12
 msgid "Unpaid"
 msgstr "Impagado"
@@ -76242,20 +77581,24 @@
 msgid "Unreconciled Entries"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:74
-#: stock/doctype/pick_list/pick_list.js:114
+#: selling/doctype/sales_order/sales_order.js:90
+#: stock/doctype/pick_list/pick_list.js:134
 msgid "Unreserve"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:418
+#: selling/doctype/sales_order/sales_order.js:448
 msgid "Unreserve Stock"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:430
-#: stock/doctype/pick_list/pick_list.js:252
+#: selling/doctype/sales_order/sales_order.js:460
+#: stock/doctype/pick_list/pick_list.js:286
 msgid "Unreserving Stock..."
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Unresolve"
+msgstr ""
+
 #: accounts/doctype/dunning/dunning_list.js:6
 msgid "Unresolved"
 msgstr "Irresoluto"
@@ -76307,6 +77650,7 @@
 msgstr "No suscrito"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:37
+#: accounts/report/accounts_receivable/accounts_receivable.html:24
 msgid "Until"
 msgstr "Hasta"
 
@@ -76334,22 +77678,23 @@
 msgid "Upcoming Calendar Events "
 msgstr "Calendario de Eventos Próximos"
 
-#: accounts/doctype/account/account.js:210
-#: accounts/doctype/cost_center/cost_center.js:102
-#: public/js/bom_configurator/bom_configurator.bundle.js:367
-#: public/js/utils.js:551 public/js/utils.js:767
-#: public/js/utils/barcode_scanner.js:176
+#: 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/barcode_scanner.js:183
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:164
+#: templates/pages/task_info.html:22
 msgid "Update"
 msgstr "Actualizar"
 
-#: accounts/doctype/account/account.js:58
+#: accounts/doctype/account/account.js:53
 msgid "Update Account Name / Number"
 msgstr "Actualizar el Nombre / Número  de la Cuenta"
 
-#: accounts/doctype/account/account.js:158
+#: accounts/doctype/account/account.js:159
 msgid "Update Account Number / Name"
 msgstr "Actualizar el Número / Nombre  de la Cuenta"
 
@@ -76395,7 +77740,7 @@
 msgid "Update Auto Repeat Reference"
 msgstr "Actualizar la Referencia de Repetición Automática"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:35
 msgid "Update BOM Cost Automatically"
 msgstr "Actualizar automáticamente el coste de la lista de materiales"
 
@@ -76424,6 +77769,18 @@
 msgid "Update Billed Amount in Delivery Note"
 msgstr ""
 
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Order"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Receipt"
+msgstr ""
+
 #. Label of a Check field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -76436,9 +77793,9 @@
 msgid "Update Billed Amount in Sales Order"
 msgstr "Actualizar el Importe Facturado en la Orden de Venta"
 
-#: accounts/doctype/bank_clearance/bank_clearance.js:57
-#: accounts/doctype/bank_clearance/bank_clearance.js:71
-#: accounts/doctype/bank_clearance/bank_clearance.js:76
+#: accounts/doctype/bank_clearance/bank_clearance.js:53
+#: accounts/doctype/bank_clearance/bank_clearance.js:67
+#: accounts/doctype/bank_clearance/bank_clearance.js:72
 msgid "Update Clearance Date"
 msgstr "Actualizar fecha de liquidación"
 
@@ -76448,7 +77805,7 @@
 msgid "Update Consumed Material Cost In Project"
 msgstr "Actualizar el costo del material consumido en el proyecto"
 
-#: manufacturing/doctype/bom/bom.js:100
+#: manufacturing/doctype/bom/bom.js:99
 msgid "Update Cost"
 msgstr "Actualizar costos"
 
@@ -76464,12 +77821,12 @@
 msgid "Update Cost"
 msgstr "Actualizar costos"
 
-#: accounts/doctype/cost_center/cost_center.js:21
-#: accounts/doctype/cost_center/cost_center.js:50
+#: accounts/doctype/cost_center/cost_center.js:19
+#: accounts/doctype/cost_center/cost_center.js:52
 msgid "Update Cost Center Name / Number"
 msgstr "Actualizar nombre / número del centro de costos"
 
-#: stock/doctype/pick_list/pick_list.js:99
+#: stock/doctype/pick_list/pick_list.js:104
 msgid "Update Current Stock"
 msgstr "Actualizar stock actual"
 
@@ -76486,12 +77843,24 @@
 msgid "Update Existing Records"
 msgstr "Actualizar registros existentes"
 
-#: buying/doctype/purchase_order/purchase_order.js:275 public/js/utils.js:721
-#: selling/doctype/sales_order/sales_order.js:56
+#: buying/doctype/purchase_order/purchase_order.js:301 public/js/utils.js:793
+#: selling/doctype/sales_order/sales_order.js:63
 msgid "Update Items"
 msgstr "Actualizar elementos"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Update Print Format"
 msgstr "Formato de impresión de actualización"
 
@@ -76501,7 +77870,7 @@
 msgid "Update Rate and Availability"
 msgstr "Actualización de tarifas y disponibilidad"
 
-#: buying/doctype/purchase_order/purchase_order.js:475
+#: buying/doctype/purchase_order/purchase_order.js:549
 msgid "Update Rate as per Last Purchase"
 msgstr ""
 
@@ -76534,9 +77903,9 @@
 msgid "Update Stock Opening Balance"
 msgstr ""
 
-#: projects/doctype/project/project.js:71
+#: projects/doctype/project/project.js:82
 msgid "Update Total Purchase Cost"
-msgstr ""
+msgstr "Actualizar Costo Total de Compra"
 
 #. Label of a Select field in DocType 'BOM Update Log'
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
@@ -76556,7 +77925,7 @@
 msgid "Update latest price in all BOMs"
 msgstr "Actualizar el último precio en todas las listas de materiales"
 
-#: assets/doctype/asset/asset.py:338
+#: assets/doctype/asset/asset.py:340
 msgid "Update stock must be enabled for the purchase invoice {0}"
 msgstr ""
 
@@ -76576,19 +77945,19 @@
 msgid "Updating Opening Balances"
 msgstr ""
 
-#: stock/doctype/item/item.py:1348
+#: stock/doctype/item/item.py:1349
 msgid "Updating Variants..."
 msgstr "Actualizando Variantes ..."
 
-#: manufacturing/doctype/work_order/work_order.js:788
+#: manufacturing/doctype/work_order/work_order.js:847
 msgid "Updating Work Order status"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:48
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:46
 msgid "Updating {0} of {1}, {2}"
 msgstr "Actualización {0} de {1}, {2}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:44
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:43
 msgid "Upload Bank Statement"
 msgstr "Cargar extracto bancario"
 
@@ -76609,7 +77978,7 @@
 msgid "Urgent"
 msgstr "Urgente"
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:37
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:36
 msgid "Use 'Repost in background' button to trigger background job. Job can only be triggered when document is in Queued or Failed status."
 msgstr ""
 
@@ -76623,7 +77992,7 @@
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Use Company Default Round Off Cost Center"
-msgstr ""
+msgstr "Utilizar el Centro de Costes de redondeo por defecto de la Compañía"
 
 #. Label of a Check field in DocType 'Sales Invoice'
 #: accounts/doctype/sales_invoice/sales_invoice.json
@@ -76645,6 +78014,12 @@
 msgid "Use Google Maps Direction API to optimize route"
 msgstr "Utilice la API de dirección de Google Maps para optimizar la ruta"
 
+#. Label of a Check field in DocType 'Currency Exchange Settings'
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
+msgctxt "Currency Exchange Settings"
+msgid "Use HTTP Protocol"
+msgstr ""
+
 #. Label of a Check field in DocType 'Stock Reposting Settings'
 #: stock/doctype/stock_reposting_settings/stock_reposting_settings.json
 msgctxt "Stock Reposting Settings"
@@ -76663,17 +78038,95 @@
 msgid "Use Multi-Level BOM"
 msgstr "Utilizar Lista de Materiales (LdM)  Multi-Nivel"
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Use Serial / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Asset Capitalization Stock Item'
+#: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
+msgctxt "Asset Capitalization Stock Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Delivery Note Item'
+#: stock/doctype/delivery_note_item/delivery_note_item.json
+msgctxt "Delivery Note Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'POS Invoice Item'
+#: accounts/doctype/pos_invoice_item/pos_invoice_item.json
+msgctxt "POS Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Packed Item'
+#: stock/doctype/packed_item/packed_item.json
+msgctxt "Packed Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Pick List Item'
+#: stock/doctype/pick_list_item/pick_list_item.json
+msgctxt "Pick List Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice Item'
+#: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+msgctxt "Purchase Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Receipt Item'
+#: stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+msgctxt "Purchase Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice Item'
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.json
+msgctxt "Sales Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Entry Detail'
+#: stock/doctype/stock_entry_detail/stock_entry_detail.json
+msgctxt "Stock Entry Detail"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Reconciliation Item'
+#: stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+msgctxt "Stock Reconciliation Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Item'
+#: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgctxt "Subcontracting Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Supplied Item'
+#: subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
+msgctxt "Subcontracting Receipt Supplied Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
 #. Label of a Check field in DocType 'Buying Settings'
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
 msgid "Use Transaction Date Exchange Rate"
-msgstr ""
+msgstr "Usar el tipo de cambio de fecha de la transacción"
 
 #. Label of a Check field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
 msgid "Use Transaction Date Exchange Rate"
-msgstr ""
+msgstr "Usar el tipo de cambio de fecha de la transacción"
 
 #: projects/doctype/project/project.py:543
 msgid "Use a name that is different from previous project name"
@@ -76775,7 +78228,7 @@
 msgid "User ID not set for Employee {0}"
 msgstr "ID de usuario no establecido para el empleado {0}"
 
-#: accounts/doctype/journal_entry/journal_entry.js:544
+#: accounts/doctype/journal_entry/journal_entry.js:607
 msgid "User Remark"
 msgstr "Observaciones"
 
@@ -76883,21 +78336,23 @@
 #: regional/doctype/south_africa_vat_settings/south_africa_vat_settings.json
 msgctxt "South Africa VAT Settings"
 msgid "VAT Accounts"
-msgstr ""
+msgstr "Cuentas de IVA"
 
 #: regional/report/uae_vat_201/uae_vat_201.py:28
 msgid "VAT Amount (AED)"
-msgstr ""
+msgstr "Importe del IVA (AED)"
 
 #. Name of a report
 #: regional/report/vat_audit_report/vat_audit_report.json
 msgid "VAT Audit Report"
 msgstr "Informe de auditoría del IVA"
 
+#: regional/report/uae_vat_201/uae_vat_201.html:47
 #: regional/report/uae_vat_201/uae_vat_201.py:115
 msgid "VAT on Expenses and All Other Inputs"
 msgstr ""
 
+#: regional/report/uae_vat_201/uae_vat_201.html:15
 #: regional/report/uae_vat_201/uae_vat_201.py:45
 msgid "VAT on Sales and All Other Outputs"
 msgstr ""
@@ -76950,10 +78405,6 @@
 msgid "Valid From"
 msgstr "Válida desde"
 
-#: stock/doctype/item_price/item_price.py:62
-msgid "Valid From Date must be lesser than Valid Up To Date."
-msgstr ""
-
 #: regional/doctype/lower_deduction_certificate/lower_deduction_certificate.py:45
 msgid "Valid From date not in Fiscal Year {0}"
 msgstr "Válido desde la fecha no en el año fiscal {0}"
@@ -76963,7 +78414,7 @@
 msgstr ""
 
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:265
-#: templates/pages/order.html:47
+#: templates/pages/order.html:59
 msgid "Valid Till"
 msgstr "Válida hasta"
 
@@ -76983,37 +78434,37 @@
 #: accounts/doctype/coupon_code/coupon_code.json
 msgctxt "Coupon Code"
 msgid "Valid Up To"
-msgstr ""
+msgstr "Válido hasta"
 
 #. Label of a Date field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
 msgid "Valid Up To"
-msgstr ""
+msgstr "Válido hasta"
 
 #. Label of a Date field in DocType 'Item Price'
 #: stock/doctype/item_price/item_price.json
 msgctxt "Item Price"
 msgid "Valid Up To"
-msgstr ""
+msgstr "Válido hasta"
 
 #. Label of a Date field in DocType 'Lower Deduction Certificate'
 #: regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
 msgctxt "Lower Deduction Certificate"
 msgid "Valid Up To"
-msgstr ""
+msgstr "Válido hasta"
 
 #. Label of a Date field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
 msgid "Valid Up To"
-msgstr ""
+msgstr "Válido hasta"
 
 #. Label of a Date field in DocType 'Promotional Scheme'
 #: accounts/doctype/promotional_scheme/promotional_scheme.json
 msgctxt "Promotional Scheme"
 msgid "Valid Up To"
-msgstr ""
+msgstr "Válido hasta"
 
 #: regional/doctype/lower_deduction_certificate/lower_deduction_certificate.py:40
 msgid "Valid Up To date cannot be before Valid From date"
@@ -77021,7 +78472,7 @@
 
 #: regional/doctype/lower_deduction_certificate/lower_deduction_certificate.py:48
 msgid "Valid Up To date not in Fiscal Year {0}"
-msgstr ""
+msgstr "Válido Hasta, la fecha no en el ejercicio fiscal {0}"
 
 #. Label of a Table field in DocType 'Shipping Rule'
 #: accounts/doctype/shipping_rule/shipping_rule.json
@@ -77107,7 +78558,7 @@
 msgstr "Valuación"
 
 #: stock/report/stock_balance/stock_balance.js:76
-#: stock/report/stock_ledger/stock_ledger.js:88
+#: stock/report/stock_ledger/stock_ledger.js:96
 msgid "Valuation Field Type"
 msgstr ""
 
@@ -77124,8 +78575,8 @@
 #: accounts/report/gross_profit/gross_profit.py:266
 #: 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:449
-#: stock/report/stock_ledger/stock_ledger.py:207
+#: stock/report/stock_balance/stock_balance.py:457
+#: stock/report/stock_ledger/stock_ledger.py:280
 msgid "Valuation Rate"
 msgstr "Tasa de valoración"
 
@@ -77190,6 +78641,12 @@
 msgid "Valuation Rate"
 msgstr "Tasa de valoración"
 
+#. Label of a Float field in DocType 'Serial and Batch Entry'
+#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
+msgctxt "Serial and Batch Entry"
+msgid "Valuation Rate"
+msgstr "Tasa de valoración"
+
 #. Label of a Currency field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
@@ -77212,11 +78669,11 @@
 msgid "Valuation Rate (In / Out)"
 msgstr ""
 
-#: stock/stock_ledger.py:1688
+#: stock/stock_ledger.py:1708
 msgid "Valuation Rate Missing"
 msgstr "Falta la tasa de valoración"
 
-#: stock/stock_ledger.py:1666
+#: stock/stock_ledger.py:1686
 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
 msgstr "Tasa de valoración para el artículo {0}, se requiere para realizar asientos contables para {1} {2}."
 
@@ -77224,7 +78681,7 @@
 msgid "Valuation Rate is mandatory if Opening Stock entered"
 msgstr "Rango de Valoración es obligatorio si se ha ingresado una Apertura de Almacén"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:514
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:568
 msgid "Valuation Rate required for Item {0} at row {1}"
 msgstr "Tasa de valoración requerida para el artículo {0} en la fila {1}"
 
@@ -77235,12 +78692,12 @@
 msgid "Valuation and Total"
 msgstr "Valuación y Total"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:731
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:785
 msgid "Valuation rate for customer provided items has been set to zero."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1649
-#: controllers/accounts_controller.py:2583
+#: accounts/doctype/payment_entry/payment_entry.py:1668
+#: controllers/accounts_controller.py:2668
 msgid "Valuation type charges can not be marked as Inclusive"
 msgstr "Los cargos por tipo de valoración no se pueden marcar como inclusivos"
 
@@ -77248,10 +78705,10 @@
 msgid "Valuation type charges can not marked as Inclusive"
 msgstr "Cargos de tipo de valoración no pueden marcado como Incluido"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:28
-#: public/js/stock_analytics.js:37
-#: selling/report/sales_analytics/sales_analytics.js:28
-#: stock/report/stock_analytics/stock_analytics.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:27
+#: public/js/stock_analytics.js:49
+#: selling/report/sales_analytics/sales_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:26
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:95
 msgid "Value"
 msgstr "Valor"
@@ -77314,7 +78771,7 @@
 msgid "Value Based Inspection"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:224
+#: stock/report/stock_ledger/stock_ledger.py:297
 msgid "Value Change"
 msgstr "Cambio de Valor"
 
@@ -77324,9 +78781,9 @@
 msgid "Value Details"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:25
-#: selling/report/sales_analytics/sales_analytics.js:25
-#: stock/report/stock_analytics/stock_analytics.js:24
+#: buying/report/purchase_analytics/purchase_analytics.js:24
+#: selling/report/sales_analytics/sales_analytics.js:32
+#: stock/report/stock_analytics/stock_analytics.js:23
 msgid "Value Or Qty"
 msgstr "Valor o cantidad"
 
@@ -77348,11 +78805,11 @@
 msgid "Value of goods cannot be 0"
 msgstr ""
 
-#: public/js/stock_analytics.js:36
+#: public/js/stock_analytics.js:46
 msgid "Value or Qty"
 msgstr "Valor o cantidad"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:120
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:121
 msgid "Values Changed"
 msgstr "Valores Cambiados"
 
@@ -77383,7 +78840,7 @@
 msgid "Variance ({})"
 msgstr "Varianza ({})"
 
-#: stock/doctype/item/item.js:110 stock/doctype/item/item_list.js:14
+#: stock/doctype/item/item.js:146 stock/doctype/item/item_list.js:22
 #: stock/report/item_variant_details/item_variant_details.py:74
 msgid "Variant"
 msgstr "Variante"
@@ -77392,13 +78849,17 @@
 msgid "Variant Attribute Error"
 msgstr "Error de atributo de variante"
 
+#: public/js/templates/item_quick_entry.html:1
+msgid "Variant Attributes"
+msgstr "Atributos de Variante"
+
 #. Label of a Table field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
 msgid "Variant Attributes"
 msgstr "Atributos de Variante"
 
-#: manufacturing/doctype/bom/bom.js:124
+#: manufacturing/doctype/bom/bom.js:128
 msgid "Variant BOM"
 msgstr "Lista de materiales variante"
 
@@ -77412,7 +78873,7 @@
 msgid "Variant Based On cannot be changed"
 msgstr "La variante basada en no se puede cambiar"
 
-#: stock/doctype/item/item.js:98
+#: stock/doctype/item/item.js:122
 msgid "Variant Details Report"
 msgstr "Informe de Detalles de Variaciones"
 
@@ -77421,7 +78882,7 @@
 msgid "Variant Field"
 msgstr "Campo de Variante"
 
-#: manufacturing/doctype/bom/bom.js:219 manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/bom/bom.js:238 manufacturing/doctype/bom/bom.js:300
 msgid "Variant Item"
 msgstr "Elemento variante"
 
@@ -77441,7 +78902,7 @@
 msgid "Variant Of"
 msgstr "Variante de"
 
-#: stock/doctype/item/item.js:543
+#: stock/doctype/item/item.js:610
 msgid "Variant creation has been queued."
 msgstr "La creación de variantes se ha puesto en cola."
 
@@ -77540,37 +79001,37 @@
 msgid "Video Settings"
 msgstr "Ajustes de video"
 
-#: accounts/doctype/account/account.js:79
+#: accounts/doctype/account/account.js:74
 #: accounts/doctype/account/account.js:103
-#: accounts/doctype/account/account_tree.js:135
-#: accounts/doctype/account/account_tree.js:139
-#: accounts/doctype/account/account_tree.js:143
-#: accounts/doctype/cost_center/cost_center_tree.js:37
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:202
-#: accounts/doctype/journal_entry/journal_entry.js:29
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:619
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:8
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:11
-#: buying/doctype/supplier/supplier.js:88
-#: buying/doctype/supplier/supplier.js:92
-#: manufacturing/doctype/production_plan/production_plan.js:94
-#: projects/doctype/project/project.js:84
-#: projects/doctype/project/project.js:92
-#: public/js/controllers/stock_controller.js:64
-#: public/js/controllers/stock_controller.js:83 public/js/utils.js:133
-#: selling/doctype/customer/customer.js:157
-#: selling/doctype/customer/customer.js:162 setup/doctype/company/company.js:88
-#: setup/doctype/company/company.js:94 setup/doctype/company/company.js:100
-#: setup/doctype/company/company.js:106
-#: stock/doctype/delivery_trip/delivery_trip.js:71
-#: stock/doctype/item/item.js:63 stock/doctype/item/item.js:69
-#: stock/doctype/item/item.js:75 stock/doctype/item/item.js:92
-#: stock/doctype/item/item.js:96 stock/doctype/item/item.js:100
-#: stock/doctype/purchase_receipt/purchase_receipt.js:182
-#: stock/doctype/purchase_receipt/purchase_receipt.js:189
-#: stock/doctype/stock_entry/stock_entry.js:257
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:41
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:53
+#: accounts/doctype/account/account_tree.js:185
+#: accounts/doctype/account/account_tree.js:193
+#: accounts/doctype/account/account_tree.js:201
+#: accounts/doctype/cost_center/cost_center_tree.js:56
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:205
+#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:668
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
+#: buying/doctype/supplier/supplier.js:93
+#: buying/doctype/supplier/supplier.js:104
+#: manufacturing/doctype/production_plan/production_plan.js:98
+#: projects/doctype/project/project.js:100
+#: projects/doctype/project/project.js:117
+#: public/js/controllers/stock_controller.js:76
+#: public/js/controllers/stock_controller.js:95 public/js/utils.js:164
+#: selling/doctype/customer/customer.js:160
+#: selling/doctype/customer/customer.js:172 setup/doctype/company/company.js:90
+#: setup/doctype/company/company.js:100 setup/doctype/company/company.js:112
+#: setup/doctype/company/company.js:124
+#: stock/doctype/delivery_trip/delivery_trip.js:83
+#: stock/doctype/item/item.js:65 stock/doctype/item/item.js:75
+#: stock/doctype/item/item.js:85 stock/doctype/item/item.js:110
+#: stock/doctype/item/item.js:118 stock/doctype/item/item.js:126
+#: stock/doctype/purchase_receipt/purchase_receipt.js:207
+#: stock/doctype/purchase_receipt/purchase_receipt.js:218
+#: stock/doctype/stock_entry/stock_entry.js:287
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:44
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:60
 msgid "View"
 msgstr ""
 
@@ -77578,7 +79039,7 @@
 msgid "View BOM Update Log"
 msgstr ""
 
-#: public/js/setup_wizard.js:39
+#: public/js/setup_wizard.js:41
 msgid "View Chart of Accounts"
 msgstr "Ver el Cuadro de Cuentas"
 
@@ -77588,24 +79049,24 @@
 msgid "View Cost Center Tree"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:158
+#: accounts/doctype/payment_entry/payment_entry.js:183
 msgid "View Exchange Gain/Loss Journals"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:128
+#: assets/doctype/asset/asset.js:164
 #: assets/doctype/asset_repair/asset_repair.js:47
 msgid "View General Ledger"
 msgstr ""
 
-#: crm/doctype/campaign/campaign.js:11
+#: crm/doctype/campaign/campaign.js:15
 msgid "View Leads"
 msgstr "Ver Iniciativas"
 
-#: accounts/doctype/account/account_tree.js:193 stock/doctype/batch/batch.js:18
+#: accounts/doctype/account/account_tree.js:278 stock/doctype/batch/batch.js:18
 msgid "View Ledger"
 msgstr "Mostrar Libro Mayor"
 
-#: stock/doctype/serial_no/serial_no.js:29
+#: stock/doctype/serial_no/serial_no.js:28
 msgid "View Ledgers"
 msgstr ""
 
@@ -77628,6 +79089,10 @@
 msgid "View attachments"
 msgstr "Ver Adjuntos"
 
+#: public/js/call_popup/call_popup.js:186
+msgid "View call log"
+msgstr ""
+
 #: utilities/report/youtube_interactions/youtube_interactions.py:25
 msgid "Views"
 msgstr ""
@@ -77677,9 +79142,9 @@
 msgid "Voucher"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.js:71
-#: stock/report/stock_ledger/stock_ledger.py:160
-#: stock/report/stock_ledger/stock_ledger.py:232
+#: stock/report/stock_ledger/stock_ledger.js:79
+#: stock/report/stock_ledger/stock_ledger.py:233
+#: stock/report/stock_ledger/stock_ledger.py:305
 msgid "Voucher #"
 msgstr "Comprobante #"
 
@@ -77719,21 +79184,21 @@
 msgid "Voucher Name"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:273
-#: accounts/report/accounts_receivable/accounts_receivable.py:1050
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: accounts/report/accounts_receivable/accounts_receivable.py:1058
 #: 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_ledger/general_ledger.js:49
-#: accounts/report/general_ledger/general_ledger.py:625
-#: accounts/report/payment_ledger/payment_ledger.js:65
+#: accounts/report/general_ledger/general_ledger.py:638
+#: 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:61
+#: 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/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/reserved_stock/reserved_stock.js:80
+#: 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
@@ -77808,7 +79273,7 @@
 msgid "Voucher Qty"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:619
+#: accounts/report/general_ledger/general_ledger.py:632
 msgid "Voucher Subtype"
 msgstr ""
 
@@ -77818,25 +79283,25 @@
 msgid "Voucher Subtype"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1048
+#: 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:617
+#: accounts/report/general_ledger/general_ledger.py:630
 #: 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/voucher_wise_balance/voucher_wise_balance.py:17
-#: public/js/utils/unreconcile.js:60
+#: 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/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/reserved_stock/reserved_stock.js:68
+#: 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_ledger/stock_ledger.py:230
+#: 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
 msgid "Voucher Type"
@@ -77908,11 +79373,11 @@
 msgid "Voucher Type"
 msgstr "Tipo de Comprobante"
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:177
+#: accounts/doctype/bank_transaction/bank_transaction.py:180
 msgid "Voucher {0} is over-allocated by {1}"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:249
+#: accounts/doctype/bank_transaction/bank_transaction.py:252
 msgid "Voucher {0} value is broken: {1}"
 msgstr ""
 
@@ -78001,12 +79466,12 @@
 msgid "Wages per hour"
 msgstr "Salarios por hora"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:251
+#: accounts/doctype/pos_invoice/pos_invoice.js:270
 msgid "Waiting for payment..."
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:55
+#: accounts/report/gross_profit/gross_profit.js:56
 #: accounts/report/gross_profit/gross_profit.py:251
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
 #: accounts/report/purchase_register/purchase_register.js:52
@@ -78014,58 +79479,62 @@
 #: 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
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:16
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:11
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:82
+#: 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/work_order_stock_report/work_order_stock_report.js:9
-#: public/js/stock_analytics.js:45 public/js/utils.js:498
-#: public/js/utils/serial_no_batch_selector.js:90
-#: selling/doctype/sales_order/sales_order.js:300
-#: selling/doctype/sales_order/sales_order.js:401
-#: selling/report/sales_order_analysis/sales_order_analysis.js:49
+#: 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/utils/serial_no_batch_selector.js:94
+#: selling/doctype/sales_order/sales_order.js:327
+#: selling/doctype/sales_order/sales_order.js:431
+#: selling/report/sales_order_analysis/sales_order_analysis.js:48
 #: selling/report/sales_order_analysis/sales_order_analysis.py:334
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:78
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:79
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:256
 #: stock/doctype/warehouse/warehouse.json
 #: stock/page/stock_balance/stock_balance.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:22
+#: 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/item_price_stock/item_price_stock.py:27
-#: stock/report/item_shortage_report/item_shortage_report.js:18
+#: stock/report/item_shortage_report/item_shortage_report.js:17
 #: stock/report/item_shortage_report/item_shortage_report.py:81
 #: stock/report/product_bundle_balance/product_bundle_balance.js:42
 #: stock/report/product_bundle_balance/product_bundle_balance.py:89
-#: stock/report/reserved_stock/reserved_stock.js:44
+#: stock/report/reserved_stock/reserved_stock.js:41
 #: stock/report/reserved_stock/reserved_stock.py:96
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:140
-#: stock/report/serial_no_ledger/serial_no_ledger.js:22
+#: 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_analytics/stock_analytics.js:50
+#: stock/report/stock_analytics/stock_analytics.js:49
 #: stock/report/stock_balance/stock_balance.js:51
-#: stock/report/stock_balance/stock_balance.py:376
+#: stock/report/stock_balance/stock_balance.py:384
 #: stock/report/stock_ledger/stock_ledger.js:30
-#: stock/report/stock_ledger/stock_ledger.py:167
+#: stock/report/stock_ledger/stock_ledger.py:240
 #: stock/report/stock_ledger_variance/stock_ledger_variance.js:38
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:55
 #: 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:17
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:39
+#: 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
+#: templates/form_grid/material_request_grid.html:8
+#: templates/form_grid/stock_entry_grid.html:9
 msgid "Warehouse"
 msgstr "Almacén"
 
@@ -78123,12 +79592,24 @@
 msgid "Warehouse"
 msgstr "Almacén"
 
+#. Label of a Link field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Warehouse"
+msgstr "Almacén"
+
 #. Label of a Link field in DocType 'Pick List Item'
 #: stock/doctype/pick_list_item/pick_list_item.json
 msgctxt "Pick List Item"
 msgid "Warehouse"
 msgstr "Almacén"
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Warehouse"
+msgstr "Almacén"
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -78263,9 +79744,15 @@
 msgid "Warehouse"
 msgstr "Almacén"
 
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Warehouse"
+msgstr "Almacén"
+
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:4
 msgid "Warehouse Capacity Summary"
-msgstr ""
+msgstr "Resumen de capacidad del Almacén"
 
 #: stock/doctype/putaway_rule/putaway_rule.py:78
 msgid "Warehouse Capacity for Item '{0}' must be greater than the existing stock level of {1} {2}."
@@ -78291,7 +79778,7 @@
 
 #: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py:113
 msgid "Warehouse Disabled?"
-msgstr ""
+msgstr "¿Almacén deshabilitado?"
 
 #. Label of a Data field in DocType 'Warehouse'
 #: stock/doctype/warehouse/warehouse.json
@@ -78388,12 +79875,12 @@
 msgid "Warehouse not found against the account {0}"
 msgstr "Almacén no encontrado en la cuenta {0}"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:367
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:421
 msgid "Warehouse not found in the system"
 msgstr "El almacén no se encuentra en el sistema"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1005
-#: stock/doctype/delivery_note/delivery_note.py:362
+#: accounts/doctype/sales_invoice/sales_invoice.py:1022
+#: stock/doctype/delivery_note/delivery_note.py:416
 msgid "Warehouse required for stock Item {0}"
 msgstr "El almacén es requerido para el stock del producto {0}"
 
@@ -78415,11 +79902,11 @@
 msgid "Warehouse {0} does not belong to Company {1}."
 msgstr ""
 
-#: stock/utils.py:441
+#: stock/utils.py:436
 msgid "Warehouse {0} does not belong to company {1}"
 msgstr "El almacén {0} no pertenece a la compañía {1}"
 
-#: controllers/stock_controller.py:244
+#: controllers/stock_controller.py:426
 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 ""
 
@@ -78431,7 +79918,7 @@
 msgid "Warehouse: {0} does not belong to {1}"
 msgstr "Almacén: {0} no pertenece a {1}"
 
-#: manufacturing/doctype/production_plan/production_plan.js:379
+#: manufacturing/doctype/production_plan/production_plan.js:407
 msgid "Warehouses"
 msgstr "Almacenes"
 
@@ -78541,9 +80028,9 @@
 msgid "Warn for new Request for Quotations"
 msgstr "Avisar de nuevas Solicitudes de Presupuesto"
 
-#: accounts/doctype/payment_entry/payment_entry.py:639
-#: controllers/accounts_controller.py:1676
-#: stock/doctype/delivery_trip/delivery_trip.js:123
+#: accounts/doctype/payment_entry/payment_entry.py:648
+#: controllers/accounts_controller.py:1765
+#: stock/doctype/delivery_trip/delivery_trip.js:144
 #: utilities/transaction_base.py:122
 msgid "Warning"
 msgstr "Advertencia"
@@ -78556,15 +80043,15 @@
 msgid "Warning!"
 msgstr "¡Advertencia!"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1146
+#: accounts/doctype/journal_entry/journal_entry.py:1173
 msgid "Warning: Another {0} # {1} exists against stock entry {2}"
 msgstr "Advertencia: Existe otra {0} # {1} para la entrada de inventario {2}"
 
-#: stock/doctype/material_request/material_request.js:415
+#: stock/doctype/material_request/material_request.js:484
 msgid "Warning: Material Requested Qty is less than Minimum Order Qty"
 msgstr "Advertencia: La requisición de materiales es menor que la orden mínima establecida"
 
-#: selling/doctype/sales_order/sales_order.py:252
+#: selling/doctype/sales_order/sales_order.py:254
 msgid "Warning: Sales Order {0} already exists against Customer's Purchase Order {1}"
 msgstr "Advertencia: La orden de venta {0} ya existe para la orden de compra {1} del cliente"
 
@@ -78586,7 +80073,7 @@
 msgstr "Garantía / Estado de CMA"
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:97
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:103
 #: support/doctype/warranty_claim/warranty_claim.json
 msgid "Warranty Claim"
 msgstr "Reclamación de Garantía"
@@ -78626,6 +80113,10 @@
 msgid "Watch Video"
 msgstr "Ver video"
 
+#: controllers/accounts_controller.py:232
+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 ""
+
 #: www/support/index.html:7
 msgid "We're here to help!"
 msgstr "¡Estamos aquí para ayudar!"
@@ -78835,12 +80326,12 @@
 msgid "Weekday"
 msgstr "Día laborable"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:34
-#: public/js/stock_analytics.js:52
-#: selling/report/sales_analytics/sales_analytics.js:61
-#: stock/report/stock_analytics/stock_analytics.js:80
-#: support/report/issue_analytics/issue_analytics.js:42
+#: buying/report/purchase_analytics/purchase_analytics.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:33
+#: public/js/stock_analytics.js:82
+#: selling/report/sales_analytics/sales_analytics.js:68
+#: stock/report/stock_analytics/stock_analytics.js:79
+#: support/report/issue_analytics/issue_analytics.js:41
 msgid "Weekly"
 msgstr "Semanal"
 
@@ -79097,15 +80588,22 @@
 msgid "Wheels"
 msgstr "Ruedas"
 
-#: stock/doctype/item/item.js:834
+#. Description of the 'Sub Assembly Warehouse' (Link) field in DocType
+#. 'Production Plan'
+#: manufacturing/doctype/production_plan/production_plan.json
+msgctxt "Production Plan"
+msgid "When a parent warehouse is chosen, the system conducts stock checks against the associated child warehouses"
+msgstr ""
+
+#: stock/doctype/item/item.js:920
 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:313
+#: accounts/doctype/account/account.py:332
 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account."
 msgstr "Al crear una cuenta para la empresa secundaria {0}, la cuenta principal {1} se encontró como una cuenta contable."
 
-#: accounts/doctype/account/account.py:303
+#: accounts/doctype/account/account.py:322
 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA"
 msgstr "Al crear la cuenta para la empresa secundaria {0}, no se encontró la cuenta principal {1}. Cree la cuenta principal en el COA correspondiente"
 
@@ -79168,7 +80666,11 @@
 msgid "With Operations"
 msgstr "Con Operaciones"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:70
+#: accounts/report/trial_balance/trial_balance.js:82
+msgid "With Period Closing Entry For Opening Balances"
+msgstr ""
+
+#: public/js/bank_reconciliation_tool/data_table_manager.js:67
 msgid "Withdrawal"
 msgstr ""
 
@@ -79184,7 +80686,7 @@
 msgid "Work Done"
 msgstr "Trabajo Realizado"
 
-#: setup/doctype/company/company.py:261
+#: setup/doctype/company/company.py:260
 msgid "Work In Progress"
 msgstr "Trabajo en Proceso"
 
@@ -79206,7 +80708,7 @@
 msgid "Work In Progress"
 msgstr "Trabajo en Proceso"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:20
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:23
 msgid "Work In Progress Warehouse"
 msgstr "Almacén de trabajo en curso"
 
@@ -79214,19 +80716,20 @@
 #. Title of an Onboarding Step
 #: manufacturing/doctype/bom/bom.js:119
 #: manufacturing/doctype/work_order/work_order.json
+#: manufacturing/doctype/workstation/workstation_job_card.html:26
 #: manufacturing/onboarding_step/work_order/work_order.json
-#: manufacturing/report/bom_variance_report/bom_variance_report.js: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:42
+#: 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/job_card_summary/job_card_summary.py:145
-#: manufacturing/report/process_loss_report/process_loss_report.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:22
 #: manufacturing/report/process_loss_report/process_loss_report.py:68
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:30
+#: 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:560
-#: stock/doctype/material_request/material_request.js:152
-#: stock/doctype/material_request/material_request.py:779
+#: selling/doctype/sales_order/sales_order.js:624
+#: stock/doctype/material_request/material_request.js:178
+#: stock/doctype/material_request/material_request.py:791
 #: templates/pages/material_request_info.html:45
 msgid "Work Order"
 msgstr "Orden de trabajo"
@@ -79277,7 +80780,7 @@
 msgid "Work Order"
 msgstr "Orden de trabajo"
 
-#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:121
 msgid "Work Order / Subcontract PO"
 msgstr ""
 
@@ -79324,33 +80827,33 @@
 msgid "Work Order Summary"
 msgstr "Resumen de la orden de trabajo"
 
-#: stock/doctype/material_request/material_request.py:784
+#: stock/doctype/material_request/material_request.py:796
 msgid "Work Order cannot be created for following reason: <br> {0}"
 msgstr "No se puede crear una orden de trabajo por el siguiente motivo:<br> {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:927
+#: manufacturing/doctype/work_order/work_order.py:941
 msgid "Work Order cannot be raised against a Item Template"
 msgstr "La Órden de Trabajo no puede levantarse contra una Plantilla de Artículo"
 
-#: manufacturing/doctype/work_order/work_order.py:1399
-#: manufacturing/doctype/work_order/work_order.py:1458
+#: manufacturing/doctype/work_order/work_order.py:1413
+#: manufacturing/doctype/work_order/work_order.py:1472
 msgid "Work Order has been {0}"
 msgstr "La orden de trabajo ha sido {0}"
 
-#: selling/doctype/sales_order/sales_order.js:667
+#: selling/doctype/sales_order/sales_order.js:768
 msgid "Work Order not created"
 msgstr "Orden de trabajo no creada"
 
-#: stock/doctype/stock_entry/stock_entry.py:679
+#: stock/doctype/stock_entry/stock_entry.py:634
 msgid "Work Order {0}: Job Card not found for the operation {1}"
 msgstr "Orden de trabajo {0}: Tarjeta de trabajo no encontrada para la operación {1}"
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:57
-#: stock/doctype/material_request/material_request.py:774
+#: manufacturing/report/job_card_summary/job_card_summary.js:56
+#: stock/doctype/material_request/material_request.py:786
 msgid "Work Orders"
 msgstr "Órdenes de trabajo"
 
-#: selling/doctype/sales_order/sales_order.js:731
+#: selling/doctype/sales_order/sales_order.js:844
 msgid "Work Orders Created: {0}"
 msgstr "Órdenes de trabajo creadas: {0}"
 
@@ -79377,7 +80880,7 @@
 msgid "Work-in-Progress Warehouse"
 msgstr "Almacén de trabajos en proceso"
 
-#: manufacturing/doctype/work_order/work_order.py:425
+#: manufacturing/doctype/work_order/work_order.py:436
 msgid "Work-in-Progress Warehouse is required before Submit"
 msgstr "Se requiere un almacén de trabajos en proceso antes de validar"
 
@@ -79414,6 +80917,10 @@
 msgid "Workflow State"
 msgstr "Estados de flujos de trabajo"
 
+#: templates/pages/task_info.html:73
+msgid "Working"
+msgstr "Trabajando"
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -79440,14 +80947,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/work_order/work_order.js:232
+#: manufacturing/doctype/work_order/work_order.js:247
 #: manufacturing/doctype/workstation/workstation.json
 #: manufacturing/onboarding_step/workstation/workstation.json
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:36
+#: 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:61
+#: 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/job_card_summary/job_card_summary.js:73
+#: 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
 msgid "Workstation"
@@ -79489,12 +80996,24 @@
 msgid "Workstation / Machine"
 msgstr "Estación de trabajo / máquina"
 
+#. Label of a HTML field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Dashboard"
+msgstr ""
+
 #. Label of a Data field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Workstation Name"
 msgstr "Nombre de la estación de trabajo"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Status"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/workstation_type/workstation_type.json
 msgid "Workstation Type"
@@ -79537,17 +81056,23 @@
 msgid "Workstation Working Hour"
 msgstr "Horario de la estación de trabajo"
 
-#: manufacturing/doctype/workstation/workstation.py:199
+#: manufacturing/doctype/workstation/workstation.py:355
 msgid "Workstation is closed on the following dates as per Holiday List: {0}"
 msgstr "La estación de trabajo estará cerrada en las siguientes fechas según la lista de festividades: {0}"
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Workstations"
+msgstr ""
+
 #: setup/setup_wizard/setup_wizard.py:16 setup/setup_wizard/setup_wizard.py:41
 msgid "Wrapping up"
 msgstr "Terminando"
 
 #: 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:510
+#: setup/doctype/company/company.py:509
 msgid "Write Off"
 msgstr "Desajuste"
 
@@ -79738,7 +81263,7 @@
 msgid "Wrong Company"
 msgstr "Compañía incorrecta"
 
-#: setup/doctype/company/company.js:172
+#: setup/doctype/company/company.js:202
 msgid "Wrong Password"
 msgstr "Contraseña incorrecta"
 
@@ -79797,20 +81322,20 @@
 msgid "Year start date or end date is overlapping with {0}. To avoid please set company"
 msgstr "Fecha de inicio de año o fecha de finalización  de año está traslapando con {0}. Para evitar porfavor establezca empresa"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:67
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:70
-#: buying/report/purchase_analytics/purchase_analytics.js:64
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:37
-#: public/js/financial_statements.js:220
+#: accounts/report/budget_variance_report/budget_variance_report.js:65
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:78
+#: buying/report/purchase_analytics/purchase_analytics.js:63
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:36
+#: public/js/financial_statements.js:229
 #: public/js/purchase_trends_filters.js:22 public/js/sales_trends_filters.js:14
-#: public/js/stock_analytics.js:55
-#: selling/report/sales_analytics/sales_analytics.js:64
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:36
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:36
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:36
-#: stock/report/stock_analytics/stock_analytics.js:83
-#: support/report/issue_analytics/issue_analytics.js:45
+#: public/js/stock_analytics.js:85
+#: selling/report/sales_analytics/sales_analytics.js:71
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: stock/report/stock_analytics/stock_analytics.js:82
+#: support/report/issue_analytics/issue_analytics.js:44
 msgid "Yearly"
 msgstr "Anual"
 
@@ -79943,23 +81468,23 @@
 msgid "Yes"
 msgstr "Si"
 
-#: controllers/accounts_controller.py:3151
+#: controllers/accounts_controller.py:3242
 msgid "You are not allowed to update as per the conditions set in {} Workflow."
 msgstr "No se le permite actualizar según las condiciones establecidas en {} Flujo de trabajo."
 
-#: accounts/general_ledger.py:665
+#: accounts/general_ledger.py:674
 msgid "You are not authorized to add or update entries before {0}"
 msgstr "No tiene permisos para agregar o actualizar las entradas antes de {0}"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:317
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
 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:263
+#: accounts/doctype/account/account.py:282
 msgid "You are not authorized to set Frozen value"
 msgstr "Usted no está autorizado para definir el 'valor congelado'"
 
-#: stock/doctype/pick_list/pick_list.py:307
+#: stock/doctype/pick_list/pick_list.py:347
 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 ""
 
@@ -79975,7 +81500,7 @@
 msgid "You can also set default CWIP account in Company {}"
 msgstr "También puede configurar una cuenta CWIP predeterminada en la empresa {}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:873
+#: accounts/doctype/sales_invoice/sales_invoice.py:890
 msgid "You can change the parent account to a Balance Sheet account or select a different account."
 msgstr "Puede cambiar la cuenta principal a una cuenta de balance o seleccionar una cuenta diferente."
 
@@ -79983,7 +81508,7 @@
 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:583
+#: accounts/doctype/journal_entry/journal_entry.py:610
 msgid "You can not enter current voucher in 'Against Journal Entry' column"
 msgstr "Usted no puede ingresar Comprobante Actual en la comumna 'Contra Contrada de Diario'"
 
@@ -79991,8 +81516,8 @@
 msgid "You can only have Plans with the same billing cycle in a Subscription"
 msgstr "Solo puede tener Planes con el mismo ciclo de facturación en una Suscripción"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:239
-#: accounts/doctype/sales_invoice/sales_invoice.js:847
+#: accounts/doctype/pos_invoice/pos_invoice.js:258
+#: accounts/doctype/sales_invoice/sales_invoice.js:915
 msgid "You can only redeem max {0} points in this order."
 msgstr "Solo puede canjear max {0} puntos en este orden."
 
@@ -80000,11 +81525,11 @@
 msgid "You can only select one mode of payment as default"
 msgstr "Solo puede seleccionar un modo de pago por defecto"
 
-#: selling/page/point_of_sale/pos_payment.js:478
+#: selling/page/point_of_sale/pos_payment.js:506
 msgid "You can redeem upto {0}."
 msgstr "Puede canjear hasta {0}."
 
-#: manufacturing/doctype/workstation/workstation.js:37
+#: manufacturing/doctype/workstation/workstation.js:59
 msgid "You can set it as a machine name or operation type. For example, stiching machine 12"
 msgstr ""
 
@@ -80013,7 +81538,7 @@
 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:1027
+#: manufacturing/doctype/job_card/job_card.py:1042
 msgid "You can't make any changes to Job Card since Work Order is closed."
 msgstr ""
 
@@ -80021,7 +81546,7 @@
 msgid "You can't redeem Loyalty Points having more value than the Rounded Total."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:532
+#: manufacturing/doctype/bom/bom.js:549
 msgid "You cannot change the rate if BOM is mentioned against any Item."
 msgstr ""
 
@@ -80029,15 +81554,15 @@
 msgid "You cannot create a {0} within the closed Accounting Period {1}"
 msgstr ""
 
-#: accounts/general_ledger.py:155
+#: accounts/general_ledger.py:159
 msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
 msgstr "No puede crear ni cancelar ningún asiento contable dentro del período contable cerrado {0}"
 
-#: accounts/general_ledger.py:689
+#: accounts/general_ledger.py:698
 msgid "You cannot create/amend any accounting entries till this date."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:809
+#: accounts/doctype/journal_entry/journal_entry.py:836
 msgid "You cannot credit and debit same account at the same time"
 msgstr "No se pueden registrar Debitos y Creditos a la misma Cuenta al mismo tiempo"
 
@@ -80049,7 +81574,7 @@
 msgid "You cannot edit root node."
 msgstr "No puedes editar el nodo raíz."
 
-#: selling/page/point_of_sale/pos_payment.js:507
+#: selling/page/point_of_sale/pos_payment.js:536
 msgid "You cannot redeem more than {0}."
 msgstr "No puede canjear más de {0}."
 
@@ -80061,15 +81586,15 @@
 msgid "You cannot restart a Subscription that is not cancelled."
 msgstr "No puede reiniciar una suscripción que no está cancelada."
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:210
 msgid "You cannot submit empty order."
 msgstr "No puede enviar un pedido vacío."
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:209
 msgid "You cannot submit the order without payment."
 msgstr "No puede enviar el pedido sin pago."
 
-#: controllers/accounts_controller.py:3127
+#: controllers/accounts_controller.py:3218
 msgid "You do not have permissions to {} items in a {}."
 msgstr "No tienes permisos para {} elementos en un {}."
 
@@ -80077,7 +81602,7 @@
 msgid "You don't have enough Loyalty Points to redeem"
 msgstr "No tienes suficientes puntos de lealtad para canjear"
 
-#: selling/page/point_of_sale/pos_payment.js:474
+#: selling/page/point_of_sale/pos_payment.js:499
 msgid "You don't have enough points to redeem."
 msgstr "No tienes suficientes puntos para canjear."
 
@@ -80085,7 +81610,7 @@
 msgid "You had {} errors while creating opening invoices. Check {} for more details"
 msgstr "Tuvo {} errores al crear facturas de apertura. Consulte {} para obtener más detalles"
 
-#: public/js/utils.js:822
+#: public/js/utils.js:893
 msgid "You have already selected items from {0} {1}"
 msgstr "Ya ha seleccionado artículos de {0} {1}"
 
@@ -80093,7 +81618,7 @@
 msgid "You have been invited to collaborate on the project: {0}"
 msgstr "Se le ha invitado a colaborar en el proyecto: {0}"
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:442
 msgid "You have entered a duplicate Delivery Note on Row"
 msgstr ""
 
@@ -80103,13 +81628,13 @@
 
 #: templates/pages/projects.html:134
 msgid "You haven't created a {0} yet"
-msgstr ""
+msgstr "Aún no ha creado un {0}"
 
-#: selling/page/point_of_sale/pos_controller.js:196
+#: selling/page/point_of_sale/pos_controller.js:218
 msgid "You must add atleast one item to save it as draft."
 msgstr "Debe agregar al menos un elemento para guardarlo como borrador."
 
-#: selling/page/point_of_sale/pos_controller.js:598
+#: selling/page/point_of_sale/pos_controller.js:626
 msgid "You must select a customer before adding an item."
 msgstr "Debe seleccionar un cliente antes de agregar un artículo."
 
@@ -80174,7 +81699,7 @@
 msgid "Youtube Statistics"
 msgstr "Estadísticas de Youtube"
 
-#: public/js/utils/contact_address_quick_entry.js:68
+#: public/js/utils/contact_address_quick_entry.js:71
 msgid "ZIP Code"
 msgstr "Código postal"
 
@@ -80188,7 +81713,7 @@
 msgid "Zero Rated"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Zero quantity"
 msgstr ""
 
@@ -80198,7 +81723,7 @@
 msgid "Zip File"
 msgstr "Archivo zip"
 
-#: stock/reorder_item.py:283
+#: stock/reorder_item.py:368
 msgid "[Important] [ERPNext] Auto Reorder Errors"
 msgstr "[Importante] [ERPNext] Errores de reorden automático"
 
@@ -80206,16 +81731,20 @@
 msgid "`Allow Negative rates for Items`"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:89
+#: stock/doctype/stock_settings/stock_settings.py:92
 #, python-format
 msgid "`Freeze Stocks Older Than` should be smaller than %d days."
 msgstr ""
 
+#: stock/stock_ledger.py:1700
+msgid "after"
+msgstr ""
+
 #: accounts/doctype/shipping_rule/shipping_rule.py:204
 msgid "and"
 msgstr "y"
 
-#: manufacturing/doctype/bom/bom.js:759
+#: manufacturing/doctype/bom/bom.js:792
 msgid "as a percentage of finished item quantity"
 msgstr ""
 
@@ -80223,11 +81752,15 @@
 msgid "at"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:17
-#: selling/report/sales_analytics/sales_analytics.js:17
+#: buying/report/purchase_analytics/purchase_analytics.js:16
+#: selling/report/sales_analytics/sales_analytics.js:24
 msgid "based_on"
 msgstr "basado_en"
 
+#: public/js/utils/sales_common.js:256
+msgid "cannot be greater than 100"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgctxt "Production Plan Sub Assembly Item"
@@ -80241,8 +81774,12 @@
 msgid "development"
 msgstr "desarrollo"
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "discount applied"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:46
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:57
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:58
 msgid "doc_type"
 msgstr ""
 
@@ -80271,6 +81808,10 @@
 msgid "exchangerate.host"
 msgstr ""
 
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:161
+msgid "fieldname"
+msgstr ""
+
 #. Option for the 'Service Provider' (Select) field in DocType 'Currency
 #. Exchange Settings'
 #: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
@@ -80278,13 +81819,21 @@
 msgid "frankfurter.app"
 msgstr ""
 
+#: templates/form_grid/item_grid.html:66 templates/form_grid/item_grid.html:80
+msgid "hidden"
+msgstr ""
+
+#: projects/doctype/project/project_dashboard.html:13
+msgid "hours"
+msgstr ""
+
 #. Label of a Attach Image field in DocType 'Batch'
 #: stock/doctype/batch/batch.json
 msgctxt "Batch"
 msgid "image"
 msgstr "imagen"
 
-#: accounts/doctype/budget/budget.py:253
+#: accounts/doctype/budget/budget.py:260
 msgid "is already"
 msgstr ""
 
@@ -80360,7 +81909,7 @@
 msgid "material_request_item"
 msgstr ""
 
-#: controllers/selling_controller.py:150
+#: controllers/selling_controller.py:151
 msgid "must be between 0 and 100"
 msgstr ""
 
@@ -80406,7 +81955,11 @@
 msgid "old_parent"
 msgstr ""
 
-#: controllers/accounts_controller.py:1033
+#: templates/pages/task_info.html:90
+msgid "on"
+msgstr ""
+
+#: controllers/accounts_controller.py:1097
 msgid "or"
 msgstr "o"
 
@@ -80418,7 +81971,7 @@
 msgid "out of 5"
 msgstr ""
 
-#: public/js/utils.js:369
+#: public/js/utils.js:417
 msgid "payments app is not installed. Please install it from {0} or {1}"
 msgstr ""
 
@@ -80459,7 +82012,7 @@
 msgid "per hour"
 msgstr "por hora"
 
-#: stock/stock_ledger.py:1681
+#: stock/stock_ledger.py:1701
 msgid "performing either one below:"
 msgstr ""
 
@@ -80487,7 +82040,7 @@
 msgid "ratings"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 msgid "received from"
 msgstr "recibido de"
 
@@ -80564,10 +82117,6 @@
 msgid "sandbox"
 msgstr "salvadera"
 
-#: public/js/controllers/transaction.js:920
-msgid "selected Payment Terms Template"
-msgstr ""
-
 #: accounts/doctype/subscription/subscription.py:711
 msgid "subscription is already cancelled."
 msgstr ""
@@ -80588,12 +82137,14 @@
 msgid "title"
 msgstr "título"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 #: 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 "a"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2737
+#: accounts/doctype/sales_invoice/sales_invoice.py:2706
 msgid "to unallocate the amount of this Return Invoice before cancelling it."
 msgstr ""
 
@@ -80616,7 +82167,7 @@
 msgid "via BOM Update Tool"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:256
+#: accounts/doctype/budget/budget.py:263
 msgid "will be"
 msgstr ""
 
@@ -80627,9 +82178,9 @@
 #: accounts/report/cash_flow/cash_flow.py:226
 #: accounts/report/cash_flow/cash_flow.py:227
 msgid "{0}"
-msgstr ""
+msgstr "{0}"
 
-#: controllers/accounts_controller.py:878
+#: controllers/accounts_controller.py:930
 msgid "{0} '{1}' is disabled"
 msgstr "{0} '{1}' está deshabilitado"
 
@@ -80637,7 +82188,7 @@
 msgid "{0} '{1}' not in Fiscal Year {2}"
 msgstr "{0} '{1}' no esta en el año fiscal {2}"
 
-#: manufacturing/doctype/work_order/work_order.py:355
+#: manufacturing/doctype/work_order/work_order.py:366
 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
 msgstr "{0} ({1}) no puede ser mayor que la cantidad planificada ({2}) en la Orden de trabajo {3}"
 
@@ -80645,19 +82196,19 @@
 msgid "{0} - Above"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:253
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:281
 msgid "{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
 msgstr ""
 
-#: controllers/accounts_controller.py:1893
+#: controllers/accounts_controller.py:1985
 msgid "{0} Account not found against Customer {1}."
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:261
+#: accounts/doctype/budget/budget.py:268
 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It {5} exceed by {6}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:759
+#: accounts/doctype/pricing_rule/utils.py:758
 msgid "{0} Coupon used are {1}. Allowed quantity is exhausted"
 msgstr "Los cupones {0} utilizados son {1}. La cantidad permitida se agota"
 
@@ -80665,11 +82216,11 @@
 msgid "{0} Digest"
 msgstr "{0} Resumen"
 
-#: accounts/utils.py:1286
+#: accounts/utils.py:1255
 msgid "{0} Number {1} is already used in {2} {3}"
 msgstr "{0} Número {1} ya se usa en {2} {3}"
 
-#: manufacturing/doctype/work_order/work_order.js:379
+#: manufacturing/doctype/work_order/work_order.js:397
 msgid "{0} Operations: {1}"
 msgstr "{0} Operaciones: {1}"
 
@@ -80681,7 +82232,7 @@
 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
 msgstr "{0} Retener muestra se basa en el lote, marque Tiene número de lote para retener la muestra del artículo."
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:429
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:428
 msgid "{0} Transaction(s) Reconciled"
 msgstr ""
 
@@ -80689,23 +82240,23 @@
 msgid "{0} account is not of type {1}"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:447
+#: stock/doctype/purchase_receipt/purchase_receipt.py:448
 msgid "{0} account not found while submitting purchase receipt"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:930
+#: accounts/doctype/journal_entry/journal_entry.py:957
 msgid "{0} against Bill {1} dated {2}"
 msgstr "{0} contra la factura {1} de fecha {2}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:939
+#: accounts/doctype/journal_entry/journal_entry.py:966
 msgid "{0} against Purchase Order {1}"
 msgstr "{0} contra la orden de compra {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:906
+#: accounts/doctype/journal_entry/journal_entry.py:933
 msgid "{0} against Sales Invoice {1}"
 msgstr "{0} contra la factura de ventas {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:913
+#: accounts/doctype/journal_entry/journal_entry.py:940
 msgid "{0} against Sales Order {1}"
 msgstr "{0} contra la orden de ventas {1}"
 
@@ -80713,7 +82264,7 @@
 msgid "{0} already has a Parent Procedure {1}."
 msgstr "{0} ya tiene un Procedimiento principal {1}."
 
-#: stock/doctype/delivery_note/delivery_note.py:610
+#: stock/doctype/delivery_note/delivery_note.py:671
 msgid "{0} and {1}"
 msgstr "{0} y {1}"
 
@@ -80734,16 +82285,16 @@
 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:783
-#: manufacturing/doctype/production_plan/production_plan.py:877
+#: manufacturing/doctype/production_plan/production_plan.py:792
+#: manufacturing/doctype/production_plan/production_plan.py:886
 msgid "{0} created"
 msgstr "{0} creado"
 
-#: setup/doctype/company/company.py:191
+#: setup/doctype/company/company.py:190
 msgid "{0} currency must be same as company's default currency. Please select another account."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:310
+#: buying/doctype/purchase_order/purchase_order.py:311
 msgid "{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution."
 msgstr "{0} tiene actualmente una {1} Tarjeta de Puntuación de Proveedores y las Órdenes de Compra a este Proveedor deben ser emitidas con precaución."
 
@@ -80773,9 +82324,13 @@
 
 #: setup/default_success_action.py:14
 msgid "{0} has been submitted successfully"
-msgstr "{0} ha sido enviado con éxito"
+msgstr "{0} se ha enviado correctamente"
 
-#: controllers/accounts_controller.py:2212
+#: projects/doctype/project/project_dashboard.html:15
+msgid "{0} hours"
+msgstr ""
+
+#: controllers/accounts_controller.py:2304
 msgid "{0} in row {1}"
 msgstr "{0} en la fila {1}"
 
@@ -80783,23 +82338,27 @@
 msgid "{0} is a mandatory Accounting Dimension. <br>Please set a value for {0} in Accounting Dimensions section."
 msgstr ""
 
-#: controllers/accounts_controller.py:162
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:189
+msgid "{0} is already running for {1}"
+msgstr ""
+
+#: controllers/accounts_controller.py:164
 msgid "{0} is blocked so this transaction cannot proceed"
 msgstr "{0} está bloqueado por lo que esta transacción no puede continuar"
 
 #: accounts/doctype/budget/budget.py:57
-#: accounts/doctype/payment_entry/payment_entry.py:542
+#: accounts/doctype/payment_entry/payment_entry.py:551
 #: accounts/report/general_ledger/general_ledger.py:62
 #: accounts/report/pos_register/pos_register.py:110 controllers/trends.py:50
 msgid "{0} is mandatory"
 msgstr "{0} es obligatorio"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:975
+#: accounts/doctype/sales_invoice/sales_invoice.py:992
 msgid "{0} is mandatory for Item {1}"
 msgstr "{0} es obligatorio para el artículo {1}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:220
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:101
+#: accounts/general_ledger.py:722
 msgid "{0} is mandatory for account {1}"
 msgstr ""
 
@@ -80807,7 +82366,7 @@
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
 msgstr "{0} es obligatorio. Quizás no se crea el registro de cambio de moneda para {1} a {2}"
 
-#: controllers/accounts_controller.py:2491
+#: controllers/accounts_controller.py:2576
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
 msgstr "{0} es obligatorio. Posiblemente el registro de cambio de moneda no ha sido creado para {1} hasta {2}."
 
@@ -80819,7 +82378,7 @@
 msgid "{0} is not a group node. Please select a group node as parent cost center"
 msgstr "{0} no es un nodo de grupo. Seleccione un nodo de grupo como centro de costo primario"
 
-#: stock/doctype/stock_entry/stock_entry.py:456
+#: stock/doctype/stock_entry/stock_entry.py:411
 msgid "{0} is not a stock Item"
 msgstr "{0} no es un artículo en existencia"
 
@@ -80835,26 +82394,30 @@
 msgid "{0} is not enabled in {1}"
 msgstr "{0} no está habilitado en {1}"
 
-#: stock/doctype/material_request/material_request.py:565
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197
+msgid "{0} is not running. Cannot trigger events for this Document"
+msgstr ""
+
+#: stock/doctype/material_request/material_request.py:566
 msgid "{0} is not the default supplier for any items."
 msgstr "{0} no es el proveedor predeterminado para ningún artículo."
 
-#: accounts/doctype/payment_entry/payment_entry.py:2300
+#: accounts/doctype/payment_entry/payment_entry.py:2325
 msgid "{0} is on hold till {1}"
 msgstr "{0} está en espera hasta {1}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:131
+#: accounts/doctype/gl_entry/gl_entry.py:121
 #: accounts/doctype/pricing_rule/pricing_rule.py:165
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:182
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:193
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:118
 msgid "{0} is required"
 msgstr "{0} es requerido"
 
-#: manufacturing/doctype/work_order/work_order.js:343
+#: manufacturing/doctype/work_order/work_order.js:362
 msgid "{0} items in progress"
 msgstr "{0} artículos en curso"
 
-#: manufacturing/doctype/work_order/work_order.js:327
+#: manufacturing/doctype/work_order/work_order.js:346
 msgid "{0} items produced"
 msgstr "{0} artículos producidos"
 
@@ -80862,7 +82425,7 @@
 msgid "{0} must be negative in return document"
 msgstr "{0} debe ser negativo en el documento de devolución"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1988
+#: accounts/doctype/sales_invoice/sales_invoice.py:1957
 msgid "{0} not allowed to transact with {1}. Please change the Company."
 msgstr "{0} no se permite realizar transacciones con {1}. Por favor cambia la Compañía."
 
@@ -80878,60 +82441,60 @@
 msgid "{0} payment entries can not be filtered by {1}"
 msgstr "{0} entradas de pago no pueden ser filtradas por {1}"
 
-#: controllers/stock_controller.py:899
+#: controllers/stock_controller.py:1085
 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:451
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:505
 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:702
+#: stock/doctype/pick_list/pick_list.py:773
 msgid "{0} units of Item {1} is not available."
 msgstr "Las {0} unidades del artículo {1} no están disponibles."
 
-#: stock/doctype/pick_list/pick_list.py:718
+#: stock/doctype/pick_list/pick_list.py:789
 msgid "{0} units of Item {1} is picked in another Pick List."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:135
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:145
 msgid "{0} units of {1} are required in {2}{3}, on {4} {5} for {6} to complete the transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1340 stock/stock_ledger.py:1829
-#: stock/stock_ledger.py:1845
+#: stock/stock_ledger.py:1366 stock/stock_ledger.py:1836
+#: stock/stock_ledger.py:1852
 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
 msgstr "{0} unidades de {1} necesaria en {2} sobre {3} {4} {5} para completar esta transacción."
 
-#: stock/stock_ledger.py:1955 stock/stock_ledger.py:2005
+#: stock/stock_ledger.py:1962 stock/stock_ledger.py:2012
 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1334
+#: stock/stock_ledger.py:1360
 msgid "{0} units of {1} needed in {2} to complete this transaction."
 msgstr "{0} unidades de {1} necesaria en {2} para completar esta transacción."
 
-#: stock/utils.py:432
+#: stock/utils.py:427
 msgid "{0} valid serial nos for Item {1}"
 msgstr "{0} núms. de serie válidos para el artículo {1}"
 
-#: stock/doctype/item/item.js:548
+#: stock/doctype/item/item.js:615
 msgid "{0} variants created."
 msgstr "{0} variantes creadas"
 
-#: accounts/doctype/payment_term/payment_term.js:17
+#: accounts/doctype/payment_term/payment_term.js:19
 msgid "{0} will be given as discount."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:773
+#: manufacturing/doctype/job_card/job_card.py:780
 msgid "{0} {1}"
 msgstr "{0} {1}"
 
-#: public/js/utils/serial_no_batch_selector.js:203
+#: public/js/utils/serial_no_batch_selector.js:206
 msgid "{0} {1} Manually"
-msgstr ""
+msgstr "{0} {1} Manualmente"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:433
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:432
 msgid "{0} {1} Partially Reconciled"
 msgstr "{0} {1} Parcialmente reconciliado"
 
@@ -80943,9 +82506,9 @@
 msgid "{0} {1} created"
 msgstr "{0} {1} creado"
 
-#: accounts/doctype/payment_entry/payment_entry.py:506
-#: accounts/doctype/payment_entry/payment_entry.py:562
-#: accounts/doctype/payment_entry/payment_entry.py:2065
+#: accounts/doctype/payment_entry/payment_entry.py:515
+#: accounts/doctype/payment_entry/payment_entry.py:571
+#: accounts/doctype/payment_entry/payment_entry.py:2084
 msgid "{0} {1} does not exist"
 msgstr "{0} {1} no existe"
 
@@ -80961,8 +82524,8 @@
 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:449
-#: selling/doctype/sales_order/sales_order.py:481
+#: buying/doctype/purchase_order/purchase_order.py:450
+#: selling/doctype/sales_order/sales_order.py:484
 #: stock/doctype/material_request/material_request.py:198
 msgid "{0} {1} has been modified. Please refresh."
 msgstr "{0} {1} ha sido modificado. Por favor actualice."
@@ -80975,12 +82538,12 @@
 msgid "{0} {1} is allocated twice in this Bank Transaction"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:591
+#: accounts/doctype/payment_entry/payment_entry.py:600
 msgid "{0} {1} is associated with {2}, but Party Account is {3}"
 msgstr "{0} {1} está asociado con {2}, pero la cuenta de grupo es {3}"
 
-#: controllers/buying_controller.py:624 controllers/selling_controller.py:421
-#: controllers/subcontracting_controller.py:806
+#: controllers/buying_controller.py:649 controllers/selling_controller.py:422
+#: controllers/subcontracting_controller.py:810
 msgid "{0} {1} is cancelled or closed"
 msgstr "{0} {1} está cancelado o cerrado"
 
@@ -80992,7 +82555,7 @@
 msgid "{0} {1} is cancelled so the action cannot be completed"
 msgstr "{0} {1} está cancelado por lo tanto la acción no puede ser completada"
 
-#: accounts/doctype/journal_entry/journal_entry.py:725
+#: accounts/doctype/journal_entry/journal_entry.py:752
 msgid "{0} {1} is closed"
 msgstr "{0} {1} está cerrado"
 
@@ -81004,7 +82567,7 @@
 msgid "{0} {1} is frozen"
 msgstr "{0} {1} está congelado"
 
-#: accounts/doctype/journal_entry/journal_entry.py:722
+#: accounts/doctype/journal_entry/journal_entry.py:749
 msgid "{0} {1} is fully billed"
 msgstr "{0} {1} está totalmente facturado"
 
@@ -81012,7 +82575,7 @@
 msgid "{0} {1} is not active"
 msgstr "{0} {1} no está activo"
 
-#: accounts/doctype/payment_entry/payment_entry.py:569
+#: accounts/doctype/payment_entry/payment_entry.py:578
 msgid "{0} {1} is not associated with {2} {3}"
 msgstr "{0} {1} no está asociado con {2} {3}"
 
@@ -81020,12 +82583,12 @@
 msgid "{0} {1} is not in any active Fiscal Year"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:719
-#: accounts/doctype/journal_entry/journal_entry.py:760
+#: accounts/doctype/journal_entry/journal_entry.py:746
+#: accounts/doctype/journal_entry/journal_entry.py:787
 msgid "{0} {1} is not submitted"
 msgstr "{0} {1} no se ha enviado"
 
-#: accounts/doctype/payment_entry/payment_entry.py:598
+#: accounts/doctype/payment_entry/payment_entry.py:607
 msgid "{0} {1} is on hold"
 msgstr ""
 
@@ -81033,11 +82596,11 @@
 msgid "{0} {1} is {2}"
 msgstr "{0} {1} es {2}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:603
+#: accounts/doctype/payment_entry/payment_entry.py:612
 msgid "{0} {1} must be submitted"
 msgstr "{0} {1} debe ser presentado"
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:213
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:215
 msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
 msgstr ""
 
@@ -81045,58 +82608,58 @@
 msgid "{0} {1} status is {2}"
 msgstr "{0} {1} el estado es {2}"
 
-#: public/js/utils/serial_no_batch_selector.js:189
+#: public/js/utils/serial_no_batch_selector.js:191
 msgid "{0} {1} via CSV File"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:254
+#: accounts/doctype/gl_entry/gl_entry.py:208
 msgid "{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry"
 msgstr "{0} {1}: cuenta de tipo \"Pérdidas y Ganancias\" {2} no se permite una entrada de apertura"
 
-#: accounts/doctype/gl_entry/gl_entry.py:283
+#: accounts/doctype/gl_entry/gl_entry.py:237
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:87
 msgid "{0} {1}: Account {2} does not belong to Company {3}"
 msgstr "{0} {1}: Cuenta {2} no pertenece a la compañía {3}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:271
+#: accounts/doctype/gl_entry/gl_entry.py:225
 #: 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:278
+#: accounts/doctype/gl_entry/gl_entry.py:232
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:82
 msgid "{0} {1}: Account {2} is inactive"
 msgstr "{0} {1}: la cuenta {2} está inactiva"
 
-#: accounts/doctype/gl_entry/gl_entry.py:322
+#: accounts/doctype/gl_entry/gl_entry.py:276
 msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
 msgstr "{0} {1}: La entrada contable para {2} sólo puede hacerse en la moneda: {3}"
 
-#: controllers/stock_controller.py:365
+#: controllers/stock_controller.py:547
 msgid "{0} {1}: Cost Center is mandatory for Item {2}"
 msgstr "{0} {1}: Centro de Costes es obligatorio para el artículo {2}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:171
+#: accounts/doctype/gl_entry/gl_entry.py:161
 msgid "{0} {1}: Cost Center is required for 'Profit and Loss' account {2}."
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:298
+#: accounts/doctype/gl_entry/gl_entry.py:252
 msgid "{0} {1}: Cost Center {2} does not belong to Company {3}"
 msgstr "{0} {1}: El centro de costos {2} no pertenece a la empresa {3}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:305
+#: accounts/doctype/gl_entry/gl_entry.py:259
 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:137
+#: accounts/doctype/gl_entry/gl_entry.py:127
 msgid "{0} {1}: Customer is required against Receivable account {2}"
 msgstr "{0} {1}: Se requiere al cliente para la cuenta por cobrar {2}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:159
+#: accounts/doctype/gl_entry/gl_entry.py:149
 msgid "{0} {1}: Either debit or credit amount is required for {2}"
 msgstr "{0} {1}: O bien se requiere tarjeta de débito o crédito por importe {2}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:143
+#: accounts/doctype/gl_entry/gl_entry.py:133
 msgid "{0} {1}: Supplier is required against Payable account {2}"
 msgstr "{0} {1}: se requiere un proveedor para la cuenta por pagar {2}"
 
@@ -81121,7 +82684,7 @@
 msgid "{0}'s {1} cannot be after {2}'s Expected End Date."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:1009
+#: manufacturing/doctype/job_card/job_card.py:1024
 msgid "{0}, complete the operation {1} before the operation {2}."
 msgstr "{0}, complete la operación {1} antes de la operación {2}."
 
@@ -81129,7 +82692,7 @@
 msgid "{0}: {1} does not exists"
 msgstr "{0}: {1} no existe"
 
-#: accounts/doctype/payment_entry/payment_entry.js:724
+#: accounts/doctype/payment_entry/payment_entry.js:889
 msgid "{0}: {1} must be less than {2}"
 msgstr "{0}: {1} debe ser menor que {2}"
 
@@ -81137,11 +82700,11 @@
 msgid "{0}{1} Did you rename the item? Please contact Administrator / Tech support"
 msgstr "{0} {1} ¿Cambió el nombre del elemento? Póngase en contacto con el administrador / soporte técnico"
 
-#: controllers/stock_controller.py:1160
+#: controllers/stock_controller.py:1346
 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:1148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1156
 msgid "{range4}-Above"
 msgstr ""
 
@@ -81149,11 +82712,11 @@
 msgid "{}"
 msgstr "{}"
 
-#: controllers/buying_controller.py:712
+#: controllers/buying_controller.py:737
 msgid "{} Assets created for {}"
 msgstr "{} Activos creados para {}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1775
+#: accounts/doctype/sales_invoice/sales_invoice.py:1744
 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
 msgstr "{} no se puede cancelar ya que se canjearon los puntos de fidelidad ganados. Primero cancele el {} No {}"
 
diff --git a/erpnext/locale/fa.po b/erpnext/locale/fa.po
index 9c062ef..f969b57 100644
--- a/erpnext/locale/fa.po
+++ b/erpnext/locale/fa.po
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: info@erpnext.com\n"
-"POT-Creation-Date: 2024-01-29 18:13+0053\n"
-"PO-Revision-Date: 2024-03-04 11:36\n"
+"POT-Creation-Date: 2024-03-24 09:35+0000\n"
+"PO-Revision-Date: 2024-03-26 12:47\n"
 "Last-Translator: info@erpnext.com\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -18,21 +18,17 @@
 "X-Crowdin-File-ID: 46\n"
 "Language: fa_IR\n"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:85
-msgid " "
-msgstr ""
-
 #. Label of a Column Break field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
 msgid "  "
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:76
+#: selling/doctype/quotation/quotation.js:77
 msgid " Address"
 msgstr "نشانی"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:612
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:618
 msgid " Amount"
 msgstr " میزان"
 
@@ -42,29 +38,16 @@
 msgid " Is Child Table"
 msgstr " جدول فرزند است"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:184
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:107
 #: selling/report/sales_analytics/sales_analytics.py:66
 msgid " Name"
 msgstr " نام"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:108
-msgid " Qty"
-msgstr " مقدار"
-
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:603
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:609
 msgid " Rate"
 msgstr " نرخ"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:116
-msgid " Raw Material"
-msgstr " ماده خام"
-
-#: public/js/bom_configurator/bom_configurator.bundle.js:127
-#: public/js/bom_configurator/bom_configurator.bundle.js:157
-msgid " Sub Assembly"
-msgstr " زیر مونتاژ"
-
 #: projects/doctype/project_update/project_update.py:110
 msgid " Summary"
 msgstr " خلاصه"
@@ -81,6 +64,10 @@
 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item"
 msgstr "علامت \"دارایی ثابت است\" را نمی توان بردارید، زیرا سابقه دارایی در برابر آیتم وجود دارد"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "#"
+msgstr ""
+
 #. Description of the Onboarding Step 'Accounts Settings'
 #: accounts/onboarding_step/accounts_settings/accounts_settings.json
 msgid "# Account Settings\n\n"
@@ -508,7 +495,7 @@
 msgid "% Completed"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:755
+#: manufacturing/doctype/bom/bom.js:788
 #, python-format
 msgid "% Finished Item Quantity"
 msgstr ""
@@ -520,6 +507,7 @@
 msgstr ""
 
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:70
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:16
 msgid "% Occupied"
 msgstr ""
 
@@ -609,11 +597,11 @@
 msgid "% of materials delivered against this Sales Order"
 msgstr ""
 
-#: controllers/accounts_controller.py:1899
+#: controllers/accounts_controller.py:1991
 msgid "'Account' in the Accounting section of Customer {0}"
 msgstr "حساب در بخش حسابداری مشتری {0}"
 
-#: selling/doctype/sales_order/sales_order.py:263
+#: selling/doctype/sales_order/sales_order.py:266
 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'"
 msgstr "اجازه دادن سفارشات فروش چندگانه در برابر سفارش خرید مشتری"
 
@@ -621,7 +609,7 @@
 msgid "'Based On' and 'Group By' can not be same"
 msgstr "بر اساس و \"گروه بر اساس\" نمی توانند یکسان باشند"
 
-#: stock/report/product_bundle_balance/product_bundle_balance.py:232
+#: stock/report/product_bundle_balance/product_bundle_balance.py:230
 msgid "'Date' is required"
 msgstr "'تاریخ' الزامی است"
 
@@ -629,11 +617,11 @@
 msgid "'Days Since Last Order' must be greater than or equal to zero"
 msgstr "روزهای پس از آخرین سفارش باید بزرگتر یا مساوی صفر باشد"
 
-#: controllers/accounts_controller.py:1904
+#: controllers/accounts_controller.py:1996
 msgid "'Default {0} Account' in Company {1}"
 msgstr "«حساب پیش‌فرض {0}» در شرکت {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1048
+#: accounts/doctype/journal_entry/journal_entry.py:1075
 msgid "'Entries' cannot be empty"
 msgstr "ورودی ها نمی توانند خالی باشند"
 
@@ -651,10 +639,26 @@
 msgid "'Has Serial No' can not be 'Yes' for non-stock item"
 msgstr "دارای شماره سریال نمی تواند \"بله\" برای کالاهای غیر موجودی باشد"
 
-#: stock/report/stock_ledger/stock_ledger.py:436
+#: stock/report/stock_ledger/stock_ledger.py:538
 msgid "'Opening'"
 msgstr "'افتتاح'"
 
+#: stock/doctype/delivery_note/delivery_note.py:388
+msgid "'Sales Invoice Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:381
+msgid "'Sales Invoice' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:364
+msgid "'Sales Order Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:357
+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
@@ -669,10 +673,18 @@
 msgid "'Update Stock' can not be checked because items are not delivered via {0}"
 msgstr "«به‌روزرسانی موجودی» قابل بررسی نیست زیرا موارد از طریق {0} تحویل داده نمی‌شوند"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:369
+#: accounts/doctype/sales_invoice/sales_invoice.py:380
 msgid "'Update Stock' cannot be checked for fixed asset sale"
 msgstr "به روز رسانی موجودی را نمی توان برای فروش دارایی ثابت بررسی کرد"
 
+#: accounts/doctype/bank_account/bank_account.py:64
+msgid "'{0}' account is already used by {1}. Use another account."
+msgstr ""
+
+#: controllers/accounts_controller.py:392
+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/stock_ledger_invariant_check/stock_ledger_invariant_check.py:180
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:104
@@ -764,7 +776,7 @@
 msgid "* Will be calculated in the transaction."
 msgstr "* در معامله محاسبه می شود."
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:130
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:140
 msgid ", with the inventory {0}: {1}"
 msgstr "، با موجودی {0}: {1}"
 
@@ -996,7 +1008,7 @@
 msgid "<div class=\"text-muted text-center\">No Matching Bank Transactions Found</div>"
 msgstr "<div class=\"text-muted text-center\">هیچ تراکنش بانکی منطبقی پیدا نشد</div>"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:258
+#: public/js/bank_reconciliation_tool/dialog_manager.js:262
 msgid "<div class=\"text-muted text-center\">{0}</div>"
 msgstr ""
 
@@ -1188,11 +1200,11 @@
 msgid "A BOM with name {0} already exists for item {1}."
 msgstr "یک BOM با نام {0} از قبل برای مورد {1} وجود دارد."
 
-#: selling/doctype/customer/customer.py:297
+#: selling/doctype/customer/customer.py:309
 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group"
 msgstr "یک گروه مشتری با همین نام وجود دارد، لطفا نام مشتری را تغییر دهید یا نام گروه مشتری را تغییر دهید"
 
-#: manufacturing/doctype/workstation/workstation.js:47
+#: manufacturing/doctype/workstation/workstation.js:73
 msgid "A Holiday List can be added to exclude counting these days for the Workstation."
 msgstr "فهرست تعطیلات را می توان اضافه کرد تا شمارش این روزها برای ایستگاه کاری حذف شود."
 
@@ -1204,7 +1216,17 @@
 msgid "A Packing Slip can only be created for Draft Delivery Note."
 msgstr "یک برگه بسته بندی فقط می تواند برای پیش نویس یادداشت تحویل ایجاد شود."
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:530
+#. Description of a DocType
+#: stock/doctype/price_list/price_list.json
+msgid "A Price List is a collection of Item Prices either Selling, Buying, or both"
+msgstr ""
+
+#. Description of a DocType
+#: stock/doctype/item/item.json
+msgid "A Product or a Service that is bought, sold or kept in stock."
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:535
 msgid "A Reconciliation Job {0} is running for the same filters. Cannot reconcile now"
 msgstr "یک کار آشتی {0} برای همین فیلترها در حال اجرا است. الان نمیشه آشتی کرد"
 
@@ -1214,13 +1236,14 @@
 "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:937
-msgid "A Transaction Deletion Job is triggered for {0}"
-msgstr "یک کار حذف تراکنش برای {0} فعال می شود"
+#: setup/doctype/company/company.py:916
+msgid "A Transaction Deletion Document: {0} is triggered for {0}"
+msgstr ""
 
-#: setup/doctype/company/company.py:914
-msgid "A Transaction Deletion Job: {0} is already running for {1}"
-msgstr "یک کار حذف تراکنش: {0} در حال حاضر برای {1} در حال اجرا است"
+#. Description of a DocType
+#: accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+msgid "A condition for a Shipping Rule"
+msgstr ""
 
 #. Description of the 'Send To Primary Contact' (Check) field in DocType
 #. 'Process Statement Of Accounts'
@@ -1237,6 +1260,11 @@
 msgid "A driver must be set to submit."
 msgstr "یک راننده باید برای ارسال تنظیم شود."
 
+#. Description of a DocType
+#: stock/doctype/warehouse/warehouse.json
+msgid "A logical Warehouse against which stock entries are made."
+msgstr ""
+
 #: templates/emails/confirm_appointment.html:2
 msgid "A new appointment has been created for you with {0}"
 msgstr "یک قرار جدید برای شما با {0} ایجاد شده است"
@@ -1245,6 +1273,11 @@
 msgid "A template with tax category {0} already exists. Only one template is allowed with each tax category"
 msgstr "الگویی با دسته مالیاتی {0} از قبل وجود دارد. فقط یک الگو با هر دسته مالیات مجاز است"
 
+#. Description of a DocType
+#: setup/doctype/sales_partner/sales_partner.json
+msgid "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission."
+msgstr ""
+
 #. Option for the 'Blood Group' (Select) field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -1443,11 +1476,11 @@
 msgid "Abbreviation"
 msgstr "مخفف"
 
-#: setup/doctype/company/company.py:164
+#: setup/doctype/company/company.py:163
 msgid "Abbreviation already used for another company"
 msgstr "مخفف قبلاً برای شرکت دیگری استفاده شده است"
 
-#: setup/doctype/company/company.py:159
+#: setup/doctype/company/company.py:158
 msgid "Abbreviation is mandatory"
 msgstr "علامت اختصاری الزامی است"
 
@@ -1461,15 +1494,15 @@
 msgid "About Us Settings"
 msgstr "تنظیمات درباره ما"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:39
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
 msgid "About {0} minute remaining"
 msgstr "حدود {0} دقیقه باقی مانده است"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:40
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:38
 msgid "About {0} minutes remaining"
 msgstr "حدود {0} دقیقه باقی مانده است"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:35
 msgid "About {0} seconds remaining"
 msgstr "حدود {0} ثانیه باقی مانده است"
 
@@ -1537,7 +1570,7 @@
 msgid "Accepted Qty in Stock UOM"
 msgstr "تعداد پذیرفته شده در انبار UOM"
 
-#: public/js/controllers/transaction.js:2124
+#: public/js/controllers/transaction.js:2167
 msgid "Accepted Quantity"
 msgstr "مقدار قابل قبول"
 
@@ -1589,7 +1622,7 @@
 msgid "Access Key"
 msgstr "کلید دسترسی"
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:48
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:49
 msgid "Access Key is required for Service Provider: {0}"
 msgstr "کلید دسترسی برای ارائه‌دهنده خدمات لازم است: {0}"
 
@@ -1611,13 +1644,13 @@
 #: 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_ledger/general_ledger.js:38
-#: accounts/report/general_ledger/general_ledger.py:565
-#: accounts/report/payment_ledger/payment_ledger.js:31
+#: accounts/report/general_ledger/general_ledger.py:578
+#: 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_for_party/trial_balance_for_party.js:70
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:16
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:16
+#: 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
 msgid "Account"
 msgstr "حساب"
 
@@ -1770,12 +1803,6 @@
 msgid "Account Balance"
 msgstr "موجودی حساب"
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Account Balance"
-msgstr "موجودی حساب"
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -1919,8 +1946,8 @@
 msgid "Account Manager"
 msgstr "مدیر حساب"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
-#: controllers/accounts_controller.py:1908
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
+#: controllers/accounts_controller.py:2000
 msgid "Account Missing"
 msgstr "حساب از دست رفته است"
 
@@ -1948,11 +1975,11 @@
 msgid "Account Name"
 msgstr "نام کاربری"
 
-#: accounts/doctype/account/account.py:306
+#: accounts/doctype/account/account.py:325
 msgid "Account Not Found"
 msgstr "حساب پیدا نشد"
 
-#: accounts/doctype/account/account_tree.js:108
+#: accounts/doctype/account/account_tree.js:131
 msgid "Account Number"
 msgstr "شماره حساب"
 
@@ -1962,7 +1989,7 @@
 msgid "Account Number"
 msgstr "شماره حساب"
 
-#: accounts/doctype/account/account.py:458
+#: accounts/doctype/account/account.py:477
 msgid "Account Number {0} already used in account {1}"
 msgstr "شماره حساب {0} قبلاً در حساب {1} استفاده شده است"
 
@@ -2000,8 +2027,8 @@
 msgid "Account Subtype"
 msgstr "زیرنوع حساب"
 
-#: accounts/doctype/account/account_tree.js:115
-#: accounts/report/account_balance/account_balance.js:35
+#: accounts/doctype/account/account_tree.js:152
+#: accounts/report/account_balance/account_balance.js:34
 msgid "Account Type"
 msgstr "نوع حساب"
 
@@ -2045,11 +2072,11 @@
 msgid "Account Value"
 msgstr "ارزش حساب"
 
-#: accounts/doctype/account/account.py:279
+#: accounts/doctype/account/account.py:298
 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 msgstr "موجودی حساب در حال حاضر اعتبار است، شما مجاز نیستید \"موجودی باید\" را به عنوان \"بدهی\" تنظیم کنید"
 
-#: accounts/doctype/account/account.py:273
+#: accounts/doctype/account/account.py:292
 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
 msgstr "موجودی حساب در حال حاضر در Debit است، شما مجاز به تنظیم \"Balance Must Be\" به عنوان \"Credit\" نیستید."
 
@@ -2071,7 +2098,7 @@
 msgid "Account for Change Amount"
 msgstr "حساب برای تغییر مقدار"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:44
+#: accounts/doctype/bank_clearance/bank_clearance.py:46
 msgid "Account is mandatory to get payment entries"
 msgstr "حساب برای دریافت ورودی های پرداخت اجباری است"
 
@@ -2079,28 +2106,28 @@
 msgid "Account is not set for the dashboard chart {0}"
 msgstr "حساب برای نمودار داشبورد {0} تنظیم نشده است"
 
-#: assets/doctype/asset/asset.py:677
+#: assets/doctype/asset/asset.py:679
 msgid "Account not Found"
 msgstr "حساب پیدا نشد"
 
-#: accounts/doctype/account/account.py:360
+#: accounts/doctype/account/account.py:379
 msgid "Account with child nodes cannot be converted to ledger"
 msgstr "حساب دارای گره های فرزند را نمی توان به دفتر کل تبدیل کرد"
 
-#: accounts/doctype/account/account.py:252
+#: accounts/doctype/account/account.py:271
 msgid "Account with child nodes cannot be set as ledger"
 msgstr "حساب با گره های فرزند را نمی توان به عنوان دفتر کل تنظیم کرد"
 
-#: accounts/doctype/account/account.py:371
+#: accounts/doctype/account/account.py:390
 msgid "Account with existing transaction can not be converted to group."
 msgstr "حساب با تراکنش موجود را نمی توان به گروه تبدیل کرد."
 
-#: accounts/doctype/account/account.py:400
+#: accounts/doctype/account/account.py:419
 msgid "Account with existing transaction can not be deleted"
 msgstr "حساب با تراکنش موجود قابل حذف نیست"
 
-#: accounts/doctype/account/account.py:247
-#: accounts/doctype/account/account.py:362
+#: accounts/doctype/account/account.py:266
+#: accounts/doctype/account/account.py:381
 msgid "Account with existing transaction cannot be converted to ledger"
 msgstr "حساب با تراکنش موجود را نمی توان به دفتر کل تبدیل کرد"
 
@@ -2108,7 +2135,7 @@
 msgid "Account {0} added multiple times"
 msgstr "حساب {0} چندین بار اضافه شد"
 
-#: setup/doctype/company/company.py:187
+#: setup/doctype/company/company.py:186
 msgid "Account {0} does not belong to company: {1}"
 msgstr "حساب {0} متعلق به شرکت نیست: {1}"
 
@@ -2116,7 +2143,7 @@
 msgid "Account {0} does not belongs to company {1}"
 msgstr "حساب {0} متعلق به شرکت {1} نیست"
 
-#: accounts/doctype/account/account.py:532
+#: accounts/doctype/account/account.py:551
 msgid "Account {0} does not exist"
 msgstr "حساب {0} وجود ندارد"
 
@@ -2132,7 +2159,7 @@
 msgid "Account {0} does not match with Company {1} in Mode of Account: {2}"
 msgstr "حساب {0} با شرکت {1} در حالت حساب مطابقت ندارد: {2}"
 
-#: accounts/doctype/account/account.py:490
+#: accounts/doctype/account/account.py:509
 msgid "Account {0} exists in parent company {1}."
 msgstr "حساب {0} در شرکت مادر {1} وجود دارد."
 
@@ -2140,51 +2167,51 @@
 msgid "Account {0} has been entered multiple times"
 msgstr "حساب {0} چندین بار وارد شده است"
 
-#: accounts/doctype/account/account.py:344
+#: accounts/doctype/account/account.py:363
 msgid "Account {0} is added in the child company {1}"
 msgstr "حساب {0} در شرکت فرزند {1} اضافه شد"
 
-#: accounts/doctype/gl_entry/gl_entry.py:443
+#: accounts/doctype/gl_entry/gl_entry.py:397
 msgid "Account {0} is frozen"
 msgstr "حساب {0} مسدود شده است"
 
-#: controllers/accounts_controller.py:1032
+#: controllers/accounts_controller.py:1096
 msgid "Account {0} is invalid. Account Currency must be {1}"
 msgstr "حساب {0} نامعتبر است. ارز حساب باید {1} باشد"
 
-#: accounts/doctype/account/account.py:150
+#: accounts/doctype/account/account.py:151
 msgid "Account {0}: Parent account {1} can not be a ledger"
 msgstr "حساب {0}: حساب والدین {1} نمی تواند دفتر کل باشد"
 
-#: accounts/doctype/account/account.py:156
+#: accounts/doctype/account/account.py:157
 msgid "Account {0}: Parent account {1} does not belong to company: {2}"
 msgstr "حساب {0}: حساب والدین {1} متعلق به شرکت نیست: {2}"
 
-#: accounts/doctype/account/account.py:144
+#: accounts/doctype/account/account.py:145
 msgid "Account {0}: Parent account {1} does not exist"
 msgstr "حساب {0}: حساب والدین {1} وجود ندارد"
 
-#: accounts/doctype/account/account.py:147
+#: accounts/doctype/account/account.py:148
 msgid "Account {0}: You can not assign itself as parent account"
 msgstr "حساب {0}: شما نمی توانید خود را به عنوان حساب والد اختصاص دهید"
 
-#: accounts/general_ledger.py:403
+#: accounts/general_ledger.py:412
 msgid "Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry"
 msgstr "حساب: <b>{0}</b> یک کار سرمایه ای در حال انجام است و نمی توان آن را با ورود مجله به روز کرد"
 
-#: accounts/doctype/journal_entry/journal_entry.py:243
+#: accounts/doctype/journal_entry/journal_entry.py:259
 msgid "Account: {0} can only be updated via Stock Transactions"
 msgstr "حساب: {0} فقط از طریق معاملات موجودی قابل به روز رسانی است"
 
-#: accounts/report/general_ledger/general_ledger.py:325
+#: accounts/report/general_ledger/general_ledger.py:338
 msgid "Account: {0} does not exist"
 msgstr "حساب: {0} وجود ندارد"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2098
+#: accounts/doctype/payment_entry/payment_entry.py:2117
 msgid "Account: {0} is not permitted under Payment Entry"
 msgstr "حساب: {0} در قسمت ورود پرداخت مجاز نیست"
 
-#: controllers/accounts_controller.py:2591
+#: controllers/accounts_controller.py:2676
 msgid "Account: {0} with currency: {1} can not be selected"
 msgstr "حساب: {0} با واحد پول: {1} قابل انتخاب نیست"
 
@@ -2344,12 +2371,12 @@
 msgid "Accounting Dimension"
 msgstr "بعد حسابداری"
 
-#: accounts/doctype/gl_entry/gl_entry.py:206
+#: accounts/doctype/gl_entry/gl_entry.py:196
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:153
 msgid "Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}."
 msgstr "بعد حسابداری <b>{0}</b> برای حساب «ترازنامه» {1} لازم است."
 
-#: accounts/doctype/gl_entry/gl_entry.py:193
+#: accounts/doctype/gl_entry/gl_entry.py:183
 #: 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 "بعد حسابداری <b>{0}</b> برای حساب \"سود و زیان\" {1} لازم است."
@@ -2665,53 +2692,54 @@
 msgid "Accounting Entries"
 msgstr "ورودی های حسابداری"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:82
+#: accounts/doctype/sales_invoice/sales_invoice.js:86
 msgid "Accounting Entries are reposted"
 msgstr "مطالب حسابداری مجددا ارسال می شود"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:42
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
 msgid "Accounting Entries are reposted."
 msgstr "مطالب حسابداری مجددا ارسال می شود."
 
-#: assets/doctype/asset/asset.py:709 assets/doctype/asset/asset.py:724
-#: assets/doctype/asset_capitalization/asset_capitalization.py:572
+#: assets/doctype/asset/asset.py:713 assets/doctype/asset/asset.py:728
+#: assets/doctype/asset_capitalization/asset_capitalization.py:578
 msgid "Accounting Entry for Asset"
 msgstr "ورودی حسابداری برای دارایی"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:738
+#: stock/doctype/purchase_receipt/purchase_receipt.py:737
 msgid "Accounting Entry for Service"
 msgstr "ورود حسابداری برای خدمات"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:906
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:926
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:942
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:959
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:978
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1126
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1266
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1284
-#: controllers/stock_controller.py:168 controllers/stock_controller.py:183
-#: stock/doctype/purchase_receipt/purchase_receipt.py:839
-#: stock/doctype/stock_entry/stock_entry.py:1464
-#: stock/doctype/stock_entry/stock_entry.py:1478
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:519
+#: 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
 msgid "Accounting Entry for Stock"
 msgstr "ورودی حسابداری برای موجودی"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:658
+#: stock/doctype/purchase_receipt/purchase_receipt.py:659
 msgid "Accounting Entry for {0}"
 msgstr "ورودی حسابداری برای {0}"
 
-#: controllers/accounts_controller.py:1950
+#: controllers/accounts_controller.py:2042
 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}"
 msgstr "ورودی حسابداری برای {0}: {1} فقط به ارز قابل انجام است: {2}"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:192
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:193
 #: buying/doctype/supplier/supplier.js:85
-#: public/js/controllers/stock_controller.js:72
-#: public/js/utils/ledger_preview.js:7 selling/doctype/customer/customer.js:159
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:43
+#: public/js/controllers/stock_controller.js:84
+#: public/js/utils/ledger_preview.js:8 selling/doctype/customer/customer.js:164
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:48
 msgid "Accounting Ledger"
 msgstr "دفتر حسابداری"
 
@@ -2742,15 +2770,19 @@
 msgid "Accounting entries are frozen up to this date. Nobody can create or modify entries except users with the role specified below"
 msgstr "ورودی های حسابداری تا این تاریخ مسدود شده است. هیچ کس نمی تواند ورودی ها را ایجاد یا تغییر دهد، به جز کاربرانی که نقش مشخص شده در زیر را دارند"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:69
+#: accounts/doctype/journal_entry/journal_entry.js:30
+msgid "Accounting entries for this Journal Entry need to be reposted. Please click on 'Repost' button to update."
+msgstr ""
+
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:82
 msgid "Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update."
 msgstr "ورودی های حسابداری برای این فاکتور نیاز به ارسال مجدد دارد. لطفاً برای به روز رسانی روی دکمه \"Repost\" کلیک کنید."
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:72
+#: accounts/doctype/sales_invoice/sales_invoice.js:73
 msgid "Accounting entries for this invoice needs to be reposted. Please click on 'Repost' button to update."
 msgstr "ورودی های حسابداری برای این فاکتور نیاز به ارسال مجدد دارد. لطفاً برای به روز رسانی روی دکمه \"Repost\" کلیک کنید."
 
-#: setup/doctype/company/company.py:317
+#: setup/doctype/company/company.py:316
 msgid "Accounts"
 msgstr "حساب ها"
 
@@ -2925,7 +2957,7 @@
 msgid "Accounts Manager"
 msgstr "مدیر حساب ها"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:343
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:341
 msgid "Accounts Missing Error"
 msgstr "خطای گم شدن حساب ها"
 
@@ -2935,9 +2967,9 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:85
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117
 #: accounts/report/accounts_payable/accounts_payable.json
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:122
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:125
 #: accounts/workspace/payables/payables.json
-#: buying/doctype/supplier/supplier.js:90
+#: buying/doctype/supplier/supplier.js:97
 msgid "Accounts Payable"
 msgstr "حساب های پرداختنی"
 
@@ -2950,7 +2982,7 @@
 
 #. Name of a report
 #. Label of a Link in the Payables Workspace
-#: accounts/report/accounts_payable/accounts_payable.js:175
+#: accounts/report/accounts_payable/accounts_payable.js:176
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.json
 #: accounts/workspace/payables/payables.json
 msgid "Accounts Payable Summary"
@@ -2963,10 +2995,10 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:12
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:12
 #: accounts/report/accounts_receivable/accounts_receivable.json
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:150
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:153
 #: accounts/workspace/accounting/accounting.json
 #: accounts/workspace/receivables/receivables.json
-#: selling/doctype/customer/customer.js:155
+#: selling/doctype/customer/customer.js:153
 msgid "Accounts Receivable"
 msgstr "حساب های دریافتنی"
 
@@ -3125,7 +3157,7 @@
 msgid "Accounts User"
 msgstr "کاربر حساب ها"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1153
+#: accounts/doctype/journal_entry/journal_entry.py:1180
 msgid "Accounts table cannot be blank."
 msgstr "جدول حساب ها نمی تواند خالی باشد."
 
@@ -3142,7 +3174,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:33
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:46
-#: accounts/report/account_balance/account_balance.js:38
+#: accounts/report/account_balance/account_balance.js:37
 msgid "Accumulated Depreciation"
 msgstr "استهلاک انباشته"
 
@@ -3165,7 +3197,7 @@
 msgstr "حساب استهلاک انباشته"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:155
-#: assets/doctype/asset/asset.js:242
+#: assets/doctype/asset/asset.js:277
 msgid "Accumulated Depreciation Amount"
 msgstr "مقدار استهلاک انباشته"
 
@@ -3180,17 +3212,17 @@
 msgid "Accumulated Depreciation as on"
 msgstr "استهلاک انباشته به عنوان"
 
-#: accounts/doctype/budget/budget.py:243
+#: accounts/doctype/budget/budget.py:250
 msgid "Accumulated Monthly"
 msgstr "انباشته ماهانه"
 
-#: accounts/report/balance_sheet/balance_sheet.js:27
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:13
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:28
+#: accounts/report/balance_sheet/balance_sheet.js:22
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:8
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:23
 msgid "Accumulated Values"
 msgstr "ارزش های انباشته شده"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:101
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:125
 msgid "Accumulated Values in Group Company"
 msgstr "ارزش های انباشته در شرکت گروه"
 
@@ -3205,7 +3237,7 @@
 msgstr "تاریخ اکتساب"
 
 #: crm/doctype/lead/lead.js:42
-#: public/js/bank_reconciliation_tool/dialog_manager.js:171
+#: public/js/bank_reconciliation_tool/dialog_manager.js:175
 msgid "Action"
 msgstr "عمل"
 
@@ -3227,7 +3259,7 @@
 msgid "Action If Same Rate is Not Maintained"
 msgstr "اگر همان نرخ حفظ نشود، اقدام کنید"
 
-#: quality_management/doctype/quality_review/quality_review_list.js:9
+#: quality_management/doctype/quality_review/quality_review_list.js:7
 msgid "Action Initialised"
 msgstr "اقدام اولیه شد"
 
@@ -3273,23 +3305,24 @@
 msgid "Action if Same Rate is Not Maintained Throughout Sales Cycle"
 msgstr "اگر نرخ یکسانی در طول چرخه فروش حفظ نشود، اقدام کنید"
 
-#: accounts/doctype/account/account.js:55
-#: accounts/doctype/account/account.js:62
-#: accounts/doctype/account/account.js:91
-#: accounts/doctype/account/account.js:116
-#: accounts/doctype/journal_entry/journal_entry.js:35
-#: accounts/doctype/payment_entry/payment_entry.js:160
+#: accounts/doctype/account/account.js:50
+#: accounts/doctype/account/account.js:57
+#: accounts/doctype/account/account.js:89
+#: accounts/doctype/account/account.js:117
+#: accounts/doctype/journal_entry/journal_entry.js:77
+#: accounts/doctype/payment_entry/payment_entry.js:190
 #: accounts/doctype/subscription/subscription.js:38
 #: accounts/doctype/subscription/subscription.js:44
 #: accounts/doctype/subscription/subscription.js:50
-#: buying/doctype/supplier/supplier.js:104
-#: buying/doctype/supplier/supplier.js:109
-#: projects/doctype/project/project.js:69
-#: projects/doctype/project/project.js:73
-#: projects/doctype/project/project.js:134
-#: public/js/bank_reconciliation_tool/data_table_manager.js:93
-#: public/js/utils/unreconcile.js:22 selling/doctype/customer/customer.js:170
-#: selling/doctype/customer/customer.js:175 stock/doctype/item/item.js:419
+#: buying/doctype/supplier/supplier.js:128
+#: buying/doctype/supplier/supplier.js:137
+#: projects/doctype/project/project.js:78
+#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:160
+#: public/js/bank_reconciliation_tool/data_table_manager.js:88
+#: public/js/bank_reconciliation_tool/data_table_manager.js:121
+#: public/js/utils/unreconcile.js:28 selling/doctype/customer/customer.js:184
+#: selling/doctype/customer/customer.js:193 stock/doctype/item/item.js:486
 #: templates/pages/order.html:20
 msgid "Actions"
 msgstr "اقدامات"
@@ -3326,7 +3359,7 @@
 msgstr "اقدامات انجام شده"
 
 #: accounts/doctype/subscription/subscription_list.js:6
-#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:11
+#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:18
 #: stock/doctype/putaway_rule/putaway_rule_list.js:7
 msgid "Active"
 msgstr "فعال"
@@ -3372,6 +3405,12 @@
 msgid "Active Leads"
 msgstr "سرنخ های فعال"
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Active Status"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -3416,14 +3455,14 @@
 msgid "Activity Cost exists for Employee {0} against Activity Type - {1}"
 msgstr "هزینه فعالیت برای کارمند {0} در مقابل نوع فعالیت - {1} وجود دارد"
 
-#: projects/doctype/activity_type/activity_type.js:7
+#: projects/doctype/activity_type/activity_type.js:10
 msgid "Activity Cost per Employee"
 msgstr "هزینه فعالیت به ازای هر کارمند"
 
 #. Name of a DocType
 #: projects/doctype/activity_type/activity_type.json
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:32
-#: public/js/projects/timer.js:8
+#: public/js/projects/timer.js:9 templates/pages/timelog_info.html:25
 msgid "Activity Type"
 msgstr "نوع فعالیت"
 
@@ -3563,6 +3602,7 @@
 msgid "Actual Posting"
 msgstr "ارسال واقعی"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:21
 #: stock/report/product_bundle_balance/product_bundle_balance.py:96
 #: stock/report/stock_projected_qty/stock_projected_qty.py:136
 msgid "Actual Qty"
@@ -3616,10 +3656,19 @@
 msgid "Actual Qty in Warehouse"
 msgstr "مقدار واقعی در انبار"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:185
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:196
 msgid "Actual Qty is mandatory"
 msgstr "مقدار واقعی اجباری است"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:37
+#: stock/dashboard/item_dashboard_list.html:28
+msgid "Actual Qty {0} / Waiting Qty {1}"
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Actual Qty: Quantity available in the warehouse."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:95
 msgid "Actual Quantity"
 msgstr "مقدار واقعی"
@@ -3686,18 +3735,20 @@
 msgid "Actual qty in stock"
 msgstr "مقدار واقعی موجود در انبار"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1223
+#: accounts/doctype/payment_entry/payment_entry.js:1470
 #: public/js/controllers/accounts.js:176
 msgid "Actual type tax cannot be included in Item rate in row {0}"
 msgstr "مالیات نوع واقعی را نمی توان در نرخ مورد در ردیف {0} لحاظ کرد"
 
-#: crm/doctype/lead/lead.js:82
-#: public/js/bom_configurator/bom_configurator.bundle.js:225
-#: public/js/bom_configurator/bom_configurator.bundle.js:237
-#: public/js/bom_configurator/bom_configurator.bundle.js:291
-#: public/js/utils/crm_activities.js:168
+#: crm/doctype/lead/lead.js:85
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:55
+#: public/js/bom_configurator/bom_configurator.bundle.js:231
+#: public/js/bom_configurator/bom_configurator.bundle.js:244
+#: public/js/bom_configurator/bom_configurator.bundle.js:329
+#: public/js/utils/crm_activities.js:170
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/dashboard/item_dashboard_list.html:59
 msgid "Add"
 msgstr "اضافه کردن"
 
@@ -3715,11 +3766,11 @@
 msgid "Add"
 msgstr "اضافه کردن"
 
-#: stock/doctype/item/item.js:417 stock/doctype/price_list/price_list.js:7
+#: stock/doctype/item/item.js:482 stock/doctype/price_list/price_list.js:8
 msgid "Add / Edit Prices"
 msgstr "افزودن / ویرایش قیمت ها"
 
-#: accounts/doctype/account/account_tree.js:176
+#: accounts/doctype/account/account_tree.js:256
 msgid "Add Child"
 msgstr "کودک را اضافه کنید"
 
@@ -3727,27 +3778,36 @@
 msgid "Add Columns in Transaction Currency"
 msgstr "اضافه کردن ستون به ارز تراکنش"
 
+#: templates/pages/task_info.html:94 templates/pages/task_info.html:96
+msgid "Add Comment"
+msgstr ""
+
 #. Label of a Check field in DocType 'Manufacturing Settings'
 #: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
 msgctxt "Manufacturing Settings"
 msgid "Add Corrective Operation Cost in Finished Good Valuation"
 msgstr "اضافه کردن هزینه عملیات اصلاحی در ارزش گذاری خوب تمام شده"
 
-#: public/js/event.js:19
+#: public/js/event.js:24
 msgid "Add Customers"
 msgstr "مشتریان را اضافه کنید"
 
-#: public/js/event.js:27
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:411
+msgid "Add Discount"
+msgstr ""
+
+#: public/js/event.js:40
 msgid "Add Employees"
 msgstr "اضافه کردن کارمندان"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:224
-#: selling/doctype/sales_order/sales_order.js:207
-#: stock/dashboard/item_dashboard.js:205
+#: public/js/bom_configurator/bom_configurator.bundle.js:230
+#: selling/doctype/sales_order/sales_order.js:228
+#: stock/dashboard/item_dashboard.js:212
 msgid "Add Item"
 msgstr "این مورد را اضافه کنید"
 
-#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:33
+#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:35
 msgid "Add Items"
 msgstr "موارد را اضافه کنید"
 
@@ -3755,11 +3815,11 @@
 msgid "Add Items in the Purpose Table"
 msgstr "موارد را در جدول هدف اضافه کنید"
 
-#: crm/doctype/lead/lead.js:82
+#: crm/doctype/lead/lead.js:84
 msgid "Add Lead to Prospect"
 msgstr "لید را به Prospect اضافه کنید"
 
-#: public/js/event.js:15
+#: public/js/event.js:16
 msgid "Add Leads"
 msgstr "سرنخ ها را اضافه کنید"
 
@@ -3789,12 +3849,12 @@
 msgid "Add Or Deduct"
 msgstr "افزودن یا کسر"
 
-#: selling/page/point_of_sale/pos_item_cart.js:269
+#: selling/page/point_of_sale/pos_item_cart.js:267
 msgid "Add Order Discount"
 msgstr "اضافه کردن تخفیف سفارش"
 
-#: public/js/event.js:17 public/js/event.js:21 public/js/event.js:25
-#: public/js/event.js:29 public/js/event.js:33
+#: public/js/event.js:20 public/js/event.js:28 public/js/event.js:36
+#: public/js/event.js:44 public/js/event.js:52
 msgid "Add Participants"
 msgstr "شرکت کنندگان اضافه کردن"
 
@@ -3804,7 +3864,7 @@
 msgid "Add Quote"
 msgstr "اضافه کردن نقل قول"
 
-#: public/js/event.js:31
+#: public/js/event.js:48
 msgid "Add Sales Partners"
 msgstr "اضافه کردن شرکای فروش"
 
@@ -3838,17 +3898,21 @@
 msgid "Add Serial / Batch No (Rejected Qty)"
 msgstr "اضافه کردن سریال / شماره دسته (تعداد رد شده)"
 
-#: public/js/utils.js:61
+#: public/js/utils.js:71
 msgid "Add Serial No"
 msgstr "اضافه کردن شماره سریال"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:231
-#: public/js/bom_configurator/bom_configurator.bundle.js:280
+#: manufacturing/doctype/plant_floor/plant_floor.js:172
+msgid "Add Stock"
+msgstr ""
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:238
+#: public/js/bom_configurator/bom_configurator.bundle.js:318
 msgid "Add Sub Assembly"
 msgstr "اضافه کردن Sub Assembly"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:433
-#: public/js/event.js:23
+#: buying/doctype/request_for_quotation/request_for_quotation.js:472
+#: public/js/event.js:32
 msgid "Add Suppliers"
 msgstr "تامین کنندگان را اضافه کنید"
 
@@ -3868,7 +3932,7 @@
 msgid "Add Weekly Holidays"
 msgstr "تعطیلات هفتگی را اضافه کنید"
 
-#: public/js/utils/crm_activities.js:140
+#: public/js/utils/crm_activities.js:142
 msgid "Add a Note"
 msgstr "یک یادداشت اضافه کنید"
 
@@ -3887,7 +3951,7 @@
 msgstr "جزئیات را اضافه کنید"
 
 #: stock/doctype/pick_list/pick_list.js:71
-#: stock/doctype/pick_list/pick_list.py:614
+#: stock/doctype/pick_list/pick_list.py:654
 msgid "Add items in the Item Locations table"
 msgstr "موارد را در جدول مکان آیتم ها اضافه کنید"
 
@@ -3923,10 +3987,14 @@
 msgid "Add to Transit"
 msgstr "به ترانزیت اضافه کنید"
 
-#: accounts/doctype/coupon_code/coupon_code.js:39
+#: accounts/doctype/coupon_code/coupon_code.js:36
 msgid "Add/Edit Coupon Conditions"
 msgstr "افزودن/ویرایش شرایط کوپن"
 
+#: templates/includes/footer/footer_extension.html:26
+msgid "Added"
+msgstr ""
+
 #. Label of a Link field in DocType 'CRM Note'
 #: crm/doctype/crm_note/crm_note.json
 msgctxt "CRM Note"
@@ -3943,7 +4011,7 @@
 msgid "Added Supplier Role to User {0}."
 msgstr "نقش تامین کننده به کاربر {0} اضافه شد."
 
-#: public/js/utils/item_selector.js:66 public/js/utils/item_selector.js:80
+#: public/js/utils/item_selector.js:70 public/js/utils/item_selector.js:86
 msgid "Added {0} ({1})"
 msgstr "اضافه شده {0} ({1})"
 
@@ -3951,10 +4019,14 @@
 msgid "Added {1} Role to User {0}."
 msgstr "نقش {1} به کاربر {0} اضافه شد."
 
-#: crm/doctype/lead/lead.js:80
+#: crm/doctype/lead/lead.js:81
 msgid "Adding Lead to Prospect..."
 msgstr "افزودن سرنخ به Prospect..."
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "Additional"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Asset'
 #: assets/doctype/asset/asset.json
 msgctxt "Asset"
@@ -4282,6 +4354,10 @@
 msgid "Additional Info"
 msgstr "اطلاعات اضافی"
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Additional Information"
+msgstr "اطلاعات تکمیلی"
+
 #. Label of a Section Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -4606,7 +4682,7 @@
 msgid "Address HTML"
 msgstr "آدرس HTML"
 
-#: public/js/utils/contact_address_quick_entry.js:58
+#: public/js/utils/contact_address_quick_entry.js:61
 msgid "Address Line 1"
 msgstr "آدرس خط 1"
 
@@ -4616,7 +4692,7 @@
 msgid "Address Line 1"
 msgstr "آدرس خط 1"
 
-#: public/js/utils/contact_address_quick_entry.js:63
+#: public/js/utils/contact_address_quick_entry.js:66
 msgid "Address Line 2"
 msgstr "آدرس خط 2"
 
@@ -4715,15 +4791,15 @@
 msgid "Addresses"
 msgstr "آدرس ها"
 
-#: assets/doctype/asset/asset.js:116
+#: assets/doctype/asset/asset.js:144
 msgid "Adjust Asset Value"
 msgstr "ارزش دارایی را تنظیم کنید"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:996
+#: accounts/doctype/sales_invoice/sales_invoice.js:1072
 msgid "Adjustment Against"
 msgstr "تعدیل در مقابل"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:581
+#: stock/doctype/purchase_receipt/purchase_receipt.py:582
 msgid "Adjustment based on Purchase Invoice rate"
 msgstr "تنظیم بر اساس نرخ فاکتور خرید"
 
@@ -4740,7 +4816,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:303
+#: stock/reorder_item.py:388
 msgid "Administrator"
 msgstr "مدیر"
 
@@ -4772,8 +4848,8 @@
 msgid "Advance Paid"
 msgstr "پیش پرداخت شده"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:47
-#: selling/doctype/sales_order/sales_order_list.js:61
+#: buying/doctype/purchase_order/purchase_order_list.js:65
+#: selling/doctype/sales_order/sales_order_list.js:105
 msgid "Advance Payment"
 msgstr "پیش پرداخت"
 
@@ -4789,7 +4865,7 @@
 msgid "Advance Payment Status"
 msgstr "وضعیت پیش پرداخت"
 
-#: controllers/accounts_controller.py:214
+#: controllers/accounts_controller.py:224
 msgid "Advance Payments"
 msgstr "پیش پرداخت"
 
@@ -4845,11 +4921,11 @@
 msgid "Advance amount"
 msgstr "مبلغ پیش پرداخت"
 
-#: controllers/taxes_and_totals.py:743
+#: controllers/taxes_and_totals.py:744
 msgid "Advance amount cannot be greater than {0} {1}"
 msgstr "مبلغ پیش پرداخت نمی تواند بیشتر از {0} {1} باشد"
 
-#: accounts/doctype/journal_entry/journal_entry.py:741
+#: accounts/doctype/journal_entry/journal_entry.py:768
 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
 msgstr "پیش پرداخت در مقابل {0} {1} نمی تواند بیشتر از کل کل {2} باشد"
 
@@ -4897,6 +4973,10 @@
 msgid "Affected Transactions"
 msgstr "معاملات تحت تأثیر"
 
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:23
+msgid "Against"
+msgstr "در برابر"
+
 #. Label of a Text field in DocType 'GL Entry'
 #: accounts/doctype/gl_entry/gl_entry.json
 msgctxt "GL Entry"
@@ -4905,7 +4985,7 @@
 
 #: 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:631
+#: accounts/report/general_ledger/general_ledger.py:644
 msgid "Against Account"
 msgstr "در مقابل حساب"
 
@@ -4939,11 +5019,11 @@
 msgid "Against Blanket Order"
 msgstr "بر خلاف دستور بلانکته"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:945
+#: accounts/doctype/sales_invoice/sales_invoice.py:962
 msgid "Against Customer Order {0} dated {1}"
 msgstr "برخلاف سفارش مشتری {0} مورخ {1}"
 
-#: selling/doctype/sales_order/sales_order.js:967
+#: selling/doctype/sales_order/sales_order.js:1127
 msgid "Against Default Supplier"
 msgstr "در مقابل تامین کننده پیش فرض"
 
@@ -5001,12 +5081,12 @@
 msgid "Against Income Account"
 msgstr "در مقابل حساب درآمد"
 
-#: accounts/doctype/journal_entry/journal_entry.py:609
-#: accounts/doctype/payment_entry/payment_entry.py:669
+#: accounts/doctype/journal_entry/journal_entry.py:636
+#: accounts/doctype/payment_entry/payment_entry.py:678
 msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
 msgstr "در مقابل ورودی مجله {0} هیچ ورودی {1} بی همتا ندارد"
 
-#: accounts/doctype/gl_entry/gl_entry.py:410
+#: accounts/doctype/gl_entry/gl_entry.py:364
 msgid "Against Journal Entry {0} is already adjusted against some other voucher"
 msgstr "در مقابل ورود مجله {0} قبلاً با کوپن دیگری تنظیم شده است"
 
@@ -5040,11 +5120,11 @@
 msgid "Against Stock Entry"
 msgstr "در مقابل ورود موجودی"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
 msgid "Against Supplier Invoice {0} dated {1}"
 msgstr "در مقابل فاکتور تامین کننده {0} به تاریخ {1}"
 
-#: accounts/report/general_ledger/general_ledger.py:650
+#: accounts/report/general_ledger/general_ledger.py:663
 msgid "Against Voucher"
 msgstr "در مقابل کوپن"
 
@@ -5055,7 +5135,7 @@
 msgstr "در مقابل کوپن"
 
 #: accounts/report/general_ledger/general_ledger.js:57
-#: accounts/report/payment_ledger/payment_ledger.js:71
+#: accounts/report/payment_ledger/payment_ledger.js:70
 #: accounts/report/payment_ledger/payment_ledger.py:185
 msgid "Against Voucher No"
 msgstr "در مقابل کوپن شماره"
@@ -5066,7 +5146,7 @@
 msgid "Against Voucher No"
 msgstr "در مقابل کوپن شماره"
 
-#: accounts/report/general_ledger/general_ledger.py:648
+#: accounts/report/general_ledger/general_ledger.py:661
 #: accounts/report/payment_ledger/payment_ledger.py:176
 msgid "Against Voucher Type"
 msgstr "در مقابل نوع کوپن"
@@ -5084,14 +5164,15 @@
 msgstr "در مقابل نوع کوپن"
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:117
-#: manufacturing/report/work_order_summary/work_order_summary.js:59
+#: manufacturing/report/work_order_summary/work_order_summary.js:58
 #: manufacturing/report/work_order_summary/work_order_summary.py:259
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:96
 msgid "Age"
 msgstr "سن"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:151
-#: accounts/report/accounts_receivable/accounts_receivable.py:1134
+#: accounts/report/accounts_receivable/accounts_receivable.html:133
+#: accounts/report/accounts_receivable/accounts_receivable.py:1142
 msgid "Age (Days)"
 msgstr "سن (روزها)"
 
@@ -5101,7 +5182,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:58
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:21
-#: accounts/report/accounts_receivable/accounts_receivable.js:83
+#: accounts/report/accounts_receivable/accounts_receivable.js:86
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:21
 msgid "Ageing Based On"
 msgstr "پیری بر اساس"
@@ -5114,7 +5195,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:65
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:28
-#: accounts/report/accounts_receivable/accounts_receivable.js:90
+#: accounts/report/accounts_receivable/accounts_receivable.js:93
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:28
 #: stock/report/stock_ageing/stock_ageing.js:49
 msgid "Ageing Range 1"
@@ -5122,7 +5203,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:72
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:35
-#: accounts/report/accounts_receivable/accounts_receivable.js:97
+#: accounts/report/accounts_receivable/accounts_receivable.js:100
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:35
 #: stock/report/stock_ageing/stock_ageing.js:56
 msgid "Ageing Range 2"
@@ -5130,7 +5211,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:79
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:42
-#: accounts/report/accounts_receivable/accounts_receivable.js:104
+#: accounts/report/accounts_receivable/accounts_receivable.js:107
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:42
 #: stock/report/stock_ageing/stock_ageing.js:63
 msgid "Ageing Range 3"
@@ -5138,7 +5219,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:86
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:49
-#: accounts/report/accounts_receivable/accounts_receivable.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:49
 msgid "Ageing Range 4"
 msgstr "محدوده پیری 4"
@@ -5202,6 +5283,11 @@
 msgid "Agents"
 msgstr "عوامل"
 
+#. Description of a DocType
+#: selling/doctype/product_bundle/product_bundle.json
+msgid "Aggregate a group of Items into another Item. This is useful if you are maintaining the stock of the packed items and not the bundled item"
+msgstr ""
+
 #. Name of a role
 #: assets/doctype/location/location.json
 msgid "Agriculture Manager"
@@ -5233,10 +5319,10 @@
 msgid "All"
 msgstr "همه"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:148
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:168
+#: 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:1324 public/js/setup_wizard.js:163
+#: accounts/utils.py:1293 public/js/setup_wizard.js:174
 msgid "All Accounts"
 msgstr "همه حساب ها"
 
@@ -5310,14 +5396,14 @@
 #: 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:310 setup/doctype/company/company.py:313
-#: setup/doctype/company/company.py:318 setup/doctype/company/company.py:324
-#: setup/doctype/company/company.py:330 setup/doctype/company/company.py:336
-#: setup/doctype/company/company.py:342 setup/doctype/company/company.py:348
-#: setup/doctype/company/company.py:354 setup/doctype/company/company.py:360
-#: setup/doctype/company/company.py:366 setup/doctype/company/company.py:372
-#: setup/doctype/company/company.py:378 setup/doctype/company/company.py:384
-#: setup/doctype/company/company.py:390
+#: 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
 msgid "All Departments"
 msgstr "همه بخش ها"
 
@@ -5338,6 +5424,10 @@
 msgid "All Item Groups"
 msgstr "همه گروه های آیتم"
 
+#: selling/page/point_of_sale/pos_item_selector.js:25
+msgid "All Items"
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5356,6 +5446,11 @@
 msgid "All Sales Person"
 msgstr "همه پرسنل فروش"
 
+#. Description of a DocType
+#: setup/doctype/sales_person/sales_person.json
+msgid "All Sales Transactions can be tagged against multiple Sales Persons so that you can set and monitor targets."
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5385,7 +5480,7 @@
 msgid "All Territories"
 msgstr "همه مناطق"
 
-#: setup/doctype/company/company.py:259 setup/doctype/company/company.py:275
+#: setup/doctype/company/company.py:258 setup/doctype/company/company.py:274
 msgid "All Warehouses"
 msgstr "کلیه انبارها"
 
@@ -5396,19 +5491,19 @@
 msgid "All allocations have been successfully reconciled"
 msgstr "همه تخصیص ها با موفقیت تطبیق داده شده است"
 
-#: support/doctype/issue/issue.js:97
+#: support/doctype/issue/issue.js:107
 msgid "All communications including and above this shall be moved into the new Issue"
 msgstr "تمام ارتباطات از جمله و بالاتر از این باید به شماره جدید منتقل شود"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:1170
+#: stock/doctype/purchase_receipt/purchase_receipt.py:1172
 msgid "All items have already been Invoiced/Returned"
 msgstr "همه اقلام قبلاً صورتحساب/بازگردانده شده اند"
 
-#: stock/doctype/stock_entry/stock_entry.py:2191
+#: stock/doctype/stock_entry/stock_entry.py:2222
 msgid "All items have already been transferred for this Work Order."
 msgstr "همه موارد قبلاً برای این سفارش کاری منتقل شده اند."
 
-#: public/js/controllers/transaction.js:2210
+#: public/js/controllers/transaction.js:2253
 msgid "All items in this document already have a linked Quality Inspection."
 msgstr "همه موارد در این سند قبلاً دارای یک بازرسی کیفیت مرتبط هستند."
 
@@ -5419,17 +5514,17 @@
 msgid "All the Comments and Emails will be copied from one document to another newly created document(Lead -> Opportunity -> Quotation) throughout the CRM documents."
 msgstr "تمام نظرات و ایمیل ها از یک سند به سند جدید ایجاد شده دیگر (سرنخ -> فرصت -> نقل قول) در سراسر اسناد CRM کپی می شوند."
 
-#: manufacturing/doctype/work_order/work_order.js:847
+#: manufacturing/doctype/work_order/work_order.js:916
 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 "تمام اقلام مورد نیاز (مواد اولیه) از BOM واکشی شده و در این جدول پر می شود. در اینجا شما همچنین می توانید منبع انبار را برای هر مورد تغییر دهید. و در حین تولید می توانید مواد اولیه انتقال یافته را از این جدول ردیابی کنید."
 
-#: stock/doctype/delivery_note/delivery_note.py:899
+#: stock/doctype/delivery_note/delivery_note.py:960
 msgid "All these items have already been Invoiced/Returned"
 msgstr "همه این موارد قبلاً صورتحساب/بازگردانده شده اند"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:83
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:95
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:84
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:85
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:92
 msgid "Allocate"
 msgstr "اختصاص دهید"
 
@@ -5445,7 +5540,7 @@
 msgid "Allocate Advances Automatically (FIFO)"
 msgstr "تخصیص خودکار پیشرفت ها (FIFO)"
 
-#: accounts/doctype/payment_entry/payment_entry.js:679
+#: accounts/doctype/payment_entry/payment_entry.js:831
 msgid "Allocate Payment Amount"
 msgstr "تخصیص مبلغ پرداختی"
 
@@ -5468,7 +5563,7 @@
 msgstr "اختصاص داده شده است"
 
 #: accounts/report/gross_profit/gross_profit.py:314
-#: public/js/utils/unreconcile.js:62
+#: public/js/utils/unreconcile.js:86
 msgid "Allocated Amount"
 msgstr "مبلغ تخصیص یافته"
 
@@ -5527,21 +5622,25 @@
 msgid "Allocated Entries"
 msgstr "ورودی های اختصاص داده شده"
 
+#: public/js/templates/crm_activities.html:49
+msgid "Allocated To:"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Invoice Advance'
 #: accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
 msgctxt "Sales Invoice Advance"
 msgid "Allocated amount"
 msgstr "مبلغ تخصیص یافته"
 
-#: accounts/utils.py:614
+#: accounts/utils.py:623
 msgid "Allocated amount cannot be greater than unadjusted amount"
 msgstr "مبلغ تخصیصی نمی تواند بیشتر از مبلغ تعدیل نشده باشد"
 
-#: accounts/utils.py:612
+#: accounts/utils.py:621
 msgid "Allocated amount cannot be negative"
 msgstr "مبلغ تخصیصی نمی تواند منفی باشد"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:258
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:262
 msgid "Allocation"
 msgstr "تخصیص"
 
@@ -5551,7 +5650,7 @@
 msgid "Allocation"
 msgstr "تخصیص"
 
-#: public/js/utils/unreconcile.js:67
+#: public/js/utils/unreconcile.js:97
 msgid "Allocations"
 msgstr "تخصیص ها"
 
@@ -5580,7 +5679,7 @@
 msgid "Allow"
 msgstr "اجازه"
 
-#: accounts/doctype/account/account.py:488
+#: accounts/doctype/account/account.py:507
 #: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68
 msgid "Allow Account Creation Against Child Company"
 msgstr "اجازه ایجاد حساب در مقابل شرکت کودک"
@@ -5685,7 +5784,7 @@
 msgid "Allow Material Transfer from Purchase Receipt to Purchase Invoice"
 msgstr "اجازه انتقال مواد از رسید خرید به فاکتور خرید"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:9
 msgid "Allow Multiple Material Consumption"
 msgstr "اجازه مصرف مواد متعدد"
 
@@ -5962,7 +6061,7 @@
 msgid "Allows to keep aside a specific quantity of inventory for a particular order."
 msgstr "اجازه می دهد تا مقدار مشخصی از موجودی را برای یک سفارش خاص کنار بگذارید."
 
-#: stock/doctype/pick_list/pick_list.py:721
+#: stock/doctype/pick_list/pick_list.py:792
 msgid "Already Picked"
 msgstr "قبلاً انتخاب شده است"
 
@@ -5974,9 +6073,9 @@
 msgid "Already set default in pos profile {0} for user {1}, kindly disabled default"
 msgstr "قبلاً پیش‌فرض در نمایه pos {0} برای کاربر {1} تنظیم شده است، لطفاً پیش‌فرض غیرفعال شده است"
 
-#: manufacturing/doctype/bom/bom.js:141
-#: manufacturing/doctype/work_order/work_order.js:162 public/js/utils.js:466
-#: stock/doctype/stock_entry/stock_entry.js:224
+#: manufacturing/doctype/bom/bom.js:152
+#: manufacturing/doctype/work_order/work_order.js:169 public/js/utils.js:519
+#: stock/doctype/stock_entry/stock_entry.js:245
 msgid "Alternate Item"
 msgstr "آیتم جایگزین"
 
@@ -5992,6 +6091,10 @@
 msgid "Alternative Item Name"
 msgstr "نام آیتم جایگزین"
 
+#: selling/doctype/quotation/quotation.js:360
+msgid "Alternative Items"
+msgstr ""
+
 #: stock/doctype/item_alternative/item_alternative.py:37
 msgid "Alternative item must not be same as item code"
 msgstr "مورد جایگزین نباید با کد مورد مشابه باشد"
@@ -6462,7 +6565,7 @@
 msgid "Amended From"
 msgstr "اصلاح شده از"
 
-#: accounts/doctype/journal_entry/journal_entry.js:529
+#: accounts/doctype/journal_entry/journal_entry.js:579
 #: 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
@@ -6476,16 +6579,20 @@
 #: 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
-#: selling/doctype/quotation/quotation.js:286
+#: 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
 #: selling/report/sales_order_analysis/sales_order_analysis.py:290
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:46
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:69
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:67
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:108
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:109
 #: stock/report/delayed_item_report/delayed_item_report.py:152
 #: stock/report/delayed_order_report/delayed_order_report.py:71
-#: templates/pages/order.html:92 templates/pages/rfq.html:46
+#: templates/form_grid/bank_reconciliation_grid.html:4
+#: templates/form_grid/item_grid.html:9
+#: templates/form_grid/stock_entry_grid.html:11 templates/pages/order.html:104
+#: templates/pages/rfq.html:46
 msgid "Amount"
 msgstr "میزان"
 
@@ -7003,19 +7110,19 @@
 msgid "Amount in customer's currency"
 msgstr "مبلغ به ارز مشتری"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1119
+#: accounts/doctype/payment_entry/payment_entry.py:1128
 msgid "Amount {0} {1} against {2} {3}"
 msgstr "مبلغ {0} {1} در مقابل {2} {3}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1127
+#: accounts/doctype/payment_entry/payment_entry.py:1136
 msgid "Amount {0} {1} deducted against {2}"
 msgstr "مبلغ {0} {1} از {2} کسر شد"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1095
+#: accounts/doctype/payment_entry/payment_entry.py:1104
 msgid "Amount {0} {1} transferred from {2} to {3}"
 msgstr "مبلغ {0} {1} از {2} به {3} منتقل شد"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1102
+#: accounts/doctype/payment_entry/payment_entry.py:1111
 msgid "Amount {0} {1} {2} {3}"
 msgstr "مبلغ {0} {1} {2} {3}"
 
@@ -7024,7 +7131,12 @@
 msgid "Amt"
 msgstr "مبلغ"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:393
+#. Description of a DocType
+#: setup/doctype/item_group/item_group.json
+msgid "An Item Group is a way to classify items based on types."
+msgstr ""
+
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:408
 msgid "An error has been appeared while reposting item valuation via {0}"
 msgstr "هنگام ارسال مجدد ارزیابی مورد از طریق {0} خطایی ظاهر شد"
 
@@ -7033,19 +7145,19 @@
 msgid "An error has occurred during {0}. Check {1} for more details"
 msgstr "خطایی در طول {0} رخ داده است. برای جزئیات بیشتر {1} را بررسی کنید"
 
-#: public/js/controllers/buying.js:297 public/js/utils/sales_common.js:364
+#: public/js/controllers/buying.js:292 public/js/utils/sales_common.js:408
 msgid "An error occurred during the update process"
 msgstr "در طول فرآیند به روز رسانی خطایی رخ داد"
 
-#: stock/reorder_item.py:287
+#: stock/reorder_item.py:372
 msgid "An error occurred for certain Items while creating Material Requests based on Re-order level. Please rectify these issues :"
-msgstr ""
+msgstr "هنگام ایجاد درخواست‌های مواد بر اساس سطح سفارش مجدد، برای موارد خاصی خطایی رخ داد. لطفا این مشکلات را اصلاح کنید:"
 
-#: accounts/doctype/budget/budget.py:232
+#: accounts/doctype/budget/budget.py:239
 msgid "Annual"
 msgstr "سالانه"
 
-#: public/js/utils.js:103
+#: public/js/utils.js:120
 msgid "Annual Billing: {0}"
 msgstr "صورت‌حساب سالانه: {0}"
 
@@ -7117,6 +7229,10 @@
 msgid "Applicable Dimension"
 msgstr "ابعاد قابل اجرا"
 
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:221
+msgid "Applicable For"
+msgstr "قابل استفاده برای"
+
 #. Label of a Tab Break field in DocType 'Inventory Dimension'
 #: stock/doctype/inventory_dimension/inventory_dimension.json
 msgctxt "Inventory Dimension"
@@ -7397,6 +7513,12 @@
 msgid "Apply Recursion Over (As Per Transaction UOM)"
 msgstr "اعمال بازگشت بیش از (بر اساس UOM تراکنش)"
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Apply Recursion Over (As Per Transaction UOM)"
+msgstr "اعمال بازگشت بیش از (بر اساس UOM تراکنش)"
+
 #. Label of a Table field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -7512,7 +7634,7 @@
 msgid "Appointment Confirmation"
 msgstr "تایید قرار ملاقات"
 
-#: www/book_appointment/index.js:229
+#: www/book_appointment/index.js:237
 msgid "Appointment Created Successfully"
 msgstr "قرار ملاقات با موفقیت ایجاد شد"
 
@@ -7577,11 +7699,11 @@
 msgid "Are you sure you want to clear all demo data?"
 msgstr "آیا مطمئن هستید که می خواهید تمام داده های نمایشی را پاک کنید؟"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:325
+#: public/js/bom_configurator/bom_configurator.bundle.js:363
 msgid "Are you sure you want to delete this Item?"
 msgstr "آیا مطمئن هستید که میخواهید این مورد را حذف کنید؟"
 
-#: accounts/doctype/subscription/subscription.js:70
+#: accounts/doctype/subscription/subscription.js:69
 msgid "Are you sure you want to restart this subscription?"
 msgstr "آیا مطمئن هستید که می خواهید این اشتراک را مجدداً راه اندازی کنید؟"
 
@@ -7601,13 +7723,13 @@
 msgid "Arrival Quantity"
 msgstr "مقدار ورود"
 
-#: stock/report/serial_no_ledger/serial_no_ledger.js:58
+#: 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:31
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:30
 msgid "As On Date"
 msgstr "همانطور که در تاریخ"
 
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:16
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:15
 msgid "As on Date"
 msgstr "همانطور که در تاریخ"
 
@@ -7630,20 +7752,24 @@
 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}."
 msgstr "از آنجایی که تراکنش‌های ارسالی موجود علیه مورد {0} وجود دارد، نمی‌توانید مقدار {1} را تغییر دهید."
 
-#: stock/doctype/stock_settings/stock_settings.py:195
+#: stock/doctype/stock_settings/stock_settings.py:198
 msgid "As there are negative stock, you can not enable {0}."
 msgstr "از آنجایی که موجودی منفی وجود دارد، نمی توانید {0} را فعال کنید."
 
-#: stock/doctype/stock_settings/stock_settings.py:209
+#: stock/doctype/stock_settings/stock_settings.py:212
 msgid "As there are reserved stock, you cannot disable {0}."
 msgstr "از آنجایی که موجودی رزرو شده وجود دارد، نمی توانید {0} را غیرفعال کنید."
 
-#: manufacturing/doctype/production_plan/production_plan.py:1600
+#: manufacturing/doctype/production_plan/production_plan.py:915
+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
 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
 msgstr "از آنجایی که مواد اولیه کافی وجود دارد، درخواست مواد برای انبار {0} لازم نیست."
 
-#: stock/doctype/stock_settings/stock_settings.py:164
-#: stock/doctype/stock_settings/stock_settings.py:178
+#: stock/doctype/stock_settings/stock_settings.py:167
+#: stock/doctype/stock_settings/stock_settings.py:181
 msgid "As {0} is enabled, you can not enable {1}."
 msgstr "از آنجایی که {0} فعال است، نمی توانید {1} را فعال کنید."
 
@@ -7654,13 +7780,13 @@
 msgstr "اقلام مونتاژ"
 
 #. Name of a DocType
-#: accounts/report/account_balance/account_balance.js:26
+#: accounts/report/account_balance/account_balance.js:25
 #: 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
 #: assets/doctype/asset/asset.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:177
+#: stock/doctype/purchase_receipt/purchase_receipt.js:200
 msgid "Asset"
 msgstr "دارایی"
 
@@ -7810,7 +7936,7 @@
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:37
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:355
 #: assets/doctype/asset_category/asset_category.json
-#: assets/report/fixed_asset_register/fixed_asset_register.js:24
+#: assets/report/fixed_asset_register/fixed_asset_register.js:23
 #: assets/report/fixed_asset_register/fixed_asset_register.py:418
 msgid "Asset Category"
 msgstr "دسته دارایی"
@@ -7907,8 +8033,8 @@
 msgid "Asset Depreciation Schedule for Asset {0} and Finance Book {1} is not using shift based depreciation"
 msgstr "برنامه استهلاک دارایی برای دارایی {0} و کتاب مالی {1} از استهلاک مبتنی بر شیفت استفاده نمی کند"
 
-#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:898
-#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:944
+#: 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
 msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
 msgstr "برنامه استهلاک دارایی برای دارایی {0} و کتاب مالی {1} یافت نشد"
@@ -7921,7 +8047,7 @@
 msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
 msgstr "برنامه استهلاک دارایی {0} برای دارایی {1} و کتاب مالی {2} از قبل وجود دارد."
 
-#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:181
+#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:183
 msgid "Asset Depreciation Schedules created:<br>{0}<br><br>Please check, edit if needed, and submit the Asset."
 msgstr "برنامه‌های استهلاک دارایی ایجاد شده:<br>{0}<br><br>لطفاً بررسی کنید، در صورت نیاز ویرایش کنید و دارایی را ارسال کنید."
 
@@ -8016,7 +8142,7 @@
 
 #. Name of a DocType
 #: assets/doctype/asset_movement/asset_movement.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:184
+#: stock/doctype/purchase_receipt/purchase_receipt.js:211
 msgid "Asset Movement"
 msgstr "جنبش دارایی"
 
@@ -8031,7 +8157,7 @@
 msgid "Asset Movement Item"
 msgstr "آیتم حرکت دارایی"
 
-#: assets/doctype/asset/asset.py:901
+#: assets/doctype/asset/asset.py:905
 msgid "Asset Movement record {0} created"
 msgstr "رکورد حرکت دارایی {0} ایجاد شد"
 
@@ -8107,7 +8233,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:91
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:127
-#: accounts/report/account_balance/account_balance.js:39
+#: accounts/report/account_balance/account_balance.js:38
 msgid "Asset Received But Not Billed"
 msgstr "دارایی دریافت شده اما صورتحساب نشده است"
 
@@ -8217,35 +8343,35 @@
 msgid "Asset Value Analytics"
 msgstr "تجزیه و تحلیل ارزش دارایی"
 
-#: assets/doctype/asset/asset.py:172
+#: assets/doctype/asset/asset.py:174
 msgid "Asset cancelled"
 msgstr "دارایی لغو شد"
 
-#: assets/doctype/asset/asset.py:506
+#: assets/doctype/asset/asset.py:508
 msgid "Asset cannot be cancelled, as it is already {0}"
 msgstr "دارایی را نمی توان لغو کرد، زیرا قبلاً {0} است"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:687
+#: assets/doctype/asset_capitalization/asset_capitalization.py:693
 msgid "Asset capitalized after Asset Capitalization {0} was submitted"
 msgstr "پس از ارسال دارایی با حروف بزرگ {0} دارایی با حروف بزرگ نوشته شد"
 
-#: assets/doctype/asset/asset.py:194
+#: assets/doctype/asset/asset.py:196
 msgid "Asset created"
 msgstr "دارایی ایجاد شد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:633
+#: assets/doctype/asset_capitalization/asset_capitalization.py:639
 msgid "Asset created after Asset Capitalization {0} was submitted"
 msgstr "دارایی ایجاد شده پس از ارسال با حروف بزرگ دارایی {0}"
 
-#: assets/doctype/asset/asset.py:1156
+#: assets/doctype/asset/asset.py:1160
 msgid "Asset created after being split from Asset {0}"
 msgstr "دارایی پس از جدا شدن از دارایی {0} ایجاد شد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:695
+#: assets/doctype/asset_capitalization/asset_capitalization.py:701
 msgid "Asset decapitalized after Asset Capitalization {0} was submitted"
 msgstr "پس از ارسال دارایی با سرمایه {0}، دارایی از سرمایه خارج شد"
 
-#: assets/doctype/asset/asset.py:197
+#: assets/doctype/asset/asset.py:199
 msgid "Asset deleted"
 msgstr "دارایی حذف شد"
 
@@ -8261,31 +8387,31 @@
 msgid "Asset received at Location {0} and issued to Employee {1}"
 msgstr "دارایی در مکان {0} دریافت و برای کارمند {1} صادر شد"
 
-#: assets/doctype/asset/depreciation.py:509
+#: assets/doctype/asset/depreciation.py:507
 msgid "Asset restored"
 msgstr "دارایی بازیابی شد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:703
+#: assets/doctype/asset_capitalization/asset_capitalization.py:709
 msgid "Asset restored after Asset Capitalization {0} was cancelled"
 msgstr "دارایی پس از لغو حروف بزرگ دارایی {0} بازیابی شد"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1320
+#: accounts/doctype/sales_invoice/sales_invoice.py:1331
 msgid "Asset returned"
 msgstr "دارایی برگردانده شد"
 
-#: assets/doctype/asset/depreciation.py:483
+#: assets/doctype/asset/depreciation.py:481
 msgid "Asset scrapped"
 msgstr "دارایی از بین رفته است"
 
-#: assets/doctype/asset/depreciation.py:485
+#: assets/doctype/asset/depreciation.py:483
 msgid "Asset scrapped via Journal Entry {0}"
 msgstr "دارایی از طریق ورود مجله {0} کنار گذاشته شد"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1365
 msgid "Asset sold"
 msgstr "دارایی فروخته شده"
 
-#: assets/doctype/asset/asset.py:160
+#: assets/doctype/asset/asset.py:161
 msgid "Asset submitted"
 msgstr "دارایی ارسال شد"
 
@@ -8293,7 +8419,7 @@
 msgid "Asset transferred to Location {0}"
 msgstr "دارایی به مکان {0} منتقل شد"
 
-#: assets/doctype/asset/asset.py:1080
+#: assets/doctype/asset/asset.py:1084
 msgid "Asset updated after being split into Asset {0}"
 msgstr "دارایی پس از تقسیم به دارایی {0} به روز شد"
 
@@ -8309,11 +8435,11 @@
 msgid "Asset {0} cannot be received at a location and given to an employee in a single movement"
 msgstr "دارایی {0} را نمی توان در یک مکان دریافت کرد و در یک حرکت به کارمند داد"
 
-#: assets/doctype/asset/depreciation.py:449
+#: assets/doctype/asset/depreciation.py:447
 msgid "Asset {0} cannot be scrapped, as it is already {1}"
 msgstr "دارایی {0} قابل حذف نیست، زیرا قبلاً {1} است"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:237
+#: assets/doctype/asset_capitalization/asset_capitalization.py:243
 msgid "Asset {0} does not belong to Item {1}"
 msgstr "دارایی {0} به مورد {1} تعلق ندارد"
 
@@ -8329,20 +8455,20 @@
 msgid "Asset {0} does not belongs to the location {1}"
 msgstr "دارایی {0} به مکان {1} تعلق ندارد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:759
-#: assets/doctype/asset_capitalization/asset_capitalization.py:859
+#: assets/doctype/asset_capitalization/asset_capitalization.py:765
+#: assets/doctype/asset_capitalization/asset_capitalization.py:865
 msgid "Asset {0} does not exist"
 msgstr "دارایی {0} وجود ندارد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:639
+#: assets/doctype/asset_capitalization/asset_capitalization.py:645
 msgid "Asset {0} has been created. Please set the depreciation details if any and submit it."
 msgstr "دارایی {0} ایجاد شده است. لطفاً جزئیات استهلاک را در صورت وجود تنظیم و ارسال کنید."
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:661
+#: assets/doctype/asset_capitalization/asset_capitalization.py:667
 msgid "Asset {0} has been updated. Please set the depreciation details if any and submit it."
 msgstr "دارایی {0} به روز شده است. لطفاً جزئیات استهلاک را در صورت وجود تنظیم و ارسال کنید."
 
-#: assets/doctype/asset/depreciation.py:446
+#: assets/doctype/asset/depreciation.py:444
 msgid "Asset {0} must be submitted"
 msgstr "دارایی {0} باید ارسال شود"
 
@@ -8384,7 +8510,7 @@
 msgid "Assets"
 msgstr "دارایی‌ها"
 
-#: controllers/buying_controller.py:732
+#: controllers/buying_controller.py:757
 msgid "Assets not created for {0}. You will have to create asset manually."
 msgstr "دارایی برای {0} ایجاد نشده است. شما باید دارایی را به صورت دستی ایجاد کنید."
 
@@ -8393,11 +8519,11 @@
 msgid "Assets, Depreciations, Repairs, and more."
 msgstr ""
 
-#: controllers/buying_controller.py:720
+#: controllers/buying_controller.py:745
 msgid "Asset{} {assets_link} created for {}"
 msgstr "دارایی{} {assets_link} ایجاد شده برای {}"
 
-#: manufacturing/doctype/job_card/job_card.js:249
+#: manufacturing/doctype/job_card/job_card.js:281
 msgid "Assign Job to Employee"
 msgstr "کار را به کارمند واگذار کنید"
 
@@ -8419,9 +8545,9 @@
 msgid "Assign to Name"
 msgstr "به نام اختصاص دهید"
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:33
-#: support/report/issue_analytics/issue_analytics.js:82
-#: support/report/issue_summary/issue_summary.js:70
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:32
+#: support/report/issue_analytics/issue_analytics.js:81
+#: support/report/issue_summary/issue_summary.js:69
 msgid "Assigned To"
 msgstr "اختصاص یافته به"
 
@@ -8435,9 +8561,9 @@
 msgid "Assignment Conditions"
 msgstr "شرایط واگذاری"
 
-#: assets/doctype/asset/asset.py:1011
+#: assets/doctype/asset/asset.py:1015
 msgid "At least one asset has to be selected."
-msgstr ""
+msgstr "حداقل یک دارایی باید انتخاب شود."
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:789
 msgid "At least one invoice has to be selected."
@@ -8448,7 +8574,7 @@
 msgstr ""
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:405
-#: accounts/doctype/sales_invoice/sales_invoice.py:509
+#: accounts/doctype/sales_invoice/sales_invoice.py:522
 msgid "At least one mode of payment is required for POS invoice."
 msgstr "حداقل یک روش پرداخت برای فاکتور POS مورد نیاز است."
 
@@ -8460,7 +8586,7 @@
 msgid "At least one of the Selling or Buying must be selected"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:643
+#: stock/doctype/stock_entry/stock_entry.py:598
 msgid "At least one warehouse is mandatory"
 msgstr ""
 
@@ -8468,22 +8594,26 @@
 msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}"
 msgstr "در ردیف #{0}: شناسه دنباله {1} نمی تواند کمتر از شناسه دنباله ردیف قبلی {2} باشد."
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:582
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
 msgid "At row {0}: Batch No is mandatory for Item {1}"
 msgstr "در ردیف {0}: شماره دسته برای مورد {1} اجباری است"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:574
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:569
 msgid "At row {0}: Serial No is mandatory for Item {1}"
 msgstr "در ردیف {0}: شماره سریال برای مورد {1} اجباری است"
 
+#: controllers/stock_controller.py:301
+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 ""
+
 #. Description of the 'File to Rename' (Attach) field in DocType 'Rename Tool'
 #: utilities/doctype/rename_tool/rename_tool.json
 msgctxt "Rename Tool"
 msgid "Attach .csv file with two columns, one for the old name and one for the new name"
 msgstr "فایل csv. را با دو ستون، یکی برای نام قدیمی و دیگری برای نام جدید، پیوست کنید"
 
-#: public/js/utils/serial_no_batch_selector.js:246
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:66
+#: public/js/utils/serial_no_batch_selector.js:250
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:69
 msgid "Attach CSV File"
 msgstr "فایل CSV را پیوست کنید"
 
@@ -8499,7 +8629,7 @@
 msgid "Attachment"
 msgstr "پیوست"
 
-#: templates/pages/order.html:125 templates/pages/projects.html:83
+#: templates/pages/order.html:137 templates/pages/projects.html:83
 msgid "Attachments"
 msgstr "پیوست ها"
 
@@ -8679,7 +8809,7 @@
 msgid "Auto Email Report"
 msgstr "گزارش خودکار ایمیل"
 
-#: public/js/utils/serial_no_batch_selector.js:316
+#: public/js/utils/serial_no_batch_selector.js:322
 msgid "Auto Fetch"
 msgstr "واکشی خودکار"
 
@@ -8695,7 +8825,7 @@
 msgid "Auto Material Request"
 msgstr "درخواست مواد خودکار"
 
-#: stock/reorder_item.py:242
+#: stock/reorder_item.py:327
 msgid "Auto Material Requests Generated"
 msgstr "درخواست مواد خودکار ایجاد شده است"
 
@@ -8719,7 +8849,7 @@
 msgid "Auto Opt In (For all customers)"
 msgstr "شرکت خودکار (برای همه مشتریان)"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:67
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:61
 msgid "Auto Reconcile"
 msgstr "آشتی خودکار"
 
@@ -8729,7 +8859,7 @@
 msgid "Auto Reconcile Payments"
 msgstr "تطبیق خودکار پرداخت ها"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:414
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:413
 msgid "Auto Reconciliation"
 msgstr "آشتی خودکار"
 
@@ -8853,7 +8983,7 @@
 msgid "Auto re-order"
 msgstr "سفارش مجدد خودکار"
 
-#: public/js/controllers/buying.js:295 public/js/utils/sales_common.js:362
+#: public/js/controllers/buying.js:290 public/js/utils/sales_common.js:403
 msgid "Auto repeat document updated"
 msgstr "سند تکرار خودکار به روز شد"
 
@@ -8938,7 +9068,7 @@
 msgstr "تاریخ استفاده در دسترس است"
 
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:82
-#: public/js/utils.js:522 stock/report/stock_ageing/stock_ageing.py:156
+#: public/js/utils.js:579 stock/report/stock_ageing/stock_ageing.py:156
 msgid "Available Qty"
 msgstr "تعداد موجود"
 
@@ -9029,15 +9159,15 @@
 msgid "Available Stock for Packing Items"
 msgstr "انبار موجود برای بسته بندی اقلام"
 
-#: assets/doctype/asset/asset.py:270
+#: assets/doctype/asset/asset.py:272
 msgid "Available for use date is required"
 msgstr "تاریخ در دسترس برای استفاده الزامی است"
 
-#: stock/doctype/stock_entry/stock_entry.py:772
+#: stock/doctype/stock_entry/stock_entry.py:727
 msgid "Available quantity is {0}, you need {1}"
 msgstr "مقدار موجود {0} است، شما به {1} نیاز دارید"
 
-#: stock/dashboard/item_dashboard.js:239
+#: stock/dashboard/item_dashboard.js:247
 msgid "Available {0}"
 msgstr "موجود {0}"
 
@@ -9047,13 +9177,13 @@
 msgid "Available-for-use Date"
 msgstr "تاریخ در دسترس برای استفاده"
 
-#: assets/doctype/asset/asset.py:355
+#: assets/doctype/asset/asset.py:357
 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:477
+#: stock/report/stock_balance/stock_balance.py:485
 msgid "Average Age"
 msgstr "میانگین سن"
 
@@ -9093,7 +9223,7 @@
 msgid "Avg Rate"
 msgstr "میانگین نرخ"
 
-#: stock/report/stock_ledger/stock_ledger.py:197
+#: stock/report/stock_ledger/stock_ledger.py:270
 msgid "Avg Rate (Balance Stock)"
 msgstr "میانگین نرخ (موجودی)"
 
@@ -9136,14 +9266,14 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/bom/bom.json manufacturing/doctype/bom/bom_tree.js:8
-#: manufacturing/report/bom_explorer/bom_explorer.js:9
+#: manufacturing/report/bom_explorer/bom_explorer.js:8
 #: manufacturing/report/bom_explorer/bom_explorer.py:56
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:9
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:8
 #: manufacturing/report/bom_stock_report/bom_stock_report.js:5
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
-#: selling/doctype/sales_order/sales_order.js:810
-#: stock/doctype/material_request/material_request.js:243
-#: stock/doctype/stock_entry/stock_entry.js:545
+#: 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/report/bom_search/bom_search.py:38
 msgid "BOM"
 msgstr "BOM"
@@ -9214,7 +9344,7 @@
 msgid "BOM 1"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1348
+#: manufacturing/doctype/bom/bom.py:1347
 msgid "BOM 1 {0} and BOM 2 {1} should not be same"
 msgstr "BOM 1 {0} و BOM 2 {1} نباید یکسان باشند"
 
@@ -9296,7 +9426,7 @@
 msgid "BOM Explosion Item"
 msgstr "مورد انفجار BOM"
 
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:21
+#: manufacturing/report/bom_operations_time/bom_operations_time.js:20
 #: manufacturing/report/bom_operations_time/bom_operations_time.py:101
 msgid "BOM ID"
 msgstr "شناسه BOM"
@@ -9317,7 +9447,7 @@
 msgid "BOM Level"
 msgstr "سطح BOM"
 
-#: manufacturing/report/bom_variance_report/bom_variance_report.js:9
+#: manufacturing/report/bom_variance_report/bom_variance_report.js:8
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:31
 msgid "BOM No"
 msgstr "شماره BOM"
@@ -9428,6 +9558,7 @@
 #. Name of a report
 #. Label of a Link in the Manufacturing Workspace
 #. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:1
 #: manufacturing/report/bom_stock_report/bom_stock_report.json
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "BOM Stock Report"
@@ -9448,7 +9579,7 @@
 msgid "BOM Update Batch"
 msgstr "دسته به روز رسانی BOM"
 
-#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:82
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:84
 msgid "BOM Update Initiated"
 msgstr "به روز رسانی BOM آغاز شد"
 
@@ -9468,6 +9599,11 @@
 msgid "BOM Update Tool"
 msgstr "ابزار به روز رسانی BOM"
 
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_log/bom_update_log.json
+msgid "BOM Update Tool Log with job status maintained"
+msgstr ""
+
 #: manufacturing/doctype/bom_update_log/bom_update_log.py:99
 msgid "BOM Updation already in progress. Please wait until {0} is complete."
 msgstr "به‌روزرسانی BOM در حال انجام است. لطفاً صبر کنید تا {0} کامل شود."
@@ -9491,12 +9627,12 @@
 msgid "BOM Website Operation"
 msgstr "عملیات وب سایت BOM"
 
-#: stock/doctype/stock_entry/stock_entry.js:1000
+#: stock/doctype/stock_entry/stock_entry.js:1145
 msgid "BOM and Manufacturing Quantity are required"
 msgstr "BOM و مقدار تولید مورد نیاز است"
 
-#: stock/doctype/material_request/material_request.js:264
-#: stock/doctype/stock_entry/stock_entry.js:581
+#: stock/doctype/material_request/material_request.js:332
+#: stock/doctype/stock_entry/stock_entry.js:669
 msgid "BOM does not contain any stock item"
 msgstr "BOM شامل هیچ مورد موجودی نیست"
 
@@ -9508,15 +9644,15 @@
 msgid "BOM recursion: {1} cannot be parent or child of {0}"
 msgstr "بازگشت BOM: {1} نمی تواند والد یا فرزند {0} باشد"
 
-#: manufacturing/doctype/bom/bom.py:1223
+#: manufacturing/doctype/bom/bom.py:1222
 msgid "BOM {0} does not belong to Item {1}"
 msgstr "BOM {0} به مورد {1} تعلق ندارد"
 
-#: manufacturing/doctype/bom/bom.py:1205
+#: manufacturing/doctype/bom/bom.py:1204
 msgid "BOM {0} must be active"
 msgstr "BOM {0} باید فعال باشد"
 
-#: manufacturing/doctype/bom/bom.py:1208
+#: manufacturing/doctype/bom/bom.py:1207
 msgid "BOM {0} must be submitted"
 msgstr "BOM {0} باید ارسال شود"
 
@@ -9538,11 +9674,11 @@
 msgid "BOMs creation has been enqueued, kindly check the status after some time"
 msgstr "ایجاد BOM در نوبت قرار گرفته است، لطفاً وضعیت را پس از مدتی بررسی کنید"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:323
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:334
 msgid "Backdated Stock Entry"
 msgstr "ثبت موجودی دارای تاریخ قبلی"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:15
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
 msgid "Backflush Raw Materials"
 msgstr "مواد اولیه بک فلاش"
 
@@ -9572,10 +9708,11 @@
 msgstr "تعادل"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:41
+#: accounts/report/general_ledger/general_ledger.html:32
 msgid "Balance (Dr - Cr)"
 msgstr "موجودی (Dr - Cr)"
 
-#: accounts/report/general_ledger/general_ledger.py:584
+#: accounts/report/general_ledger/general_ledger.py:597
 msgid "Balance ({0})"
 msgstr "موجودی ({0})"
 
@@ -9592,8 +9729,8 @@
 msgstr "موجودی در ارز پایه"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:82
-#: stock/report/stock_balance/stock_balance.py:405
-#: stock/report/stock_ledger/stock_ledger.py:153
+#: stock/report/stock_balance/stock_balance.py:413
+#: stock/report/stock_ledger/stock_ledger.py:226
 msgid "Balance Qty"
 msgstr "تعداد موجودی"
 
@@ -9601,10 +9738,6 @@
 msgid "Balance Qty (Stock)"
 msgstr "تعداد موجودی (موجودی)"
 
-#: stock/report/stock_ledger/stock_ledger.py:259
-msgid "Balance Serial No"
-msgstr "شماره سریال موجودی"
-
 #. Name of a report
 #. Label of a Link in the Financial Reports Workspace
 #: accounts/report/balance_sheet/balance_sheet.json
@@ -9637,18 +9770,22 @@
 msgid "Balance Sheet Summary"
 msgstr "خلاصه ترازنامه"
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:13
+msgid "Balance Stock Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "Balance Stock Value"
 msgstr "موجودی ارزش موجودی"
 
-#: stock/report/stock_balance/stock_balance.py:412
-#: stock/report/stock_ledger/stock_ledger.py:217
+#: stock/report/stock_balance/stock_balance.py:420
+#: stock/report/stock_ledger/stock_ledger.py:290
 msgid "Balance Value"
 msgstr "ارزش موجودی"
 
-#: accounts/doctype/gl_entry/gl_entry.py:355
+#: accounts/doctype/gl_entry/gl_entry.py:309
 msgid "Balance for Account {0} must always be {1}"
 msgstr "موجودی حساب {0} باید همیشه {1} باشد"
 
@@ -9660,7 +9797,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/bank/bank.json
-#: accounts/report/account_balance/account_balance.js:40
+#: accounts/report/account_balance/account_balance.js:39
 msgid "Bank"
 msgstr "بانک"
 
@@ -9740,7 +9877,7 @@
 #: accounts/doctype/bank_account/bank_account.json
 #: 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:94
+#: buying/doctype/supplier/supplier.js:108
 #: setup/setup_wizard/operations/install_fixtures.py:492
 msgid "Bank Account"
 msgstr "حساب بانکی"
@@ -9982,6 +10119,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:4
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Bank Reconciliation Statement"
@@ -10040,23 +10178,23 @@
 msgid "Bank Transaction Payments"
 msgstr "پرداخت تراکنش های بانکی"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:496
+#: public/js/bank_reconciliation_tool/dialog_manager.js:485
 msgid "Bank Transaction {0} Matched"
 msgstr "تراکنش بانکی {0} مطابقت دارد"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:544
+#: public/js/bank_reconciliation_tool/dialog_manager.js:533
 msgid "Bank Transaction {0} added as Journal Entry"
 msgstr "تراکنش بانکی {0} به عنوان ورودی مجله اضافه شد"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:520
+#: public/js/bank_reconciliation_tool/dialog_manager.js:508
 msgid "Bank Transaction {0} added as Payment Entry"
 msgstr "تراکنش بانکی {0} به عنوان ورودی پرداخت اضافه شد"
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:124
+#: accounts/doctype/bank_transaction/bank_transaction.py:127
 msgid "Bank Transaction {0} is already fully reconciled"
 msgstr "تراکنش بانکی {0} در حال حاضر به طور کامل تطبیق شده است"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:563
+#: public/js/bank_reconciliation_tool/dialog_manager.js:553
 msgid "Bank Transaction {0} updated"
 msgstr "تراکنش بانکی {0} به روز شد"
 
@@ -10064,15 +10202,15 @@
 msgid "Bank account cannot be named as {0}"
 msgstr "حساب بانکی نمی تواند به عنوان {0} نامگذاری شود"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:130
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:146
 msgid "Bank account {0} already exists and could not be created again"
 msgstr "حساب بانکی {0} از قبل وجود دارد و نمی توان دوباره ایجاد کرد"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:134
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:153
 msgid "Bank accounts added"
 msgstr "حساب های بانکی اضافه شد"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:297
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:313
 msgid "Bank transaction creation error"
 msgstr "خطای ایجاد تراکنش بانکی"
 
@@ -10097,7 +10235,7 @@
 msgid "Banking"
 msgstr "بانکداری"
 
-#: public/js/utils/barcode_scanner.js:273
+#: public/js/utils/barcode_scanner.js:282
 msgid "Barcode"
 msgstr "بارکد"
 
@@ -10224,7 +10362,7 @@
 msgid "Base Tax Withholding Net Total"
 msgstr "کل خالص کسر مالیات پایه"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:239
 msgid "Base Total"
 msgstr "مجموع پایه"
 
@@ -10252,18 +10390,18 @@
 msgid "Base URL"
 msgstr "URL پایه"
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:28
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:27
 #: accounts/report/profitability_analysis/profitability_analysis.js:16
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:9
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:45
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:39
-#: manufacturing/report/production_planning_report/production_planning_report.js:17
-#: manufacturing/report/work_order_summary/work_order_summary.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:8
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:44
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:38
+#: manufacturing/report/production_planning_report/production_planning_report.js:16
+#: manufacturing/report/work_order_summary/work_order_summary.js:15
 #: public/js/purchase_trends_filters.js:45 public/js/sales_trends_filters.js:20
-#: stock/report/delayed_item_report/delayed_item_report.js:55
-#: stock/report/delayed_order_report/delayed_order_report.js:55
-#: support/report/issue_analytics/issue_analytics.js:17
-#: support/report/issue_summary/issue_summary.js:17
+#: stock/report/delayed_item_report/delayed_item_report.js:54
+#: stock/report/delayed_order_report/delayed_order_report.js:54
+#: support/report/issue_analytics/issue_analytics.js:16
+#: support/report/issue_summary/issue_summary.js:16
 msgid "Based On"
 msgstr "بر اساس"
 
@@ -10279,18 +10417,18 @@
 msgid "Based On"
 msgstr "بر اساس"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:47
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:46
 msgid "Based On Data ( in years )"
 msgstr "بر اساس داده ها (در سال)"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:31
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:30
 msgid "Based On Document"
 msgstr "بر اساس سند"
 
-#: accounts/report/accounts_payable/accounts_payable.js:134
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:111
-#: accounts/report/accounts_receivable/accounts_receivable.js:156
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:137
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:114
+#: accounts/report/accounts_receivable/accounts_receivable.js:159
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:132
 msgid "Based On Payment Terms"
 msgstr "بر اساس شرایط پرداخت"
 
@@ -10362,7 +10500,7 @@
 #: 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/stock_ledger/stock_ledger.py:239
+#: 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
 msgid "Batch"
@@ -10403,11 +10541,11 @@
 msgid "Batch Item Expiry Status"
 msgstr "وضعیت انقضای دسته دسته"
 
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:88
+#: 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:2150
-#: public/js/utils/barcode_scanner.js:251
-#: public/js/utils/serial_no_batch_selector.js:367
+#: public/js/controllers/transaction.js:2193
+#: 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
@@ -10535,15 +10673,15 @@
 msgid "Batch No"
 msgstr "شماره دسته"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:585
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:580
 msgid "Batch No is mandatory"
 msgstr "شماره دسته اجباری است"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2118
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2137
 msgid "Batch No {0} does not exists"
 msgstr ""
 
-#: stock/utils.py:643
+#: stock/utils.py:638
 msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
 msgstr "شماره دسته {0} با مورد {1} که دارای شماره سریال است پیوند داده شده است. لطفاً شماره سریال را اسکن کنید."
 
@@ -10553,13 +10691,13 @@
 msgid "Batch No."
 msgstr "شماره دسته"
 
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Batch Nos"
 msgstr "شماره های دسته"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1113
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1120
 msgid "Batch Nos are created successfully"
 msgstr "شماره های دسته با موفقیت ایجاد شد"
 
@@ -10579,7 +10717,7 @@
 msgid "Batch Quantity"
 msgstr "مقدار دسته ای"
 
-#: manufacturing/doctype/work_order/work_order.js:256
+#: manufacturing/doctype/work_order/work_order.js:271
 msgid "Batch Size"
 msgstr "اندازه دسته"
 
@@ -10619,7 +10757,7 @@
 msgid "Batch and Serial No"
 msgstr "شماره دسته و سریال"
 
-#: manufacturing/doctype/work_order/work_order.py:485
+#: manufacturing/doctype/work_order/work_order.py:496
 msgid "Batch not created for item {} since it does not have a batch series."
 msgstr "دسته ای برای آیتم {} ایجاد نشده است زیرا سری دسته ای ندارد."
 
@@ -10627,12 +10765,12 @@
 msgid "Batch {0} and Warehouse"
 msgstr "دسته {0} و انبار"
 
-#: stock/doctype/stock_entry/stock_entry.py:2345
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:272
+#: stock/doctype/stock_entry/stock_entry.py:2379
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:283
 msgid "Batch {0} of Item {1} has expired."
 msgstr "دسته {0} مورد {1} منقضی شده است."
 
-#: stock/doctype/stock_entry/stock_entry.py:2347
+#: stock/doctype/stock_entry/stock_entry.py:2381
 msgid "Batch {0} of Item {1} is disabled."
 msgstr "دسته {0} مورد {1} غیرفعال است."
 
@@ -10672,7 +10810,7 @@
 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:1061
+#: accounts/report/accounts_receivable/accounts_receivable.py:1069
 #: accounts/report/purchase_register/purchase_register.py:214
 msgid "Bill Date"
 msgstr "تاریخ قبض"
@@ -10689,7 +10827,7 @@
 msgid "Bill Date"
 msgstr "تاریخ قبض"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1060
+#: accounts/report/accounts_receivable/accounts_receivable.py:1068
 #: accounts/report/purchase_register/purchase_register.py:213
 msgid "Bill No"
 msgstr "لایحه شماره"
@@ -10714,11 +10852,11 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Manufacturing Workspace
-#: manufacturing/doctype/bom/bom.py:1089
+#: manufacturing/doctype/bom/bom.py:1088
 #: 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:533
+#: stock/doctype/stock_entry/stock_entry.js:599
 msgid "Bill of Materials"
 msgstr "لایحه مواد"
 
@@ -11122,8 +11260,8 @@
 msgid "Blanket Order Rate"
 msgstr "نرخ سفارش پتو"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:101
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:265
 msgid "Block Invoice"
 msgstr "بلوک فاکتور"
 
@@ -11262,7 +11400,7 @@
 msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
 msgstr "رزرو ارزش موجودی در چندین حساب، ردیابی موجودی و ارزش حساب را دشوارتر می کند."
 
-#: accounts/general_ledger.py:685
+#: accounts/general_ledger.py:694
 msgid "Books have been closed till the period ending on {0}"
 msgstr "کتاب‌ها تا پایان دوره {0} بسته شده‌اند"
 
@@ -11328,11 +11466,11 @@
 #: accounts/report/gross_profit/gross_profit.py:243
 #: 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:41 public/js/stock_analytics.js:62
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:48
+#: public/js/stock_analytics.js:58 public/js/stock_analytics.js:93
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:47
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:61
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:100
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:101
 #: setup/doctype/brand/brand.json
 #: stock/report/item_price_stock/item_price_stock.py:25
 #: stock/report/item_prices/item_prices.py:53
@@ -11342,10 +11480,10 @@
 #: 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_analytics/stock_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:34
 #: stock/report/stock_analytics/stock_analytics.py:45
-#: stock/report/stock_ledger/stock_ledger.js:65
-#: stock/report/stock_ledger/stock_ledger.py:181
+#: 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
 #: stock/report/stock_projected_qty/stock_projected_qty.py:115
 msgid "Brand"
@@ -11504,16 +11642,16 @@
 msgid "Breakdown"
 msgstr "درهم شکستن"
 
-#: manufacturing/doctype/bom/bom.js:103
+#: manufacturing/doctype/bom/bom.js:102
 msgid "Browse BOM"
 msgstr "BOM را مرور کنید"
 
 #. Name of a DocType
 #: accounts/doctype/budget/budget.json
-#: accounts/doctype/cost_center/cost_center.js:44
-#: accounts/doctype/cost_center/cost_center_tree.js:42
-#: accounts/doctype/cost_center/cost_center_tree.js:46
-#: accounts/doctype/cost_center/cost_center_tree.js:50
+#: accounts/doctype/cost_center/cost_center.js:45
+#: accounts/doctype/cost_center/cost_center_tree.js:65
+#: accounts/doctype/cost_center/cost_center_tree.js:73
+#: 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
@@ -11537,7 +11675,7 @@
 msgid "Budget Accounts"
 msgstr "حساب های بودجه"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:82
+#: accounts/report/budget_variance_report/budget_variance_report.js:80
 msgid "Budget Against"
 msgstr "بودجه در مقابل"
 
@@ -11559,17 +11697,17 @@
 msgid "Budget Detail"
 msgstr "جزئیات بودجه"
 
-#: accounts/doctype/budget/budget.py:278 accounts/doctype/budget/budget.py:280
+#: accounts/doctype/budget/budget.py:285 accounts/doctype/budget/budget.py:287
 msgid "Budget Exceeded"
 msgstr "بودجه بیش از حد"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:40
+#: accounts/doctype/cost_center/cost_center_tree.js:61
 msgid "Budget List"
 msgstr "لیست بودجه"
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/cost_center/cost_center_tree.js:48
+#: accounts/doctype/cost_center/cost_center_tree.js:77
 #: accounts/report/budget_variance_report/budget_variance_report.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Budget Variance Report"
@@ -11642,6 +11780,11 @@
 msgid "Buy"
 msgstr "خرید کنید"
 
+#. Description of a DocType
+#: selling/doctype/customer/customer.json
+msgid "Buyer of Goods and Services."
+msgstr ""
+
 #. Name of a Workspace
 #. Label of a Card Break in the Buying Workspace
 #: buying/workspace/buying/buying.json
@@ -11740,7 +11883,7 @@
 msgid "Buying must be checked, if Applicable For is selected as {0}"
 msgstr "اگر Applicable For به عنوان {0} انتخاب شده باشد، خرید باید بررسی شود"
 
-#: buying/doctype/buying_settings/buying_settings.js:14
+#: buying/doctype/buying_settings/buying_settings.js:13
 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a <a href='https://docs.erpnext.com/docs/user/manual/en/setting-up/settings/naming-series' target='_blank'>Naming Series</a> choose the 'Naming Series' option."
 msgstr "به‌طور پیش‌فرض، نام تأمین‌کننده مطابق با نام تأمین‌کننده وارد شده تنظیم می‌شود. اگر می‌خواهید تأمین‌کنندگان با <a href='https://docs.erpnext.com/docs/user/manual/en/setting-up/settings/name-series' target='_blank'>سری نام‌گذاری نام‌گذاری شوند. </a> گزینه \"Naming Series\" را انتخاب کنید."
 
@@ -11934,12 +12077,12 @@
 msgid "Call Routing"
 msgstr "مسیریابی تماس"
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:57
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:58
 #: telephony/doctype/incoming_call_settings/incoming_call_settings.py:49
 msgid "Call Schedule Row {0}: To time slot should always be ahead of From time slot."
 msgstr "ردیف زمان‌بندی تماس {0}: بازه زمانی To همیشه باید جلوتر از بازه زمانی از زمان باشد."
 
-#: public/js/call_popup/call_popup.js:153
+#: public/js/call_popup/call_popup.js:164
 #: telephony/doctype/call_log/call_log.py:135
 msgid "Call Summary"
 msgstr "خلاصه تماس"
@@ -11950,6 +12093,10 @@
 msgid "Call Summary"
 msgstr "خلاصه تماس"
 
+#: public/js/call_popup/call_popup.js:186
+msgid "Call Summary Saved"
+msgstr ""
+
 #. Label of a Data field in DocType 'Telephony Call Type'
 #: telephony/doctype/telephony_call_type/telephony_call_type.json
 msgctxt "Telephony Call Type"
@@ -12096,7 +12243,7 @@
 msgid "Can be approved by {0}"
 msgstr "قابل تایید توسط {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:1451
+#: manufacturing/doctype/work_order/work_order.py:1465
 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
 msgstr "نمی توان Work Order را بست. از آنجایی که کارت‌های شغلی {0} در حالت کار در حال انجام هستند."
 
@@ -12124,20 +12271,24 @@
 msgid "Can not filter based on Voucher No, if grouped by Voucher"
 msgstr "اگر بر اساس کوپن گروه بندی شود، نمی توان بر اساس شماره کوپن فیلتر کرد"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1226
-#: accounts/doctype/payment_entry/payment_entry.py:2229
+#: accounts/doctype/journal_entry/journal_entry.py:1240
+#: accounts/doctype/payment_entry/payment_entry.py:2254
 msgid "Can only make payment against unbilled {0}"
 msgstr "فقط می‌توانید با {0} پرداخت نشده انجام دهید"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1199
-#: controllers/accounts_controller.py:2500 public/js/controllers/accounts.js:90
+#: accounts/doctype/payment_entry/payment_entry.js:1438
+#: controllers/accounts_controller.py:2585 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 "فقط در صورتی می‌توان ردیف را ارجاع داد که نوع شارژ «در مقدار ردیف قبلی» یا «مجموع ردیف قبلی» باشد"
 
-#: stock/doctype/stock_settings/stock_settings.py:133
+#: stock/doctype/stock_settings/stock_settings.py:136
 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method"
 msgstr "نمی توان روش ارزش گذاری را تغییر داد، زیرا معاملاتی در برابر برخی اقلام وجود دارد که روش ارزش گذاری خاص خود را ندارند."
 
+#: templates/pages/task_info.html:24
+msgid "Cancel"
+msgstr "لغو کنید"
+
 #. Label of a Check field in DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
 msgctxt "Subscription"
@@ -12168,8 +12319,8 @@
 msgid "Cancelation Date"
 msgstr "تاریخ لغو"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:18
-#: stock/doctype/stock_entry/stock_entry_list.js:19
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:13
+#: stock/doctype/stock_entry/stock_entry_list.js:25
 msgid "Canceled"
 msgstr "لغو شد"
 
@@ -12186,11 +12337,12 @@
 msgstr "لغو شد"
 
 #: accounts/doctype/bank_transaction/bank_transaction_list.js:8
-#: accounts/doctype/payment_request/payment_request_list.js:20
+#: accounts/doctype/payment_request/payment_request_list.js:18
 #: accounts/doctype/subscription/subscription_list.js:14
 #: assets/doctype/asset_repair/asset_repair_list.js:9
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:11
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle_list.js:8
+#: templates/pages/task_info.html:77
 msgid "Cancelled"
 msgstr "لغو شد"
 
@@ -12445,6 +12597,13 @@
 msgid "Cancelled"
 msgstr "لغو شد"
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Cancelled"
+msgstr "لغو شد"
+
 #. Option for the 'Status' (Select) field in DocType 'Warranty Claim'
 #: support/doctype/warranty_claim/warranty_claim.json
 msgctxt "Warranty Claim"
@@ -12457,7 +12616,7 @@
 msgid "Cancelled"
 msgstr "لغو شد"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:76
+#: stock/doctype/delivery_trip/delivery_trip.js:89
 #: stock/doctype/delivery_trip/delivery_trip.py:189
 msgid "Cannot Calculate Arrival Time as Driver Address is Missing."
 msgstr "نمی توان زمان رسیدن را محاسبه کرد زیرا آدرس راننده گم شده است."
@@ -12467,7 +12626,7 @@
 msgid "Cannot Merge"
 msgstr "نمی توان ادغام کرد"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:105
+#: stock/doctype/delivery_trip/delivery_trip.js:122
 msgid "Cannot Optimize Route as Driver Address is Missing."
 msgstr "نمی توان مسیر را بهینه کرد زیرا نشانی راننده وجود ندارد."
 
@@ -12483,7 +12642,7 @@
 msgid "Cannot amend {0} {1}, please create a new one instead."
 msgstr "نمی توان {0} {1} را اصلاح کرد، لطفاً در عوض یک مورد جدید ایجاد کنید."
 
-#: accounts/doctype/journal_entry/journal_entry.py:257
+#: accounts/doctype/journal_entry/journal_entry.py:273
 msgid "Cannot apply TDS against multiple parties in one entry"
 msgstr "نمی‌توان TDS را در یک ورودی علیه چندین طرف اعمال کرد"
 
@@ -12491,23 +12650,23 @@
 msgid "Cannot be a fixed asset item as Stock Ledger is created."
 msgstr "نمی تواند یک مورد دارایی ثابت باشد زیرا دفتر کل موجودی ایجاد می شود."
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:222
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:217
 msgid "Cannot cancel as processing of cancelled documents is pending."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:641
+#: manufacturing/doctype/work_order/work_order.py:655
 msgid "Cannot cancel because submitted Stock Entry {0} exists"
 msgstr "نمی توان لغو کرد زیرا ورودی موجودی ارسال شده {0} وجود دارد"
 
-#: stock/stock_ledger.py:196
+#: stock/stock_ledger.py:198
 msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet."
 msgstr "نمی توان معامله را لغو کرد. ارسال مجدد ارزیابی اقلام هنگام ارسال هنوز تکمیل نشده است."
 
-#: controllers/buying_controller.py:811
+#: controllers/buying_controller.py:836
 msgid "Cannot cancel this document as it is linked with submitted asset {0}. Please cancel it to continue."
 msgstr "نمی توان این سند را لغو کرد زیرا با دارایی ارسال شده {0} پیوند داده شده است. لطفاً برای ادامه آن را لغو کنید."
 
-#: stock/doctype/stock_entry/stock_entry.py:365
+#: stock/doctype/stock_entry/stock_entry.py:320
 msgid "Cannot cancel transaction for Completed Work Order."
 msgstr "نمی توان تراکنش را برای سفارش کار تکمیل شده لغو کرد."
 
@@ -12519,7 +12678,7 @@
 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:66
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:70
 msgid "Cannot change Reference Document Type."
 msgstr "نمی توان نوع سند مرجع را تغییر داد."
 
@@ -12531,7 +12690,7 @@
 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:209
+#: setup/doctype/company/company.py:208
 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."
 msgstr "نمی توان ارز پیش فرض شرکت را تغییر داد، زیرا تراکنش های موجود وجود دارد. برای تغییر واحد پول پیش‌فرض، تراکنش‌ها باید لغو شوند."
 
@@ -12543,32 +12702,32 @@
 msgid "Cannot convert Cost Center to ledger as it has child nodes"
 msgstr "نمی توان مرکز هزینه را به دفتر کل تبدیل کرد زیرا دارای گره های فرزند است"
 
-#: projects/doctype/task/task.js:48
+#: projects/doctype/task/task.js:50
 msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}."
 msgstr "نمی توان وظیفه را به غیر گروهی تبدیل کرد زیرا وظایف فرزند زیر وجود دارد: {0}."
 
-#: accounts/doctype/account/account.py:373
+#: accounts/doctype/account/account.py:392
 msgid "Cannot convert to Group because Account Type is selected."
 msgstr "نمی توان به گروه تبدیل کرد زیرا نوع حساب انتخاب شده است."
 
-#: accounts/doctype/account/account.py:250
+#: accounts/doctype/account/account.py:269
 msgid "Cannot covert to Group because Account Type is selected."
 msgstr "نمی توان در گروه پنهان کرد زیرا نوع حساب انتخاب شده است."
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:914
+#: stock/doctype/purchase_receipt/purchase_receipt.py:916
 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
 msgstr "نمی توان ورودی های رزرو موجودی را برای رسیدهای خرید با تاریخ آینده ایجاد کرد."
 
-#: stock/doctype/delivery_note/delivery_note_list.js:25
+#: stock/doctype/delivery_note/delivery_note_list.js:35
 msgid "Cannot create a Delivery Trip from Draft documents."
 msgstr "نمی توان یک سفر تحویل از اسناد پیش نویس ایجاد کرد."
 
-#: selling/doctype/sales_order/sales_order.py:1576
-#: stock/doctype/pick_list/pick_list.py:104
+#: selling/doctype/sales_order/sales_order.py:1599
+#: stock/doctype/pick_list/pick_list.py:108
 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 "نمی‌توان فهرست انتخابی برای سفارش فروش {0} ایجاد کرد زیرا موجودی رزرو کرده است. لطفاً برای ایجاد لیست انتخاب، موجودی را لغو رزرو کنید."
 
-#: accounts/general_ledger.py:127
+#: accounts/general_ledger.py:131
 msgid "Cannot create accounting entries against disabled accounts: {0}"
 msgstr "نمی توان ورودی های حسابداری را در برابر حساب های غیرفعال ایجاد کرد: {0}"
 
@@ -12589,32 +12748,40 @@
 msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
 msgstr "نمی توان شماره سریال {0} را حذف کرد، زیرا در معاملات موجودی استفاده می شود"
 
-#: selling/doctype/sales_order/sales_order.py:638
-#: selling/doctype/sales_order/sales_order.py:661
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:101
+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
 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
 msgstr "نمی توان از تحویل با شماره سریال اطمینان حاصل کرد زیرا مورد {0} با و بدون اطمینان از تحویل با شماره سریال اضافه شده است."
 
-#: public/js/utils/barcode_scanner.js:51
+#: public/js/utils/barcode_scanner.js:54
 msgid "Cannot find Item with this Barcode"
 msgstr "نمی توان موردی را با این بارکد پیدا کرد"
 
-#: controllers/accounts_controller.py:3023
+#: controllers/accounts_controller.py:3114
 msgid "Cannot find {} for item {}. Please set the same in Item Master or Stock Settings."
 msgstr "نمی توان {} را برای مورد {} پیدا کرد. لطفاً همان را در آیتم اصلی یا تنظیمات موجودی تنظیم کنید."
 
-#: controllers/accounts_controller.py:1774
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:506
+msgid "Cannot make any transactions until the deletion job is completed"
+msgstr ""
+
+#: controllers/accounts_controller.py:1863
 msgid "Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings"
 msgstr "نمی توان برای مورد {0} در ردیف {1} بیش از {2} صورت حساب اضافه کرد. برای مجاز کردن صورت‌حساب بیش از حد، لطفاً در تنظیمات حساب‌ها مقدار مجاز را تنظیم کنید"
 
-#: manufacturing/doctype/work_order/work_order.py:292
+#: manufacturing/doctype/work_order/work_order.py:296
 msgid "Cannot produce more Item {0} than Sales Order quantity {1}"
 msgstr "نمی‌توان آیتم {0} بیشتر از مقدار سفارش فروش {1} تولید کرد"
 
-#: manufacturing/doctype/work_order/work_order.py:962
+#: manufacturing/doctype/work_order/work_order.py:976
 msgid "Cannot produce more item for {0}"
 msgstr "نمی توان مورد بیشتری برای {0} تولید کرد"
 
-#: manufacturing/doctype/work_order/work_order.py:966
+#: manufacturing/doctype/work_order/work_order.py:980
 msgid "Cannot produce more than {0} items for {1}"
 msgstr "نمی توان بیش از {0} مورد برای {1} تولید کرد"
 
@@ -12622,8 +12789,8 @@
 msgid "Cannot receive from customer against negative outstanding"
 msgstr "نمی توان از مشتری در برابر معوقات منفی دریافت کرد"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1209
-#: controllers/accounts_controller.py:2515
+#: accounts/doctype/payment_entry/payment_entry.js:1455
+#: controllers/accounts_controller.py:2600
 #: public/js/controllers/accounts.js:100
 msgid "Cannot refer row number greater than or equal to current row number for this Charge type"
 msgstr "نمی توان شماره ردیف را بزرگتر یا مساوی با شماره ردیف فعلی برای این نوع شارژ ارجاع داد"
@@ -12632,14 +12799,14 @@
 msgid "Cannot retrieve link token for update. Check Error Log for more information"
 msgstr "نمی توان رمز پیوند را برای به روز رسانی بازیابی کرد. برای اطلاعات بیشتر Log خطا را بررسی کنید"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:60
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:63
 msgid "Cannot retrieve link token. Check Error Log for more information"
 msgstr "رمز پیوند بازیابی نمی شود. برای اطلاعات بیشتر Log خطا را بررسی کنید"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1203
-#: accounts/doctype/payment_entry/payment_entry.js:1374
-#: accounts/doctype/payment_entry/payment_entry.py:1579
-#: controllers/accounts_controller.py:2505 public/js/controllers/accounts.js:94
+#: 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
 #: 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 "نمی توان نوع شارژ را به عنوان «در مقدار ردیف قبلی» یا «در مجموع ردیف قبلی» برای ردیف اول انتخاب کرد"
@@ -12656,11 +12823,11 @@
 msgid "Cannot set multiple Item Defaults for a company."
 msgstr "نمی توان چندین مورد پیش فرض را برای یک شرکت تنظیم کرد."
 
-#: controllers/accounts_controller.py:3173
+#: controllers/accounts_controller.py:3264
 msgid "Cannot set quantity less than delivered quantity"
 msgstr "نمی توان مقدار کمتر از مقدار تحویلی را تنظیم کرد"
 
-#: controllers/accounts_controller.py:3178
+#: controllers/accounts_controller.py:3269
 msgid "Cannot set quantity less than received quantity"
 msgstr "نمی توان مقدار کمتر از مقدار دریافتی را تنظیم کرد"
 
@@ -12668,7 +12835,7 @@
 msgid "Cannot set the field <b>{0}</b> for copying in variants"
 msgstr "نمی توان فیلد <b>{0}</b> را برای کپی در انواع مختلف تنظیم کرد"
 
-#: accounts/doctype/payment_entry/payment_entry.js:876
+#: accounts/doctype/payment_entry/payment_entry.js:1050
 msgid "Cannot {0} {1} {2} without any negative outstanding invoice"
 msgstr "بدون هیچ فاکتور معوقه منفی نمی توان {0} {1} {2} را انجام داد"
 
@@ -12688,7 +12855,7 @@
 msgid "Capacity Planning"
 msgstr "برنامه ریزی ظرفیت"
 
-#: manufacturing/doctype/work_order/work_order.py:627
+#: manufacturing/doctype/work_order/work_order.py:641
 msgid "Capacity Planning Error, planned start time can not be same as end time"
 msgstr "خطای برنامه ریزی ظرفیت، زمان شروع برنامه ریزی شده نمی تواند با زمان پایان یکسان باشد"
 
@@ -12730,7 +12897,7 @@
 msgid "Capital Work In Progress Account"
 msgstr "حساب کار سرمایه ای در حال انجام"
 
-#: accounts/report/account_balance/account_balance.js:43
+#: accounts/report/account_balance/account_balance.js:42
 msgid "Capital Work in Progress"
 msgstr "کار سرمایه ای در حال انجام است"
 
@@ -12752,7 +12919,7 @@
 msgid "Capitalization Method"
 msgstr "روش حروف بزرگ"
 
-#: assets/doctype/asset/asset.js:155
+#: assets/doctype/asset/asset.js:194
 msgid "Capitalize Asset"
 msgstr "سرمایه گذاری دارایی"
 
@@ -12794,7 +12961,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:14
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:18
-#: accounts/report/account_balance/account_balance.js:41
+#: accounts/report/account_balance/account_balance.js:40
 #: setup/setup_wizard/operations/install_fixtures.py:208
 msgid "Cash"
 msgstr "پول نقد"
@@ -12858,7 +13025,7 @@
 msgid "Cash In Hand"
 msgstr "پول نقد در دست"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:322
 msgid "Cash or Bank Account is mandatory for making payment entry"
 msgstr "برای ورود به پرداخت پول نقد یا حساب بانکی الزامی است"
 
@@ -12880,7 +13047,7 @@
 msgid "Cash/Bank Account"
 msgstr "نقدی / حساب بانکی"
 
-#: accounts/report/pos_register/pos_register.js:39
+#: accounts/report/pos_register/pos_register.js:38
 #: accounts/report/pos_register/pos_register.py:126
 #: accounts/report/pos_register/pos_register.py:200
 msgid "Cashier"
@@ -12942,7 +13109,7 @@
 msgid "Category-wise Asset Value"
 msgstr "ارزش دارایی بر حسب دسته"
 
-#: buying/doctype/purchase_order/purchase_order.py:313
+#: buying/doctype/purchase_order/purchase_order.py:314
 #: buying/doctype/request_for_quotation/request_for_quotation.py:99
 msgid "Caution"
 msgstr "احتیاط"
@@ -12987,7 +13154,7 @@
 msgid "Certificate Required"
 msgstr "گواهی مورد نیاز است"
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "Change"
 msgstr "تغییر دادن"
 
@@ -13003,7 +13170,7 @@
 msgid "Change Amount"
 msgstr "تغییر مقدار"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:90
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:108
 msgid "Change Release Date"
 msgstr "تاریخ انتشار را تغییر دهید"
 
@@ -13023,7 +13190,7 @@
 msgid "Change in Stock Value"
 msgstr "تغییر در ارزش موجودی"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:885
+#: accounts/doctype/sales_invoice/sales_invoice.py:902
 msgid "Change the account type to Receivable or select a different account."
 msgstr "نوع حساب را به دریافتنی تغییر دهید یا حساب دیگری را انتخاب کنید."
 
@@ -13044,7 +13211,11 @@
 msgid "Changes"
 msgstr "تغییرات"
 
-#: stock/doctype/item/item.js:235
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Changes in {0}"
+msgstr ""
+
+#: stock/doctype/item/item.js:277
 msgid "Changing Customer Group for the selected Customer is not allowed."
 msgstr "تغییر گروه مشتری برای مشتری انتخابی مجاز نیست."
 
@@ -13054,12 +13225,12 @@
 msgid "Channel Partner"
 msgstr "شریک کانال"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1634
-#: controllers/accounts_controller.py:2568
+#: accounts/doctype/payment_entry/payment_entry.py:1653
+#: controllers/accounts_controller.py:2653
 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
 msgstr "هزینه از نوع \"واقعی\" در ردیف {0} نمی تواند در نرخ مورد یا مبلغ پرداختی لحاظ شود"
 
-#: accounts/report/account_balance/account_balance.js:42
+#: accounts/report/account_balance/account_balance.js:41
 msgid "Chargeable"
 msgstr "قابل شارژ"
 
@@ -13075,7 +13246,15 @@
 msgid "Charges Incurred"
 msgstr "هزینه های متحمل شده"
 
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges are updated in Purchase Receipt against each item"
+msgstr ""
+
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges will be distributed proportionately based on item qty or amount, as per your selection"
+msgstr ""
+
+#: selling/page/sales_funnel/sales_funnel.js:45
 msgid "Chart"
 msgstr "چارت سازمانی"
 
@@ -13103,10 +13282,10 @@
 msgid "Chart Tree"
 msgstr "درخت نمودار"
 
-#: accounts/doctype/account/account.js:75
+#: accounts/doctype/account/account.js:70
 #: accounts/doctype/account/account_tree.js:5
-#: accounts/doctype/cost_center/cost_center_tree.js:35
-#: public/js/setup_wizard.js:36 setup/doctype/company/company.js:92
+#: accounts/doctype/cost_center/cost_center_tree.js:52
+#: public/js/setup_wizard.js:37 setup/doctype/company/company.js:96
 msgid "Chart of Accounts"
 msgstr "نمودار حساب"
 
@@ -13142,7 +13321,7 @@
 msgid "Chart of Accounts Importer"
 msgstr "وارد کننده نمودار حساب"
 
-#: accounts/doctype/account/account_tree.js:133
+#: accounts/doctype/account/account_tree.js:181
 #: accounts/doctype/cost_center/cost_center.js:41
 msgid "Chart of Cost Centers"
 msgstr "نمودار مراکز هزینه"
@@ -13153,7 +13332,7 @@
 msgid "Chart of Cost Centers"
 msgstr "نمودار مراکز هزینه"
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:65
+#: manufacturing/report/work_order_summary/work_order_summary.js:64
 msgid "Charts Based On"
 msgstr "نمودارها بر اساس"
 
@@ -13231,7 +13410,12 @@
 msgid "Checking this will round off the tax amount to the nearest integer"
 msgstr "بررسی این مقدار مالیات را به نزدیکترین عدد صحیح گرد می کند"
 
-#: selling/page/point_of_sale/pos_item_cart.js:252
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:148
+msgid "Checkout"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:250
 msgid "Checkout Order / Submit Order / New Order"
 msgstr "سفارش پرداخت / ارسال سفارش / سفارش جدید"
 
@@ -13280,7 +13464,7 @@
 msgid "Cheque Width"
 msgstr "عرض را بررسی کنید"
 
-#: public/js/controllers/transaction.js:2061
+#: public/js/controllers/transaction.js:2104
 msgid "Cheque/Reference Date"
 msgstr "تاریخ چک / مرجع"
 
@@ -13301,6 +13485,7 @@
 msgstr "شماره چک/مرجع"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:131
+#: accounts/report/accounts_receivable/accounts_receivable.html:113
 msgid "Cheques Required"
 msgstr "چک های مورد نیاز"
 
@@ -13318,7 +13503,7 @@
 msgid "Child Task exists for this Task. You can not delete this Task."
 msgstr "Child Task برای این Task وجود دارد. شما نمی توانید این Task را حذف کنید."
 
-#: stock/doctype/warehouse/warehouse_tree.js:17
+#: stock/doctype/warehouse/warehouse_tree.js:21
 msgid "Child nodes can be only created under 'Group' type nodes"
 msgstr "گره های فرزند را می توان فقط تحت گره های نوع \"گروهی\" ایجاد کرد"
 
@@ -13337,7 +13522,7 @@
 msgid "Circular Reference Error"
 msgstr "خطای مرجع دایره ای"
 
-#: public/js/utils/contact_address_quick_entry.js:76
+#: public/js/utils/contact_address_quick_entry.js:79
 msgid "City"
 msgstr "شهر"
 
@@ -13365,12 +13550,27 @@
 msgid "Class / Percentage"
 msgstr "کلاس / درصد"
 
+#. Description of a DocType
+#: setup/doctype/territory/territory.json
+msgid "Classification of Customers by region"
+msgstr ""
+
 #. Label of a Text Editor field in DocType 'Bank Guarantee'
 #: accounts/doctype/bank_guarantee/bank_guarantee.json
 msgctxt "Bank Guarantee"
 msgid "Clauses and Conditions"
 msgstr "بندها و شرایط"
 
+#: public/js/utils/demo.js:11
+msgid "Clear Demo Data"
+msgstr ""
+
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Clear Notifications"
+msgstr ""
+
 #. Label of a Button field in DocType 'Holiday List'
 #: setup/doctype/holiday_list/holiday_list.json
 msgctxt "Holiday List"
@@ -13378,7 +13578,9 @@
 msgstr "پاک کردن جدول"
 
 #: 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
+#: templates/form_grid/bank_reconciliation_grid.html:7
 msgid "Clearance Date"
 msgstr "تاریخ ترخیص"
 
@@ -13418,11 +13620,11 @@
 msgid "Clearance Date"
 msgstr "تاریخ ترخیص"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:115
+#: accounts/doctype/bank_clearance/bank_clearance.py:117
 msgid "Clearance Date not mentioned"
 msgstr "تاریخ ترخیص ذکر نشده است"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:113
+#: accounts/doctype/bank_clearance/bank_clearance.py:115
 msgid "Clearance Date updated"
 msgstr "تاریخ ترخیص به روز شد"
 
@@ -13430,7 +13632,7 @@
 msgid "Clearing Demo Data..."
 msgstr "در حال پاک کردن داده های نمایشی..."
 
-#: manufacturing/doctype/production_plan/production_plan.js:535
+#: manufacturing/doctype/production_plan/production_plan.js:577
 msgid "Click on 'Get Finished Goods for Manufacture' to fetch the items from the above Sales Orders. Items only for which a BOM is present will be fetched."
 msgstr "برای دریافت اقلام از سفارشات فروش فوق، روی \"دریافت کالاهای تمام شده برای ساخت\" کلیک کنید. فقط مواردی که BOM برای آنها وجود دارد واکشی می شوند."
 
@@ -13438,7 +13640,7 @@
 msgid "Click on Add to Holidays. This will populate the holidays table with all the dates that fall on the selected weekly off. Repeat the process for populating the dates for all your weekly holidays"
 msgstr "روی افزودن به تعطیلات کلیک کنید. با این کار جدول تعطیلات با تمام تاریخ هایی که در تعطیلات هفتگی انتخاب شده قرار می گیرند پر می کند. فرآیند پر کردن تاریخ ها را برای تمام تعطیلات هفتگی خود تکرار کنید"
 
-#: manufacturing/doctype/production_plan/production_plan.js:530
+#: manufacturing/doctype/production_plan/production_plan.js:572
 msgid "Click on Get Sales Orders to fetch sales orders based on the above filters."
 msgstr "برای دریافت سفارشات فروش بر اساس فیلترهای بالا، روی دریافت سفارشات فروش کلیک کنید."
 
@@ -13453,6 +13655,10 @@
 msgid "Click on the link below to verify your email and confirm the appointment"
 msgstr "برای تایید ایمیل خود و تایید قرار ملاقات روی لینک زیر کلیک کنید"
 
+#: selling/page/point_of_sale/pos_item_cart.js:468
+msgid "Click to add email / phone"
+msgstr ""
+
 #. Option for the 'Lead Type' (Select) field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -13471,19 +13677,19 @@
 msgid "Client Secret"
 msgstr "راز مشتری"
 
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order_list.js:30
-#: crm/doctype/opportunity/opportunity.js:108
-#: manufacturing/doctype/production_plan/production_plan.js:101
-#: manufacturing/doctype/work_order/work_order.js:559
-#: quality_management/doctype/quality_meeting/quality_meeting_list.js:8
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/doctype/sales_order/sales_order_list.js:45
-#: stock/doctype/delivery_note/delivery_note.js:209
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/doctype/issue/issue.js:17
+#: buying/doctype/purchase_order/purchase_order.js:327
+#: buying/doctype/purchase_order/purchase_order_list.js:49
+#: crm/doctype/opportunity/opportunity.js:118
+#: manufacturing/doctype/production_plan/production_plan.js:111
+#: manufacturing/doctype/work_order/work_order.js:589
+#: quality_management/doctype/quality_meeting/quality_meeting_list.js:7
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:588
+#: selling/doctype/sales_order/sales_order_list.js:58
+#: stock/doctype/delivery_note/delivery_note.js:248
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:112
+#: support/doctype/issue/issue.js:21
 msgid "Close"
 msgstr "بستن"
 
@@ -13493,7 +13699,7 @@
 msgid "Close Issue After Days"
 msgstr "بستن شماره پس از چند روز"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:67
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:69
 msgid "Close Loan"
 msgstr "بستن وام"
 
@@ -13503,17 +13709,18 @@
 msgid "Close Replied Opportunity After Days"
 msgstr "بستن فرصت پاسخ داده شده پس از چند روز"
 
-#: selling/page/point_of_sale/pos_controller.js:178
+#: selling/page/point_of_sale/pos_controller.js:200
 msgid "Close the POS"
 msgstr "POS را ببندید"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:6
-#: selling/doctype/sales_order/sales_order_list.js:7
-#: stock/doctype/delivery_note/delivery_note_list.js:8
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:8
-#: support/report/issue_analytics/issue_analytics.js:59
-#: support/report/issue_summary/issue_summary.js:47
+#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: selling/doctype/sales_order/sales_order_list.js:18
+#: stock/doctype/delivery_note/delivery_note_list.js:18
+#: 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
+#: templates/pages/task_info.html:76
 msgid "Closed"
 msgstr "بسته شد"
 
@@ -13620,11 +13827,11 @@
 msgid "Closed Documents"
 msgstr "اسناد بسته"
 
-#: manufacturing/doctype/work_order/work_order.py:1395
+#: manufacturing/doctype/work_order/work_order.py:1409
 msgid "Closed Work Order can not be stopped or Re-opened"
 msgstr "سفارش کار بسته را نمی توان متوقف کرد یا دوباره باز کرد"
 
-#: selling/doctype/sales_order/sales_order.py:420
+#: selling/doctype/sales_order/sales_order.py:423
 msgid "Closed order cannot be cancelled. Unclose to cancel."
 msgstr "سفارش بسته قابل لغو نیست. برای لغو بسته را باز کنید."
 
@@ -13729,7 +13936,7 @@
 msgid "Code"
 msgstr "کد"
 
-#: public/js/setup_wizard.js:174
+#: public/js/setup_wizard.js:190
 msgid "Collapse All"
 msgstr "جمع کردن همه"
 
@@ -13797,10 +14004,15 @@
 msgid "Column in Bank File"
 msgstr "ستون در فایل بانکی"
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:389
+msgid "Column {0}"
+msgstr "ستون {0}"
+
 #: accounts/doctype/payment_terms_template/payment_terms_template.py:40
 msgid "Combined invoice portion must equal 100%"
 msgstr ""
 
+#: templates/pages/task_info.html:86
 #: utilities/report/youtube_interactions/youtube_interactions.py:28
 msgid "Comments"
 msgstr "نظرات"
@@ -13952,7 +14164,7 @@
 msgid "Communication Medium Type"
 msgstr "نوع رسانه ارتباطی"
 
-#: setup/install.py:111
+#: setup/install.py:92
 msgid "Compact Item Print"
 msgstr "چاپ آیتم فشرده"
 
@@ -13965,10 +14177,10 @@
 #. Name of a DocType
 #: accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js:8
 #: accounts/doctype/account/account_tree.js:12
-#: accounts/doctype/account/account_tree.js:149
-#: accounts/doctype/cost_center/cost_center_tree.js:8
-#: accounts/doctype/journal_entry/journal_entry.js:72
-#: accounts/report/account_balance/account_balance.js:9
+#: accounts/doctype/account/account_tree.js:212
+#: accounts/doctype/cost_center/cost_center_tree.js:9
+#: accounts/doctype/journal_entry/journal_entry.js:128
+#: accounts/report/account_balance/account_balance.js:8
 #: accounts/report/accounts_payable/accounts_payable.js:8
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:8
 #: accounts/report/accounts_receivable/accounts_receivable.js:10
@@ -13976,13 +14188,13 @@
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:8
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:8
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:8
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:8
-#: accounts/report/budget_variance_report/budget_variance_report.js:74
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:9
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:9
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:9
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:7
+#: accounts/report/budget_variance_report/budget_variance_report.js:72
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:8
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:8
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:8
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:80
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:9
+#: 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
@@ -13993,9 +14205,9 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:227
 #: 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/payment_ledger/payment_ledger.js:9
+#: 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:9
+#: accounts/report/pos_register/pos_register.js:8
 #: accounts/report/pos_register/pos_register.py:110
 #: accounts/report/profitability_analysis/profitability_analysis.js:8
 #: accounts/report/purchase_register/purchase_register.js:33
@@ -14003,78 +14215,79 @@
 #: accounts/report/sales_payment_summary/sales_payment_summary.js:22
 #: accounts/report/sales_register/sales_register.js:33
 #: accounts/report/share_ledger/share_ledger.py:58
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:9
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:9
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:9
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:8
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:8
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:8
 #: accounts/report/trial_balance/trial_balance.js:8
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:8
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:9
-#: assets/report/fixed_asset_register/fixed_asset_register.js:9
-#: buying/report/procurement_tracker/procurement_tracker.js:9
-#: buying/report/purchase_analytics/purchase_analytics.js:50
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:9
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:8
+#: assets/report/fixed_asset_register/fixed_asset_register.js:8
+#: 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/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:9
+#: 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/subcontract_order_summary/subcontract_order_summary.js:8
+#: 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:9
+#: crm/report/lead_details/lead_details.js:8
 #: crm/report/lead_details/lead_details.py:52
-#: crm/report/lost_opportunity/lost_opportunity.js:9
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:59
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:52
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:119
-#: manufacturing/doctype/bom_creator/bom_creator.js:52
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:9
-#: manufacturing/report/job_card_summary/job_card_summary.js:8
-#: manufacturing/report/process_loss_report/process_loss_report.js:8
-#: manufacturing/report/production_analytics/production_analytics.js:9
-#: manufacturing/report/production_planning_report/production_planning_report.js:9
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:8
-#: manufacturing/report/work_order_summary/work_order_summary.js:8
-#: projects/report/project_summary/project_summary.js:9
+#: crm/report/lost_opportunity/lost_opportunity.js:8
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:51
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:128
+#: manufacturing/doctype/bom_creator/bom_creator.js:51
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:2
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:8
+#: manufacturing/report/job_card_summary/job_card_summary.js:7
+#: manufacturing/report/process_loss_report/process_loss_report.js:7
+#: manufacturing/report/production_analytics/production_analytics.js:8
+#: manufacturing/report/production_planning_report/production_planning_report.js:8
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:7
+#: manufacturing/report/work_order_summary/work_order_summary.js:7
+#: projects/report/project_summary/project_summary.js:8
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:44
 #: public/js/financial_statements.js:153 public/js/purchase_trends_filters.js:8
-#: public/js/sales_trends_filters.js:55
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:28
+#: public/js/sales_trends_filters.js:51
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:27
 #: regional/report/irs_1099/irs_1099.js:8
-#: regional/report/uae_vat_201/uae_vat_201.js:9
-#: regional/report/vat_audit_report/vat_audit_report.js:9
-#: selling/page/point_of_sale/pos_controller.js:64
-#: selling/page/sales_funnel/sales_funnel.js:30
+#: regional/report/uae_vat_201/uae_vat_201.js:8
+#: regional/report/vat_audit_report/vat_audit_report.js:8
+#: selling/page/point_of_sale/pos_controller.js:72
+#: selling/page/sales_funnel/sales_funnel.js:33
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:16
 #: selling/report/customer_credit_balance/customer_credit_balance.js:8
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:9
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:8
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:114
 #: selling/report/lost_quotations/lost_quotations.js:8
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:9
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:8
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:46
-#: selling/report/sales_analytics/sales_analytics.js:50
-#: selling/report/sales_order_analysis/sales_order_analysis.js:9
+#: selling/report/sales_analytics/sales_analytics.js:57
+#: selling/report/sales_order_analysis/sales_order_analysis.js:8
 #: selling/report/sales_order_analysis/sales_order_analysis.py:343
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:35
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:9
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:34
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:9
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:33
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:8
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:33
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:8
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:9
-#: selling/report/territory_wise_sales/territory_wise_sales.js:17
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:8
+#: selling/report/territory_wise_sales/territory_wise_sales.js:18
 #: setup/doctype/company/company.json setup/doctype/company/company_tree.js:10
 #: setup/doctype/department/department_tree.js:10
 #: setup/doctype/employee/employee_tree.js:8
 #: stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.js:8
-#: stock/doctype/warehouse/warehouse_tree.js:10
+#: stock/doctype/warehouse/warehouse_tree.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:12
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:8
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:9
-#: stock/report/delayed_item_report/delayed_item_report.js:9
-#: stock/report/delayed_order_report/delayed_order_report.js:9
-#: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:8
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js: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_stock_value_report/incorrect_stock_value_report.js:8
-#: stock/report/item_shortage_report/item_shortage_report.js:9
+#: 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
 #: stock/report/product_bundle_balance/product_bundle_balance.py:115
 #: stock/report/reserved_stock/reserved_stock.js:8
@@ -14083,20 +14296,20 @@
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:73
 #: stock/report/serial_no_ledger/serial_no_ledger.py:37
 #: stock/report/stock_ageing/stock_ageing.js:8
-#: stock/report/stock_analytics/stock_analytics.js:42
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:8
+#: 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:466
+#: stock/report/stock_balance/stock_balance.py:474
 #: stock/report/stock_ledger/stock_ledger.js:8
-#: stock/report/stock_ledger/stock_ledger.py:268
+#: 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:9
-#: stock/report/total_stock_summary/total_stock_summary.js:18
+#: 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/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:9
-#: support/report/issue_analytics/issue_analytics.js:9
-#: support/report/issue_summary/issue_summary.js:9
+#: 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
 msgid "Company"
 msgstr "شرکت"
 
@@ -14554,6 +14767,12 @@
 msgid "Company"
 msgstr "شرکت"
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Company"
+msgstr "شرکت"
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -14848,7 +15067,7 @@
 msgid "Company Abbreviation"
 msgstr "مخفف شرکت"
 
-#: public/js/setup_wizard.js:155
+#: public/js/setup_wizard.js:164
 msgid "Company Abbreviation cannot have more than 5 characters"
 msgstr "مخفف شرکت نمی تواند بیش از 5 کاراکتر داشته باشد"
 
@@ -15032,7 +15251,7 @@
 msgid "Company Name as per Imported Tally Data"
 msgstr "نام شرکت طبق داده های آماری وارداتی"
 
-#: public/js/setup_wizard.js:63
+#: public/js/setup_wizard.js:67
 msgid "Company Name cannot be Company"
 msgstr "نام شرکت نمی تواند شرکت باشد"
 
@@ -15074,28 +15293,28 @@
 msgid "Company and Posting Date is mandatory"
 msgstr "شرکت و تاریخ ارسال الزامی است"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2203
+#: accounts/doctype/sales_invoice/sales_invoice.py:2172
 msgid "Company currencies of both the companies should match for Inter Company Transactions."
 msgstr "ارزهای شرکت هر دو شرکت باید برای معاملات بین شرکتی مطابقت داشته باشد."
 
-#: stock/doctype/material_request/material_request.js:258
-#: stock/doctype/stock_entry/stock_entry.js:575
+#: stock/doctype/material_request/material_request.js:326
+#: stock/doctype/stock_entry/stock_entry.js:663
 msgid "Company field is required"
 msgstr "فیلد شرکت الزامی است"
 
-#: accounts/doctype/bank_account/bank_account.py:58
+#: accounts/doctype/bank_account/bank_account.py:72
 msgid "Company is mandatory for company account"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:413
-msgid "Company is mandatory was generating invoice. Please set default company in Global Defaults."
-msgstr "شرکت اجباری در حال تولید فاکتور بود. لطفاً شرکت پیش‌فرض را در پیش‌فرض‌های سراسری تنظیم کنید."
+#: accounts/doctype/subscription/subscription.py:412
+msgid "Company is mandatory for generating an invoice. Please set a default company in Global Defaults."
+msgstr ""
 
-#: setup/doctype/company/company.js:161
+#: setup/doctype/company/company.js:191
 msgid "Company name not same"
 msgstr "نام شرکت یکسان نیست"
 
-#: assets/doctype/asset/asset.py:206
+#: assets/doctype/asset/asset.py:208
 msgid "Company of asset {0} and purchase document {1} doesn't matches."
 msgstr "شرکت دارایی {0} و سند خرید {1} مطابقت ندارد."
 
@@ -15126,15 +15345,15 @@
 msgid "Company which internal supplier represents"
 msgstr "شرکتی که تامین کننده داخلی آن را نمایندگی می کند"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:80
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:85
 msgid "Company {0} already exists. Continuing will overwrite the Company and Chart of Accounts"
 msgstr "شرکت {0} در حال حاضر وجود دارد. ادامه، شرکت و نمودار حساب‌ها را بازنویسی می‌کند"
 
-#: accounts/doctype/account/account.py:443
+#: accounts/doctype/account/account.py:462
 msgid "Company {0} does not exist"
 msgstr "شرکت {0} وجود ندارد"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:76
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:80
 msgid "Company {0} is added more than once"
 msgstr "شرکت {0} بیش از یک بار اضافه شده است"
 
@@ -15175,7 +15394,7 @@
 msgid "Competitor Name"
 msgstr "نام رقیب"
 
-#: public/js/utils/sales_common.js:417
+#: public/js/utils/sales_common.js:476
 msgid "Competitors"
 msgstr "رقبا"
 
@@ -15191,7 +15410,9 @@
 msgid "Competitors"
 msgstr "رقبا"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:61
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:67
+#: manufacturing/doctype/workstation/workstation_job_card.html:68
+#: public/js/projects/timer.js:32
 msgid "Complete"
 msgstr "کامل"
 
@@ -15207,23 +15428,26 @@
 msgid "Complete"
 msgstr "کامل"
 
-#: manufacturing/doctype/job_card/job_card.js:263
+#: manufacturing/doctype/job_card/job_card.js:296
 msgid "Complete Job"
 msgstr "کار کامل"
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Complete Order"
+msgstr ""
+
 #: accounts/doctype/subscription/subscription_list.js:8
 #: assets/doctype/asset_repair/asset_repair_list.js:7
-#: buying/doctype/purchase_order/purchase_order_list.js:24
+#: buying/doctype/purchase_order/purchase_order_list.js:43
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:9
 #: manufacturing/report/job_card_summary/job_card_summary.py:93
 #: manufacturing/report/work_order_summary/work_order_summary.py:151
 #: projects/doctype/timesheet/timesheet_list.js:13
 #: projects/report/project_summary/project_summary.py:95
-#: selling/doctype/sales_order/sales_order_list.js:12
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:9
-#: stock/doctype/delivery_note/delivery_note_list.js:14
+#: selling/doctype/sales_order/sales_order_list.js:23
+#: stock/doctype/delivery_note/delivery_note_list.js:24
 #: stock/doctype/material_request/material_request_list.js:13
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:25
 msgid "Completed"
 msgstr "تکمیل شد"
 
@@ -15482,11 +15706,12 @@
 msgid "Completed Qty"
 msgstr "تعداد تکمیل شده"
 
-#: manufacturing/doctype/work_order/work_order.py:885
+#: manufacturing/doctype/work_order/work_order.py:899
 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
 msgstr "تعداد تکمیل شده نمی تواند بیشتر از «تعداد تا تولید» باشد"
 
-#: manufacturing/doctype/job_card/job_card.js:277
+#: manufacturing/doctype/job_card/job_card.js:313
+#: manufacturing/doctype/workstation/workstation.js:199
 msgid "Completed Quantity"
 msgstr "مقدار تکمیل شده"
 
@@ -15621,7 +15846,7 @@
 msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained."
 msgstr "کنش را طوری پیکربندی کنید که تراکنش را متوقف کند یا در صورت عدم حفظ همان نرخ فقط هشدار دهد."
 
-#: buying/doctype/buying_settings/buying_settings.js:19
+#: buying/doctype/buying_settings/buying_settings.js:20
 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List."
 msgstr "هنگام ایجاد تراکنش خرید جدید، فهرست قیمت پیش‌فرض را پیکربندی کنید. قیمت اقلام از این لیست قیمت دریافت می شود."
 
@@ -15631,12 +15856,12 @@
 msgid "Confirmation Date"
 msgstr "تاریخ تایید"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:37
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:45
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:43
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:51
 msgid "Connect to Quickbooks"
 msgstr "به Quickbooks متصل شوید"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:59
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:65
 msgid "Connected to QuickBooks"
 msgstr "به QuickBooks متصل است"
 
@@ -15646,7 +15871,7 @@
 msgid "Connected to QuickBooks"
 msgstr "به QuickBooks متصل است"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:58
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:64
 msgid "Connecting to QuickBooks"
 msgstr "اتصال به QuickBooks"
 
@@ -15752,6 +15977,12 @@
 msgid "Connections"
 msgstr "اتصالات"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Connections"
+msgstr "اتصالات"
+
 #: accounts/report/general_ledger/general_ledger.js:172
 msgid "Consider Accounting Dimensions"
 msgstr "ابعاد حسابداری را در نظر بگیرید"
@@ -15768,6 +15999,12 @@
 msgid "Consider Minimum Order Qty"
 msgstr "حداقل تعداد سفارش را در نظر بگیرید"
 
+#. Label of a Check field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Consider Rejected Warehouses"
+msgstr ""
+
 #. Label of a Select field in DocType 'Purchase Taxes and Charges'
 #: accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
 msgctxt "Purchase Taxes and Charges"
@@ -15865,7 +16102,7 @@
 msgid "Consumed Amount"
 msgstr "مقدار مصرف شده"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:318
+#: assets/doctype/asset_capitalization/asset_capitalization.py:324
 msgid "Consumed Asset Items is mandatory for Decapitalization"
 msgstr "اقلام دارایی مصرف شده برای کاهش سرمایه اجباری است"
 
@@ -15936,7 +16173,7 @@
 msgid "Consumed Stock Items"
 msgstr "اقلام موجودی مصرفی"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:321
+#: assets/doctype/asset_capitalization/asset_capitalization.py:327
 msgid "Consumed Stock Items or Consumed Asset Items is mandatory for Capitalization"
 msgstr "اقلام موجودی مصرف شده یا اقلام دارایی مصرف شده برای سرمایه گذاری اجباری است"
 
@@ -16471,9 +16708,9 @@
 msgid "Content Type"
 msgstr "نوع محتوا"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
-#: public/js/controllers/transaction.js:2074
-#: selling/doctype/quotation/quotation.js:344
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:157
+#: public/js/controllers/transaction.js:2117
+#: selling/doctype/quotation/quotation.js:356
 msgid "Continue"
 msgstr "ادامه هید"
 
@@ -16559,7 +16796,7 @@
 msgstr "شرایط و ضوابط قرارداد"
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:76
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:121
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:122
 msgid "Contribution %"
 msgstr ""
 
@@ -16570,10 +16807,14 @@
 msgstr ""
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:88
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:123
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
 msgid "Contribution Amount"
 msgstr "مبلغ مشارکت"
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:124
+msgid "Contribution Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Team'
 #: selling/doctype/sales_team/sales_team.json
 msgctxt "Sales Team"
@@ -16592,7 +16833,7 @@
 msgid "Control Historical Stock Transactions"
 msgstr "معاملات تاریخی موجودی را کنترل کنید"
 
-#: public/js/utils.js:684
+#: public/js/utils.js:749
 msgid "Conversion Factor"
 msgstr "ضریب تبدیل"
 
@@ -16692,7 +16933,7 @@
 msgid "Conversion Factor"
 msgstr "ضریب تبدیل"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:86
+#: manufacturing/doctype/bom_creator/bom_creator.js:85
 msgid "Conversion Rate"
 msgstr "نرخ تبدیل"
 
@@ -16718,7 +16959,7 @@
 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}"
 msgstr "ضریب تبدیل برای واحد اندازه گیری پیش فرض باید 1 در ردیف {0} باشد"
 
-#: controllers/accounts_controller.py:2384
+#: controllers/accounts_controller.py:2476
 msgid "Conversion rate cannot be 0 or 1"
 msgstr "نرخ تبدیل نمی تواند 0 یا 1 باشد"
 
@@ -16728,12 +16969,12 @@
 msgid "Convert Item Description to Clean HTML in Transactions"
 msgstr "توضیحات مورد را به Clean HTML در Transactions تبدیل کنید"
 
-#: accounts/doctype/account/account.js:106
-#: accounts/doctype/cost_center/cost_center.js:119
+#: accounts/doctype/account/account.js:107
+#: accounts/doctype/cost_center/cost_center.js:123
 msgid "Convert to Group"
 msgstr "تبدیل به گروه"
 
-#: stock/doctype/warehouse/warehouse.js:61
+#: stock/doctype/warehouse/warehouse.js:58
 msgctxt "Warehouse"
 msgid "Convert to Group"
 msgstr "تبدیل به گروه"
@@ -16742,17 +16983,17 @@
 msgid "Convert to Item Based Reposting"
 msgstr "تبدیل به ارسال مجدد بر اساس آیتم"
 
-#: stock/doctype/warehouse/warehouse.js:60
+#: stock/doctype/warehouse/warehouse.js:57
 msgctxt "Warehouse"
 msgid "Convert to Ledger"
 msgstr "تبدیل به لجر"
 
-#: accounts/doctype/account/account.js:83
-#: accounts/doctype/cost_center/cost_center.js:116
+#: accounts/doctype/account/account.js:79
+#: accounts/doctype/cost_center/cost_center.js:121
 msgid "Convert to Non-Group"
 msgstr "تبدیل به غیر گروهی"
 
-#: crm/report/lead_details/lead_details.js:41
+#: crm/report/lead_details/lead_details.js:40
 #: selling/page/sales_funnel/sales_funnel.py:58
 msgid "Converted"
 msgstr "تبدیل شده است"
@@ -16799,11 +17040,11 @@
 msgid "Corrective Action"
 msgstr "اقدام اصلاحی"
 
-#: manufacturing/doctype/job_card/job_card.js:146
+#: manufacturing/doctype/job_card/job_card.js:155
 msgid "Corrective Job Card"
 msgstr "کارت شغلی اصلاحی"
 
-#: manufacturing/doctype/job_card/job_card.js:151
+#: manufacturing/doctype/job_card/job_card.js:162
 msgid "Corrective Operation"
 msgstr "عملیات اصلاحی"
 
@@ -16836,23 +17077,23 @@
 #: 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:1047
+#: accounts/report/accounts_receivable/accounts_receivable.py:1055
 #: 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:643
+#: accounts/report/general_ledger/general_ledger.py:656
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:300
 #: 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/trial_balance/trial_balance.js:49
-#: assets/report/fixed_asset_register/fixed_asset_register.js:30
+#: assets/report/fixed_asset_register/fixed_asset_register.js:29
 #: assets/report/fixed_asset_register/fixed_asset_register.py:461
-#: buying/report/procurement_tracker/procurement_tracker.js:16
+#: buying/report/procurement_tracker/procurement_tracker.js:15
 #: buying/report/procurement_tracker/procurement_tracker.py:32
-#: public/js/financial_statements.js:237
+#: public/js/financial_statements.js:246
 msgid "Cost Center"
 msgstr "مرکز هزینه"
 
@@ -17228,7 +17469,7 @@
 msgid "Cost Center Allocation Percentages"
 msgstr "درصدهای تخصیص مرکز هزینه"
 
-#: public/js/utils/sales_common.js:383
+#: public/js/utils/sales_common.js:435
 msgid "Cost Center For Item with Item Code {0} has been Changed to {1}"
 msgstr "مرکز هزینه برای مورد با کد مورد {0} به {1} تغییر کرده است"
 
@@ -17238,7 +17479,7 @@
 msgid "Cost Center Name"
 msgstr "نام مرکز هزینه"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:25
+#: accounts/doctype/cost_center/cost_center_tree.js:38
 msgid "Cost Center Number"
 msgstr "شماره مرکز هزینه"
 
@@ -17257,8 +17498,8 @@
 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:1235
-#: stock/doctype/purchase_receipt/purchase_receipt.py:788
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1287
+#: stock/doctype/purchase_receipt/purchase_receipt.py:790
 msgid "Cost Center is required in row {0} in Taxes table for type {1}"
 msgstr "مرکز هزینه در ردیف {0} جدول مالیات برای نوع {1} لازم است"
 
@@ -17278,11 +17519,11 @@
 msgid "Cost Center {0} cannot be used for allocation as it is used as main cost center in other allocation record."
 msgstr "مرکز هزینه {0} را نمی توان برای تخصیص استفاده کرد زیرا به عنوان مرکز هزینه اصلی در سایر رکوردهای تخصیص استفاده می شود."
 
-#: assets/doctype/asset/asset.py:246
+#: assets/doctype/asset/asset.py:248
 msgid "Cost Center {} doesn't belong to Company {}"
 msgstr "مرکز هزینه {} متعلق به شرکت {} نیست"
 
-#: assets/doctype/asset/asset.py:253
+#: assets/doctype/asset/asset.py:255
 msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
 msgstr "مرکز هزینه {} یک مرکز هزینه گروهی است و مراکز هزینه گروهی را نمی توان در تراکنش ها استفاده کرد"
 
@@ -17322,7 +17563,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:45
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:64
-#: accounts/report/account_balance/account_balance.js:44
+#: accounts/report/account_balance/account_balance.js:43
 msgid "Cost of Goods Sold"
 msgstr "هزینه کالاهای فروخته شده"
 
@@ -17434,11 +17675,11 @@
 msgid "Could not auto update shifts. Shift with shift factor {0} needed."
 msgstr "به‌روزرسانی خودکار شیفت‌ها ممکن نیست. Shift با ضریب تغییر {0} مورد نیاز است."
 
-#: stock/doctype/delivery_note/delivery_note.py:737
+#: stock/doctype/delivery_note/delivery_note.py:798
 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
 msgstr "یادداشت اعتباری به‌طور خودکار ایجاد نشد، لطفاً علامت «صدور یادداشت اعتبار» را بردارید و دوباره ارسال کنید"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:339
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:355
 msgid "Could not detect the Company for updating Bank Accounts"
 msgstr "شرکت برای به‌روزرسانی حساب‌های بانکی شناسایی نشد"
 
@@ -17460,10 +17701,6 @@
 msgid "Could not solve weighted score function. Make sure the formula is valid."
 msgstr "تابع نمره وزنی حل نشد. اطمینان حاصل کنید که فرمول معتبر است."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1030
-msgid "Could not update stock, invoice contains drop shipping item."
-msgstr "موجودی به‌روزرسانی نشد، فاکتور حاوی کالای ارسالی است."
-
 #. Label of a Int field in DocType 'Shipment Parcel'
 #: stock/doctype/shipment_parcel/shipment_parcel.json
 msgctxt "Shipment Parcel"
@@ -17471,7 +17708,7 @@
 msgstr "شمردن"
 
 #: crm/report/lead_details/lead_details.py:63
-#: public/js/utils/contact_address_quick_entry.js:86
+#: public/js/utils/contact_address_quick_entry.js:89
 msgid "Country"
 msgstr "کشور"
 
@@ -17570,6 +17807,12 @@
 msgid "Coupon Code"
 msgstr "کد کوپن"
 
+#. Label of a Link field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Coupon Code"
+msgstr "کد کوپن"
+
 #. Label of a Link field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
@@ -17600,147 +17843,149 @@
 msgid "Coupon Type"
 msgstr "نوع کوپن"
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Cr"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:148
-#: accounts/doctype/account/account_tree.js:151
-#: accounts/doctype/dunning/dunning.js:54
-#: accounts/doctype/dunning/dunning.js:56
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:31
-#: accounts/doctype/journal_entry/journal_entry.js:85
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/pos_invoice/pos_invoice.js:51
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:97
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:103
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:114
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: accounts/doctype/account/account_tree.js:209
+#: accounts/doctype/account/account_tree.js:216
+#: accounts/doctype/dunning/dunning.js:55
+#: accounts/doctype/dunning/dunning.js:57
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:34
+#: accounts/doctype/journal_entry/journal_entry.js:139
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/pos_invoice/pos_invoice.js:55
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:127
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:189
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:609
-#: accounts/doctype/sales_invoice/sales_invoice.js:106
-#: accounts/doctype/sales_invoice/sales_invoice.js:108
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:134
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:225
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:654
+#: accounts/doctype/sales_invoice/sales_invoice.js:109
+#: accounts/doctype/sales_invoice/sales_invoice.js:110
 #: accounts/doctype/sales_invoice/sales_invoice.js:121
 #: accounts/doctype/sales_invoice/sales_invoice.js:122
-#: accounts/doctype/sales_invoice/sales_invoice.js:135
-#: accounts/doctype/sales_invoice/sales_invoice.js:142
-#: accounts/doctype/sales_invoice/sales_invoice.js:146
-#: accounts/doctype/sales_invoice/sales_invoice.js:157
-#: accounts/doctype/sales_invoice/sales_invoice.js:164
-#: accounts/doctype/sales_invoice/sales_invoice.js:184
-#: buying/doctype/purchase_order/purchase_order.js:94
-#: buying/doctype/purchase_order/purchase_order.js:310
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: buying/doctype/purchase_order/purchase_order.js:324
-#: buying/doctype/purchase_order/purchase_order.js:330
-#: buying/doctype/purchase_order/purchase_order.js:336
-#: buying/doctype/purchase_order/purchase_order.js:348
+#: accounts/doctype/sales_invoice/sales_invoice.js:136
+#: accounts/doctype/sales_invoice/sales_invoice.js:147
+#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:168
+#: 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/request_for_quotation/request_for_quotation.js:43
-#: buying/doctype/request_for_quotation/request_for_quotation.js:146
-#: buying/doctype/request_for_quotation/request_for_quotation.js:169
-#: buying/doctype/supplier/supplier.js:96
-#: buying/doctype/supplier/supplier.js:100
-#: buying/doctype/supplier_quotation/supplier_quotation.js:24
+#: 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:421
+#: 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
+#: buying/doctype/supplier/supplier.js:112
+#: buying/doctype/supplier/supplier.js:120
 #: buying/doctype/supplier_quotation/supplier_quotation.js:25
+#: buying/doctype/supplier_quotation/supplier_quotation.js:26
 #: buying/doctype/supplier_quotation/supplier_quotation.js:27
-#: crm/doctype/lead/lead.js:35 crm/doctype/lead/lead.js:38
+#: crm/doctype/lead/lead.js:31 crm/doctype/lead/lead.js:37
 #: crm/doctype/lead/lead.js:39 crm/doctype/lead/lead.js:41
-#: crm/doctype/lead/lead.js:220 crm/doctype/opportunity/opportunity.js:85
-#: crm/doctype/opportunity/opportunity.js:90
-#: crm/doctype/opportunity/opportunity.js:97
+#: crm/doctype/lead/lead.js:230 crm/doctype/opportunity/opportunity.js:85
+#: crm/doctype/opportunity/opportunity.js:93
 #: crm/doctype/opportunity/opportunity.js:103
-#: crm/doctype/prospect/prospect.js:12 crm/doctype/prospect/prospect.js:20
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:151
-#: manufacturing/doctype/blanket_order/blanket_order.js:31
-#: manufacturing/doctype/blanket_order/blanket_order.js:41
-#: manufacturing/doctype/blanket_order/blanket_order.js:53
-#: manufacturing/doctype/bom/bom.js:121 manufacturing/doctype/bom/bom.js:126
-#: manufacturing/doctype/bom/bom.js:132 manufacturing/doctype/bom/bom.js:135
-#: manufacturing/doctype/bom/bom.js:344
-#: manufacturing/doctype/bom_creator/bom_creator.js:93
-#: manufacturing/doctype/production_plan/production_plan.js:109
-#: manufacturing/doctype/production_plan/production_plan.js:115
-#: manufacturing/doctype/production_plan/production_plan.js:121
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/doctype/work_order/work_order.js:726
-#: projects/doctype/task/task_tree.js:77 public/js/communication.js:16
-#: public/js/communication.js:24 public/js/communication.js:30
-#: public/js/controllers/transaction.js:300
-#: public/js/controllers/transaction.js:301
-#: public/js/controllers/transaction.js:2188
-#: selling/doctype/customer/customer.js:165
-#: selling/doctype/quotation/quotation.js:119
-#: selling/doctype/quotation/quotation.js:129
-#: selling/doctype/sales_order/sales_order.js:548
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order.js:560
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order.js:570
-#: selling/doctype/sales_order/sales_order.js:571
-#: selling/doctype/sales_order/sales_order.js:576
-#: selling/doctype/sales_order/sales_order.js:581
-#: selling/doctype/sales_order/sales_order.js:582
-#: selling/doctype/sales_order/sales_order.js:587
-#: selling/doctype/sales_order/sales_order.js:599
-#: selling/doctype/sales_order/sales_order.js:605
-#: selling/doctype/sales_order/sales_order.js:606
-#: selling/doctype/sales_order/sales_order.js:608
-#: selling/doctype/sales_order/sales_order.js:739
-#: selling/doctype/sales_order/sales_order.js:847
-#: stock/doctype/delivery_note/delivery_note.js:89
-#: stock/doctype/delivery_note/delivery_note.js:90
-#: stock/doctype/delivery_note/delivery_note.js:104
-#: stock/doctype/delivery_note/delivery_note.js:167
-#: stock/doctype/delivery_note/delivery_note.js:172
-#: stock/doctype/delivery_note/delivery_note.js:176
-#: stock/doctype/delivery_note/delivery_note.js:181
-#: stock/doctype/delivery_note/delivery_note.js:190
-#: stock/doctype/delivery_note/delivery_note.js:196
-#: stock/doctype/delivery_note/delivery_note.js:223
-#: stock/doctype/item/item.js:105 stock/doctype/item/item.js:108
-#: stock/doctype/item/item.js:112 stock/doctype/item/item.js:449
-#: stock/doctype/item/item.js:651
-#: stock/doctype/material_request/material_request.js:114
-#: stock/doctype/material_request/material_request.js:120
-#: stock/doctype/material_request/material_request.js:123
-#: stock/doctype/material_request/material_request.js:128
-#: stock/doctype/material_request/material_request.js:133
-#: stock/doctype/material_request/material_request.js:138
-#: stock/doctype/material_request/material_request.js:143
+#: crm/doctype/opportunity/opportunity.js:112
+#: crm/doctype/prospect/prospect.js:15 crm/doctype/prospect/prospect.js:27
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:159
+#: manufacturing/doctype/blanket_order/blanket_order.js:34
+#: manufacturing/doctype/blanket_order/blanket_order.js:48
+#: manufacturing/doctype/blanket_order/blanket_order.js:64
+#: manufacturing/doctype/bom/bom.js:123 manufacturing/doctype/bom/bom.js:132
+#: manufacturing/doctype/bom/bom.js:142 manufacturing/doctype/bom/bom.js:146
+#: manufacturing/doctype/bom/bom.js:360
+#: manufacturing/doctype/bom_creator/bom_creator.js:92
+#: manufacturing/doctype/plant_floor/plant_floor.js:240
+#: manufacturing/doctype/production_plan/production_plan.js:125
+#: manufacturing/doctype/production_plan/production_plan.js:139
+#: manufacturing/doctype/production_plan/production_plan.js:146
+#: manufacturing/doctype/work_order/work_order.js:301
+#: manufacturing/doctype/work_order/work_order.js:782
+#: projects/doctype/task/task_tree.js:81 public/js/communication.js:19
+#: 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
+#: selling/doctype/customer/customer.js:176
+#: selling/doctype/quotation/quotation.js:125
+#: selling/doctype/quotation/quotation.js:134
+#: selling/doctype/sales_order/sales_order.js:601
+#: selling/doctype/sales_order/sales_order.js:621
+#: selling/doctype/sales_order/sales_order.js:626
+#: selling/doctype/sales_order/sales_order.js:635
+#: selling/doctype/sales_order/sales_order.js:647
+#: selling/doctype/sales_order/sales_order.js:652
+#: selling/doctype/sales_order/sales_order.js:661
+#: selling/doctype/sales_order/sales_order.js:670
+#: selling/doctype/sales_order/sales_order.js:675
+#: selling/doctype/sales_order/sales_order.js:681
+#: selling/doctype/sales_order/sales_order.js:698
+#: selling/doctype/sales_order/sales_order.js:711
+#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:715
+#: selling/doctype/sales_order/sales_order.js:853
+#: selling/doctype/sales_order/sales_order.js:992
+#: stock/doctype/delivery_note/delivery_note.js:91
+#: stock/doctype/delivery_note/delivery_note.js:93
+#: stock/doctype/delivery_note/delivery_note.js:112
+#: stock/doctype/delivery_note/delivery_note.js:185
+#: stock/doctype/delivery_note/delivery_note.js:195
+#: stock/doctype/delivery_note/delivery_note.js:204
+#: stock/doctype/delivery_note/delivery_note.js:214
+#: stock/doctype/delivery_note/delivery_note.js:228
+#: stock/doctype/delivery_note/delivery_note.js:234
+#: stock/doctype/delivery_note/delivery_note.js:270
+#: stock/doctype/item/item.js:135 stock/doctype/item/item.js:142
+#: stock/doctype/item/item.js:150 stock/doctype/item/item.js:517
+#: stock/doctype/item/item.js:725
+#: stock/doctype/material_request/material_request.js:117
+#: stock/doctype/material_request/material_request.js:126
+#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:140
 #: stock/doctype/material_request/material_request.js:148
-#: stock/doctype/material_request/material_request.js:153
 #: stock/doctype/material_request/material_request.js:156
-#: stock/doctype/material_request/material_request.js:314
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/pick_list/pick_list.js:104
-#: stock/doctype/purchase_receipt/purchase_receipt.js:78
-#: stock/doctype/purchase_receipt/purchase_receipt.js:79
-#: stock/doctype/purchase_receipt/purchase_receipt.js:88
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
-#: stock/doctype/purchase_receipt/purchase_receipt.js:234
-#: stock/doctype/stock_entry/stock_entry.js:146
-#: stock/doctype/stock_entry/stock_entry.js:147
-#: stock/doctype/stock_entry/stock_entry.js:217
-#: stock/doctype/stock_entry/stock_entry.js:1065
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:159
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:193
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:63
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
+#: stock/doctype/material_request/material_request.js:164
+#: stock/doctype/material_request/material_request.js:172
+#: stock/doctype/material_request/material_request.js:180
+#: stock/doctype/material_request/material_request.js:184
+#: stock/doctype/material_request/material_request.js:384
+#: stock/doctype/pick_list/pick_list.js:112
+#: stock/doctype/pick_list/pick_list.js:118
+#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/purchase_receipt/purchase_receipt.js:85
+#: stock/doctype/purchase_receipt/purchase_receipt.js:97
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
+#: stock/doctype/purchase_receipt/purchase_receipt.js:263
+#: stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: 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
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:169
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:202
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:212
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:74
-#: support/doctype/issue/issue.js:27
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:88
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:90
+#: support/doctype/issue/issue.js:34
 msgid "Create"
 msgstr "ايجاد كردن"
 
-#: manufacturing/doctype/work_order/work_order.js:179
+#: manufacturing/doctype/work_order/work_order.js:190
 msgid "Create BOM"
 msgstr "BOM ایجاد کنید"
 
@@ -17750,14 +17995,18 @@
 msgid "Create Chart Of Accounts Based On"
 msgstr "ایجاد نمودار حساب بر اساس"
 
-#: stock/doctype/delivery_note/delivery_note_list.js:59
+#: stock/doctype/delivery_note/delivery_note_list.js:68
 msgid "Create Delivery Trip"
 msgstr "ایجاد سفر تحویل"
 
-#: assets/doctype/asset/asset.js:122
+#: assets/doctype/asset/asset.js:154
 msgid "Create Depreciation Entry"
 msgstr "ایجاد ورودی استهلاک"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:316
+msgid "Create Document"
+msgstr ""
+
 #: utilities/activation.py:138
 msgid "Create Employee"
 msgstr "ایجاد کارمند"
@@ -17776,15 +18025,15 @@
 msgid "Create Grouped Asset"
 msgstr "ایجاد دارایی گروهی"
 
-#: accounts/doctype/journal_entry/journal_entry.js:48
+#: accounts/doctype/journal_entry/journal_entry.js:96
 msgid "Create Inter Company Journal Entry"
 msgstr "ورود مجله Inter Company را ایجاد کنید"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:45
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:49
 msgid "Create Invoices"
 msgstr "ایجاد فاکتورها"
 
-#: manufacturing/doctype/work_order/work_order.js:152
+#: manufacturing/doctype/work_order/work_order.js:159
 msgid "Create Job Card"
 msgstr "ایجاد کارت شغلی"
 
@@ -17794,7 +18043,7 @@
 msgid "Create Job Card based on Batch Size"
 msgstr "ایجاد کارت شغلی بر اساس اندازه دسته ای"
 
-#: accounts/doctype/share_transfer/share_transfer.js:20
+#: accounts/doctype/share_transfer/share_transfer.js:18
 msgid "Create Journal Entry"
 msgstr "ایجاد ورودی مجله"
 
@@ -17813,8 +18062,8 @@
 msgid "Create Ledger Entries for Change Amount"
 msgstr "برای تغییر مقدار، ورودی های دفتر کل ایجاد کنید"
 
-#: buying/doctype/supplier/supplier.js:191
-#: selling/doctype/customer/customer.js:236
+#: buying/doctype/supplier/supplier.js:224
+#: selling/doctype/customer/customer.js:257
 msgid "Create Link"
 msgstr "ایجاد لینک"
 
@@ -17824,45 +18073,45 @@
 msgid "Create Missing Party"
 msgstr "طرف گمشده را ایجاد کنید"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:150
+#: manufacturing/doctype/bom_creator/bom_creator.js:146
 msgid "Create Multi-level BOM"
 msgstr "BOM چند سطحی ایجاد کنید"
 
-#: public/js/call_popup/call_popup.js:119
+#: public/js/call_popup/call_popup.js:122
 msgid "Create New Contact"
 msgstr "ایجاد مخاطب جدید"
 
-#: public/js/call_popup/call_popup.js:124
+#: public/js/call_popup/call_popup.js:128
 msgid "Create New Customer"
 msgstr "مشتری جدید ایجاد کنید"
 
-#: public/js/call_popup/call_popup.js:129
+#: public/js/call_popup/call_popup.js:134
 msgid "Create New Lead"
 msgstr "سرنخ جدید ایجاد کنید"
 
 #. Title of an Onboarding Step
-#: crm/doctype/lead/lead.js:198
+#: crm/doctype/lead/lead.js:208
 #: crm/onboarding_step/create_opportunity/create_opportunity.json
 msgid "Create Opportunity"
 msgstr "فرصت ایجاد کنید"
 
-#: selling/page/point_of_sale/pos_controller.js:60
+#: selling/page/point_of_sale/pos_controller.js:67
 msgid "Create POS Opening Entry"
 msgstr "ورودی باز کردن POS را ایجاد کنید"
 
-#: accounts/doctype/payment_order/payment_order.js:31
+#: accounts/doctype/payment_order/payment_order.js:39
 msgid "Create Payment Entries"
 msgstr "ایجاد ورودی های پرداخت"
 
-#: accounts/doctype/payment_request/payment_request.js:46
+#: accounts/doctype/payment_request/payment_request.js:58
 msgid "Create Payment Entry"
 msgstr "ایجاد ورودی پرداخت"
 
-#: manufacturing/doctype/work_order/work_order.js:588
+#: manufacturing/doctype/work_order/work_order.js:627
 msgid "Create Pick List"
 msgstr "لیست انتخاب ایجاد کنید"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Create Print Format"
 msgstr "فرمت چاپ ایجاد کنید"
 
@@ -17893,18 +18142,18 @@
 msgid "Create Receiver List"
 msgstr "ایجاد لیست گیرنده"
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:45
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:81
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:44
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:76
 msgid "Create Reposting Entries"
 msgstr "ورودی های ارسال مجدد ایجاد کنید"
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:53
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:52
 msgid "Create Reposting Entry"
 msgstr "ورودی ارسال مجدد ایجاد کنید"
 
 #: projects/doctype/timesheet/timesheet.js:54
-#: projects/doctype/timesheet/timesheet.js:203
-#: projects/doctype/timesheet/timesheet.js:207
+#: projects/doctype/timesheet/timesheet.js:230
+#: projects/doctype/timesheet/timesheet.js:234
 msgid "Create Sales Invoice"
 msgstr "ایجاد فاکتور فروش"
 
@@ -17918,24 +18167,24 @@
 msgid "Create Sales Orders to help you plan your work and deliver on-time"
 msgstr "برای کمک به برنامه ریزی کار و تحویل به موقع، سفارش های فروش ایجاد کنید"
 
-#: stock/doctype/stock_entry/stock_entry.js:346
+#: stock/doctype/stock_entry/stock_entry.js:399
 msgid "Create Sample Retention Stock Entry"
 msgstr "ورود نمونه ذخیره موجودی را ایجاد کنید"
 
-#: public/js/utils/serial_no_batch_selector.js:220
+#: public/js/utils/serial_no_batch_selector.js:223
 msgid "Create Serial Nos"
 msgstr "ایجاد شماره‌های سریال"
 
-#: stock/dashboard/item_dashboard.js:271
-#: stock/doctype/material_request/material_request.js:376
+#: stock/dashboard/item_dashboard.js:279
+#: stock/doctype/material_request/material_request.js:446
 msgid "Create Stock Entry"
 msgstr "ورود موجودی ایجاد کنید"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:153
+#: buying/doctype/request_for_quotation/request_for_quotation.js:163
 msgid "Create Supplier Quotation"
 msgstr "ایجاد نقل قول تامین کننده"
 
-#: setup/doctype/company/company.js:110
+#: setup/doctype/company/company.js:130
 msgid "Create Tax Template"
 msgstr "ایجاد الگوی مالیاتی"
 
@@ -17963,11 +18212,11 @@
 msgid "Create Users"
 msgstr "کاربران ایجاد کنید"
 
-#: stock/doctype/item/item.js:647
+#: stock/doctype/item/item.js:721
 msgid "Create Variant"
 msgstr "ایجاد متغیر"
 
-#: stock/doctype/item/item.js:495 stock/doctype/item/item.js:530
+#: stock/doctype/item/item.js:563 stock/doctype/item/item.js:597
 msgid "Create Variants"
 msgstr "ایجاد انواع"
 
@@ -18074,7 +18323,7 @@
 msgid "Create an Item"
 msgstr ""
 
-#: stock/stock_ledger.py:1684
+#: stock/stock_ledger.py:1704
 msgid "Create an incoming stock transaction for the Item."
 msgstr "یک معامله موجودی ورودی برای آیتم ایجاد کنید."
 
@@ -18131,7 +18380,7 @@
 msgid "Created {0} scorecards for {1} between:"
 msgstr "ایجاد {0} کارت امتیازی برای {1} بین:"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:126
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:140
 msgid "Creating Accounts..."
 msgstr "ایجاد اکانت ..."
 
@@ -18139,11 +18388,11 @@
 msgid "Creating Company and Importing Chart of Accounts"
 msgstr "ایجاد شرکت و واردات نمودار حساب"
 
-#: selling/doctype/sales_order/sales_order.js:912
+#: selling/doctype/sales_order/sales_order.js:1069
 msgid "Creating Delivery Note ..."
 msgstr "ایجاد یادداشت تحویل ..."
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:137
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:143
 msgid "Creating Dimensions..."
 msgstr "ایجاد ابعاد..."
 
@@ -18151,34 +18400,34 @@
 msgid "Creating Packing Slip ..."
 msgstr "ایجاد برگه بسته بندی ..."
 
-#: selling/doctype/sales_order/sales_order.js:1026
+#: selling/doctype/sales_order/sales_order.js:1194
 msgid "Creating Purchase Order ..."
 msgstr "ایجاد سفارش خرید ..."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: buying/doctype/purchase_order/purchase_order.js:414
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:709
+#: buying/doctype/purchase_order/purchase_order.js:482
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:71
 msgid "Creating Purchase Receipt ..."
 msgstr "ایجاد رسید خرید ..."
 
-#: buying/doctype/purchase_order/purchase_order.js:81
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:146
+#: buying/doctype/purchase_order/purchase_order.js:85
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:155
 msgid "Creating Stock Entry"
 msgstr "ایجاد ورود موجودی"
 
-#: buying/doctype/purchase_order/purchase_order.js:429
+#: buying/doctype/purchase_order/purchase_order.js:497
 msgid "Creating Subcontracting Order ..."
 msgstr "ایجاد سفارش پیمانکاری فرعی ..."
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:226
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:247
 msgid "Creating Subcontracting Receipt ..."
 msgstr "ایجاد رسید پیمانکاری فرعی ..."
 
-#: setup/doctype/employee/employee.js:85
+#: setup/doctype/employee/employee.js:87
 msgid "Creating User..."
 msgstr "ایجاد کاربر..."
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:52
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:56
 msgid "Creating {0} Invoice"
 msgstr "ایجاد فاکتور {0}"
 
@@ -18198,22 +18447,24 @@
 msgid "Creation Document No"
 msgstr "شماره سند ایجاد"
 
-#: utilities/bulk_transaction.py:173
+#: utilities/bulk_transaction.py:185
 msgid "Creation of <b><a href='/app/{0}'>{1}(s)</a></b> successful"
 msgstr "ایجاد <b><a href='/app/{0}'>{1}(ها)</a></b> با موفقیت"
 
-#: utilities/bulk_transaction.py:190
+#: utilities/bulk_transaction.py:202
 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:181
+#: utilities/bulk_transaction.py:193
 msgid "Creation of {0} partially successful.\n"
 "\t\t\t\tCheck <b><a href=\"/app/bulk-transaction-log\">Bulk Transaction Log</a></b>"
 msgstr ""
 
 #: 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/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
@@ -18235,15 +18486,15 @@
 msgid "Credit"
 msgstr "اعتبار"
 
-#: accounts/report/general_ledger/general_ledger.py:601
+#: accounts/report/general_ledger/general_ledger.py:614
 msgid "Credit (Transaction)"
 msgstr "اعتبار (معامله)"
 
-#: accounts/report/general_ledger/general_ledger.py:578
+#: accounts/report/general_ledger/general_ledger.py:591
 msgid "Credit ({0})"
 msgstr "اعتبار ({0})"
 
-#: accounts/doctype/journal_entry/journal_entry.js:536
+#: accounts/doctype/journal_entry/journal_entry.js:593
 msgid "Credit Account"
 msgstr "حساب اعتباری"
 
@@ -18311,6 +18562,7 @@
 msgstr "روزهای اعتباری"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:49
+#: accounts/report/accounts_receivable/accounts_receivable.html:36
 #: selling/report/customer_credit_balance/customer_credit_balance.py:65
 msgid "Credit Limit"
 msgstr "محدودیت اعتبار"
@@ -18345,7 +18597,7 @@
 msgid "Credit Limit"
 msgstr "محدودیت اعتبار"
 
-#: selling/doctype/customer/customer.py:546
+#: selling/doctype/customer/customer.py:558
 msgid "Credit Limit Crossed"
 msgstr "از حد اعتبار عبور کرد"
 
@@ -18386,7 +18638,8 @@
 msgstr "ماه های اعتباری"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:173
-#: accounts/report/accounts_receivable/accounts_receivable.py:1070
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1078
 #: controllers/sales_and_purchase_return.py:328
 #: setup/setup_wizard/operations/install_fixtures.py:256
 #: stock/doctype/delivery_note/delivery_note.js:84
@@ -18413,10 +18666,11 @@
 msgstr "یادداشت اعتباری"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:200
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Credit Note Amount"
 msgstr "مبلغ یادداشت اعتباری"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:254
+#: accounts/doctype/sales_invoice/sales_invoice.py:259
 msgid "Credit Note Issued"
 msgstr "اوراق اعتباری صادر شد"
 
@@ -18432,7 +18686,14 @@
 msgid "Credit Note Issued"
 msgstr "اوراق اعتباری صادر شد"
 
-#: stock/doctype/delivery_note/delivery_note.py:734
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+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
 msgid "Credit Note {0} has been created automatically"
 msgstr "یادداشت اعتباری {0} به طور خودکار ایجاد شده است"
 
@@ -18448,16 +18709,16 @@
 msgid "Credit in Company Currency"
 msgstr "اعتبار به ارز شرکت"
 
-#: selling/doctype/customer/customer.py:512
-#: selling/doctype/customer/customer.py:566
+#: selling/doctype/customer/customer.py:524
+#: selling/doctype/customer/customer.py:579
 msgid "Credit limit has been crossed for customer {0} ({1}/{2})"
 msgstr "محدودیت اعتبار برای مشتری {0} ({1}/{2}) رد شده است"
 
-#: selling/doctype/customer/customer.py:328
+#: selling/doctype/customer/customer.py:340
 msgid "Credit limit is already defined for the Company {0}"
 msgstr "محدودیت اعتبار از قبل برای شرکت تعریف شده است {0}"
 
-#: selling/doctype/customer/customer.py:565
+#: selling/doctype/customer/customer.py:578
 msgid "Credit limit reached for customer {0}"
 msgstr "به سقف اعتبار مشتری {0} رسیده است"
 
@@ -18526,25 +18787,31 @@
 msgid "Criteria weights must add up to 100%"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/website_item_group/website_item_group.json
+msgid "Cross Listing of Item in multiple groups"
+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 "آستانه تراکنش تجمعی"
 
-#: accounts/doctype/account/account_tree.js:121
+#: accounts/doctype/account/account_tree.js:166
 #: accounts/report/account_balance/account_balance.py:28
-#: accounts/report/accounts_receivable/accounts_receivable.py:1079
+#: 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/consolidated_financial_statement/consolidated_financial_statement.js:94
+#: 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/financial_statements.html:29
 #: accounts/report/financial_statements.py:631
 #: 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:644
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:650
 #: accounts/report/payment_ledger/payment_ledger.py:213
 #: accounts/report/profitability_analysis/profitability_analysis.py:175
 #: accounts/report/purchase_register/purchase_register.py:229
@@ -18553,12 +18820,12 @@
 #: 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
-#: manufacturing/doctype/bom_creator/bom_creator.js:77
-#: public/js/financial_statements.js:231 public/js/utils/unreconcile.js:63
+#: 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
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:72
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:85
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:137
 msgid "Currency"
 msgstr "واحد پول"
 
@@ -18846,12 +19113,12 @@
 msgid "Currency and Price List"
 msgstr "ارز و لیست قیمت"
 
-#: accounts/doctype/account/account.py:295
+#: accounts/doctype/account/account.py:314
 msgid "Currency can not be changed after making entries using some other currency"
 msgstr "پس از ثبت نام با استفاده از ارزهای دیگر، ارز را نمی توان تغییر داد"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1360
-#: accounts/doctype/payment_entry/payment_entry.py:1422 accounts/utils.py:2091
+#: accounts/doctype/payment_entry/payment_entry.py:1379
+#: accounts/doctype/payment_entry/payment_entry.py:1441 accounts/utils.py:2059
 msgid "Currency for {0} must be {1}"
 msgstr "واحد پول برای {0} باید {1} باشد"
 
@@ -19064,57 +19331,57 @@
 
 #. Name of a DocType
 #. Name of a role
-#: accounts/doctype/sales_invoice/sales_invoice.js:265
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
+#: 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/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:45
+#: 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/sales_register/sales_register.js:21
 #: accounts/report/sales_register/sales_register.py:185
-#: buying/doctype/supplier/supplier.js:162 crm/doctype/lead/lead.js:35
-#: crm/doctype/opportunity/opportunity.js:94 crm/doctype/prospect/prospect.js:7
+#: 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
-#: projects/doctype/timesheet/timesheet.js:195
+#: projects/doctype/timesheet/timesheet.js:222
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:45
-#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:42
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:22
+#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:39
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:21
 #: selling/doctype/customer/customer.json
 #: selling/doctype/sales_order/sales_order_calendar.js:18
-#: selling/page/point_of_sale/pos_item_cart.js:309
+#: selling/page/point_of_sale/pos_item_cart.js:307
 #: 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:8
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:7
 #: selling/report/inactive_customers/inactive_customers.py:78
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:48
+#: 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:38
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:37
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:19
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:41
 #: selling/report/sales_order_analysis/sales_order_analysis.py:230
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:42
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:40
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:32
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:54
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:53
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:32
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:42
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:40
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:53
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:53
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:64
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:65
 #: setup/doctype/customer_group/customer_group.json
 #: setup/doctype/territory/territory.json
-#: stock/doctype/delivery_note/delivery_note.js:359
-#: stock/doctype/stock_entry/stock_entry.js:300
-#: stock/report/delayed_item_report/delayed_item_report.js:37
+#: stock/doctype/delivery_note/delivery_note.js:405
+#: stock/doctype/stock_entry/stock_entry.js:342
+#: stock/report/delayed_item_report/delayed_item_report.js:36
 #: stock/report/delayed_item_report/delayed_item_report.py:117
-#: stock/report/delayed_order_report/delayed_order_report.js:37
+#: stock/report/delayed_order_report/delayed_order_report.js:36
 #: stock/report/delayed_order_report/delayed_order_report.py:46
-#: support/report/issue_analytics/issue_analytics.js:70
+#: support/report/issue_analytics/issue_analytics.js:69
 #: support/report/issue_analytics/issue_analytics.py:37
-#: support/report/issue_summary/issue_summary.js:58
+#: support/report/issue_summary/issue_summary.js:57
 #: support/report/issue_summary/issue_summary.py:34
 msgid "Customer"
 msgstr "مشتری"
@@ -19483,7 +19750,7 @@
 msgid "Customer Code"
 msgstr "کد مشتری"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1027
+#: accounts/report/accounts_receivable/accounts_receivable.py:1035
 msgid "Customer Contact"
 msgstr "تماس با مشتری"
 
@@ -19563,11 +19830,11 @@
 msgstr "بازخورد مشتری"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:118
-#: accounts/report/accounts_receivable/accounts_receivable.py:1097
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:99
+#: accounts/report/accounts_receivable/accounts_receivable.js:121
+#: accounts/report/accounts_receivable/accounts_receivable.py:1105
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:102
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:188
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
+#: 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/item_wise_sales_register/item_wise_sales_register.py:208
@@ -19576,10 +19843,10 @@
 #: public/js/sales_trends_filters.js:26
 #: selling/report/inactive_customers/inactive_customers.py:81
 #: 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:31
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:30
 #: setup/doctype/customer_group/customer_group.json
-#: stock/report/delayed_item_report/delayed_item_report.js:43
-#: stock/report/delayed_order_report/delayed_order_report.js:43
+#: stock/report/delayed_item_report/delayed_item_report.js:42
+#: stock/report/delayed_order_report/delayed_order_report.js:42
 msgid "Customer Group"
 msgstr "گروه مشتریان"
 
@@ -19742,7 +20009,7 @@
 msgid "Customer Group Name"
 msgstr "نام گروه مشتری"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1197
+#: accounts/report/accounts_receivable/accounts_receivable.py:1205
 msgid "Customer Group: {0} does not exist"
 msgstr "گروه مشتری: {0} وجود ندارد"
 
@@ -19763,11 +20030,12 @@
 msgid "Customer Items"
 msgstr "اقلام مشتری"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1088
+#: accounts/report/accounts_receivable/accounts_receivable.py:1096
 msgid "Customer LPO"
 msgstr "LPO مشتری"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:182
+#: accounts/report/accounts_receivable/accounts_receivable.html:152
 msgid "Customer LPO No."
 msgstr "شماره LPO مشتری"
 
@@ -19784,9 +20052,9 @@
 msgid "Customer Mobile No"
 msgstr "شماره موبایل مشتری"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1034
+#: accounts/report/accounts_receivable/accounts_receivable.py:1042
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:92
+#: 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
@@ -19938,7 +20206,7 @@
 msgid "Customer PO Details"
 msgstr "جزئیات PO مشتری"
 
-#: public/js/utils/contact_address_quick_entry.js:92
+#: public/js/utils/contact_address_quick_entry.js:95
 msgid "Customer POS Id"
 msgstr "شناسه POS مشتری"
 
@@ -19985,7 +20253,7 @@
 msgid "Customer Provided"
 msgstr "مشتری ارائه شده است"
 
-#: setup/doctype/company/company.py:359
+#: setup/doctype/company/company.py:358
 msgid "Customer Service"
 msgstr "خدمات مشتری"
 
@@ -20013,7 +20281,7 @@
 msgid "Customer Warehouse (Optional)"
 msgstr "انبار مشتری (اختیاری)"
 
-#: selling/page/point_of_sale/pos_item_cart.js:924
+#: selling/page/point_of_sale/pos_item_cart.js:956
 msgid "Customer contact updated successfully."
 msgstr "تماس با مشتری با موفقیت به روز شد."
 
@@ -20036,9 +20304,9 @@
 msgid "Customer required for 'Customerwise Discount'"
 msgstr "مشتری برای \"تخفیف از نظر مشتری\" مورد نیاز است"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:986
-#: selling/doctype/sales_order/sales_order.py:335
-#: stock/doctype/delivery_note/delivery_note.py:354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1003
+#: selling/doctype/sales_order/sales_order.py:338
+#: stock/doctype/delivery_note/delivery_note.py:408
 msgid "Customer {0} does not belong to project {1}"
 msgstr "مشتری {0} به پروژه {1} تعلق ندارد"
 
@@ -20200,7 +20468,7 @@
 msgid "DUNN-.MM.-.YY.-"
 msgstr ""
 
-#: public/js/stock_analytics.js:51
+#: public/js/stock_analytics.js:81
 msgid "Daily"
 msgstr "روزانه"
 
@@ -20309,7 +20577,7 @@
 msgid "Dashboard"
 msgstr "داشبورد"
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:15
 msgid "Data Based On"
 msgstr "داده ها بر اساس"
 
@@ -20330,17 +20598,19 @@
 msgid "Data exported from Tally that consists of the Chart of Accounts, Customers, Suppliers, Addresses, Items and UOMs"
 msgstr "داده های صادر شده از Tally که شامل نمودار حساب ها، مشتریان، تامین کنندگان، آدرس ها، اقلام و UOM است."
 
-#: accounts/doctype/journal_entry/journal_entry.js:542
+#: accounts/doctype/journal_entry/journal_entry.js:603
 #: 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:16
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:37
+#: accounts/report/account_balance/account_balance.js:15
+#: accounts/report/accounts_receivable/accounts_receivable.html:132
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:38
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:26
+#: accounts/report/general_ledger/general_ledger.html:27
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:26
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:22
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:38
-#: accounts/report/share_balance/share_balance.js:10
-#: accounts/report/share_ledger/share_ledger.js:10
+#: 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
@@ -20348,12 +20618,12 @@
 #: 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
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:19
-#: public/js/bank_reconciliation_tool/data_table_manager.js:40
+#: public/js/bank_reconciliation_tool/data_table_manager.js:39
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:34
 #: selling/report/sales_order_analysis/sales_order_analysis.py:220
 #: stock/report/product_bundle_balance/product_bundle_balance.js:8
 #: stock/report/reserved_stock/reserved_stock.py:89
-#: stock/report/stock_ledger/stock_ledger.py:107
+#: stock/report/stock_ledger/stock_ledger.py:180
 #: support/report/first_response_time_for_issues/first_response_time_for_issues.py:11
 #: support/report/support_hour_distribution/support_hour_distribution.py:68
 msgid "Date"
@@ -20533,7 +20803,7 @@
 msgid "Date "
 msgstr " تاریخ"
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:98
+#: assets/report/fixed_asset_register/fixed_asset_register.js:97
 msgid "Date Based On"
 msgstr "تاریخ بر اساس"
 
@@ -20570,7 +20840,7 @@
 msgid "Date of Commencement"
 msgstr "تاریخ شروع"
 
-#: setup/doctype/company/company.js:70
+#: setup/doctype/company/company.js:69
 msgid "Date of Commencement should be greater than Date of Incorporation"
 msgstr "تاریخ شروع باید بزرگتر از تاریخ ثبت باشد"
 
@@ -20598,7 +20868,7 @@
 msgid "Date of Joining"
 msgstr "تاریخ عضویت"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:265
 msgid "Date of Transaction"
 msgstr "تاریخ معامله"
 
@@ -20703,7 +20973,7 @@
 msgid "Days Since Last Order"
 msgstr "روزهای پس از آخرین سفارش"
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:35
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:34
 msgid "Days Since Last order"
 msgstr "روزهای پس از آخرین سفارش"
 
@@ -20736,12 +21006,14 @@
 msgid "Dear"
 msgstr "عزیز"
 
-#: stock/reorder_item.py:285
+#: stock/reorder_item.py:370
 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/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
@@ -20763,15 +21035,15 @@
 msgid "Debit"
 msgstr "بدهی"
 
-#: accounts/report/general_ledger/general_ledger.py:594
+#: accounts/report/general_ledger/general_ledger.py:607
 msgid "Debit (Transaction)"
 msgstr "بدهی (معامله)"
 
-#: accounts/report/general_ledger/general_ledger.py:572
+#: accounts/report/general_ledger/general_ledger.py:585
 msgid "Debit ({0})"
 msgstr "بدهی ({0})"
 
-#: accounts/doctype/journal_entry/journal_entry.js:530
+#: accounts/doctype/journal_entry/journal_entry.js:583
 msgid "Debit Account"
 msgstr "حساب بدهکار"
 
@@ -20806,10 +21078,11 @@
 msgstr "مبلغ بدهی به ارز تراکنش"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:175
-#: accounts/report/accounts_receivable/accounts_receivable.py:1073
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1081
 #: controllers/sales_and_purchase_return.py:332
 #: setup/setup_wizard/operations/install_fixtures.py:257
-#: stock/doctype/purchase_receipt/purchase_receipt.js:73
+#: stock/doctype/purchase_receipt/purchase_receipt.js:76
 msgid "Debit Note"
 msgstr "یادداشت بدهی"
 
@@ -20827,6 +21100,7 @@
 msgstr "یادداشت بدهی"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:202
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Debit Note Amount"
 msgstr "مبلغ یادداشت بدهی"
 
@@ -20836,6 +21110,13 @@
 msgid "Debit Note Issued"
 msgstr "یادداشت بدهی صادر شد"
 
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Debit Note will update it's own outstanding amount, even if \"Return Against\" is specified."
+msgstr ""
+
 #. Label of a Link field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -20848,11 +21129,11 @@
 msgid "Debit To"
 msgstr "بدهی به"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
 msgid "Debit To is required"
 msgstr "بدهی به مورد نیاز است"
 
-#: accounts/general_ledger.py:465
+#: accounts/general_ledger.py:474
 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
 msgstr "بدهی و اعتبار برای {0} #{1} برابر نیست. تفاوت {2} است."
 
@@ -20892,7 +21173,7 @@
 msgid "Decapitalized"
 msgstr "بدون سرمایه"
 
-#: public/js/utils/sales_common.js:444
+#: public/js/utils/sales_common.js:503
 msgid "Declare Lost"
 msgstr "اعلام گمشده"
 
@@ -21024,15 +21305,15 @@
 msgid "Default BOM ({0}) must be active for this item or its template"
 msgstr "BOM پیش‌فرض ({0}) باید برای این مورد یا الگوی آن فعال باشد"
 
-#: manufacturing/doctype/work_order/work_order.py:1234
+#: manufacturing/doctype/work_order/work_order.py:1248
 msgid "Default BOM for {0} not found"
 msgstr "BOM پیش‌فرض برای {0} یافت نشد"
 
-#: controllers/accounts_controller.py:3216
+#: controllers/accounts_controller.py:3307
 msgid "Default BOM not found for FG Item {0}"
 msgstr "BOM پیش فرض برای FG مورد {0} یافت نشد"
 
-#: manufacturing/doctype/work_order/work_order.py:1231
+#: manufacturing/doctype/work_order/work_order.py:1245
 msgid "Default BOM not found for Item {0} and Project {1}"
 msgstr "BOM پیش‌فرض برای مورد {0} و پروژه {1} یافت نشد"
 
@@ -21490,11 +21771,11 @@
 msgid "Default Unit of Measure"
 msgstr "واحد اندازه گیری پیش فرض"
 
-#: stock/doctype/item/item.py:1233
+#: stock/doctype/item/item.py:1234
 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 "واحد اندازه گیری پیش فرض برای مورد {0} را نمی توان مستقیماً تغییر داد زیرا قبلاً تراکنش(هایی) را با UOM دیگری انجام داده اید. شما باید اسناد پیوند داده شده را لغو کنید یا یک مورد جدید ایجاد کنید."
 
-#: stock/doctype/item/item.py:1216
+#: stock/doctype/item/item.py:1217
 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 "واحد اندازه گیری پیش فرض برای مورد {0} را نمی توان مستقیماً تغییر داد زیرا قبلاً تراکنش(هایی) را با UOM دیگری انجام داده اید. برای استفاده از یک UOM پیش فرض متفاوت، باید یک آیتم جدید ایجاد کنید."
 
@@ -21581,7 +21862,12 @@
 msgid "Default account will be automatically updated in POS Invoice when this mode is selected."
 msgstr "با انتخاب این حالت، حساب پیش‌فرض به‌طور خودکار در فاکتور POS به‌روزرسانی می‌شود."
 
-#: setup/doctype/company/company.js:133
+#. Description of a DocType
+#: stock/doctype/stock_settings/stock_settings.json
+msgid "Default settings for your stock-related transactions"
+msgstr ""
+
+#: setup/doctype/company/company.js:160
 msgid "Default tax templates for sales, purchase and items are created."
 msgstr "الگوهای مالیاتی پیش فرض برای فروش، خرید و اقلام ایجاد می شود."
 
@@ -21762,7 +22048,7 @@
 msgid "Delayed Tasks Summary"
 msgstr "خلاصه وظایف تاخیری"
 
-#: setup/doctype/company/company.js:176
+#: setup/doctype/company/company.js:207
 msgid "Delete"
 msgstr "حذف"
 
@@ -21772,21 +22058,39 @@
 msgid "Delete Accounting and Stock Ledger Entries on deletion of Transaction"
 msgstr "حذف ورودی های حسابداری و دفتر موجودی در حذف تراکنش"
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Bins"
+msgstr ""
+
 #. Label of a Check field in DocType 'Repost Accounting Ledger'
 #: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
 msgctxt "Repost Accounting Ledger"
 msgid "Delete Cancelled Ledger Entries"
 msgstr "ورودی های لغو شده در دفتر را حذف کنید"
 
-#: stock/doctype/inventory_dimension/inventory_dimension.js:50
+#: stock/doctype/inventory_dimension/inventory_dimension.js:66
 msgid "Delete Dimension"
 msgstr "حذف ابعاد"
 
-#: setup/doctype/company/company.js:117
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Leads and Addresses"
+msgstr ""
+
+#: setup/doctype/company/company.js:141
 msgid "Delete Transactions"
 msgstr "تراکنش ها را حذف کنید"
 
-#: setup/doctype/company/company.js:176
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Transactions"
+msgstr "تراکنش ها را حذف کنید"
+
+#: setup/doctype/company/company.js:206
 msgid "Delete all the Transactions for this Company"
 msgstr "تمام معاملات این شرکت را حذف کنید"
 
@@ -21796,12 +22100,16 @@
 msgid "Deleted Documents"
 msgstr ""
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:489
+msgid "Deletion in Progress!"
+msgstr ""
+
 #: regional/__init__.py:14
 msgid "Deletion is not permitted for country {0}"
 msgstr "حذف برای کشور {0} مجاز نیست"
 
-#: buying/doctype/purchase_order/purchase_order.js:297
-#: buying/doctype/purchase_order/purchase_order_list.js:10
+#: 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
 msgid "Delivered"
@@ -21914,7 +22222,7 @@
 msgid "Delivery"
 msgstr "تحویل"
 
-#: public/js/utils.js:678
+#: public/js/utils.js:742 selling/doctype/sales_order/sales_order.js:1012
 #: selling/report/sales_order_analysis/sales_order_analysis.py:321
 msgid "Delivery Date"
 msgstr "تاریخ تحویل"
@@ -21947,17 +22255,17 @@
 msgstr "مدیر تحویل"
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:281
-#: accounts/doctype/sales_invoice/sales_invoice_list.js:27
+#: 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
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order_list.js:57
+#: selling/doctype/sales_order/sales_order.js:619
+#: selling/doctype/sales_order/sales_order_list.js:70
 #: stock/doctype/delivery_note/delivery_note.json
-#: stock/doctype/delivery_trip/delivery_trip.js:51
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/delivery_trip/delivery_trip.js:52
+#: stock/doctype/pick_list/pick_list.js:110
+#: stock/doctype/purchase_receipt/purchase_receipt.js:90
 msgid "Delivery Note"
 msgstr "رسید"
 
@@ -22073,16 +22381,16 @@
 msgid "Delivery Note Trends"
 msgstr "روند یادداشت تحویل"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1148
+#: accounts/doctype/sales_invoice/sales_invoice.py:1155
 msgid "Delivery Note {0} is not submitted"
 msgstr "یادداشت تحویل {0} ارسال نشده است"
 
-#: stock/doctype/pick_list/pick_list.py:885
+#: stock/doctype/pick_list/pick_list.py:1005
 msgid "Delivery Note(s) created for the Pick List"
 msgstr "یادداشت(های) تحویل برای لیست انتخاب ایجاد شده است"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1092
-#: stock/doctype/delivery_trip/delivery_trip.js:67
+#: accounts/report/accounts_receivable/accounts_receivable.py:1100
+#: stock/doctype/delivery_trip/delivery_trip.js:72
 msgid "Delivery Notes"
 msgstr "یادداشت های تحویل"
 
@@ -22129,7 +22437,7 @@
 msgstr "تحویل به"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:180
+#: stock/doctype/delivery_note/delivery_note.js:210
 #: stock/doctype/delivery_trip/delivery_trip.json
 msgid "Delivery Trip"
 msgstr "سفر تحویل"
@@ -22161,7 +22469,7 @@
 msgid "Delivery to"
 msgstr "تحویل به"
 
-#: selling/doctype/sales_order/sales_order.py:351
+#: selling/doctype/sales_order/sales_order.py:354
 msgid "Delivery warehouse required for stock item {0}"
 msgstr "انبار تحویل مورد نیاز برای کالای موجود {0}"
 
@@ -22280,7 +22588,7 @@
 msgid "Depends on Tasks"
 msgstr "بستگی به Tasks دارد"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:61
+#: public/js/bank_reconciliation_tool/data_table_manager.js:60
 msgid "Deposit"
 msgstr "سپرده"
 
@@ -22322,7 +22630,7 @@
 
 #: 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:45
+#: accounts/report/account_balance/account_balance.js:44
 #: accounts/report/cash_flow/cash_flow.py:129
 msgid "Depreciation"
 msgstr "استهلاک"
@@ -22341,7 +22649,7 @@
 msgstr "استهلاک"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:149
-#: assets/doctype/asset/asset.js:241
+#: assets/doctype/asset/asset.js:276
 msgid "Depreciation Amount"
 msgstr "مقدار استهلاک"
 
@@ -22404,7 +22712,7 @@
 msgid "Depreciation Expense Account"
 msgstr "حساب هزینه استهلاک"
 
-#: assets/doctype/asset/depreciation.py:390
+#: assets/doctype/asset/depreciation.py:388
 msgid "Depreciation Expense Account should be an Income or Expense Account."
 msgstr "حساب هزینه استهلاک باید یک حساب درآمد یا هزینه باشد."
 
@@ -22438,19 +22746,19 @@
 msgid "Depreciation Posting Date"
 msgstr "تاریخ ثبت استهلاک"
 
-#: assets/doctype/asset/asset.js:661
+#: assets/doctype/asset/asset.js:780
 msgid "Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr "تاریخ ارسال استهلاک نباید برابر با تاریخ موجود برای استفاده باشد."
 
-#: assets/doctype/asset/asset.py:491
+#: assets/doctype/asset/asset.py:493
 msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
 msgstr "ردیف استهلاک {0}: مقدار مورد انتظار پس از عمر مفید باید بزرگتر یا مساوی با {1} باشد."
 
-#: assets/doctype/asset/asset.py:460
+#: assets/doctype/asset/asset.py:462
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date"
 msgstr "ردیف استهلاک {0}: تاریخ استهلاک بعدی نمی تواند قبل از تاریخ موجود برای استفاده باشد"
 
-#: assets/doctype/asset/asset.py:451
+#: assets/doctype/asset/asset.py:453
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date"
 msgstr "ردیف استهلاک {0}: تاریخ استهلاک بعدی نمی تواند قبل از تاریخ خرید باشد"
 
@@ -22485,7 +22793,7 @@
 msgid "Depreciation Schedule View"
 msgstr "مشاهده برنامه زمانبندی استهلاک"
 
-#: assets/doctype/asset/asset.py:347
+#: assets/doctype/asset/asset.py:349
 msgid "Depreciation cannot be calculated for fully depreciated assets"
 msgstr "استهلاک برای دارایی های کاملا مستهلک شده قابل محاسبه نیست"
 
@@ -22495,12 +22803,15 @@
 #: 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
+#: manufacturing/doctype/bom/bom_item_preview.html:12
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:58
+#: 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:56
-#: public/js/controllers/transaction.js:2138
-#: selling/doctype/quotation/quotation.js:279
+#: public/js/bank_reconciliation_tool/data_table_manager.js:55
+#: public/js/controllers/transaction.js:2181
+#: 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
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:26
@@ -22511,7 +22822,7 @@
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:59
 #: stock/report/product_bundle_balance/product_bundle_balance.py:112
 #: stock/report/stock_ageing/stock_ageing.py:126
-#: stock/report/stock_ledger/stock_ledger.py:187
+#: 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
@@ -23077,7 +23388,7 @@
 msgid "Desk User"
 msgstr "کاربر میز"
 
-#: public/js/utils/sales_common.js:423
+#: public/js/utils/sales_common.js:482
 msgid "Detailed Reason"
 msgstr "دلیل تفصیلی"
 
@@ -23093,6 +23404,10 @@
 msgid "Detailed Reason"
 msgstr "دلیل تفصیلی"
 
+#: templates/pages/task_info.html:49
+msgid "Details"
+msgstr "جزئیات"
+
 #. Label of a Long Text field in DocType 'Appointment'
 #: crm/doctype/appointment/appointment.json
 msgctxt "Appointment"
@@ -23153,6 +23468,12 @@
 msgid "Details"
 msgstr "جزئیات"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Details"
+msgstr "جزئیات"
+
 #. Label of a Select field in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
 msgctxt "Accounts Settings"
@@ -23166,7 +23487,7 @@
 msgstr "دیزل"
 
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:175
-#: public/js/bank_reconciliation_tool/number_card.js:31
+#: 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
 msgid "Difference"
@@ -23196,7 +23517,7 @@
 msgid "Difference (Dr - Cr)"
 msgstr "تفاوت (Dr - Cr)"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:287
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:294
 msgid "Difference Account"
 msgstr "حساب تفاوت"
 
@@ -23225,15 +23546,15 @@
 msgid "Difference Account"
 msgstr "حساب تفاوت"
 
-#: stock/doctype/stock_entry/stock_entry.py:573
+#: stock/doctype/stock_entry/stock_entry.py:528
 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:714
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:768
 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"
 msgstr "حساب مابه التفاوت باید یک حساب از نوع دارایی/بدهی باشد، زیرا این تطبیق موجودی یک ورودی افتتاحیه است."
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:301
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:309
 msgid "Difference Amount"
 msgstr "مقدار تفاوت"
 
@@ -23297,7 +23618,7 @@
 msgid "Difference Value"
 msgstr "ارزش تفاوت"
 
-#: stock/doctype/delivery_note/delivery_note.js:366
+#: stock/doctype/delivery_note/delivery_note.js:414
 msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
 msgstr "برای هر ردیف می توان «انبار منبع» و «انبار هدف» متفاوتی را تنظیم کرد."
 
@@ -23317,7 +23638,7 @@
 msgid "Dimension Details"
 msgstr "جزئیات ابعاد"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:94
+#: accounts/report/budget_variance_report/budget_variance_report.js:92
 msgid "Dimension Filter"
 msgstr "فیلتر ابعاد"
 
@@ -23487,7 +23808,7 @@
 msgstr "غیرفعال کردن سریال No And Batch Selector"
 
 #: selling/report/customer_credit_balance/customer_credit_balance.py:70
-#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:8
+#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:16
 #: stock/doctype/putaway_rule/putaway_rule_list.js:5
 msgid "Disabled"
 msgstr "غیرفعال"
@@ -23636,19 +23957,19 @@
 msgid "Disabled"
 msgstr "غیرفعال"
 
-#: accounts/general_ledger.py:128
+#: accounts/general_ledger.py:132
 msgid "Disabled Account Selected"
 msgstr "حساب غیرفعال انتخاب شد"
 
-#: stock/utils.py:454
+#: stock/utils.py:449
 msgid "Disabled Warehouse {0} cannot be used for this transaction."
 msgstr "از انبار غیرفعال شده {0} نمی توان برای این تراکنش استفاده کرد."
 
-#: controllers/accounts_controller.py:550
+#: controllers/accounts_controller.py:594
 msgid "Disabled pricing rules since this {} is an internal transfer"
 msgstr "قوانین قیمت گذاری غیرفعال شده است زیرا این {} یک انتقال داخلی است"
 
-#: controllers/accounts_controller.py:564
+#: controllers/accounts_controller.py:608
 msgid "Disabled tax included prices since this {} is an internal transfer"
 msgstr "مالیات غیرفعال شامل قیمت‌ها می‌شود زیرا این {} یک انتقال داخلی است"
 
@@ -23663,11 +23984,11 @@
 msgid "Disables auto-fetching of existing quantity"
 msgstr "واکشی خودکار مقدار موجود را غیرفعال می کند"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:62
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:64
 msgid "Disburse Loan"
 msgstr "پرداخت وام"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:12
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
 msgid "Disbursed"
 msgstr "پرداخت شد"
 
@@ -23677,7 +23998,8 @@
 msgid "Disbursed"
 msgstr "پرداخت شد"
 
-#: selling/page/point_of_sale/pos_item_cart.js:380
+#: selling/page/point_of_sale/pos_item_cart.js:387
+#: templates/form_grid/item_grid.html:71
 msgid "Discount"
 msgstr "تخفیف"
 
@@ -23943,7 +24265,7 @@
 msgid "Discount and Margin"
 msgstr "تخفیف و حاشیه"
 
-#: selling/page/point_of_sale/pos_item_cart.js:761
+#: selling/page/point_of_sale/pos_item_cart.js:791
 msgid "Discount cannot be greater than 100%"
 msgstr ""
 
@@ -23951,7 +24273,7 @@
 msgid "Discount must be less than 100"
 msgstr "تخفیف باید کمتر از 100 باشد"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2532
+#: accounts/doctype/payment_entry/payment_entry.py:2561
 msgid "Discount of {} applied as per Payment Term"
 msgstr "تخفیف {} طبق شرایط پرداخت اعمال شد"
 
@@ -24037,7 +24359,7 @@
 msgid "Dislikes"
 msgstr "دوست ندارد"
 
-#: setup/doctype/company/company.py:353
+#: setup/doctype/company/company.py:352
 msgid "Dispatch"
 msgstr "ارسال"
 
@@ -24145,6 +24467,11 @@
 msgid "Distinct Item and Warehouse"
 msgstr "کالا و انبار متمایز"
 
+#. Description of a DocType
+#: stock/doctype/serial_no/serial_no.json
+msgid "Distinct unit of an Item"
+msgstr ""
+
 #. Label of a Select field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
@@ -24191,7 +24518,7 @@
 msgid "Divorced"
 msgstr "جدا شده"
 
-#: crm/report/lead_details/lead_details.js:42
+#: crm/report/lead_details/lead_details.js:41
 msgid "Do Not Contact"
 msgstr "تماس نگیرید"
 
@@ -24213,6 +24540,12 @@
 msgid "Do Not Explode"
 msgstr "منفجر نشوید"
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Do Not Update Serial / Batch on Creation of Auto Bundle"
+msgstr ""
+
 #. Description of the 'Hide Currency Symbol' (Select) field in DocType 'Global
 #. Defaults'
 #: setup/doctype/global_defaults/global_defaults.json
@@ -24226,29 +24559,49 @@
 msgid "Do not update variants on save"
 msgstr "نسخه ها را در ذخیره به روز نکنید"
 
-#: assets/doctype/asset/asset.js:683
+#: assets/doctype/asset/asset.js:800
 msgid "Do you really want to restore this scrapped asset?"
 msgstr "آیا واقعاً می خواهید این دارایی از بین رفته را بازیابی کنید؟"
 
-#: assets/doctype/asset/asset.js:669
+#: assets/doctype/asset/asset.js:788
 msgid "Do you really want to scrap this asset?"
 msgstr "آیا واقعاً می خواهید این دارایی را از بین ببرید؟"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:134
+#: public/js/controllers/transaction.js:978
+msgid "Do you want to clear the selected {0}?"
+msgstr ""
+
+#: stock/doctype/delivery_trip/delivery_trip.js:155
 msgid "Do you want to notify all the customers by email?"
 msgstr "آیا می خواهید از طریق ایمیل به همه مشتریان اطلاع دهید؟"
 
-#: manufacturing/doctype/production_plan/production_plan.js:196
+#: manufacturing/doctype/production_plan/production_plan.js:221
 msgid "Do you want to submit the material request"
 msgstr "آیا می خواهید درخواست مواد را ارسال کنید؟"
 
+#. Label of a Data field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocField"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "DocType"
+msgstr "DocType"
+
+#. Label of a Link field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocType"
+msgstr "DocType"
+
 #. Label of a Link field in DocType 'Transaction Deletion Record Item'
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgctxt "Transaction Deletion Record Item"
 msgid "DocType"
 msgstr "DocType"
 
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:45
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:69
 msgid "DocTypes should not be added manually to the 'Excluded DocTypes' table. You are only allowed to remove entries from it."
 msgstr "DocTypes نباید به صورت دستی به جدول 'Excluded DocTypes' اضافه شود. شما فقط مجاز به حذف ورودی ها از آن هستید."
 
@@ -24267,9 +24620,9 @@
 msgstr "Doctype"
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:141
-#: manufacturing/report/production_planning_report/production_planning_report.js:43
+#: manufacturing/report/production_planning_report/production_planning_report.js:42
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:102
-#: public/js/bank_reconciliation_tool/dialog_manager.js:104
+#: public/js/bank_reconciliation_tool/dialog_manager.js:111
 msgid "Document Name"
 msgstr "نام سند"
 
@@ -24287,15 +24640,15 @@
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:134
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:100
-#: public/js/bank_reconciliation_tool/dialog_manager.js:99
-#: public/js/bank_reconciliation_tool/dialog_manager.js:182
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:16
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:15
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:23
+#: public/js/bank_reconciliation_tool/dialog_manager.js:106
+#: public/js/bank_reconciliation_tool/dialog_manager.js:186
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:14
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:22
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:14
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:14
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:22
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:14
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:23
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:22
 msgid "Document Type"
 msgstr "نوع سند"
 
@@ -24341,11 +24694,11 @@
 msgid "Document Type "
 msgstr " نوع سند"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:56
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:60
 msgid "Document Type already used as a dimension"
 msgstr "نوع سند قبلاً به عنوان بعد استفاده شده است"
 
-#: accounts/doctype/bank_transaction/bank_transaction.js:64
+#: accounts/doctype/bank_transaction/bank_transaction.js:59
 msgid "Document {0} successfully uncleared"
 msgstr "سند {0} با موفقیت پاک نشد"
 
@@ -24355,7 +24708,7 @@
 msgid "Documents"
 msgstr "اسناد"
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:200
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:202
 msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
 msgstr "اسناد: {0} درآمد/هزینه معوق را برای آنها فعال کرده است. امکان ارسال مجدد وجود ندارد."
 
@@ -24392,7 +24745,13 @@
 #: 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
-#: public/js/utils/crm_activities.js:211
+#: public/js/utils/crm_activities.js:212
+msgid "Done"
+msgstr "انجام شده"
+
+#. Label of a Check field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
 msgid "Done"
 msgstr "انجام شده"
 
@@ -24428,8 +24787,8 @@
 msgid "Double Declining Balance"
 msgstr "موجودی دو برابر کاهشی"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:84
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:93
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:27
 msgid "Download"
 msgstr "دانلود"
 
@@ -24438,7 +24797,7 @@
 msgid "Download Backups"
 msgstr "دانلود نسخه پشتیبان"
 
-#: public/js/utils/serial_no_batch_selector.js:237
+#: public/js/utils/serial_no_batch_selector.js:241
 msgid "Download CSV Template"
 msgstr "دانلود قالب CSV"
 
@@ -24454,11 +24813,11 @@
 msgid "Download Materials Request Plan Section"
 msgstr "دانلود بخش طرح درخواست مواد"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:60
+#: buying/doctype/request_for_quotation/request_for_quotation.js:70
 msgid "Download PDF"
 msgstr "PDF را دانلود کنید"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:31
 msgid "Download Template"
 msgstr "دانلود قالب"
 
@@ -24514,18 +24873,17 @@
 msgid "Downtime Reason"
 msgstr "دلیل خرابی"
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Dr"
 msgstr "دکتر"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:6
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:5
 #: accounts/doctype/payment_request/payment_request_list.js:5
-#: assets/doctype/asset/asset_list.js:35
+#: assets/doctype/asset/asset_list.js:25
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:5
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:7
-#: stock/doctype/stock_entry/stock_entry_list.js:10
+#: stock/doctype/stock_entry/stock_entry_list.js:18
 msgid "Draft"
 msgstr "پیش نویس"
 
@@ -24722,13 +25080,6 @@
 msgid "Draft"
 msgstr "پیش نویس"
 
-#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
-#. Record'
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-msgctxt "Transaction Deletion Record"
-msgid "Draft"
-msgstr "پیش نویس"
-
 #. Option for the 'Status' (Select) field in DocType 'Work Order'
 #: manufacturing/doctype/work_order/work_order.json
 msgctxt "Work Order"
@@ -24827,7 +25178,7 @@
 msgid "Due / Reference Date cannot be after {0}"
 msgstr "سررسید / تاریخ مرجع نمی تواند بعد از {0} باشد"
 
-#: accounts/doctype/payment_entry/payment_entry.js:649
+#: accounts/doctype/payment_entry/payment_entry.js:795
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:40
 msgid "Due Date"
 msgstr "سررسید"
@@ -24909,14 +25260,14 @@
 msgid "Due Date cannot be before Posting / Supplier Invoice Date"
 msgstr "تاریخ سررسید نمی تواند قبل از ارسال / تاریخ فاکتور تامین کننده باشد"
 
-#: controllers/accounts_controller.py:576
+#: controllers/accounts_controller.py:628
 msgid "Due Date is mandatory"
 msgstr "تاریخ سررسید اجباری است"
 
 #. Name of a DocType
 #. Label of a Card Break in the Receivables Workspace
 #: accounts/doctype/dunning/dunning.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:164
 #: accounts/workspace/receivables/receivables.json
 msgid "Dunning"
 msgstr "دانینگ"
@@ -24993,7 +25344,7 @@
 msgid "Dunning Type"
 msgstr "نوع دانینگ"
 
-#: stock/doctype/item/item.js:135 stock/doctype/putaway_rule/putaway_rule.py:55
+#: stock/doctype/item/item.js:178 stock/doctype/putaway_rule/putaway_rule.py:55
 msgid "Duplicate"
 msgstr "تکراری"
 
@@ -25009,7 +25360,7 @@
 msgid "Duplicate Entry. Please check Authorization Rule {0}"
 msgstr "ورود تکراری. لطفاً قانون مجوز {0} را بررسی کنید"
 
-#: assets/doctype/asset/asset.py:301
+#: assets/doctype/asset/asset.py:303
 msgid "Duplicate Finance Book"
 msgstr "کتاب مالی تکراری"
 
@@ -25022,7 +25373,7 @@
 msgid "Duplicate POS Invoices found"
 msgstr "فاکتورهای POS تکراری پیدا شد"
 
-#: projects/doctype/project/project.js:67
+#: projects/doctype/project/project.js:74
 msgid "Duplicate Project with Tasks"
 msgstr "پروژه تکراری با وظایف"
 
@@ -25038,7 +25389,7 @@
 msgid "Duplicate item group found in the item group table"
 msgstr "گروه مورد تکراری در جدول گروه آیتم یافت شد"
 
-#: projects/doctype/project/project.js:146
+#: projects/doctype/project/project.js:174
 msgid "Duplicate project has been created"
 msgstr "پروژه تکراری ایجاد شده است"
 
@@ -25139,7 +25490,7 @@
 msgid "Earliest"
 msgstr "اولین"
 
-#: stock/report/stock_balance/stock_balance.py:478
+#: stock/report/stock_balance/stock_balance.py:486
 msgid "Earliest Age"
 msgstr "اولین سن"
 
@@ -25153,6 +25504,14 @@
 msgid "Edit"
 msgstr "ویرایش"
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.html:37
+msgid "Edit Capacity"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Edit Cart"
+msgstr ""
+
 #: public/js/utils/serial_no_batch_selector.js:30
 msgid "Edit Full Form"
 msgstr "ویرایش فرم کامل"
@@ -25161,11 +25520,11 @@
 msgid "Edit Not Allowed"
 msgstr "ویرایش مجاز نیست"
 
-#: public/js/utils/crm_activities.js:182
+#: public/js/utils/crm_activities.js:184
 msgid "Edit Note"
 msgstr "ویرایش یادداشت"
 
-#: stock/doctype/delivery_note/delivery_note.js:370
+#: stock/doctype/delivery_note/delivery_note.js:418
 msgid "Edit Posting Date and Time"
 msgstr "ویرایش تاریخ و زمان ارسال"
 
@@ -25223,15 +25582,15 @@
 msgid "Edit Posting Date and Time"
 msgstr "ویرایش تاریخ و زمان ارسال"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:366
+#: public/js/bom_configurator/bom_configurator.bundle.js:405
 msgid "Edit Qty"
 msgstr "ویرایش تعداد"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:238
+#: selling/page/point_of_sale/pos_past_order_summary.js:247
 msgid "Edit Receipt"
 msgstr "ویرایش رسید"
 
-#: selling/page/point_of_sale/pos_item_cart.js:717
+#: selling/page/point_of_sale/pos_item_cart.js:745
 msgid "Editing {0} is not allowed as per POS Profile settings"
 msgstr "ویرایش {0} طبق تنظیمات نمایه POS مجاز نیست"
 
@@ -25247,7 +25606,7 @@
 msgid "Educational Qualification"
 msgstr "صلاحیت تحصیلی"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
 msgid "Either 'Selling' or 'Buying' must be selected"
 msgstr "«فروش» یا «خرید» باید انتخاب شود"
 
@@ -25301,9 +25660,9 @@
 msgid "Electronic Invoice Register"
 msgstr "ثبت الکترونیکی صورتحساب"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:231
+#: 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:874
+#: selling/page/point_of_sale/pos_item_cart.js:904
 msgid "Email"
 msgstr "پست الکترونیک"
 
@@ -25457,7 +25816,7 @@
 msgid "Email Group"
 msgstr "گروه ایمیل"
 
-#: public/js/utils/contact_address_quick_entry.js:39
+#: public/js/utils/contact_address_quick_entry.js:42
 msgid "Email Id"
 msgstr "آدرس ایمیل"
 
@@ -25485,7 +25844,7 @@
 msgid "Email Sent"
 msgstr "ایمیل ارسال شد"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:289
+#: buying/doctype/request_for_quotation/request_for_quotation.py:313
 msgid "Email Sent to Supplier {0}"
 msgstr "ایمیل به تامین کننده ارسال شد {0}"
 
@@ -25513,15 +25872,15 @@
 msgid "Email Template"
 msgstr "قالب ایمیل"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:269
+#: selling/page/point_of_sale/pos_past_order_summary.js:278
 msgid "Email not sent to {0} (unsubscribed / disabled)"
 msgstr "ایمیل به {0} ارسال نشد (لغو اشتراک / غیرفعال)"
 
-#: stock/doctype/shipment/shipment.js:153
+#: stock/doctype/shipment/shipment.js:174
 msgid "Email or Phone/Mobile of the Contact are mandatory to continue."
 msgstr "برای ادامه ایمیل یا تلفن/موبایل مخاطب الزامی است."
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:273
+#: selling/page/point_of_sale/pos_past_order_summary.js:283
 msgid "Email sent successfully."
 msgstr "ایمیل با موفقیت ارسال شد."
 
@@ -25571,7 +25930,7 @@
 #: projects/doctype/timesheet/timesheet_calendar.js:28
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:27
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:10
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:50
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:45
 #: quality_management/doctype/non_conformance/non_conformance.json
 #: setup/doctype/company/company.json setup/doctype/employee/employee.json
 #: setup/doctype/sales_person/sales_person_tree.js:7
@@ -25774,7 +26133,7 @@
 msgid "Empty"
 msgstr "خالی"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1042
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1044
 msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
 msgstr "برای رزرو موجودی جزئی، Allow Partial Reservation را در تنظیمات موجودی فعال کنید."
 
@@ -25812,6 +26171,12 @@
 msgid "Enable Common Party Accounting"
 msgstr "حسابداری طرف مشترک را فعال کنید"
 
+#. Label of a Check field in DocType 'Selling Settings'
+#: selling/doctype/selling_settings/selling_settings.json
+msgctxt "Selling Settings"
+msgid "Enable Cut-Off Date on Bulk Delivery Note Creation"
+msgstr ""
+
 #. Label of a Check field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
@@ -25884,6 +26249,13 @@
 msgid "Enable YouTube Tracking"
 msgstr "ردیابی یوتیوب را فعال کنید"
 
+#. Description of the 'Consider Rejected Warehouses' (Check) field in DocType
+#. 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Enable it if users want to consider rejected materials to dispatch."
+msgstr ""
+
 #: support/doctype/service_level_agreement/service_level_agreement.js:34
 msgid "Enable to apply SLA on every {0}"
 msgstr "فعال کردن اعمال SLA در هر {0}"
@@ -25963,14 +26335,14 @@
 msgid "Encashment Date"
 msgstr "تاریخ وصول"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:41
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:41
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:49
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:49
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:23
-#: accounts/report/payment_ledger/payment_ledger.js:24
-#: assets/report/fixed_asset_register/fixed_asset_register.js:75
+#: accounts/report/payment_ledger/payment_ledger.js:23
+#: assets/report/fixed_asset_register/fixed_asset_register.js:74
 #: projects/report/project_summary/project_summary.py:74
-#: public/js/financial_statements.js:191 public/js/setup_wizard.js:42
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:24
+#: public/js/financial_statements.js:200 public/js/setup_wizard.js:44
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:23
 #: templates/pages/projects.html:47
 msgid "End Date"
 msgstr "تاریخ پایان"
@@ -26039,6 +26411,10 @@
 msgid "End Date cannot be before Start Date."
 msgstr "تاریخ پایان نمی تواند قبل از تاریخ شروع باشد."
 
+#: manufacturing/doctype/workstation/workstation.js:206
+msgid "End Time"
+msgstr "زمان پایان"
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -26063,15 +26439,15 @@
 msgid "End Time"
 msgstr "زمان پایان"
 
-#: stock/doctype/stock_entry/stock_entry.js:241
+#: stock/doctype/stock_entry/stock_entry.js:268
 msgid "End Transit"
 msgstr "پایان حمل و نقل"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
 #: accounts/report/financial_ratios/financial_ratios.js:25
-#: assets/report/fixed_asset_register/fixed_asset_register.js:90
-#: public/js/financial_statements.js:206
+#: assets/report/fixed_asset_register/fixed_asset_register.js:89
+#: public/js/financial_statements.js:215
 msgid "End Year"
 msgstr "پایان سال"
 
@@ -26079,7 +26455,7 @@
 msgid "End Year cannot be before Start Year"
 msgstr "پایان سال نمی تواند قبل از سال شروع باشد"
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:43
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:48
 #: accounts/doctype/process_deferred_accounting/process_deferred_accounting.py:37
 msgid "End date cannot be before start date"
 msgstr "تاریخ پایان نمی تواند قبل از تاریخ شروع باشد"
@@ -26103,6 +26479,8 @@
 msgid "End of the current subscription period"
 msgstr "پایان دوره اشتراک فعلی"
 
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:13
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:23
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:31
 msgid "Enough Parts to Build"
 msgstr "قطعات کافی برای ساخت"
@@ -26117,27 +26495,29 @@
 msgid "Enter API key in Google Settings."
 msgstr "کلید API را در تنظیمات Google وارد کنید."
 
-#: setup/doctype/employee/employee.js:102
+#: setup/doctype/employee/employee.js:103
 msgid "Enter First and Last name of Employee, based on Which Full Name will be updated. IN transactions, it will be Full Name which will be fetched."
 msgstr "نام و نام خانوادگی کارمند را که بر اساس نام کامل به روز می شود وارد کنید. در معاملات، نام کامل خواهد بود که واکشی می شود."
 
-#: public/js/utils/serial_no_batch_selector.js:208
+#: public/js/utils/serial_no_batch_selector.js:211
 msgid "Enter Serial Nos"
 msgstr "شماره های سریال را وارد کنید"
 
-#: stock/doctype/material_request/material_request.js:313
+#: stock/doctype/material_request/material_request.js:383
 msgid "Enter Supplier"
 msgstr "تامین کننده را وارد کنید"
 
-#: manufacturing/doctype/job_card/job_card.js:280
+#: manufacturing/doctype/job_card/job_card.js:320
+#: manufacturing/doctype/workstation/workstation.js:189
+#: manufacturing/doctype/workstation/workstation.js:236
 msgid "Enter Value"
 msgstr "مقدار را وارد کنید"
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:91
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:96
 msgid "Enter Visit Details"
 msgstr "جزئیات بازدید را وارد کنید"
 
-#: manufacturing/doctype/routing/routing.js:77
+#: manufacturing/doctype/routing/routing.js:78
 msgid "Enter a name for Routing."
 msgstr "یک نام برای مسیریابی وارد کنید."
 
@@ -26149,31 +26529,31 @@
 msgid "Enter a name for this Holiday List."
 msgstr "یک نام برای این لیست تعطیلات وارد کنید."
 
-#: selling/page/point_of_sale/pos_payment.js:499
+#: selling/page/point_of_sale/pos_payment.js:527
 msgid "Enter amount to be redeemed."
 msgstr "مبلغی را برای بازخرید وارد کنید."
 
-#: stock/doctype/item/item.js:804
+#: stock/doctype/item/item.js:882
 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field."
 msgstr "یک کد مورد را وارد کنید، نام با کلیک کردن در داخل قسمت نام مورد، به طور خودکار مانند کد مورد پر می شود."
 
-#: selling/page/point_of_sale/pos_item_cart.js:877
+#: selling/page/point_of_sale/pos_item_cart.js:907
 msgid "Enter customer's email"
 msgstr "ایمیل مشتری را وارد کنید"
 
-#: selling/page/point_of_sale/pos_item_cart.js:882
+#: selling/page/point_of_sale/pos_item_cart.js:913
 msgid "Enter customer's phone number"
 msgstr "شماره تلفن مشتری را وارد کنید"
 
-#: assets/doctype/asset/asset.py:345
+#: assets/doctype/asset/asset.py:347
 msgid "Enter depreciation details"
 msgstr "جزئیات استهلاک را وارد کنید"
 
-#: selling/page/point_of_sale/pos_item_cart.js:382
+#: selling/page/point_of_sale/pos_item_cart.js:389
 msgid "Enter discount percentage."
 msgstr "درصد تخفیف را وارد کنید"
 
-#: public/js/utils/serial_no_batch_selector.js:211
+#: public/js/utils/serial_no_batch_selector.js:214
 msgid "Enter each serial no in a new line"
 msgstr "هر شماره سریال را در یک خط جدید وارد کنید"
 
@@ -26187,7 +26567,7 @@
 msgid "Enter the Bank Guarantee Number before submitting."
 msgstr "قبل از ارسال، شماره ضمانت نامه بانکی را وارد کنید."
 
-#: manufacturing/doctype/routing/routing.js:82
+#: manufacturing/doctype/routing/routing.js:83
 msgid "Enter the Operation, the table will fetch the Operation details like Hourly Rate, Workstation automatically.\n\n"
 " After that, set the Operation Time in minutes and the table will calculate the Operation Costs based on the Hourly Rate and Operation Time."
 msgstr ""
@@ -26200,19 +26580,19 @@
 msgid "Enter the name of the bank or lending institution before submitting."
 msgstr ""
 
-#: stock/doctype/item/item.js:824
+#: stock/doctype/item/item.js:908
 msgid "Enter the opening stock units."
 msgstr "واحدهای موجودی افتتاحی را وارد کنید."
 
-#: manufacturing/doctype/bom/bom.js:730
+#: manufacturing/doctype/bom/bom.js:761
 msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
 msgstr "مقدار کالایی را که از این لایحه مواد ساخته می شود وارد کنید."
 
-#: manufacturing/doctype/work_order/work_order.js:817
+#: manufacturing/doctype/work_order/work_order.js:878
 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
 msgstr "مقدار تولید را وارد کنید اقلام مواد خام فقط زمانی واکشی می شوند که این تنظیم شود."
 
-#: selling/page/point_of_sale/pos_payment.js:392
+#: selling/page/point_of_sale/pos_payment.js:411
 msgid "Enter {0} amount."
 msgstr "مقدار {0} را وارد کنید."
 
@@ -26227,7 +26607,7 @@
 msgid "Entity"
 msgstr "وجود، موجودیت"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:203
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:123
 msgid "Entity Type"
 msgstr "نوع موجودیت"
@@ -26252,8 +26632,8 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:102
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:150
-#: accounts/report/account_balance/account_balance.js:30
-#: accounts/report/account_balance/account_balance.js:46
+#: accounts/report/account_balance/account_balance.js:29
+#: accounts/report/account_balance/account_balance.js:45
 #: accounts/report/balance_sheet/balance_sheet.py:242
 #: setup/setup_wizard/operations/install_fixtures.py:259
 msgid "Equity"
@@ -26278,8 +26658,8 @@
 msgid "Equity/Liability Account"
 msgstr "حساب حقوق صاحبان موجودی / بدهی"
 
-#: accounts/doctype/payment_request/payment_request.py:410
-#: manufacturing/doctype/job_card/job_card.py:773
+#: 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
 msgid "Error"
 msgstr "خطا"
@@ -26344,6 +26724,16 @@
 msgid "Error Log"
 msgstr "گزارش خطا"
 
+#. Label of a Long Text field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Error Log"
+msgstr "گزارش خطا"
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+msgid "Error Message"
+msgstr "پیغام خطا"
+
 #. Label of a Text field in DocType 'Period Closing Voucher'
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgctxt "Period Closing Voucher"
@@ -26366,7 +26756,7 @@
 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:406
+#: assets/doctype/asset/depreciation.py:404
 msgid "Error while posting depreciation entries"
 msgstr "خطا هنگام ارسال ورودی های استهلاک"
 
@@ -26374,11 +26764,15 @@
 msgid "Error while processing deferred accounting for {0}"
 msgstr "خطا هنگام پردازش حسابداری معوق برای {0}"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:389
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:404
 msgid "Error while reposting item valuation"
 msgstr "خطا هنگام ارسال مجدد ارزیابی مورد"
 
-#: accounts/doctype/payment_entry/payment_entry.js:720
+#: templates/includes/footer/footer_extension.html:29
+msgid "Error: Not a valid id?"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.js:883
 msgid "Error: {0} is mandatory field"
 msgstr "خطا: {0} فیلد اجباری است"
 
@@ -26446,7 +26840,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 "مثال: ABCD.#####. اگر سری تنظیم شده باشد و Batch No در تراکنش ها ذکر نشده باشد، شماره دسته خودکار بر اساس این سری ایجاد می شود. اگر همیشه می‌خواهید به صراحت شماره دسته را برای این مورد ذکر کنید، این قسمت را خالی بگذارید. توجه: این تنظیم بر پیشوند سری نامگذاری در تنظیمات موجودی اولویت دارد."
 
-#: stock/stock_ledger.py:1976
+#: stock/stock_ledger.py:1983
 msgid "Example: Serial No {0} reserved in {1}."
 msgstr "مثال: شماره سریال {0} در {1} رزرو شده است."
 
@@ -26456,11 +26850,11 @@
 msgid "Exception Budget Approver Role"
 msgstr "نقش تصویب کننده بودجه استثنایی"
 
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:56
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:55
 msgid "Excess Materials Consumed"
 msgstr "مواد اضافی مصرف شده"
 
-#: manufacturing/doctype/job_card/job_card.py:869
+#: manufacturing/doctype/job_card/job_card.py:876
 msgid "Excess Transfer"
 msgstr "انتقال مازاد"
 
@@ -26484,7 +26878,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:517
+#: setup/doctype/company/company.py:516
 msgid "Exchange Gain/Loss"
 msgstr "سود/زیان مبادله"
 
@@ -26506,8 +26900,8 @@
 msgid "Exchange Gain/Loss"
 msgstr "سود/زیان مبادله"
 
-#: controllers/accounts_controller.py:1313
-#: controllers/accounts_controller.py:1394
+#: controllers/accounts_controller.py:1382
+#: controllers/accounts_controller.py:1463
 msgid "Exchange Gain/Loss amount has been booked through {0}"
 msgstr "مبلغ سود/زیان مبادله از طریق {0} رزرو شده است"
 
@@ -26691,7 +27085,7 @@
 msgid "Excise Entry"
 msgstr "ورودی مالیات غیر مستقیم"
 
-#: stock/doctype/stock_entry/stock_entry.js:1060
+#: stock/doctype/stock_entry/stock_entry.js:1213
 msgid "Excise Invoice"
 msgstr "فاکتور مالیات غیر مستقیم"
 
@@ -26740,9 +27134,9 @@
 msgid "Exit Interview Held On"
 msgstr "خروج از مصاحبه برگزار شد"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:138
-#: public/js/bom_configurator/bom_configurator.bundle.js:179
-#: public/js/setup_wizard.js:168
+#: public/js/bom_configurator/bom_configurator.bundle.js:140
+#: public/js/bom_configurator/bom_configurator.bundle.js:183
+#: public/js/setup_wizard.js:181
 msgid "Expand All"
 msgstr "گسترش همه"
 
@@ -26800,11 +27194,13 @@
 msgid "Expected Delivery Date"
 msgstr "تاریخ تحویل قابل انتظار"
 
-#: selling/doctype/sales_order/sales_order.py:316
+#: selling/doctype/sales_order/sales_order.py:319
 msgid "Expected Delivery Date should be after Sales Order Date"
 msgstr "تاریخ تحویل مورد انتظار باید پس از تاریخ سفارش فروش باشد"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:44
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:104
+#: templates/pages/task_info.html:64
 msgid "Expected End Date"
 msgstr "تاریخ پایان مورد انتظار"
 
@@ -26830,7 +27226,7 @@
 msgid "Expected End Date should be less than or equal to parent task's Expected End Date {0}."
 msgstr "تاریخ پایان مورد انتظار باید کمتر یا مساوی با تاریخ پایان مورد انتظار کار والدین {0} باشد."
 
-#: public/js/projects/timer.js:12
+#: public/js/projects/timer.js:16
 msgid "Expected Hrs"
 msgstr "ساعت پیش بینی شده"
 
@@ -26840,7 +27236,9 @@
 msgid "Expected Hrs"
 msgstr "ساعت پیش بینی شده"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:40
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:98
+#: templates/pages/task_info.html:59
 msgid "Expected Start Date"
 msgstr "تاریخ شروع مورد انتظار"
 
@@ -26890,8 +27288,8 @@
 msgid "Expected Value After Useful Life"
 msgstr "ارزش مورد انتظار پس از عمر مفید"
 
-#: accounts/report/account_balance/account_balance.js:29
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:81
+#: 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/profitability_analysis/profitability_analysis.py:189
 msgid "Expense"
@@ -26922,11 +27320,11 @@
 msgid "Expense"
 msgstr "هزینه"
 
-#: controllers/stock_controller.py:359
+#: controllers/stock_controller.py:541
 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
 msgstr "حساب هزینه / تفاوت ({0}) باید یک حساب \"سود یا زیان\" باشد"
 
-#: accounts/report/account_balance/account_balance.js:47
+#: accounts/report/account_balance/account_balance.js:46
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:248
 msgid "Expense Account"
 msgstr "حساب هزینه"
@@ -27009,7 +27407,7 @@
 msgid "Expense Account"
 msgstr "حساب هزینه"
 
-#: controllers/stock_controller.py:339
+#: controllers/stock_controller.py:521
 msgid "Expense Account Missing"
 msgstr "حساب هزینه گم شده است"
 
@@ -27026,13 +27424,13 @@
 msgid "Expense Head"
 msgstr "رئیس هزینه"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:510
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:528
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:514
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:532
 msgid "Expense Head Changed"
 msgstr "سر هزینه تغییر کرد"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:552
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:556
 msgid "Expense account is mandatory for item {0}"
 msgstr "حساب هزینه برای مورد {0} اجباری است"
 
@@ -27043,7 +27441,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:46
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:65
-#: accounts/report/account_balance/account_balance.js:48
+#: accounts/report/account_balance/account_balance.js:49
 msgid "Expenses Included In Asset Valuation"
 msgstr "مخارج موجود در ارزیابی دارایی"
 
@@ -27055,7 +27453,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:49
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:69
-#: accounts/report/account_balance/account_balance.js:49
+#: accounts/report/account_balance/account_balance.js:51
 msgid "Expenses Included In Valuation"
 msgstr "هزینه های گنجانده شده در ارزش گذاری"
 
@@ -27066,8 +27464,8 @@
 msgstr "هزینه های گنجانده شده در ارزش گذاری"
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:9
-#: selling/doctype/quotation/quotation_list.js:35
-#: stock/doctype/batch/batch_list.js:9 stock/doctype/item/item_list.js:10
+#: selling/doctype/quotation/quotation_list.js:34
+#: stock/doctype/batch/batch_list.js:13 stock/doctype/item/item_list.js:18
 msgid "Expired"
 msgstr "منقضی شده"
 
@@ -27089,7 +27487,7 @@
 msgid "Expired"
 msgstr "منقضی شده"
 
-#: stock/doctype/stock_entry/stock_entry.js:316
+#: stock/doctype/stock_entry/stock_entry.js:362
 msgid "Expired Batches"
 msgstr "دسته های منقضی شده"
 
@@ -27159,11 +27557,11 @@
 msgid "Export Data"
 msgstr "صادرات داده ها"
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:35
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:34
 msgid "Export E-Invoices"
 msgstr "صدور فاکتورهای الکترونیکی"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:106
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:93
 msgid "Export Errored Rows"
 msgstr "صادر کردن ردیف های خطا"
 
@@ -27255,7 +27653,7 @@
 msgid "FIFO Stock Queue (qty, rate)"
 msgstr "صف موجودی FIFO (تعداد، نرخ)"
 
-#. Label of a Text field in DocType 'Stock Ledger Entry'
+#. Label of a Long Text field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "FIFO Stock Queue (qty, rate)"
@@ -27267,7 +27665,8 @@
 msgid "FIFO/LIFO Queue"
 msgstr "صف FIFO/LIFO"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:62
+#: 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
 msgid "Failed"
 msgstr "ناموفق"
@@ -27380,7 +27779,14 @@
 msgid "Failed"
 msgstr "ناموفق"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:9
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Failed"
+msgstr "ناموفق"
+
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:17
 msgid "Failed Entries"
 msgstr "ورودی های ناموفق"
 
@@ -27415,11 +27821,11 @@
 msgid "Failed to setup defaults"
 msgstr "تنظیم پیش فرض ها انجام نشد"
 
-#: setup/doctype/company/company.py:699
+#: setup/doctype/company/company.py:698
 msgid "Failed to setup defaults for country {0}. Please contact support."
 msgstr "تنظیم پیش فرض های کشور {0} انجام نشد. لطفا با پشتیبانی تماس بگیرید."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Failure"
 msgstr "شکست"
 
@@ -27435,6 +27841,10 @@
 msgid "Failure Description"
 msgstr "شرح شکست"
 
+#: accounts/doctype/payment_request/payment_request.js:29
+msgid "Failure: {0}"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -27496,7 +27906,7 @@
 msgid "Fees"
 msgstr "هزینه ها"
 
-#: public/js/utils/serial_no_batch_selector.js:332
+#: public/js/utils/serial_no_batch_selector.js:338
 msgid "Fetch Based On"
 msgstr "واکشی بر اساس"
 
@@ -27506,7 +27916,7 @@
 msgid "Fetch Customers"
 msgstr "واکشی مشتریان"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:50
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:56
 msgid "Fetch Data"
 msgstr "واکشی داده ها"
 
@@ -27514,7 +27924,7 @@
 msgid "Fetch Items from Warehouse"
 msgstr "واکشی اقلام از انبار"
 
-#: accounts/doctype/dunning/dunning.js:60
+#: accounts/doctype/dunning/dunning.js:61
 msgid "Fetch Overdue Payments"
 msgstr "واکشی پرداخت های معوق"
 
@@ -27522,8 +27932,8 @@
 msgid "Fetch Subscription Updates"
 msgstr "واکشی به‌روزرسانی‌های اشتراک"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:952
-#: accounts/doctype/sales_invoice/sales_invoice.js:954
+#: accounts/doctype/sales_invoice/sales_invoice.js:1028
+#: accounts/doctype/sales_invoice/sales_invoice.js:1030
 msgid "Fetch Timesheet"
 msgstr "واکشی جدول زمانی"
 
@@ -27533,8 +27943,8 @@
 msgid "Fetch Value From"
 msgstr "واکشی ارزش از"
 
-#: stock/doctype/material_request/material_request.js:252
-#: stock/doctype/stock_entry/stock_entry.js:554
+#: stock/doctype/material_request/material_request.js:318
+#: stock/doctype/stock_entry/stock_entry.js:640
 msgid "Fetch exploded BOM (including sub-assemblies)"
 msgstr "واکشی BOM منفجر شده (شامل مجموعه های فرعی)"
 
@@ -27545,11 +27955,20 @@
 msgid "Fetch items based on Default Supplier."
 msgstr "واکشی موارد بر اساس تامین کننده پیش فرض."
 
-#: accounts/doctype/dunning/dunning.js:131
-#: public/js/controllers/transaction.js:1083
+#: accounts/doctype/dunning/dunning.js:135
+#: public/js/controllers/transaction.js:1138
 msgid "Fetching exchange rates ..."
 msgstr "واکشی نرخ ارز ..."
 
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:72
+msgid "Fetching..."
+msgstr ""
+
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:106
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Field"
+msgstr "رشته"
+
 #. Label of a Select field in DocType 'POS Search Fields'
 #: accounts/doctype/pos_search_fields/pos_search_fields.json
 msgctxt "POS Search Fields"
@@ -27623,8 +28042,8 @@
 msgid "File to Rename"
 msgstr "فایل برای تغییر نام"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:17
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:17
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:16
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:16
 #: public/js/financial_statements.js:167
 msgid "Filter Based On"
 msgstr "فیلتر بر اساس"
@@ -27635,7 +28054,7 @@
 msgid "Filter Duration (Months)"
 msgstr "مدت زمان فیلتر (ماه)"
 
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:46
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:45
 msgid "Filter Total Zero Qty"
 msgstr "فیلتر مجموع صفر تعداد"
 
@@ -27661,8 +28080,8 @@
 msgid "Filter on Payment"
 msgstr "فیلتر در پرداخت"
 
-#: accounts/doctype/payment_entry/payment_entry.js:696
-#: public/js/bank_reconciliation_tool/dialog_manager.js:192
+#: accounts/doctype/payment_entry/payment_entry.js:858
+#: public/js/bank_reconciliation_tool/dialog_manager.js:196
 msgid "Filters"
 msgstr "فیلترها"
 
@@ -27721,13 +28140,13 @@
 #: accounts/report/accounts_receivable/accounts_receivable.js:24
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:56
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:48
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:32
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:52
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:104
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:31
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:51
 #: accounts/report/general_ledger/general_ledger.js:16
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:32
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:31
 #: accounts/report/trial_balance/trial_balance.js:70
-#: assets/report/fixed_asset_register/fixed_asset_register.js:49
+#: assets/report/fixed_asset_register/fixed_asset_register.js:48
 #: public/js/financial_statements.js:161
 msgid "Finance Book"
 msgstr "کتاب مالی"
@@ -27853,14 +28272,14 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Financial Reports Workspace
-#: accounts/doctype/account/account_tree.js:158
+#: accounts/doctype/account/account_tree.js:234
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/workspace/financial_reports/financial_reports.json
 #: public/js/financial_statements.js:129
 msgid "Financial Statements"
 msgstr "صورت های مالی"
 
-#: public/js/setup_wizard.js:40
+#: public/js/setup_wizard.js:42
 msgid "Financial Year Begins On"
 msgstr "سال مالی شروع می شود"
 
@@ -27871,13 +28290,13 @@
 msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) "
 msgstr "گزارش‌های مالی با استفاده از اسناد ورودی GL ایجاد می‌شوند (اگر کوپن پایان دوره برای همه سال‌ها به‌طور متوالی پست نشده باشد یا مفقود شده باشد، باید فعال شود)"
 
-#: manufacturing/doctype/work_order/work_order.js:627
-#: manufacturing/doctype/work_order/work_order.js:642
-#: manufacturing/doctype/work_order/work_order.js:651
+#: manufacturing/doctype/work_order/work_order.js:675
+#: manufacturing/doctype/work_order/work_order.js:690
+#: manufacturing/doctype/work_order/work_order.js:699
 msgid "Finish"
 msgstr "پایان"
 
-#: buying/doctype/purchase_order/purchase_order.js:176
+#: buying/doctype/purchase_order/purchase_order.js:182
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:43
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:119
 msgid "Finished Good"
@@ -27913,7 +28332,7 @@
 msgid "Finished Good BOM"
 msgstr "خوب BOM تمام شد"
 
-#: public/js/utils.js:698
+#: public/js/utils.js:768
 msgid "Finished Good Item"
 msgstr "مورد خوب تمام شد"
 
@@ -27927,7 +28346,7 @@
 msgid "Finished Good Item Code"
 msgstr "کد مورد خوب تمام شده"
 
-#: public/js/utils.js:715
+#: public/js/utils.js:786
 msgid "Finished Good Item Qty"
 msgstr "تعداد آیتم خوب تمام شد"
 
@@ -27937,15 +28356,15 @@
 msgid "Finished Good Item Quantity"
 msgstr "تعداد مورد خوب تمام شده"
 
-#: controllers/accounts_controller.py:3204
+#: controllers/accounts_controller.py:3295
 msgid "Finished Good Item is not specified for service item {0}"
 msgstr "مورد خوب تمام شده برای مورد سرویس مشخص نشده است {0}"
 
-#: controllers/accounts_controller.py:3219
+#: controllers/accounts_controller.py:3310
 msgid "Finished Good Item {0} Qty can not be zero"
 msgstr "مورد خوب تمام شده {0} تعداد نمی تواند صفر باشد"
 
-#: controllers/accounts_controller.py:3213
+#: controllers/accounts_controller.py:3304
 msgid "Finished Good Item {0} must be a sub-contracted item"
 msgstr "مورد خوب تمام شده {0} باید یک مورد قرارداد فرعی باشد"
 
@@ -27989,15 +28408,15 @@
 msgid "Finished Good {0} must be a sub-contracted item."
 msgstr "کالای تمام شده {0} باید یک مورد قرارداد فرعی باشد."
 
-#: setup/doctype/company/company.py:262
+#: setup/doctype/company/company.py:261
 msgid "Finished Goods"
 msgstr "کالاهای تمام شده"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:25
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
 msgid "Finished Goods Warehouse"
 msgstr "انبار کالاهای تمام شده"
 
-#: stock/doctype/stock_entry/stock_entry.py:1264
+#: stock/doctype/stock_entry/stock_entry.py:1273
 msgid "Finished Item {0} does not match with Work Order {1}"
 msgstr "مورد تمام شده {0} با دستور کار {1} مطابقت ندارد"
 
@@ -28084,16 +28503,17 @@
 
 #. Name of a DocType
 #: accounts/doctype/fiscal_year/fiscal_year.json
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:17
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:1
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:16
 #: accounts/report/profitability_analysis/profitability_analysis.js:38
 #: accounts/report/trial_balance/trial_balance.js:16
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:16
-#: manufacturing/report/job_card_summary/job_card_summary.js:17
-#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:48
+#: manufacturing/report/job_card_summary/job_card_summary.js:16
+#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:44
 #: regional/report/irs_1099/irs_1099.js:17
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:16
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:16
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:15
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:15
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:15
 msgid "Fiscal Year"
 msgstr "سال مالی"
 
@@ -28171,7 +28591,7 @@
 msgid "Fixed"
 msgstr "درست شد"
 
-#: accounts/report/account_balance/account_balance.js:50
+#: accounts/report/account_balance/account_balance.js:52
 msgid "Fixed Asset"
 msgstr "دارایی ثابت"
 
@@ -28245,11 +28665,23 @@
 msgid "Fleet Manager"
 msgstr "مدیر ناوگان"
 
-#: selling/page/point_of_sale/pos_item_selector.js:303
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor"
+msgstr ""
+
+#. Label of a Data field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor Name"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_selector.js:300
 msgid "Focus on Item Group filter"
 msgstr "روی فیلتر گروه آیتم تمرکز کنید"
 
-#: selling/page/point_of_sale/pos_item_selector.js:294
+#: selling/page/point_of_sale/pos_item_selector.js:291
 msgid "Focus on search input"
 msgstr "روی ورودی جستجو تمرکز کنید"
 
@@ -28269,15 +28701,15 @@
 msgid "Following Material Requests have been raised automatically based on Item's re-order level"
 msgstr "درخواست‌های مواد زیر به‌طور خودکار براساس سطح سفارش مجدد آیتم مطرح شده‌اند"
 
-#: selling/doctype/customer/customer.py:740
+#: selling/doctype/customer/customer.py:751
 msgid "Following fields are mandatory to create address:"
 msgstr "فیلدهای زیر برای ایجاد آدرس اجباری هستند:"
 
-#: controllers/buying_controller.py:906
+#: controllers/buying_controller.py:932
 msgid "Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr "مورد زیر {0} به عنوان {1} مورد علامت گذاری نشده است. می توانید آنها را به عنوان {1} مورد از آیتم اصلی آن فعال کنید"
 
-#: controllers/buying_controller.py:902
+#: controllers/buying_controller.py:928
 msgid "Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr "موارد زیر {0} به عنوان {1} مورد علامت گذاری نمی شوند. می توانید آنها را به عنوان {1} مورد از آیتم اصلی آن فعال کنید"
 
@@ -28285,7 +28717,7 @@
 msgid "For"
 msgstr "برای"
 
-#: public/js/utils/sales_common.js:274
+#: public/js/utils/sales_common.js:309
 msgid "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table."
 msgstr "برای اقلام \"دسته محصول\"، انبار، شماره سریال و شماره دسته از جدول \"لیست بسته بندی\" در نظر گرفته می شود. اگر انبار و شماره دسته‌ای برای همه اقلام بسته‌بندی برای هر مورد «دسته محصول» یکسان باشد، آن مقادیر را می‌توان در جدول کالای اصلی وارد کرد، مقادیر در جدول «فهرست بسته‌بندی» کپی می‌شوند."
 
@@ -28301,11 +28733,16 @@
 msgid "For Company"
 msgstr "برای شرکت"
 
-#: stock/doctype/material_request/material_request.js:293
+#: stock/doctype/material_request/material_request.js:361
 msgid "For Default Supplier (Optional)"
 msgstr "برای تامین کننده پیش فرض (اختیاری)"
 
-#: controllers/stock_controller.py:770
+#: manufacturing/doctype/plant_floor/plant_floor.js:159
+#: manufacturing/doctype/plant_floor/plant_floor.js:183
+msgid "For Item"
+msgstr ""
+
+#: controllers/stock_controller.py:953
 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
 msgstr ""
 
@@ -28315,7 +28752,7 @@
 msgid "For Job Card"
 msgstr "برای کارت شغلی"
 
-#: manufacturing/doctype/job_card/job_card.js:160
+#: manufacturing/doctype/job_card/job_card.js:175
 msgid "For Operation"
 msgstr "برای عملیات"
 
@@ -28340,23 +28777,28 @@
 msgid "For Production"
 msgstr "برای تولید"
 
-#: stock/doctype/stock_entry/stock_entry.py:657
+#: stock/doctype/stock_entry/stock_entry.py:612
 msgid "For Quantity (Manufactured Qty) is mandatory"
 msgstr "برای مقدار (تعداد تولید شده) اجباری است"
 
+#: controllers/accounts_controller.py:1070
+msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}"
+msgstr ""
+
 #. Label of a Check field in DocType 'Currency Exchange'
 #: setup/doctype/currency_exchange/currency_exchange.json
 msgctxt "Currency Exchange"
 msgid "For Selling"
 msgstr "برای فروش"
 
-#: accounts/doctype/payment_order/payment_order.js:98
+#: accounts/doctype/payment_order/payment_order.js:106
 msgid "For Supplier"
 msgstr "برای تامین کننده"
 
-#: manufacturing/doctype/production_plan/production_plan.js:331
-#: selling/doctype/sales_order/sales_order.js:808
-#: stock/doctype/material_request/material_request.js:247
+#: manufacturing/doctype/production_plan/production_plan.js:358
+#: selling/doctype/sales_order/sales_order.js:933
+#: stock/doctype/material_request/material_request.js:310
+#: templates/form_grid/material_request_grid.html:36
 msgid "For Warehouse"
 msgstr "برای انبار"
 
@@ -28366,11 +28808,11 @@
 msgid "For Warehouse"
 msgstr "برای انبار"
 
-#: manufacturing/doctype/work_order/work_order.py:427
+#: manufacturing/doctype/work_order/work_order.py:438
 msgid "For Warehouse is required before Submit"
 msgstr "برای انبار قبل از ارسال الزامی است"
 
-#: public/js/utils/serial_no_batch_selector.js:116
+#: public/js/utils/serial_no_batch_selector.js:119
 msgid "For Work Order"
 msgstr "برای سفارش کار"
 
@@ -28412,15 +28854,15 @@
 msgid "For item {0}, rate must be a positive number. To Allow negative rates, enable {1} in {2}"
 msgstr "برای مورد {0}، نرخ باید یک عدد مثبت باشد. برای مجاز کردن نرخ‌های منفی، {1} را در {2} فعال کنید"
 
-#: stock/doctype/stock_entry/stock_entry.py:384
+#: stock/doctype/stock_entry/stock_entry.py:339
 msgid "For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry"
 msgstr "برای کارت شغلی {0}، فقط می‌توانید نوع «انتقال مواد برای ساخت» را وارد کنید"
 
-#: manufacturing/doctype/work_order/work_order.py:1523
+#: manufacturing/doctype/work_order/work_order.py:1537
 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1302
+#: stock/doctype/stock_entry/stock_entry.py:1311
 msgid "For quantity {0} should not be greater than allowed quantity {1}"
 msgstr "برای مقدار {0} نباید بیشتر از مقدار مجاز {1} باشد"
 
@@ -28430,12 +28872,12 @@
 msgid "For reference"
 msgstr "برای مرجع"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1229
+#: accounts/doctype/payment_entry/payment_entry.js:1477
 #: public/js/controllers/accounts.js:182
 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
 msgstr "برای ردیف {0} در {1}. برای گنجاندن {2} در نرخ آیتم، ردیف‌های {3} نیز باید گنجانده شوند"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1498
+#: manufacturing/doctype/production_plan/production_plan.py:1520
 msgid "For row {0}: Enter Planned Qty"
 msgstr "برای ردیف {0}: تعداد برنامه ریزی شده را وارد کنید"
 
@@ -28443,6 +28885,11 @@
 msgid "For the 'Apply Rule On Other' condition the field {0} is mandatory"
 msgstr "برای شرط \"اعمال قانون در مورد دیگر\" فیلد {0} اجباری است"
 
+#. Description of a DocType
+#: stock/doctype/item_customer_detail/item_customer_detail.json
+msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes"
+msgstr ""
+
 #. Label of a shortcut in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "Forecasting"
@@ -28625,7 +29072,7 @@
 msgid "Friday"
 msgstr "جمعه"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:957
+#: accounts/doctype/sales_invoice/sales_invoice.js:1033
 #: templates/pages/projects.html:67
 msgid "From"
 msgstr "از جانب"
@@ -28677,13 +29124,13 @@
 msgid "From Customer"
 msgstr "از مشتری"
 
-#: accounts/doctype/payment_entry/payment_entry.js:645
-#: accounts/doctype/payment_entry/payment_entry.js:650
+#: accounts/doctype/payment_entry/payment_entry.js:789
+#: accounts/doctype/payment_entry/payment_entry.js:796
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:16
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:16
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:8
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:16
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:38
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:15
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:37
 #: accounts/report/financial_ratios/financial_ratios.js:41
 #: accounts/report/general_ledger/general_ledger.js:22
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -28691,77 +29138,77 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:8
 #: 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:17
+#: accounts/report/pos_register/pos_register.js:16
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:8
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:16
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:47
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:47
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:15
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:46
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:46
 #: accounts/report/trial_balance/trial_balance.js:37
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:37
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:15
-#: buying/report/procurement_tracker/procurement_tracker.js:28
-#: buying/report/purchase_analytics/purchase_analytics.js:36
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:18
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:18
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:16
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:23
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:23
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:14
+#: buying/report/procurement_tracker/procurement_tracker.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:35
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:17
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:17
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:15
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:22
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:22
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:16
 #: crm/report/campaign_efficiency/campaign_efficiency.js:7
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:9
-#: crm/report/lead_conversion_time/lead_conversion_time.js:9
-#: crm/report/lead_details/lead_details.js:17
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:8
+#: crm/report/lead_conversion_time/lead_conversion_time.js:8
+#: crm/report/lead_details/lead_details.js:16
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:7
-#: crm/report/lost_opportunity/lost_opportunity.js:17
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:23
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:16
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:16
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:17
-#: manufacturing/report/process_loss_report/process_loss_report.js:30
-#: manufacturing/report/production_analytics/production_analytics.js:17
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:8
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:16
+#: crm/report/lost_opportunity/lost_opportunity.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:22
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:15
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:15
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:16
+#: manufacturing/report/process_loss_report/process_loss_report.js:29
+#: manufacturing/report/production_analytics/production_analytics.js:16
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:7
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:15
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:8
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:9
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:8
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:28
-#: public/js/stock_analytics.js:47
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:9
-#: regional/report/uae_vat_201/uae_vat_201.js:17
-#: regional/report/vat_audit_report/vat_audit_report.js:17
-#: selling/page/sales_funnel/sales_funnel.js:39
+#: public/js/stock_analytics.js:74
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:8
+#: regional/report/uae_vat_201/uae_vat_201.js:16
+#: regional/report/vat_audit_report/vat_audit_report.js:16
+#: selling/page/sales_funnel/sales_funnel.js:43
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:24
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:18
-#: selling/report/sales_analytics/sales_analytics.js:36
-#: selling/report/sales_order_analysis/sales_order_analysis.js:18
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:22
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:23
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:17
+#: selling/report/sales_analytics/sales_analytics.js:43
+#: selling/report/sales_order_analysis/sales_order_analysis.js:17
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:21
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:21
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:21
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:21
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:8
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:16
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:17
-#: stock/report/delayed_item_report/delayed_item_report.js:17
-#: stock/report/delayed_order_report/delayed_order_report.js:17
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:21
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:31
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:15
+#: stock/report/delayed_item_report/delayed_item_report.js:16
+#: stock/report/delayed_order_report/delayed_order_report.js:16
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:20
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:30
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:8
 #: stock/report/reserved_stock/reserved_stock.js:16
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:16
-#: stock/report/stock_analytics/stock_analytics.js:63
+#: stock/report/stock_analytics/stock_analytics.js:62
 #: stock/report/stock_balance/stock_balance.js:16
 #: stock/report/stock_ledger/stock_ledger.js:16
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:15
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:9
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:9
-#: support/report/issue_analytics/issue_analytics.js:25
-#: support/report/issue_summary/issue_summary.js:25
-#: support/report/support_hour_distribution/support_hour_distribution.js:8
-#: utilities/report/youtube_interactions/youtube_interactions.js:9
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:8
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:8
+#: support/report/issue_analytics/issue_analytics.js:24
+#: support/report/issue_summary/issue_summary.js:24
+#: support/report/support_hour_distribution/support_hour_distribution.js:7
+#: utilities/report/youtube_interactions/youtube_interactions.js:8
 msgid "From Date"
 msgstr "از تاریخ"
 
@@ -28867,7 +29314,7 @@
 msgid "From Date"
 msgstr "از تاریخ"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:41
+#: accounts/doctype/bank_clearance/bank_clearance.py:43
 msgid "From Date and To Date are Mandatory"
 msgstr "از تاریخ و تا به امروز اجباری است"
 
@@ -28913,7 +29360,7 @@
 msgid "From Delivery Date"
 msgstr "از تاریخ تحویل"
 
-#: selling/doctype/installation_note/installation_note.js:58
+#: selling/doctype/installation_note/installation_note.js:59
 msgid "From Delivery Note"
 msgstr "از یادداشت تحویل"
 
@@ -28923,7 +29370,7 @@
 msgid "From Doctype"
 msgstr "از Doctype"
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:80
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:78
 msgid "From Due Date"
 msgstr "از تاریخ سررسید"
 
@@ -28933,7 +29380,7 @@
 msgid "From Employee"
 msgstr "از کارمند"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:45
+#: accounts/report/budget_variance_report/budget_variance_report.js:43
 msgid "From Fiscal Year"
 msgstr "از سال مالی"
 
@@ -28997,8 +29444,8 @@
 msgid "From Payment Date"
 msgstr "از تاریخ پرداخت"
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:37
-#: manufacturing/report/work_order_summary/work_order_summary.js:23
+#: manufacturing/report/job_card_summary/job_card_summary.js:36
+#: manufacturing/report/work_order_summary/work_order_summary.js:22
 msgid "From Posting Date"
 msgstr "از تاریخ ارسال"
 
@@ -29044,6 +29491,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:91
 #: manufacturing/report/job_card_summary/job_card_summary.py:179
+#: templates/pages/timelog_info.html:31
 msgid "From Time"
 msgstr "از زمان"
 
@@ -29129,7 +29577,7 @@
 msgid "From Voucher Detail No"
 msgstr "از جزئیات کوپن شماره"
 
-#: stock/report/reserved_stock/reserved_stock.js:106
+#: stock/report/reserved_stock/reserved_stock.js:103
 #: stock/report/reserved_stock/reserved_stock.py:164
 msgid "From Voucher No"
 msgstr "از کوپن شماره"
@@ -29140,7 +29588,7 @@
 msgid "From Voucher No"
 msgstr "از کوپن شماره"
 
-#: stock/report/reserved_stock/reserved_stock.js:95
+#: stock/report/reserved_stock/reserved_stock.js:92
 #: stock/report/reserved_stock/reserved_stock.py:158
 msgid "From Voucher Type"
 msgstr "از نوع کوپن"
@@ -29191,7 +29639,7 @@
 msgid "From and To dates are required"
 msgstr "تاریخ های از و تا تاریخ لازم است"
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:47
+#: manufacturing/doctype/blanket_order/blanket_order.py:48
 msgid "From date cannot be greater than To date"
 msgstr "از تاریخ نمی تواند بیشتر از تاریخ باشد"
 
@@ -29379,30 +29827,33 @@
 msgid "Furniture and Fixtures"
 msgstr "مبلمان و وسایل"
 
-#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/account/account_tree.js:138
 msgid "Further accounts can be made under Groups, but entries can be made against non-Groups"
 msgstr "حساب‌های بیشتری را می‌توان در گروه‌ها ایجاد کرد، اما ورودی‌ها را می‌توان در مقابل غیر گروه‌ها انجام داد"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:24
+#: accounts/doctype/cost_center/cost_center_tree.js:31
 msgid "Further cost centers can be made under Groups but entries can be made against non-Groups"
 msgstr "مراکز هزینه بیشتر را می‌توان تحت گروه‌ها ایجاد کرد، اما ورودی‌ها را می‌توان در مقابل غیر گروه‌ها انجام داد"
 
-#: setup/doctype/sales_person/sales_person_tree.js:10
+#: setup/doctype/sales_person/sales_person_tree.js:15
 msgid "Further nodes can be only created under 'Group' type nodes"
 msgstr "گره های بیشتر را فقط می توان تحت گره های نوع «گروهی» ایجاد کرد"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:185
-#: accounts/report/accounts_receivable/accounts_receivable.py:1084
+#: 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
 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.py:1083
+#: accounts/report/accounts_receivable/accounts_receivable.html:154
+#: accounts/report/accounts_receivable/accounts_receivable.py:1091
 msgid "Future Payment Ref"
 msgstr "مرجع پرداخت آینده"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:120
+#: accounts/report/accounts_receivable/accounts_receivable.html:102
 msgid "Future Payments"
 msgstr "پرداخت های آینده"
 
@@ -29418,7 +29869,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/gl_entry/gl_entry.json
-#: accounts/report/general_ledger/general_ledger.py:557
+#: accounts/report/general_ledger/general_ledger.py:570
 msgid "GL Entry"
 msgstr "ورودی GL"
 
@@ -29479,11 +29930,11 @@
 
 #: 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:525
+#: setup/doctype/company/company.py:524
 msgid "Gain/Loss on Asset Disposal"
 msgstr "سود / زیان در دفع دارایی"
 
-#: projects/doctype/project/project.js:79
+#: projects/doctype/project/project.js:93
 msgid "Gantt Chart"
 msgstr "نمودار گانت"
 
@@ -29519,7 +29970,7 @@
 #. Name of a report
 #. Label of a shortcut in the Accounting Workspace
 #. Label of a Link in the Financial Reports Workspace
-#: accounts/doctype/account/account.js:95
+#: accounts/doctype/account/account.js:93
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/report/general_ledger/general_ledger.json
 #: accounts/workspace/accounting/accounting.json
@@ -29540,7 +29991,7 @@
 msgid "General Ledger"
 msgstr "دفتر کل"
 
-#: stock/doctype/warehouse/warehouse.js:74
+#: stock/doctype/warehouse/warehouse.js:68
 msgctxt "Warehouse"
 msgid "General Ledger"
 msgstr "دفتر کل"
@@ -29560,7 +30011,7 @@
 msgid "Generate Closing Stock Balance"
 msgstr "ایجاد مانده موجودی پایانی"
 
-#: public/js/setup_wizard.js:46
+#: public/js/setup_wizard.js:48
 msgid "Generate Demo Data for Exploration"
 msgstr "داده های نسخه ی نمایشی را برای کاوش ایجاد کنید"
 
@@ -29586,6 +30037,11 @@
 msgid "Generate Schedule"
 msgstr "ایجاد برنامه"
 
+#. Description of a DocType
+#: stock/doctype/packing_slip/packing_slip.json
+msgid "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight."
+msgstr ""
+
 #. Label of a Check field in DocType 'Bisect Nodes'
 #: accounts/doctype/bisect_nodes/bisect_nodes.json
 msgctxt "Bisect Nodes"
@@ -29632,7 +30088,7 @@
 msgid "Get Current Stock"
 msgstr "موجودی جاری را دریافت کنید"
 
-#: selling/doctype/customer/customer.js:168
+#: selling/doctype/customer/customer.js:180
 msgid "Get Customer Group Details"
 msgstr "دریافت جزئیات گروه مشتری"
 
@@ -29648,12 +30104,12 @@
 msgid "Get Finished Goods for Manufacture"
 msgstr "کالاهای تمام شده برای ساخت را دریافت کنید"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:55
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:157
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:57
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:159
 msgid "Get Invoices"
 msgstr "فاکتورها را دریافت کنید"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:102
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:104
 msgid "Get Invoices based on Filters"
 msgstr "فاکتورها را بر اساس فیلترها دریافت کنید"
 
@@ -29663,11 +30119,11 @@
 msgid "Get Item Locations"
 msgstr "مکان های مورد را دریافت کنید"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:351
-#: manufacturing/doctype/production_plan/production_plan.js:342
-#: stock/doctype/pick_list/pick_list.js:161
-#: stock/doctype/pick_list/pick_list.js:202
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: buying/doctype/request_for_quotation/request_for_quotation.js:377
+#: manufacturing/doctype/production_plan/production_plan.js:369
+#: stock/doctype/pick_list/pick_list.js:193
+#: stock/doctype/pick_list/pick_list.js:236
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:163
 msgid "Get Items"
 msgstr "موارد را دریافت کنید"
 
@@ -29677,37 +30133,37 @@
 msgid "Get Items"
 msgstr "موارد را دریافت کنید"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:147
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:165
-#: accounts/doctype/sales_invoice/sales_invoice.js:252
-#: accounts/doctype/sales_invoice/sales_invoice.js:276
-#: accounts/doctype/sales_invoice/sales_invoice.js:304
-#: buying/doctype/purchase_order/purchase_order.js:456
-#: buying/doctype/purchase_order/purchase_order.js:473
-#: buying/doctype/request_for_quotation/request_for_quotation.js:315
-#: buying/doctype/request_for_quotation/request_for_quotation.js:334
-#: buying/doctype/request_for_quotation/request_for_quotation.js:375
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:195
+#: 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/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
 #: buying/doctype/supplier_quotation/supplier_quotation.js:49
-#: buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:78
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:96
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:112
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:132
-#: public/js/controllers/buying.js:267
-#: selling/doctype/quotation/quotation.js:160
-#: selling/doctype/sales_order/sales_order.js:132
-#: selling/doctype/sales_order/sales_order.js:643
-#: stock/doctype/delivery_note/delivery_note.js:160
-#: stock/doctype/material_request/material_request.js:100
-#: stock/doctype/material_request/material_request.js:162
-#: stock/doctype/purchase_receipt/purchase_receipt.js:130
-#: stock/doctype/purchase_receipt/purchase_receipt.js:217
-#: stock/doctype/stock_entry/stock_entry.js:275
-#: stock/doctype/stock_entry/stock_entry.js:312
-#: stock/doctype/stock_entry/stock_entry.js:336
-#: stock/doctype/stock_entry/stock_entry.js:387
-#: stock/doctype/stock_entry/stock_entry.js:535
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
+#: buying/doctype/supplier_quotation/supplier_quotation.js:82
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:80
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:100
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:119
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:142
+#: public/js/controllers/buying.js:262
+#: selling/doctype/quotation/quotation.js:167
+#: selling/doctype/sales_order/sales_order.js:158
+#: selling/doctype/sales_order/sales_order.js:743
+#: stock/doctype/delivery_note/delivery_note.js:173
+#: stock/doctype/material_request/material_request.js:101
+#: stock/doctype/material_request/material_request.js:192
+#: stock/doctype/purchase_receipt/purchase_receipt.js:145
+#: stock/doctype/purchase_receipt/purchase_receipt.js:249
+#: 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:119
 msgid "Get Items From"
 msgstr "موارد را از"
 
@@ -29723,13 +30179,13 @@
 msgid "Get Items From Purchase Receipts"
 msgstr "اقلام را از رسید خرید دریافت کنید"
 
-#: stock/doctype/material_request/material_request.js:241
-#: stock/doctype/stock_entry/stock_entry.js:555
-#: stock/doctype/stock_entry/stock_entry.js:568
+#: stock/doctype/material_request/material_request.js:295
+#: stock/doctype/stock_entry/stock_entry.js:643
+#: stock/doctype/stock_entry/stock_entry.js:656
 msgid "Get Items from BOM"
 msgstr "موارد را از BOM دریافت کنید"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:348
+#: buying/doctype/request_for_quotation/request_for_quotation.js:374
 msgid "Get Items from Material Requests against this Supplier"
 msgstr "اقلام را از درخواست های مواد در برابر این تامین کننده دریافت کنید"
 
@@ -29739,7 +30195,7 @@
 msgid "Get Items from Open Material Requests"
 msgstr "موارد را از درخواست‌های Open Material دریافت کنید"
 
-#: public/js/controllers/buying.js:507
+#: public/js/controllers/buying.js:504
 msgid "Get Items from Product Bundle"
 msgstr "موارد را از Product Bundle دریافت کنید"
 
@@ -29773,18 +30229,24 @@
 msgid "Get Outstanding Orders"
 msgstr "دریافت سفارشات برجسته"
 
+#: accounts/doctype/bank_clearance/bank_clearance.js:38
 #: accounts/doctype/bank_clearance/bank_clearance.js:40
-#: accounts/doctype/bank_clearance/bank_clearance.js:44
-#: accounts/doctype/bank_clearance/bank_clearance.js:56
-#: accounts/doctype/bank_clearance/bank_clearance.js:75
+#: accounts/doctype/bank_clearance/bank_clearance.js:52
+#: accounts/doctype/bank_clearance/bank_clearance.js:71
 msgid "Get Payment Entries"
 msgstr "دریافت ورودی های پرداخت"
 
-#: accounts/doctype/payment_order/payment_order.js:20
-#: accounts/doctype/payment_order/payment_order.js:24
+#: accounts/doctype/payment_order/payment_order.js:23
+#: accounts/doctype/payment_order/payment_order.js:31
 msgid "Get Payments from"
 msgstr "دریافت پرداخت از"
 
+#. Label of a Check field in DocType 'Manufacturing Settings'
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+msgctxt "Manufacturing Settings"
+msgid "Get Raw Materials Cost from Consumption Entry"
+msgstr ""
+
 #. Label of a Button field in DocType 'Production Plan'
 #: manufacturing/doctype/production_plan/production_plan.json
 msgctxt "Production Plan"
@@ -29815,7 +30277,7 @@
 msgid "Get Started Sections"
 msgstr "بخش های شروع به کار"
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:432
 msgid "Get Stock"
 msgstr "موجودی دریافت کنید"
 
@@ -29825,29 +30287,29 @@
 msgid "Get Sub Assembly Items"
 msgstr "اقلام Sub Assembly را دریافت کنید"
 
-#: buying/doctype/supplier/supplier.js:102
+#: buying/doctype/supplier/supplier.js:124
 msgid "Get Supplier Group Details"
 msgstr "جزئیات گروه تامین کننده را دریافت کنید"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:384
-#: buying/doctype/request_for_quotation/request_for_quotation.js:402
+#: buying/doctype/request_for_quotation/request_for_quotation.js:416
+#: buying/doctype/request_for_quotation/request_for_quotation.js:436
 msgid "Get Suppliers"
 msgstr "تامین کنندگان را دریافت کنید"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:405
+#: buying/doctype/request_for_quotation/request_for_quotation.js:440
 msgid "Get Suppliers By"
 msgstr "تامین کنندگان را دریافت کنید"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:989
+#: accounts/doctype/sales_invoice/sales_invoice.js:1065
 msgid "Get Timesheets"
 msgstr "برگه های زمانی را دریافت کنید"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:81
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:84
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:77
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:80
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:87
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:94
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:75
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:81
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:91
 msgid "Get Unreconciled Entries"
 msgstr "ورودی های ناسازگار را دریافت کنید"
 
@@ -29855,11 +30317,11 @@
 msgid "Get Updates"
 msgstr "دریافت به روز رسانی"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:65
+#: stock/doctype/delivery_trip/delivery_trip.js:68
 msgid "Get stops from"
 msgstr "توقف از"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:125
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:149
 msgid "Getting Scrap Items"
 msgstr "دریافت اقلام قراضه"
 
@@ -29876,6 +30338,13 @@
 msgid "Give free item for every N quantity"
 msgstr "برای هر N مقدار مورد رایگان بدهید"
 
+#. Description of the 'Recurse Every (As Per Transaction UOM)' (Float) field in
+#. DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Give free item for every N quantity"
+msgstr "برای هر N مقدار مورد رایگان بدهید"
+
 #. Name of a DocType
 #: setup/doctype/global_defaults/global_defaults.json
 msgid "Global Defaults"
@@ -29892,7 +30361,7 @@
 msgid "Go back"
 msgstr "برگرد"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:113
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:97
 msgid "Go to {0} List"
 msgstr "به فهرست {0} بروید"
 
@@ -29931,16 +30400,16 @@
 msgid "Goods"
 msgstr "کالاها"
 
-#: setup/doctype/company/company.py:263
-#: stock/doctype/stock_entry/stock_entry_list.js:14
+#: setup/doctype/company/company.py:262
+#: stock/doctype/stock_entry/stock_entry_list.js:21
 msgid "Goods In Transit"
 msgstr "کالاهای در حال حمل و نقل"
 
-#: stock/doctype/stock_entry/stock_entry_list.js:17
+#: stock/doctype/stock_entry/stock_entry_list.js:23
 msgid "Goods Transferred"
 msgstr "کالاهای منتقل شده"
 
-#: stock/doctype/stock_entry/stock_entry.py:1618
+#: stock/doctype/stock_entry/stock_entry.py:1627
 msgid "Goods are already received against the outward entry {0}"
 msgstr "کالاها قبلاً در مقابل ورودی خارجی دریافت شده اند {0}"
 
@@ -29964,7 +30433,12 @@
 #: accounts/report/pos_register/pos_register.py:207
 #: 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:253
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:251
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:154
+#: selling/page/point_of_sale/pos_payment.js:590
 #: templates/includes/order/order_taxes.html:105 templates/pages/rfq.html:58
 msgid "Grand Total"
 msgstr "کل بزرگ"
@@ -30186,7 +30660,7 @@
 msgid "Grant Commission"
 msgstr "کمیسیون کمک هزینه"
 
-#: accounts/doctype/payment_entry/payment_entry.js:654
+#: accounts/doctype/payment_entry/payment_entry.js:802
 msgid "Greater Than Amount"
 msgstr "بیشتر از مقدار"
 
@@ -30295,11 +30769,11 @@
 msgid "Gross Purchase Amount"
 msgstr "مبلغ خرید ناخالص"
 
-#: assets/doctype/asset/asset.py:317
+#: assets/doctype/asset/asset.py:319
 msgid "Gross Purchase Amount is mandatory"
 msgstr "مبلغ خرید ناخالص اجباری است"
 
-#: assets/doctype/asset/asset.py:362
+#: assets/doctype/asset/asset.py:364
 msgid "Gross Purchase Amount should be <b>equal</b> to purchase amount of one single Asset."
 msgstr "مقدار خرید ناخالص باید <b>برابر</b> برای خرید یک دارایی واحد باشد."
 
@@ -30328,11 +30802,11 @@
 #: accounts/report/gross_profit/gross_profit.js:36
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:52
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:58
-#: assets/report/fixed_asset_register/fixed_asset_register.js:36
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
+#: assets/report/fixed_asset_register/fixed_asset_register.js:35
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:41
 #: public/js/purchase_trends_filters.js:61 public/js/sales_trends_filters.js:37
 #: selling/report/lost_quotations/lost_quotations.js:33
-#: stock/report/total_stock_summary/total_stock_summary.js:9
+#: stock/report/total_stock_summary/total_stock_summary.js:8
 msgid "Group By"
 msgstr "دسته بندی بر اساس"
 
@@ -30342,15 +30816,15 @@
 msgid "Group By"
 msgstr "دسته بندی بر اساس"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:151
+#: accounts/report/accounts_receivable/accounts_receivable.js:154
 msgid "Group By Customer"
 msgstr "گروه بر اساس مشتری"
 
-#: accounts/report/accounts_payable/accounts_payable.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:132
 msgid "Group By Supplier"
 msgstr "گروه بر اساس تامین کننده"
 
-#: setup/doctype/sales_person/sales_person_tree.js:9
+#: setup/doctype/sales_person/sales_person_tree.js:14
 msgid "Group Node"
 msgstr "گره گروه"
 
@@ -30360,12 +30834,12 @@
 msgid "Group Same Items"
 msgstr "گروه بندی موارد مشابه"
 
-#: stock/doctype/stock_settings/stock_settings.py:112
+#: stock/doctype/stock_settings/stock_settings.py:115
 msgid "Group Warehouses cannot be used in transactions. Please change the value of {0}"
 msgstr "انبارهای گروهی را نمی توان در معاملات استفاده کرد. لطفا مقدار {0} را تغییر دهید"
 
 #: accounts/report/general_ledger/general_ledger.js:115
-#: accounts/report/pos_register/pos_register.js:57
+#: accounts/report/pos_register/pos_register.js:56
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:78
 msgid "Group by"
 msgstr "دسته بندی بر اساس"
@@ -30374,34 +30848,34 @@
 msgid "Group by Account"
 msgstr "گروه بندی بر اساس حساب"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:82
 msgid "Group by Item"
 msgstr "گروه بندی بر اساس آیتم"
 
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:62
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:61
 msgid "Group by Material Request"
 msgstr "گروه بر اساس درخواست مواد"
 
 #: accounts/report/general_ledger/general_ledger.js:132
-#: accounts/report/payment_ledger/payment_ledger.js:83
+#: accounts/report/payment_ledger/payment_ledger.js:82
 msgid "Group by Party"
 msgstr "گروه بندی بر اساس طرف"
 
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:71
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:70
 msgid "Group by Purchase Order"
 msgstr "گروه بر اساس سفارش خرید"
 
-#: selling/report/sales_order_analysis/sales_order_analysis.js:73
+#: selling/report/sales_order_analysis/sales_order_analysis.js:72
 msgid "Group by Sales Order"
 msgstr "گروه بندی بر اساس سفارش فروش"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:81
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:84
 msgid "Group by Supplier"
 msgstr "گروه بندی بر اساس تامین کننده"
 
-#: accounts/report/accounts_payable/accounts_payable.js:159
-#: accounts/report/accounts_receivable/accounts_receivable.js:191
+#: accounts/report/accounts_payable/accounts_payable.js:162
+#: accounts/report/accounts_receivable/accounts_receivable.js:194
 #: accounts/report/general_ledger/general_ledger.js:120
 msgid "Group by Voucher"
 msgstr "گروه بندی بر اساس کوپن"
@@ -30424,7 +30898,7 @@
 msgid "Group by Voucher (Consolidated)"
 msgstr "گروه بر اساس کوپن (تلفیقی)"
 
-#: stock/utils.py:448
+#: stock/utils.py:443
 msgid "Group node warehouse is not allowed to select for transactions"
 msgstr "انبار گره گروه مجاز به انتخاب برای تراکنش ها نیست"
 
@@ -30486,8 +30960,8 @@
 msgid "Groups"
 msgstr "گروه ها"
 
-#: accounts/report/balance_sheet/balance_sheet.js:18
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:18
+#: accounts/report/balance_sheet/balance_sheet.js:14
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
 msgid "Growth View"
 msgstr "نمای رشد"
 
@@ -30533,14 +31007,14 @@
 msgid "Half Yearly"
 msgstr "نیم سال"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:66
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:69
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
-#: public/js/financial_statements.js:219
+#: accounts/report/budget_variance_report/budget_variance_report.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
+#: public/js/financial_statements.js:228
 #: public/js/purchase_trends_filters.js:21 public/js/sales_trends_filters.js:13
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
 msgid "Half-Yearly"
 msgstr "نیم سال"
 
@@ -30699,6 +31173,11 @@
 msgid "Have Default Naming Series for Batch ID?"
 msgstr "آیا سری نام‌گذاری پیش‌فرض برای Batch ID دارید؟"
 
+#. Description of a DocType
+#: accounts/doctype/account/account.json
+msgid "Heads (or groups) against which Accounting Entries are made and balances are maintained."
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -30723,7 +31202,7 @@
 msgid "Height (cm)"
 msgstr "ارتفاع (سانتی متر)"
 
-#: assets/doctype/asset/depreciation.py:412
+#: assets/doctype/asset/depreciation.py:410
 msgid "Hello,"
 msgstr "سلام،"
 
@@ -30757,11 +31236,16 @@
 msgid "Help Text"
 msgstr "متن راهنما"
 
-#: assets/doctype/asset/depreciation.py:419
+#. Description of a DocType
+#: accounts/doctype/monthly_distribution/monthly_distribution.json
+msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
+msgstr ""
+
+#: assets/doctype/asset/depreciation.py:417
 msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
 msgstr "در اینجا گزارش های خطا برای ورودی های استهلاک ناموفق فوق الذکر آمده است: {0}"
 
-#: stock/stock_ledger.py:1669
+#: stock/stock_ledger.py:1689
 msgid "Here are the options to proceed:"
 msgstr "در اینجا گزینه هایی برای ادامه وجود دارد:"
 
@@ -30778,15 +31262,15 @@
 msgid "Here you can maintain height, weight, allergies, medical concerns etc"
 msgstr "در اینجا می توانید قد، وزن، آلرژی، نگرانی های پزشکی و غیره را حفظ کنید"
 
-#: setup/doctype/employee/employee.js:122
+#: setup/doctype/employee/employee.js:129
 msgid "Here, you can select a senior of this Employee. Based on this, Organization Chart will be populated."
 msgstr "در اینجا، می توانید یک ارشد این کارمند را انتخاب کنید. بر این اساس نمودار سازمانی پر می شود."
 
-#: setup/doctype/holiday_list/holiday_list.js:75
+#: setup/doctype/holiday_list/holiday_list.js:77
 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:391
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:406
 msgid "Hi,"
 msgstr "سلام،"
 
@@ -30848,12 +31332,12 @@
 msgid "History In Company"
 msgstr "تاریخچه در شرکت"
 
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: selling/doctype/sales_order/sales_order.js:539
+#: buying/doctype/purchase_order/purchase_order.js:315
+#: selling/doctype/sales_order/sales_order.js:582
 msgid "Hold"
 msgstr "نگه دارید"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
 msgid "Hold Invoice"
 msgstr "نگه داشتن فاکتور"
 
@@ -30959,6 +31443,13 @@
 msgstr "ساعتی"
 
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:31
+#: templates/pages/timelog_info.html:37
+msgid "Hours"
+msgstr "ساعت ها"
+
+#. Label of a Float field in DocType 'Workstation Working Hour'
+#: manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
+msgctxt "Workstation Working Hour"
 msgid "Hours"
 msgstr "ساعت ها"
 
@@ -30997,7 +31488,7 @@
 msgid "Hrs"
 msgstr "ساعت"
 
-#: setup/doctype/company/company.py:365
+#: setup/doctype/company/company.py:364
 msgid "Human Resources"
 msgstr "منابع انسانی"
 
@@ -31035,8 +31526,8 @@
 msgid "IBAN"
 msgstr ""
 
-#: accounts/doctype/bank_account/bank_account.py:84
-#: accounts/doctype/bank_account/bank_account.py:87
+#: accounts/doctype/bank_account/bank_account.py:98
+#: accounts/doctype/bank_account/bank_account.py:101
 msgid "IBAN is not valid"
 msgstr "IBAN معتبر نیست"
 
@@ -31111,6 +31602,12 @@
 msgid "Identifying Decision Makers"
 msgstr "شناسایی تصمیم گیرندگان"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Idle"
+msgstr ""
+
 #. Description of the 'Book Deferred Entries Based On' (Select) field in
 #. DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31118,6 +31615,10 @@
 msgid "If \"Months\" is selected, a fixed amount will be booked as deferred revenue or expense for each month irrespective of the number of days in a month. It will be prorated if deferred revenue or expense is not booked for an entire month"
 msgstr "اگر «ماه‌ها» انتخاب شود، صرف نظر از تعداد روزهای یک ماه، مبلغ ثابتی به‌عنوان درآمد یا هزینه معوق برای هر ماه ثبت می‌شود. در صورتی که درآمد یا هزینه معوق برای یک ماه کامل ثبت نشود، به نسبت محاسبه می شود"
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)"
+msgstr ""
+
 #. Description of the 'Cost Center' (Link) field in DocType 'Journal Entry
 #. Account'
 #: accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -31125,7 +31626,7 @@
 msgid "If Income or Expense"
 msgstr "در صورت درآمد یا هزینه"
 
-#: manufacturing/doctype/operation/operation.js:30
+#: manufacturing/doctype/operation/operation.js:32
 msgid "If an operation is divided into sub operations, they can be added here."
 msgstr "اگر یک عملیات به عملیات فرعی تقسیم شود، می توان آنها را در اینجا اضافه کرد."
 
@@ -31182,7 +31683,7 @@
 msgid "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 msgstr "اگر علامت زده شود، مبلغ مالیات به عنوان قبلاً در نرخ چاپ / مبلغ چاپ در نظر گرفته می شود"
 
-#: public/js/setup_wizard.js:48
+#: public/js/setup_wizard.js:50
 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later."
 msgstr "در صورت علامت زدن، داده‌های نمایشی را برای شما ایجاد می‌کنیم تا سیستم را کاوش کنید. این داده های نمایشی را می توان بعداً پاک کرد."
 
@@ -31228,6 +31729,14 @@
 msgid "If enabled, all files attached to this document will be attached to each email"
 msgstr "در صورت فعال بودن، تمام فایل های پیوست شده به این سند به هر ایمیل پیوست می شود"
 
+#. Description of the 'Do Not Update Serial / Batch on Creation of Auto Bundle'
+#. (Check) field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "If enabled, do not update serial / batch values in the stock transactions on creation of auto Serial \n"
+" / Batch Bundle. "
+msgstr ""
+
 #. Description of the 'Create Ledger Entries for Change Amount' (Check) field
 #. in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31268,7 +31777,7 @@
 msgid "If more than one package of the same type (for print)"
 msgstr "اگر بیش از یک بسته از همان نوع (برای چاپ)"
 
-#: stock/stock_ledger.py:1679
+#: stock/stock_ledger.py:1699
 msgid "If not, you can Cancel / Submit this entry"
 msgstr "اگر نه، می توانید این ورودی را لغو / ارسال کنید"
 
@@ -31286,7 +31795,7 @@
 msgid "If subcontracted to a vendor"
 msgstr "اگر قرارداد فرعی به فروشنده داده شود"
 
-#: manufacturing/doctype/work_order/work_order.js:842
+#: manufacturing/doctype/work_order/work_order.js:911
 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."
 msgstr "اگر BOM منجر به مواد قراضه شود، انبار ضایعات باید انتخاب شود."
 
@@ -31296,11 +31805,11 @@
 msgid "If the account is frozen, entries are allowed to restricted users."
 msgstr "اگر حساب مسدود شود، ورود به کاربران محدود مجاز است."
 
-#: stock/stock_ledger.py:1672
+#: stock/stock_ledger.py:1692
 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 "اگر مورد به عنوان یک مورد نرخ ارزش گذاری صفر در این ورودی معامله می شود، لطفاً \"مجاز نرخ ارزش گذاری صفر\" را در جدول آیتم {0} فعال کنید."
 
-#: manufacturing/doctype/work_order/work_order.js:857
+#: manufacturing/doctype/work_order/work_order.js:930
 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
 msgstr "اگر BOM انتخاب شده دارای عملیات ذکر شده در آن باشد، سیستم تمام عملیات را از BOM واکشی می کند، این مقادیر را می توان تغییر داد."
 
@@ -31346,7 +31855,7 @@
 msgid "If this is unchecked, direct GL entries will be created to book deferred revenue or expense"
 msgstr "اگر این علامت را بردارید، ورودی‌های مستقیم GL برای رزرو درآمد یا هزینه معوق ایجاد می‌شوند"
 
-#: accounts/doctype/payment_entry/payment_entry.py:638
+#: accounts/doctype/payment_entry/payment_entry.py:647
 msgid "If this is undesirable please cancel the corresponding Payment Entry."
 msgstr "اگر این امر نامطلوب است، لطفاً ورودی پرداخت مربوطه را لغو کنید."
 
@@ -31356,23 +31865,34 @@
 msgid "If this item has variants, then it cannot be selected in sales orders etc."
 msgstr "اگر این کالا دارای انواع باشد، نمی توان آن را در سفارشات فروش و غیره انتخاب کرد."
 
-#: buying/doctype/buying_settings/buying_settings.js:24
+#: buying/doctype/buying_settings/buying_settings.js:27
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master."
 msgstr "اگر این گزینه 'بله' پیکربندی شده باشد، ERPNext شما را از ایجاد فاکتور خرید یا رسید بدون ایجاد یک سفارش خرید جلوگیری می کند. این پیکربندی را می‌توان با فعال کردن کادر انتخاب «اجازه ایجاد فاکتور خرید بدون سفارش خرید» در بخش اصلی تأمین‌کننده، برای یک تأمین‌کننده خاص لغو کرد."
 
-#: buying/doctype/buying_settings/buying_settings.js:29
+#: buying/doctype/buying_settings/buying_settings.js:34
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master."
 msgstr "اگر این گزینه 'بله' پیکربندی شده باشد، ERPNext از ایجاد فاکتور خرید بدون ایجاد یک رسید خرید جلوگیری می کند. این پیکربندی را می‌توان برای یک تامین‌کننده خاص با فعال کردن کادر انتخاب «اجازه ایجاد فاکتور خرید بدون رسید خرید» در قسمت اصلی تأمین‌کننده لغو کرد."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:11
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
 msgid "If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured."
 msgstr "اگر علامت زده شود، می توان از چندین ماده برای یک سفارش کاری استفاده کرد. این در صورتی مفید است که یک یا چند محصول وقت گیر تولید شود."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:36
 msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
 msgstr "در صورت علامت زدن، هزینه BOM به طور خودکار بر اساس نرخ ارزش گذاری / نرخ لیست قیمت / آخرین نرخ خرید مواد اولیه به روز می شود."
 
-#: stock/doctype/item/item.js:814
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
+msgstr ""
+
+#. Description of the 'Is Rejected Warehouse' (Check) field in DocType
+#. 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "If yes, then this warehouse will be used to store rejected materials"
+msgstr ""
+
+#: stock/doctype/item/item.js:894
 msgid "If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item."
 msgstr "اگر موجودی این کالا را در موجودی خود نگهداری می کنید، ERPNext برای هر تراکنش این کالا یک ثبت در دفتر کل موجودی ایجاد می کند."
 
@@ -31383,7 +31903,11 @@
 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 "اگر نیاز به تطبیق معاملات خاصی با یکدیگر دارید، لطفاً مطابق آن را انتخاب کنید. در غیر این صورت، تمام تراکنش ها به ترتیب FIFO تخصیص می یابد."
 
-#: manufacturing/doctype/production_plan/production_plan.py:1605
+#: manufacturing/doctype/production_plan/production_plan.py:920
+msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.py:1625
 msgid "If you still want to proceed, please enable {0}."
 msgstr "اگر همچنان می‌خواهید ادامه دهید، لطفاً {0} را فعال کنید."
 
@@ -31450,17 +31974,21 @@
 msgid "Ignore Empty Stock"
 msgstr "موجودی خالی را نادیده بگیرید"
 
+#: accounts/report/general_ledger/general_ledger.js:209
+msgid "Ignore Exchange Rate Revaluation Journals"
+msgstr "مجلات تجدید ارزیابی نرخ ارز را نادیده بگیرید"
+
 #. Label of a Check field in DocType 'Process Statement Of Accounts'
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 msgctxt "Process Statement Of Accounts"
 msgid "Ignore Exchange Rate Revaluation Journals"
 msgstr "مجلات تجدید ارزیابی نرخ ارز را نادیده بگیرید"
 
-#: selling/doctype/sales_order/sales_order.js:800
+#: selling/doctype/sales_order/sales_order.js:916
 msgid "Ignore Existing Ordered Qty"
 msgstr "نادیده گرفتن تعداد سفارش شده موجود"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1597
+#: manufacturing/doctype/production_plan/production_plan.py:1617
 msgid "Ignore Existing Projected Quantity"
 msgstr "کمیت پیش بینی شده موجود را نادیده بگیرید"
 
@@ -31524,7 +32052,7 @@
 msgid "Ignore Pricing Rule"
 msgstr "نادیده گرفتن قانون قیمت گذاری"
 
-#: selling/page/point_of_sale/pos_payment.js:187
+#: selling/page/point_of_sale/pos_payment.js:188
 msgid "Ignore Pricing Rule is enabled. Cannot apply coupon code."
 msgstr "نادیده گرفتن قانون قیمت گذاری فعال است. نمی توان کد کوپن را اعمال کرد."
 
@@ -31847,10 +32375,15 @@
 msgid "Image View"
 msgstr "نمای تصویر"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:118
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:132
 msgid "Import"
 msgstr "وارد كردن"
 
+#. Description of a DocType
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json
+msgid "Import Chart of Accounts from a csv file"
+msgstr ""
+
 #. Label of a Link in the Home Workspace
 #. Label of a Link in the Settings Workspace
 #: setup/workspace/home/home.json setup/workspace/settings/settings.json
@@ -31863,7 +32396,7 @@
 msgid "Import Data from Spreadsheet"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:66
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:71
 msgid "Import Day Book Data"
 msgstr "داده های کتاب روز واردات"
 
@@ -31903,7 +32436,7 @@
 msgid "Import Log Preview"
 msgstr "پیش نمایش ورود به سیستم"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:54
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:59
 msgid "Import Master Data"
 msgstr "وارد کردن داده های اصلی"
 
@@ -31913,11 +32446,11 @@
 msgid "Import Preview"
 msgstr "پیش نمایش واردات"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:61
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
 msgid "Import Progress"
 msgstr "پیشرفت واردات"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:130
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:144
 msgid "Import Successful"
 msgstr "واردات با موفقیت انجام شد"
 
@@ -31938,8 +32471,8 @@
 msgid "Import Type"
 msgstr "نوع واردات"
 
-#: public/js/utils/serial_no_batch_selector.js:197
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:77
+#: public/js/utils/serial_no_batch_selector.js:200
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:80
 msgid "Import Using CSV file"
 msgstr "وارد کردن با استفاده از فایل CSV"
 
@@ -31955,7 +32488,7 @@
 msgid "Import from Google Sheets"
 msgstr "وارد کردن از Google Sheets"
 
-#: stock/doctype/item_price/item_price.js:27
+#: stock/doctype/item_price/item_price.js:29
 msgid "Import in Bulk"
 msgstr "واردات به صورت عمده"
 
@@ -31967,7 +32500,7 @@
 msgid "Importing Parties and Addresses"
 msgstr "وارد کننده طرف‌ها و آدرس"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:47
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:45
 msgid "Importing {0} of {1}, {2}"
 msgstr "در حال وارد کردن {0} از {1}، {2}"
 
@@ -31978,7 +32511,7 @@
 msgid "In House"
 msgstr "در خانه"
 
-#: assets/doctype/asset/asset_list.js:20
+#: assets/doctype/asset/asset_list.js:15
 msgid "In Maintenance"
 msgstr "در تعمیر و نگهداری"
 
@@ -32006,8 +32539,8 @@
 msgid "In Minutes"
 msgstr "در چند دقیقه"
 
-#: accounts/report/accounts_payable/accounts_payable.js:149
-#: accounts/report/accounts_receivable/accounts_receivable.js:181
+#: accounts/report/accounts_payable/accounts_payable.js:152
+#: accounts/report/accounts_receivable/accounts_receivable.js:184
 msgid "In Party Currency"
 msgstr "به ارز طرف"
 
@@ -32054,10 +32587,10 @@
 msgid "In Production"
 msgstr "در تولید"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:65
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:52
 #: accounts/doctype/ledger_merge/ledger_merge.js:19
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:36
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:60
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:40
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:66
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:7
 msgid "In Progress"
 msgstr "در حال پیش رفت"
@@ -32118,11 +32651,17 @@
 msgstr "در حال پیش رفت"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:80
-#: stock/report/stock_balance/stock_balance.py:433
-#: stock/report/stock_ledger/stock_ledger.py:139
+#: stock/report/stock_balance/stock_balance.py:441
+#: stock/report/stock_ledger/stock_ledger.py:212
 msgid "In Qty"
 msgstr "در تعداد"
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "In Stock"
+msgstr ""
+
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:12
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:22
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:30
 msgid "In Stock Qty"
 msgstr "موجودی تعداد"
@@ -32144,15 +32683,15 @@
 msgid "In Transit"
 msgstr "در حمل و نقل"
 
-#: stock/doctype/material_request/material_request.js:375
+#: stock/doctype/material_request/material_request.js:445
 msgid "In Transit Transfer"
 msgstr "در انتقال ترانزیت"
 
-#: stock/doctype/material_request/material_request.js:344
+#: stock/doctype/material_request/material_request.js:414
 msgid "In Transit Warehouse"
 msgstr "در انبار ترانزیت"
 
-#: stock/report/stock_balance/stock_balance.py:439
+#: stock/report/stock_balance/stock_balance.py:447
 msgid "In Value"
 msgstr "در ارزش"
 
@@ -32337,7 +32876,7 @@
 msgid "In minutes"
 msgstr "در چند دقیقه"
 
-#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:7
+#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:8
 msgid "In row {0} of Appointment Booking Slots: \"To Time\" must be later than \"From Time\"."
 msgstr "در ردیف {0} قسمت‌های رزرو قرار ملاقات: «تا زمان» باید دیرتر از «از زمان» باشد."
 
@@ -32352,7 +32891,11 @@
 msgid "In the case of 'Use Multi-Level BOM' in a work order, if the user wishes to add sub-assembly costs to Finished Goods items without using a job card as well the scrap items, then this option needs to be enable."
 msgstr "در مورد «استفاده از BOM چند سطحی» در یک سفارش کاری، اگر کاربر بخواهد هزینه‌های مونتاژ فرعی را بدون استفاده از کارت کار و همچنین اقلام ضایعات به کالاهای نهایی اضافه کند، این گزینه باید فعال شود."
 
-#: stock/doctype/item/item.js:839
+#: accounts/doctype/loyalty_program/loyalty_program.js:12
+msgid "In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent"
+msgstr ""
+
+#: stock/doctype/item/item.js:927
 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc."
 msgstr "در این بخش می‌توانید پیش‌فرض‌های مربوط به تراکنش‌های کل شرکت را برای این آیتم تعریف کنید. به عنوان مثال. انبار پیش فرض، لیست قیمت پیش فرض، تامین کننده و غیره"
 
@@ -32388,6 +32931,12 @@
 msgid "Inactive Sales Items"
 msgstr "اقلام غیر فعال فروش"
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Inactive Status"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:93
 msgid "Incentives"
 msgstr "مشوق ها"
@@ -32398,7 +32947,7 @@
 msgid "Incentives"
 msgstr "مشوق ها"
 
-#: accounts/report/payment_ledger/payment_ledger.js:77
+#: accounts/report/payment_ledger/payment_ledger.js:76
 msgid "Include Account Currency"
 msgstr "شامل ارز حساب"
 
@@ -32409,27 +32958,27 @@
 msgstr "شامل خلاصه پیری"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:54
-#: assets/report/fixed_asset_register/fixed_asset_register.js:55
+#: assets/report/fixed_asset_register/fixed_asset_register.js:54
 msgid "Include Default FB Assets"
 msgstr "دارایی های پیش فرض FB را شامل شود"
 
-#: accounts/report/balance_sheet/balance_sheet.js:34
-#: accounts/report/cash_flow/cash_flow.js:20
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:107
+#: accounts/report/balance_sheet/balance_sheet.js:29
+#: 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/trial_balance/trial_balance.js:98
+#: accounts/report/trial_balance/trial_balance.js:104
 msgid "Include Default FB Entries"
 msgstr "شامل ورودی های پیش فرض FB"
 
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:60
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:55
 msgid "Include Disabled"
 msgstr "شامل افراد غیر فعال"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:85
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:88
 msgid "Include Expired"
 msgstr "شامل منقضی شده است"
 
-#: selling/doctype/sales_order/sales_order.js:798
+#: selling/doctype/sales_order/sales_order.js:912
 msgid "Include Exploded Items"
 msgstr "شامل موارد منفجر شده"
 
@@ -32499,7 +33048,7 @@
 msgid "Include Non Stock Items"
 msgstr "شامل اقلام غیر موجودی"
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:44
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:45
 msgid "Include POS Transactions"
 msgstr "شامل معاملات POS"
 
@@ -32533,7 +33082,7 @@
 msgid "Include Safety Stock in Required Qty Calculation"
 msgstr "موجودی ایمنی را در محاسبه مقدار مورد نیاز لحاظ کنید"
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:88
+#: manufacturing/report/production_planning_report/production_planning_report.js:87
 msgid "Include Sub-assembly Raw Materials"
 msgstr "شامل مواد اولیه زیر مجموعه"
 
@@ -32543,12 +33092,12 @@
 msgid "Include Subcontracted Items"
 msgstr "شامل موارد قرارداد فرعی"
 
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:57
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
 msgid "Include Timesheets in Draft Status"
 msgstr "شامل جدول زمانی در وضعیت پیش نویس"
 
 #: stock/report/stock_balance/stock_balance.js:84
-#: stock/report/stock_ledger/stock_ledger.js:82
+#: stock/report/stock_ledger/stock_ledger.js:90
 #: stock/report/stock_projected_qty/stock_projected_qty.js:51
 msgid "Include UOM"
 msgstr "شامل UOM شود"
@@ -32579,10 +33128,10 @@
 
 #: 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:28
+#: accounts/report/account_balance/account_balance.js:27
 #: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:172
 #: accounts/report/profitability_analysis/profitability_analysis.py:182
-#: public/js/financial_statements.js:35
+#: public/js/financial_statements.js:36
 msgid "Income"
 msgstr "درآمد"
 
@@ -32605,7 +33154,7 @@
 msgid "Income"
 msgstr "درآمد"
 
-#: accounts/report/account_balance/account_balance.js:51
+#: 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
 msgid "Income Account"
@@ -32678,7 +33227,7 @@
 msgstr "تنظیمات تماس ورودی"
 
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:163
-#: stock/report/stock_ledger/stock_ledger.py:189
+#: 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
 msgid "Incoming Rate"
@@ -32702,12 +33251,6 @@
 msgid "Incoming Rate"
 msgstr "نرخ ورودی"
 
-#. Label of a Float field in DocType 'Serial and Batch Entry'
-#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
-msgctxt "Serial and Batch Entry"
-msgid "Incoming Rate"
-msgstr "نرخ ورودی"
-
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
@@ -32729,16 +33272,16 @@
 msgid "Incorrect Balance Qty After Transaction"
 msgstr "تعداد موجودی نادرست پس از تراکنش"
 
-#: controllers/subcontracting_controller.py:710
+#: controllers/subcontracting_controller.py:714
 msgid "Incorrect Batch Consumed"
 msgstr "دسته نادرست مصرف شده است"
 
-#: assets/doctype/asset/asset.py:278
+#: assets/doctype/asset/asset.py:280
 #: assets/doctype/asset_value_adjustment/asset_value_adjustment.py:74
 msgid "Incorrect Date"
 msgstr "تاریخ نادرست"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:99
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:120
 msgid "Incorrect Invoice"
 msgstr "فاکتور نادرست"
 
@@ -32751,12 +33294,16 @@
 msgid "Incorrect Payment Type"
 msgstr "نوع پرداخت نادرست"
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+msgid "Incorrect Reference Document (Purchase Receipt Item)"
+msgstr ""
+
 #. Name of a report
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.json
 msgid "Incorrect Serial No Valuation"
 msgstr "ارزش گذاری بدون سریال نادرست است"
 
-#: controllers/subcontracting_controller.py:723
+#: controllers/subcontracting_controller.py:727
 msgid "Incorrect Serial Number Consumed"
 msgstr "شماره سریال نادرست مصرف شده است"
 
@@ -32765,15 +33312,15 @@
 msgid "Incorrect Stock Value Report"
 msgstr "گزارش ارزش موجودی نادرست است"
 
-#: stock/serial_batch_bundle.py:95
+#: stock/serial_batch_bundle.py:96
 msgid "Incorrect Type of Transaction"
 msgstr "نوع معامله نادرست"
 
-#: stock/doctype/stock_settings/stock_settings.py:115
+#: stock/doctype/stock_settings/stock_settings.py:118
 msgid "Incorrect Warehouse"
 msgstr "انبار نادرست"
 
-#: accounts/general_ledger.py:47
+#: accounts/general_ledger.py:51
 msgid "Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction."
 msgstr "تعداد اشتباهی از ورودی های دفتر کل پیدا شد. ممکن است حساب اشتباهی را در تراکنش انتخاب کرده باشید."
 
@@ -32924,11 +33471,11 @@
 msgid "Individual"
 msgstr "شخصی"
 
-#: accounts/doctype/gl_entry/gl_entry.py:336
+#: accounts/doctype/gl_entry/gl_entry.py:290
 msgid "Individual GL Entry cannot be cancelled."
 msgstr "ورود انفرادی GL را نمی توان لغو کرد."
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:326
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:337
 msgid "Individual Stock Ledger Entry cannot be cancelled."
 msgstr "ورود فردی به دفتر موجودی را نمی توان لغو کرد."
 
@@ -32973,7 +33520,13 @@
 msgid "Initial Email Notification Sent"
 msgstr "اعلان ایمیل اولیه ارسال شد"
 
-#: accounts/doctype/payment_request/payment_request_list.js:11
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Initialize Summary Table"
+msgstr ""
+
+#: accounts/doctype/payment_request/payment_request_list.js:10
 msgid "Initiated"
 msgstr "آغاز شد"
 
@@ -33004,7 +33557,7 @@
 msgid "Insert New Records"
 msgstr "درج رکوردهای جدید"
 
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:34
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:33
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:109
 msgid "Inspected By"
 msgstr "بازرسی توسط"
@@ -33015,11 +33568,11 @@
 msgid "Inspected By"
 msgstr "بازرسی توسط"
 
-#: controllers/stock_controller.py:666
+#: controllers/stock_controller.py:849
 msgid "Inspection Rejected"
 msgstr "بازرسی رد شد"
 
-#: controllers/stock_controller.py:636 controllers/stock_controller.py:638
+#: controllers/stock_controller.py:819 controllers/stock_controller.py:821
 msgid "Inspection Required"
 msgstr "بازرسی مورد نیاز است"
 
@@ -33041,7 +33594,7 @@
 msgid "Inspection Required before Purchase"
 msgstr "بازرسی قبل از خرید الزامی است"
 
-#: controllers/stock_controller.py:653
+#: controllers/stock_controller.py:836
 msgid "Inspection Submission"
 msgstr "ارسال بازرسی"
 
@@ -33063,7 +33616,7 @@
 
 #. Name of a DocType
 #: selling/doctype/installation_note/installation_note.json
-#: stock/doctype/delivery_note/delivery_note.js:171
+#: stock/doctype/delivery_note/delivery_note.js:191
 msgid "Installation Note"
 msgstr "یادداشت نصب"
 
@@ -33080,7 +33633,7 @@
 msgid "Installation Note Item"
 msgstr "مورد یادداشت نصب"
 
-#: stock/doctype/delivery_note/delivery_note.py:688
+#: stock/doctype/delivery_note/delivery_note.py:749
 msgid "Installation Note {0} has already been submitted"
 msgstr "یادداشت نصب {0} قبلا ارسال شده است"
 
@@ -33145,19 +33698,19 @@
 msgid "Insufficient Capacity"
 msgstr "ظرفیت ناکافی"
 
-#: controllers/accounts_controller.py:3130
-#: controllers/accounts_controller.py:3154
+#: controllers/accounts_controller.py:3221
+#: controllers/accounts_controller.py:3245
 msgid "Insufficient Permissions"
 msgstr "مجوزهای ناکافی"
 
-#: stock/doctype/pick_list/pick_list.py:705
-#: stock/doctype/stock_entry/stock_entry.py:776
-#: stock/serial_batch_bundle.py:880 stock/stock_ledger.py:1369
-#: stock/stock_ledger.py:1840
+#: stock/doctype/pick_list/pick_list.py:776
+#: stock/doctype/stock_entry/stock_entry.py:731
+#: stock/serial_batch_bundle.py:899 stock/stock_ledger.py:1395
+#: stock/stock_ledger.py:1847
 msgid "Insufficient Stock"
 msgstr "موجودی ناکافی"
 
-#: stock/stock_ledger.py:1855
+#: stock/stock_ledger.py:1862
 msgid "Insufficient Stock for Batch"
 msgstr "موجودی ناکافی برای دسته"
 
@@ -33298,11 +33851,11 @@
 msgid "Interest"
 msgstr "علاقه"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2339
+#: accounts/doctype/payment_entry/payment_entry.py:2364
 msgid "Interest and/or dunning fee"
 msgstr "بهره و/یا هزینه اجناس"
 
-#: crm/report/lead_details/lead_details.js:40
+#: crm/report/lead_details/lead_details.js:39
 msgid "Interested"
 msgstr "علاقه مند"
 
@@ -33326,11 +33879,11 @@
 msgid "Internal Customer for company {0} already exists"
 msgstr "مشتری داخلی برای شرکت {0} از قبل وجود دارد"
 
-#: controllers/accounts_controller.py:533
+#: controllers/accounts_controller.py:577
 msgid "Internal Sale or Delivery Reference missing."
 msgstr "مرجع فروش داخلی یا تحویل موجود نیست."
 
-#: controllers/accounts_controller.py:535
+#: controllers/accounts_controller.py:579
 msgid "Internal Sales Reference Missing"
 msgstr "مرجع فروش داخلی وجود ندارد"
 
@@ -33379,7 +33932,7 @@
 msgid "Internal Transfer"
 msgstr "انتقال داخلی"
 
-#: controllers/accounts_controller.py:544
+#: controllers/accounts_controller.py:588
 msgid "Internal Transfer Reference Missing"
 msgstr "مرجع انتقال داخلی وجود ندارد"
 
@@ -33393,7 +33946,7 @@
 msgid "Internal Work History"
 msgstr "سابقه کار داخلی"
 
-#: controllers/stock_controller.py:735
+#: controllers/stock_controller.py:918
 msgid "Internal transfers can only be done in company's default currency"
 msgstr "نقل و انتقالات داخلی فقط با ارز پیش فرض شرکت قابل انجام است"
 
@@ -33428,14 +33981,14 @@
 msgid "Invalid"
 msgstr "بی اعتبار"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:377
-#: accounts/doctype/sales_invoice/sales_invoice.py:876
-#: accounts/doctype/sales_invoice/sales_invoice.py:886
+#: 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:2531
-#: controllers/accounts_controller.py:2537
+#: controllers/accounts_controller.py:2616
+#: controllers/accounts_controller.py:2622
 msgid "Invalid Account"
 msgstr "حساب نامعتبر"
 
@@ -33443,7 +33996,7 @@
 msgid "Invalid Attribute"
 msgstr "ویژگی نامعتبر است"
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 msgid "Invalid Auto Repeat Date"
 msgstr "تاریخ تکرار خودکار نامعتبر است"
 
@@ -33451,7 +34004,7 @@
 msgid "Invalid Barcode. There is no Item attached to this barcode."
 msgstr "بارکد نامعتبر هیچ موردی به این بارکد متصل نیست."
 
-#: public/js/controllers/transaction.js:2360
+#: public/js/controllers/transaction.js:2413
 msgid "Invalid Blanket Order for the selected Customer and Item"
 msgstr "سفارش پتوی نامعتبر برای مشتری و مورد انتخاب شده"
 
@@ -33459,12 +34012,12 @@
 msgid "Invalid Child Procedure"
 msgstr "رویه کودک نامعتبر"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1977
+#: accounts/doctype/sales_invoice/sales_invoice.py:1946
 msgid "Invalid Company for Inter Company Transaction."
 msgstr "شرکت نامعتبر برای معاملات بین شرکتی."
 
-#: assets/doctype/asset/asset.py:249 assets/doctype/asset/asset.py:256
-#: controllers/accounts_controller.py:2552
+#: assets/doctype/asset/asset.py:251 assets/doctype/asset/asset.py:258
+#: controllers/accounts_controller.py:2637
 msgid "Invalid Cost Center"
 msgstr "مرکز هزینه نامعتبر است"
 
@@ -33472,11 +34025,11 @@
 msgid "Invalid Credentials"
 msgstr "گواهی نامه نامعتبر"
 
-#: selling/doctype/sales_order/sales_order.py:318
+#: selling/doctype/sales_order/sales_order.py:321
 msgid "Invalid Delivery Date"
 msgstr "تاریخ تحویل نامعتبر است"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:88
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
 msgid "Invalid Document"
 msgstr "سند نامعتبر"
 
@@ -33489,7 +34042,7 @@
 msgid "Invalid Formula"
 msgstr "فرمول نامعتبر است"
 
-#: assets/doctype/asset/asset.py:367
+#: assets/doctype/asset/asset.py:369
 msgid "Invalid Gross Purchase Amount"
 msgstr "مبلغ خرید ناخالص نامعتبر است"
 
@@ -33501,12 +34054,12 @@
 msgid "Invalid Item"
 msgstr "مورد نامعتبر"
 
-#: stock/doctype/item/item.py:1371
+#: stock/doctype/item/item.py:1372
 msgid "Invalid Item Defaults"
 msgstr "پیش فرض های مورد نامعتبر"
 
 #: accounts/doctype/pos_closing_entry/pos_closing_entry.py:59
-#: accounts/general_ledger.py:677
+#: accounts/general_ledger.py:686
 msgid "Invalid Opening Entry"
 msgstr "ورودی افتتاحیه نامعتبر است"
 
@@ -33514,11 +34067,11 @@
 msgid "Invalid POS Invoices"
 msgstr "فاکتورهای POS نامعتبر"
 
-#: accounts/doctype/account/account.py:320
+#: accounts/doctype/account/account.py:339
 msgid "Invalid Parent Account"
 msgstr "حساب والدین نامعتبر است"
 
-#: public/js/controllers/buying.js:338
+#: public/js/controllers/buying.js:333
 msgid "Invalid Part Number"
 msgstr "شماره قطعه نامعتبر است"
 
@@ -33538,24 +34091,24 @@
 msgid "Invalid Process Loss Configuration"
 msgstr "پیکربندی از دست دادن فرآیند نامعتبر است"
 
-#: accounts/doctype/payment_entry/payment_entry.py:599
+#: accounts/doctype/payment_entry/payment_entry.py:608
 msgid "Invalid Purchase Invoice"
 msgstr "فاکتور خرید نامعتبر"
 
-#: controllers/accounts_controller.py:3169
+#: controllers/accounts_controller.py:3260
 msgid "Invalid Qty"
 msgstr "تعداد نامعتبر است"
 
-#: controllers/accounts_controller.py:1021
+#: controllers/accounts_controller.py:1085
 msgid "Invalid Quantity"
 msgstr "مقدار نامعتبر"
 
-#: assets/doctype/asset/asset.py:411 assets/doctype/asset/asset.py:417
-#: assets/doctype/asset/asset.py:444
+#: assets/doctype/asset/asset.py:413 assets/doctype/asset/asset.py:419
+#: assets/doctype/asset/asset.py:446
 msgid "Invalid Schedule"
 msgstr "زمانبندی نامعتبر است"
 
-#: controllers/selling_controller.py:225
+#: controllers/selling_controller.py:226
 msgid "Invalid Selling Price"
 msgstr "قیمت فروش نامعتبر"
 
@@ -33588,22 +34141,21 @@
 msgid "Invalid reference {0} {1}"
 msgstr "مرجع نامعتبر {0} {1}"
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:101
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:102
 msgid "Invalid result key. Response:"
 msgstr "کلید نتیجه نامعتبر است. واکنش:"
 
-#: accounts/doctype/gl_entry/gl_entry.py:229
-#: accounts/doctype/gl_entry/gl_entry.py:239
 #: 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
 msgid "Invalid value {0} for {1} against account {2}"
 msgstr "مقدار {0} برای {1} در برابر حساب {2} نامعتبر است"
 
-#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:569
+#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:642
 msgid "Invalid {0}"
 msgstr "{0} نامعتبر است"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1975
+#: accounts/doctype/sales_invoice/sales_invoice.py:1944
 msgid "Invalid {0} for Inter Company Transaction."
 msgstr "{0} برای تراکنش بین شرکتی نامعتبر است."
 
@@ -33623,7 +34175,7 @@
 msgid "Inventory Dimension"
 msgstr "ابعاد موجودی"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:147
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:157
 msgid "Inventory Dimension Negative Stock"
 msgstr "ابعاد موجودی منفی"
 
@@ -33681,7 +34233,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/invoice_discounting/invoice_discounting.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:144
+#: accounts/doctype/sales_invoice/sales_invoice.js:151
 msgid "Invoice Discounting"
 msgstr "تخفیف فاکتور"
 
@@ -33692,7 +34244,7 @@
 msgid "Invoice Discounting"
 msgstr "تخفیف فاکتور"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1065
+#: accounts/report/accounts_receivable/accounts_receivable.py:1073
 msgid "Invoice Grand Total"
 msgstr "فاکتور گرند توتال"
 
@@ -33769,7 +34321,8 @@
 msgid "Invoice Status"
 msgstr "وضعیت فاکتور"
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:7
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:85
 msgid "Invoice Type"
 msgstr "نوع فاکتور"
 
@@ -33804,7 +34357,7 @@
 msgid "Invoice Type"
 msgstr "نوع فاکتور"
 
-#: projects/doctype/timesheet/timesheet.py:376
+#: projects/doctype/timesheet/timesheet.py:386
 msgid "Invoice already created for all billing hours"
 msgstr "فاکتور قبلاً برای تمام ساعات صورت‌حساب ایجاد شده است"
 
@@ -33814,12 +34367,13 @@
 msgid "Invoice and Billing"
 msgstr "فاکتور و صورتحساب"
 
-#: projects/doctype/timesheet/timesheet.py:373
+#: projects/doctype/timesheet/timesheet.py:383
 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.py:1067
+#: 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
 msgid "Invoiced Amount"
@@ -33829,7 +34383,7 @@
 msgid "Invoiced Qty"
 msgstr "تعداد فاکتور"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2028
+#: accounts/doctype/sales_invoice/sales_invoice.py:1997
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
 msgid "Invoices"
 msgstr "فاکتورها"
@@ -33911,7 +34465,7 @@
 msgid "Is Account Payable"
 msgstr "آیا حساب قابل پرداخت است"
 
-#: projects/report/project_summary/project_summary.js:17
+#: projects/report/project_summary/project_summary.js:16
 msgid "Is Active"
 msgstr "فعال است"
 
@@ -33970,7 +34524,7 @@
 msgid "Is Advance"
 msgstr "پیشرفته است"
 
-#: selling/doctype/quotation/quotation.js:294
+#: selling/doctype/quotation/quotation.js:306
 msgid "Is Alternative"
 msgstr "جایگزین است"
 
@@ -34278,9 +34832,9 @@
 msgid "Is Fully Depreciated"
 msgstr "کاملا مستهلک شده"
 
-#: accounts/doctype/account/account_tree.js:110
-#: accounts/doctype/cost_center/cost_center_tree.js:23
-#: stock/doctype/warehouse/warehouse_tree.js:16
+#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/cost_center/cost_center_tree.js:30
+#: stock/doctype/warehouse/warehouse_tree.js:20
 msgid "Is Group"
 msgstr "گروه است"
 
@@ -34554,7 +35108,13 @@
 msgid "Is Rejected"
 msgstr "رد شده است"
 
-#: accounts/report/pos_register/pos_register.js:64
+#. Label of a Check field in DocType 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "Is Rejected Warehouse"
+msgstr ""
+
+#: accounts/report/pos_register/pos_register.js:63
 #: accounts/report/pos_register/pos_register.py:226
 msgid "Is Return"
 msgstr "بازگشت است"
@@ -34704,7 +35264,7 @@
 msgstr "آیا این مالیات شامل نرخ پایه می شود؟"
 
 #. Name of a DocType
-#: assets/doctype/asset/asset_list.js:26 public/js/communication.js:12
+#: assets/doctype/asset/asset_list.js:19 public/js/communication.js:13
 #: support/doctype/issue/issue.json
 msgid "Issue"
 msgstr "موضوع"
@@ -34769,15 +35329,15 @@
 msgid "Issue Date"
 msgstr "تاریخ صدور"
 
-#: stock/doctype/material_request/material_request.js:127
+#: stock/doctype/material_request/material_request.js:138
 msgid "Issue Material"
 msgstr "موضوع موضوع"
 
 #. Name of a DocType
 #: support/doctype/issue_priority/issue_priority.json
-#: support/report/issue_analytics/issue_analytics.js:64
+#: support/report/issue_analytics/issue_analytics.js:63
 #: support/report/issue_analytics/issue_analytics.py:64
-#: support/report/issue_summary/issue_summary.js:52
+#: support/report/issue_summary/issue_summary.js:51
 #: support/report/issue_summary/issue_summary.py:61
 msgid "Issue Priority"
 msgstr "اولویت موضوع"
@@ -34825,7 +35385,7 @@
 msgid "Issue a debit note with 0 qty against an existing Sales Invoice"
 msgstr "در مقابل فاکتور فروش موجود، یک برگه بدهی با مقدار 0 صادر کنید"
 
-#: stock/doctype/material_request/material_request_list.js:29
+#: stock/doctype/material_request/material_request_list.js:33
 msgid "Issued"
 msgstr "صادر شده"
 
@@ -34877,70 +35437,79 @@
 msgid "It can take upto few hours for accurate stock values to be visible after merging items."
 msgstr "ممکن است چند ساعت طول بکشد تا ارزش موجودی دقیق پس از ادغام اقلام قابل مشاهده باشد."
 
-#: public/js/controllers/transaction.js:1839
+#: public/js/controllers/transaction.js:1882
 msgid "It is needed to fetch Item Details."
 msgstr "برای واکشی جزئیات مورد نیاز است."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:135
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:156
 msgid "It's not possible to distribute charges equally when total amount is zero, please set 'Distribute Charges Based On' as 'Quantity'"
 msgstr "وقتی مبلغ کل صفر است، نمی توان هزینه ها را به طور مساوی تقسیم کرد، لطفاً «توزیع هزینه ها بر اساس» را به عنوان «تعداد» تنظیم کنید."
 
 #. Name of a DocType
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:16
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:15
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:32
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:22
 #: buying/report/procurement_tracker/procurement_tracker.py:60
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:50
+#: 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:1018
+#: controllers/taxes_and_totals.py:1019
+#: 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_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:67
-#: manufacturing/report/process_loss_report/process_loss_report.js:16
+#: 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
-#: public/js/bom_configurator/bom_configurator.bundle.js:202
-#: public/js/bom_configurator/bom_configurator.bundle.js:270
+#: 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
 #: public/js/purchase_trends_filters.js:48
-#: public/js/purchase_trends_filters.js:65 public/js/sales_trends_filters.js:23
-#: public/js/sales_trends_filters.js:41 public/js/stock_analytics.js:61
-#: selling/doctype/sales_order/sales_order.js:977
-#: selling/report/customer_wise_item_price/customer_wise_item_price.js:15
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:37
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:63
-#: stock/dashboard/item_dashboard.js:208 stock/doctype/item/item.json
+#: public/js/purchase_trends_filters.js:63 public/js/sales_trends_filters.js:23
+#: public/js/sales_trends_filters.js:39 public/js/stock_analytics.js:92
+#: selling/doctype/sales_order/sales_order.js:1139
+#: selling/page/point_of_sale/pos_item_cart.js:46
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:14
+#: 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/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
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:24
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:32
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:74
-#: stock/report/item_price_stock/item_price_stock.js:9
+#: stock/report/item_price_stock/item_price_stock.js:8
 #: 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:11
+#: stock/report/item_variant_details/item_variant_details.js:10
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55
 #: 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:33
+#: stock/report/reserved_stock/reserved_stock.js:30
 #: stock/report/reserved_stock/reserved_stock.py:103
 #: 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:16
+#: stock/report/stock_analytics/stock_analytics.js:15
 #: stock/report/stock_analytics/stock_analytics.py:30
 #: stock/report/stock_balance/stock_balance.js:39
-#: stock/report/stock_balance/stock_balance.py:361
+#: stock/report/stock_balance/stock_balance.py:369
 #: stock/report/stock_ledger/stock_ledger.js:42
-#: stock/report/stock_ledger/stock_ledger.py:109
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:32
+#: 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 templates/generators/bom.html:19
-#: templates/pages/material_request_info.html:42 templates/pages/order.html:83
+#: templates/emails/reorder_item.html:8
+#: templates/form_grid/material_request_grid.html:6
+#: templates/form_grid/stock_entry_grid.html:8 templates/generators/bom.html:19
+#: templates/pages/material_request_info.html:42 templates/pages/order.html:95
 msgid "Item"
 msgstr "آیتم"
 
@@ -35134,6 +35703,10 @@
 msgid "Item Barcode"
 msgstr "بارکد آیتم"
 
+#: selling/page/point_of_sale/pos_item_cart.js:46
+msgid "Item Cart"
+msgstr ""
+
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:69
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:36
 #: accounts/report/gross_profit/gross_profit.py:224
@@ -35143,40 +35716,41 @@
 #: 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/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:9
+#: 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/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:76
+#: 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/quality_inspection_summary/quality_inspection_summary.js:28
+#: 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:187
-#: public/js/controllers/transaction.js:2112 public/js/utils.js:459
-#: public/js/utils.js:606 selling/doctype/quotation/quotation.js:268
-#: selling/doctype/sales_order/sales_order.js:291
-#: selling/doctype/sales_order/sales_order.js:392
-#: selling/doctype/sales_order/sales_order.js:682
-#: selling/doctype/sales_order/sales_order.js:806
+#: 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
+#: selling/doctype/sales_order/sales_order.js:318
+#: selling/doctype/sales_order/sales_order.js:422
+#: selling/doctype/sales_order/sales_order.js:784
+#: selling/doctype/sales_order/sales_order.js:926
 #: selling/report/customer_wise_item_price/customer_wise_item_price.py:29
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:27
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:19
 #: selling/report/sales_order_analysis/sales_order_analysis.py:241
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:86
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:16
+#: 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:8
+#: 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/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:8
+#: stock/report/serial_no_ledger/serial_no_ledger.js:7
 #: stock/report/stock_ageing/stock_ageing.py:119
 #: 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
@@ -35568,7 +36142,7 @@
 msgid "Item Code"
 msgstr "کد آیتم"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:61
+#: manufacturing/doctype/bom_creator/bom_creator.js:60
 msgid "Item Code (Final Product)"
 msgstr "کد آیتم (محصول نهایی)"
 
@@ -35576,12 +36150,12 @@
 msgid "Item Code cannot be changed for Serial No."
 msgstr "کد آیتم را نمی توان برای شماره سریال تغییر داد."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:444
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:448
 msgid "Item Code required at Row No {0}"
 msgstr "کد آیتم در ردیف شماره {0} مورد نیاز است"
 
-#: selling/page/point_of_sale/pos_controller.js:672
-#: selling/page/point_of_sale/pos_item_details.js:251
+#: selling/page/point_of_sale/pos_controller.js:704
+#: selling/page/point_of_sale/pos_item_details.js:262
 msgid "Item Code: {0} is not available under warehouse {1}."
 msgstr "کد آیتم: {0} در انبار {1} موجود نیست."
 
@@ -35649,6 +36223,10 @@
 msgid "Item Description"
 msgstr "توضیحات مورد"
 
+#: selling/page/point_of_sale/pos_item_details.js:28
+msgid "Item Details"
+msgstr "جزئیات مورد"
+
 #. Label of a Section Break field in DocType 'Production Plan Sub Assembly
 #. Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -35657,9 +36235,9 @@
 msgstr "جزئیات مورد"
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:43
+#: accounts/report/gross_profit/gross_profit.js:44
 #: accounts/report/gross_profit/gross_profit.py:237
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:22
+#: 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
@@ -35667,36 +36245,38 @@
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:181
 #: accounts/report/purchase_register/purchase_register.js:58
 #: accounts/report/sales_register/sales_register.js:70
+#: manufacturing/doctype/plant_floor/plant_floor.js:100
+#: manufacturing/doctype/workstation/workstation_job_card.html:94
 #: public/js/purchase_trends_filters.js:49 public/js/sales_trends_filters.js:24
-#: selling/page/point_of_sale/pos_item_selector.js:159
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:31
+#: selling/page/point_of_sale/pos_item_selector.js:156
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:30
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:35
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:55
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:54
 #: selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:89
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:42
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:41
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:54
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:41
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:93
+#: 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/delayed_item_report/delayed_item_report.js:49
-#: stock/report/delayed_order_report/delayed_order_report.js:49
+#: 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/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_analytics/stock_analytics.js:9
+#: stock/report/stock_analytics/stock_analytics.js:8
 #: stock/report/stock_analytics/stock_analytics.py:39
 #: stock/report/stock_balance/stock_balance.js:32
-#: stock/report/stock_balance/stock_balance.py:369
+#: stock/report/stock_balance/stock_balance.py:377
 #: stock/report/stock_ledger/stock_ledger.js:53
-#: stock/report/stock_ledger/stock_ledger.py:174
+#: stock/report/stock_ledger/stock_ledger.py:247
 #: stock/report/stock_projected_qty/stock_projected_qty.js:39
 #: stock/report/stock_projected_qty/stock_projected_qty.py:108
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:25
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:24
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:94
 msgid "Item Group"
 msgstr "گروه آیتم"
@@ -35916,7 +36496,7 @@
 msgid "Item Group Name"
 msgstr "نام گروه آیتم"
 
-#: setup/doctype/item_group/item_group.js:65
+#: setup/doctype/item_group/item_group.js:82
 msgid "Item Group Tree"
 msgstr "درخت گروه مورد"
 
@@ -35982,7 +36562,8 @@
 #: 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
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:95
+#: 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
@@ -35991,7 +36572,7 @@
 #: manufacturing/report/production_planning_report/production_planning_report.py:356
 #: 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:2118
+#: public/js/controllers/transaction.js:2161
 #: 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
@@ -36005,8 +36586,8 @@
 #: 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:367
-#: stock/report/stock_ledger/stock_ledger.py:115
+#: stock/report/stock_balance/stock_balance.py:375
+#: 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
@@ -36389,15 +36970,15 @@
 msgid "Item Price Stock"
 msgstr "موجودی قیمت کالا"
 
-#: stock/get_item_details.py:878
+#: stock/get_item_details.py:889
 msgid "Item Price added for {0} in Price List {1}"
 msgstr "قیمت مورد برای {0} در لیست قیمت {1} اضافه شد"
 
-#: stock/doctype/item_price/item_price.py:142
+#: stock/doctype/item_price/item_price.py:136
 msgid "Item Price appears multiple times based on Price List, Supplier/Customer, Currency, Item, Batch, UOM, Qty, and Dates."
 msgstr "قیمت مورد چندین بار بر اساس لیست قیمت، تامین کننده/مشتری، ارز، مورد، دسته، UOM، تعداد و تاریخ ها ظاهر می شود."
 
-#: stock/get_item_details.py:862
+#: stock/get_item_details.py:873
 msgid "Item Price updated for {0} in Price List {1}"
 msgstr "قیمت مورد برای {0} در فهرست قیمت {1} به روز شد"
 
@@ -36441,7 +37022,7 @@
 msgid "Item Reorder"
 msgstr "سفارش مجدد آیتم"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:130
 msgid "Item Row {0}: {1} {2} does not exist in above '{1}' table"
 msgstr "ردیف مورد {0}: {1} {2} در جدول بالا \"{1}\" وجود ندارد"
 
@@ -36655,7 +37236,7 @@
 msgstr "جزئیات نوع مورد"
 
 #. Name of a DocType
-#: stock/doctype/item/item.js:94
+#: stock/doctype/item/item.js:114
 #: stock/doctype/item_variant_settings/item_variant_settings.json
 msgid "Item Variant Settings"
 msgstr "تنظیمات متغیر مورد"
@@ -36666,7 +37247,7 @@
 msgid "Item Variant Settings"
 msgstr "تنظیمات متغیر مورد"
 
-#: stock/doctype/item/item.js:667
+#: stock/doctype/item/item.js:744
 msgid "Item Variant {0} already exists with same attributes"
 msgstr "نوع مورد {0} در حال حاضر با همان ویژگی ها وجود دارد"
 
@@ -36761,7 +37342,7 @@
 msgid "Item and Warranty Details"
 msgstr "جزئیات مورد و گارانتی"
 
-#: stock/doctype/stock_entry/stock_entry.py:2325
+#: stock/doctype/stock_entry/stock_entry.py:2359
 msgid "Item for row {0} does not match Material Request"
 msgstr "مورد ردیف {0} با درخواست مواد مطابقت ندارد"
 
@@ -36769,16 +37350,16 @@
 msgid "Item has variants."
 msgstr "مورد دارای انواع است."
 
-#: selling/page/point_of_sale/pos_item_details.js:110
+#: selling/page/point_of_sale/pos_item_details.js:108
 msgid "Item is removed since no serial / batch no selected."
 msgstr "مورد حذف شده است زیرا هیچ سریال / دسته ای انتخاب نشده است."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:105
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:126
 msgid "Item must be added using 'Get Items from Purchase Receipts' button"
 msgstr "مورد باید با استفاده از دکمه \"دریافت موارد از رسید خرید\" اضافه شود"
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: selling/doctype/sales_order/sales_order.js:984
+#: selling/doctype/sales_order/sales_order.js:1146
 msgid "Item name"
 msgstr "نام آیتم"
 
@@ -36788,11 +37369,11 @@
 msgid "Item operation"
 msgstr "عملیات آیتم"
 
-#: controllers/accounts_controller.py:3196
+#: controllers/accounts_controller.py:3287
 msgid "Item qty can not be updated as raw materials are already processed."
 msgstr "تعداد مورد را نمی توان به روز کرد زیرا مواد خام قبلاً پردازش شده است."
 
-#: stock/doctype/stock_entry/stock_entry.py:857
+#: stock/doctype/stock_entry/stock_entry.py:813
 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
 msgstr "نرخ مورد به صفر به‌روزرسانی شده است زیرا نرخ ارزش گذاری مجاز صفر برای مورد {0} بررسی می‌شود"
 
@@ -36802,7 +37383,11 @@
 msgid "Item to be manufactured or repacked"
 msgstr "موردی که باید تولید یا بسته بندی شود"
 
-#: stock/utils.py:564
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Item valuation rate is recalculated considering landed cost voucher amount"
+msgstr ""
+
+#: stock/utils.py:559
 msgid "Item valuation reposting in progress. Report might show incorrect item valuation."
 msgstr "ارسال مجدد ارزیابی آیتم در حال انجام است. گزارش ممکن است ارزش گذاری اقلام نادرست را نشان دهد."
 
@@ -36814,11 +37399,11 @@
 msgid "Item {0} cannot be added as a sub-assembly of itself"
 msgstr "مورد {0} را نمی توان به عنوان یک مجموعه فرعی از خودش اضافه کرد"
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:146
+#: manufacturing/doctype/blanket_order/blanket_order.py:189
 msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
 msgstr "مورد {0} را نمی توان بیش از {1} در مقابل سفارش بلانکت {2} سفارش داد."
 
-#: assets/doctype/asset/asset.py:231 stock/doctype/item/item.py:603
+#: assets/doctype/asset/asset.py:233 stock/doctype/item/item.py:603
 msgid "Item {0} does not exist"
 msgstr "مورد {0} وجود ندارد"
 
@@ -36826,7 +37411,7 @@
 msgid "Item {0} does not exist in the system or has expired"
 msgstr "مورد {0} در سیستم وجود ندارد یا منقضی شده است"
 
-#: controllers/selling_controller.py:655
+#: controllers/selling_controller.py:679
 msgid "Item {0} entered multiple times."
 msgstr "مورد {0} چندین بار وارد شده است."
 
@@ -36834,11 +37419,11 @@
 msgid "Item {0} has already been returned"
 msgstr "مورد {0} قبلاً برگردانده شده است"
 
-#: assets/doctype/asset/asset.py:233
+#: assets/doctype/asset/asset.py:235
 msgid "Item {0} has been disabled"
 msgstr "مورد {0} غیرفعال شده است"
 
-#: selling/doctype/sales_order/sales_order.py:645
+#: selling/doctype/sales_order/sales_order.py:651
 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No"
 msgstr ""
 
@@ -36846,7 +37431,7 @@
 msgid "Item {0} has reached its end of life on {1}"
 msgstr "مورد {0} در تاریخ {1} به پایان عمر خود رسیده است"
 
-#: stock/stock_ledger.py:111
+#: stock/stock_ledger.py:113
 msgid "Item {0} ignored since it is not a stock item"
 msgstr "مورد {0} نادیده گرفته شد زیرا کالای موجودی نیست"
 
@@ -36870,43 +37455,43 @@
 msgid "Item {0} is not a stock Item"
 msgstr "مورد {0} یک مورد موجودی نیست"
 
-#: stock/doctype/stock_entry/stock_entry.py:1538
+#: stock/doctype/stock_entry/stock_entry.py:1547
 msgid "Item {0} is not active or end of life has been reached"
 msgstr "مورد {0} فعال نیست یا به پایان عمر رسیده است"
 
-#: assets/doctype/asset/asset.py:235
+#: assets/doctype/asset/asset.py:237
 msgid "Item {0} must be a Fixed Asset Item"
 msgstr "مورد {0} باید یک مورد دارایی ثابت باشد"
 
-#: stock/get_item_details.py:228
+#: stock/get_item_details.py:233
 msgid "Item {0} must be a Non-Stock Item"
 msgstr "مورد {0} باید یک کالای غیر موجودی باشد"
 
-#: stock/get_item_details.py:225
+#: stock/get_item_details.py:230
 msgid "Item {0} must be a Sub-contracted Item"
 msgstr "مورد {0} باید یک مورد قرارداد فرعی باشد"
 
-#: assets/doctype/asset/asset.py:237
+#: assets/doctype/asset/asset.py:239
 msgid "Item {0} must be a non-stock item"
 msgstr "مورد {0} باید یک کالای غیر موجودی باشد"
 
-#: stock/doctype/stock_entry/stock_entry.py:1086
+#: stock/doctype/stock_entry/stock_entry.py:1095
 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}"
 msgstr "مورد {0} در جدول \"مواد خام تامین شده\" در {1} {2} یافت نشد"
 
-#: stock/doctype/item_price/item_price.py:57
+#: stock/doctype/item_price/item_price.py:56
 msgid "Item {0} not found."
 msgstr "مورد {0} یافت نشد."
 
-#: buying/doctype/purchase_order/purchase_order.py:342
+#: buying/doctype/purchase_order/purchase_order.py:343
 msgid "Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item)."
 msgstr "مورد {0}: تعداد سفارش‌شده {1} نمی‌تواند کمتر از حداقل تعداد سفارش {2} (تعریف شده در مورد) باشد."
 
-#: manufacturing/doctype/production_plan/production_plan.js:418
+#: manufacturing/doctype/production_plan/production_plan.js:453
 msgid "Item {0}: {1} qty produced. "
 msgstr " مورد {0}: تعداد {1} تولید شده است."
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1131
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1190
 msgid "Item {} does not exist."
 msgstr "مورد {} وجود ندارد."
 
@@ -36952,9 +37537,12 @@
 msgid "Item: {0} does not exist in the system"
 msgstr "مورد: {0} در سیستم وجود ندارد"
 
-#: public/js/utils.js:442 setup/doctype/item_group/item_group.js:70
-#: stock/doctype/delivery_note/delivery_note.js:364
-#: templates/generators/bom.html:38 templates/pages/rfq.html:37
+#: public/js/utils.js:489
+#: 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
+#: templates/form_grid/item_grid.html:6 templates/generators/bom.html:38
+#: templates/pages/rfq.html:37
 msgid "Items"
 msgstr "موارد"
 
@@ -37125,8 +37713,8 @@
 msgid "Items Filter"
 msgstr "فیلتر موارد"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1462
-#: selling/doctype/sales_order/sales_order.js:1018
+#: manufacturing/doctype/production_plan/production_plan.py:1484
+#: selling/doctype/sales_order/sales_order.js:1182
 msgid "Items Required"
 msgstr "موارد مورد نیاز"
 
@@ -37142,15 +37730,15 @@
 msgid "Items and Pricing"
 msgstr ""
 
-#: controllers/accounts_controller.py:3416
+#: controllers/accounts_controller.py:3507
 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
 msgstr "موارد را نمی توان به روز کرد زیرا سفارش قرارداد فرعی در برابر سفارش خرید {0} ایجاد شده است."
 
-#: selling/doctype/sales_order/sales_order.js:824
+#: selling/doctype/sales_order/sales_order.js:962
 msgid "Items for Raw Material Request"
 msgstr "اقلام برای درخواست مواد خام"
 
-#: stock/doctype/stock_entry/stock_entry.py:853
+#: stock/doctype/stock_entry/stock_entry.py:809
 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}"
 msgstr "نرخ اقلام به صفر به‌روزرسانی شده است زیرا نرخ ارزش گذاری مجاز صفر برای موارد زیر بررسی می‌شود: {0}"
 
@@ -37160,7 +37748,7 @@
 msgid "Items to Be Repost"
 msgstr "مواردی که باید بازنشر شوند"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1461
+#: manufacturing/doctype/production_plan/production_plan.py:1483
 msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
 msgstr "اقلام برای تولید برای کشیدن مواد خام مرتبط با آن مورد نیاز است."
 
@@ -37169,11 +37757,11 @@
 msgid "Items to Order and Receive"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:252
+#: selling/doctype/sales_order/sales_order.js:278
 msgid "Items to Reserve"
 msgstr "موارد برای رزرو"
 
-#. Description of the 'Parent Warehouse' (Link) field in DocType 'Pick List'
+#. Description of the 'Warehouse' (Link) field in DocType 'Pick List'
 #: stock/doctype/pick_list/pick_list.json
 msgctxt "Pick List"
 msgid "Items under this warehouse will be suggested"
@@ -37198,11 +37786,18 @@
 msgid "JAN"
 msgstr "ژان"
 
+#. Label of a Int field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Capacity"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/job_card/job_card.json
-#: manufacturing/doctype/job_card/job_card.py:765
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:28
+#: manufacturing/doctype/job_card/job_card.py:772
+#: 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
 msgid "Job Card"
 msgstr "کارت شغلی"
@@ -37306,11 +37901,17 @@
 msgid "Job Card Time Log"
 msgstr "گزارش زمان کارت شغلی"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:94
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Cards"
+msgstr ""
+
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:95
 msgid "Job Paused"
 msgstr "کار متوقف شد"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:54
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:53
 msgid "Job Started"
 msgstr "کار شروع شد"
 
@@ -37332,11 +37933,11 @@
 msgid "Job Title"
 msgstr "عنوان شغلی"
 
-#: manufacturing/doctype/work_order/work_order.py:1562
+#: manufacturing/doctype/work_order/work_order.py:1576
 msgid "Job card {0} created"
 msgstr "کارت شغلی {0} ایجاد شد"
 
-#: utilities/bulk_transaction.py:48
+#: utilities/bulk_transaction.py:52
 msgid "Job: {0} has been triggered for processing failed transactions"
 msgstr "شغل: {0} برای پردازش تراکنش های ناموفق فعال شده است"
 
@@ -37350,19 +37951,20 @@
 msgid "Joining"
 msgstr "پیوستن"
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:29
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:30
 msgid "Journal Entries"
 msgstr "نوشته های مجله"
 
-#: accounts/utils.py:866
+#: accounts/utils.py:875
 msgid "Journal Entries {0} are un-linked"
 msgstr "ورودی های مجله {0} لغو پیوند هستند"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:146
+#: accounts/doctype/account/account_tree.js:205
 #: accounts/doctype/journal_entry/journal_entry.json
 #: accounts/print_format/journal_auditing_voucher/journal_auditing_voucher.html:10
-#: assets/doctype/asset/asset.js:246 assets/doctype/asset/asset.js:249
+#: assets/doctype/asset/asset.js:282 assets/doctype/asset/asset.js:291
+#: templates/form_grid/bank_reconciliation_grid.html:3
 msgid "Journal Entry"
 msgstr "مطلب ثبت شده در دفتر وقایع روزانه"
 
@@ -37447,7 +38049,7 @@
 msgid "Journal Entry Type"
 msgstr "نوع ورودی مجله"
 
-#: accounts/doctype/journal_entry/journal_entry.py:471
+#: accounts/doctype/journal_entry/journal_entry.py:487
 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset."
 msgstr "ورود مجله برای حذف دارایی را نمی توان لغو کرد. لطفا دارایی را بازیابی کنید."
 
@@ -37457,11 +38059,11 @@
 msgid "Journal Entry for Scrap"
 msgstr "ورودی مجله برای قراضه"
 
-#: accounts/doctype/journal_entry/journal_entry.py:232
+#: accounts/doctype/journal_entry/journal_entry.py:248
 msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
 msgstr "نوع ورود مجله باید به عنوان ورودی استهلاک برای استهلاک دارایی تنظیم شود"
 
-#: accounts/doctype/journal_entry/journal_entry.py:597
+#: accounts/doctype/journal_entry/journal_entry.py:624
 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
 msgstr "ورودی مجله {0} دارای حساب {1} نیست یا قبلاً با سایر کوپن مطابقت دارد"
 
@@ -37471,14 +38073,19 @@
 msgid "Journals"
 msgstr "مجلات"
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:95
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:99
 msgid "Journals have been created"
 msgstr "مجلات ایجاد شده است"
 
-#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:104
 msgid "Kanban Board"
 msgstr "هیئت کانبان"
 
+#. Description of a DocType
+#: crm/doctype/campaign/campaign.json
+msgid "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. "
+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"
@@ -37499,11 +38106,11 @@
 msgid "Key Reports"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:768
+#: manufacturing/doctype/job_card/job_card.py:775
 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}."
 msgstr "لطفاً ابتدا ورودی‌های ساخت را در برابر سفارش کاری {0} لغو کنید."
 
-#: public/js/utils/party.js:221
+#: public/js/utils/party.js:264
 msgid "Kindly select the company first"
 msgstr "لطفا ابتدا شرکت را انتخاب کنید"
 
@@ -37643,7 +38250,7 @@
 msgid "Last Name"
 msgstr "نام خانوادگی"
 
-#: stock/doctype/shipment/shipment.js:247
+#: stock/doctype/shipment/shipment.js:275
 msgid "Last Name, Email or Phone/Mobile of the user are mandatory to continue."
 msgstr "نام خانوادگی، ایمیل یا تلفن / تلفن همراه کاربر برای ادامه اجباری است."
 
@@ -37686,7 +38293,7 @@
 msgid "Last Purchase Rate"
 msgstr "آخرین نرخ خرید"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:313
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:324
 msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
 msgstr "آخرین معامله موجودی کالای {0} در انبار {1} در تاریخ {2} انجام شد."
 
@@ -37698,7 +38305,7 @@
 msgid "Latest"
 msgstr "آخرین"
 
-#: stock/report/stock_balance/stock_balance.py:479
+#: stock/report/stock_balance/stock_balance.py:487
 msgid "Latest Age"
 msgstr "آخرین سن"
 
@@ -37715,11 +38322,11 @@
 msgstr "عرض جغرافیایی"
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:34
+#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:33
 #: crm/report/lead_details/lead_details.py:18
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:8
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:28
-#: public/js/communication.js:20
+#: public/js/communication.js:25
 msgid "Lead"
 msgstr "سرنخ"
 
@@ -37984,9 +38591,9 @@
 msgid "Leave blank to use the standard Delivery Note format"
 msgstr "برای استفاده از قالب استاندارد یادداشت تحویل، خالی بگذارید"
 
-#: accounts/doctype/journal_entry/journal_entry.js:18
-#: accounts/doctype/payment_entry/payment_entry.js:265
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:24
+#: accounts/doctype/journal_entry/journal_entry.js:54
+#: accounts/doctype/payment_entry/payment_entry.js:343
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:25
 msgid "Ledger"
 msgstr "دفتر کل"
 
@@ -38029,10 +38636,15 @@
 msgid "Left Index"
 msgstr "فهرست چپ"
 
-#: setup/doctype/company/company.py:389
+#: setup/doctype/company/company.py:388
 msgid "Legal"
 msgstr "مجاز"
 
+#. Description of a DocType
+#: setup/doctype/company/company.json
+msgid "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization."
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:59
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:84
 msgid "Legal Expenses"
@@ -38058,7 +38670,7 @@
 msgid "Length (cm)"
 msgstr "طول (سانتی متر)"
 
-#: accounts/doctype/payment_entry/payment_entry.js:657
+#: accounts/doctype/payment_entry/payment_entry.js:807
 msgid "Less Than Amount"
 msgstr "کمتر از مقدار"
 
@@ -38379,7 +38991,7 @@
 msgid "Liabilities"
 msgstr "بدهی ها"
 
-#: accounts/report/account_balance/account_balance.js:27
+#: accounts/report/account_balance/account_balance.js:26
 msgid "Liability"
 msgstr "مسئولیت"
 
@@ -38476,20 +39088,20 @@
 msgid "Link existing Quality Procedure."
 msgstr "پیوند رویه کیفیت موجود"
 
-#: buying/doctype/purchase_order/purchase_order.js:487
+#: buying/doctype/purchase_order/purchase_order.js:564
 msgid "Link to Material Request"
 msgstr "پیوند به درخواست مواد"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:378
-#: buying/doctype/supplier_quotation/supplier_quotation.js:52
+#: buying/doctype/request_for_quotation/request_for_quotation.js:407
+#: buying/doctype/supplier_quotation/supplier_quotation.js:54
 msgid "Link to Material Requests"
 msgstr "پیوند به درخواست های مواد"
 
-#: buying/doctype/supplier/supplier.js:107
+#: buying/doctype/supplier/supplier.js:133
 msgid "Link with Customer"
 msgstr "پیوند با مشتری"
 
-#: selling/doctype/customer/customer.js:173
+#: selling/doctype/customer/customer.js:189
 msgid "Link with Supplier"
 msgstr "پیوند با تامین کننده"
 
@@ -38514,16 +39126,16 @@
 msgid "Linked with submitted documents"
 msgstr "مرتبط با اسناد ارسالی"
 
-#: buying/doctype/supplier/supplier.js:185
-#: selling/doctype/customer/customer.js:230
+#: buying/doctype/supplier/supplier.js:218
+#: selling/doctype/customer/customer.js:251
 msgid "Linking Failed"
 msgstr "پیوند ناموفق بود"
 
-#: buying/doctype/supplier/supplier.js:184
+#: buying/doctype/supplier/supplier.js:217
 msgid "Linking to Customer Failed. Please try again."
 msgstr "پیوند به مشتری انجام نشد. لطفا دوباره تلاش کنید."
 
-#: selling/doctype/customer/customer.js:229
+#: selling/doctype/customer/customer.js:250
 msgid "Linking to Supplier Failed. Please try again."
 msgstr "پیوند به تامین کننده انجام نشد. لطفا دوباره تلاش کنید."
 
@@ -38545,7 +39157,7 @@
 msgid "Load All Criteria"
 msgstr "بارگیری همه معیارها"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:298
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:276
 msgid "Loading import file..."
 msgstr "در حال بارگیری فایل واردات..."
 
@@ -38654,6 +39266,11 @@
 msgid "Log Entries"
 msgstr "ورودی های ورود"
 
+#. Description of a DocType
+#: stock/doctype/item_price/item_price.json
+msgid "Log the selling and buying rate of an Item"
+msgstr ""
+
 #. Label of a Attach Image field in DocType 'Manufacturer'
 #: stock/doctype/manufacturer/manufacturer.json
 msgctxt "Manufacturer"
@@ -38679,7 +39296,7 @@
 msgstr "طول جغرافیایی"
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:7
-#: selling/doctype/quotation/quotation_list.js:33
+#: selling/doctype/quotation/quotation_list.js:32
 msgid "Lost"
 msgstr "گمشده"
 
@@ -38706,7 +39323,7 @@
 msgid "Lost Opportunity"
 msgstr "فرصت از دست رفته"
 
-#: crm/report/lead_details/lead_details.js:39
+#: crm/report/lead_details/lead_details.js:38
 msgid "Lost Quotation"
 msgstr "نقل قول گمشده"
 
@@ -38726,7 +39343,7 @@
 msgid "Lost Quotations %"
 msgstr ""
 
-#: crm/report/lost_opportunity/lost_opportunity.js:31
+#: crm/report/lost_opportunity/lost_opportunity.js:30
 #: selling/report/lost_quotations/lost_quotations.py:24
 msgid "Lost Reason"
 msgstr "دلیل گم شده"
@@ -38743,7 +39360,7 @@
 msgstr "جزئیات دلیل گم شده"
 
 #: crm/report/lost_opportunity/lost_opportunity.py:49
-#: public/js/utils/sales_common.js:410
+#: public/js/utils/sales_common.js:466
 msgid "Lost Reasons"
 msgstr "دلایل گمشده"
 
@@ -38761,7 +39378,7 @@
 msgid "Lost Reasons"
 msgstr "دلایل گمشده"
 
-#: crm/doctype/opportunity/opportunity.js:29
+#: crm/doctype/opportunity/opportunity.js:28
 msgid "Lost Reasons are required in case opportunity is Lost."
 msgstr "در صورت از دست رفتن فرصت، دلایل گمشده مورد نیاز است."
 
@@ -38839,7 +39456,7 @@
 msgid "Loyalty Point Entry Redemption"
 msgstr "بازخرید ورودی امتیاز وفاداری"
 
-#: selling/page/point_of_sale/pos_item_cart.js:891
+#: selling/page/point_of_sale/pos_item_cart.js:924
 msgid "Loyalty Points"
 msgstr "امتیاز وفاداری"
 
@@ -38886,14 +39503,18 @@
 msgid "Loyalty Points Redemption"
 msgstr "بازخرید امتیازات وفاداری"
 
-#: public/js/utils.js:109
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+msgid "Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned."
+msgstr ""
+
+#: public/js/utils.js:136
 msgid "Loyalty Points: {0}"
 msgstr "امتیازات وفاداری: {0}"
 
 #. Name of a DocType
 #: accounts/doctype/loyalty_program/loyalty_program.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:1041
-#: selling/page/point_of_sale/pos_item_cart.js:885
+#: accounts/doctype/sales_invoice/sales_invoice.js:1117
+#: selling/page/point_of_sale/pos_item_cart.js:917
 msgid "Loyalty Program"
 msgstr "برنامه وفاداری"
 
@@ -39076,11 +39697,16 @@
 msgid "MFG-WO-.YYYY.-"
 msgstr ""
 
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:22
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:23
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:78
+#: public/js/plant_floor_visual/visual_plant.js:86
 msgid "Machine"
 msgstr "دستگاه"
 
+#: public/js/plant_floor_visual/visual_plant.js:70
+msgid "Machine Type"
+msgstr ""
+
 #. Option for the 'Stop Reason' (Select) field in DocType 'Downtime Entry'
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 msgctxt "Downtime Entry"
@@ -39093,8 +39719,8 @@
 msgid "Machine operator errors"
 msgstr "خطاهای اپراتور ماشین"
 
-#: setup/doctype/company/company.py:563 setup/doctype/company/company.py:578
-#: setup/doctype/company/company.py:579 setup/doctype/company/company.py:580
+#: setup/doctype/company/company.py:562 setup/doctype/company/company.py:577
+#: setup/doctype/company/company.py:578 setup/doctype/company/company.py:579
 msgid "Main"
 msgstr "اصلی"
 
@@ -39108,7 +39734,7 @@
 msgid "Main Cost Center {0} cannot be entered in the child table"
 msgstr "مرکز هزینه اصلی {0} را نمی توان در جدول فرزند وارد کرد"
 
-#: assets/doctype/asset/asset.js:102
+#: assets/doctype/asset/asset.js:118
 msgid "Maintain Asset"
 msgstr "حفظ دارایی"
 
@@ -39165,6 +39791,12 @@
 msgid "Maintenance"
 msgstr "نگهداری"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Maintenance"
+msgstr "نگهداری"
+
 #. Label of a Date field in DocType 'Maintenance Visit'
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
 msgctxt "Maintenance Visit"
@@ -39177,7 +39809,7 @@
 msgid "Maintenance Details"
 msgstr "جزئیات تعمیر و نگهداری"
 
-#: assets/doctype/asset_maintenance/asset_maintenance.js:43
+#: assets/doctype/asset_maintenance/asset_maintenance.js:41
 msgid "Maintenance Log"
 msgstr "گزارش تعمیر و نگهداری"
 
@@ -39224,10 +39856,10 @@
 msgstr "نقش نگهداری"
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:162
+#: accounts/doctype/sales_invoice/sales_invoice.js:175
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.json
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:78
-#: selling/doctype/sales_order/sales_order.js:582
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
+#: selling/doctype/sales_order/sales_order.js:673
 msgid "Maintenance Schedule"
 msgstr "برنامه تعمیر و نگهداری"
 
@@ -39370,10 +40002,10 @@
 msgstr "کاربر تعمیر و نگهداری"
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:83
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:87
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
-#: selling/doctype/sales_order/sales_order.js:581
-#: support/doctype/warranty_claim/warranty_claim.js:50
+#: selling/doctype/sales_order/sales_order.js:668
+#: support/doctype/warranty_claim/warranty_claim.js:47
 msgid "Maintenance Visit"
 msgstr "بازدید تعمیر و نگهداری"
 
@@ -39406,16 +40038,16 @@
 msgid "Major/Optional Subjects"
 msgstr "موضوعات اصلی/اختیاری"
 
-#: accounts/doctype/journal_entry/journal_entry.js:51
-#: manufacturing/doctype/job_card/job_card.js:174
+#: accounts/doctype/journal_entry/journal_entry.js:100
+#: manufacturing/doctype/job_card/job_card.js:196
 msgid "Make"
 msgstr "بسازید"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:56
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:54
 msgid "Make "
 msgstr " بسازید"
 
-#: assets/doctype/asset/asset_list.js:39
+#: assets/doctype/asset/asset_list.js:29
 msgid "Make Asset Movement"
 msgstr "حرکت دارایی را ایجاد کنید"
 
@@ -39445,7 +40077,7 @@
 msgid "Make Quotation"
 msgstr "نقل قول انجام دهید"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:335
 msgid "Make Return Entry"
 msgstr "ورود بازگشت ایجاد کنید"
 
@@ -39461,7 +40093,7 @@
 msgid "Make Serial No / Batch from Work Order"
 msgstr "شماره سریال / دسته از سفارش کار را بسازید"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
+#: stock/doctype/purchase_receipt/purchase_receipt.js:261
 msgid "Make Stock Entry"
 msgstr "ورود موجودی"
 
@@ -39469,20 +40101,20 @@
 msgid "Make project from a template."
 msgstr "پروژه را از یک الگو بسازید."
 
-#: stock/doctype/item/item.js:502
+#: stock/doctype/item/item.js:569
 msgid "Make {0} Variant"
 msgstr "{0} را تغییر دهید"
 
-#: stock/doctype/item/item.js:504
+#: stock/doctype/item/item.js:571
 msgid "Make {0} Variants"
 msgstr "ایجاد {0} Variants"
 
-#: assets/doctype/asset/asset.js:85 assets/doctype/asset/asset.js:89
-#: assets/doctype/asset/asset.js:93 assets/doctype/asset/asset.js:98
-#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:109
-#: assets/doctype/asset/asset.js:113 assets/doctype/asset/asset.js:118
-#: assets/doctype/asset/asset.js:124 assets/doctype/asset/asset.js:136
-#: setup/doctype/company/company.js:112 setup/doctype/company/company.js:119
+#: assets/doctype/asset/asset.js:88 assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:112
+#: assets/doctype/asset/asset.js:122 assets/doctype/asset/asset.js:131
+#: assets/doctype/asset/asset.js:139 assets/doctype/asset/asset.js:148
+#: assets/doctype/asset/asset.js:158 assets/doctype/asset/asset.js:174
+#: setup/doctype/company/company.js:134 setup/doctype/company/company.js:145
 msgid "Manage"
 msgstr "مدیریت کنید"
 
@@ -39506,22 +40138,22 @@
 msgid "Manage your orders"
 msgstr "سفارشات خود را مدیریت کنید"
 
-#: setup/doctype/company/company.py:371
+#: setup/doctype/company/company.py:370
 msgid "Management"
 msgstr "مدیریت"
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
-#: manufacturing/doctype/bom/bom.js:71 manufacturing/doctype/bom/bom.js:482
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: 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
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484 public/js/utils/party.js:273
-#: stock/doctype/delivery_note/delivery_note.js:138
-#: stock/doctype/purchase_receipt/purchase_receipt.js:113
-#: stock/doctype/purchase_receipt/purchase_receipt.js:198
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
+#: public/js/controllers/transaction.js:2537 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:99
 msgid "Mandatory"
 msgstr "اجباری"
 
@@ -39547,7 +40179,7 @@
 msgid "Mandatory Depends On"
 msgstr "اجباری بستگی دارد"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
 msgid "Mandatory Field"
 msgstr "فیلد اجباری"
 
@@ -39567,11 +40199,11 @@
 msgid "Mandatory Missing"
 msgstr "گمشده اجباری"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:587
 msgid "Mandatory Purchase Order"
 msgstr "دستور خرید اجباری"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
 msgid "Mandatory Purchase Receipt"
 msgstr "رسید خرید اجباری"
 
@@ -39639,7 +40271,7 @@
 msgid "Manual Inspection"
 msgstr "بازرسی دستی"
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:34
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:36
 msgid "Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again"
 msgstr "ورود دستی ایجاد نمی شود! ورود خودکار برای حسابداری معوق را در تنظیمات حساب ها غیرفعال کنید و دوباره امتحان کنید"
 
@@ -39735,7 +40367,7 @@
 msgid "Manufacture against Material Request"
 msgstr "ساخت بر اساس درخواست مواد"
 
-#: stock/doctype/material_request/material_request_list.js:33
+#: stock/doctype/material_request/material_request_list.js:37
 msgid "Manufactured"
 msgstr "ساخته"
 
@@ -39867,10 +40499,15 @@
 msgid "Manufacturer Part Number"
 msgstr "شماره قطعه سازنده"
 
-#: public/js/controllers/buying.js:337
+#: public/js/controllers/buying.js:332
 msgid "Manufacturer Part Number <b>{0}</b> is invalid"
 msgstr "شماره قطعه سازنده <b>{0}</b> نامعتبر است"
 
+#. Description of a DocType
+#: stock/doctype/manufacturer/manufacturer.json
+msgid "Manufacturers used in Items"
+msgstr ""
+
 #. Name of a Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: selling/doctype/sales_order/sales_order_dashboard.py:26
@@ -39917,7 +40554,7 @@
 msgid "Manufacturing Manager"
 msgstr "مدیر تولید"
 
-#: stock/doctype/stock_entry/stock_entry.py:1689
+#: stock/doctype/stock_entry/stock_entry.py:1698
 msgid "Manufacturing Quantity is mandatory"
 msgstr "مقدار تولید الزامی است"
 
@@ -39981,15 +40618,15 @@
 msgid "Manufacturing module is all set up!"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:148
+#: stock/doctype/purchase_receipt/purchase_receipt.js:168
 msgid "Mapping Purchase Receipt ..."
 msgstr "نقشه رسید خرید ..."
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:98
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:97
 msgid "Mapping Subcontracting Order ..."
 msgstr "نگاشت سفارش پیمانکاری فرعی ..."
 
-#: public/js/utils.js:843
+#: public/js/utils.js:913
 msgid "Mapping {0} ..."
 msgstr "نگاشت {0}..."
 
@@ -40125,7 +40762,7 @@
 msgid "Margin Type"
 msgstr "نوع حاشیه"
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:19
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:15
 msgid "Margin View"
 msgstr ""
 
@@ -40135,6 +40772,15 @@
 msgid "Marital Status"
 msgstr "وضعیت تأهل"
 
+#: public/js/templates/crm_activities.html:39
+#: public/js/templates/crm_activities.html:82
+msgid "Mark As Closed"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:323
+msgid "Mark as unresolved"
+msgstr ""
+
 #. Name of a DocType
 #: crm/doctype/market_segment/market_segment.json
 msgid "Market Segment"
@@ -40170,7 +40816,7 @@
 msgid "Market Segment"
 msgstr "بخش بازار"
 
-#: setup/doctype/company/company.py:323
+#: setup/doctype/company/company.py:322
 msgid "Marketing"
 msgstr "بازار یابی"
 
@@ -40210,7 +40856,7 @@
 msgid "Material"
 msgstr "مواد"
 
-#: manufacturing/doctype/work_order/work_order.js:613
+#: manufacturing/doctype/work_order/work_order.js:655
 msgid "Material Consumption"
 msgstr "مصرف مواد"
 
@@ -40226,7 +40872,7 @@
 msgid "Material Consumption for Manufacture"
 msgstr "مصرف مواد برای ساخت"
 
-#: stock/doctype/stock_entry/stock_entry.js:420
+#: stock/doctype/stock_entry/stock_entry.js:480
 msgid "Material Consumption is not set in Manufacturing Settings."
 msgstr "مصرف مواد در تنظیمات تولید تنظیم نشده است."
 
@@ -40268,7 +40914,7 @@
 msgid "Material Issue"
 msgstr "مسئله مادی"
 
-#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:146
 msgid "Material Receipt"
 msgstr "رسید مواد"
 
@@ -40285,20 +40931,21 @@
 msgstr "رسید مواد"
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:435
-#: buying/doctype/request_for_quotation/request_for_quotation.js:297
-#: buying/doctype/supplier_quotation/supplier_quotation.js:31
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:34
+#: buying/doctype/purchase_order/purchase_order.js:504
+#: 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
-#: manufacturing/doctype/job_card/job_card.js:57
-#: manufacturing/doctype/production_plan/production_plan.js:113
-#: selling/doctype/sales_order/sales_order.js:570
+#: 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/stock_entry/stock_entry.js:192
-#: stock/doctype/stock_entry/stock_entry.js:277
+#: stock/doctype/stock_entry/stock_entry.js:210
+#: stock/doctype/stock_entry/stock_entry.js:313
 msgid "Material Request"
 msgstr "درخواست مواد"
 
@@ -40516,13 +41163,17 @@
 msgid "Material Request Planning"
 msgstr "برنامه ریزی درخواست مواد"
 
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:1
+msgid "Material Request Type"
+msgstr "نوع درخواست مواد"
+
 #. Label of a Select field in DocType 'Item Reorder'
 #: stock/doctype/item_reorder/item_reorder.json
 msgctxt "Item Reorder"
 msgid "Material Request Type"
 msgstr "نوع درخواست مواد"
 
-#: selling/doctype/sales_order/sales_order.py:1521
+#: selling/doctype/sales_order/sales_order.py:1544
 msgid "Material Request not created, as quantity for Raw Materials already available."
 msgstr "درخواست مواد ایجاد نشد، زیرا مقدار مواد خام از قبل موجود است."
 
@@ -40537,11 +41188,11 @@
 msgid "Material Request used to make this Stock Entry"
 msgstr "درخواست مواد برای ایجاد این ورود موجودی استفاده شده است"
 
-#: controllers/subcontracting_controller.py:974
+#: controllers/subcontracting_controller.py:979
 msgid "Material Request {0} is cancelled or stopped"
 msgstr "درخواست مواد {0} لغو یا متوقف شده است"
 
-#: selling/doctype/sales_order/sales_order.js:839
+#: selling/doctype/sales_order/sales_order.js:978
 msgid "Material Request {0} submitted."
 msgstr "درخواست مواد {0} ارسال شد."
 
@@ -40557,7 +41208,7 @@
 msgid "Material Requests"
 msgstr "درخواست مواد"
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Material Requests Required"
 msgstr "درخواست مواد مورد نیاز است"
 
@@ -40568,12 +41219,12 @@
 msgid "Material Requests for which Supplier Quotations are not created"
 msgstr "درخواست‌های موادی که برای آنها نقل‌قول‌های تامین‌کننده ایجاد نشده است"
 
-#: stock/doctype/stock_entry/stock_entry_list.js:7
+#: stock/doctype/stock_entry/stock_entry_list.js:13
 msgid "Material Returned from WIP"
 msgstr "مواد از WIP برگردانده شد"
 
-#: manufacturing/doctype/job_card/job_card.js:67
-#: stock/doctype/material_request/material_request.js:119
+#: manufacturing/doctype/job_card/job_card.js:64
+#: stock/doctype/material_request/material_request.js:124
 msgid "Material Transfer"
 msgstr "انتقال مواد"
 
@@ -40614,7 +41265,7 @@
 msgid "Material Transfer"
 msgstr "انتقال مواد"
 
-#: stock/doctype/material_request/material_request.js:122
+#: stock/doctype/material_request/material_request.js:130
 msgid "Material Transfer (In Transit)"
 msgstr "انتقال مواد (در حال حمل و نقل)"
 
@@ -40668,8 +41319,8 @@
 msgid "Material Transferred for Subcontract"
 msgstr "انتقال مواد برای قرارداد فرعی"
 
-#: buying/doctype/purchase_order/purchase_order.js:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:360
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:206
 msgid "Material to Supplier"
 msgstr "مواد به تامین کننده"
 
@@ -40679,11 +41330,11 @@
 msgid "Materials Required (Exploded)"
 msgstr "مواد مورد نیاز (منفجر شده)"
 
-#: controllers/subcontracting_controller.py:1164
+#: controllers/subcontracting_controller.py:1169
 msgid "Materials are already received against the {0} {1}"
 msgstr "مطالب قبلاً علیه {0} {1} دریافت شده است"
 
-#: manufacturing/doctype/job_card/job_card.py:636
+#: manufacturing/doctype/job_card/job_card.py:643
 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}"
 msgstr "برای کارت شغلی باید مواد به انبار کار در حال انجام انتقال داده شود {0}"
 
@@ -40763,8 +41414,8 @@
 msgid "Max discount allowed for item: {0} is {1}%"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:715
-#: stock/doctype/pick_list/pick_list.js:147
+#: manufacturing/doctype/work_order/work_order.js:768
+#: stock/doctype/pick_list/pick_list.js:176
 msgid "Max: {0}"
 msgstr "حداکثر: {0}"
 
@@ -40786,11 +41437,11 @@
 msgid "Maximum Payment Amount"
 msgstr "حداکثر مبلغ پرداختی"
 
-#: stock/doctype/stock_entry/stock_entry.py:2842
+#: stock/doctype/stock_entry/stock_entry.py:2878
 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
 msgstr "حداکثر نمونه - {0} را می توان برای دسته {1} و مورد {2} حفظ کرد."
 
-#: stock/doctype/stock_entry/stock_entry.py:2833
+#: stock/doctype/stock_entry/stock_entry.py:2869
 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
 msgstr "حداکثر نمونه - {0} قبلاً برای دسته {1} و مورد {2} در دسته {3} حفظ شده است."
 
@@ -40812,11 +41463,11 @@
 msgid "Maximum Value"
 msgstr "حداکثر ارزش"
 
-#: controllers/selling_controller.py:194
+#: controllers/selling_controller.py:195
 msgid "Maximum discount for Item {0} is {1}%"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:94
+#: public/js/utils/barcode_scanner.js:99
 msgid "Maximum quantity scanned for item {0}."
 msgstr "حداکثر مقدار اسکن شده برای مورد {0}."
 
@@ -40854,7 +41505,7 @@
 msgid "Meeting"
 msgstr "ملاقات"
 
-#: stock/stock_ledger.py:1685
+#: stock/stock_ledger.py:1705
 msgid "Mention Valuation Rate in the Item master."
 msgstr "نرخ ارزش گذاری را در آیتم اصلی ذکر کنید."
 
@@ -40882,11 +41533,11 @@
 msgid "Mention if non-standard receivable account applicable"
 msgstr "اگر حساب دریافتنی غیراستاندارد قابل اجرا است را ذکر کنید"
 
-#: accounts/doctype/account/account.js:151
+#: accounts/doctype/account/account.js:152
 msgid "Merge"
 msgstr "ادغام"
 
-#: accounts/doctype/account/account.js:51
+#: accounts/doctype/account/account.js:46
 msgid "Merge Account"
 msgstr "ادغام حساب"
 
@@ -40906,15 +41557,15 @@
 msgid "Merge Similar Account Heads"
 msgstr "ادغام سران حساب های مشابه"
 
-#: public/js/utils.js:873
+#: public/js/utils.js:943
 msgid "Merge taxes from multiple documents"
 msgstr "ادغام مالیات از اسناد متعدد"
 
-#: accounts/doctype/account/account.js:123
+#: accounts/doctype/account/account.js:124
 msgid "Merge with Existing Account"
 msgstr "ادغام با حساب موجود"
 
-#: accounts/doctype/cost_center/cost_center.js:66
+#: accounts/doctype/cost_center/cost_center.js:68
 msgid "Merge with existing"
 msgstr "ادغام با موجود"
 
@@ -40924,7 +41575,7 @@
 msgid "Merged"
 msgstr "ادغام شد"
 
-#: accounts/doctype/account/account.py:546
+#: accounts/doctype/account/account.py:565
 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency"
 msgstr "ادغام تنها در صورتی امکان پذیر است که ویژگی های زیر در هر دو رکورد یکسان باشند. گروه، نوع ریشه، شرکت و ارز حساب است"
 
@@ -40932,6 +41583,10 @@
 msgid "Merging {0} of {1}"
 msgstr "ادغام {0} از {1}"
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Message"
+msgstr "پیام"
+
 #. Label of a Text field in DocType 'Payment Request'
 #: accounts/doctype/payment_request/payment_request.json
 msgctxt "Payment Request"
@@ -40962,7 +41617,7 @@
 msgid "Message Examples"
 msgstr "نمونه های پیام"
 
-#: accounts/doctype/payment_request/payment_request.js:38
+#: accounts/doctype/payment_request/payment_request.js:47
 #: setup/doctype/email_digest/email_digest.js:26
 msgid "Message Sent"
 msgstr "پیغام فرستاده شد"
@@ -40991,6 +41646,10 @@
 msgid "Messages greater than 160 characters will be split into multiple messages"
 msgstr "پیام های بیشتر از 160 کاراکتر به چند پیام تقسیم می شوند"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Meta Data"
+msgstr ""
+
 #: setup/setup_wizard/operations/install_fixtures.py:263
 #: setup/setup_wizard/operations/install_fixtures.py:379
 msgid "Middle Income"
@@ -41157,32 +41816,32 @@
 msgid "Mismatch"
 msgstr "عدم تطابق"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1132
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1191
 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:548
-#: accounts/doctype/sales_invoice/sales_invoice.py:2044
-#: accounts/doctype/sales_invoice/sales_invoice.py:2602
+#: 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
 msgid "Missing Account"
 msgstr "حساب گم شده"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1403
+#: accounts/doctype/sales_invoice/sales_invoice.py:1414
 msgid "Missing Asset"
 msgstr "دارایی گمشده"
 
-#: accounts/doctype/gl_entry/gl_entry.py:179 assets/doctype/asset/asset.py:265
+#: accounts/doctype/gl_entry/gl_entry.py:169 assets/doctype/asset/asset.py:267
 msgid "Missing Cost Center"
 msgstr "مرکز هزینه گم شده"
 
-#: assets/doctype/asset/asset.py:309
+#: assets/doctype/asset/asset.py:311
 msgid "Missing Finance Book"
 msgstr "کتاب مالی گم شده"
 
-#: stock/doctype/stock_entry/stock_entry.py:1280
+#: stock/doctype/stock_entry/stock_entry.py:1289
 msgid "Missing Finished Good"
 msgstr "از دست رفته به پایان رسید"
 
@@ -41202,7 +41861,7 @@
 msgid "Missing Serial No Bundle"
 msgstr "سریال No Bundle گم شده است"
 
-#: selling/doctype/customer/customer.py:743
+#: selling/doctype/customer/customer.py:754
 msgid "Missing Values Required"
 msgstr "مقادیر از دست رفته الزامی است"
 
@@ -41210,12 +41869,12 @@
 msgid "Missing Warehouse"
 msgstr "انبار گم شده"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:132
+#: stock/doctype/delivery_trip/delivery_trip.js:153
 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:979
+#: manufacturing/doctype/work_order/work_order.py:993
 msgid "Missing value"
 msgstr "مقدار از دست رفته"
 
@@ -41355,7 +42014,7 @@
 msgid "Mobile No"
 msgstr "هیچ موبایل"
 
-#: public/js/utils/contact_address_quick_entry.js:48
+#: public/js/utils/contact_address_quick_entry.js:51
 msgid "Mobile Number"
 msgstr "شماره موبایل"
 
@@ -41368,7 +42027,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/mode_of_payment/mode_of_payment.json
-#: accounts/doctype/payment_order/payment_order.js:109
+#: accounts/doctype/payment_order/payment_order.js:124
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:40
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:47
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:35
@@ -41608,21 +42267,21 @@
 msgid "Month(s) after the end of the invoice month"
 msgstr "ماه(های) پس از پایان ماه فاکتور"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:67
+#: 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
-#: buying/report/purchase_analytics/purchase_analytics.js:62
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
-#: manufacturing/report/production_analytics/production_analytics.js:35
-#: public/js/financial_statements.js:217
+#: 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
+#: public/js/financial_statements.js:226
 #: public/js/purchase_trends_filters.js:19 public/js/sales_trends_filters.js:11
-#: public/js/stock_analytics.js:53
-#: selling/report/sales_analytics/sales_analytics.js:62
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
-#: stock/report/stock_analytics/stock_analytics.js:81
-#: support/report/issue_analytics/issue_analytics.js:43
+#: public/js/stock_analytics.js:83
+#: selling/report/sales_analytics/sales_analytics.js:69
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:32
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:32
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:32
+#: stock/report/stock_analytics/stock_analytics.js:80
+#: support/report/issue_analytics/issue_analytics.js:42
 msgid "Monthly"
 msgstr "ماهانه"
 
@@ -41672,7 +42331,7 @@
 msgstr "سفارشات کار ماهانه تکمیل شده"
 
 #. Name of a DocType
-#: accounts/doctype/cost_center/cost_center_tree.js:44
+#: accounts/doctype/cost_center/cost_center_tree.js:69
 #: accounts/doctype/monthly_distribution/monthly_distribution.json
 msgid "Monthly Distribution"
 msgstr "توزیع ماهانه"
@@ -41918,14 +42577,20 @@
 msgid "More columns found than expected. Please compare the uploaded file with standard template"
 msgstr "ستون‌های بیشتری از حد انتظار پیدا شد. لطفا فایل آپلود شده را با قالب استاندارد مقایسه کنید"
 
-#: stock/doctype/batch/batch.js:111 stock/doctype/batch/batch_dashboard.py:10
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:58
+#: stock/dashboard/item_dashboard_list.html:52 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:128 stock/doctype/batch/batch_dashboard.py:10
 msgid "Move"
 msgstr "حرکت"
 
-#: stock/dashboard/item_dashboard.js:205
+#: stock/dashboard/item_dashboard.js:212
 msgid "Move Item"
 msgstr "انتقال آیتم"
 
+#: manufacturing/doctype/plant_floor/plant_floor.js:211
+msgid "Move Stock"
+msgstr ""
+
 #: templates/includes/macros.html:169
 msgid "Move to Cart"
 msgstr "حرکت به سبد خرید"
@@ -41968,11 +42633,11 @@
 msgid "Multi Currency"
 msgstr "چنذ ارزی"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:42
+#: manufacturing/doctype/bom_creator/bom_creator.js:41
 msgid "Multi-level BOM Creator"
 msgstr "ایجاد کننده BOM چند سطحی"
 
-#: selling/doctype/customer/customer.py:369
+#: selling/doctype/customer/customer.py:381
 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually."
 msgstr "چندین برنامه وفاداری برای مشتری {} پیدا شد. لطفا به صورت دستی انتخاب کنید"
 
@@ -41987,7 +42652,7 @@
 msgid "Multiple Tier Program"
 msgstr "برنامه چند لایه"
 
-#: stock/doctype/item/item.js:106
+#: stock/doctype/item/item.js:138
 msgid "Multiple Variants"
 msgstr "انواع مختلف"
 
@@ -41995,11 +42660,11 @@
 msgid "Multiple Warehouse Accounts"
 msgstr "چندین حساب انبار"
 
-#: controllers/accounts_controller.py:899
+#: controllers/accounts_controller.py:951
 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
 msgstr "چندین سال مالی برای تاریخ {0} وجود دارد. لطفا شرکت را در سال مالی تعیین کنید"
 
-#: stock/doctype/stock_entry/stock_entry.py:1287
+#: stock/doctype/stock_entry/stock_entry.py:1296
 msgid "Multiple items cannot be marked as finished item"
 msgstr "چند مورد را نمی توان به عنوان مورد تمام شده علامت گذاری کرد"
 
@@ -42036,9 +42701,9 @@
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.py:86
 #: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:357
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:29
-#: manufacturing/doctype/bom_creator/bom_creator.js:45
-#: public/js/utils/serial_no_batch_selector.js:404
-#: selling/doctype/quotation/quotation.js:261
+#: manufacturing/doctype/bom_creator/bom_creator.js:44
+#: public/js/utils/serial_no_batch_selector.js:413
+#: selling/doctype/quotation/quotation.js:273
 msgid "Name"
 msgstr "نام"
 
@@ -42096,7 +42761,7 @@
 msgid "Name of Beneficiary"
 msgstr "نام ذینفع"
 
-#: accounts/doctype/account/account_tree.js:107
+#: accounts/doctype/account/account_tree.js:124
 msgid "Name of new Account. Note: Please don't create accounts for Customers and Suppliers"
 msgstr "نام حساب جدید توجه: لطفاً برای مشتریان و تامین کنندگان حساب ایجاد نکنید"
 
@@ -42275,11 +42940,11 @@
 msgid "Needs Analysis"
 msgstr "نیاز به تحلیل دارد"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:431
 msgid "Negative Quantity is not allowed"
 msgstr "مقدار منفی مجاز نیست"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:381
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:435
 msgid "Negative Valuation Rate is not allowed"
 msgstr "نرخ ارزش گذاری منفی مجاز نیست"
 
@@ -42576,6 +43241,10 @@
 #: 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
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:124
 #: templates/includes/order/order_taxes.html:5
 msgid "Net Total"
 msgstr "کل خالص"
@@ -42763,15 +43432,15 @@
 msgid "Net Weight UOM"
 msgstr "وزن خالص UOM"
 
-#: controllers/accounts_controller.py:1210
+#: controllers/accounts_controller.py:1277
 msgid "Net total calculation precision loss"
 msgstr "خالص از دست دادن دقت محاسبه کل"
 
-#: accounts/doctype/account/account_tree.js:164
+#: accounts/doctype/account/account_tree.js:241
 msgid "New"
 msgstr "جدید"
 
-#: accounts/doctype/account/account_tree.js:106
+#: accounts/doctype/account/account_tree.js:122
 msgid "New Account Name"
 msgstr "نام حساب جدید"
 
@@ -42785,7 +43454,7 @@
 msgid "New Assets (This Year)"
 msgstr "دارایی های جدید (این سال)"
 
-#: manufacturing/doctype/bom/bom_tree.js:56
+#: manufacturing/doctype/bom/bom_tree.js:55
 msgid "New BOM"
 msgstr "BOM جدید"
 
@@ -42813,21 +43482,21 @@
 msgid "New Balance In Base Currency"
 msgstr "موجودی جدید در ارز پایه"
 
-#: stock/doctype/batch/batch.js:127
+#: stock/doctype/batch/batch.js:146
 msgid "New Batch ID (Optional)"
 msgstr "شناسه دسته جدید (اختیاری)"
 
-#: stock/doctype/batch/batch.js:121
+#: stock/doctype/batch/batch.js:140
 msgid "New Batch Qty"
 msgstr "تعداد دسته جدید"
 
-#: accounts/doctype/account/account_tree.js:100
-#: accounts/doctype/cost_center/cost_center_tree.js:16
+#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/cost_center/cost_center_tree.js:18
 #: setup/doctype/company/company_tree.js:23
 msgid "New Company"
 msgstr "شرکت جدید"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:22
+#: accounts/doctype/cost_center/cost_center_tree.js:26
 msgid "New Cost Center Name"
 msgstr "نام مرکز هزینه جدید"
 
@@ -42847,7 +43516,8 @@
 msgid "New Employee"
 msgstr "کارمند جدید"
 
-#: public/js/utils/crm_activities.js:81
+#: public/js/templates/crm_activities.html:14
+#: public/js/utils/crm_activities.js:85
 msgid "New Event"
 msgstr "رویداد جدید"
 
@@ -42873,6 +43543,10 @@
 msgid "New Location"
 msgstr "مکان جدید"
 
+#: public/js/templates/crm_notes.html:7
+msgid "New Note"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
@@ -42907,7 +43581,7 @@
 msgid "New Sales Orders"
 msgstr "سفارشات فروش جدید"
 
-#: setup/doctype/sales_person/sales_person_tree.js:5
+#: setup/doctype/sales_person/sales_person_tree.js:3
 msgid "New Sales Person Name"
 msgstr "نام فروشنده جدید"
 
@@ -42915,15 +43589,16 @@
 msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
 msgstr "شماره سریال جدید نمی تواند انبار داشته باشد. انبار باید با ورود به انبار یا رسید خرید تنظیم شود"
 
-#: public/js/utils/crm_activities.js:63
+#: public/js/templates/crm_activities.html:8
+#: public/js/utils/crm_activities.js:67
 msgid "New Task"
 msgstr "وظیفه جدید"
 
-#: manufacturing/doctype/bom/bom.js:112
+#: manufacturing/doctype/bom/bom.js:111
 msgid "New Version"
 msgstr "نسخه جدید"
 
-#: stock/doctype/warehouse/warehouse_tree.js:15
+#: stock/doctype/warehouse/warehouse_tree.js:16
 msgid "New Warehouse Name"
 msgstr "نام انبار جدید"
 
@@ -42933,10 +43608,14 @@
 msgid "New Workplace"
 msgstr "محل کار جدید"
 
-#: selling/doctype/customer/customer.py:338
+#: selling/doctype/customer/customer.py:350
 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}"
 msgstr "سقف اعتبار جدید کمتر از مبلغ معوقه فعلی برای مشتری است. حد اعتبار باید حداقل {0} باشد"
 
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:3
+msgid "New fiscal year created :- "
+msgstr ""
+
 #. Description of the 'Generate New Invoices Past Due Date' (Check) field in
 #. DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
@@ -42944,7 +43623,7 @@
 msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
 msgstr "فاکتورهای جدید طبق برنامه زمانی تولید می شود حتی اگر فاکتورهای فعلی پرداخت نشده یا سررسید گذشته باشد"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:218
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:255
 msgid "New release date should be in the future"
 msgstr "تاریخ انتشار جدید باید در آینده باشد"
 
@@ -42952,7 +43631,7 @@
 msgid "New task"
 msgstr "وظیفه جدید"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:211
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:213
 msgid "New {0} pricing rules are created"
 msgstr "قوانین قیمت گذاری جدید {0} ایجاد شده است"
 
@@ -43094,7 +43773,7 @@
 msgid "No Account matched these filters: {}"
 msgstr "هیچ حسابی با این فیلترها مطابقت نداشت: {}"
 
-#: quality_management/doctype/quality_review/quality_review_list.js:6
+#: quality_management/doctype/quality_review/quality_review_list.js:5
 msgid "No Action"
 msgstr "بدون اقدام"
 
@@ -43104,44 +43783,52 @@
 msgid "No Answer"
 msgstr "بدون پاسخ"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2146
+#: accounts/doctype/sales_invoice/sales_invoice.py:2115
 msgid "No Customer found for Inter Company Transactions which represents company {0}"
 msgstr "هیچ مشتری برای Inter Company Transactions که نماینده شرکت {0} است یافت نشد"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:118
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:362
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:115
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:350
 msgid "No Customers found with selected options."
 msgstr "هیچ مشتری با گزینه های انتخاب شده یافت نشد."
 
-#: selling/page/sales_funnel/sales_funnel.js:48
+#: selling/page/sales_funnel/sales_funnel.js:59
 msgid "No Data"
 msgstr "اطلاعاتی وجود ندارد"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:122
+#: stock/doctype/delivery_trip/delivery_trip.js:143
 msgid "No Delivery Note selected for Customer {}"
 msgstr "هیچ یادداشت تحویلی برای مشتری انتخاب نشده است {}"
 
-#: stock/get_item_details.py:199
+#: stock/get_item_details.py:204
 msgid "No Item with Barcode {0}"
 msgstr "هیچ موردی با بارکد {0} وجود ندارد"
 
-#: stock/get_item_details.py:203
+#: stock/get_item_details.py:208
 msgid "No Item with Serial No {0}"
 msgstr "موردی با شماره سریال {0} وجود ندارد"
 
-#: controllers/subcontracting_controller.py:1084
+#: controllers/subcontracting_controller.py:1089
 msgid "No Items selected for transfer."
 msgstr "هیچ موردی برای انتقال انتخاب نشده است."
 
-#: selling/doctype/sales_order/sales_order.js:668
+#: selling/doctype/sales_order/sales_order.js:769
 msgid "No Items with Bill of Materials to Manufacture"
 msgstr "هیچ موردی با لایحه مواد برای ساخت وجود ندارد"
 
-#: selling/doctype/sales_order/sales_order.js:782
+#: selling/doctype/sales_order/sales_order.js:898
 msgid "No Items with Bill of Materials."
 msgstr "هیچ موردی با صورتحساب مواد وجود ندارد."
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:213
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:15
+msgid "No Matching Bank Transactions Found"
+msgstr ""
+
+#: public/js/templates/crm_notes.html:44
+msgid "No Notes"
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:219
 msgid "No Outstanding Invoices found for this party"
 msgstr "هیچ صورت حساب معوقی برای این طرف یافت نشد"
 
@@ -43149,28 +43836,32 @@
 msgid "No POS Profile found. Please create a New POS Profile first"
 msgstr "هیچ نمایه POS یافت نشد. لطفا ابتدا یک نمایه POS جدید ایجاد کنید"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1420
-#: accounts/doctype/journal_entry/journal_entry.py:1486
-#: accounts/doctype/journal_entry/journal_entry.py:1509
-#: stock/doctype/item/item.py:1332
+#: 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
 msgid "No Permission"
 msgstr "بدون مجوز و اجازه"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:23
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:38
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:22
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:39
 msgid "No Records for these settings."
 msgstr "هیچ رکوردی برای این تنظیمات وجود ندارد."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
-#: accounts/doctype/sales_invoice/sales_invoice.py:949
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:337
+#: accounts/doctype/sales_invoice/sales_invoice.py:966
 msgid "No Remarks"
 msgstr "بدون اظهار نظر"
 
-#: stock/dashboard/item_dashboard.js:147
+#: stock/dashboard/item_dashboard.js:150
 msgid "No Stock Available Currently"
 msgstr "موجودی در حال حاضر موجود نیست"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2130
+#: public/js/templates/call_link.html:30
+msgid "No Summary"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.py:2099
 msgid "No Supplier found for Inter Company Transactions which represents company {0}"
 msgstr "هیچ تامین کننده ای برای Inter Company Transactions یافت نشد که نماینده شرکت {0}"
 
@@ -43182,32 +43873,32 @@
 msgid "No Terms"
 msgstr "بدون شرایط"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:211
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:216
 msgid "No Unreconciled Invoices and Payments found for this party and account"
 msgstr "هیچ فاکتور و پرداخت ناسازگاری برای این طرف و حساب پیدا نشد"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:215
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:221
 msgid "No Unreconciled Payments found for this party"
 msgstr "هیچ پرداخت ناسازگاری برای این طرف یافت نشد"
 
-#: manufacturing/doctype/production_plan/production_plan.py:682
+#: manufacturing/doctype/production_plan/production_plan.py:691
 msgid "No Work Orders were created"
 msgstr "هیچ سفارش کاری ایجاد نشد"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:727
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:606
+#: stock/doctype/purchase_receipt/purchase_receipt.py:726
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:607
 msgid "No accounting entries for the following warehouses"
 msgstr "ثبت حسابداری برای انبارهای زیر وجود ندارد"
 
-#: selling/doctype/sales_order/sales_order.py:651
+#: selling/doctype/sales_order/sales_order.py:657
 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured"
 msgstr "هیچ BOM فعالی برای مورد {0} یافت نشد. تحویل با شماره سریال نمی تواند تضمین شود"
 
-#: stock/doctype/item_variant_settings/item_variant_settings.js:31
+#: stock/doctype/item_variant_settings/item_variant_settings.js:46
 msgid "No additional fields available"
 msgstr "هیچ فیلد اضافی در دسترس نیست"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:429
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:417
 msgid "No billing email found for customer: {0}"
 msgstr "هیچ ایمیل صورت‌حساب برای مشتری پیدا نشد: {0}"
 
@@ -43215,7 +43906,7 @@
 msgid "No contacts with email IDs found."
 msgstr "هیچ مخاطبی با شناسه ایمیل پیدا نشد."
 
-#: selling/page/sales_funnel/sales_funnel.js:115
+#: selling/page/sales_funnel/sales_funnel.js:130
 msgid "No data for this period"
 msgstr "هیچ داده ای برای این دوره وجود ندارد"
 
@@ -43223,7 +43914,7 @@
 msgid "No data found. Seems like you uploaded a blank file"
 msgstr "داده ای یافت نشد. به نظر می رسد شما یک فایل خالی آپلود کرده اید"
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:38
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:37
 msgid "No data to export"
 msgstr "داده ای برای صادرات وجود ندارد"
 
@@ -43235,11 +43926,15 @@
 msgid "No employee was scheduled for call popup"
 msgstr "هیچ کارمندی برای فراخوانی برنامه ریزی نشده بود"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1064
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:486
+msgid "No failed logs"
+msgstr "گزارش های ناموفق وجود ندارد"
+
+#: accounts/doctype/payment_entry/payment_entry.js:1289
 msgid "No gain or loss in the exchange rate"
 msgstr "بدون سود و زیان در نرخ ارز"
 
-#: controllers/subcontracting_controller.py:1005
+#: controllers/subcontracting_controller.py:1010
 msgid "No item available for transfer."
 msgstr "هیچ موردی برای انتقال موجود نیست"
 
@@ -43252,30 +43947,40 @@
 msgid "No items are available in the sales order {0} for production"
 msgstr "هیچ موردی در سفارش فروش {0} برای تولید موجود نیست"
 
-#: selling/page/point_of_sale/pos_item_selector.js:320
+#: selling/page/point_of_sale/pos_item_selector.js:317
 msgid "No items found. Scan barcode again."
 msgstr "موردی یافت نشد. دوباره بارکد را اسکن کنید."
 
+#: selling/page/point_of_sale/pos_item_cart.js:76
+msgid "No items in cart"
+msgstr ""
+
 #: setup/doctype/email_digest/email_digest.py:168
 msgid "No items to be received are overdue"
 msgstr "هیچ موردی که باید دریافت شود دیر نشده است"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:424
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:423
 msgid "No matches occurred via auto reconciliation"
 msgstr "هیچ مسابقه ای از طریق آشتی خودکار رخ نداد"
 
-#: manufacturing/doctype/production_plan/production_plan.py:879
+#: manufacturing/doctype/production_plan/production_plan.py:888
 msgid "No material request created"
 msgstr "هیچ درخواست مادی ایجاد نشد"
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:198
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:199
 msgid "No more children on Left"
 msgstr ""
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:212
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:213
 msgid "No more children on Right"
 msgstr ""
 
+#. Label of a Int field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "No of Docs"
+msgstr ""
+
 #. Label of a Select field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -43327,6 +44032,14 @@
 msgid "No of Visits"
 msgstr "تعداد بازدید"
 
+#: public/js/templates/crm_activities.html:104
+msgid "No open event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:57
+msgid "No open task"
+msgstr ""
+
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:315
 msgid "No outstanding invoices found"
 msgstr "فاکتور معوقی پیدا نشد"
@@ -43335,15 +44048,15 @@
 msgid "No outstanding invoices require exchange rate revaluation"
 msgstr "هیچ فاکتور معوقی نیاز به تجدید ارزیابی نرخ ارز ندارد"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1801
+#: accounts/doctype/payment_entry/payment_entry.py:1820
 msgid "No outstanding {0} found for the {1} {2} which qualify the filters you have specified."
 msgstr "هیچ {0} برجسته ای برای {1} {2} که واجد شرایط فیلترهایی است که شما مشخص کرده اید، یافت نشد."
 
-#: public/js/controllers/buying.js:439
+#: public/js/controllers/buying.js:436
 msgid "No pending Material Requests found to link for the given items."
 msgstr "هیچ درخواست مواد معلقی برای پیوند برای موارد داده شده یافت نشد."
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:436
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:424
 msgid "No primary email found for customer: {0}"
 msgstr "ایمیل اصلی برای مشتری پیدا نشد: {0}"
 
@@ -43357,15 +44070,15 @@
 msgid "No record found"
 msgstr "هیچ سابقه ای پیدا نشد"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:677
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:687
 msgid "No records found in Allocation table"
 msgstr "هیچ رکوردی در جدول تخصیص یافت نشد"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:579
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:584
 msgid "No records found in the Invoices table"
 msgstr "هیچ رکوردی در جدول فاکتورها یافت نشد"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:582
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:587
 msgid "No records found in the Payments table"
 msgstr "هیچ رکوردی در جدول پرداخت ها یافت نشد"
 
@@ -43376,7 +44089,7 @@
 msgid "No stock transactions can be created or modified before this date."
 msgstr "هیچ معامله موجودیی را نمی توان قبل از این تاریخ ایجاد یا تغییر داد."
 
-#: controllers/accounts_controller.py:2435
+#: controllers/accounts_controller.py:2520
 msgid "No updates pending for reposting"
 msgstr "هیچ به‌روزرسانی در انتظار ارسال مجدد نیست"
 
@@ -43384,15 +44097,15 @@
 msgid "No values"
 msgstr "بدون ارزش"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:340
 msgid "No {0} Accounts found for this company."
 msgstr "هیچ حساب {0} برای این شرکت یافت نشد."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2197
+#: accounts/doctype/sales_invoice/sales_invoice.py:2166
 msgid "No {0} found for Inter Company Transactions."
 msgstr "هیچ {0} برای معاملات بین شرکتی یافت نشد."
 
-#: assets/doctype/asset/asset.js:239
+#: assets/doctype/asset/asset.js:274
 msgid "No."
 msgstr "شماره"
 
@@ -43402,7 +44115,7 @@
 msgid "No. of Employees"
 msgstr "تعداد کارمندان"
 
-#: manufacturing/doctype/workstation/workstation.js:42
+#: manufacturing/doctype/workstation/workstation.js:66
 msgid "No. of parallel job cards which can be allowed on this workstation. Example: 2 would mean this workstation can process production for two Work Orders at a time."
 msgstr "تعداد کارت های شغلی موازی که می توانند در این ایستگاه کاری مجاز باشند. مثال: 2 به این معنی است که این ایستگاه کاری می تواند تولید را برای دو Work Order در یک زمان پردازش کند."
 
@@ -43428,7 +44141,7 @@
 msgid "Non Profit"
 msgstr "غیر انتفاعی"
 
-#: manufacturing/doctype/bom/bom.py:1305
+#: manufacturing/doctype/bom/bom.py:1304
 msgid "Non stock items"
 msgstr "اقلام غیر موجودی"
 
@@ -43439,7 +44152,7 @@
 msgid "None"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:315
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:369
 msgid "None of the items have any change in quantity or value."
 msgstr "هیچ یک از اقلام هیچ تغییری در کمیت یا ارزش ندارند."
 
@@ -43452,11 +44165,11 @@
 
 #: 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:525
-#: assets/doctype/asset/asset.js:530 assets/doctype/asset/asset.js:547
+#: accounts/doctype/sales_invoice/sales_invoice.py:538
+#: assets/doctype/asset/asset.js:603 assets/doctype/asset/asset.js:620
 #: controllers/buying_controller.py:206
 #: selling/doctype/product_bundle/product_bundle.py:71
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:48
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:72
 msgid "Not Allowed"
 msgstr "مجاز نیست"
 
@@ -43472,8 +44185,8 @@
 msgid "Not Applicable"
 msgstr "قابل اجرا نیست"
 
-#: selling/page/point_of_sale/pos_controller.js:671
-#: selling/page/point_of_sale/pos_controller.js:694
+#: selling/page/point_of_sale/pos_controller.js:703
+#: selling/page/point_of_sale/pos_controller.js:732
 msgid "Not Available"
 msgstr "در دسترس نیست"
 
@@ -43496,8 +44209,8 @@
 msgid "Not Initiated"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:744
-#: templates/pages/material_request_info.py:21 templates/pages/order.py:32
+#: buying/doctype/purchase_order/purchase_order.py:747
+#: templates/pages/material_request_info.py:21 templates/pages/order.py:34
 #: templates/pages/rfq.py:48
 msgid "Not Permitted"
 msgstr "غیر مجاز"
@@ -43517,7 +44230,7 @@
 msgstr "مشخص نشده است"
 
 #: manufacturing/doctype/production_plan/production_plan_list.js:7
-#: manufacturing/doctype/work_order/work_order_list.js:7
+#: manufacturing/doctype/work_order/work_order_list.js:15
 #: stock/doctype/material_request/material_request_list.js:9
 msgid "Not Started"
 msgstr "شروع نشده است"
@@ -43549,11 +44262,11 @@
 msgid "Not allow to set alternative item for the item {0}"
 msgstr "اجازه تنظیم مورد جایگزین برای مورد {0} داده نشود"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:48
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:52
 msgid "Not allowed to create accounting dimension for {0}"
 msgstr "ایجاد بعد حسابداری برای {0} مجاز نیست"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:254
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:265
 msgid "Not allowed to update stock transactions older than {0}"
 msgstr "به‌روزرسانی معاملات موجودی قدیمی‌تر از {0} مجاز نیست"
 
@@ -43561,31 +44274,37 @@
 msgid "Not authorized since {0} exceeds limits"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:445
+#: accounts/doctype/gl_entry/gl_entry.py:399
 msgid "Not authorized to edit frozen Account {0}"
 msgstr "مجاز به ویرایش حساب ثابت {0} نیست"
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "Not in Stock"
+msgstr ""
+
 #: templates/includes/products_as_grid.html:20
 msgid "Not in stock"
 msgstr "موجود نیست"
 
-#: buying/doctype/purchase_order/purchase_order.py:667
-#: manufacturing/doctype/work_order/work_order.py:1256
-#: manufacturing/doctype/work_order/work_order.py:1390
-#: manufacturing/doctype/work_order/work_order.py:1440
-#: selling/doctype/sales_order/sales_order.py:755
-#: selling/doctype/sales_order/sales_order.py:1504
+#: 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
 msgid "Not permitted"
 msgstr "غیر مجاز"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:240
+#: 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:1607
-#: public/js/controllers/buying.js:440 selling/doctype/customer/customer.py:125
-#: selling/doctype/sales_order/sales_order.js:957
-#: stock/doctype/item/item.js:426 stock/doctype/item/item.py:539
-#: stock/doctype/stock_entry/stock_entry.py:1288
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:732
+#: 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
+#: 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
+#: templates/pages/timelog_info.html:43
 msgid "Note"
 msgstr "یادداشت"
 
@@ -43622,15 +44341,15 @@
 msgid "Note: Email will not be sent to disabled users"
 msgstr "توجه: برای کاربران ناتوان ایمیل ارسال نخواهد شد"
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:53
+#: manufacturing/doctype/blanket_order/blanket_order.py:91
 msgid "Note: Item {0} added multiple times"
 msgstr "توجه: مورد {0} چندین بار اضافه شد"
 
-#: controllers/accounts_controller.py:450
+#: controllers/accounts_controller.py:494
 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
 msgstr "توجه: ورودی پرداخت ایجاد نخواهد شد زیرا «حساب نقدی یا بانکی» مشخص نشده است"
 
-#: accounts/doctype/cost_center/cost_center.js:32
+#: accounts/doctype/cost_center/cost_center.js:30
 msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups."
 msgstr "توجه: این مرکز هزینه یک گروه است. نمی توان در مقابل گروه ها ثبت حسابداری انجام داد."
 
@@ -43638,10 +44357,12 @@
 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
 msgstr "توجه: برای ادغام موارد، یک تطبیق موجودی جداگانه برای اقلام قدیمی {0} ایجاد کنید."
 
-#: accounts/doctype/journal_entry/journal_entry.py:895
+#: accounts/doctype/journal_entry/journal_entry.py:922
 msgid "Note: {0}"
 msgstr "توجه: {0}"
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
 #: www/book_appointment/index.html:55
 msgid "Notes"
 msgstr "یادداشت"
@@ -43833,12 +44554,6 @@
 msgid "Number of Depreciations Booked"
 msgstr "تعداد استهلاک های رزرو شده"
 
-#. Label of a Data field in DocType 'Transaction Deletion Record Item'
-#: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
-msgctxt "Transaction Deletion Record Item"
-msgid "Number of Docs"
-msgstr "تعداد اسناد"
-
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:14
 msgid "Number of Interaction"
 msgstr "تعداد تعامل"
@@ -43873,11 +44588,11 @@
 msgid "Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days"
 msgstr "تعداد فواصل برای فیلد بازه زمانی به عنوان مثال اگر فاصله زمانی \"روز\" و تعداد فاصله صورتحساب 3 باشد، فاکتورها هر 3 روز یکبار تولید می شوند."
 
-#: accounts/doctype/account/account_tree.js:109
+#: accounts/doctype/account/account_tree.js:132
 msgid "Number of new Account, it will be included in the account name as a prefix"
 msgstr "شماره حساب جدید، به عنوان پیشوند در نام حساب درج خواهد شد"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:26
+#: accounts/doctype/cost_center/cost_center_tree.js:39
 msgid "Number of new Cost Center, it will be included in the cost center name as a prefix"
 msgstr "شماره مرکز هزینه جدید، به عنوان پیشوند در نام مرکز هزینه درج خواهد شد"
 
@@ -43952,6 +44667,12 @@
 msgid "Odometer Value (Last)"
 msgstr "مقدار کیلومتر شمار (آخرین)"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Off"
+msgstr "خاموش"
+
 #. Label of a Date field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -43979,7 +44700,7 @@
 msgid "Offsetting Account"
 msgstr "تسویه حساب"
 
-#: accounts/general_ledger.py:77
+#: accounts/general_ledger.py:81
 msgid "Offsetting for Accounting Dimension"
 msgstr "جبران برای بعد حسابداری"
 
@@ -44029,11 +44750,11 @@
 msgid "On Converting Opportunity"
 msgstr "در مورد تبدیل فرصت"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:31
-#: buying/doctype/purchase_order/purchase_order_list.js:8
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:27
+#: buying/doctype/purchase_order/purchase_order_list.js:17
 #: buying/doctype/supplier/supplier_list.js:5
-#: selling/doctype/sales_order/sales_order_list.js:10
-#: support/report/issue_summary/issue_summary.js:45
+#: 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
 msgid "On Hold"
 msgstr "در انتظار"
@@ -44150,10 +44871,17 @@
 msgid "On Track"
 msgstr "در مسیر"
 
-#: manufacturing/doctype/production_plan/production_plan.js:540
+#: manufacturing/doctype/production_plan/production_plan.js:584
 msgid "On expanding a row in the Items to Manufacture table, you'll see an option to 'Include Exploded Items'. Ticking this includes raw materials of the sub-assembly items in the production process."
 msgstr "با گسترش یک ردیف در جدول Items to Manufacture، گزینه ای برای \"شامل موارد منفجر شده\" را مشاهده خواهید کرد. تیک زدن این شامل مواد اولیه اقلام زیر مجموعه در فرآیند تولید می شود."
 
+#. Description of the 'Use Serial / Batch Fields' (Check) field in DocType
+#. 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "On submission of the stock transaction, system will auto create the Serial and Batch Bundle based on the Serial No / Batch fields."
+msgstr ""
+
 #: setup/default_energy_point_rules.py:43
 msgid "On {0} Creation"
 msgstr "در ایجاد {0}"
@@ -44170,10 +44898,14 @@
 msgid "Once set, this invoice will be on hold till the set date"
 msgstr "پس از تنظیم، این فاکتور تا تاریخ تعیین شده در حالت تعلیق خواهد بود"
 
-#: manufacturing/doctype/work_order/work_order.js:560
+#: manufacturing/doctype/work_order/work_order.js:591
 msgid "Once the Work Order is Closed. It can't be resumed."
 msgstr "هنگامی که دستور کار بسته شد. نمی توان آن را از سر گرفت."
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:16
+msgid "One customer can be part of only single Loyalty Program."
+msgstr ""
+
 #: manufacturing/dashboard_fixtures.py:228
 msgid "Ongoing Job Cards"
 msgstr "کارت های شغلی در حال انجام"
@@ -44200,11 +44932,11 @@
 msgid "Only Include Allocated Payments"
 msgstr "فقط شامل پرداخت های اختصاص داده شده است"
 
-#: accounts/doctype/account/account.py:134
+#: accounts/doctype/account/account.py:135
 msgid "Only Parent can be of type {0}"
 msgstr "فقط والدین می توانند از نوع {0} باشند"
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:44
+#: assets/report/fixed_asset_register/fixed_asset_register.js:43
 msgid "Only existing assets"
 msgstr "فقط دارایی های موجود"
 
@@ -44224,6 +44956,10 @@
 msgid "Only one Subcontracting Order can be created against a Purchase Order, cancel the existing Subcontracting Order to create a new one."
 msgstr "فقط یک سفارش پیمانکاری فرعی را می توان در مقابل یک سفارش خرید ایجاد کرد، برای ایجاد یک سفارش جدید، سفارش پیمانکاری فرعی موجود را لغو کنید."
 
+#: stock/doctype/stock_entry/stock_entry.py:898
+msgid "Only one {0} entry can be created against the Work Order {1}"
+msgstr ""
+
 #. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
 #: accounts/doctype/pos_profile/pos_profile.json
 msgctxt "POS Profile"
@@ -44248,13 +44984,14 @@
 msgid "Only {0} are supported"
 msgstr "فقط {0} پشتیبانی می شود"
 
-#: crm/report/lead_details/lead_details.js:35
+#: crm/report/lead_details/lead_details.js:34
 #: manufacturing/report/job_card_summary/job_card_summary.py:92
 #: quality_management/doctype/quality_meeting/quality_meeting_list.js:5
-#: selling/doctype/quotation/quotation_list.js:27
-#: support/report/issue_analytics/issue_analytics.js:56
-#: support/report/issue_summary/issue_summary.js:43
+#: 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
+#: templates/pages/task_info.html:72
 msgid "Open"
 msgstr "باز"
 
@@ -44385,11 +45122,27 @@
 msgid "Open Activities HTML"
 msgstr "Activity HTML را باز کنید"
 
-#: public/js/call_popup/call_popup.js:114
+#: manufacturing/doctype/bom/bom_item_preview.html:21
+msgid "Open BOM {0}"
+msgstr ""
+
+#: public/js/templates/call_link.html:11
+msgid "Open Call Log"
+msgstr ""
+
+#: public/js/call_popup/call_popup.js:116
 msgid "Open Contact"
 msgstr "مخاطب را باز کنید"
 
-#: selling/page/point_of_sale/pos_controller.js:172
+#: public/js/templates/crm_activities.html:76
+msgid "Open Event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:63
+msgid "Open Events"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_controller.js:189
 msgid "Open Form View"
 msgstr "نمای فرم را باز کنید"
 
@@ -44403,6 +45156,11 @@
 msgid "Open Issues "
 msgstr " مسائل را باز کنید"
 
+#: manufacturing/doctype/bom/bom_item_preview.html:25
+#: manufacturing/doctype/work_order/work_order_preview.html:28
+msgid "Open Item {0}"
+msgstr ""
+
 #: setup/doctype/email_digest/templates/default.html:154
 msgid "Open Notifications"
 msgstr "اعلان ها را باز کنید"
@@ -44438,6 +45196,14 @@
 msgid "Open Sales Orders"
 msgstr "باز کردن سفارشات فروش"
 
+#: public/js/templates/crm_activities.html:33
+msgid "Open Task"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:21
+msgid "Open Tasks"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
@@ -44448,6 +45214,10 @@
 msgid "Open To Do "
 msgstr " باز کردن برای انجام"
 
+#: manufacturing/doctype/work_order/work_order_preview.html:24
+msgid "Open Work Order {0}"
+msgstr ""
+
 #. Name of a report
 #: manufacturing/report/open_work_orders/open_work_orders.json
 msgid "Open Work Orders"
@@ -44458,7 +45228,7 @@
 msgstr "یک بلیط جدید باز کنید"
 
 #: accounts/report/general_ledger/general_ledger.py:56
-#: public/js/stock_analytics.js:64
+#: public/js/stock_analytics.js:97
 msgid "Opening"
 msgstr "افتتاح"
 
@@ -44496,7 +45266,7 @@
 msgid "Opening Accumulated Depreciation"
 msgstr "گشایش استهلاک انباشته"
 
-#: assets/doctype/asset/asset.py:428
+#: assets/doctype/asset/asset.py:430
 msgid "Opening Accumulated Depreciation must be less than or equal to {0}"
 msgstr "استهلاک انباشته افتتاحیه باید کمتر یا مساوی با {0} باشد."
 
@@ -44546,7 +45316,7 @@
 msgid "Opening Entry"
 msgstr "باز کردن ورودی"
 
-#: accounts/general_ledger.py:676
+#: accounts/general_ledger.py:685
 msgid "Opening Entry can not be created after Period Closing Voucher is created."
 msgstr "پس از ایجاد کوپن بسته شدن دوره، ورودی باز نمی تواند ایجاد شود."
 
@@ -44555,7 +45325,7 @@
 msgstr "افتتاح فاکتور ایجاد در حال انجام است"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/account/account_tree.js:189
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
 msgid "Opening Invoice Creation Tool"
 msgstr "باز کردن ابزار ایجاد فاکتور"
@@ -44576,12 +45346,16 @@
 msgid "Opening Invoice Item"
 msgstr "باز شدن مورد فاکتور"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:125
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:8
+msgid "Opening Invoices"
+msgstr ""
+
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:128
 msgid "Opening Invoices Summary"
 msgstr "خلاصه فاکتورهای افتتاحیه"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:79
-#: stock/report/stock_balance/stock_balance.py:419
+#: stock/report/stock_balance/stock_balance.py:427
 msgid "Opening Qty"
 msgstr "باز کردن تعداد"
 
@@ -44607,7 +45381,7 @@
 msgid "Opening Time"
 msgstr "زمان بازگشایی"
 
-#: stock/report/stock_balance/stock_balance.py:426
+#: stock/report/stock_balance/stock_balance.py:434
 msgid "Opening Value"
 msgstr "ارزش افتتاحیه"
 
@@ -44616,7 +45390,7 @@
 msgid "Opening and Closing"
 msgstr ""
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:30
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:31
 msgid "Opening {0} Invoices created"
 msgstr "باز کردن {0} فاکتورها ایجاد شد"
 
@@ -44648,7 +45422,7 @@
 msgid "Operating Cost Per BOM Quantity"
 msgstr "هزینه عملیاتی به ازای هر مقدار BOM"
 
-#: manufacturing/doctype/bom/bom.py:1321
+#: manufacturing/doctype/bom/bom.py:1320
 msgid "Operating Cost as per Work Order / BOM"
 msgstr "هزینه عملیاتی بر اساس سفارش کار / BOM"
 
@@ -44672,14 +45446,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/bom/bom.js:319
+#: manufacturing/doctype/bom/bom.js:332
 #: manufacturing/doctype/operation/operation.json
-#: manufacturing/doctype/work_order/work_order.js:225
+#: manufacturing/doctype/work_order/work_order.js:240
 #: 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:48
+#: 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/job_card_summary/job_card_summary.js:79
+#: manufacturing/report/job_card_summary/job_card_summary.js:78
 #: manufacturing/report/job_card_summary/job_card_summary.py:167
 msgid "Operation"
 msgstr "عمل"
@@ -44774,7 +45548,7 @@
 msgid "Operation ID"
 msgstr "شناسه عملیات"
 
-#: manufacturing/doctype/work_order/work_order.js:239
+#: manufacturing/doctype/work_order/work_order.js:254
 msgid "Operation Id"
 msgstr "شناسه عملیات"
 
@@ -44802,7 +45576,7 @@
 msgid "Operation Time "
 msgstr " زمان عملیات"
 
-#: manufacturing/doctype/work_order/work_order.py:985
+#: manufacturing/doctype/work_order/work_order.py:999
 msgid "Operation Time must be greater than 0 for Operation {0}"
 msgstr "زمان عملیات برای عملیات {0} باید بیشتر از 0 باشد"
 
@@ -44819,20 +45593,20 @@
 msgid "Operation time does not depend on quantity to produce"
 msgstr "زمان عملیات به مقدار تولید بستگی ندارد"
 
-#: manufacturing/doctype/job_card/job_card.js:215
+#: manufacturing/doctype/job_card/job_card.js:238
 msgid "Operation {0} added multiple times in the work order {1}"
 msgstr "عملیات {0} چندین بار در دستور کار اضافه شد {1}"
 
-#: manufacturing/doctype/job_card/job_card.py:975
+#: manufacturing/doctype/job_card/job_card.py:990
 msgid "Operation {0} does not belong to the work order {1}"
 msgstr "عملیات {0} به دستور کار {1} تعلق ندارد"
 
-#: manufacturing/doctype/workstation/workstation.py:179
+#: manufacturing/doctype/workstation/workstation.py:335
 msgid "Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations"
 msgstr "عملیات {0} طولانی‌تر از هر ساعت کاری موجود در ایستگاه کاری {1}، عملیات را به چندین عملیات تقسیم کنید"
 
-#: manufacturing/doctype/work_order/work_order.js:220
-#: setup/doctype/company/company.py:341 templates/generators/bom.html:61
+#: manufacturing/doctype/work_order/work_order.js:235
+#: setup/doctype/company/company.py:340 templates/generators/bom.html:61
 msgid "Operations"
 msgstr "عملیات"
 
@@ -44862,6 +45636,7 @@
 msgid "Operations cannot be left blank"
 msgstr "عملیات را نمی توان خالی گذاشت"
 
+#: manufacturing/doctype/workstation/workstation.js:165
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:85
 msgid "Operator"
 msgstr "اپراتور"
@@ -44893,17 +45668,17 @@
 msgid "Opportunities"
 msgstr "فرصت ها"
 
-#: selling/page/sales_funnel/sales_funnel.js:43
+#: selling/page/sales_funnel/sales_funnel.js:48
 msgid "Opportunities by lead source"
 msgstr "فرصت ها بر اساس منبع اصلی"
 
 #. Name of a DocType
-#: buying/doctype/request_for_quotation/request_for_quotation.js:318
-#: crm/doctype/lead/lead.js:36 crm/doctype/opportunity/opportunity.json
-#: crm/doctype/prospect/prospect.js:15
-#: crm/report/lead_details/lead_details.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: crm/doctype/lead/lead.js:33 crm/doctype/opportunity/opportunity.json
+#: crm/doctype/prospect/prospect.js:20
+#: crm/report/lead_details/lead_details.js:36
 #: crm/report/lost_opportunity/lost_opportunity.py:17
-#: public/js/communication.js:26 selling/doctype/quotation/quotation.js:133
+#: public/js/communication.js:35 selling/doctype/quotation/quotation.js:139
 msgid "Opportunity"
 msgstr "فرصت"
 
@@ -44972,7 +45747,7 @@
 msgid "Opportunity Date"
 msgstr "تاریخ فرصت"
 
-#: crm/report/lost_opportunity/lost_opportunity.js:43
+#: crm/report/lost_opportunity/lost_opportunity.js:42
 #: crm/report/lost_opportunity/lost_opportunity.py:24
 msgid "Opportunity From"
 msgstr "فرصت از"
@@ -45017,7 +45792,7 @@
 msgstr "جزئیات دلیل از دست رفته فرصت"
 
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:32
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:55
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:57
 msgid "Opportunity Owner"
 msgstr "صاحب فرصت"
 
@@ -45027,8 +45802,8 @@
 msgid "Opportunity Owner"
 msgstr "صاحب فرصت"
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:47
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:59
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:45
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:58
 msgid "Opportunity Source"
 msgstr "منبع فرصت"
 
@@ -45045,9 +45820,9 @@
 #. Name of a DocType
 #: crm/doctype/opportunity_type/opportunity_type.json
 #: crm/report/lost_opportunity/lost_opportunity.py:44
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:53
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:51
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:48
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:65
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:64
 msgid "Opportunity Type"
 msgstr "نوع فرصت"
 
@@ -45063,7 +45838,7 @@
 msgid "Opportunity Value"
 msgstr "ارزش فرصت"
 
-#: public/js/communication.js:86
+#: public/js/communication.js:102
 msgid "Opportunity {0} created"
 msgstr "فرصت {0} ایجاد شد"
 
@@ -45073,11 +45848,11 @@
 msgid "Optimize Route"
 msgstr "بهینه سازی مسیر"
 
-#: accounts/doctype/account/account_tree.js:122
+#: accounts/doctype/account/account_tree.js:168
 msgid "Optional. Sets company's default currency, if not specified."
 msgstr "اختیاری. اگر مشخص نشده باشد، واحد پول پیش‌فرض شرکت را تنظیم می‌کند."
 
-#: accounts/doctype/account/account_tree.js:117
+#: accounts/doctype/account/account_tree.js:155
 msgid "Optional. This setting will be used to filter in various transactions."
 msgstr "اختیاری. این تنظیم برای فیلتر کردن در تراکنش‌های مختلف استفاده می‌شود."
 
@@ -45105,7 +45880,7 @@
 msgid "Order Amount"
 msgstr "مقدار سفارش"
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:81
+#: manufacturing/report/production_planning_report/production_planning_report.js:80
 msgid "Order By"
 msgstr "سفارش توسط"
 
@@ -45150,9 +45925,13 @@
 msgid "Order Status"
 msgstr "وضعیت سفارش"
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:30
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:8
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:8
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:4
+msgid "Order Summary"
+msgstr ""
+
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:29
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:7
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:7
 msgid "Order Type"
 msgstr "نوع سفارش"
 
@@ -45185,8 +45964,8 @@
 msgstr ""
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:5
-#: selling/doctype/quotation/quotation_list.js:31
-#: stock/doctype/material_request/material_request_list.js:25
+#: selling/doctype/quotation/quotation_list.js:30
+#: stock/doctype/material_request/material_request_list.js:29
 msgid "Ordered"
 msgstr "سفارش داده شده"
 
@@ -45239,6 +46018,10 @@
 msgid "Ordered Qty"
 msgstr "تعداد سفارش داد"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Ordered Qty: Quantity ordered for purchase, but not received."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:102
 msgid "Ordered Quantity"
 msgstr "مقدار سفارش داده شده"
@@ -45251,7 +46034,7 @@
 
 #: buying/doctype/supplier/supplier_dashboard.py:14
 #: selling/doctype/customer/customer_dashboard.py:21
-#: selling/doctype/sales_order/sales_order.py:745
+#: selling/doctype/sales_order/sales_order.py:751
 #: setup/doctype/company/company_dashboard.py:23
 msgid "Orders"
 msgstr "سفارشات"
@@ -45383,12 +46166,12 @@
 msgstr "تنظیمات دیگر"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:81
-#: stock/report/stock_balance/stock_balance.py:441
-#: stock/report/stock_ledger/stock_ledger.py:146
+#: stock/report/stock_balance/stock_balance.py:449
+#: stock/report/stock_ledger/stock_ledger.py:219
 msgid "Out Qty"
 msgstr "خارج از تعداد"
 
-#: stock/report/stock_balance/stock_balance.py:447
+#: stock/report/stock_balance/stock_balance.py:455
 msgid "Out Value"
 msgstr "خارج از ارزش"
 
@@ -45405,7 +46188,7 @@
 msgid "Out of AMC"
 msgstr "خارج از AMC"
 
-#: assets/doctype/asset/asset_list.js:23
+#: assets/doctype/asset/asset_list.js:17
 msgid "Out of Order"
 msgstr "خارج از نظم"
 
@@ -45415,7 +46198,7 @@
 msgid "Out of Order"
 msgstr "خارج از نظم"
 
-#: stock/doctype/pick_list/pick_list.py:386
+#: stock/doctype/pick_list/pick_list.py:426
 msgid "Out of Stock"
 msgstr "تمام شده"
 
@@ -45486,9 +46269,10 @@
 msgid "Outstanding"
 msgstr "برجسته"
 
-#: accounts/doctype/payment_entry/payment_entry.js:653
+#: 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.py:1074
+#: 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/purchase_register/purchase_register.py:289
 #: accounts/report/sales_register/sales_register.py:317
@@ -45545,7 +46329,7 @@
 msgid "Outstanding Cheques and Deposits to clear"
 msgstr "چک ها و سپرده های معوق برای تسویه"
 
-#: accounts/doctype/gl_entry/gl_entry.py:422
+#: accounts/doctype/gl_entry/gl_entry.py:376
 msgid "Outstanding for {0} cannot be less than zero ({1})"
 msgstr "معوقه برای {0} نمی تواند کمتر از صفر باشد ({1})"
 
@@ -45594,7 +46378,7 @@
 msgid "Over Delivery/Receipt Allowance (%)"
 msgstr ""
 
-#: controllers/stock_controller.py:896
+#: controllers/stock_controller.py:1082
 msgid "Over Receipt"
 msgstr "بیش از رسید"
 
@@ -45618,13 +46402,14 @@
 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role."
 msgstr "اضافه صورتحساب {0} {1} برای مورد {2} نادیده گرفته شد زیرا شما نقش {3} را دارید."
 
-#: controllers/accounts_controller.py:1713
+#: controllers/accounts_controller.py:1802
 msgid "Overbilling of {} ignored because you have {} role."
 msgstr "پرداخت بیش از حد {} نادیده گرفته شد زیرا شما نقش {} را دارید."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:261
+#: accounts/doctype/sales_invoice/sales_invoice.py:266
 #: projects/report/project_summary/project_summary.py:94
-#: selling/doctype/sales_order/sales_order_list.js:18
+#: selling/doctype/sales_order/sales_order_list.js:29
+#: templates/pages/task_info.html:75
 msgid "Overdue"
 msgstr "عقب افتاده"
 
@@ -45834,11 +46619,11 @@
 msgid "POS Closing Entry Taxes"
 msgstr "مالیات ورودی بسته شدن POS"
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:30
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:31
 msgid "POS Closing Failed"
 msgstr "بسته شدن POS ناموفق بود"
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:54
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:55
 msgid "POS Closing failed while running in a background process. You can resolve the {0} and retry the process again."
 msgstr "بسته شدن POS هنگام اجرا در یک فرآیند پس‌زمینه انجام نشد. می توانید {0} را حل کنید و دوباره این فرآیند را امتحان کنید."
 
@@ -45985,10 +46770,10 @@
 
 #. Name of a DocType
 #: accounts/doctype/pos_profile/pos_profile.json
-#: accounts/report/pos_register/pos_register.js:33
+#: accounts/report/pos_register/pos_register.js:32
 #: accounts/report/pos_register/pos_register.py:120
 #: accounts/report/pos_register/pos_register.py:193
-#: selling/page/point_of_sale/pos_controller.js:68
+#: selling/page/point_of_sale/pos_controller.js:80
 msgid "POS Profile"
 msgstr "نمایه POS"
 
@@ -46025,7 +46810,7 @@
 msgid "POS Profile doesn't matches {}"
 msgstr "نمایه POS با {} مطابقت ندارد"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1119
+#: accounts/doctype/sales_invoice/sales_invoice.py:1135
 msgid "POS Profile required to make POS Entry"
 msgstr "نمایه POS برای ورود به POS لازم است"
 
@@ -46076,7 +46861,7 @@
 msgid "POS Transactions"
 msgstr "معاملات POS"
 
-#: selling/page/point_of_sale/pos_controller.js:363
+#: selling/page/point_of_sale/pos_controller.js:392
 msgid "POS invoice {0} created successfully"
 msgstr ""
 
@@ -46149,7 +46934,7 @@
 msgid "Package Weight Details"
 msgstr "جزئیات وزن بسته"
 
-#: stock/doctype/delivery_note/delivery_note_list.js:65
+#: stock/doctype/delivery_note/delivery_note_list.js:74
 msgid "Packaging Slip From Delivery Note"
 msgstr "برگه بسته بندی از یادداشت تحویل"
 
@@ -46182,7 +46967,7 @@
 msgid "Packed Items"
 msgstr "اقلام بسته بندی شده"
 
-#: controllers/stock_controller.py:739
+#: controllers/stock_controller.py:922
 msgid "Packed Items cannot be transferred internally"
 msgstr "اقلام بسته بندی شده را نمی توان به صورت داخلی منتقل کرد"
 
@@ -46223,7 +47008,7 @@
 msgstr "لیست بسته بندی"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:186
+#: stock/doctype/delivery_note/delivery_note.js:221
 #: stock/doctype/packing_slip/packing_slip.json
 msgid "Packing Slip"
 msgstr "برگه بسته بندی"
@@ -46239,7 +47024,7 @@
 msgid "Packing Slip Item"
 msgstr "اقلام اسلیپ بسته بندی"
 
-#: stock/doctype/delivery_note/delivery_note.py:704
+#: stock/doctype/delivery_note/delivery_note.py:765
 msgid "Packing Slip(s) cancelled"
 msgstr "برگه(های) بسته بندی لغو شد"
 
@@ -46349,8 +47134,8 @@
 msgid "Page {0} of {1}"
 msgstr "صفحه {0} از {1}"
 
-#: accounts/doctype/payment_request/payment_request_list.js:17
-#: accounts/doctype/sales_invoice/sales_invoice.py:267
+#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/sales_invoice/sales_invoice.py:272
 msgid "Paid"
 msgstr "پرداخت شده"
 
@@ -46379,10 +47164,12 @@
 msgstr "پرداخت شده"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:170
-#: accounts/report/accounts_receivable/accounts_receivable.py:1068
+#: 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
+#: 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"
 msgstr "مقدار پرداخت شده"
@@ -46459,7 +47246,7 @@
 msgid "Paid Amount After Tax (Company Currency)"
 msgstr "مبلغ پرداختی پس از مالیات (ارز شرکت)"
 
-#: accounts/doctype/payment_entry/payment_entry.js:881
+#: accounts/doctype/payment_entry/payment_entry.js:1059
 msgid "Paid Amount cannot be greater than total negative outstanding amount {0}"
 msgstr "مبلغ پرداختی نمی تواند بیشتر از کل مبلغ معوق منفی باشد {0}"
 
@@ -46481,8 +47268,8 @@
 msgid "Paid To Account Type"
 msgstr "پرداخت به نوع حساب"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:324
-#: accounts/doctype/sales_invoice/sales_invoice.py:994
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:328
+#: accounts/doctype/sales_invoice/sales_invoice.py:1011
 msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
 msgstr "مبلغ پرداخت شده + مبلغ بازنویسی نمی تواند بیشتر از کل کل باشد"
 
@@ -46626,7 +47413,7 @@
 msgid "Parent Company"
 msgstr "شرکت مادر"
 
-#: setup/doctype/company/company.py:460
+#: setup/doctype/company/company.py:459
 msgid "Parent Company must be a group company"
 msgstr "شرکت مادر باید یک شرکت گروهی باشد"
 
@@ -46736,12 +47523,6 @@
 msgid "Parent Warehouse"
 msgstr "انبار والدین"
 
-#. Label of a Link field in DocType 'Pick List'
-#: stock/doctype/pick_list/pick_list.json
-msgctxt "Pick List"
-msgid "Parent Warehouse"
-msgstr "انبار والدین"
-
 #. Label of a Link field in DocType 'Warehouse'
 #: stock/doctype/warehouse/warehouse.json
 msgctxt "Warehouse"
@@ -46754,7 +47535,7 @@
 msgid "Partial Material Transferred"
 msgstr "مواد جزئی منتقل شد"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1043
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1045
 msgid "Partial Stock Reservation"
 msgstr "رزرو جزئی موجودی"
 
@@ -46797,7 +47578,7 @@
 msgid "Partially Delivered"
 msgstr "تا حدی تحویل شد"
 
-#: assets/doctype/asset/asset_list.js:8
+#: assets/doctype/asset/asset_list.js:7
 msgid "Partially Depreciated"
 msgstr "نیمه مستهلک شده"
 
@@ -46813,7 +47594,7 @@
 msgid "Partially Fulfilled"
 msgstr "تا حدی برآورده شده است"
 
-#: selling/doctype/quotation/quotation_list.js:29
+#: selling/doctype/quotation/quotation_list.js:28
 msgid "Partially Ordered"
 msgstr "تا حدی سفارش داده شده"
 
@@ -46829,7 +47610,7 @@
 msgid "Partially Ordered"
 msgstr "تا حدی سفارش داده شده"
 
-#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/payment_request/payment_request_list.js:12
 msgid "Partially Paid"
 msgstr "تا حدی پرداخت شده است"
 
@@ -46853,7 +47634,7 @@
 msgid "Partially Paid"
 msgstr "تا حدی پرداخت شده است"
 
-#: stock/doctype/material_request/material_request_list.js:21
+#: stock/doctype/material_request/material_request_list.js:25
 msgid "Partially Received"
 msgstr "تا حدی دریافت شد"
 
@@ -46899,7 +47680,7 @@
 msgid "Parties"
 msgstr "طرف‌ها"
 
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:14
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:23
 msgid "Partly Billed"
 msgstr "تا حدی صورتحساب"
 
@@ -46957,30 +47738,38 @@
 msgid "Partnership"
 msgstr "شراکت"
 
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Parts Per Hour"
+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
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:193
 #: accounts/doctype/tax_category/tax_category_dashboard.py:11
-#: accounts/report/accounts_payable/accounts_payable.js:109
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:86
-#: accounts/report/accounts_receivable/accounts_receivable.js:54
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:86
+#: accounts/report/accounts_payable/accounts_payable.js:112
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:89
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.js:74
-#: accounts/report/general_ledger/general_ledger.py:633
-#: accounts/report/payment_ledger/payment_ledger.js:52
+#: accounts/report/general_ledger/general_ledger.py:646
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:92
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:27
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:27
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:26
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:26
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:57
-#: crm/report/lost_opportunity/lost_opportunity.js:56
+#: crm/report/lost_opportunity/lost_opportunity.js:55
 #: crm/report/lost_opportunity/lost_opportunity.py:31
-#: public/js/bank_reconciliation_tool/data_table_manager.js:51
-#: public/js/bank_reconciliation_tool/dialog_manager.js:128
+#: public/js/bank_reconciliation_tool/data_table_manager.js:50
+#: public/js/bank_reconciliation_tool/dialog_manager.js:135
 msgid "Party"
 msgstr "طرف"
 
@@ -47122,16 +47911,10 @@
 msgid "Party Account No. (Bank Statement)"
 msgstr "شماره حساب طرف (صورتحساب بانکی)"
 
-#: controllers/accounts_controller.py:1983
+#: controllers/accounts_controller.py:2075
 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same"
 msgstr "واحد پول حساب طرف {0} ({1}) و واحد پول سند ({2}) باید یکسان باشند"
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Party Balance"
-msgstr "تراز طرف"
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47174,13 +47957,19 @@
 msgid "Party Information"
 msgstr "اطلاعات طرف"
 
+#. Label of a Data field in DocType 'Blanket Order Item'
+#: manufacturing/doctype/blanket_order_item/blanket_order_item.json
+msgctxt "Blanket Order Item"
+msgid "Party Item Code"
+msgstr ""
+
 #. Name of a DocType
 #: accounts/doctype/party_link/party_link.json
 msgid "Party Link"
 msgstr "لینک طرف"
 
 #: accounts/report/general_ledger/general_ledger.js:109
-#: selling/report/address_and_contacts/address_and_contacts.js:23
+#: selling/report/address_and_contacts/address_and_contacts.js:22
 msgid "Party Name"
 msgstr "نام طرف"
 
@@ -47233,16 +48022,16 @@
 #: 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/general_ledger/general_ledger.js:65
-#: accounts/report/general_ledger/general_ledger.py:632
-#: accounts/report/payment_ledger/payment_ledger.js:42
+#: accounts/report/general_ledger/general_ledger.py:645
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:16
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:16
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:15
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:15
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:49
-#: public/js/bank_reconciliation_tool/data_table_manager.js:46
-#: selling/report/address_and_contacts/address_and_contacts.js:10
+#: public/js/bank_reconciliation_tool/data_table_manager.js:45
+#: selling/report/address_and_contacts/address_and_contacts.js:9
 #: setup/doctype/party_type/party_type.json
 msgid "Party Type"
 msgstr "نوع طرف"
@@ -47347,7 +48136,7 @@
 msgid "Party Type and Party is mandatory for {0} account"
 msgstr "نوع طرف و طرف برای حساب {0} اجباری است"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:162
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:161
 msgid "Party Type and Party is required for Receivable / Payable account {0}"
 msgstr "نوع طرف و طرف برای حساب دریافتنی / پرداختنی {0} لازم است"
 
@@ -47361,7 +48150,7 @@
 msgid "Party User"
 msgstr "کاربر طرف"
 
-#: accounts/doctype/payment_entry/payment_entry.js:308
+#: accounts/doctype/payment_entry/payment_entry.js:390
 msgid "Party can only be one of {0}"
 msgstr "طرف فقط می تواند یکی از {0} باشد"
 
@@ -47415,7 +48204,7 @@
 msgid "Path"
 msgstr "مسیر"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:84
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:85
 msgid "Pause"
 msgstr "مکث کنید"
 
@@ -47425,7 +48214,7 @@
 msgid "Pause"
 msgstr "مکث کنید"
 
-#: manufacturing/doctype/job_card/job_card.js:259
+#: manufacturing/doctype/job_card/job_card.js:292
 msgid "Pause Job"
 msgstr "مکث کار"
 
@@ -47448,6 +48237,10 @@
 msgid "Paused"
 msgstr "مکث کرد"
 
+#: templates/pages/order.html:43
+msgid "Pay"
+msgstr "پرداخت"
+
 #. Option for the 'Payment Type' (Select) field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47460,7 +48253,7 @@
 msgid "Pay To / Recd From"
 msgstr "پرداخت به / ضبط از"
 
-#: accounts/report/account_balance/account_balance.js:52
+#: accounts/report/account_balance/account_balance.js:54
 msgid "Payable"
 msgstr "قابل پرداخت"
 
@@ -47509,15 +48302,15 @@
 
 #: accounts/doctype/dunning/dunning.js:51
 #: accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:110
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:65
-#: accounts/doctype/sales_invoice/sales_invoice.js:104
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:52
+#: 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:31
-#: buying/doctype/purchase_order/purchase_order.js:328
+#: accounts/doctype/sales_invoice/sales_invoice_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:385
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:20
-#: selling/doctype/sales_order/sales_order.js:606
+#: selling/doctype/sales_order/sales_order.js:713
 #: selling/doctype/sales_order/sales_order_dashboard.py:28
 msgid "Payment"
 msgstr "پرداخت"
@@ -47625,15 +48418,16 @@
 msgid "Payment Entries"
 msgstr "ورودی های پرداخت"
 
-#: accounts/utils.py:937
+#: accounts/utils.py:946
 msgid "Payment Entries {0} are un-linked"
 msgstr "ورودی های پرداخت {0} لغو پیوند هستند"
 
 #. Name of a DocType
 #: accounts/doctype/payment_entry/payment_entry.json
-#: accounts/doctype/payment_order/payment_order.js:22
+#: accounts/doctype/payment_order/payment_order.js:27
 #: accounts/print_format/bank_and_cash_payment_voucher/bank_and_cash_payment_voucher.html:12
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.py:29
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:11
 msgid "Payment Entry"
 msgstr "ورودی پرداخت"
 
@@ -47686,23 +48480,24 @@
 msgid "Payment Entry Reference"
 msgstr "مرجع ورود به پرداخت"
 
-#: accounts/doctype/payment_request/payment_request.py:410
+#: accounts/doctype/payment_request/payment_request.py:413
 msgid "Payment Entry already exists"
 msgstr "ورودی پرداخت از قبل وجود دارد"
 
-#: accounts/utils.py:604
+#: accounts/utils.py:613
 msgid "Payment Entry has been modified after you pulled it. Please pull it again."
 msgstr "ورودی پرداخت پس از اینکه شما آن را کشیدید اصلاح شده است. لطفا دوباره آن را بکشید."
 
-#: accounts/doctype/payment_request/payment_request.py:568
+#: accounts/doctype/payment_request/payment_request.py:111
+#: accounts/doctype/payment_request/payment_request.py:460
 msgid "Payment Entry is already created"
 msgstr "ورودی پرداخت قبلا ایجاد شده است"
 
-#: controllers/accounts_controller.py:1164
+#: controllers/accounts_controller.py:1231
 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice."
 msgstr "ورودی پرداخت {0} با سفارش {1} مرتبط است، بررسی کنید که آیا باید به عنوان پیش پرداخت در این فاکتور آورده شود."
 
-#: selling/page/point_of_sale/pos_payment.js:261
+#: selling/page/point_of_sale/pos_payment.js:271
 msgid "Payment Failed"
 msgstr "پرداخت ناموفق"
 
@@ -47753,7 +48548,7 @@
 msgid "Payment Gateway Account"
 msgstr "حساب درگاه پرداخت"
 
-#: accounts/utils.py:1227
+#: accounts/utils.py:1196
 msgid "Payment Gateway Account not created, please create one manually."
 msgstr "حساب درگاه پرداخت ایجاد نشد، لطفاً یکی را به صورت دستی ایجاد کنید."
 
@@ -47783,9 +48578,10 @@
 msgid "Payment Limit"
 msgstr "محدودیت پرداخت"
 
-#: accounts/report/pos_register/pos_register.js:51
+#: accounts/report/pos_register/pos_register.js:50
 #: accounts/report/pos_register/pos_register.py:129
 #: accounts/report/pos_register/pos_register.py:221
+#: selling/page/point_of_sale/pos_payment.js:19
 msgid "Payment Method"
 msgstr "روش پرداخت"
 
@@ -47877,7 +48673,7 @@
 msgid "Payment Receipt Note"
 msgstr "یادداشت رسید پرداخت"
 
-#: selling/page/point_of_sale/pos_payment.js:248
+#: selling/page/point_of_sale/pos_payment.js:252
 msgid "Payment Received"
 msgstr "پرداخت دریافت شد"
 
@@ -47910,7 +48706,7 @@
 msgid "Payment Reconciliation Invoice"
 msgstr "فاکتور تطبیق پرداخت"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:120
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:123
 msgid "Payment Reconciliation Job: {0} is running for this party. Can't reconcile now."
 msgstr "کار تطبیق پرداخت: {0} برای این طرف اجرا می شود. الان نمیشه آشتی کرد"
 
@@ -47938,12 +48734,12 @@
 msgstr "مراجع پرداخت"
 
 #. Name of a DocType
-#: accounts/doctype/payment_order/payment_order.js:18
+#: accounts/doctype/payment_order/payment_order.js:19
 #: accounts/doctype/payment_request/payment_request.json
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:125
-#: accounts/doctype/sales_invoice/sales_invoice.js:140
-#: buying/doctype/purchase_order/purchase_order.js:335
-#: selling/doctype/sales_order/sales_order.js:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:145
+#: accounts/doctype/sales_invoice/sales_invoice.js:143
+#: buying/doctype/purchase_order/purchase_order.js:393
+#: selling/doctype/sales_order/sales_order.js:709
 msgid "Payment Request"
 msgstr "درخواست پرداخت"
 
@@ -47972,15 +48768,15 @@
 msgid "Payment Request Type"
 msgstr "نوع درخواست پرداخت"
 
-#: accounts/doctype/payment_request/payment_request.py:502
+#: accounts/doctype/payment_request/payment_request.py:507
 msgid "Payment Request for {0}"
 msgstr "درخواست پرداخت برای {0}"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:268
+#: accounts/doctype/pos_invoice/pos_invoice.js:289
 msgid "Payment Request took too long to respond. Please try requesting for payment again."
 msgstr "پاسخ درخواست پرداخت خیلی طول کشید. لطفاً دوباره درخواست پرداخت کنید."
 
-#: accounts/doctype/payment_request/payment_request.py:450
+#: accounts/doctype/payment_request/payment_request.py:453
 msgid "Payment Requests cannot be created against: {0}"
 msgstr ""
 
@@ -48031,13 +48827,9 @@
 msgid "Payment Schedule"
 msgstr "برنامه زمانی پرداخت"
 
-#: public/js/controllers/transaction.js:925
-msgid "Payment Schedule Table"
-msgstr "جدول زمانبندی پرداخت"
-
 #. Name of a DocType
 #: accounts/doctype/payment_term/payment_term.json
-#: accounts/report/accounts_receivable/accounts_receivable.py:1064
+#: accounts/report/accounts_receivable/accounts_receivable.py:1072
 #: accounts/report/gross_profit/gross_profit.py:348
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
 msgid "Payment Term"
@@ -48080,6 +48872,7 @@
 msgstr "نام مدت پرداخت"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:44
+#: accounts/report/accounts_receivable/accounts_receivable.html:31
 msgid "Payment Terms"
 msgstr "شرایط پرداخت"
 
@@ -48133,11 +48926,11 @@
 #. Name of a DocType
 #: accounts/doctype/payment_terms_template/payment_terms_template.json
 #: accounts/report/accounts_payable/accounts_payable.js:93
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:99
-#: accounts/report/accounts_receivable/accounts_receivable.js:127
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:105
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:62
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:62
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:102
+#: accounts/report/accounts_receivable/accounts_receivable.js:130
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:108
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:61
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:61
 msgid "Payment Terms Template"
 msgstr "الگوی شرایط پرداخت"
 
@@ -48205,15 +48998,15 @@
 msgid "Payment Type"
 msgstr "نوع پرداخت"
 
-#: accounts/doctype/payment_entry/payment_entry.py:501
+#: accounts/doctype/payment_entry/payment_entry.py:510
 msgid "Payment Type must be one of Receive, Pay and Internal Transfer"
 msgstr "نوع پرداخت باید یکی از دریافت، پرداخت و انتقال داخلی باشد"
 
-#: accounts/utils.py:927
+#: accounts/utils.py:936
 msgid "Payment Unlink Error"
 msgstr "خطای لغو پیوند پرداخت"
 
-#: accounts/doctype/journal_entry/journal_entry.py:764
+#: accounts/doctype/journal_entry/journal_entry.py:791
 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
 msgstr "پرداخت در مقابل {0} {1} نمی تواند بیشتر از مبلغ معوقه {2} باشد"
 
@@ -48225,12 +49018,12 @@
 msgid "Payment methods are mandatory. Please add at least one payment method."
 msgstr "روش های پرداخت اجباری است. لطفاً حداقل یک روش پرداخت اضافه کنید."
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:277
-#: selling/page/point_of_sale/pos_payment.js:252
+#: accounts/doctype/pos_invoice/pos_invoice.js:301
+#: selling/page/point_of_sale/pos_payment.js:259
 msgid "Payment of {0} received successfully."
 msgstr "پرداخت {0} با موفقیت دریافت شد."
 
-#: selling/page/point_of_sale/pos_payment.js:257
+#: selling/page/point_of_sale/pos_payment.js:266
 msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
 msgstr "پرداخت {0} با موفقیت دریافت شد. در انتظار تکمیل درخواست های دیگر..."
 
@@ -48238,11 +49031,11 @@
 msgid "Payment related to {0} is not completed"
 msgstr "پرداخت مربوط به {0} تکمیل نشده است"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:259
+#: accounts/doctype/pos_invoice/pos_invoice.js:278
 msgid "Payment request failed"
 msgstr "درخواست پرداخت انجام نشد"
 
-#: accounts/doctype/payment_entry/payment_entry.py:713
+#: accounts/doctype/payment_entry/payment_entry.py:722
 msgid "Payment term {0} not used in {1}"
 msgstr "مدت پرداخت {0} در {1} استفاده نشده است"
 
@@ -48257,6 +49050,7 @@
 #: accounts/workspace/receivables/receivables.json
 #: buying/doctype/supplier/supplier_dashboard.py:15
 #: selling/doctype/customer/customer_dashboard.py:22
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Payments"
 msgstr "مبلغ پرداختی"
 
@@ -48321,11 +49115,11 @@
 msgstr "فیش حقوقی"
 
 #: assets/doctype/asset_repair/asset_repair_list.js:5
-#: buying/doctype/request_for_quotation/request_for_quotation.py:314
+#: buying/doctype/request_for_quotation/request_for_quotation.py:338
 #: 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
-#: templates/pages/order.html:56
+#: templates/pages/order.html:68
 msgid "Pending"
 msgstr "انتظار"
 
@@ -48403,9 +49197,9 @@
 msgstr "مبلغ معلق"
 
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:218
-#: manufacturing/doctype/work_order/work_order.js:244
+#: 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:991
+#: selling/doctype/sales_order/sales_order.js:1153
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
 msgid "Pending Qty"
 msgstr "تعداد معلق"
@@ -48421,6 +49215,10 @@
 msgid "Pending Quantity"
 msgstr "مقدار معلق"
 
+#: templates/pages/task_info.html:74
+msgid "Pending Review"
+msgstr "بررسی در انتظار"
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -48442,7 +49240,7 @@
 msgid "Pending activities for today"
 msgstr "فعالیت های معلق برای امروز"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:224
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:219
 msgid "Pending processing"
 msgstr "در انتظار پردازش"
 
@@ -48595,24 +49393,24 @@
 msgid "Perception Analysis"
 msgstr "تجزیه و تحلیل ادراک"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:61
+#: accounts/report/budget_variance_report/budget_variance_report.js:59
 #: public/js/purchase_trends_filters.js:16 public/js/sales_trends_filters.js:8
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:30
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:30
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:30
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:29
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:29
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:29
 msgid "Period"
 msgstr "دوره زمانی"
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:61
+#: assets/report/fixed_asset_register/fixed_asset_register.js:60
 msgid "Period Based On"
 msgstr "دوره بر اساس"
 
-#: accounts/general_ledger.py:690
+#: accounts/general_ledger.py:699
 msgid "Period Closed"
 msgstr "دوره بسته است"
 
-#: accounts/report/trial_balance/trial_balance.js:82
-msgid "Period Closing Entry"
+#: accounts/report/trial_balance/trial_balance.js:88
+msgid "Period Closing Entry For Current Period"
 msgstr ""
 
 #. Label of a Section Break field in DocType 'Accounts Settings'
@@ -48622,7 +49420,7 @@
 msgstr "تنظیمات بسته شدن دوره"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:141
+#: accounts/doctype/account/account_tree.js:197
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgid "Period Closing Voucher"
 msgstr "کوپن پایان دوره"
@@ -48709,10 +49507,10 @@
 msgid "Period_from_date"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:72
 #: accounts/report/financial_ratios/financial_ratios.js:33
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:55
-#: public/js/financial_statements.js:214
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:54
+#: public/js/financial_statements.js:223
 msgid "Periodicity"
 msgstr "دوره ای"
 
@@ -48847,7 +49645,7 @@
 msgid "Phone No"
 msgstr "شماره تلفن"
 
-#: selling/page/point_of_sale/pos_item_cart.js:880
+#: selling/page/point_of_sale/pos_item_cart.js:911
 msgid "Phone Number"
 msgstr "شماره تلفن"
 
@@ -48857,13 +49655,13 @@
 msgid "Phone Number"
 msgstr "شماره تلفن"
 
-#: public/js/utils.js:64
+#: public/js/utils.js:78
 msgid "Pick Batch No"
 msgstr "شماره دسته را انتخاب کنید"
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:548
-#: stock/doctype/material_request/material_request.js:113
+#: selling/doctype/sales_order/sales_order.js:599
+#: stock/doctype/material_request/material_request.js:115
 #: stock/doctype/pick_list/pick_list.json
 msgid "Pick List"
 msgstr "لیست انتخاب"
@@ -48893,7 +49691,7 @@
 msgid "Pick List"
 msgstr "لیست انتخاب"
 
-#: stock/doctype/pick_list/pick_list.py:116
+#: stock/doctype/pick_list/pick_list.py:120
 msgid "Pick List Incomplete"
 msgstr "فهرست انتخابی ناقص است"
 
@@ -48974,7 +49772,7 @@
 msgid "Pickup Date"
 msgstr "تاریخ تحویل"
 
-#: stock/doctype/shipment/shipment.js:364
+#: stock/doctype/shipment/shipment.js:398
 msgid "Pickup Date cannot be before this day"
 msgstr "تاریخ تحویل نمی‌تواند قبل از این روز باشد"
 
@@ -49008,7 +49806,7 @@
 msgid "Pickup to"
 msgstr "وانت به"
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:9
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:8
 msgid "Pipeline By"
 msgstr "خط لوله توسط"
 
@@ -49036,16 +49834,16 @@
 msgid "Plaid Environment"
 msgstr "محیط شطرنجی"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:136
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:160
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:152
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:176
 msgid "Plaid Link Failed"
 msgstr "پیوند Plaid ناموفق بود"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:238
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:254
 msgid "Plaid Link Refresh Required"
 msgstr "بازخوانی پیوند شطرنجی مورد نیاز است"
 
-#: accounts/doctype/bank/bank.js:121
+#: accounts/doctype/bank/bank.js:131
 msgid "Plaid Link Updated"
 msgstr "پیوند شطرنجی به روز شد"
 
@@ -49066,7 +49864,7 @@
 msgid "Plaid Settings"
 msgstr "تنظیمات شطرنجی"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:211
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:227
 msgid "Plaid transactions sync error"
 msgstr "خطای همگام سازی تراکنش های پرداخت شده"
 
@@ -49167,6 +49965,10 @@
 msgid "Planned Qty"
 msgstr "تعداد برنامه ریزی شده"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:109
 msgid "Planned Quantity"
 msgstr "مقدار برنامه ریزی شده"
@@ -49222,12 +50024,36 @@
 msgid "Plans"
 msgstr "طرح ها"
 
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Plant Dashboard"
+msgstr ""
+
+#. Name of a DocType
+#: manufacturing/doctype/plant_floor/plant_floor.json
+#: public/js/plant_floor_visual/visual_plant.js:53
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/workspace/manufacturing/manufacturing.json
+msgctxt "Plant Floor"
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Plant Floor"
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:30
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:43
 msgid "Plants and Machineries"
 msgstr "گیاهان و ماشین آلات"
 
-#: stock/doctype/pick_list/pick_list.py:383
+#: stock/doctype/pick_list/pick_list.py:423
 msgid "Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List."
 msgstr "لطفاً موارد را مجدداً ذخیره کنید و فهرست انتخابی را برای ادامه به‌روزرسانی کنید. برای توقف، فهرست انتخاب را لغو کنید."
 
@@ -49235,17 +50061,17 @@
 msgid "Please Select a Company"
 msgstr "لطفا یک شرکت را انتخاب کنید"
 
-#: selling/page/sales_funnel/sales_funnel.js:94
+#: selling/page/sales_funnel/sales_funnel.js:109
 msgid "Please Select a Company."
 msgstr "لطفا یک شرکت را انتخاب کنید"
 
-#: stock/doctype/delivery_note/delivery_note.js:139
+#: stock/doctype/delivery_note/delivery_note.js:151
 msgid "Please Select a Customer"
 msgstr "لطفا یک مشتری انتخاب کنید"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:114
-#: stock/doctype/purchase_receipt/purchase_receipt.js:199
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:82
+#: stock/doctype/purchase_receipt/purchase_receipt.js:128
+#: stock/doctype/purchase_receipt/purchase_receipt.js:230
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
 msgid "Please Select a Supplier"
 msgstr "لطفا یک تامین کننده انتخاب کنید"
 
@@ -49253,7 +50079,7 @@
 msgid "Please Set Supplier Group in Buying Settings."
 msgstr "لطفاً گروه تامین کننده را در تنظیمات خرید تنظیم کنید."
 
-#: accounts/doctype/payment_entry/payment_entry.js:1071
+#: accounts/doctype/payment_entry/payment_entry.js:1297
 msgid "Please Specify Account"
 msgstr "لطفا حساب را مشخص کنید"
 
@@ -49261,7 +50087,7 @@
 msgid "Please add 'Supplier' role to user {0}."
 msgstr "لطفا نقش \"تامین کننده\" را به کاربر {0} اضافه کنید."
 
-#: selling/page/point_of_sale/pos_controller.js:87
+#: selling/page/point_of_sale/pos_controller.js:101
 msgid "Please add Mode of payments and opening balance details."
 msgstr "لطفا نحوه پرداخت و جزئیات موجودی افتتاح را اضافه کنید."
 
@@ -49277,7 +50103,7 @@
 msgid "Please add a Temporary Opening account in Chart of Accounts"
 msgstr "لطفاً یک حساب افتتاحیه موقت در نمودار حسابها اضافه کنید"
 
-#: public/js/utils/serial_no_batch_selector.js:535
+#: public/js/utils/serial_no_batch_selector.js:542
 msgid "Please add atleast one Serial No / Batch No"
 msgstr "لطفاً حداقل یک شماره سریال / شماره دسته اضافه کنید"
 
@@ -49285,11 +50111,11 @@
 msgid "Please add the Bank Account column"
 msgstr "لطفا ستون حساب بانکی را اضافه کنید"
 
-#: accounts/doctype/account/account_tree.js:168
+#: accounts/doctype/account/account_tree.js:246
 msgid "Please add the account to root level Company - {0}"
 msgstr "لطفاً حساب را به شرکت سطح ریشه اضافه کنید - {0}"
 
-#: accounts/doctype/account/account.py:215
+#: accounts/doctype/account/account.py:234
 msgid "Please add the account to root level Company - {}"
 msgstr "لطفاً حساب را به شرکت سطح ریشه اضافه کنید - {}"
 
@@ -49297,28 +50123,28 @@
 msgid "Please add {1} role to user {0}."
 msgstr "لطفاً نقش {1} را به کاربر {0} اضافه کنید."
 
-#: controllers/stock_controller.py:909
+#: controllers/stock_controller.py:1095
 msgid "Please adjust the qty or edit {0} to proceed."
 msgstr "لطفاً تعداد را تنظیم کنید یا برای ادامه {0} را ویرایش کنید."
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:121
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:124
 msgid "Please attach CSV file"
 msgstr "لطفا فایل CSV را پیوست کنید"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2735
+#: accounts/doctype/sales_invoice/sales_invoice.py:2704
 msgid "Please cancel and amend the Payment Entry"
 msgstr "لطفاً ورودی پرداخت را لغو و اصلاح کنید"
 
-#: accounts/utils.py:926
+#: accounts/utils.py:935
 msgid "Please cancel payment entry manually first"
 msgstr "لطفاً ابتدا ورود پرداخت را به صورت دستی لغو کنید"
 
-#: accounts/doctype/gl_entry/gl_entry.py:337
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:327
+#: accounts/doctype/gl_entry/gl_entry.py:291
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:338
 msgid "Please cancel related transaction."
 msgstr "لطفا معامله مربوطه را لغو کنید."
 
-#: accounts/doctype/journal_entry/journal_entry.py:836
+#: accounts/doctype/journal_entry/journal_entry.py:863
 msgid "Please check Multi Currency option to allow accounts with other currency"
 msgstr "لطفاً گزینه Multi Currency را علامت بزنید تا حساب با ارزهای دیگر مجاز باشد"
 
@@ -49326,11 +50152,11 @@
 msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
 msgstr "لطفاً Process Deferred Accounting {0} را بررسی کنید و پس از رفع خطاها را به صورت دستی ارسال کنید."
 
-#: manufacturing/doctype/bom/bom.js:71
+#: manufacturing/doctype/bom/bom.js:70
 msgid "Please check either with operations or FG Based Operating Cost."
 msgstr "لطفاً با عملیات یا هزینه عملیاتی مبتنی بر FG بررسی کنید."
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:397
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:412
 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again."
 msgstr "لطفاً پیام خطا را بررسی کنید و اقدامات لازم را برای رفع خطا انجام دهید و سپس ارسال مجدد را مجدداً راه اندازی کنید."
 
@@ -49338,14 +50164,10 @@
 msgid "Please check your Plaid client ID and secret values"
 msgstr "لطفاً شناسه مشتری Plaid و مقادیر مخفی خود را بررسی کنید"
 
-#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:227
+#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:235
 msgid "Please check your email to confirm the appointment"
 msgstr "لطفا ایمیل خود را برای تایید قرار ملاقات بررسی کنید"
 
-#: public/js/controllers/transaction.js:917
-msgid "Please clear the"
-msgstr "لطفا پاک کنید"
-
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:377
 msgid "Please click on 'Generate Schedule'"
 msgstr "لطفا روی \"ایجاد برنامه زمانی\" کلیک کنید"
@@ -49358,19 +50180,19 @@
 msgid "Please click on 'Generate Schedule' to get schedule"
 msgstr "لطفاً برای دریافت برنامه بر روی \"ایجاد برنامه زمانی\" کلیک کنید"
 
-#: selling/doctype/customer/customer.py:538
+#: selling/doctype/customer/customer.py:550
 msgid "Please contact any of the following users to extend the credit limits for {0}: {1}"
 msgstr "لطفاً برای تمدید محدودیت اعتبار برای {0} با هر یک از کاربران زیر تماس بگیرید: {1}"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:321
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:332
 msgid "Please contact any of the following users to {} this transaction."
 msgstr "لطفاً با هر یک از کاربران زیر برای {} این تراکنش تماس بگیرید."
 
-#: selling/doctype/customer/customer.py:531
+#: selling/doctype/customer/customer.py:543
 msgid "Please contact your administrator to extend the credit limits for {0}."
 msgstr "لطفاً برای تمدید محدودیت اعتبار برای {0} با سرپرست خود تماس بگیرید."
 
-#: accounts/doctype/account/account.py:317
+#: accounts/doctype/account/account.py:336
 msgid "Please convert the parent account in corresponding child company to a group account."
 msgstr "لطفاً حساب مادر در شرکت فرزند مربوطه را به یک حساب گروهی تبدیل کنید."
 
@@ -49378,19 +50200,19 @@
 msgid "Please create Customer from Lead {0}."
 msgstr "لطفاً مشتری از سرنخ {0} ایجاد کنید."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:96
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:117
 msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled."
 msgstr "لطفاً در برابر فاکتورهایی که «به‌روزرسانی موجودی» را فعال کرده‌اند، کوپن‌های هزینه‌ای ایجاد کنید."
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:67
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:71
 msgid "Please create a new Accounting Dimension if required."
 msgstr "لطفاً در صورت نیاز یک بعد حسابداری جدید ایجاد کنید."
 
-#: controllers/accounts_controller.py:534
+#: controllers/accounts_controller.py:578
 msgid "Please create purchase from internal sale or delivery document itself"
 msgstr "لطفا خرید را از فروش داخلی یا سند تحویل خود ایجاد کنید"
 
-#: assets/doctype/asset/asset.py:327
+#: assets/doctype/asset/asset.py:329
 msgid "Please create purchase receipt or purchase invoice for the item {0}"
 msgstr "لطفاً رسید خرید یا فاکتور خرید برای مورد {0} ایجاد کنید"
 
@@ -49398,7 +50220,7 @@
 msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
 msgstr "لطفاً قبل از ادغام {1} در {2}، مجموعه محصول {0} را حذف کنید"
 
-#: assets/doctype/asset/asset.py:366
+#: assets/doctype/asset/asset.py:368
 msgid "Please do not book expense of multiple assets against one single Asset."
 msgstr "لطفا هزینه چند دارایی را در مقابل یک دارایی ثبت نکنید."
 
@@ -49414,8 +50236,12 @@
 msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses"
 msgstr "لطفاً Applicable on Purchase Order و Applicable on Booking Expeal Expens را فعال کنید"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:135
-#: public/js/utils/serial_no_batch_selector.js:289
+#: stock/doctype/pick_list/pick_list.py:143
+msgid "Please enable Use Old Serial / Batch Fields to make_bundle"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:145
+#: public/js/utils/serial_no_batch_selector.js:295
 #: regional/report/electronic_invoice_register/electronic_invoice_register.js:49
 msgid "Please enable pop-ups"
 msgstr "لطفا پنجره های بازشو را فعال کنید"
@@ -49424,32 +50250,32 @@
 msgid "Please enable {0} in the {1}."
 msgstr "لطفاً {0} را در {1} فعال کنید."
 
-#: controllers/selling_controller.py:657
+#: controllers/selling_controller.py:681
 msgid "Please enable {} in {} to allow same item in multiple rows"
 msgstr "لطفاً {} را در {} فعال کنید تا یک مورد در چندین ردیف مجاز باشد"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:871
+#: accounts/doctype/sales_invoice/sales_invoice.py:888
 msgid "Please ensure {} account is a Balance Sheet account."
 msgstr "لطفاً مطمئن شوید که حساب {} یک حساب ترازنامه است."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:366
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:370
 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:374
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:378
 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:880
+#: accounts/doctype/sales_invoice/sales_invoice.py:897
 msgid "Please ensure {} account {} is a Receivable account."
 msgstr "لطفاً مطمئن شوید که {} حساب {} یک حساب دریافتنی است."
 
-#: stock/doctype/stock_entry/stock_entry.py:563
+#: stock/doctype/stock_entry/stock_entry.py:518
 msgid "Please enter <b>Difference Account</b> or set default <b>Stock Adjustment Account</b> for company {0}"
 msgstr "لطفاً <b>حساب تفاوت</b> را وارد کنید یا <b>حساب تعدیل موجودی</b> پیش‌فرض را برای شرکت {0} تنظیم کنید"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:430
-#: accounts/doctype/sales_invoice/sales_invoice.py:1024
+#: accounts/doctype/sales_invoice/sales_invoice.py:1046
 msgid "Please enter Account for Change Amount"
 msgstr "لطفاً حساب را برای تغییر مقدار وارد کنید"
 
@@ -49457,32 +50283,32 @@
 msgid "Please enter Approving Role or Approving User"
 msgstr "لطفاً نقش تأیید یا تأیید کاربر را وارد کنید"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:697
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:751
 msgid "Please enter Cost Center"
 msgstr "لطفا مرکز هزینه را وارد کنید"
 
-#: selling/doctype/sales_order/sales_order.py:322
+#: selling/doctype/sales_order/sales_order.py:325
 msgid "Please enter Delivery Date"
 msgstr "لطفا تاریخ تحویل را وارد کنید"
 
-#: setup/doctype/sales_person/sales_person_tree.js:8
+#: setup/doctype/sales_person/sales_person_tree.js:9
 msgid "Please enter Employee Id of this sales person"
 msgstr "لطفا شناسه کارمند این فروشنده را وارد کنید"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:708
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:762
 msgid "Please enter Expense Account"
 msgstr "لطفا حساب هزینه را وارد کنید"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.js:87
-#: stock/doctype/stock_entry/stock_entry.js:82
+#: assets/doctype/asset_capitalization/asset_capitalization.js:89
+#: stock/doctype/stock_entry/stock_entry.js:87
 msgid "Please enter Item Code to get Batch Number"
 msgstr "لطفا کد مورد را برای دریافت شماره دسته وارد کنید"
 
-#: public/js/controllers/transaction.js:2236
+#: public/js/controllers/transaction.js:2289
 msgid "Please enter Item Code to get batch no"
 msgstr "لطفا کد مورد را برای دریافت شماره دسته وارد کنید"
 
-#: manufacturing/doctype/production_plan/production_plan.js:67
+#: manufacturing/doctype/production_plan/production_plan.js:66
 msgid "Please enter Item first"
 msgstr "لطفا ابتدا مورد را وارد کنید"
 
@@ -49494,27 +50320,27 @@
 msgid "Please enter Planned Qty for Item {0} at row {1}"
 msgstr "لطفاً تعداد برنامه ریزی شده را برای مورد {0} در ردیف {1} وارد کنید"
 
-#: setup/doctype/employee/employee.js:76
+#: setup/doctype/employee/employee.js:78
 msgid "Please enter Preferred Contact Email"
 msgstr "لطفا ایمیل تماس ترجیحی را وارد کنید"
 
-#: manufacturing/doctype/work_order/work_order.js:71
+#: manufacturing/doctype/work_order/work_order.js:73
 msgid "Please enter Production Item first"
 msgstr "لطفا ابتدا کالای تولیدی را وارد کنید"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:74
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:76
 msgid "Please enter Purchase Receipt first"
 msgstr "لطفا ابتدا رسید خرید را وارد کنید"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:77
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:98
 msgid "Please enter Receipt Document"
 msgstr "لطفاً سند رسید را وارد کنید"
 
-#: accounts/doctype/journal_entry/journal_entry.py:901
+#: accounts/doctype/journal_entry/journal_entry.py:928
 msgid "Please enter Reference date"
 msgstr "لطفا تاریخ مرجع را وارد کنید"
 
-#: controllers/buying_controller.py:851
+#: controllers/buying_controller.py:877
 msgid "Please enter Reqd by Date"
 msgstr "لطفاً Reqd را بر اساس تاریخ وارد کنید"
 
@@ -49522,7 +50348,7 @@
 msgid "Please enter Root Type for account- {0}"
 msgstr "لطفاً نوع ریشه را برای حساب وارد کنید- {0}"
 
-#: public/js/utils/serial_no_batch_selector.js:258
+#: public/js/utils/serial_no_batch_selector.js:262
 msgid "Please enter Serial Nos"
 msgstr "لطفا شماره های سریال را وارد کنید"
 
@@ -49534,7 +50360,7 @@
 msgid "Please enter Stock Items consumed during the Repair."
 msgstr "لطفاً اقلام موجودی مصرف شده در طول تعمیر را وارد کنید."
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:29
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:30
 msgid "Please enter Warehouse and Date"
 msgstr "لطفا انبار و تاریخ را وارد کنید"
 
@@ -49542,20 +50368,20 @@
 msgid "Please enter Warehouse from which Stock Items consumed during the Repair were taken."
 msgstr "لطفاً وارد انباری شوید که اقلام موجودی مصرف شده در طول تعمیر از آن گرفته شده است."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
-#: accounts/doctype/sales_invoice/sales_invoice.py:1020
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:613
+#: accounts/doctype/sales_invoice/sales_invoice.py:1042
 msgid "Please enter Write Off Account"
 msgstr "لطفاً Write Off Account را وارد کنید"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:23
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:26
 msgid "Please enter company first"
 msgstr "لطفا ابتدا شرکت را وارد کنید"
 
-#: accounts/doctype/cost_center/cost_center.js:109
+#: accounts/doctype/cost_center/cost_center.js:114
 msgid "Please enter company name first"
 msgstr "لطفا ابتدا نام شرکت را وارد کنید"
 
-#: controllers/accounts_controller.py:2378
+#: controllers/accounts_controller.py:2470
 msgid "Please enter default currency in Company Master"
 msgstr "لطفا ارز پیش فرض را در Company Master وارد کنید"
 
@@ -49563,7 +50389,7 @@
 msgid "Please enter message before sending"
 msgstr "لطفا قبل از ارسال پیام را وارد کنید"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:247
+#: accounts/doctype/pos_invoice/pos_invoice.js:266
 msgid "Please enter mobile number first."
 msgstr "لطفا ابتدا شماره موبایل را وارد کنید"
 
@@ -49571,7 +50397,7 @@
 msgid "Please enter parent cost center"
 msgstr "لطفاً مرکز هزینه والدین را وارد کنید"
 
-#: public/js/utils/barcode_scanner.js:160
+#: public/js/utils/barcode_scanner.js:165
 msgid "Please enter quantity for item {0}"
 msgstr "لطفاً مقدار مورد {0} را وارد کنید"
 
@@ -49579,11 +50405,11 @@
 msgid "Please enter relieving date."
 msgstr "لطفا تاریخ تخفیف را وارد کنید."
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:125
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:128
 msgid "Please enter serial nos"
 msgstr "لطفا شماره سریال را وارد کنید"
 
-#: setup/doctype/company/company.js:155
+#: setup/doctype/company/company.js:183
 msgid "Please enter the company name to confirm"
 msgstr "لطفاً برای تأیید نام شرکت را وارد کنید"
 
@@ -49591,19 +50417,23 @@
 msgid "Please enter the phone number first"
 msgstr "لطفا ابتدا شماره تلفن را وارد کنید"
 
-#: public/js/setup_wizard.js:83
+#: public/js/setup_wizard.js:87
 msgid "Please enter valid Financial Year Start and End Dates"
 msgstr "لطفاً تاریخ شروع و پایان سال مالی معتبر را وارد کنید"
 
+#: templates/includes/footer/footer_extension.html:37
+msgid "Please enter valid email address"
+msgstr ""
+
 #: setup/doctype/employee/employee.py:225
 msgid "Please enter {0}"
 msgstr "لطفاً {0} را وارد کنید"
 
-#: public/js/utils/party.js:273
+#: public/js/utils/party.js:317
 msgid "Please enter {0} first"
 msgstr "لطفا ابتدا {0} را وارد کنید"
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Please fill the Material Requests table"
 msgstr "لطفا جدول درخواست مواد را پر کنید"
 
@@ -49611,11 +50441,11 @@
 msgid "Please fill the Sales Orders table"
 msgstr "لطفا جدول سفارشات فروش را پر کنید"
 
-#: stock/doctype/shipment/shipment.js:248
+#: stock/doctype/shipment/shipment.js:277
 msgid "Please first set Last Name, Email and Phone for the user"
 msgstr "لطفا ابتدا نام خانوادگی، ایمیل و تلفن را برای کاربر تنظیم کنید"
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:92
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:94
 msgid "Please fix overlapping time slots for {0}"
 msgstr "لطفاً بازه های زمانی همپوشانی را برای {0} اصلاح کنید"
 
@@ -49627,6 +50457,10 @@
 msgid "Please import accounts against parent company or enable {} in company master."
 msgstr "لطفاً حساب‌ها را علیه شرکت مادر وارد کنید یا {} را در شرکت اصلی فعال کنید."
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:175
+msgid "Please keep one Applicable Charges, when 'Distribute Charges Based On' is 'Distribute Manually'. For more charges, please create another Landed Cost Voucher."
+msgstr ""
+
 #: setup/doctype/employee/employee.py:184
 msgid "Please make sure the employees above report to another Active employee."
 msgstr "لطفاً مطمئن شوید که کارمندان بالا به کارمند Active دیگری گزارش می دهند."
@@ -49635,19 +50469,19 @@
 msgid "Please make sure the file you are using has 'Parent Account' column present in the header."
 msgstr "لطفاً مطمئن شوید که فایلی که استفاده می‌کنید دارای ستون «حساب والد» در سرصفحه باشد."
 
-#: setup/doctype/company/company.js:157
+#: setup/doctype/company/company.js:185
 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone."
 msgstr "لطفاً مطمئن شوید که واقعاً می خواهید همه تراکنش های این شرکت را حذف کنید. داده های اصلی شما همانطور که هست باقی می ماند. این عمل قابل لغو نیست."
 
-#: stock/doctype/item/item.js:425
+#: stock/doctype/item/item.js:493
 msgid "Please mention 'Weight UOM' along with Weight."
 msgstr "لطفا \"وزن UOM\" را همراه با وزن ذکر کنید."
 
-#: accounts/general_ledger.py:555
+#: accounts/general_ledger.py:564
 msgid "Please mention Round Off Account in Company"
 msgstr "لطفاً حساب گردآوری در شرکت را ذکر کنید"
 
-#: accounts/general_ledger.py:558
+#: accounts/general_ledger.py:567
 msgid "Please mention Round Off Cost Center in Company"
 msgstr "لطفا مرکز هزینه دور در شرکت را ذکر کنید"
 
@@ -49663,16 +50497,16 @@
 msgid "Please pull items from Delivery Note"
 msgstr "لطفا موارد را از یادداشت تحویل بردارید"
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:444
 msgid "Please rectify and try again."
 msgstr "لطفاً اصلاح کنید و دوباره امتحان کنید."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:237
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:253
 msgid "Please refresh or reset the Plaid linking of the Bank {}."
 msgstr "لطفاً پیوند Plaid بانک {} را بازخوانی یا بازنشانی کنید."
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:12
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:29
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
 msgid "Please save before proceeding."
 msgstr "لطفا قبل از ادامه ذخیره کنید."
 
@@ -49680,16 +50514,16 @@
 msgid "Please save first"
 msgstr "لطفا اول ذخیره کنید"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:70
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:79
 msgid "Please select <b>Template Type</b> to download template"
 msgstr "لطفاً <b>نوع الگو</b> را برای دانلود الگو انتخاب کنید"
 
-#: controllers/taxes_and_totals.py:651
+#: controllers/taxes_and_totals.py:652
 #: public/js/controllers/taxes_and_totals.js:688
 msgid "Please select Apply Discount On"
 msgstr "لطفاً Apply Discount On را انتخاب کنید"
 
-#: selling/doctype/sales_order/sales_order.py:1469
+#: selling/doctype/sales_order/sales_order.py:1492
 msgid "Please select BOM against item {0}"
 msgstr "لطفاً BOM را در مقابل مورد {0} انتخاب کنید"
 
@@ -49701,25 +50535,26 @@
 msgid "Please select BOM in BOM field for Item {0}"
 msgstr "لطفاً BOM را در قسمت BOM برای مورد {0} انتخاب کنید"
 
-#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:12
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:13
 msgid "Please select Category first"
 msgstr "لطفاً ابتدا دسته را انتخاب کنید"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1195
+#: accounts/doctype/payment_entry/payment_entry.js:1429
 #: public/js/controllers/accounts.js:86 public/js/controllers/accounts.js:124
 msgid "Please select Charge Type first"
 msgstr "لطفاً ابتدا نوع شارژ را انتخاب کنید"
 
-#: accounts/doctype/journal_entry/journal_entry.js:401
+#: accounts/doctype/journal_entry/journal_entry.js:443
 msgid "Please select Company"
 msgstr "لطفا شرکت را انتخاب کنید"
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:135
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:141
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:75
 msgid "Please select Company and Posting Date to getting entries"
 msgstr "لطفاً شرکت و تاریخ ارسال را برای دریافت ورودی انتخاب کنید"
 
-#: accounts/doctype/journal_entry/journal_entry.js:606
+#: accounts/doctype/journal_entry/journal_entry.js:688
+#: manufacturing/doctype/plant_floor/plant_floor.js:12
 msgid "Please select Company first"
 msgstr "لطفا ابتدا شرکت را انتخاب کنید"
 
@@ -49727,12 +50562,12 @@
 msgid "Please select Completion Date for Completed Asset Maintenance Log"
 msgstr "لطفاً تاریخ تکمیل را برای گزارش کامل تعمیر و نگهداری دارایی انتخاب کنید"
 
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:116
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:84
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:125
 msgid "Please select Customer first"
 msgstr "لطفا ابتدا مشتری را انتخاب کنید"
 
-#: setup/doctype/company/company.py:407
+#: setup/doctype/company/company.py:406
 msgid "Please select Existing Company for creating Chart of Accounts"
 msgstr "لطفاً شرکت موجود را برای ایجاد نمودار حساب انتخاب کنید"
 
@@ -49740,7 +50575,7 @@
 msgid "Please select Finished Good Item for Service Item {0}"
 msgstr "لطفاً مورد خوب تمام شده را برای مورد سرویس انتخاب کنید {0}"
 
-#: assets/doctype/asset/asset.js:531 assets/doctype/asset/asset.js:548
+#: assets/doctype/asset/asset.js:604 assets/doctype/asset/asset.js:621
 msgid "Please select Item Code first"
 msgstr "لطفا ابتدا کد مورد را انتخاب کنید"
 
@@ -49749,18 +50584,18 @@
 msgstr "لطفاً وضعیت تعمیر و نگهداری را به عنوان تکمیل شده انتخاب کنید یا تاریخ تکمیل را حذف کنید"
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:52
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:33
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:33
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:32
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:32
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:63
-#: selling/report/address_and_contacts/address_and_contacts.js:28
+#: selling/report/address_and_contacts/address_and_contacts.js:27
 msgid "Please select Party Type first"
 msgstr "لطفا ابتدا نوع طرف را انتخاب کنید"
 
-#: accounts/doctype/payment_entry/payment_entry.js:342
+#: accounts/doctype/payment_entry/payment_entry.js:429
 msgid "Please select Posting Date before selecting Party"
 msgstr "لطفاً قبل از انتخاب طرف، تاریخ ارسال را انتخاب کنید"
 
-#: accounts/doctype/journal_entry/journal_entry.js:607
+#: accounts/doctype/journal_entry/journal_entry.js:689
 msgid "Please select Posting Date first"
 msgstr "لطفا ابتدا تاریخ ارسال را انتخاب کنید"
 
@@ -49768,7 +50603,7 @@
 msgid "Please select Price List"
 msgstr "لطفا لیست قیمت را انتخاب کنید"
 
-#: selling/doctype/sales_order/sales_order.py:1471
+#: selling/doctype/sales_order/sales_order.py:1494
 msgid "Please select Qty against item {0}"
 msgstr "لطفاً تعداد را در برابر مورد {0} انتخاب کنید"
 
@@ -49784,15 +50619,15 @@
 msgid "Please select Start Date and End Date for Item {0}"
 msgstr "لطفاً تاریخ شروع و تاریخ پایان را برای مورد {0} انتخاب کنید"
 
-#: stock/doctype/stock_entry/stock_entry.py:1202
+#: stock/doctype/stock_entry/stock_entry.py:1211
 msgid "Please select Subcontracting Order instead of Purchase Order {0}"
 msgstr "لطفاً به جای سفارش خرید، سفارش قرارداد فرعی را انتخاب کنید {0}"
 
-#: controllers/accounts_controller.py:2288
+#: controllers/accounts_controller.py:2380
 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
 msgstr "لطفاً حساب سود / زیان تحقق نیافته را انتخاب کنید یا حساب سود / زیان پیش فرض را برای شرکت اضافه کنید {0}"
 
-#: manufacturing/doctype/bom/bom.py:1229
+#: manufacturing/doctype/bom/bom.py:1228
 msgid "Please select a BOM"
 msgstr "لطفا یک BOM را انتخاب کنید"
 
@@ -49800,10 +50635,10 @@
 msgid "Please select a Company"
 msgstr "لطفا یک شرکت را انتخاب کنید"
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: manufacturing/doctype/bom/bom.js:482 manufacturing/doctype/bom/bom.py:245
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: manufacturing/doctype/bom/bom.js:499 manufacturing/doctype/bom/bom.py:245
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484
+#: public/js/controllers/transaction.js:2537
 msgid "Please select a Company first."
 msgstr "لطفا ابتدا یک شرکت را انتخاب کنید."
 
@@ -49819,11 +50654,15 @@
 msgid "Please select a Subcontracting Purchase Order."
 msgstr "لطفاً سفارش خرید پیمانکاری فرعی را انتخاب کنید."
 
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
+#: buying/doctype/supplier_quotation/supplier_quotation.js:65
 msgid "Please select a Supplier"
 msgstr "لطفا یک تامین کننده انتخاب کنید"
 
-#: manufacturing/doctype/job_card/job_card.py:1063
+#: public/js/utils/serial_no_batch_selector.js:546
+msgid "Please select a Warehouse"
+msgstr ""
+
+#: manufacturing/doctype/job_card/job_card.py:1084
 msgid "Please select a Work Order first."
 msgstr "لطفاً ابتدا یک سفارش کاری را انتخاب کنید."
 
@@ -49835,11 +50674,11 @@
 msgid "Please select a customer for fetching payments."
 msgstr "لطفاً یک مشتری را برای واکشی پرداخت ها انتخاب کنید."
 
-#: www/book_appointment/index.js:63
+#: www/book_appointment/index.js:67
 msgid "Please select a date"
 msgstr "لطفا تاریخ را انتخاب کنید"
 
-#: www/book_appointment/index.js:48
+#: www/book_appointment/index.js:52
 msgid "Please select a date and time"
 msgstr "لطفا تاریخ و زمان را انتخاب کنید"
 
@@ -49847,11 +50686,11 @@
 msgid "Please select a default mode of payment"
 msgstr "لطفاً یک روش پرداخت پیش فرض را انتخاب کنید"
 
-#: selling/page/point_of_sale/pos_item_cart.js:753
+#: selling/page/point_of_sale/pos_item_cart.js:783
 msgid "Please select a field to edit from numpad"
 msgstr "لطفاً فیلدی را برای ویرایش از numpad انتخاب کنید"
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:68
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:67
 msgid "Please select a row to create a Reposting Entry"
 msgstr "لطفاً یک ردیف برای ایجاد یک ورودی ارسال مجدد انتخاب کنید"
 
@@ -49867,11 +50706,11 @@
 msgid "Please select a valid Purchase Order that is configured for Subcontracting."
 msgstr "لطفاً یک سفارش خرید معتبر که برای قرارداد فرعی پیکربندی شده است، انتخاب کنید."
 
-#: selling/doctype/quotation/quotation.js:220
+#: selling/doctype/quotation/quotation.js:229
 msgid "Please select a value for {0} quotation_to {1}"
 msgstr "لطفاً یک مقدار برای {0} quotation_to {1} انتخاب کنید"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1570
+#: accounts/doctype/journal_entry/journal_entry.py:1574
 msgid "Please select correct account"
 msgstr "لطفا حساب صحیح را انتخاب کنید"
 
@@ -49888,12 +50727,12 @@
 msgid "Please select item code"
 msgstr "لطفا کد مورد را انتخاب کنید"
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:71
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:69
 msgid "Please select only one row to create a Reposting Entry"
 msgstr "لطفاً فقط یک ردیف را برای ایجاد یک ورودی ارسال مجدد انتخاب کنید"
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:60
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:96
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:59
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:91
 msgid "Please select rows to create Reposting Entries"
 msgstr "لطفاً ردیف‌هایی را برای ایجاد ورودی‌های ارسال مجدد انتخاب کنید"
 
@@ -49901,7 +50740,7 @@
 msgid "Please select the Company"
 msgstr "لطفا شرکت را انتخاب کنید"
 
-#: accounts/doctype/loyalty_program/loyalty_program.js:57
+#: accounts/doctype/loyalty_program/loyalty_program.js:65
 msgid "Please select the Multiple Tier Program type for more than one collection rules."
 msgstr "لطفاً نوع برنامه چند لایه را برای بیش از یک قانون مجموعه انتخاب کنید."
 
@@ -49912,7 +50751,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:21
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:21
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:42
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:53
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:54
 msgid "Please select the document type first"
 msgstr "لطفا ابتدا نوع سند را انتخاب کنید"
 
@@ -49928,25 +50767,25 @@
 msgid "Please select weekly off day"
 msgstr "لطفاً روز تعطیل هفتگی را انتخاب کنید"
 
-#: public/js/utils.js:891
+#: public/js/utils.js:961
 msgid "Please select {0}"
 msgstr "لطفاً {0} را انتخاب کنید"
 
-#: accounts/doctype/payment_entry/payment_entry.js:991
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:575
+#: 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
 msgid "Please select {0} first"
 msgstr "لطفاً ابتدا {0} را انتخاب کنید"
 
-#: public/js/controllers/transaction.js:76
+#: public/js/controllers/transaction.js:77
 msgid "Please set 'Apply Additional Discount On'"
 msgstr "لطفاً \"اعمال تخفیف اضافی\" را تنظیم کنید"
 
-#: assets/doctype/asset/depreciation.py:790
+#: assets/doctype/asset/depreciation.py:788
 msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
 msgstr "لطفاً \"مرکز هزینه استهلاک دارایی\" را در شرکت {0} تنظیم کنید"
 
-#: assets/doctype/asset/depreciation.py:787
+#: assets/doctype/asset/depreciation.py:785
 msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
 msgstr "لطفاً «حساب سود/زیان در دفع دارایی» را در شرکت تنظیم کنید {0}"
 
@@ -49954,6 +50793,10 @@
 msgid "Please set Account"
 msgstr "لطفا حساب را تنظیم کنید"
 
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
+msgid "Please set Account for Change Amount"
+msgstr ""
+
 #: stock/__init__.py:88
 msgid "Please set Account in Warehouse {0} or Default Inventory Account in Company {1}"
 msgstr "لطفاً حساب را در انبار {0} یا حساب موجودی پیش فرض را در شرکت {1} تنظیم کنید"
@@ -49964,23 +50807,23 @@
 
 #: accounts/doctype/ledger_merge/ledger_merge.js:23
 #: accounts/doctype/ledger_merge/ledger_merge.js:34
-#: accounts/doctype/pos_profile/pos_profile.js:27
-#: accounts/doctype/pos_profile/pos_profile.js:50
-#: accounts/doctype/pos_profile/pos_profile.js:64
-#: accounts/doctype/pos_profile/pos_profile.js:78
-#: accounts/doctype/pos_profile/pos_profile.js:91
-#: accounts/doctype/sales_invoice/sales_invoice.js:707
-#: accounts/doctype/sales_invoice/sales_invoice.js:721
-#: selling/doctype/quotation/quotation.js:28
-#: selling/doctype/sales_order/sales_order.js:28
+#: accounts/doctype/pos_profile/pos_profile.js:25
+#: accounts/doctype/pos_profile/pos_profile.js:48
+#: accounts/doctype/pos_profile/pos_profile.js:62
+#: accounts/doctype/pos_profile/pos_profile.js:76
+#: accounts/doctype/pos_profile/pos_profile.js:89
+#: accounts/doctype/sales_invoice/sales_invoice.js:763
+#: accounts/doctype/sales_invoice/sales_invoice.js:777
+#: selling/doctype/quotation/quotation.js:29
+#: selling/doctype/sales_order/sales_order.js:31
 msgid "Please set Company"
 msgstr "لطفا شرکت را تنظیم کنید"
 
-#: assets/doctype/asset/depreciation.py:372
+#: assets/doctype/asset/depreciation.py:370
 msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
 msgstr "لطفاً حساب‌های مربوط به استهلاک را در دسته دارایی {0} یا شرکت {1} تنظیم کنید."
 
-#: stock/doctype/shipment/shipment.js:154
+#: stock/doctype/shipment/shipment.js:176
 msgid "Please set Email/Phone for the contact"
 msgstr "لطفا ایمیل/تلفن را برای مخاطب تنظیم کنید"
 
@@ -49994,11 +50837,11 @@
 msgid "Please set Fiscal Code for the public administration '%s'"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:547
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:551
 msgid "Please set Fixed Asset Account in {} against {}."
 msgstr "لطفاً حساب دارایی ثابت را در {} در مقابل {} تنظیم کنید."
 
-#: assets/doctype/asset/asset.py:435
+#: assets/doctype/asset/asset.py:437
 msgid "Please set Number of Depreciations Booked"
 msgstr "لطفا تعداد استهلاک های رزرو شده را تنظیم کنید"
 
@@ -50028,11 +50871,11 @@
 msgid "Please set a Company"
 msgstr "لطفا یک شرکت تعیین کنید"
 
-#: assets/doctype/asset/asset.py:262
+#: assets/doctype/asset/asset.py:264
 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:1260
+#: selling/doctype/sales_order/sales_order.py:1283
 msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
 msgstr "لطفاً در مقابل مواردی که باید در سفارش خرید در نظر گرفته شوند، یک تامین کننده تنظیم کنید."
 
@@ -50044,7 +50887,7 @@
 msgid "Please set a default Holiday List for Employee {0} or Company {1}"
 msgstr "لطفاً فهرست تعطیلات پیش‌فرض را برای کارمند {0} یا شرکت {1} تنظیم کنید"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:991
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1019
 msgid "Please set account in Warehouse {0}"
 msgstr "لطفاً حساب را در انبار {0} تنظیم کنید"
 
@@ -50053,7 +50896,7 @@
 msgid "Please set an Address on the Company '%s'"
 msgstr ""
 
-#: controllers/stock_controller.py:334
+#: controllers/stock_controller.py:516
 msgid "Please set an Expense Account in the Items table"
 msgstr "لطفاً یک حساب هزینه در جدول موارد تنظیم کنید"
 
@@ -50065,23 +50908,23 @@
 msgid "Please set at least one row in the Taxes and Charges Table"
 msgstr "لطفاً حداقل یک ردیف در جدول مالیات ها و هزینه ها تنظیم کنید"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2041
+#: accounts/doctype/sales_invoice/sales_invoice.py:2010
 msgid "Please set default Cash or Bank account in Mode of Payment {0}"
 msgstr "لطفاً حساب پیش‌فرض نقدی یا بانکی را در حالت پرداخت تنظیم کنید {0}"
 
 #: 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:2599
+#: accounts/doctype/sales_invoice/sales_invoice.py:2568
 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:2601
+#: accounts/doctype/sales_invoice/sales_invoice.py:2570
 msgid "Please set default Cash or Bank account in Mode of Payments {}"
 msgstr "لطفاً حساب پیش‌فرض نقدی یا بانکی را در حالت پرداخت تنظیم کنید {}"
 
-#: accounts/utils.py:2086
+#: accounts/utils.py:2054
 msgid "Please set default Exchange Gain/Loss Account in Company {}"
 msgstr "لطفاً حساب سود/زیان مبادله پیش‌فرض را در شرکت تنظیم کنید {}"
 
@@ -50093,11 +50936,11 @@
 msgid "Please set default UOM in Stock Settings"
 msgstr "لطفاً UOM پیش‌فرض را در تنظیمات موجودی تنظیم کنید"
 
-#: controllers/stock_controller.py:204
+#: controllers/stock_controller.py:386
 msgid "Please set default cost of goods sold account in company {0} for booking rounding gain and loss during stock transfer"
 msgstr "لطفاً حساب هزینه پیش‌فرض کالاهای فروخته‌شده در شرکت {0} را برای رزرو سود و زیان در حین انتقال موجودی تنظیم کنید"
 
-#: accounts/utils.py:946
+#: accounts/utils.py:955
 msgid "Please set default {0} in Company {1}"
 msgstr "لطفاً {0} پیش فرض را در شرکت {1} تنظیم کنید"
 
@@ -50114,11 +50957,11 @@
 msgid "Please set filters"
 msgstr "لطفا فیلترها را تنظیم کنید"
 
-#: controllers/accounts_controller.py:1896
+#: controllers/accounts_controller.py:1988
 msgid "Please set one of the following:"
 msgstr "لطفا یکی از موارد زیر را تنظیم کنید:"
 
-#: public/js/controllers/transaction.js:1967
+#: public/js/controllers/transaction.js:2010
 msgid "Please set recurring after saving"
 msgstr "لطفاً پس از ذخیره، تکرار شونده را تنظیم کنید"
 
@@ -50130,7 +50973,7 @@
 msgid "Please set the Default Cost Center in {0} company."
 msgstr "لطفاً مرکز هزینه پیش‌فرض را در شرکت {0} تنظیم کنید."
 
-#: manufacturing/doctype/work_order/work_order.js:487
+#: manufacturing/doctype/work_order/work_order.js:512
 msgid "Please set the Item Code first"
 msgstr "لطفا ابتدا کد مورد را تنظیم کنید"
 
@@ -50138,7 +50981,7 @@
 msgid "Please set the Payment Schedule"
 msgstr "لطفا برنامه پرداخت را تنظیم کنید"
 
-#: accounts/doctype/gl_entry/gl_entry.py:175
+#: accounts/doctype/gl_entry/gl_entry.py:165
 msgid "Please set the cost center field in {0} or setup a default Cost Center for the Company."
 msgstr "لطفاً فیلد مرکز هزینه را در {0} تنظیم کنید یا یک مرکز هزینه پیش‌فرض برای شرکت تنظیم کنید."
 
@@ -50146,8 +50989,8 @@
 msgid "Please set up the Campaign Schedule in the Campaign {0}"
 msgstr "لطفاً برنامه کمپین را در کمپین {0} تنظیم کنید"
 
-#: public/js/queries.js:39 public/js/queries.js:49 public/js/queries.js:66
-#: public/js/queries.js:95 stock/report/reserved_stock/reserved_stock.py:26
+#: public/js/queries.js:32 public/js/queries.js:44 public/js/queries.js:64
+#: public/js/queries.js:96 stock/report/reserved_stock/reserved_stock.py:26
 msgid "Please set {0}"
 msgstr "لطفاً {0} را تنظیم کنید"
 
@@ -50163,34 +51006,34 @@
 msgid "Please set {0} in BOM Creator {1}"
 msgstr "لطفاً {0} را در BOM Creator {1} تنظیم کنید"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:95
-msgid "Please setup a default bank account for company {0}"
-msgstr "لطفاً یک حساب بانکی پیش‌فرض برای شرکت {0} تنظیم کنید"
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:97
+msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
+msgstr ""
 
-#: assets/doctype/asset/depreciation.py:424
+#: assets/doctype/asset/depreciation.py:422
 msgid "Please share this email with your support team so that they can find and fix the issue."
 msgstr "لطفاً این ایمیل را با تیم پشتیبانی خود به اشتراک بگذارید تا آنها بتوانند مشکل را پیدا کرده و برطرف کنند."
 
-#: public/js/controllers/transaction.js:1837
+#: public/js/controllers/transaction.js:1880
 msgid "Please specify"
 msgstr "لطفا مشخص کنید"
 
-#: stock/get_item_details.py:210
+#: stock/get_item_details.py:215
 msgid "Please specify Company"
 msgstr "لطفا شرکت را مشخص کنید"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:81
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:380
-#: accounts/doctype/sales_invoice/sales_invoice.js:452
+#: accounts/doctype/pos_invoice/pos_invoice.js:88
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:420
+#: accounts/doctype/sales_invoice/sales_invoice.js:501
 msgid "Please specify Company to proceed"
 msgstr "لطفاً شرکت را برای ادامه مشخص کنید"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1206
-#: controllers/accounts_controller.py:2511 public/js/controllers/accounts.js:97
+#: accounts/doctype/payment_entry/payment_entry.js:1452
+#: controllers/accounts_controller.py:2596 public/js/controllers/accounts.js:97
 msgid "Please specify a valid Row ID for row {0} in table {1}"
 msgstr "لطفاً یک شناسه ردیف معتبر برای ردیف {0} در جدول {1} مشخص کنید"
 
-#: public/js/queries.js:104
+#: public/js/queries.js:106
 msgid "Please specify a {0}"
 msgstr "لطفاً یک {0} را مشخص کنید"
 
@@ -50198,7 +51041,7 @@
 msgid "Please specify at least one attribute in the Attributes table"
 msgstr "لطفا حداقل یک ویژگی را در جدول Attributes مشخص کنید"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:372
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:426
 msgid "Please specify either Quantity or Valuation Rate or both"
 msgstr "لطفاً مقدار یا نرخ ارزش گذاری یا هر دو را مشخص کنید"
 
@@ -50206,11 +51049,11 @@
 msgid "Please specify from/to range"
 msgstr "لطفاً از/به محدوده را مشخص کنید"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:35
+#: buying/doctype/request_for_quotation/request_for_quotation.js:37
 msgid "Please supply the specified items at the best possible rates"
 msgstr "لطفا اقلام مشخص شده را با بهترین نرخ ممکن تهیه نمایید"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:223
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:218
 msgid "Please try again in an hour."
 msgstr "لطفا یک ساعت دیگر دوباره امتحان کنید."
 
@@ -50267,7 +51110,7 @@
 msgid "Portrait"
 msgstr "پرتره"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:337
+#: buying/doctype/request_for_quotation/request_for_quotation.js:362
 msgid "Possible Supplier"
 msgstr "تامین کننده احتمالی"
 
@@ -50334,17 +51177,18 @@
 msgid "Postal Expenses"
 msgstr "هزینه های پستی"
 
-#: accounts/doctype/payment_entry/payment_entry.js:644
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: 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/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:563
+#: 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/item_wise_sales_register/item_wise_sales_register.py:200
@@ -50359,7 +51203,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:45
 #: 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:84
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:89
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:129
@@ -50369,6 +51213,7 @@
 #: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
 #: 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
 msgid "Posting Date"
 msgstr "تاریخ ارسال"
 
@@ -50553,11 +51398,17 @@
 msgid "Posting Date cannot be future date"
 msgstr "تاریخ ارسال نمی تواند تاریخ آینده باشد"
 
+#. Label of a Datetime field in DocType 'Stock Ledger Entry'
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+msgctxt "Stock Ledger Entry"
+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
-#: stock/report/serial_no_ledger/serial_no_ledger.js:64
+#: 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_ledger_invariant_check/stock_ledger_invariant_check.py:126
@@ -50655,7 +51506,7 @@
 msgid "Posting Time"
 msgstr "زمان ارسال"
 
-#: stock/doctype/stock_entry/stock_entry.py:1641
+#: stock/doctype/stock_entry/stock_entry.py:1650
 msgid "Posting date and posting time is mandatory"
 msgstr "تاریخ ارسال و زمان ارسال الزامی است"
 
@@ -50663,6 +51514,11 @@
 msgid "Posting timestamp must be after {0}"
 msgstr "مهر زمانی ارسال باید بعد از {0} باشد"
 
+#. Description of a DocType
+#: crm/doctype/opportunity/opportunity.json
+msgid "Potential Sales Deal"
+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
@@ -50761,7 +51617,7 @@
 msgid "Preventive Maintenance"
 msgstr "تعمیر و نگهداری پیشگیرانه"
 
-#: public/js/utils/ledger_preview.js:20 public/js/utils/ledger_preview.js:40
+#: public/js/utils/ledger_preview.js:28 public/js/utils/ledger_preview.js:57
 msgid "Preview"
 msgstr "پیش نمایش"
 
@@ -50777,7 +51633,7 @@
 msgid "Preview"
 msgstr "پیش نمایش"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:205
+#: buying/doctype/request_for_quotation/request_for_quotation.js:223
 msgid "Preview Email"
 msgstr "پیش نمایش ایمیل"
 
@@ -50798,7 +51654,7 @@
 msgid "Previous Work Experience"
 msgstr "سابقه کار قبلی"
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:152
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:153
 msgid "Previous Year is not closed, please close it first"
 msgstr "سال قبل تعطیل نیست، لطفا اول آن را ببندید"
 
@@ -51009,7 +51865,7 @@
 msgid "Price List Currency"
 msgstr "لیست قیمت ارز"
 
-#: stock/get_item_details.py:1029
+#: stock/get_item_details.py:1040
 msgid "Price List Currency not selected"
 msgstr "لیست قیمت ارز انتخاب نشده است"
 
@@ -51097,6 +51953,12 @@
 msgid "Price List Rate"
 msgstr "نرخ لیست قیمت"
 
+#. Label of a Currency field in DocType 'Material Request Item'
+#: stock/doctype/material_request_item/material_request_item.json
+msgctxt "Material Request Item"
+msgid "Price List Rate"
+msgstr "نرخ لیست قیمت"
+
 #. Label of a Currency field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
@@ -51217,7 +52079,7 @@
 msgid "Price Per Unit ({0})"
 msgstr "قیمت هر واحد ({0})"
 
-#: selling/page/point_of_sale/pos_controller.js:553
+#: selling/page/point_of_sale/pos_controller.js:581
 msgid "Price is not set for the item."
 msgstr ""
 
@@ -51231,7 +52093,7 @@
 msgid "Price or Product Discount"
 msgstr "قیمت یا تخفیف محصول"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:145
 msgid "Price or product discount slabs are required"
 msgstr "اسلب های تخفیف قیمت یا محصول مورد نیاز است"
 
@@ -51247,7 +52109,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/pricing_rule/pricing_rule.json
-#: buying/doctype/supplier/supplier.js:98
+#: buying/doctype/supplier/supplier.js:116
 msgid "Pricing Rule"
 msgstr "قانون قیمت گذاری"
 
@@ -51364,7 +52226,7 @@
 msgid "Pricing Rule Item Group"
 msgstr "گروه آیتم قوانین قیمت گذاری"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:208
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:210
 msgid "Pricing Rule {0} is updated"
 msgstr "قانون قیمت گذاری {0} به روز شده است"
 
@@ -51488,7 +52350,7 @@
 msgid "Primary Address"
 msgstr "آدرس اصلی"
 
-#: public/js/utils/contact_address_quick_entry.js:54
+#: public/js/utils/contact_address_quick_entry.js:57
 msgid "Primary Address Details"
 msgstr "جزئیات آدرس اصلی"
 
@@ -51510,7 +52372,7 @@
 msgid "Primary Contact"
 msgstr "ارتباط اصلی"
 
-#: public/js/utils/contact_address_quick_entry.js:35
+#: public/js/utils/contact_address_quick_entry.js:38
 msgid "Primary Contact Details"
 msgstr "جزئیات مخاطب اصلی"
 
@@ -51539,7 +52401,7 @@
 msgid "Primary Settings"
 msgstr "تنظیمات اولیه"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:69
+#: selling/page/point_of_sale/pos_past_order_summary.js:67
 #: templates/pages/material_request_info.html:15 templates/pages/order.html:33
 msgid "Print"
 msgstr "چاپ"
@@ -51780,7 +52642,7 @@
 msgid "Print Preferences"
 msgstr "تنظیمات چاپ"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:223
+#: selling/page/point_of_sale/pos_past_order_summary.js:231
 msgid "Print Receipt"
 msgstr "چاپ رسید"
 
@@ -51845,7 +52707,7 @@
 msgid "Print Style"
 msgstr "سبک چاپ"
 
-#: setup/install.py:118
+#: setup/install.py:99
 msgid "Print UOM after Quantity"
 msgstr "چاپ UOM بعد از مقدار"
 
@@ -51860,15 +52722,16 @@
 msgid "Print and Stationery"
 msgstr "چاپ و لوازم التحریر"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:73
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:75
 msgid "Print settings updated in respective print format"
 msgstr "تنظیمات چاپ در قالب چاپ مربوطه به روز شد"
 
-#: setup/install.py:125
+#: setup/install.py:106
 msgid "Print taxes with zero amount"
 msgstr "چاپ مالیات با مقدار صفر"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:364
+#: accounts/report/accounts_receivable/accounts_receivable.html:285
 msgid "Printed On "
 msgstr " چاپ شده در"
 
@@ -51949,9 +52812,10 @@
 msgid "Priorities"
 msgstr "اولویت های"
 
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:19
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:18
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:93
-#: projects/report/project_summary/project_summary.js:37
+#: projects/report/project_summary/project_summary.js:36
+#: templates/pages/task_info.html:54
 msgid "Priority"
 msgstr "اولویت"
 
@@ -52039,6 +52903,12 @@
 msgid "Problem"
 msgstr "مسئله"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Problem"
+msgstr "مسئله"
+
 #. Label of a Link field in DocType 'Non Conformance'
 #: quality_management/doctype/non_conformance/non_conformance.json
 msgctxt "Non Conformance"
@@ -52063,7 +52933,7 @@
 msgid "Procedure"
 msgstr "روش"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:70
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:75
 msgid "Process Day Book Data"
 msgstr "پردازش داده های کتاب روز"
 
@@ -52149,7 +53019,7 @@
 msgid "Process Loss Value"
 msgstr "ارزش از دست دادن فرآیند"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:58
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:63
 msgid "Process Master Data"
 msgstr "پردازش داده های اصلی"
 
@@ -52201,6 +53071,12 @@
 msgid "Process Subscription"
 msgstr "فرآیند اشتراک"
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Process in Single Transaction"
+msgstr ""
+
 #. Label of a Long Text field in DocType 'BOM Update Log'
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 msgctxt "BOM Update Log"
@@ -52231,7 +53107,7 @@
 msgid "Processing Party Addresses"
 msgstr "پردازش آدرس های طرف"
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:115
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:122
 msgid "Processing Sales! Please Wait..."
 msgstr "در حال پردازش فروش! لطفا صبر کنید..."
 
@@ -52304,7 +53180,7 @@
 msgstr "تولید - محصول"
 
 #. Name of a DocType
-#: public/js/controllers/buying.js:265 public/js/controllers/buying.js:511
+#: public/js/controllers/buying.js:260 public/js/controllers/buying.js:508
 #: selling/doctype/product_bundle/product_bundle.json
 msgid "Product Bundle"
 msgstr "بسته محصول"
@@ -52408,7 +53284,13 @@
 
 #. Label of a Card Break in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
-#: setup/doctype/company/company.py:347
+#: setup/doctype/company/company.py:346
+msgid "Production"
+msgstr "تولید"
+
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
 msgid "Production"
 msgstr "تولید"
 
@@ -52419,18 +53301,18 @@
 msgid "Production Analytics"
 msgstr "تجزیه و تحلیل تولید"
 
-#. Label of a Int field in DocType 'Workstation'
+#. Label of a Section Break field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Production Capacity"
 msgstr "ظرفیت تولید"
 
 #: manufacturing/doctype/work_order/work_order_calendar.js:38
-#: manufacturing/report/job_card_summary/job_card_summary.js:65
+#: manufacturing/report/job_card_summary/job_card_summary.js:64
 #: manufacturing/report/job_card_summary/job_card_summary.py:152
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:43
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:42
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:113
-#: manufacturing/report/work_order_summary/work_order_summary.js:51
+#: manufacturing/report/work_order_summary/work_order_summary.js:50
 #: manufacturing/report/work_order_summary/work_order_summary.py:208
 msgid "Production Item"
 msgstr "آیتم تولیدی"
@@ -52455,7 +53337,7 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/production_plan/production_plan.json
-#: manufacturing/report/production_plan_summary/production_plan_summary.js:9
+#: manufacturing/report/production_plan_summary/production_plan_summary.js:8
 msgid "Production Plan"
 msgstr "برنامه تولید"
 
@@ -52662,7 +53544,7 @@
 msgid "Profitability Analysis"
 msgstr "تجزیه و تحلیل سودآوری"
 
-#: templates/pages/projects.html:25
+#: projects/doctype/task/task_list.js:52 templates/pages/projects.html:25
 msgid "Progress"
 msgstr "پیش رفتن"
 
@@ -52682,10 +53564,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:973
+#: 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:634
+#: 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
@@ -52693,30 +53575,31 @@
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:73
 #: accounts/report/sales_register/sales_register.py:228
 #: accounts/report/trial_balance/trial_balance.js:64
-#: buying/report/procurement_tracker/procurement_tracker.js:22
+#: 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:34
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:33
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:182
 #: projects/doctype/project/project.json
 #: projects/doctype/project/project_dashboard.py:11
 #: projects/doctype/task/task_calendar.js:19
-#: projects/doctype/task/task_tree.js:11
+#: projects/doctype/task/task_list.js:45 projects/doctype/task/task_tree.js:11
 #: projects/doctype/timesheet/timesheet_calendar.js:22
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:34
 #: projects/report/project_summary/project_summary.py:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:19
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:51
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:25
-#: public/js/financial_statements.js:247 public/js/projects/timer.js:10
+#: public/js/financial_statements.js:256 public/js/projects/timer.js:14
 #: public/js/purchase_trends_filters.js:52 public/js/sales_trends_filters.js:28
-#: selling/doctype/sales_order/sales_order.js:587
+#: selling/doctype/sales_order/sales_order.js:681
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:94
-#: stock/report/reserved_stock/reserved_stock.js:139
+#: stock/report/reserved_stock/reserved_stock.js:130
 #: stock/report/reserved_stock/reserved_stock.py:184
-#: stock/report/stock_ledger/stock_ledger.js:76
-#: stock/report/stock_ledger/stock_ledger.py:261
-#: support/report/issue_analytics/issue_analytics.js:76
-#: support/report/issue_summary/issue_summary.js:64
+#: stock/report/stock_ledger/stock_ledger.js:84
+#: stock/report/stock_ledger/stock_ledger.py:333
+#: support/report/issue_analytics/issue_analytics.js:75
+#: support/report/issue_summary/issue_summary.js:63
+#: templates/pages/task_info.html:39 templates/pages/timelog_info.html:22
 msgid "Project"
 msgstr "پروژه"
 
@@ -52781,6 +53664,12 @@
 msgid "Project"
 msgstr "پروژه"
 
+#. Label of a Link field in DocType 'Installation Note'
+#: selling/doctype/installation_note/installation_note.json
+msgctxt "Installation Note"
+msgid "Project"
+msgstr "پروژه"
+
 #. Label of a Link field in DocType 'Issue'
 #: support/doctype/issue/issue.json
 msgctxt "Issue"
@@ -53086,7 +53975,7 @@
 
 #. Name of a DocType
 #: projects/doctype/project_type/project_type.json
-#: projects/report/project_summary/project_summary.js:31
+#: projects/report/project_summary/project_summary.js:30
 msgid "Project Type"
 msgstr "نوع پروژه"
 
@@ -53162,6 +54051,8 @@
 msgid "Project-wise data is not available for Quotation"
 msgstr "داده های پروژه عاقلانه برای نقل قول در دسترس نیست"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:46
+#: stock/dashboard/item_dashboard_list.html:37
 #: stock/report/item_shortage_report/item_shortage_report.py:73
 #: stock/report/stock_projected_qty/stock_projected_qty.py:199
 #: templates/emails/reorder_item.html:12
@@ -53214,6 +54105,10 @@
 msgid "Projected Quantity"
 msgstr "مقدار پیش بینی شده"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Projected Quantity Formula"
+msgstr ""
+
 #: stock/page/stock_balance/stock_balance.js:51
 msgid "Projected qty"
 msgstr "تعداد پیش بینی شده"
@@ -53344,7 +54239,7 @@
 msgstr "به نسبت"
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:61
+#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:62
 #: crm/doctype/prospect/prospect.json
 msgid "Prospect"
 msgstr "چشم انداز"
@@ -53439,7 +54334,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:335
+#: setup/doctype/company/company.py:334
 msgid "Purchase"
 msgstr "خرید"
 
@@ -53532,15 +54427,15 @@
 #. Name of a DocType
 #: 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:23
+#: 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:323
-#: buying/doctype/purchase_order/purchase_order_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:378
+#: 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:110
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:22
-#: stock/doctype/stock_entry/stock_entry.js:262
+#: stock/doctype/purchase_receipt/purchase_receipt.js:123
+#: stock/doctype/purchase_receipt/purchase_receipt.js:268
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:30
+#: stock/doctype/stock_entry/stock_entry.js:294
 msgid "Purchase Invoice"
 msgstr "فاکتور خرید"
 
@@ -53663,16 +54558,16 @@
 msgid "Purchase Invoice Trends"
 msgstr "روندهای فاکتور خرید"
 
-#: assets/doctype/asset/asset.py:213
+#: assets/doctype/asset/asset.py:215
 msgid "Purchase Invoice cannot be made against an existing asset {0}"
 msgstr "فاکتور خرید نمی‌تواند در مقابل دارایی موجود {0}"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:389
-#: stock/doctype/purchase_receipt/purchase_receipt.py:403
+#: stock/doctype/purchase_receipt/purchase_receipt.py:390
+#: stock/doctype/purchase_receipt/purchase_receipt.py:404
 msgid "Purchase Invoice {0} is already submitted"
 msgstr "فاکتور خرید {0} قبلا ارسال شده است"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1769
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1828
 msgid "Purchase Invoices"
 msgstr "فاکتورهای خرید"
 
@@ -53690,6 +54585,7 @@
 #: setup/doctype/supplier_group/supplier_group.json stock/doctype/bin/bin.json
 #: stock/doctype/material_request/material_request.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgid "Purchase Manager"
 msgstr "مدیر خرید"
@@ -53704,21 +54600,21 @@
 msgstr "مدیر ارشد را خریداری کنید"
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:131
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:155
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:234
 #: accounts/report/purchase_register/purchase_register.py:216
 #: buying/doctype/purchase_order/purchase_order.json
-#: buying/doctype/supplier_quotation/supplier_quotation.js:23
+#: 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:41
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:40
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:167
-#: controllers/buying_controller.py:624
-#: manufacturing/doctype/blanket_order/blanket_order.js:45
-#: selling/doctype/sales_order/sales_order.js:112
-#: selling/doctype/sales_order/sales_order.js:576
-#: stock/doctype/material_request/material_request.js:137
-#: stock/doctype/purchase_receipt/purchase_receipt.js:194
+#: controllers/buying_controller.py:649
+#: manufacturing/doctype/blanket_order/blanket_order.js:54
+#: selling/doctype/sales_order/sales_order.js:136
+#: selling/doctype/sales_order/sales_order.js:659
+#: stock/doctype/material_request/material_request.js:154
+#: stock/doctype/purchase_receipt/purchase_receipt.js:225
 msgid "Purchase Order"
 msgstr "سفارش خرید"
 
@@ -53889,7 +54785,7 @@
 msgid "Purchase Order Item Supplied"
 msgstr "مورد سفارش خرید عرضه شده است"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:684
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:685
 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}"
 msgstr "مرجع مورد سفارش خرید در رسید پیمانکاری فرعی وجود ندارد {0}"
 
@@ -53903,11 +54799,11 @@
 msgid "Purchase Order Pricing Rule"
 msgstr "قانون قیمت گذاری سفارش خرید"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:579
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
 msgid "Purchase Order Required"
 msgstr "سفارش خرید الزامی است"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:576
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:580
 msgid "Purchase Order Required for item {}"
 msgstr "سفارش خرید برای مورد {} لازم است"
 
@@ -53919,7 +54815,7 @@
 msgid "Purchase Order Trends"
 msgstr "روند سفارش خرید"
 
-#: selling/doctype/sales_order/sales_order.js:957
+#: selling/doctype/sales_order/sales_order.js:1115
 msgid "Purchase Order already created for all Sales Order items"
 msgstr "سفارش خرید قبلاً برای همه موارد سفارش فروش ایجاد شده است"
 
@@ -53927,11 +54823,11 @@
 msgid "Purchase Order number required for Item {0}"
 msgstr "شماره سفارش خرید برای مورد {0} لازم است"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:618
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:622
 msgid "Purchase Order {0} is not submitted"
 msgstr "سفارش خرید {0} ارسال نشده است"
 
-#: buying/doctype/purchase_order/purchase_order.py:824
+#: buying/doctype/purchase_order/purchase_order.py:827
 msgid "Purchase Orders"
 msgstr "سفارشات خرید"
 
@@ -53941,7 +54837,7 @@
 msgid "Purchase Orders Items Overdue"
 msgstr "سفارشات خرید اقلام عقب افتاده"
 
-#: buying/doctype/purchase_order/purchase_order.py:301
+#: buying/doctype/purchase_order/purchase_order.py:302
 msgid "Purchase Orders are not allowed for {0} due to a scorecard standing of {1}."
 msgstr "سفارشات خرید برای {0} به دلیل امتیاز کارت امتیازی {1} مجاز نیستند."
 
@@ -53957,7 +54853,7 @@
 msgid "Purchase Orders to Receive"
 msgstr "سفارش خرید برای دریافت"
 
-#: controllers/accounts_controller.py:1517
+#: controllers/accounts_controller.py:1606
 msgid "Purchase Orders {0} are un-linked"
 msgstr "سفارشات خرید {0} لغو پیوند هستند"
 
@@ -53966,17 +54862,17 @@
 msgstr "لیست قیمت خرید"
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:607
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:613
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: 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/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:310
-#: buying/doctype/purchase_order/purchase_order_list.js:43
+#: buying/doctype/purchase_order/purchase_order.js:352
+#: buying/doctype/purchase_order/purchase_order_list.js:61
 #: stock/doctype/purchase_receipt/purchase_receipt.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:56
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:65
 msgid "Purchase Receipt"
 msgstr "رسید خرید"
 
@@ -54093,11 +54989,11 @@
 msgid "Purchase Receipt No"
 msgstr "شماره رسید خرید"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:601
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
 msgid "Purchase Receipt Required"
 msgstr "رسید خرید الزامی است"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:600
 msgid "Purchase Receipt Required for item {}"
 msgstr "رسید خرید برای کالای {} مورد نیاز است"
 
@@ -54110,15 +55006,15 @@
 msgid "Purchase Receipt Trends"
 msgstr "روند رسید خرید"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:314
+#: stock/doctype/purchase_receipt/purchase_receipt.js:363
 msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
 msgstr "رسید خرید هیچ موردی ندارد که حفظ نمونه برای آن فعال باشد."
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:702
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:703
 msgid "Purchase Receipt {0} created."
 msgstr "رسید خرید {0} ایجاد شد."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:628
 msgid "Purchase Receipt {0} is not submitted"
 msgstr "رسید خرید {0} ارسال نشده است"
 
@@ -54135,11 +55031,11 @@
 msgid "Purchase Register"
 msgstr "ثبت خرید"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
 msgid "Purchase Return"
 msgstr "بازگشت خرید"
 
-#: setup/doctype/company/company.js:104
+#: setup/doctype/company/company.js:118
 msgid "Purchase Tax Template"
 msgstr "الگوی مالیات خرید"
 
@@ -54256,6 +55152,7 @@
 #: stock/doctype/price_list/price_list.json
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -54321,7 +55218,7 @@
 msgid "Purple"
 msgstr "رنگ بنفش"
 
-#: stock/doctype/stock_entry/stock_entry.js:287
+#: stock/doctype/stock_entry/stock_entry.js:329
 msgid "Purpose"
 msgstr "هدف"
 
@@ -54361,7 +55258,7 @@
 msgid "Purpose"
 msgstr "هدف"
 
-#: stock/doctype/stock_entry/stock_entry.py:380
+#: stock/doctype/stock_entry/stock_entry.py:335
 msgid "Purpose must be one of {0}"
 msgstr "هدف باید یکی از {0} باشد"
 
@@ -54402,18 +55299,21 @@
 #: controllers/trends.py:240 controllers/trends.py:252
 #: controllers/trends.py:257
 #: manufacturing/report/bom_explorer/bom_explorer.py:57
-#: public/js/bom_configurator/bom_configurator.bundle.js:203
-#: public/js/bom_configurator/bom_configurator.bundle.js:266
-#: public/js/bom_configurator/bom_configurator.bundle.js:271
-#: public/js/bom_configurator/bom_configurator.bundle.js:344
-#: public/js/utils.js:660 selling/doctype/sales_order/sales_order.js:315
-#: selling/doctype/sales_order/sales_order.js:410
-#: selling/doctype/sales_order/sales_order.js:698
-#: selling/doctype/sales_order/sales_order.js:815
+#: 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
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:106
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:166
 #: 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
+#: templates/form_grid/stock_entry_grid.html:10
 #: templates/generators/bom.html:50 templates/pages/rfq.html:40
 msgid "Qty"
 msgstr "مقدار"
@@ -54560,7 +55460,7 @@
 msgid "Qty"
 msgstr "مقدار"
 
-#: templates/pages/order.html:167
+#: templates/pages/order.html:179
 msgid "Qty "
 msgstr " تعداد"
 
@@ -54610,7 +55510,7 @@
 msgid "Qty Per Unit"
 msgstr "تعداد در هر واحد"
 
-#: manufacturing/doctype/bom/bom.js:237
+#: manufacturing/doctype/bom/bom.js:256
 #: manufacturing/report/process_loss_report/process_loss_report.py:83
 msgid "Qty To Manufacture"
 msgstr "تعداد برای تولید"
@@ -54701,7 +55601,14 @@
 msgid "Qty for which recursion isn't applicable."
 msgstr "تعداد که بازگشت برای آنها قابل اعمال نیست."
 
-#: manufacturing/doctype/work_order/work_order.js:713
+#. Description of the 'Apply Recursion Over (As Per Transaction UOM)' (Float)
+#. field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Qty for which recursion isn't applicable."
+msgstr "تعداد که بازگشت برای آنها قابل اعمال نیست."
+
+#: manufacturing/doctype/work_order/work_order.js:766
 msgid "Qty for {0}"
 msgstr "تعداد برای {0}"
 
@@ -54721,7 +55628,7 @@
 msgid "Qty in Stock UOM"
 msgstr "تعداد موجود در انبار UOM"
 
-#: stock/doctype/pick_list/pick_list.js:145
+#: stock/doctype/pick_list/pick_list.js:174
 msgid "Qty of Finished Goods Item"
 msgstr "تعداد کالاهای تمام شده"
 
@@ -54731,7 +55638,7 @@
 msgid "Qty of Finished Goods Item"
 msgstr "تعداد کالاهای تمام شده"
 
-#: stock/doctype/pick_list/pick_list.py:430
+#: stock/doctype/pick_list/pick_list.py:470
 msgid "Qty of Finished Goods Item should be greater than 0."
 msgstr "تعداد کالاهای تمام شده باید بیشتر از 0 باشد."
 
@@ -54761,11 +55668,12 @@
 msgid "Qty to Deliver"
 msgstr "تعداد برای تحویل"
 
-#: public/js/utils/serial_no_batch_selector.js:321
+#: public/js/utils/serial_no_batch_selector.js:327
 msgid "Qty to Fetch"
 msgstr "تعداد برای واکشی"
 
-#: manufacturing/doctype/job_card/job_card.py:668
+#: manufacturing/doctype/job_card/job_card.py:675
+#: manufacturing/doctype/workstation/workstation_job_card.html:56
 msgid "Qty to Manufacture"
 msgstr "تعداد تا تولید"
 
@@ -54946,7 +55854,7 @@
 msgstr "هدف کیفیت"
 
 #. Name of a DocType
-#: manufacturing/doctype/bom/bom.js:130
+#: manufacturing/doctype/bom/bom.js:138
 #: stock/doctype/quality_inspection/quality_inspection.json
 msgid "Quality Inspection"
 msgstr "بازرسی کیفیت"
@@ -55106,12 +56014,12 @@
 msgid "Quality Inspection Template Name"
 msgstr "نام الگوی بازرسی کیفیت"
 
-#: public/js/controllers/transaction.js:298
-#: stock/doctype/stock_entry/stock_entry.js:143
+#: public/js/controllers/transaction.js:324
+#: stock/doctype/stock_entry/stock_entry.js:157
 msgid "Quality Inspection(s)"
 msgstr "بازرسی(های) کیفیت"
 
-#: setup/doctype/company/company.py:377
+#: setup/doctype/company/company.py:376
 msgid "Quality Management"
 msgstr "مدیریت کیفیت"
 
@@ -55210,23 +56118,26 @@
 
 #: 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:29
+#: buying/report/purchase_analytics/purchase_analytics.js:28
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:215
-#: manufacturing/doctype/bom/bom.js:306
-#: manufacturing/doctype/bom_creator/bom_creator.js:69
-#: public/js/controllers/buying.js:518 public/js/stock_analytics.js:37
-#: public/js/utils/serial_no_batch_selector.js:393
+#: 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/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
-#: selling/report/sales_analytics/sales_analytics.js:29
+#: selling/report/sales_analytics/sales_analytics.js:36
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:67
-#: stock/dashboard/item_dashboard.js:236
-#: stock/doctype/material_request/material_request.js:249
-#: stock/doctype/stock_entry/stock_entry.js:551
+#: stock/dashboard/item_dashboard.js:244
+#: stock/doctype/material_request/material_request.js:314
+#: stock/doctype/stock_entry/stock_entry.js:636
 #: 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:28
+#: stock/report/stock_analytics/stock_analytics.js:27
 #: templates/emails/reorder_item.html:10 templates/generators/bom.html:30
-#: templates/pages/material_request_info.html:48 templates/pages/order.html:86
+#: templates/pages/material_request_info.html:48 templates/pages/order.html:98
 msgid "Quantity"
 msgstr "تعداد"
 
@@ -55465,16 +56376,20 @@
 msgid "Quantity and Warehouse"
 msgstr "مقدار و انبار"
 
-#: stock/doctype/stock_entry/stock_entry.py:1270
+#: stock/doctype/stock_entry/stock_entry.py:1279
 msgid "Quantity in row {0} ({1}) must be same as manufactured quantity {2}"
 msgstr "مقدار در ردیف {0} ({1}) باید با مقدار تولید شده {2} یکسان باشد"
 
-#: stock/dashboard/item_dashboard.js:273
+#: manufacturing/doctype/plant_floor/plant_floor.js:246
+msgid "Quantity is required"
+msgstr ""
+
+#: stock/dashboard/item_dashboard.js:281
 msgid "Quantity must be greater than zero, and less or equal to {0}"
 msgstr "مقدار باید بزرگتر از صفر و کمتر یا مساوی با {0} باشد."
 
-#: manufacturing/doctype/work_order/work_order.js:721
-#: stock/doctype/pick_list/pick_list.js:152
+#: manufacturing/doctype/work_order/work_order.js:775
+#: stock/doctype/pick_list/pick_list.js:182
 msgid "Quantity must not be more than {0}"
 msgstr "مقدار نباید بیشتر از {0} باشد"
 
@@ -55489,26 +56404,27 @@
 msgstr "مقدار مورد نیاز برای مورد {0} در ردیف {1}"
 
 #: manufacturing/doctype/bom/bom.py:568
+#: manufacturing/doctype/workstation/workstation.js:216
 msgid "Quantity should be greater than 0"
 msgstr "مقدار باید بیشتر از 0 باشد"
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:22
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:21
 msgid "Quantity to Make"
 msgstr "مقدار برای ساخت"
 
-#: manufacturing/doctype/work_order/work_order.js:249
+#: manufacturing/doctype/work_order/work_order.js:264
 msgid "Quantity to Manufacture"
 msgstr "مقدار برای ساخت"
 
-#: manufacturing/doctype/work_order/work_order.py:1516
+#: manufacturing/doctype/work_order/work_order.py:1530
 msgid "Quantity to Manufacture can not be zero for the operation {0}"
 msgstr "مقدار تا ساخت نمی تواند برای عملیات صفر باشد {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:934
+#: manufacturing/doctype/work_order/work_order.py:948
 msgid "Quantity to Manufacture must be greater than 0."
 msgstr "مقدار تولید باید بیشتر از 0 باشد."
 
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:21
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:24
 msgid "Quantity to Produce"
 msgstr "مقدار برای تولید"
 
@@ -55516,7 +56432,7 @@
 msgid "Quantity to Produce should be greater than zero."
 msgstr "مقدار تولید باید بیشتر از صفر باشد."
 
-#: public/js/utils/barcode_scanner.js:227
+#: public/js/utils/barcode_scanner.js:236
 msgid "Quantity to Scan"
 msgstr "مقدار برای اسکن"
 
@@ -55525,20 +56441,20 @@
 msgid "Quarter {0} {1}"
 msgstr "سه ماهه {0} {1}"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:65
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:68
-#: buying/report/purchase_analytics/purchase_analytics.js:63
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
-#: manufacturing/report/production_analytics/production_analytics.js:36
-#: public/js/financial_statements.js:218
+#: accounts/report/budget_variance_report/budget_variance_report.js:63
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:76
+#: buying/report/purchase_analytics/purchase_analytics.js:62
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
+#: manufacturing/report/production_analytics/production_analytics.js:35
+#: public/js/financial_statements.js:227
 #: public/js/purchase_trends_filters.js:20 public/js/sales_trends_filters.js:12
-#: public/js/stock_analytics.js:54
-#: selling/report/sales_analytics/sales_analytics.js:63
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
-#: stock/report/stock_analytics/stock_analytics.js:82
-#: support/report/issue_analytics/issue_analytics.js:44
+#: public/js/stock_analytics.js:84
+#: selling/report/sales_analytics/sales_analytics.js:70
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
+#: stock/report/stock_analytics/stock_analytics.js:81
+#: support/report/issue_analytics/issue_analytics.js:43
 msgid "Quarterly"
 msgstr "سه ماه یکبار"
 
@@ -55626,11 +56542,18 @@
 msgid "Queued"
 msgstr "در صف"
 
-#: accounts/doctype/journal_entry/journal_entry.js:39
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Queued"
+msgstr "در صف"
+
+#: accounts/doctype/journal_entry/journal_entry.js:82
 msgid "Quick Entry"
 msgstr "ورود سریع"
 
-#: accounts/doctype/journal_entry/journal_entry.js:527
+#: accounts/doctype/journal_entry/journal_entry.js:577
 msgid "Quick Journal Entry"
 msgstr "ورود سریع مجله"
 
@@ -55667,13 +56590,14 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:257
-#: buying/doctype/supplier_quotation/supplier_quotation.js:26
-#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:100
-#: crm/report/lead_details/lead_details.js:38
-#: manufacturing/doctype/blanket_order/blanket_order.js:33
+#: accounts/doctype/sales_invoice/sales_invoice.js:287
+#: buying/doctype/supplier_quotation/supplier_quotation.js:27
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
+#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:108
+#: crm/report/lead_details/lead_details.js:37
+#: manufacturing/doctype/blanket_order/blanket_order.js:38
 #: selling/doctype/quotation/quotation.json
-#: selling/doctype/sales_order/sales_order.js:613
+#: selling/doctype/sales_order/sales_order.js:721
 msgid "Quotation"
 msgstr "نقل قول"
 
@@ -55781,11 +56705,11 @@
 msgid "Quotation Trends"
 msgstr "روند نقل قول"
 
-#: selling/doctype/sales_order/sales_order.py:383
+#: selling/doctype/sales_order/sales_order.py:386
 msgid "Quotation {0} is cancelled"
 msgstr "نقل قول {0} لغو شده است"
 
-#: selling/doctype/sales_order/sales_order.py:300
+#: selling/doctype/sales_order/sales_order.py:303
 msgid "Quotation {0} not of type {1}"
 msgstr "نقل قول {0} از نوع {1} نیست"
 
@@ -55841,13 +56765,13 @@
 msgid "Random"
 msgstr "تصادفی"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:58
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:26
-#: manufacturing/report/production_analytics/production_analytics.js:31
-#: public/js/stock_analytics.js:49
-#: selling/report/sales_analytics/sales_analytics.js:58
-#: stock/report/stock_analytics/stock_analytics.js:77
-#: support/report/issue_analytics/issue_analytics.js:39
+#: buying/report/purchase_analytics/purchase_analytics.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:25
+#: manufacturing/report/production_analytics/production_analytics.js:30
+#: public/js/stock_analytics.js:78
+#: selling/report/sales_analytics/sales_analytics.js:65
+#: stock/report/stock_analytics/stock_analytics.js:76
+#: support/report/issue_analytics/issue_analytics.js:38
 msgid "Range"
 msgstr "دامنه"
 
@@ -55867,12 +56791,13 @@
 #: 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:669
+#: accounts/report/share_ledger/share_ledger.py:56 public/js/utils.js:732
 #: 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:243
+#: stock/dashboard/item_dashboard.js:251
 #: stock/report/delayed_item_report/delayed_item_report.py:151
-#: templates/pages/order.html:89 templates/pages/rfq.html:43
+#: templates/form_grid/item_grid.html:8 templates/pages/order.html:101
+#: templates/pages/rfq.html:43
 msgid "Rate"
 msgstr "نرخ"
 
@@ -56482,6 +57407,7 @@
 msgstr "نسبت ها"
 
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:52
+#: public/js/bom_configurator/bom_configurator.bundle.js:118
 #: setup/setup_wizard/operations/install_fixtures.py:46
 #: setup/setup_wizard/operations/install_fixtures.py:167
 msgid "Raw Material"
@@ -56551,12 +57477,13 @@
 msgid "Raw Material Value"
 msgstr "ارزش مواد خام"
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:66
+#: manufacturing/report/production_planning_report/production_planning_report.js:65
 msgid "Raw Material Warehouse"
 msgstr "انبار مواد اولیه"
 
-#: manufacturing/doctype/bom/bom.js:274
-#: public/js/bom_configurator/bom_configurator.bundle.js:268
+#: manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/workstation/workstation_job_card.html:76
+#: public/js/bom_configurator/bom_configurator.bundle.js:289
 msgid "Raw Materials"
 msgstr "مواد خام"
 
@@ -56642,12 +57569,12 @@
 msgid "Raw Materials cannot be blank."
 msgstr "مواد خام نمی تواند خالی باشد."
 
-#: buying/doctype/purchase_order/purchase_order.js:304
-#: manufacturing/doctype/production_plan/production_plan.js:97
-#: manufacturing/doctype/work_order/work_order.js:574
-#: selling/doctype/sales_order/sales_order.js:526
-#: selling/doctype/sales_order/sales_order_list.js:49
-#: stock/doctype/material_request/material_request.js:166
+#: buying/doctype/purchase_order/purchase_order.js:342
+#: manufacturing/doctype/production_plan/production_plan.js:103
+#: manufacturing/doctype/work_order/work_order.js:610
+#: selling/doctype/sales_order/sales_order.js:563
+#: selling/doctype/sales_order/sales_order_list.js:62
+#: stock/doctype/material_request/material_request.js:197
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 msgid "Re-open"
 msgstr "دوباره باز کنید"
@@ -56664,7 +57591,7 @@
 msgid "Re-order Qty"
 msgstr "دوباره سفارش تعداد"
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:226
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:227
 msgid "Reached Root"
 msgstr ""
 
@@ -56751,11 +57678,11 @@
 msgid "Readings"
 msgstr "خواندن"
 
-#: support/doctype/issue/issue.js:44
+#: support/doctype/issue/issue.js:51
 msgid "Reason"
 msgstr "دلیل"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:242
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:279
 msgid "Reason For Putting On Hold"
 msgstr "دلیل تعلیق"
 
@@ -56765,8 +57692,14 @@
 msgid "Reason For Putting On Hold"
 msgstr "دلیل تعلیق"
 
-#: buying/doctype/purchase_order/purchase_order.js:565
-#: selling/doctype/sales_order/sales_order.js:1112
+#. Label of a Data field in DocType 'Payment Request'
+#: accounts/doctype/payment_request/payment_request.json
+msgctxt "Payment Request"
+msgid "Reason for Failure"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:661
+#: selling/doctype/sales_order/sales_order.js:1274
 msgid "Reason for Hold"
 msgstr "دلیل نگه داشتن"
 
@@ -56776,11 +57709,11 @@
 msgid "Reason for Leaving"
 msgstr "دلیل ترک"
 
-#: selling/doctype/sales_order/sales_order.js:1127
+#: selling/doctype/sales_order/sales_order.js:1289
 msgid "Reason for hold:"
 msgstr "دلیل توقف:"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:144
+#: manufacturing/doctype/bom_creator/bom_creator.js:140
 msgid "Rebuild Tree"
 msgstr "درخت را بازسازی کنید"
 
@@ -56794,11 +57727,11 @@
 msgid "Recalculate Incoming/Outgoing Rate"
 msgstr "محاسبه مجدد نرخ ورودی/خروجی"
 
-#: projects/doctype/project/project.js:104
+#: projects/doctype/project/project.js:128
 msgid "Recalculating Purchase Cost against this Project..."
 msgstr "محاسبه مجدد هزینه خرید در مقابل این پروژه..."
 
-#: assets/doctype/asset/asset_list.js:29
+#: assets/doctype/asset/asset_list.js:21
 msgid "Receipt"
 msgstr "اعلام وصول"
 
@@ -56844,7 +57777,7 @@
 msgid "Receipt Document Type"
 msgstr "نوع سند رسید"
 
-#: accounts/report/account_balance/account_balance.js:53
+#: accounts/report/account_balance/account_balance.js:55
 msgid "Receivable"
 msgstr "قابل دریافت است"
 
@@ -56873,7 +57806,7 @@
 msgid "Receivable / Payable Account"
 msgstr "حساب دریافتنی / پرداختنی"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:67
+#: 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
@@ -56907,10 +57840,10 @@
 msgid "Receive"
 msgstr "دريافت كردن"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:297
+#: buying/doctype/request_for_quotation/request_for_quotation.py:321
 #: buying/doctype/supplier_quotation/supplier_quotation.py:175
-#: stock/doctype/material_request/material_request_list.js:23
-#: stock/doctype/material_request/material_request_list.js:31
+#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:35
 msgid "Received"
 msgstr "اخذ شده"
 
@@ -56951,7 +57884,7 @@
 msgid "Received Amount After Tax (Company Currency)"
 msgstr "مبلغ دریافتی پس از کسر مالیات (ارز شرکت)"
 
-#: accounts/doctype/payment_entry/payment_entry.py:891
+#: accounts/doctype/payment_entry/payment_entry.py:900
 msgid "Received Amount cannot be greater than Paid Amount"
 msgstr "مبلغ دریافتی نمی تواند بیشتر از مبلغ پرداختی باشد"
 
@@ -57025,6 +57958,7 @@
 msgstr "تعداد در انبار UOM دریافت شد"
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:50
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:9
 msgid "Received Quantity"
 msgstr "مقدار دریافتی"
 
@@ -57040,7 +57974,7 @@
 msgid "Received Quantity"
 msgstr "مقدار دریافتی"
 
-#: stock/doctype/stock_entry/stock_entry.js:250
+#: stock/doctype/stock_entry/stock_entry.js:278
 msgid "Received Stock Entries"
 msgstr "ورودی های موجودی دریافت شده است"
 
@@ -57073,6 +58007,10 @@
 msgid "Receiving"
 msgstr "در حال دریافت"
 
+#: selling/page/point_of_sale/pos_past_order_list.js:17
+msgid "Recent Orders"
+msgstr ""
+
 #. Label of a Dynamic Link field in DocType 'Email Campaign'
 #: crm/doctype/email_campaign/email_campaign.json
 msgctxt "Email Campaign"
@@ -57103,8 +58041,8 @@
 msgid "Recipients"
 msgstr "گیرندگان"
 
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:89
 #: accounts/doctype/payment_reconciliation/payment_reconciliation.js:90
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:93
 msgid "Reconcile"
 msgstr "وفق دادن"
 
@@ -57114,11 +58052,11 @@
 msgid "Reconcile"
 msgstr "وفق دادن"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:325
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:341
 msgid "Reconcile Entries"
 msgstr "تطبیق ورودی ها"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:217
+#: public/js/bank_reconciliation_tool/dialog_manager.js:221
 msgid "Reconcile the Bank Transaction"
 msgstr "معامله بانکی را تطبیق دهید"
 
@@ -57195,6 +58133,12 @@
 msgid "Recurse Every (As Per Transaction UOM)"
 msgstr "تکرار هر (بر اساس UOM تراکنش)"
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Recurse Every (As Per Transaction UOM)"
+msgstr "تکرار هر (بر اساس UOM تراکنش)"
+
 #: accounts/doctype/pricing_rule/pricing_rule.py:232
 msgid "Recurse Over Qty cannot be less than 0"
 msgstr "Recurse Over Qty نمی تواند کمتر از 0 باشد"
@@ -57223,7 +58167,7 @@
 msgid "Redeem Against"
 msgstr "رستگاری در برابر"
 
-#: selling/page/point_of_sale/pos_payment.js:497
+#: selling/page/point_of_sale/pos_payment.js:525
 msgid "Redeem Loyalty Points"
 msgstr "امتیازات وفاداری را بازخرید کنید"
 
@@ -57304,7 +58248,12 @@
 #: accounts/doctype/promotional_scheme/promotional_scheme_dashboard.py:7
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:22
 #: accounts/doctype/sales_invoice/sales_invoice_dashboard.py:34
+#: accounts/report/accounts_receivable/accounts_receivable.html:136
+#: 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/general_ledger/general_ledger.html:28
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:22
 #: buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:15
 #: manufacturing/doctype/job_card/job_card_dashboard.py:10
@@ -57458,11 +58407,12 @@
 msgid "Reference"
 msgstr "ارجاع"
 
-#: accounts/doctype/journal_entry/journal_entry.py:899
+#: accounts/doctype/journal_entry/journal_entry.py:926
 msgid "Reference #{0} dated {1}"
 msgstr "مرجع #{0} به تاریخ {1}"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:112
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:27
+#: public/js/bank_reconciliation_tool/dialog_manager.js:119
 msgid "Reference Date"
 msgstr "تاریخ مرجع"
 
@@ -57472,7 +58422,7 @@
 msgid "Reference Date"
 msgstr "تاریخ مرجع"
 
-#: public/js/controllers/transaction.js:2073
+#: public/js/controllers/transaction.js:2116
 msgid "Reference Date for Early Payment Discount"
 msgstr "تاریخ مرجع برای تخفیف پرداخت زودهنگام"
 
@@ -57494,7 +58444,7 @@
 msgid "Reference Doctype"
 msgstr "نوع مرجع"
 
-#: accounts/doctype/payment_entry/payment_entry.py:555
+#: accounts/doctype/payment_entry/payment_entry.py:564
 msgid "Reference Doctype must be one of {0}"
 msgstr "Reference Doctype باید یکی از {0} باشد"
 
@@ -57663,24 +58613,30 @@
 msgid "Reference Name"
 msgstr "نام مرجع"
 
-#: accounts/doctype/journal_entry/journal_entry.py:532
+#. Label of a Data field in DocType 'Sales Invoice Payment'
+#: accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
+msgctxt "Sales Invoice Payment"
+msgid "Reference No"
+msgstr ""
+
+#: accounts/doctype/journal_entry/journal_entry.py:548
 msgid "Reference No & Reference Date is required for {0}"
 msgstr "شماره مرجع و تاریخ مرجع برای {0} مورد نیاز است"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1087
+#: accounts/doctype/payment_entry/payment_entry.py:1096
 msgid "Reference No and Reference Date is mandatory for Bank transaction"
 msgstr "شماره مرجع و تاریخ مرجع برای تراکنش بانکی الزامی است"
 
-#: accounts/doctype/journal_entry/journal_entry.py:537
+#: accounts/doctype/journal_entry/journal_entry.py:553
 msgid "Reference No is mandatory if you entered Reference Date"
 msgstr "اگر تاریخ مرجع را وارد کرده باشید، شماره مرجع اجباری است"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
 msgid "Reference No."
 msgstr "شماره مرجع."
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:88
-#: public/js/bank_reconciliation_tool/dialog_manager.js:123
+#: public/js/bank_reconciliation_tool/data_table_manager.js:83
+#: public/js/bank_reconciliation_tool/dialog_manager.js:130
 msgid "Reference Number"
 msgstr "شماره مرجع"
 
@@ -57856,7 +58812,15 @@
 msgid "References"
 msgstr "منابع"
 
-#: accounts/doctype/payment_entry/payment_entry.py:631
+#: stock/doctype/delivery_note/delivery_note.py:395
+msgid "References to Sales Invoices are Incomplete"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:371
+msgid "References to Sales Orders are Incomplete"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.py:640
 msgid "References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount."
 msgstr "مراجع {0} از نوع {1} قبل از ارسال ورودی پرداخت، مبلغ معوقه ای باقی نمانده بود. اکنون آنها یک مبلغ معوقه منفی دارند."
 
@@ -57872,7 +58836,8 @@
 msgid "Referral Sales Partner"
 msgstr "شریک فروش ارجاعی"
 
-#: selling/page/sales_funnel/sales_funnel.js:44
+#: public/js/plant_floor_visual/visual_plant.js:151
+#: selling/page/sales_funnel/sales_funnel.js:51
 msgid "Refresh"
 msgstr "تازه کردن"
 
@@ -57882,7 +58847,7 @@
 msgid "Refresh Google Sheet"
 msgstr "برگه Google را بازخوانی کنید"
 
-#: accounts/doctype/bank/bank.js:22
+#: accounts/doctype/bank/bank.js:21
 msgid "Refresh Plaid Link"
 msgstr "پیوند شطرنجی را تازه کنید"
 
@@ -57892,7 +58857,7 @@
 msgid "Refresh Token"
 msgstr ""
 
-#: stock/reorder_item.py:303
+#: stock/reorder_item.py:388
 msgid "Regards,"
 msgstr "با احترام،"
 
@@ -58034,8 +58999,8 @@
 msgid "Relation"
 msgstr "رابطه"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:234
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:278
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:271
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:315
 msgid "Release Date"
 msgstr "تاریخ انتشار"
 
@@ -58051,7 +59016,7 @@
 msgid "Release Date"
 msgstr "تاریخ انتشار"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:314
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
 msgid "Release date must be in the future"
 msgstr "تاریخ انتشار باید در آینده باشد"
 
@@ -58061,17 +59026,18 @@
 msgid "Relieving Date"
 msgstr "تاریخ تسکین"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:118
+#: public/js/bank_reconciliation_tool/dialog_manager.js:125
 msgid "Remaining"
 msgstr "باقی مانده است"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:186
-#: accounts/report/accounts_receivable/accounts_receivable.py:1085
+#: 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
 msgid "Remaining Balance"
 msgstr "موجودی باقی مانده"
 
-#: selling/page/point_of_sale/pos_payment.js:350
+#: selling/page/point_of_sale/pos_payment.js:367
 msgid "Remark"
 msgstr "تذکر دهید"
 
@@ -58094,8 +59060,14 @@
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:240
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:311
 #: accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:11
-#: accounts/report/accounts_receivable/accounts_receivable.py:1117
-#: accounts/report/general_ledger/general_ledger.py:661
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.html:29
+#: accounts/report/general_ledger/general_ledger.html:51
+#: accounts/report/general_ledger/general_ledger.py:674
 #: 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
@@ -58218,11 +59190,15 @@
 msgid "Remarks Column Length"
 msgstr "طول ستون اظهارات"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:323
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Remove item if charges is not applicable to that item"
+msgstr ""
+
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
 msgid "Removed items with no change in quantity or value."
 msgstr "موارد حذف شده بدون تغییر در کمیت یا ارزش."
 
-#: utilities/doctype/rename_tool/rename_tool.js:25
+#: utilities/doctype/rename_tool/rename_tool.js:24
 msgid "Rename"
 msgstr "تغییر نام دهید"
 
@@ -58239,7 +59215,7 @@
 msgid "Rename Log"
 msgstr "تغییر نام گزارش"
 
-#: accounts/doctype/account/account.py:502
+#: accounts/doctype/account/account.py:521
 msgid "Rename Not Allowed"
 msgstr "تغییر نام مجاز نیست"
 
@@ -58248,7 +59224,7 @@
 msgid "Rename Tool"
 msgstr "تغییر نام ابزار"
 
-#: accounts/doctype/account/account.py:494
+#: accounts/doctype/account/account.py:513
 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch."
 msgstr "تغییر نام آن فقط از طریق شرکت مادر {0} مجاز است تا از عدم تطابق جلوگیری شود."
 
@@ -58271,11 +59247,11 @@
 msgid "Rented"
 msgstr "اجاره شده است"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:34
-#: crm/doctype/opportunity/opportunity.js:113
-#: stock/doctype/delivery_note/delivery_note.js:228
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: support/doctype/issue/issue.js:30
+#: buying/doctype/purchase_order/purchase_order_list.js:53
+#: crm/doctype/opportunity/opportunity.js:123
+#: stock/doctype/delivery_note/delivery_note.js:277
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: support/doctype/issue/issue.js:37
 msgid "Reopen"
 msgstr "دوباره باز کنید"
 
@@ -58312,7 +59288,7 @@
 msgid "Repair"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:107
+#: assets/doctype/asset/asset.js:127
 msgid "Repair Asset"
 msgstr "دارایی تعمیر"
 
@@ -58360,9 +59336,15 @@
 msgid "Replace BOM"
 msgstr "BOM را جایگزین کنید"
 
-#: crm/report/lead_details/lead_details.js:36
-#: support/report/issue_analytics/issue_analytics.js:57
-#: support/report/issue_summary/issue_summary.js:44
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.json
+msgid "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM.\n"
+"It also updates latest price in all the BOMs."
+msgstr ""
+
+#: 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
 msgid "Replied"
 msgstr "پاسخ داد"
@@ -58391,7 +59373,7 @@
 msgid "Replied"
 msgstr "پاسخ داد"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:86
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:110
 msgid "Report"
 msgstr "گزارش"
 
@@ -58411,7 +59393,7 @@
 msgid "Report Date"
 msgstr "تاریخ گزارش"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:213
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:192
 msgid "Report Error"
 msgstr "گزارش خطا"
 
@@ -58427,12 +59409,12 @@
 msgid "Report Type"
 msgstr "نوع گزارش"
 
-#: accounts/doctype/account/account.py:395
+#: accounts/doctype/account/account.py:414
 msgid "Report Type is mandatory"
 msgstr "نوع گزارش اجباری است"
 
-#: accounts/report/balance_sheet/balance_sheet.js:17
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:17
+#: accounts/report/balance_sheet/balance_sheet.js:13
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:13
 msgid "Report View"
 msgstr "مشاهده گزارش"
 
@@ -58466,8 +59448,9 @@
 msgid "Reports to"
 msgstr "گزارش به"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:70
-#: accounts/doctype/sales_invoice/sales_invoice.js:73
+#: accounts/doctype/journal_entry/journal_entry.js:34
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:87
+#: accounts/doctype/sales_invoice/sales_invoice.js:78
 msgid "Repost Accounting Entries"
 msgstr "ارسال مجدد ورودی های حسابداری"
 
@@ -58512,6 +59495,12 @@
 msgid "Repost Payment Ledger Items"
 msgstr "ارسال مجدد اقلام دفتر پرداخت"
 
+#. Label of a Check field in DocType 'Journal Entry'
+#: accounts/doctype/journal_entry/journal_entry.json
+msgctxt "Journal Entry"
+msgid "Repost Required"
+msgstr "ارسال مجدد الزامی است"
+
 #. Label of a Check field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
@@ -58530,11 +59519,11 @@
 msgid "Repost Status"
 msgstr "وضعیت بازنشر"
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:137
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:138
 msgid "Repost has started in the background"
 msgstr "ارسال مجدد در پس زمینه شروع شده است"
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:38
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:40
 msgid "Repost in background"
 msgstr "بازنشر در پس زمینه"
 
@@ -58542,7 +59531,7 @@
 msgid "Repost started in the background"
 msgstr "بازنشر در پس‌زمینه شروع شد"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:105
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:115
 msgid "Reposting Completed {0}%"
 msgstr ""
 
@@ -58558,7 +59547,7 @@
 msgid "Reposting Info"
 msgstr "بازنشر اطلاعات"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:113
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:123
 msgid "Reposting Progress"
 msgstr "بازنشر پیشرفت"
 
@@ -58567,16 +59556,17 @@
 msgid "Reposting entries created: {0}"
 msgstr "ارسال مجدد ورودی های ایجاد شده: {0}"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:89
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:99
 msgid "Reposting has been started in the background."
 msgstr "ارسال مجدد در پس‌زمینه آغاز شده است."
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:47
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:49
 msgid "Reposting in the background."
 msgstr "بازنشر در پس زمینه"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:76
-#: accounts/doctype/sales_invoice/sales_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:39
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/sales_invoice/sales_invoice.js:83
 msgid "Reposting..."
 msgstr "بازنشر..."
 
@@ -58634,11 +59624,20 @@
 msgid "Represents Company"
 msgstr "نمایندگی شرکت"
 
-#: public/js/utils.js:678
+#. Description of a DocType
+#: accounts/doctype/fiscal_year/fiscal_year.json
+msgid "Represents a Financial Year. All accounting entries and other major transactions are tracked against the Fiscal Year."
+msgstr ""
+
+#: templates/form_grid/material_request_grid.html:25
+msgid "Reqd By Date"
+msgstr ""
+
+#: public/js/utils.js:742
 msgid "Reqd by date"
 msgstr "درخواست بر اساس تاریخ"
 
-#: crm/doctype/opportunity/opportunity.js:87
+#: crm/doctype/opportunity/opportunity.js:89
 msgid "Request For Quotation"
 msgstr "درخواست برای نقل قول"
 
@@ -58648,7 +59647,7 @@
 msgid "Request Parameters"
 msgstr "پارامترهای درخواست"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:269
+#: accounts/doctype/pos_invoice/pos_invoice.js:292
 msgid "Request Timeout"
 msgstr "درخواست مهلت زمانی"
 
@@ -58672,11 +59671,11 @@
 
 #. Name of a DocType
 #: buying/doctype/request_for_quotation/request_for_quotation.json
-#: buying/doctype/request_for_quotation/request_for_quotation.py:346
-#: buying/doctype/supplier_quotation/supplier_quotation.js:57
+#: buying/doctype/request_for_quotation/request_for_quotation.py:370
+#: 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
-#: stock/doctype/material_request/material_request.js:142
+#: stock/doctype/material_request/material_request.js:162
 msgid "Request for Quotation"
 msgstr "درخواست برای نقل قول"
 
@@ -58714,7 +59713,7 @@
 msgid "Request for Quotation Supplier"
 msgstr "درخواست تامین کننده قیمت"
 
-#: selling/doctype/sales_order/sales_order.js:571
+#: selling/doctype/sales_order/sales_order.js:650
 msgid "Request for Raw Materials"
 msgstr "درخواست مواد اولیه"
 
@@ -58770,6 +59769,10 @@
 msgid "Requested Qty"
 msgstr "تعداد درخواستی"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Requested Qty: Quantity requested for purchase, but not ordered."
+msgstr ""
+
 #: buying/report/procurement_tracker/procurement_tracker.py:46
 msgid "Requesting Site"
 msgstr "سایت درخواستی"
@@ -58856,8 +59859,15 @@
 msgid "Required Items"
 msgstr "موارد مورد نیاز"
 
+#: templates/form_grid/material_request_grid.html:7
+msgid "Required On"
+msgstr ""
+
 #: 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_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
@@ -58934,7 +59944,7 @@
 msgid "Research"
 msgstr "پژوهش"
 
-#: setup/doctype/company/company.py:383
+#: setup/doctype/company/company.py:382
 msgid "Research & Development"
 msgstr "تحقیق و توسعه"
 
@@ -58966,11 +59976,11 @@
 msgid "Reselect, if the chosen contact is edited after save"
 msgstr "اگر مخاطب انتخابی پس از ذخیره ویرایش شد، دوباره انتخاب کنید"
 
-#: accounts/doctype/payment_request/payment_request.js:30
+#: accounts/doctype/payment_request/payment_request.js:39
 msgid "Resend Payment Email"
 msgstr "ارسال مجدد ایمیل پرداخت"
 
-#: stock/report/reserved_stock/reserved_stock.js:121
+#: stock/report/reserved_stock/reserved_stock.js:118
 msgid "Reservation Based On"
 msgstr "رزرو بر اساس"
 
@@ -58980,12 +59990,12 @@
 msgid "Reservation Based On"
 msgstr "رزرو بر اساس"
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: stock/doctype/pick_list/pick_list.js:110
+#: selling/doctype/sales_order/sales_order.js:80
+#: stock/doctype/pick_list/pick_list.js:126
 msgid "Reserve"
 msgstr "ذخیره"
 
-#: selling/doctype/sales_order/sales_order.js:322
+#: selling/doctype/sales_order/sales_order.js:347
 msgid "Reserve Stock"
 msgstr "ذخیره موجودی"
 
@@ -59019,6 +60029,8 @@
 msgid "Reserved"
 msgstr "رزرو شده است"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:29
+#: stock/dashboard/item_dashboard_list.html:20
 #: stock/report/reserved_stock/reserved_stock.py:124
 #: stock/report/stock_projected_qty/stock_projected_qty.py:164
 msgid "Reserved Qty"
@@ -59058,16 +60070,28 @@
 msgid "Reserved Qty for Production Plan"
 msgstr "تعداد رزرو شده برای طرح تولید"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Production: Raw materials quantity to make manufacturing items."
+msgstr ""
+
 #. Label of a Float field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "Reserved Qty for Subcontract"
 msgstr "مقدار رزرو شده برای قرارداد فرعی"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
+msgstr ""
+
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:497
 msgid "Reserved Qty should be greater than Delivered Qty."
 msgstr "تعداد رزرو شده باید بیشتر از تعداد تحویل شده باشد."
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty: Quantity ordered for sale, but not delivered."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:116
 msgid "Reserved Quantity"
 msgstr "مقدار رزرو شده"
@@ -59076,16 +60100,18 @@
 msgid "Reserved Quantity for Production"
 msgstr "مقدار رزرو شده برای تولید"
 
-#: stock/stock_ledger.py:1982
+#: stock/stock_ledger.py:1989
 msgid "Reserved Serial No."
 msgstr "شماره سریال رزرو شده"
 
 #. Name of a report
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:374
-#: stock/doctype/pick_list/pick_list.js:120
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:24
+#: selling/doctype/sales_order/sales_order.js:99
+#: selling/doctype/sales_order/sales_order.js:404
+#: 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:459 stock/stock_ledger.py:1962
+#: stock/report/stock_balance/stock_balance.py:467 stock/stock_ledger.py:1969
 msgid "Reserved Stock"
 msgstr "موجودی رزرو شده"
 
@@ -59095,7 +60121,7 @@
 msgid "Reserved Stock"
 msgstr "موجودی رزرو شده"
 
-#: stock/stock_ledger.py:2012
+#: stock/stock_ledger.py:2019
 msgid "Reserved Stock for Batch"
 msgstr "موجودی رزرو شده برای دسته"
 
@@ -59127,21 +60153,27 @@
 msgid "Reserved for sub contracting"
 msgstr "برای قرارداد فرعی محفوظ است"
 
-#: selling/doctype/sales_order/sales_order.js:335
-#: stock/doctype/pick_list/pick_list.js:237
+#: selling/doctype/sales_order/sales_order.js:360
+#: stock/doctype/pick_list/pick_list.js:271
 msgid "Reserving Stock..."
 msgstr "رزرو موجودی..."
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:139
-#: support/doctype/issue/issue.js:48
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:155
+#: support/doctype/issue/issue.js:55
 msgid "Reset"
 msgstr "بازنشانی کنید"
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Reset Company Default Values"
+msgstr ""
+
 #: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:19
 msgid "Reset Plaid Link"
 msgstr "بازنشانی پیوند Plaid"
 
-#: support/doctype/issue/issue.js:39
+#: support/doctype/issue/issue.js:46
 msgid "Reset Service Level Agreement"
 msgstr "بازنشانی توافقنامه سطح خدمات"
 
@@ -59151,7 +60183,7 @@
 msgid "Reset Service Level Agreement"
 msgstr "بازنشانی توافقنامه سطح خدمات"
 
-#: support/doctype/issue/issue.js:56
+#: support/doctype/issue/issue.js:63
 msgid "Resetting Service Level Agreement."
 msgstr "بازنشانی قرارداد سطح سرویس."
 
@@ -59240,8 +60272,8 @@
 msgstr "برطرف کردن"
 
 #: accounts/doctype/dunning/dunning_list.js:4
-#: support/report/issue_analytics/issue_analytics.js:58
-#: support/report/issue_summary/issue_summary.js:46
+#: support/report/issue_analytics/issue_analytics.js:57
+#: support/report/issue_summary/issue_summary.js:45
 #: support/report/issue_summary/issue_summary.py:366
 msgid "Resolved"
 msgstr "حل شد"
@@ -59321,7 +60353,7 @@
 msgid "Rest Of The World"
 msgstr "بقیه دنیا"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:72
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:82
 msgid "Restart"
 msgstr "راه اندازی مجدد"
 
@@ -59329,7 +60361,7 @@
 msgid "Restart Subscription"
 msgstr "شروع مجدد اشتراک"
 
-#: assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:108
 msgid "Restore Asset"
 msgstr "بازیابی دارایی"
 
@@ -59376,12 +60408,12 @@
 msgid "Result Title Field"
 msgstr "فیلد عنوان نتیجه"
 
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: selling/doctype/sales_order/sales_order.js:515
+#: buying/doctype/purchase_order/purchase_order.js:321
+#: selling/doctype/sales_order/sales_order.js:549
 msgid "Resume"
 msgstr "از سرگیری"
 
-#: manufacturing/doctype/job_card/job_card.js:255
+#: manufacturing/doctype/job_card/job_card.js:288
 msgid "Resume Job"
 msgstr "رزومه کاری"
 
@@ -59408,11 +60440,11 @@
 msgid "Retained Earnings"
 msgstr "سود انباشته"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: stock/doctype/purchase_receipt/purchase_receipt.js:274
 msgid "Retention Stock Entry"
 msgstr "ورود موجودی نگهداری"
 
-#: stock/doctype/stock_entry/stock_entry.js:450
+#: stock/doctype/stock_entry/stock_entry.js:510
 msgid "Retention Stock Entry already created or Sample Quantity not provided"
 msgstr "ورودی موجودی نگهداری از قبل ایجاد شده است یا مقدار نمونه ارائه نشده است"
 
@@ -59422,20 +60454,21 @@
 msgid "Retried"
 msgstr "دوباره امتحان شد"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:134
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 #: accounts/doctype/ledger_merge/ledger_merge.js:72
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:65
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:66
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
 msgid "Retry"
 msgstr "دوباره امتحان کنید"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:13
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:27
 msgid "Retry Failed Transactions"
 msgstr "تراکنش های ناموفق را دوباره امتحان کنید"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/sales_invoice/sales_invoice.py:263
-#: stock/doctype/delivery_note/delivery_note_list.js:6
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:6
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/sales_invoice/sales_invoice.py:268
+#: stock/doctype/delivery_note/delivery_note_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:15
 msgid "Return"
 msgstr "برگشت"
 
@@ -59463,11 +60496,11 @@
 msgid "Return"
 msgstr "برگشت"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:120
+#: accounts/doctype/sales_invoice/sales_invoice.js:121
 msgid "Return / Credit Note"
 msgstr "یادداشت برگشتی / اعتباری"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
 msgid "Return / Debit Note"
 msgstr "یادداشت برگشتی / بدهکاری"
 
@@ -59513,12 +60546,12 @@
 msgid "Return Against Subcontracting Receipt"
 msgstr "استرداد در مقابل رسید پیمانکاری فرعی"
 
-#: manufacturing/doctype/work_order/work_order.js:194
+#: manufacturing/doctype/work_order/work_order.js:205
 msgid "Return Components"
 msgstr "برگرداندن اجزاء"
 
-#: stock/doctype/delivery_note/delivery_note_list.js:10
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:10
+#: stock/doctype/delivery_note/delivery_note_list.js:20
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:19
 msgid "Return Issued"
 msgstr "بازگشت صادر شد"
 
@@ -59540,16 +60573,16 @@
 msgid "Return Issued"
 msgstr "بازگشت صادر شد"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:334
 msgid "Return Qty"
 msgstr "تعداد برگشت"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:265
+#: stock/doctype/purchase_receipt/purchase_receipt.js:310
 msgid "Return Qty from Rejected Warehouse"
 msgstr "تعداد بازگرداندن از انبار رد شده"
 
-#: buying/doctype/purchase_order/purchase_order.js:77
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:142
+#: buying/doctype/purchase_order/purchase_order.js:80
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:150
 msgid "Return of Components"
 msgstr "بازگشت اجزاء"
 
@@ -59629,7 +60662,7 @@
 msgid "Returned Qty in Stock UOM"
 msgstr "تعداد برگردانده شده در انبار UOM"
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:103
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:104
 msgid "Returned exchange rate is neither integer not float."
 msgstr "نرخ ارز برگشتی نه عدد صحیح است و نه شناور."
 
@@ -59647,14 +60680,14 @@
 msgid "Returns"
 msgstr "برمی گرداند"
 
-#: accounts/report/accounts_payable/accounts_payable.js:154
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:116
-#: accounts/report/accounts_receivable/accounts_receivable.js:186
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:144
+#: accounts/report/accounts_payable/accounts_payable.js:157
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:119
+#: accounts/report/accounts_receivable/accounts_receivable.js:189
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:147
 msgid "Revaluation Journals"
 msgstr "مجلات تجدید ارزیابی"
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
 msgid "Revenue"
 msgstr "درآمد"
 
@@ -59664,7 +60697,7 @@
 msgid "Reversal Of"
 msgstr "معکوس شدن"
 
-#: accounts/doctype/journal_entry/journal_entry.js:33
+#: accounts/doctype/journal_entry/journal_entry.js:73
 msgid "Reverse Journal Entry"
 msgstr "ورود معکوس مجله"
 
@@ -59821,12 +60854,12 @@
 msgid "Root"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:41
+#: accounts/doctype/account/account_tree.js:47
 msgid "Root Company"
 msgstr "شرکت ریشه"
 
-#: accounts/doctype/account/account_tree.js:112
-#: accounts/report/account_balance/account_balance.js:23
+#: accounts/doctype/account/account_tree.js:145
+#: accounts/report/account_balance/account_balance.js:22
 msgid "Root Type"
 msgstr "نوع ریشه"
 
@@ -59846,11 +60879,11 @@
 msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity"
 msgstr "نوع ریشه برای {0} باید یکی از دارایی، بدهی، درآمد، هزینه و حقوق صاحبان موجودی باشد."
 
-#: accounts/doctype/account/account.py:392
+#: accounts/doctype/account/account.py:411
 msgid "Root Type is mandatory"
 msgstr "نوع ریشه اجباری است"
 
-#: accounts/doctype/account/account.py:195
+#: accounts/doctype/account/account.py:214
 msgid "Root cannot be edited."
 msgstr "Root قابل ویرایش نیست."
 
@@ -59866,7 +60899,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:66
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:90
-#: accounts/report/account_balance/account_balance.js:54
+#: accounts/report/account_balance/account_balance.js:56
 msgid "Round Off"
 msgstr "گرد کردن"
 
@@ -60127,12 +61160,12 @@
 msgid "Rounding Loss Allowance"
 msgstr "کمک هزینه از دست دادن گرد"
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:41
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:45
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:48
 msgid "Rounding Loss Allowance should be between 0 and 1"
 msgstr "کمک هزینه زیان گرد باید بین 0 و 1 باشد"
 
-#: controllers/stock_controller.py:216 controllers/stock_controller.py:231
+#: controllers/stock_controller.py:398 controllers/stock_controller.py:413
 msgid "Rounding gain/loss Entry for Stock Transfer"
 msgstr "گردآوری سود/زیان ورودی برای انتقال موجودی"
 
@@ -60173,11 +61206,11 @@
 msgid "Routing Name"
 msgstr "نام مسیریابی"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:428
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:482
 msgid "Row #"
 msgstr "ردیف #"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:334
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:388
 msgid "Row # {0}:"
 msgstr "ردیف شماره {0}:"
 
@@ -60194,12 +61227,12 @@
 msgstr "ردیف # {0}: مورد برگشتی {1} در {2} {3} وجود ندارد"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:439
-#: accounts/doctype/sales_invoice/sales_invoice.py:1715
+#: accounts/doctype/sales_invoice/sales_invoice.py:1684
 msgid "Row #{0} (Payment Table): Amount must be negative"
 msgstr "ردیف #{0} (جدول پرداخت): مبلغ باید منفی باشد"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:437
-#: accounts/doctype/sales_invoice/sales_invoice.py:1710
+#: accounts/doctype/sales_invoice/sales_invoice.py:1679
 msgid "Row #{0} (Payment Table): Amount must be positive"
 msgstr "ردیف #{0} (جدول پرداخت): مبلغ باید مثبت باشد"
 
@@ -60216,7 +61249,7 @@
 msgstr "ردیف #{0}: فرمول معیارهای پذیرش الزامی است."
 
 #: controllers/subcontracting_controller.py:72
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:413
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:414
 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same"
 msgstr "ردیف #{0}: انبار پذیرفته شده و انبار رد شده نمی توانند یکسان باشند"
 
@@ -60224,11 +61257,11 @@
 msgid "Row #{0}: Accepted Warehouse and Supplier Warehouse cannot be same"
 msgstr "ردیف #{0}: انبار پذیرفته شده و انبار تامین کننده نمی توانند یکسان باشند"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:406
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:407
 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
 msgstr "ردیف #{0}: انبار پذیرفته شده برای مورد پذیرفته شده اجباری است {1}"
 
-#: controllers/accounts_controller.py:887
+#: controllers/accounts_controller.py:939
 msgid "Row #{0}: Account {1} does not belong to company {2}"
 msgstr "ردیف #{0}: حساب {1} به شرکت {2} تعلق ندارد"
 
@@ -60241,15 +61274,15 @@
 msgid "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}"
 msgstr "ردیف #{0}: مبلغ تخصیص یافته:{1} بیشتر از مبلغ معوق است:{2} برای مدت پرداخت {3}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:309
+#: assets/doctype/asset_capitalization/asset_capitalization.py:315
 msgid "Row #{0}: Amount must be a positive number"
 msgstr "ردیف #{0}: مقدار باید یک عدد مثبت باشد"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:375
+#: accounts/doctype/sales_invoice/sales_invoice.py:386
 msgid "Row #{0}: Asset {1} cannot be submitted, it is already {2}"
 msgstr "ردیف #{0}: دارایی {1} قابل ارسال نیست، قبلاً {2} است"
 
-#: buying/doctype/purchase_order/purchase_order.py:351
+#: buying/doctype/purchase_order/purchase_order.py:352
 msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
 msgstr "ردیف #{0}: BOM برای قرارداد فرعی مورد {0} مشخص نشده است"
 
@@ -60257,27 +61290,27 @@
 msgid "Row #{0}: Batch No {1} is already selected."
 msgstr "ردیف #{0}: شماره دسته {1} قبلاً انتخاب شده است."
 
-#: accounts/doctype/payment_entry/payment_entry.py:736
+#: accounts/doctype/payment_entry/payment_entry.py:745
 msgid "Row #{0}: Cannot allocate more than {1} against payment term {2}"
 msgstr "ردیف #{0}: نمی توان بیش از {1} را در مقابل مدت پرداخت {2} تخصیص داد"
 
-#: controllers/accounts_controller.py:3064
+#: controllers/accounts_controller.py:3155
 msgid "Row #{0}: Cannot delete item {1} which has already been billed."
 msgstr "ردیف #{0}: نمی‌توان مورد {1} را که قبلاً صورت‌حساب شده است حذف کرد."
 
-#: controllers/accounts_controller.py:3038
+#: controllers/accounts_controller.py:3129
 msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
 msgstr "ردیف #{0}: نمی توان مورد {1} را که قبلاً تحویل داده شده حذف کرد"
 
-#: controllers/accounts_controller.py:3057
+#: controllers/accounts_controller.py:3148
 msgid "Row #{0}: Cannot delete item {1} which has already been received"
 msgstr "ردیف #{0}: نمی توان مورد {1} را که قبلاً دریافت کرده است حذف کرد"
 
-#: controllers/accounts_controller.py:3044
+#: controllers/accounts_controller.py:3135
 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
 msgstr "ردیف #{0}: نمی توان مورد {1} را که سفارش کاری به آن اختصاص داده است حذف کرد."
 
-#: controllers/accounts_controller.py:3050
+#: controllers/accounts_controller.py:3141
 msgid "Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order."
 msgstr "ردیف #{0}: نمی توان مورد {1} را که به سفارش خرید مشتری اختصاص داده است حذف کرد."
 
@@ -60285,11 +61318,11 @@
 msgid "Row #{0}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor"
 msgstr "ردیف #{0}: هنگام تامین مواد خام به پیمانکار فرعی، نمی توان انبار تامین کننده را انتخاب کرد"
 
-#: controllers/accounts_controller.py:3309
+#: controllers/accounts_controller.py:3400
 msgid "Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}."
 msgstr "ردیف #{0}: اگر مبلغ بیشتر از مبلغ صورت‌حساب مورد {1} باشد، نمی‌توان نرخ را تنظیم کرد."
 
-#: manufacturing/doctype/job_card/job_card.py:864
+#: manufacturing/doctype/job_card/job_card.py:871
 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
 msgstr "ردیف #{0}: نمی توان بیش از مقدار لازم {1} برای مورد {2} در مقابل کارت شغلی {3} انتقال داد"
 
@@ -60297,31 +61330,31 @@
 msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
 msgstr "ردیف #{0}: مورد فرزند نباید یک بسته محصول باشد. لطفاً مورد {1} را حذف کرده و ذخیره کنید"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:97
+#: accounts/doctype/bank_clearance/bank_clearance.py:99
 msgid "Row #{0}: Clearance date {1} cannot be before Cheque Date {2}"
 msgstr "ردیف شماره #{0}: تاریخ پاکسازی {1} نمی تواند قبل از تاریخ بررسی {2} باشد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:286
+#: assets/doctype/asset_capitalization/asset_capitalization.py:292
 msgid "Row #{0}: Consumed Asset {1} cannot be Draft"
 msgstr "ردیف #{0}: دارایی مصرف شده {1} نمی تواند پیش نویس باشد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:288
+#: assets/doctype/asset_capitalization/asset_capitalization.py:294
 msgid "Row #{0}: Consumed Asset {1} cannot be cancelled"
 msgstr "ردیف #{0}: دارایی مصرف شده {1} قابل لغو نیست"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:273
+#: assets/doctype/asset_capitalization/asset_capitalization.py:279
 msgid "Row #{0}: Consumed Asset {1} cannot be the same as the Target Asset"
 msgstr "ردیف #{0}: دارایی مصرف شده {1} نمی تواند با دارایی هدف یکسان باشد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:282
+#: assets/doctype/asset_capitalization/asset_capitalization.py:288
 msgid "Row #{0}: Consumed Asset {1} cannot be {2}"
 msgstr "ردیف #{0}: دارایی مصرف شده {1} نمی تواند {2} باشد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:292
+#: assets/doctype/asset_capitalization/asset_capitalization.py:298
 msgid "Row #{0}: Consumed Asset {1} does not belong to company {2}"
 msgstr "ردیف #{0}: دارایی مصرف شده {1} به شرکت {2} تعلق ندارد"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:385
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:105
 msgid "Row #{0}: Cost Center {1} does not belong to company {2}"
 msgstr "ردیف #{0}: مرکز هزینه {1} به شرکت {2} تعلق ندارد"
 
@@ -60333,7 +61366,7 @@
 msgid "Row #{0}: Dates overlapping with other row"
 msgstr "ردیف #{0}: تاریخ ها با ردیف دیگر همپوشانی دارند"
 
-#: buying/doctype/purchase_order/purchase_order.py:375
+#: buying/doctype/purchase_order/purchase_order.py:376
 msgid "Row #{0}: Default BOM not found for FG Item {1}"
 msgstr "ردیف #{0}: BOM پیش‌فرض برای مورد FG {1} یافت نشد"
 
@@ -60341,35 +61374,35 @@
 msgid "Row #{0}: Duplicate entry in References {1} {2}"
 msgstr "ردیف #{0}: ورودی تکراری در منابع {1} {2}"
 
-#: selling/doctype/sales_order/sales_order.py:237
+#: selling/doctype/sales_order/sales_order.py:239
 msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
 msgstr "ردیف #{0}: تاریخ تحویل مورد انتظار نمی‌تواند قبل از تاریخ سفارش خرید باشد"
 
-#: controllers/stock_controller.py:336
+#: controllers/stock_controller.py:518
 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
 msgstr "ردیف #{0}: حساب هزینه برای مورد {1} تنظیم نشده است. {2}"
 
-#: buying/doctype/purchase_order/purchase_order.py:378
+#: buying/doctype/purchase_order/purchase_order.py:379
 msgid "Row #{0}: Finished Good Item Qty can not be zero"
 msgstr "ردیف #{0}: تعداد مورد خوب تمام شده نمی تواند صفر باشد"
 
-#: buying/doctype/purchase_order/purchase_order.py:362
+#: buying/doctype/purchase_order/purchase_order.py:363
 msgid "Row #{0}: Finished Good Item is not specified for service item {1}"
 msgstr "ردیف #{0}: مورد خوب تمام شده برای مورد خدماتی مشخص نشده است {1}"
 
-#: buying/doctype/purchase_order/purchase_order.py:369
+#: buying/doctype/purchase_order/purchase_order.py:370
 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item"
 msgstr "ردیف #{0}: مورد خوب تمام شده {1} باید یک مورد قرارداد فرعی باشد"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:394
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:395
 msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
 msgstr "ردیف #{0}: مرجع خوب تمام شده برای ضایعات {1} اجباری است."
 
-#: accounts/doctype/journal_entry/journal_entry.py:571
+#: accounts/doctype/journal_entry/journal_entry.py:594
 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
 msgstr "ردیف #{0}: برای {1}، فقط در صورتی می‌توانید سند مرجع را انتخاب کنید که حساب اعتبار شود"
 
-#: accounts/doctype/journal_entry/journal_entry.py:577
+#: accounts/doctype/journal_entry/journal_entry.py:604
 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
 msgstr "ردیف #{0}: برای {1}، فقط در صورتی می‌توانید سند مرجع را انتخاب کنید که حساب بدهکار شود"
 
@@ -60377,7 +61410,7 @@
 msgid "Row #{0}: From Date cannot be before To Date"
 msgstr "ردیف #{0}: From Date نمی تواند قبل از To Date باشد"
 
-#: public/js/utils/barcode_scanner.js:489
+#: public/js/utils/barcode_scanner.js:394
 msgid "Row #{0}: Item added"
 msgstr "ردیف #{0}: مورد اضافه شد"
 
@@ -60385,23 +61418,23 @@
 msgid "Row #{0}: Item {1} does not exist"
 msgstr "ردیف #{0}: مورد {1} وجود ندارد"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:949
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:951
 msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
 msgstr "ردیف #{0}: مورد {1} انتخاب شده است، لطفاً موجودی را از فهرست انتخاب رزرو کنید."
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:491
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:545
 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it."
 msgstr "ردیف #{0}: مورد {1} یک مورد سریال/دسته‌ای نیست. نمی تواند یک شماره سریال / شماره دسته ای در مقابل آن داشته باشد."
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:303
+#: assets/doctype/asset_capitalization/asset_capitalization.py:309
 msgid "Row #{0}: Item {1} is not a service item"
 msgstr "ردیف #{0}: مورد {1} یک مورد خدماتی نیست"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:261
+#: assets/doctype/asset_capitalization/asset_capitalization.py:267
 msgid "Row #{0}: Item {1} is not a stock item"
 msgstr "ردیف #{0}: مورد {1} یک کالای موجودی نیست"
 
-#: accounts/doctype/payment_entry/payment_entry.py:657
+#: accounts/doctype/payment_entry/payment_entry.py:666
 msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
 msgstr "ردیف #{0}: ورودی مجله {1} دارای حساب {2} نیست یا قبلاً با کوپن دیگری مطابقت دارد"
 
@@ -60409,48 +61442,48 @@
 msgid "Row #{0}: Maximum Net Rate cannot be greater than Minimum Net Rate"
 msgstr "ردیف #{0}: حداکثر نرخ خالص نمی تواند بیشتر از حداقل نرخ خالص باشد"
 
-#: selling/doctype/sales_order/sales_order.py:535
+#: selling/doctype/sales_order/sales_order.py:541
 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
 msgstr "ردیف #{0}: به دلیل وجود سفارش خرید، مجاز به تغییر تامین کننده نیست"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1032
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1034
 msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
 msgstr "ردیف #{0}: فقط {1} برای رزرو مورد {2} موجود است"
 
-#: stock/doctype/stock_entry/stock_entry.py:687
+#: stock/doctype/stock_entry/stock_entry.py:642
 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 "ردیف #{0}: عملیات {1} برای تعداد {2} کالای نهایی در سفارش کار {3} تکمیل نشده است. لطفاً وضعیت عملیات را از طریق کارت شغلی {4} به روز کنید."
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:93
+#: accounts/doctype/bank_clearance/bank_clearance.py:95
 msgid "Row #{0}: Payment document is required to complete the transaction"
 msgstr "ردیف #{0}: برای تکمیل تراکنش، سند پرداخت لازم است"
 
-#: manufacturing/doctype/production_plan/production_plan.py:892
+#: manufacturing/doctype/production_plan/production_plan.py:901
 msgid "Row #{0}: Please select Item Code in Assembly Items"
 msgstr "ردیف #{0}: لطفاً کد مورد را در موارد اسمبلی انتخاب کنید"
 
-#: manufacturing/doctype/production_plan/production_plan.py:895
+#: manufacturing/doctype/production_plan/production_plan.py:904
 msgid "Row #{0}: Please select the BOM No in Assembly Items"
 msgstr "ردیف #{0}: لطفاً شماره BOM را در موارد اسمبلی انتخاب کنید"
 
-#: manufacturing/doctype/production_plan/production_plan.py:889
-msgid "Row #{0}: Please select the FG Warehouse in Assembly Items"
-msgstr "ردیف #{0}: لطفاً FG Warehouse را در اقلام اسمبلی انتخاب کنید"
+#: manufacturing/doctype/production_plan/production_plan.py:898
+msgid "Row #{0}: Please select the Sub Assembly Warehouse"
+msgstr ""
 
 #: stock/doctype/item/item.py:487
 msgid "Row #{0}: Please set reorder quantity"
 msgstr "ردیف #{0}: لطفاً مقدار سفارش مجدد را تنظیم کنید"
 
-#: controllers/accounts_controller.py:367
+#: controllers/accounts_controller.py:411
 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
 msgstr "ردیف #{0}: لطفاً حساب درآمد/هزینه معوق را در ردیف آیتم یا حساب پیش‌فرض در اصلی شرکت به‌روزرسانی کنید."
 
-#: public/js/utils/barcode_scanner.js:487
+#: public/js/utils/barcode_scanner.js:392
 msgid "Row #{0}: Qty increased by {1}"
 msgstr "ردیف #{0}: تعداد با {1} افزایش یافت"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:264
-#: assets/doctype/asset_capitalization/asset_capitalization.py:306
+#: assets/doctype/asset_capitalization/asset_capitalization.py:270
+#: assets/doctype/asset_capitalization/asset_capitalization.py:312
 msgid "Row #{0}: Qty must be a positive number"
 msgstr "ردیف #{0}: تعداد باید یک عدد مثبت باشد"
 
@@ -60458,12 +61491,12 @@
 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 "ردیف #{0}: تعداد باید کمتر یا برابر با تعداد موجود برای رزرو (تعداد واقعی - تعداد رزرو شده) {1} برای Iem {2} در مقابل دسته {3} در انبار {4} باشد."
 
-#: controllers/accounts_controller.py:1018
-#: controllers/accounts_controller.py:3166
+#: controllers/accounts_controller.py:1082
+#: controllers/accounts_controller.py:3257
 msgid "Row #{0}: Quantity for Item {1} cannot be zero."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1017
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1019
 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
 msgstr "ردیف #{0}: مقدار قابل رزرو برای مورد {1} باید بیشتر از 0 باشد."
 
@@ -60475,11 +61508,11 @@
 msgid "Row #{0}: Received Qty must be equal to Accepted + Rejected Qty for Item {1}"
 msgstr "ردیف #{0}: تعداد دریافتی باید برابر با تعداد پذیرفته شده + رد شده برای مورد {1} باشد."
 
-#: accounts/doctype/payment_entry/payment_entry.js:1016
+#: accounts/doctype/payment_entry/payment_entry.js:1234
 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry"
 msgstr "ردیف #{0}: نوع سند مرجع باید یکی از سفارش خرید، فاکتور خرید یا ورودی روزنامه باشد."
 
-#: accounts/doctype/payment_entry/payment_entry.js:1008
+#: accounts/doctype/payment_entry/payment_entry.js:1220
 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning"
 msgstr "ردیف #{0}: نوع سند مرجع باید یکی از سفارشات فروش، فاکتور فروش، ورودی مجله یا Dunning باشد."
 
@@ -60487,7 +61520,7 @@
 msgid "Row #{0}: Rejected Qty can not be entered in Purchase Return"
 msgstr "ردیف #{0}: تعداد رد شده را نمی توان در اظهارنامه خرید وارد کرد"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:387
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:388
 msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}."
 msgstr "سطر #{0}: تعداد رد شده را نمی توان برای ضایعات {1} تنظیم کرد."
 
@@ -60495,22 +61528,22 @@
 msgid "Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}"
 msgstr "ردیف #{0}: انبار رد شده برای مورد رد شده اجباری است {1}"
 
-#: controllers/buying_controller.py:849
+#: controllers/buying_controller.py:875
 msgid "Row #{0}: Reqd by Date cannot be before Transaction Date"
 msgstr "ردیف #{0}: Reqd بر اساس تاریخ نمی تواند قبل از تاریخ تراکنش باشد"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:382
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:383
 msgid "Row #{0}: Scrap Item Qty cannot be zero"
 msgstr "ردیف #{0}: تعداد مورد ضایعات نمی تواند صفر باشد"
 
-#: controllers/selling_controller.py:212
+#: controllers/selling_controller.py:213
 msgid "Row #{0}: Selling rate for item {1} is lower than its {2}.\n"
 "\t\t\t\t\tSelling {3} should be atleast {4}.<br><br>Alternatively,\n"
 "\t\t\t\t\tyou can disable selling price validation in {5} to bypass\n"
 "\t\t\t\t\tthis validation."
 msgstr ""
 
-#: controllers/stock_controller.py:97
+#: controllers/stock_controller.py:129
 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
 msgstr "ردیف #{0}: شماره سریال {1} به دسته {2} تعلق ندارد"
 
@@ -60522,27 +61555,35 @@
 msgid "Row #{0}: Serial No {1} is already selected."
 msgstr "ردیف #{0}: شماره سریال {1} قبلاً انتخاب شده است."
 
-#: controllers/accounts_controller.py:395
+#: controllers/accounts_controller.py:439
 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date"
 msgstr "ردیف #{0}: تاریخ پایان سرویس نمی‌تواند قبل از تاریخ ارسال فاکتور باشد"
 
-#: controllers/accounts_controller.py:391
+#: controllers/accounts_controller.py:435
 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date"
 msgstr "ردیف #{0}: تاریخ شروع سرویس نمی تواند بیشتر از تاریخ پایان سرویس باشد"
 
-#: controllers/accounts_controller.py:387
+#: controllers/accounts_controller.py:431
 msgid "Row #{0}: Service Start and End Date is required for deferred accounting"
 msgstr "ردیف #{0}: تاریخ شروع و پایان سرویس برای حسابداری معوق الزامی است"
 
-#: selling/doctype/sales_order/sales_order.py:391
+#: selling/doctype/sales_order/sales_order.py:394
 msgid "Row #{0}: Set Supplier for item {1}"
 msgstr "ردیف #{0}: تنظیم تامین کننده برای مورد {1}"
 
+#: manufacturing/doctype/workstation/workstation.py:80
+msgid "Row #{0}: Start Time and End Time are required"
+msgstr ""
+
+#: manufacturing/doctype/workstation/workstation.py:83
+msgid "Row #{0}: Start Time must be before End Time"
+msgstr ""
+
 #: stock/doctype/quality_inspection/quality_inspection.py:120
 msgid "Row #{0}: Status is mandatory"
 msgstr "ردیف #{0}: وضعیت اجباری است"
 
-#: accounts/doctype/journal_entry/journal_entry.py:381
+#: accounts/doctype/journal_entry/journal_entry.py:397
 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
 msgstr "ردیف #{0}: وضعیت باید {1} برای تخفیف فاکتور {2} باشد"
 
@@ -60550,19 +61591,19 @@
 msgid "Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
 msgstr "ردیف #{0}: موجودی را نمی توان برای آیتم {1} در مقابل دسته غیرفعال شده {2} رزرو کرد."
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:962
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:964
 msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
 msgstr "ردیف #{0}: موجودی را نمی توان برای یک کالای غیر موجودی رزرو کرد {1}"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:975
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:977
 msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
 msgstr "ردیف #{0}: موجودی در انبار گروهی {1} قابل رزرو نیست."
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:989
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:991
 msgid "Row #{0}: Stock is already reserved for the Item {1}."
 msgstr "ردیف #{0}: موجودی قبلاً برای مورد {1} رزرو شده است."
 
-#: stock/doctype/delivery_note/delivery_note.py:605
+#: stock/doctype/delivery_note/delivery_note.py:666
 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
 msgstr "ردیف #{0}: موجودی برای کالای {1} در انبار {2} رزرو شده است."
 
@@ -60570,19 +61611,19 @@
 msgid "Row #{0}: Stock not available to reserve for Item {1} against Batch {2} in Warehouse {3}."
 msgstr "ردیف #{0}: موجودی برای رزرو مورد {1} در مقابل دسته {2} در انبار {3} موجود نیست."
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1003
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1005
 msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
 msgstr "ردیف #{0}: موجودی برای رزرو مورد {1} در انبار {2} موجود نیست."
 
-#: controllers/stock_controller.py:110
+#: controllers/stock_controller.py:142
 msgid "Row #{0}: The batch {1} has already expired."
 msgstr "ردیف #{0}: دسته {1} قبلاً منقضی شده است."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1687
-msgid "Row #{0}: The following Serial Nos are not present in Delivery Note {1}:"
-msgstr "ردیف #{0}: شماره های سریال زیر در یادداشت تحویل {1} وجود ندارد:"
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:150
+msgid "Row #{0}: The following serial numbers are not present in Delivery Note {1}:"
+msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.py:116
+#: manufacturing/doctype/workstation/workstation.py:137
 msgid "Row #{0}: Timings conflicts with row {1}"
 msgstr "ردیف #{0}: زمان بندی با ردیف {1} در تضاد است"
 
@@ -60590,15 +61631,11 @@
 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 "ردیف #{0}: نمی‌توانید از بعد موجودی «{1}» در تطبیق موجودی برای تغییر مقدار یا نرخ ارزیابی استفاده کنید. تطبیق موجودی با ابعاد موجودی صرفاً برای انجام ورودی های افتتاحیه در نظر گرفته شده است."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1402
+#: accounts/doctype/sales_invoice/sales_invoice.py:1413
 msgid "Row #{0}: You must select an Asset for Item {1}."
 msgstr "ردیف #{0}: باید یک دارایی برای مورد {1} انتخاب کنید."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1696
-msgid "Row #{0}: {1} Serial numbers required for Item {2}. You have provided {3}."
-msgstr "ردیف #{0}: {1} شماره های سریال مورد نیاز برای مورد {2}. شما {3} را ارائه کرده اید."
-
-#: controllers/buying_controller.py:483 public/js/controllers/buying.js:208
+#: controllers/buying_controller.py:483 public/js/controllers/buying.js:203
 msgid "Row #{0}: {1} can not be negative for item {2}"
 msgstr "ردیف #{0}: {1} نمی تواند برای مورد {2} منفی باشد"
 
@@ -60614,6 +61651,10 @@
 msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account."
 msgstr "ردیف #{0}: {1} از {2} باید {3} باشد. لطفاً {1} را به روز کنید یا حساب دیگری را انتخاب کنید."
 
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:161
+msgid "Row #{0}: {1} serial numbers are required for Item {2}. You have provided {3} serial numbers."
+msgstr ""
+
 #: buying/utils.py:106
 msgid "Row #{1}: Warehouse is mandatory for stock Item {0}"
 msgstr "ردیف #{1}: انبار برای کالای موجودی {0} اجباری است"
@@ -60622,11 +61663,11 @@
 msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
 msgstr "ردیف #{}: واحد پول {} - {} با واحد پول شرکت مطابقت ندارد."
 
-#: assets/doctype/asset/asset.py:275
+#: assets/doctype/asset/asset.py:277
 msgid "Row #{}: Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr "ردیف #{}: تاریخ ارسال استهلاک نباید برابر با تاریخ موجود برای استفاده باشد."
 
-#: assets/doctype/asset/asset.py:308
+#: assets/doctype/asset/asset.py:310
 msgid "Row #{}: Finance Book should not be empty since you're using multiple."
 msgstr "ردیف #{}: کتاب مالی نباید خالی باشد زیرا از چندگانه استفاده می کنید."
 
@@ -60654,7 +61695,7 @@
 msgid "Row #{}: Please assign task to a member."
 msgstr "ردیف #{}: لطفاً کار را به یک عضو اختصاص دهید."
 
-#: assets/doctype/asset/asset.py:300
+#: assets/doctype/asset/asset.py:302
 msgid "Row #{}: Please use a different Finance Book."
 msgstr "ردیف #{}: لطفاً از کتاب مالی دیگری استفاده کنید."
 
@@ -60670,7 +61711,7 @@
 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:83
+#: stock/doctype/pick_list/pick_list.py:87
 msgid "Row #{}: item {} has been picked already."
 msgstr "ردیف #{}: مورد {} قبلاً انتخاب شده است."
 
@@ -60682,39 +61723,47 @@
 msgid "Row #{}: {} {} does not exist."
 msgstr "ردیف #{}: {} {} وجود ندارد."
 
-#: stock/doctype/item/item.py:1364
+#: stock/doctype/item/item.py:1365
 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
 msgstr "ردیف #{}: {} {} به شرکت {} تعلق ندارد. لطفاً {} معتبر را انتخاب کنید."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:433
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:437
 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
 msgstr "ردیف شماره {0}: انبار مورد نیاز است. لطفاً یک انبار پیش فرض برای مورد {1} و شرکت {2} تنظیم کنید"
 
-#: manufacturing/doctype/job_card/job_card.py:599
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Row Number"
+msgstr "شماره ردیف"
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:376
+msgid "Row {0}"
+msgstr "ردیف {0}"
+
+#: manufacturing/doctype/job_card/job_card.py:606
 msgid "Row {0} : Operation is required against the raw material item {1}"
 msgstr "ردیف {0} : عملیات در برابر ماده خام {1} مورد نیاز است"
 
-#: stock/doctype/pick_list/pick_list.py:113
+#: stock/doctype/pick_list/pick_list.py:117
 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required."
 msgstr "مقدار انتخابی ردیف {0} کمتر از مقدار مورد نیاز است، {1} {2} اضافی مورد نیاز است."
 
-#: stock/doctype/stock_entry/stock_entry.py:1135
+#: stock/doctype/stock_entry/stock_entry.py:1144
 msgid "Row {0}# Item {1} cannot be transferred more than {2} against {3} {4}"
 msgstr "ردیف {0}# مورد {1} را نمی توان بیش از {2} در برابر {3} {4} منتقل کرد"
 
-#: stock/doctype/stock_entry/stock_entry.py:1159
+#: stock/doctype/stock_entry/stock_entry.py:1168
 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
 msgstr "ردیف {0}# مورد {1} در جدول «مواد خام عرضه شده» در {2} {3} یافت نشد"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:190
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:191
 msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
 msgstr "ردیف {0}: تعداد پذیرفته شده و تعداد رد شده نمی توانند همزمان صفر باشند."
 
-#: accounts/doctype/journal_entry/journal_entry.py:509
+#: accounts/doctype/journal_entry/journal_entry.py:525
 msgid "Row {0}: Account {1} and Party Type {2} have different account types"
 msgstr "ردیف {0}: حساب {1} و نوع طرف {2} انواع مختلف حساب دارند"
 
-#: controllers/accounts_controller.py:2536
+#: controllers/accounts_controller.py:2621
 msgid "Row {0}: Account {1} is a Group Account"
 msgstr "ردیف {0}: حساب {1} یک حساب گروهی است"
 
@@ -60722,43 +61771,47 @@
 msgid "Row {0}: Activity Type is mandatory."
 msgstr "ردیف {0}: نوع فعالیت اجباری است."
 
-#: accounts/doctype/journal_entry/journal_entry.py:561
+#: accounts/doctype/journal_entry/journal_entry.py:577
 msgid "Row {0}: Advance against Customer must be credit"
 msgstr "ردیف {0}: پیش پرداخت در برابر مشتری باید اعتبار باشد"
 
-#: accounts/doctype/journal_entry/journal_entry.py:563
+#: accounts/doctype/journal_entry/journal_entry.py:579
 msgid "Row {0}: Advance against Supplier must be debit"
 msgstr "ردیف {0}: پیش پرداخت در مقابل تامین کننده باید بدهکار باشد"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:671
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:681
 msgid "Row {0}: Allocated amount {1} must be less than or equal to invoice outstanding amount {2}"
 msgstr "ردیف {0}: مبلغ تخصیص یافته {1} باید کمتر یا برابر با مبلغ معوق فاکتور {2} باشد."
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:663
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:673
 msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}"
 msgstr "ردیف {0}: مبلغ تخصیص یافته {1} باید کمتر یا مساوی با مبلغ پرداخت باقی مانده باشد {2}"
 
-#: stock/doctype/material_request/material_request.py:763
+#: stock/doctype/stock_entry/stock_entry.py:884
+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
 msgid "Row {0}: Bill of Materials not found for the Item {1}"
 msgstr "ردیف {0}: لایحه مواد برای مورد {1} یافت نشد"
 
-#: accounts/doctype/journal_entry/journal_entry.py:796
+#: accounts/doctype/journal_entry/journal_entry.py:823
 msgid "Row {0}: Both Debit and Credit values cannot be zero"
 msgstr "ردیف {0}: هر دو مقدار بدهی و اعتبار نمی توانند صفر باشند"
 
-#: controllers/buying_controller.py:438 controllers/selling_controller.py:204
+#: controllers/buying_controller.py:438 controllers/selling_controller.py:205
 msgid "Row {0}: Conversion Factor is mandatory"
 msgstr "ردیف {0}: ضریب تبدیل اجباری است"
 
-#: controllers/accounts_controller.py:2549
+#: controllers/accounts_controller.py:2634
 msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
 msgstr "ردیف {0}: مرکز هزینه {1} به شرکت {2} تعلق ندارد"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:116
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:137
 msgid "Row {0}: Cost center is required for an item {1}"
 msgstr "ردیف {0}: مرکز هزینه برای یک مورد {1} لازم است"
 
-#: accounts/doctype/journal_entry/journal_entry.py:647
+#: accounts/doctype/journal_entry/journal_entry.py:674
 msgid "Row {0}: Credit entry can not be linked with a {1}"
 msgstr "ردیف {0}: ورودی اعتبار را نمی توان با {1} پیوند داد"
 
@@ -60766,19 +61819,19 @@
 msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
 msgstr "ردیف {0}: واحد پول BOM #{1} باید برابر با ارز انتخابی {2} باشد."
 
-#: accounts/doctype/journal_entry/journal_entry.py:642
+#: accounts/doctype/journal_entry/journal_entry.py:669
 msgid "Row {0}: Debit entry can not be linked with a {1}"
 msgstr "ردیف {0}: ورودی بدهی را نمی توان با یک {1} پیوند داد"
 
-#: controllers/selling_controller.py:679
+#: controllers/selling_controller.py:703
 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
 msgstr "ردیف {0}: انبار تحویل ({1}) و انبار مشتری ({2}) نمی توانند یکسان باشند"
 
-#: assets/doctype/asset/asset.py:417
+#: assets/doctype/asset/asset.py:419
 msgid "Row {0}: Depreciation Start Date is required"
 msgstr "ردیف {0}: تاریخ شروع استهلاک الزامی است"
 
-#: controllers/accounts_controller.py:2209
+#: controllers/accounts_controller.py:2301
 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
 msgstr "ردیف {0}: تاریخ سررسید در جدول شرایط پرداخت نمی‌تواند قبل از تاریخ ارسال باشد"
 
@@ -60786,28 +61839,28 @@
 msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
 msgstr "ردیف {0}: مرجع مورد یادداشت تحویل یا کالای بسته بندی شده اجباری است."
 
-#: controllers/buying_controller.py:742
+#: controllers/buying_controller.py:767
 msgid "Row {0}: Enter location for the asset item {1}"
 msgstr "ردیف {0}: مکان مورد دارایی را وارد کنید {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:886
-#: controllers/taxes_and_totals.py:1115
+#: accounts/doctype/journal_entry/journal_entry.py:913
+#: controllers/taxes_and_totals.py:1116
 msgid "Row {0}: Exchange Rate is mandatory"
 msgstr "ردیف {0}: نرخ ارز اجباری است"
 
-#: assets/doctype/asset/asset.py:408
+#: assets/doctype/asset/asset.py:410
 msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
 msgstr "ردیف {0}: ارزش مورد انتظار پس از عمر مفید باید کمتر از مقدار ناخالص خرید باشد"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:523
 msgid "Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}."
 msgstr "ردیف {0}: سر هزینه به {1} تغییر کرد زیرا هیچ رسید خریدی در برابر مورد {2} ایجاد نشد."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:482
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:486
 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 "ردیف {0}: سر هزینه به {1} تغییر کرد زیرا حساب {2} به انبار {3} مرتبط نیست یا حساب موجودی پیش‌فرض نیست"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:505
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:509
 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
 msgstr "ردیف {0}: سر هزینه به {1} تغییر کرد زیرا هزینه در قبض خرید {2} در مقابل این حساب رزرو شده است."
 
@@ -60824,7 +61877,7 @@
 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
 msgstr "ردیف {0}: از زمان و تا زمان {1} با {2} همپوشانی دارد"
 
-#: controllers/stock_controller.py:730
+#: controllers/stock_controller.py:913
 msgid "Row {0}: From Warehouse is mandatory for internal transfers"
 msgstr "ردیف {0}: از انبار برای نقل و انتقالات داخلی اجباری است"
 
@@ -60836,15 +61889,15 @@
 msgid "Row {0}: Hours value must be greater than zero."
 msgstr "ردیف {0}: مقدار ساعت باید بزرگتر از صفر باشد."
 
-#: accounts/doctype/journal_entry/journal_entry.py:665
+#: accounts/doctype/journal_entry/journal_entry.py:692
 msgid "Row {0}: Invalid reference {1}"
 msgstr "ردیف {0}: مرجع نامعتبر {1}"
 
-#: controllers/taxes_and_totals.py:128
+#: controllers/taxes_and_totals.py:129
 msgid "Row {0}: Item Tax template updated as per validity and rate applied"
 msgstr "ردیف {0}: الگوی مالیات مورد بر اساس اعتبار و نرخ اعمال شده به روز شد"
 
-#: controllers/buying_controller.py:400 controllers/selling_controller.py:479
+#: controllers/buying_controller.py:400 controllers/selling_controller.py:484
 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer"
 msgstr "ردیف {0}: نرخ اقلام براساس نرخ ارزیابی به‌روزرسانی شده است، زیرا یک انتقال داخلی موجودی است"
 
@@ -60856,7 +61909,7 @@
 msgid "Row {0}: Item {1} must be a subcontracted item."
 msgstr "ردیف {0}: مورد {1} باید یک مورد قرارداد فرعی باشد."
 
-#: stock/doctype/delivery_note/delivery_note.py:661
+#: stock/doctype/delivery_note/delivery_note.py:722
 msgid "Row {0}: Packed Qty must be equal to {1} Qty."
 msgstr "ردیف {0}: تعداد بسته بندی شده باید برابر با {1} تعداد باشد."
 
@@ -60864,11 +61917,11 @@
 msgid "Row {0}: Packing Slip is already created for Item {1}."
 msgstr "ردیف {0}: برگه بسته بندی قبلاً برای مورد {1} ایجاد شده است."
 
-#: accounts/doctype/journal_entry/journal_entry.py:687
+#: accounts/doctype/journal_entry/journal_entry.py:714
 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
 msgstr "ردیف {0}: طرف / حساب با {1} / {2} در {3} {4} مطابقت ندارد"
 
-#: accounts/doctype/journal_entry/journal_entry.py:500
+#: accounts/doctype/journal_entry/journal_entry.py:516
 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}"
 msgstr "ردیف {0}: نوع طرف و طرف برای حساب دریافتنی / پرداختنی {1} لازم است"
 
@@ -60876,11 +61929,11 @@
 msgid "Row {0}: Payment Term is mandatory"
 msgstr "ردیف {0}: مدت پرداخت اجباری است"
 
-#: accounts/doctype/journal_entry/journal_entry.py:554
+#: accounts/doctype/journal_entry/journal_entry.py:570
 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
 msgstr "ردیف {0}: پرداخت در برابر سفارش فروش/خرید باید همیشه به عنوان پیش پرداخت علامت گذاری شود"
 
-#: accounts/doctype/journal_entry/journal_entry.py:547
+#: accounts/doctype/journal_entry/journal_entry.py:563
 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
 msgstr "ردیف {0}: اگر این یک ورودی قبلی است، لطفاً «آیا پیشرفته است» را در مقابل حساب {1} علامت بزنید."
 
@@ -60916,7 +61969,7 @@
 msgid "Row {0}: Project must be same as the one set in the Timesheet: {1}."
 msgstr "ردیف {0}: پروژه باید مانند آنچه در صفحه زمان تنظیم شده است: {1} باشد."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:114
 msgid "Row {0}: Purchase Invoice {1} has no stock impact."
 msgstr "ردیف {0}: فاکتور خرید {1} تأثیری بر موجودی ندارد."
 
@@ -60924,7 +61977,7 @@
 msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}."
 msgstr "ردیف {0}: تعداد نمی‌تواند بیشتر از {1} برای مورد {2} باشد."
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Row {0}: Qty in Stock UOM can not be zero."
 msgstr "ردیف {0}: تعداد موجودی UOM در انبار نمی تواند صفر باشد."
 
@@ -60932,7 +61985,7 @@
 msgid "Row {0}: Qty must be greater than 0."
 msgstr "ردیف {0}: تعداد باید بیشتر از 0 باشد."
 
-#: stock/doctype/stock_entry/stock_entry.py:762
+#: stock/doctype/stock_entry/stock_entry.py:717
 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})"
 msgstr "ردیف {0}: مقدار برای {4} در انبار {1} در زمان ارسال ورودی موجود نیست ({2} {3})"
 
@@ -60940,15 +61993,15 @@
 msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed"
 msgstr "ردیف {0}: Shift را نمی توان تغییر داد زیرا استهلاک قبلاً پردازش شده است"
 
-#: stock/doctype/stock_entry/stock_entry.py:1170
+#: stock/doctype/stock_entry/stock_entry.py:1179
 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
 msgstr "ردیف {0}: مورد قرارداد فرعی برای مواد خام اجباری است {1}"
 
-#: controllers/stock_controller.py:721
+#: controllers/stock_controller.py:904
 msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
 msgstr "ردیف {0}: انبار هدف برای نقل و انتقالات داخلی اجباری است"
 
-#: stock/doctype/stock_entry/stock_entry.py:450
+#: stock/doctype/stock_entry/stock_entry.py:405
 msgid "Row {0}: The item {1}, quantity must be positive number"
 msgstr "ردیف {0}: مورد {1}، مقدار باید عدد مثبت باشد"
 
@@ -60956,15 +62009,15 @@
 msgid "Row {0}: To set {1} periodicity, difference between from and to date must be greater than or equal to {2}"
 msgstr "ردیف {0}: برای تنظیم تناوب {1}، تفاوت بین تاریخ و تاریخ باید بزرگتر یا مساوی با {2} باشد."
 
-#: assets/doctype/asset/asset.py:441
+#: assets/doctype/asset/asset.py:443
 msgid "Row {0}: Total Number of Depreciations cannot be less than or equal to Number of Depreciations Booked"
 msgstr "ردیف {0}: تعداد کل استهلاک ها نمی تواند کمتر یا مساوی تعداد استهلاک های رزرو شده باشد."
 
-#: stock/doctype/stock_entry/stock_entry.py:401
+#: stock/doctype/stock_entry/stock_entry.py:356
 msgid "Row {0}: UOM Conversion Factor is mandatory"
 msgstr "ردیف {0}: ضریب تبدیل UOM اجباری است"
 
-#: controllers/accounts_controller.py:786
+#: controllers/accounts_controller.py:838
 msgid "Row {0}: user has not applied the rule {1} on the item {2}"
 msgstr "ردیف {0}: کاربر قانون {1} را در مورد {2} اعمال نکرده است"
 
@@ -60976,15 +62029,19 @@
 msgid "Row {0}: {1} must be greater than 0"
 msgstr "ردیف {0}: {1} باید بزرگتر از 0 باشد"
 
-#: controllers/accounts_controller.py:511
+#: controllers/accounts_controller.py:555
 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
 msgstr "ردیف {0}: {1} {2} نمی‌تواند مانند {3} (حساب طرف) {4}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:701
+#: accounts/doctype/journal_entry/journal_entry.py:728
 msgid "Row {0}: {1} {2} does not match with {3}"
 msgstr "ردیف {0}: {1} {2} با {3} مطابقت ندارد"
 
-#: controllers/accounts_controller.py:2528
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:87
+msgid "Row {0}: {2} Item {1} does not exist in {2} {3}"
+msgstr ""
+
+#: controllers/accounts_controller.py:2613
 msgid "Row {0}: {3} Account {1} does not belong to Company {2}"
 msgstr "ردیف {0}: {3} حساب {1} به شرکت {2} تعلق ندارد"
 
@@ -60992,7 +62049,7 @@
 msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}."
 msgstr "ردیف {1}: مقدار ({0}) نمی تواند کسری باشد. برای اجازه دادن به این کار، \"{2}\" را در UOM {3} غیرفعال کنید."
 
-#: controllers/buying_controller.py:726
+#: controllers/buying_controller.py:751
 msgid "Row {}: Asset Naming Series is mandatory for the auto creation for item {}"
 msgstr "ردیف {}: سری نامگذاری دارایی برای ایجاد خودکار مورد {} الزامی است"
 
@@ -61004,11 +62061,11 @@
 msgid "Row({0}): {1} is already discounted in {2}"
 msgstr "ردیف ({0}): {1} قبلاً در {2} تخفیف داده شده است"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:193
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:200
 msgid "Rows Added in {0}"
 msgstr "ردیف های اضافه شده در {0}"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:194
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:201
 msgid "Rows Removed in {0}"
 msgstr "ردیف‌ها در {0} حذف شدند"
 
@@ -61019,15 +62076,15 @@
 msgid "Rows with Same Account heads will be merged on Ledger"
 msgstr "ردیف هایی با سرهای حساب یکسان در لجر ادغام می شوند"
 
-#: controllers/accounts_controller.py:2218
+#: controllers/accounts_controller.py:2310
 msgid "Rows with duplicate due dates in other rows were found: {0}"
 msgstr "ردیف‌هایی با تاریخ سررسید تکراری در ردیف‌های دیگر یافت شد: {0}"
 
-#: accounts/doctype/journal_entry/journal_entry.js:61
+#: accounts/doctype/journal_entry/journal_entry.js:115
 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually."
 msgstr "ردیف‌ها: {0} دارای \"ورودی پرداخت\" به عنوان reference_type هستند. این نباید به صورت دستی تنظیم شود."
 
-#: controllers/accounts_controller.py:211
+#: controllers/accounts_controller.py:221
 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry."
 msgstr "ردیف‌ها: {0} در بخش {1} نامعتبر است. نام مرجع باید به یک ورودی پرداخت معتبر یا ورودی مجله اشاره کند."
 
@@ -61055,6 +62112,12 @@
 msgid "Rule Description"
 msgstr "شرح قانون"
 
+#. Description of the 'Job Capacity' (Int) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Run parallel job cards in a workstation"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Process Payment
 #. Reconciliation'
 #: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
@@ -61069,6 +62132,13 @@
 msgid "Running"
 msgstr "در حال دویدن"
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Running"
+msgstr "در حال دویدن"
+
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:28
 msgid "S.O. No."
 msgstr "بنابراین نه."
@@ -61133,7 +62203,7 @@
 msgid "SLA Paused On"
 msgstr "SLA متوقف شد"
 
-#: public/js/utils.js:1015
+#: public/js/utils.js:1098
 msgid "SLA is on hold since {0}"
 msgstr "SLA از {0} در حالت تعلیق است"
 
@@ -61172,6 +62242,10 @@
 msgid "SO Qty"
 msgstr ""
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:107
+msgid "SO Total Qty"
+msgstr ""
+
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:16
 msgid "STATEMENTS OF ACCOUNTS"
 msgstr "صورتحسابها"
@@ -61266,7 +62340,7 @@
 #: 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:329 setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:328 setup/doctype/company/company.py:491
 #: setup/doctype/company/company_dashboard.py:9
 #: setup/doctype/sales_person/sales_person_dashboard.py:12
 #: setup/setup_wizard/operations/install_fixtures.py:250
@@ -61304,7 +62378,7 @@
 msgid "Sales"
 msgstr "فروش"
 
-#: setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:491
 msgid "Sales Account"
 msgstr "حساب فروش"
 
@@ -61338,7 +62412,7 @@
 #. Label of a Link in the CRM Workspace
 #. Label of a Link in the Selling Workspace
 #: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:7
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: selling/page/sales_funnel/sales_funnel.js:46
 #: selling/workspace/selling/selling.json
 msgid "Sales Funnel"
 msgstr "قیف فروش"
@@ -61349,11 +62423,11 @@
 #: accounts/report/gross_profit/gross_profit.js:30
 #: accounts/report/gross_profit/gross_profit.py:199
 #: accounts/report/gross_profit/gross_profit.py:206
-#: selling/doctype/quotation/quotation_list.js:20
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order_list.js:53
-#: stock/doctype/delivery_note/delivery_note.js:222
-#: stock/doctype/delivery_note/delivery_note_list.js:61
+#: selling/doctype/quotation/quotation_list.js:19
+#: selling/doctype/sales_order/sales_order.js:633
+#: selling/doctype/sales_order/sales_order_list.js:66
+#: stock/doctype/delivery_note/delivery_note.js:266
+#: stock/doctype/delivery_note/delivery_note_list.js:70
 msgid "Sales Invoice"
 msgstr "فاکتور فروش"
 
@@ -61503,11 +62577,11 @@
 msgid "Sales Invoice Trends"
 msgstr "روند فاکتور فروش"
 
-#: stock/doctype/delivery_note/delivery_note.py:679
+#: stock/doctype/delivery_note/delivery_note.py:740
 msgid "Sales Invoice {0} has already been submitted"
 msgstr "فاکتور فروش {0} قبلا ارسال شده است"
 
-#: selling/doctype/sales_order/sales_order.py:472
+#: selling/doctype/sales_order/sales_order.py:475
 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order"
 msgstr "فاکتور فروش {0} باید قبل از لغو این سفارش فروش حذف شود"
 
@@ -61541,6 +62615,7 @@
 #: setup/doctype/sales_person/sales_person.json
 #: setup/doctype/territory/territory.json stock/doctype/bin/bin.json
 #: stock/doctype/packing_slip/packing_slip.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 msgid "Sales Manager"
 msgstr "مدیر فروش"
 
@@ -61570,36 +62645,36 @@
 msgid "Sales Monthly History"
 msgstr "تاریخچه ماهانه فروش"
 
-#: selling/page/sales_funnel/sales_funnel.js:129
+#: selling/page/sales_funnel/sales_funnel.js:144
 msgid "Sales Opportunities by Source"
 msgstr ""
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: accounts/doctype/sales_invoice/sales_invoice.js:236
+#: 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:421
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:64
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:113
-#: manufacturing/doctype/blanket_order/blanket_order.js:23
+#: controllers/selling_controller.py:422
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:65
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:122
+#: manufacturing/doctype/blanket_order/blanket_order.js:24
 #: manufacturing/doctype/work_order/work_order_calendar.js:32
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:127
 #: manufacturing/report/work_order_summary/work_order_summary.py:217
-#: selling/doctype/quotation/quotation.js:117
+#: selling/doctype/quotation/quotation.js:125
 #: selling/doctype/quotation/quotation_dashboard.py:11
-#: selling/doctype/quotation/quotation_list.js:16
+#: selling/doctype/quotation/quotation_list.js:15
 #: selling/doctype/sales_order/sales_order.json
 #: selling/onboarding_step/sales_order/sales_order.json
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:59
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13
-#: selling/report/sales_order_analysis/sales_order_analysis.js:34
+#: selling/report/sales_order_analysis/sales_order_analysis.js:33
 #: selling/report/sales_order_analysis/sales_order_analysis.py:222
-#: stock/doctype/delivery_note/delivery_note.js:134
-#: stock/doctype/material_request/material_request.js:161
-#: stock/report/delayed_item_report/delayed_item_report.js:31
+#: stock/doctype/delivery_note/delivery_note.js:146
+#: stock/doctype/material_request/material_request.js:190
+#: stock/report/delayed_item_report/delayed_item_report.js:30
 #: stock/report/delayed_item_report/delayed_item_report.py:155
-#: stock/report/delayed_order_report/delayed_order_report.js:31
+#: stock/report/delayed_order_report/delayed_order_report.js:30
 #: stock/report/delayed_order_report/delayed_order_report.py:74
 msgid "Sales Order"
 msgstr "سفارش فروش"
@@ -61750,8 +62825,8 @@
 msgstr "تاریخ سفارش فروش"
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:260
-#: selling/doctype/sales_order/sales_order.js:704
+#: selling/doctype/sales_order/sales_order.js:286
+#: selling/doctype/sales_order/sales_order.js:809
 #: selling/doctype/sales_order_item/sales_order_item.json
 msgid "Sales Order Item"
 msgstr "آیتم سفارش فروش"
@@ -61840,11 +62915,11 @@
 msgid "Sales Order required for Item {0}"
 msgstr "سفارش فروش برای مورد {0} لازم است"
 
-#: selling/doctype/sales_order/sales_order.py:258
+#: selling/doctype/sales_order/sales_order.py:261
 msgid "Sales Order {0} already exists against Customer's Purchase Order {1}. To allow multiple Sales Orders, Enable {2} in {3}"
 msgstr "سفارش فروش {0} در مقابل سفارش خرید مشتری {1} وجود دارد. برای مجاز کردن چندین سفارش فروش، {2} را در {3} فعال کنید"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1142
+#: accounts/doctype/sales_invoice/sales_invoice.py:1149
 msgid "Sales Order {0} is not submitted"
 msgstr "سفارش فروش {0} ارسال نشده است"
 
@@ -61852,12 +62927,12 @@
 msgid "Sales Order {0} is not valid"
 msgstr "سفارش فروش {0} معتبر نیست"
 
-#: controllers/selling_controller.py:402
+#: controllers/selling_controller.py:403
 #: manufacturing/doctype/work_order/work_order.py:223
 msgid "Sales Order {0} is {1}"
 msgstr "سفارش فروش {0} {1} است"
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:42
 msgid "Sales Orders"
 msgstr "سفارش های فروش"
 
@@ -61885,14 +62960,14 @@
 msgstr "سفارشات فروش برای تحویل"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:133
-#: accounts/report/accounts_receivable/accounts_receivable.py:1106
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:117
+#: accounts/report/accounts_receivable/accounts_receivable.js:136
+#: accounts/report/accounts_receivable/accounts_receivable.py:1114
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:197
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:74
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:10
+#: 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
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:9
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:8
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:71
 #: setup/doctype/sales_partner/sales_partner.json
 msgid "Sales Partner"
@@ -62035,17 +63110,18 @@
 
 #. Name of a DocType
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:155
-#: accounts/report/accounts_receivable/accounts_receivable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.py:1103
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:123
+#: 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_summary/accounts_receivable_summary.js:126
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:194
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
-#: accounts/report/gross_profit/gross_profit.js:49
+#: 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
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:10
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:115
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:116
 #: setup/doctype/sales_person/sales_person.json
 msgid "Sales Person"
 msgstr "شخص فروش"
@@ -62121,7 +63197,7 @@
 msgstr "خلاصه معامله از نظر شخص فروش"
 
 #. Label of a Card Break in the CRM Workspace
-#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:42
+#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:47
 msgid "Sales Pipeline"
 msgstr "خط لوله فروش"
 
@@ -62132,7 +63208,7 @@
 msgid "Sales Pipeline Analytics"
 msgstr "تجزیه و تحلیل خط لوله فروش"
 
-#: selling/page/sales_funnel/sales_funnel.js:131
+#: selling/page/sales_funnel/sales_funnel.js:146
 msgid "Sales Pipeline by Stage"
 msgstr ""
 
@@ -62148,14 +63224,14 @@
 msgstr "ثبت نام فروش"
 
 #: accounts/report/gross_profit/gross_profit.py:777
-#: stock/doctype/delivery_note/delivery_note.js:175
+#: stock/doctype/delivery_note/delivery_note.js:200
 msgid "Sales Return"
 msgstr "بازگشت فروش"
 
 #. Name of a DocType
 #: crm/doctype/sales_stage/sales_stage.json
 #: crm/report/lost_opportunity/lost_opportunity.py:51
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:59
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:61
 msgid "Sales Stage"
 msgstr "مرحله فروش"
 
@@ -62175,7 +63251,7 @@
 msgid "Sales Summary"
 msgstr "خلاصه فروش"
 
-#: setup/doctype/company/company.js:98
+#: setup/doctype/company/company.js:106
 msgid "Sales Tax Template"
 msgstr "الگوی مالیات بر فروش"
 
@@ -62362,6 +63438,7 @@
 #: stock/doctype/delivery_note/delivery_note.json stock/doctype/item/item.json
 #: stock/doctype/packing_slip/packing_slip.json
 #: stock/doctype/price_list/price_list.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
@@ -62421,7 +63498,7 @@
 msgid "Same Item"
 msgstr "همان مورد"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:350
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:404
 msgid "Same item and warehouse combination already entered."
 msgstr "همان کالا و ترکیب انبار قبلا وارد شده است."
 
@@ -62452,7 +63529,7 @@
 msgstr "انبار نگهداری نمونه"
 
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: public/js/controllers/transaction.js:2131
+#: public/js/controllers/transaction.js:2174
 msgid "Sample Size"
 msgstr "اندازهی نمونه"
 
@@ -62462,11 +63539,11 @@
 msgid "Sample Size"
 msgstr "اندازهی نمونه"
 
-#: stock/doctype/stock_entry/stock_entry.py:2824
+#: stock/doctype/stock_entry/stock_entry.py:2860
 msgid "Sample quantity {0} cannot be more than received quantity {1}"
 msgstr "مقدار نمونه {0} نمی تواند بیشتر از مقدار دریافتی {1} باشد"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:7
 msgid "Sanctioned"
 msgstr "تحریم شد"
 
@@ -62535,16 +63612,16 @@
 msgid "Saturday"
 msgstr "شنبه"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:139
-#: accounts/doctype/journal_entry/journal_entry.js:550
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:118
+#: accounts/doctype/journal_entry/journal_entry.js:619
 #: accounts/doctype/ledger_merge/ledger_merge.js:75
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:252
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:288
-#: public/js/call_popup/call_popup.js:157
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:289
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:325
+#: public/js/call_popup/call_popup.js:169
 msgid "Save"
 msgstr "ذخیره"
 
-#: selling/page/point_of_sale/pos_controller.js:176
+#: selling/page/point_of_sale/pos_controller.js:198
 msgid "Save as Draft"
 msgstr "ذخیره به عنوان پیش نویس"
 
@@ -62557,7 +63634,7 @@
 msgid "Savings"
 msgstr "پس انداز"
 
-#: public/js/utils/barcode_scanner.js:206
+#: public/js/utils/barcode_scanner.js:215
 msgid "Scan Barcode"
 msgstr "اسکن بارکد"
 
@@ -62633,7 +63710,7 @@
 msgid "Scan Barcode"
 msgstr "اسکن بارکد"
 
-#: public/js/utils/serial_no_batch_selector.js:151
+#: public/js/utils/serial_no_batch_selector.js:154
 msgid "Scan Batch No"
 msgstr "اسکن شماره دسته"
 
@@ -62649,11 +63726,11 @@
 msgid "Scan Mode"
 msgstr "حالت اسکن"
 
-#: public/js/utils/serial_no_batch_selector.js:136
+#: public/js/utils/serial_no_batch_selector.js:139
 msgid "Scan Serial No"
 msgstr "اسکن شماره سریال"
 
-#: public/js/utils/barcode_scanner.js:172
+#: public/js/utils/barcode_scanner.js:179
 msgid "Scan barcode for item {0}"
 msgstr "اسکن بارکد برای مورد {0}"
 
@@ -62667,7 +63744,7 @@
 msgid "Scanned Cheque"
 msgstr "چک اسکن شده"
 
-#: public/js/utils/barcode_scanner.js:238
+#: public/js/utils/barcode_scanner.js:247
 msgid "Scanned Quantity"
 msgstr "مقدار اسکن شده"
 
@@ -62677,7 +63754,7 @@
 msgid "Schedule"
 msgstr "برنامه"
 
-#: assets/doctype/asset/asset.js:240
+#: assets/doctype/asset/asset.js:275
 msgid "Schedule Date"
 msgstr "تاریخ برنامه ریزی"
 
@@ -62712,7 +63789,7 @@
 msgid "Scheduled"
 msgstr "برنامه ریزی شده است"
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:111
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:118
 msgid "Scheduled Date"
 msgstr "تاریخ برنامه ریزی شده"
 
@@ -62740,7 +63817,7 @@
 msgid "Scheduled Time Logs"
 msgstr "گزارش های زمان برنامه ریزی شده"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: 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
@@ -62759,7 +63836,7 @@
 msgid "Scheduler is inactive. Cannot enqueue job."
 msgstr "زمانبند غیرفعال است. نمی توان کار را در نوبت گذاشت."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:232
 msgid "Scheduler is inactive. Cannot import data."
 msgstr "زمانبند غیرفعال است. نمی توان داده ها را وارد کرد."
@@ -62841,7 +63918,7 @@
 msgid "Scrap & Process Loss"
 msgstr "ضایعات و از دست دادن فرآیند"
 
-#: assets/doctype/asset/asset.js:87
+#: assets/doctype/asset/asset.js:92
 msgid "Scrap Asset"
 msgstr "دارایی قراضه"
 
@@ -62895,7 +63972,7 @@
 msgid "Scrap Warehouse"
 msgstr "انبار ضایعات"
 
-#: assets/doctype/asset/asset_list.js:17
+#: assets/doctype/asset/asset_list.js:13
 msgid "Scrapped"
 msgstr "اسقاط شده"
 
@@ -62905,7 +63982,7 @@
 msgid "Scrapped"
 msgstr "اسقاط شده"
 
-#: selling/page/point_of_sale/pos_item_selector.js:150
+#: selling/page/point_of_sale/pos_item_selector.js:147
 #: selling/page/point_of_sale/pos_past_order_list.js:51
 #: templates/pages/help.html:14
 msgid "Search"
@@ -62928,7 +64005,7 @@
 msgid "Search Term Param Name"
 msgstr "عبارت جستجو نام Param"
 
-#: selling/page/point_of_sale/pos_item_cart.js:312
+#: selling/page/point_of_sale/pos_item_cart.js:310
 msgid "Search by customer name, phone, email."
 msgstr "جستجو بر اساس نام مشتری، تلفن، ایمیل."
 
@@ -62936,7 +64013,7 @@
 msgid "Search by invoice id or customer name"
 msgstr "جستجو بر اساس شناسه فاکتور یا نام مشتری"
 
-#: selling/page/point_of_sale/pos_item_selector.js:152
+#: selling/page/point_of_sale/pos_item_selector.js:149
 msgid "Search by item code, serial number or barcode"
 msgstr "جستجو بر اساس کد مورد، شماره سریال یا بارکد"
 
@@ -62958,7 +64035,7 @@
 msgid "Secondary Role"
 msgstr "نقش ثانویه"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:172
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:117
 msgid "Section Code"
 msgstr "کد بخش"
@@ -62981,8 +64058,13 @@
 msgid "See all open tickets"
 msgstr "همه بلیط های باز را ببینید"
 
-#: buying/doctype/purchase_order/purchase_order.js:180
-#: selling/doctype/sales_order/sales_order.js:888
+#: stock/report/stock_ledger/stock_ledger.js:104
+msgid "Segregate Serial / Batch Bundle"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:186
+#: selling/doctype/sales_order/sales_order.js:1043
+#: selling/doctype/sales_order/sales_order_list.js:85
 msgid "Select"
 msgstr "انتخاب کنید"
 
@@ -62990,33 +64072,33 @@
 msgid "Select Accounting Dimension."
 msgstr "بعد حسابداری را انتخاب کنید."
 
-#: public/js/utils.js:440
+#: public/js/utils.js:487
 msgid "Select Alternate Item"
 msgstr "گزینه Alternate Item را انتخاب کنید"
 
-#: selling/doctype/quotation/quotation.js:312
+#: selling/doctype/quotation/quotation.js:324
 msgid "Select Alternative Items for Sales Order"
 msgstr "اقلام جایگزین را برای سفارش فروش انتخاب کنید"
 
-#: stock/doctype/item/item.js:518
+#: stock/doctype/item/item.js:585
 msgid "Select Attribute Values"
 msgstr "Attribute Values را انتخاب کنید"
 
-#: selling/doctype/sales_order/sales_order.js:689
+#: selling/doctype/sales_order/sales_order.js:792
 msgid "Select BOM"
 msgstr "BOM را انتخاب کنید"
 
-#: selling/doctype/sales_order/sales_order.js:678
+#: selling/doctype/sales_order/sales_order.js:779
 msgid "Select BOM and Qty for Production"
 msgstr "BOM و Qty را برای تولید انتخاب کنید"
 
-#: selling/doctype/sales_order/sales_order.js:803
+#: selling/doctype/sales_order/sales_order.js:921
 msgid "Select BOM, Qty and For Warehouse"
 msgstr "BOM، Qty و For Warehouse را انتخاب کنید"
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: selling/page/point_of_sale/pos_item_details.js:212
+#: stock/doctype/pick_list/pick_list.js:352
 msgid "Select Batch No"
 msgstr "شماره دسته را انتخاب کنید"
 
@@ -63032,15 +64114,15 @@
 msgid "Select Billing Address"
 msgstr "آدرس صورتحساب را انتخاب کنید"
 
-#: public/js/stock_analytics.js:42
+#: public/js/stock_analytics.js:61
 msgid "Select Brand..."
 msgstr "انتخاب برند..."
 
-#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/journal_entry/journal_entry.js:123
 msgid "Select Company"
 msgstr "شرکت را انتخاب کنید"
 
-#: manufacturing/doctype/job_card/job_card.js:173
+#: manufacturing/doctype/job_card/job_card.js:193
 msgid "Select Corrective Operation"
 msgstr "عملیات اصلاحی را انتخاب کنید"
 
@@ -63050,24 +64132,24 @@
 msgid "Select Customers By"
 msgstr "انتخاب مشتریان توسط"
 
-#: setup/doctype/employee/employee.js:112
+#: setup/doctype/employee/employee.js:115
 msgid "Select Date of Birth. This will validate Employees age and prevent hiring of under-age staff."
 msgstr "تاریخ تولد را انتخاب کنید. این امر سن کارکنان را تأیید می کند و از استخدام کارکنان زیر سن جلوگیری می کند."
 
-#: setup/doctype/employee/employee.js:117
+#: setup/doctype/employee/employee.js:122
 msgid "Select Date of joining. It will have impact on the first salary calculation, Leave allocation on pro-rata bases."
 msgstr "تاریخ عضویت را انتخاب کنید. در اولین محاسبه حقوق، تخصیص مرخصی به نسبت، تاثیر خواهد داشت."
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:111
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:131
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:114
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:138
 msgid "Select Default Supplier"
 msgstr "تامین کننده پیش فرض را انتخاب کنید"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:252
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:256
 msgid "Select Difference Account"
 msgstr "حساب تفاوت را انتخاب کنید"
 
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:58
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:57
 msgid "Select Dimension"
 msgstr "Dimension را انتخاب کنید"
 
@@ -63077,27 +64159,27 @@
 msgid "Select DocType"
 msgstr "DocType را انتخاب کنید"
 
-#: manufacturing/doctype/job_card/job_card.js:246
+#: manufacturing/doctype/job_card/job_card.js:274
 msgid "Select Employees"
 msgstr "کارکنان را انتخاب کنید"
 
-#: buying/doctype/purchase_order/purchase_order.js:170
+#: buying/doctype/purchase_order/purchase_order.js:176
 msgid "Select Finished Good"
 msgstr "Finished Good را انتخاب کنید"
 
-#: selling/doctype/sales_order/sales_order.js:962
+#: selling/doctype/sales_order/sales_order.js:1122
 msgid "Select Items"
 msgstr "موارد را انتخاب کنید"
 
-#: selling/doctype/sales_order/sales_order.js:861
+#: selling/doctype/sales_order/sales_order.js:1008
 msgid "Select Items based on Delivery Date"
 msgstr "اقلام را بر اساس تاریخ تحویل انتخاب کنید"
 
-#: public/js/controllers/transaction.js:2159
+#: public/js/controllers/transaction.js:2202
 msgid "Select Items for Quality Inspection"
 msgstr "موارد را برای بازرسی کیفیت انتخاب کنید"
 
-#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:820
 msgid "Select Items to Manufacture"
 msgstr "مواردی را برای ساخت انتخاب کنید"
 
@@ -63107,27 +64189,31 @@
 msgid "Select Items to Manufacture"
 msgstr "مواردی را برای ساخت انتخاب کنید"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1038
-#: selling/page/point_of_sale/pos_item_cart.js:888
+#: selling/doctype/sales_order/sales_order_list.js:76
+msgid "Select Items up to Delivery Date"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.js:1114
+#: selling/page/point_of_sale/pos_item_cart.js:920
 msgid "Select Loyalty Program"
 msgstr "برنامه وفاداری را انتخاب کنید"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: buying/doctype/request_for_quotation/request_for_quotation.js:366
 msgid "Select Possible Supplier"
 msgstr "تامین کننده احتمالی را انتخاب کنید"
 
-#: manufacturing/doctype/work_order/work_order.js:726
-#: stock/doctype/pick_list/pick_list.js:161
+#: manufacturing/doctype/work_order/work_order.js:781
+#: stock/doctype/pick_list/pick_list.js:192
 msgid "Select Quantity"
 msgstr "تعداد را انتخاب کنید"
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: 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:328 stock/doctype/pick_list/pick_list.js:321
+#: public/js/utils/sales_common.js:364 stock/doctype/pick_list/pick_list.js:355
 msgid "Select Serial and Batch"
 msgstr "سریال و دسته را انتخاب کنید"
 
@@ -63155,40 +64241,40 @@
 msgid "Select Supplier Address"
 msgstr "آدرس تامین کننده را انتخاب کنید"
 
-#: stock/doctype/batch/batch.js:110
+#: stock/doctype/batch/batch.js:127
 msgid "Select Target Warehouse"
 msgstr "انبار هدف را انتخاب کنید"
 
-#: www/book_appointment/index.js:69
+#: www/book_appointment/index.js:73
 msgid "Select Time"
 msgstr "زمان را انتخاب کنید"
 
-#: accounts/report/balance_sheet/balance_sheet.js:14
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
+#: accounts/report/balance_sheet/balance_sheet.js:10
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:10
 msgid "Select View"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:248
+#: public/js/bank_reconciliation_tool/dialog_manager.js:251
 msgid "Select Vouchers to Match"
 msgstr "کوپن‌ها را برای مطابقت انتخاب کنید"
 
-#: public/js/stock_analytics.js:46
+#: public/js/stock_analytics.js:72
 msgid "Select Warehouse..."
 msgstr "انتخاب انبار..."
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:431
 msgid "Select Warehouses to get Stock for Materials Planning"
 msgstr "برای بدست آوردن انبار برای برنامه ریزی مواد، انبارها را انتخاب کنید"
 
-#: public/js/communication.js:67
+#: public/js/communication.js:80
 msgid "Select a Company"
 msgstr "یک شرکت را انتخاب کنید"
 
-#: setup/doctype/employee/employee.js:107
+#: setup/doctype/employee/employee.js:110
 msgid "Select a Company this Employee belongs to."
 msgstr "شرکتی را انتخاب کنید که این کارمند به آن تعلق دارد."
 
-#: buying/doctype/supplier/supplier.js:160
+#: buying/doctype/supplier/supplier.js:188
 msgid "Select a Customer"
 msgstr "یک مشتری انتخاب کنید"
 
@@ -63196,19 +64282,19 @@
 msgid "Select a Default Priority."
 msgstr "یک اولویت پیش فرض را انتخاب کنید."
 
-#: selling/doctype/customer/customer.js:205
+#: selling/doctype/customer/customer.js:221
 msgid "Select a Supplier"
 msgstr "یک تامین کننده انتخاب کنید"
 
-#: stock/doctype/material_request/material_request.js:297
+#: stock/doctype/material_request/material_request.js:365
 msgid "Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only."
 msgstr "یک تامین کننده از تامین کنندگان پیش فرض موارد زیر انتخاب کنید. در صورت انتخاب، یک سفارش خرید فقط در برابر اقلام متعلق به تامین کننده منتخب انجام می شود."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:156
 msgid "Select a company"
 msgstr "یک شرکت را انتخاب کنید"
 
-#: stock/doctype/item/item.js:809
+#: stock/doctype/item/item.js:889
 msgid "Select an Item Group."
 msgstr "یک گروه آیتم را انتخاب کنید."
 
@@ -63216,15 +64302,19 @@
 msgid "Select an account to print in account currency"
 msgstr "حسابی را برای چاپ با ارز حساب انتخاب کنید"
 
-#: selling/doctype/quotation/quotation.js:327
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
+msgid "Select an invoice to load summary data"
+msgstr ""
+
+#: selling/doctype/quotation/quotation.js:339
 msgid "Select an item from each set to be used in the Sales Order."
 msgstr "از هر مجموعه یک مورد را برای استفاده در سفارش فروش انتخاب کنید."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
-msgid "Select change amount account"
-msgstr "تغییر حساب مبلغ را انتخاب کنید"
+#: stock/doctype/item/item.js:590
+msgid "Select at least one value from each of the attributes."
+msgstr ""
 
-#: public/js/utils/party.js:305
+#: public/js/utils/party.js:352
 msgid "Select company first"
 msgstr "ابتدا شرکت را انتخاب کنید"
 
@@ -63235,15 +64325,15 @@
 msgid "Select company name first."
 msgstr "ابتدا نام شرکت را انتخاب کنید"
 
-#: controllers/accounts_controller.py:2394
+#: controllers/accounts_controller.py:2486
 msgid "Select finance book for the item {0} at row {1}"
 msgstr "کتاب مالی را برای مورد {0} در ردیف {1} انتخاب کنید"
 
-#: selling/page/point_of_sale/pos_item_selector.js:162
+#: selling/page/point_of_sale/pos_item_selector.js:159
 msgid "Select item group"
 msgstr "گروه مورد را انتخاب کنید"
 
-#: manufacturing/doctype/bom/bom.js:293
+#: manufacturing/doctype/bom/bom.js:306
 msgid "Select template item"
 msgstr "مورد الگو را انتخاب کنید"
 
@@ -63257,16 +64347,16 @@
 msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders."
 msgstr "ایستگاه کاری پیش‌فرض را که در آن عملیات انجام می‌شود، انتخاب کنید. این در BOM ها و Work Orders واکشی می شود."
 
-#: manufacturing/doctype/work_order/work_order.js:807
+#: manufacturing/doctype/work_order/work_order.js:866
 msgid "Select the Item to be manufactured."
 msgstr "موردی را که باید تولید شود انتخاب کنید."
 
-#: manufacturing/doctype/bom/bom.js:725
+#: manufacturing/doctype/bom/bom.js:754
 msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
 msgstr "موردی را که باید تولید شود انتخاب کنید. نام مورد، UoM، شرکت و ارز به طور خودکار واکشی می شود."
 
-#: manufacturing/doctype/production_plan/production_plan.js:294
-#: manufacturing/doctype/production_plan/production_plan.js:305
+#: manufacturing/doctype/production_plan/production_plan.js:319
+#: manufacturing/doctype/production_plan/production_plan.js:332
 msgid "Select the Warehouse"
 msgstr "انبار را انتخاب کنید"
 
@@ -63278,15 +64368,15 @@
 msgid "Select the date and your timezone"
 msgstr "تاریخ و منطقه زمانی خود را انتخاب کنید"
 
-#: manufacturing/doctype/bom/bom.js:740
+#: manufacturing/doctype/bom/bom.js:773
 msgid "Select the raw materials (Items) required to manufacture the Item"
 msgstr "مواد خام (اقلام) مورد نیاز برای تولید کالا را انتخاب کنید"
 
-#: manufacturing/doctype/bom/bom.js:338
+#: manufacturing/doctype/bom/bom.js:353
 msgid "Select variant item code for the template item {0}"
 msgstr "کد نوع مورد را برای مورد الگو انتخاب کنید {0}"
 
-#: manufacturing/doctype/production_plan/production_plan.js:525
+#: manufacturing/doctype/production_plan/production_plan.js:565
 msgid "Select whether to get items from a Sales Order or a Material Request. For now select <b>Sales Order</b>.\n"
 " A Production Plan can also be created manually where you can select the Items to manufacture."
 msgstr ""
@@ -63306,7 +64396,7 @@
 msgid "Selected POS Opening Entry should be open."
 msgstr "ورودی باز کردن POS انتخاب شده باید باز باشد."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2192
+#: accounts/doctype/sales_invoice/sales_invoice.py:2161
 msgid "Selected Price List should have buying and selling fields checked."
 msgstr "لیست قیمت انتخاب شده باید دارای فیلدهای خرید و فروش باشد."
 
@@ -63320,7 +64410,7 @@
 msgid "Selected date is"
 msgstr "تاریخ انتخاب شده است"
 
-#: public/js/bulk_transaction_processing.js:26
+#: public/js/bulk_transaction_processing.js:34
 msgid "Selected document must be in submitted state"
 msgstr "سند انتخاب شده باید در حالت ارسال شده باشد"
 
@@ -63335,7 +64425,7 @@
 msgid "Sell"
 msgstr "فروش"
 
-#: assets/doctype/asset/asset.js:91
+#: assets/doctype/asset/asset.js:100
 msgid "Sell Asset"
 msgstr "فروش دارایی"
 
@@ -63465,7 +64555,7 @@
 msgid "Send Emails"
 msgstr "ارسال ایمیل"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:46
+#: buying/doctype/request_for_quotation/request_for_quotation.js:53
 msgid "Send Emails to Suppliers"
 msgstr "ارسال ایمیل به تامین کنندگان"
 
@@ -63473,7 +64563,7 @@
 msgid "Send Now"
 msgstr "در حال حاضر ارسال"
 
-#: public/js/controllers/transaction.js:440
+#: public/js/controllers/transaction.js:479
 msgid "Send SMS"
 msgstr "ارسال پیامک"
 
@@ -63495,6 +64585,11 @@
 msgid "Send To Primary Contact"
 msgstr "ارسال به مخاطب اصلی"
 
+#. Description of a DocType
+#: setup/doctype/email_digest/email_digest.json
+msgid "Send regular summary reports via Email."
+msgstr ""
+
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
@@ -63525,7 +64620,7 @@
 msgid "Sender"
 msgstr "فرستنده"
 
-#: accounts/doctype/payment_request/payment_request.js:35
+#: accounts/doctype/payment_request/payment_request.js:44
 msgid "Sending"
 msgstr "در حال ارسال"
 
@@ -63547,7 +64642,7 @@
 msgid "Sequence ID"
 msgstr "شناسه دنباله"
 
-#: manufacturing/doctype/work_order/work_order.js:262
+#: manufacturing/doctype/work_order/work_order.js:277
 msgid "Sequence Id"
 msgstr "شناسه دنباله"
 
@@ -63598,26 +64693,26 @@
 msgid "Serial / Batch No"
 msgstr "شماره سریال / دسته"
 
-#: public/js/utils.js:124
+#: public/js/utils.js:153
 msgid "Serial / Batch Nos"
 msgstr "شماره های سریال / دسته ای"
 
 #. Name of a DocType
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:73
+#: 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:2144
-#: public/js/utils/serial_no_batch_selector.js:350
+#: public/js/controllers/transaction.js:2187
+#: 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/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_no_ledger/serial_no_ledger.js:39
+#: 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:246
+#: stock/report/stock_ledger/stock_ledger.py:319
 msgid "Serial No"
 msgstr "شماره سریال"
 
-#. Label of a Small Text field in DocType 'Asset Capitalization Stock Item'
+#. Label of a Text field in DocType 'Asset Capitalization Stock Item'
 #: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
 msgctxt "Asset Capitalization Stock Item"
 msgid "Serial No"
@@ -63665,7 +64760,7 @@
 msgid "Serial No"
 msgstr "شماره سریال"
 
-#. Label of a Small Text field in DocType 'POS Invoice Item'
+#. Label of a Text field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
 msgid "Serial No"
@@ -63701,7 +64796,7 @@
 msgid "Serial No"
 msgstr "شماره سریال"
 
-#. Label of a Small Text field in DocType 'Sales Invoice Item'
+#. Label of a Text field in DocType 'Sales Invoice Item'
 #: accounts/doctype/sales_invoice_item/sales_invoice_item.json
 msgctxt "Sales Invoice Item"
 msgid "Serial No"
@@ -63722,7 +64817,7 @@
 msgid "Serial No"
 msgstr "شماره سریال"
 
-#. Label of a Small Text field in DocType 'Stock Entry Detail'
+#. Label of a Text field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
 msgid "Serial No"
@@ -63817,7 +64912,7 @@
 msgid "Serial No and Batch for Finished Good"
 msgstr "شماره سریال و دسته ای برای Finished Good"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:572
 msgid "Serial No is mandatory"
 msgstr "شماره سریال اجباری است"
 
@@ -63825,11 +64920,11 @@
 msgid "Serial No is mandatory for Item {0}"
 msgstr "شماره سریال برای مورد {0} اجباری است"
 
-#: public/js/utils/serial_no_batch_selector.js:480
+#: public/js/utils/serial_no_batch_selector.js:488
 msgid "Serial No {0} already exists"
 msgstr "شماره سریال {0} از قبل وجود دارد"
 
-#: public/js/utils/barcode_scanner.js:311
+#: public/js/utils/barcode_scanner.js:321
 msgid "Serial No {0} already scanned"
 msgstr "شماره سریال {0} قبلاً اسکن شده است"
 
@@ -63846,16 +64941,11 @@
 msgid "Serial No {0} does not exist"
 msgstr "شماره سریال {0} وجود ندارد"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2112
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2131
 msgid "Serial No {0} does not exists"
 msgstr ""
 
 #: public/js/utils/barcode_scanner.js:402
-msgid "Serial No {0} has already scanned."
-msgstr ""
-
-#: public/js/utils/barcode_scanner.js:499
-#: public/js/utils/barcode_scanner.js:506
 msgid "Serial No {0} is already added"
 msgstr "شماره سریال {0} قبلاً اضافه شده است"
 
@@ -63871,23 +64961,23 @@
 msgid "Serial No {0} not found"
 msgstr "شماره سریال {0} یافت نشد"
 
-#: selling/page/point_of_sale/pos_controller.js:695
+#: selling/page/point_of_sale/pos_controller.js:734
 msgid "Serial No: {0} has already been transacted into another POS Invoice."
 msgstr "شماره سریال: {0} قبلاً در صورت‌حساب POS دیگری معامله شده است."
 
-#: public/js/utils/barcode_scanner.js:262
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/barcode_scanner.js:271
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Serial Nos"
 msgstr "شماره های سریال"
 
 #: public/js/utils/serial_no_batch_selector.js:20
-#: public/js/utils/serial_no_batch_selector.js:183
+#: public/js/utils/serial_no_batch_selector.js:185
 msgid "Serial Nos / Batch Nos"
 msgstr "شماره های سریال / شماره های دسته ای"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1692
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:157
 msgid "Serial Nos Mismatch"
 msgstr "عدم تطابق شماره های سریال"
 
@@ -63897,11 +64987,11 @@
 msgid "Serial Nos and Batches"
 msgstr "شماره های سریال و دسته ها"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1074
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1081
 msgid "Serial Nos are created successfully"
 msgstr "شماره های سریال با موفقیت ایجاد شد"
 
-#: stock/stock_ledger.py:1972
+#: stock/stock_ledger.py:1979
 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
 msgstr "شماره های سریال در ورودی های رزرو موجودی رزرو شده اند، قبل از ادامه باید آنها را لغو رزرو کنید."
 
@@ -63927,7 +65017,7 @@
 #. Name of a DocType
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:80
-#: stock/report/stock_ledger/stock_ledger.py:253
+#: stock/report/stock_ledger/stock_ledger.py:326
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:154
 msgid "Serial and Batch Bundle"
 msgstr "بسته سریال و دسته ای"
@@ -64022,14 +65112,18 @@
 msgid "Serial and Batch Bundle"
 msgstr "بسته سریال و دسته ای"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1253
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1260
 msgid "Serial and Batch Bundle created"
 msgstr "سریال و دسته بسته ایجاد شد"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1295
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1309
 msgid "Serial and Batch Bundle updated"
 msgstr "سریال و دسته بسته به روز شد"
 
+#: controllers/stock_controller.py:82
+msgid "Serial and Batch Bundle {0} is already used in {1} {2}."
+msgstr ""
+
 #. Label of a Section Break field in DocType 'Subcontracting Receipt Item'
 #: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
 msgctxt "Subcontracting Receipt Item"
@@ -64053,7 +65147,7 @@
 msgid "Serial and Batch No"
 msgstr "شماره سریال و دسته"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:51
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:49
 msgid "Serial and Batch Nos"
 msgstr "شماره سریال و دسته"
 
@@ -64081,11 +65175,11 @@
 msgid "Serial and Batch Summary"
 msgstr "خلاصه سریال و دسته ای"
 
-#: stock/utils.py:427
+#: stock/utils.py:422
 msgid "Serial number {0} entered more than once"
 msgstr "شماره سریال {0} بیش از یک بار وارد شده است"
 
-#: accounts/doctype/journal_entry/journal_entry.js:545
+#: accounts/doctype/journal_entry/journal_entry.js:611
 msgid "Series"
 msgstr "سلسله"
 
@@ -64543,7 +65637,7 @@
 msgid "Service Level Agreement has been changed to {0}."
 msgstr "قرارداد سطح سرویس به {0} تغییر کرده است."
 
-#: support/doctype/issue/issue.js:67
+#: support/doctype/issue/issue.js:77
 msgid "Service Level Agreement was reset."
 msgstr "قرارداد سطح سرویس بازنشانی شد."
 
@@ -64624,11 +65718,11 @@
 msgid "Service Stop Date"
 msgstr "تاریخ توقف خدمات"
 
-#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1239
+#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1298
 msgid "Service Stop Date cannot be after Service End Date"
 msgstr "تاریخ توقف سرویس نمی تواند بعد از تاریخ پایان سرویس باشد"
 
-#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1236
+#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1295
 msgid "Service Stop Date cannot be before Service Start Date"
 msgstr "تاریخ توقف سرویس نمی تواند قبل از تاریخ شروع سرویس باشد"
 
@@ -64661,7 +65755,7 @@
 msgid "Set Basic Rate Manually"
 msgstr "نرخ پایه را به صورت دستی تنظیم کنید"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:150
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:157
 msgid "Set Default Supplier"
 msgstr "تامین کننده پیش فرض را تنظیم کنید"
 
@@ -64702,11 +65796,11 @@
 msgid "Set Landed Cost Based on Purchase Invoice Rate"
 msgstr "هزینه زمین را بر اساس نرخ فاکتور خرید تنظیم کنید"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1050
+#: accounts/doctype/sales_invoice/sales_invoice.js:1126
 msgid "Set Loyalty Program"
 msgstr "تنظیم برنامه وفاداری"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:272
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:309
 msgid "Set New Release Date"
 msgstr "تاریخ انتشار جدید را تنظیم کنید"
 
@@ -64722,27 +65816,31 @@
 msgid "Set Operating Cost Based On BOM Quantity"
 msgstr "هزینه عملیاتی را بر اساس مقدار BOM تنظیم کنید"
 
+#: buying/doctype/request_for_quotation/request_for_quotation.py:264
+msgid "Set Password"
+msgstr "قراردادن رمز عبور"
+
 #. Label of a Check field in DocType 'POS Opening Entry'
 #: accounts/doctype/pos_opening_entry/pos_opening_entry.json
 msgctxt "POS Opening Entry"
 msgid "Set Posting Date"
 msgstr "تاریخ ارسال را تنظیم کنید"
 
-#: manufacturing/doctype/bom/bom.js:767
+#: manufacturing/doctype/bom/bom.js:800
 msgid "Set Process Loss Item Quantity"
 msgstr "مقدار مورد از دست دادن فرآیند را تنظیم کنید"
 
-#: projects/doctype/project/project.js:116
-#: projects/doctype/project/project.js:118
-#: projects/doctype/project/project.js:132
+#: projects/doctype/project/project.js:140
+#: projects/doctype/project/project.js:143
+#: projects/doctype/project/project.js:157
 msgid "Set Project Status"
 msgstr "تنظیم وضعیت پروژه"
 
-#: projects/doctype/project/project.js:154
+#: projects/doctype/project/project.js:182
 msgid "Set Project and all Tasks to status {0}?"
 msgstr "پروژه و همه وظایف روی وضعیت {0} تنظیم شود؟"
 
-#: manufacturing/doctype/bom/bom.js:768
+#: manufacturing/doctype/bom/bom.js:801
 msgid "Set Quantity"
 msgstr "مقدار را تنظیم کنید"
 
@@ -64822,7 +65920,7 @@
 msgid "Set Valuation Rate Based on Source Warehouse"
 msgstr "نرخ ارزش گذاری را بر اساس انبار منبع تنظیم کنید"
 
-#: selling/doctype/sales_order/sales_order.js:184
+#: selling/doctype/sales_order/sales_order.js:207
 msgid "Set Warehouse"
 msgstr "مجموعه انبار"
 
@@ -64831,25 +65929,25 @@
 msgid "Set as Closed"
 msgstr "به عنوان بسته تنظیم کنید"
 
-#: projects/doctype/task/task_list.js:12
+#: projects/doctype/task/task_list.js:20
 msgid "Set as Completed"
 msgstr "به عنوان تکمیل شده تنظیم کنید"
 
-#: public/js/utils/sales_common.js:406
-#: selling/doctype/quotation/quotation.js:124
+#: public/js/utils/sales_common.js:462
+#: selling/doctype/quotation/quotation.js:129
 msgid "Set as Lost"
 msgstr "به عنوان از دست رفته ست کنید"
 
 #: crm/doctype/opportunity/opportunity_list.js:13
-#: projects/doctype/task/task_list.js:8 support/doctype/issue/issue_list.js:8
+#: projects/doctype/task/task_list.js:16 support/doctype/issue/issue_list.js:8
 msgid "Set as Open"
 msgstr "به عنوان Open تنظیم کنید"
 
-#: setup/doctype/company/company.py:419
+#: setup/doctype/company/company.py:418
 msgid "Set default inventory account for perpetual inventory"
 msgstr "حساب موجودی پیش فرض را برای موجودی دائمی تنظیم کنید"
 
-#: setup/doctype/company/company.py:429
+#: setup/doctype/company/company.py:428
 msgid "Set default {0} account for non stock items"
 msgstr "حساب پیش‌فرض {0} را برای اقلام غیر موجودی تنظیم کنید"
 
@@ -64860,7 +65958,7 @@
 msgid "Set fieldname from which you want to fetch the data from the parent form."
 msgstr "نام فیلدی را که می‌خواهید داده‌ها را از فرم والد دریافت کنید، تنظیم کنید."
 
-#: manufacturing/doctype/bom/bom.js:757
+#: manufacturing/doctype/bom/bom.js:790
 msgid "Set quantity of process loss item:"
 msgstr "تنظیم مقدار مورد از دست دادن فرآیند:"
 
@@ -64877,7 +65975,7 @@
 msgid "Set targets Item Group-wise for this Sales Person."
 msgstr "اهداف مورد نظر را از نظر گروهی برای این فروشنده تعیین کنید."
 
-#: manufacturing/doctype/work_order/work_order.js:852
+#: manufacturing/doctype/work_order/work_order.js:923
 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
 msgstr "تاریخ شروع برنامه ریزی شده را تنظیم کنید (تاریخ تخمینی که در آن می خواهید تولید شروع شود)"
 
@@ -64899,15 +65997,15 @@
 msgid "Set up your Warehouse"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:672
+#: assets/doctype/asset/asset.py:674
 msgid "Set {0} in asset category {1} for company {2}"
 msgstr "تنظیم {0} در دسته دارایی {1} برای شرکت {2}"
 
-#: assets/doctype/asset/asset.py:953
+#: assets/doctype/asset/asset.py:957
 msgid "Set {0} in asset category {1} or company {2}"
 msgstr "تنظیم {0} در دسته دارایی {1} یا شرکت {2}"
 
-#: assets/doctype/asset/asset.py:949
+#: assets/doctype/asset/asset.py:953
 msgid "Set {0} in company {1}"
 msgstr "تنظیم {0} در شرکت {1}"
 
@@ -64988,7 +66086,7 @@
 msgstr "راه اندازی شرکت"
 
 #: manufacturing/doctype/bom/bom.py:956
-#: manufacturing/doctype/work_order/work_order.py:978
+#: manufacturing/doctype/work_order/work_order.py:992
 msgid "Setting {} is required"
 msgstr "تنظیم {} مورد نیاز است"
 
@@ -65021,7 +66119,13 @@
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:15
+#. Description of a DocType
+#: crm/doctype/crm_settings/crm_settings.json
+#: selling/doctype/selling_settings/selling_settings.json
+msgid "Settings for Selling Module"
+msgstr ""
+
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:11
 msgid "Settled"
 msgstr "مستقر شده"
 
@@ -65037,6 +66141,12 @@
 msgid "Settled"
 msgstr "مستقر شده"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Setup"
+msgstr "برپایی"
+
 #. Title of an Onboarding Step
 #: setup/onboarding_step/letterhead/letterhead.json
 msgid "Setup Your Letterhead"
@@ -65055,7 +66165,7 @@
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
 #: accounts/doctype/share_balance/share_balance.json
-#: accounts/doctype/shareholder/shareholder.js:22
+#: accounts/doctype/shareholder/shareholder.js:21
 #: accounts/report/share_balance/share_balance.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Balance"
@@ -65070,7 +66180,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/shareholder/shareholder.js:28
+#: accounts/doctype/shareholder/shareholder.js:27
 #: accounts/report/share_ledger/share_ledger.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Ledger"
@@ -65114,9 +66224,9 @@
 
 #. Name of a DocType
 #: accounts/doctype/shareholder/shareholder.json
-#: accounts/report/share_balance/share_balance.js:17
+#: accounts/report/share_balance/share_balance.js:16
 #: accounts/report/share_balance/share_balance.py:57
-#: accounts/report/share_ledger/share_ledger.js:17
+#: accounts/report/share_ledger/share_ledger.js:16
 #: accounts/report/share_ledger/share_ledger.py:51
 msgid "Shareholder"
 msgstr "سهامدار"
@@ -65133,7 +66243,7 @@
 msgid "Shelf Life In Days"
 msgstr "ماندگاری به روز"
 
-#: assets/doctype/asset/asset.js:247
+#: assets/doctype/asset/asset.js:288
 msgid "Shift"
 msgstr "تغییر مکان"
 
@@ -65156,7 +66266,7 @@
 msgstr "نام شیفت"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:166
+#: stock/doctype/delivery_note/delivery_note.js:181
 #: stock/doctype/shipment/shipment.json
 msgid "Shipment"
 msgstr "حمل و نقل"
@@ -65224,7 +66334,7 @@
 msgid "Shipment details"
 msgstr "جزئیات حمل و نقل"
 
-#: stock/doctype/delivery_note/delivery_note.py:846
+#: stock/doctype/delivery_note/delivery_note.py:907
 msgid "Shipments"
 msgstr "محموله ها"
 
@@ -65572,31 +66682,35 @@
 msgid "Show Cancelled Entries"
 msgstr "نمایش ورودی های لغو شده"
 
-#: templates/pages/projects.js:64
+#: templates/pages/projects.js:61
 msgid "Show Completed"
 msgstr "نمایش کامل شد"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:107
+#: accounts/report/budget_variance_report/budget_variance_report.js:105
 msgid "Show Cumulative Amount"
 msgstr "نمایش مقدار تجمعی"
 
-#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:17
+#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:16
 msgid "Show Disabled Warehouses"
 msgstr "نمایش انبارهای غیرفعال"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:306
+msgid "Show Document"
+msgstr "نمایش سند"
+
 #. Label of a Check field in DocType 'Bank Statement Import'
 #: accounts/doctype/bank_statement_import/bank_statement_import.json
 msgctxt "Bank Statement Import"
 msgid "Show Failed Logs"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:144
-#: accounts/report/accounts_receivable/accounts_receivable.js:161
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:134
+#: accounts/report/accounts_payable/accounts_payable.js:147
+#: accounts/report/accounts_receivable/accounts_receivable.js:164
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:137
 msgid "Show Future Payments"
 msgstr "نمایش پرداخت های آینده"
 
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:139
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:142
 msgid "Show GL Balance"
 msgstr "نمایش موجودی GL"
 
@@ -65629,7 +66743,7 @@
 msgid "Show Ledger View"
 msgstr "نمایش لجر نمای"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:166
+#: accounts/report/accounts_receivable/accounts_receivable.js:169
 msgid "Show Linked Delivery Notes"
 msgstr "نمایش یادداشت های تحویل مرتبط"
 
@@ -65643,7 +66757,7 @@
 msgid "Show Net Values in Party Account"
 msgstr "نمایش ارزش خالص در حساب طرف"
 
-#: templates/pages/projects.js:66
+#: templates/pages/projects.js:63
 msgid "Show Open"
 msgstr "نمایش باز"
 
@@ -65677,18 +66791,18 @@
 msgid "Show Preview"
 msgstr "نمایش پیش نمایش"
 
-#: accounts/report/accounts_payable/accounts_payable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.js:176
+#: accounts/report/accounts_payable/accounts_payable.js:142
+#: accounts/report/accounts_receivable/accounts_receivable.js:179
 #: accounts/report/general_ledger/general_ledger.js:204
 msgid "Show Remarks"
 msgstr "نمایش اظهارات"
 
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:66
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:65
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:65
 msgid "Show Return Entries"
 msgstr "نمایش ورودی های بازگشتی"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:171
+#: accounts/report/accounts_receivable/accounts_receivable.js:174
 msgid "Show Sales Person"
 msgstr "نمایش فروشنده"
 
@@ -65702,11 +66816,16 @@
 msgid "Show Taxes as Table in Print"
 msgstr "نمایش مالیات به عنوان جدول در چاپ"
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:456
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:296
+msgid "Show Traceback"
+msgstr "نمایش ردیابی"
+
 #: stock/report/stock_balance/stock_balance.js:90
 msgid "Show Variant Attributes"
 msgstr "نمایش ویژگی های متغیر"
 
-#: stock/doctype/item/item.js:90
+#: stock/doctype/item/item.js:106
 msgid "Show Variants"
 msgstr "نمایش انواع"
 
@@ -65714,8 +66833,8 @@
 msgid "Show Warehouse-wise Stock"
 msgstr "نمایش موجودی از نظر انبار"
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:29
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:17
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:28
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:19
 msgid "Show exploded view"
 msgstr "نمایش نمای انفجاری"
 
@@ -65725,7 +66844,7 @@
 msgid "Show in Website"
 msgstr "نمایش در وب سایت"
 
-#: accounts/report/trial_balance/trial_balance.js:104
+#: accounts/report/trial_balance/trial_balance.js:110
 msgid "Show net values in opening and closing columns"
 msgstr "نمایش مقادیر خالص در باز و بسته شدن ستون"
 
@@ -65733,30 +66852,30 @@
 msgid "Show only POS"
 msgstr "فقط POS نمایش داده شود"
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:108
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:106
 msgid "Show only the Immediate Upcoming Term"
 msgstr "فقط عبارت فوری آینده را نشان دهید"
 
-#: stock/utils.py:588
+#: stock/utils.py:583
 msgid "Show pending entries"
 msgstr "نمایش ورودی های معلق"
 
-#: accounts/report/trial_balance/trial_balance.js:93
+#: accounts/report/trial_balance/trial_balance.js:99
 msgid "Show unclosed fiscal year's P&L balances"
 msgstr "موجودی P&L سال مالی بسته نشده را نشان دهید"
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:96
 msgid "Show with upcoming revenue/expense"
 msgstr "نمایش با درآمد/هزینه آتی"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:113
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:137
 #: accounts/report/profitability_analysis/profitability_analysis.js:71
-#: accounts/report/trial_balance/trial_balance.js:88
+#: accounts/report/trial_balance/trial_balance.js:94
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:85
 msgid "Show zero values"
 msgstr "نمایش مقادیر صفر"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.js:30
+#: accounts/doctype/accounting_dimension/accounting_dimension.js:35
 msgid "Show {0}"
 msgstr "نمایش {0}"
 
@@ -65840,7 +66959,7 @@
 msgid "Simultaneous"
 msgstr "همزمان"
 
-#: stock/doctype/stock_entry/stock_entry.py:551
+#: stock/doctype/stock_entry/stock_entry.py:506
 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 ""
 
@@ -65863,7 +66982,7 @@
 msgid "Single Transaction Threshold"
 msgstr "آستانه معامله واحد"
 
-#: stock/doctype/item/item.js:103
+#: stock/doctype/item/item.js:131
 msgid "Single Variant"
 msgstr "تک نوع"
 
@@ -65899,7 +67018,7 @@
 msgid "Skipping Tax Withholding Category {0} as there is no associated account set for Company {1} in it."
 msgstr "رد شدن از دسته مالیات کسر مالیات {0} زیرا هیچ حساب مرتبطی برای شرکت {1} در آن تنظیم نشده است."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:49
 msgid "Skipping {0} of {1}, {2}"
 msgstr "پرش از {0} از {1}، {2}"
 
@@ -65913,7 +67032,7 @@
 msgid "Small"
 msgstr "کم اهمیت"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:68
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:67
 msgid "Smoothing Constant"
 msgstr "صاف کردن ثابت"
 
@@ -65922,7 +67041,7 @@
 msgid "Software"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:11
+#: assets/doctype/asset/asset_list.js:9
 msgid "Sold"
 msgstr "فروخته شد"
 
@@ -65932,24 +67051,29 @@
 msgid "Sold"
 msgstr "فروخته شد"
 
-#: www/book_appointment/index.js:239
+#: selling/page/point_of_sale/pos_past_order_summary.js:80
+msgid "Sold by"
+msgstr ""
+
+#: www/book_appointment/index.js:248
 msgid "Something went wrong please try again"
 msgstr "اشتباهی رخ داده لطفا دوباره تلاش کنید"
 
-#: accounts/doctype/pricing_rule/utils.py:747
+#: accounts/doctype/pricing_rule/utils.py:746
 msgid "Sorry, this coupon code is no longer valid"
 msgstr "با عرض پوزش، این کد کوپن دیگر معتبر نیست"
 
-#: accounts/doctype/pricing_rule/utils.py:745
+#: accounts/doctype/pricing_rule/utils.py:744
 msgid "Sorry, this coupon code's validity has expired"
 msgstr "با عرض پوزش، اعتبار این کد کوپن منقضی شده است"
 
-#: accounts/doctype/pricing_rule/utils.py:742
+#: accounts/doctype/pricing_rule/utils.py:741
 msgid "Sorry, this coupon code's validity has not started"
 msgstr "با عرض پوزش، اعتبار این کد کوپن شروع نشده است"
 
 #: crm/report/lead_details/lead_details.py:40
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:38
+#: templates/form_grid/stock_entry_grid.html:29
 msgid "Source"
 msgstr "منبع"
 
@@ -66055,10 +67179,10 @@
 msgid "Source Type"
 msgstr "نوع منبع"
 
-#: manufacturing/doctype/bom/bom.js:313
+#: manufacturing/doctype/bom/bom.js:326
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:126
-#: stock/dashboard/item_dashboard.js:215
-#: stock/doctype/stock_entry/stock_entry.js:547
+#: stock/dashboard/item_dashboard.js:223
+#: stock/doctype/stock_entry/stock_entry.js:627
 msgid "Source Warehouse"
 msgstr "انبار منبع"
 
@@ -66133,11 +67257,11 @@
 msgid "Source and Target Location cannot be same"
 msgstr "منبع و مکان هدف نمی توانند یکسان باشند"
 
-#: stock/doctype/stock_entry/stock_entry.py:640
+#: stock/doctype/stock_entry/stock_entry.py:595
 msgid "Source and target warehouse cannot be same for row {0}"
 msgstr "منبع و انبار هدف نمی توانند برای ردیف {0} یکسان باشند"
 
-#: stock/dashboard/item_dashboard.js:278
+#: stock/dashboard/item_dashboard.js:286
 msgid "Source and target warehouse must be different"
 msgstr "انبار منبع و هدف باید متفاوت باشد"
 
@@ -66146,8 +67270,8 @@
 msgid "Source of Funds (Liabilities)"
 msgstr "منبع وجوه (بدهی ها)"
 
-#: stock/doctype/stock_entry/stock_entry.py:617
-#: stock/doctype/stock_entry/stock_entry.py:634
+#: stock/doctype/stock_entry/stock_entry.py:572
+#: stock/doctype/stock_entry/stock_entry.py:589
 msgid "Source warehouse is mandatory for row {0}"
 msgstr "انبار منبع برای ردیف {0} اجباری است"
 
@@ -66185,16 +67309,26 @@
 msgid "Spacer"
 msgstr "اسپیسر"
 
-#: assets/doctype/asset/asset.js:467 stock/doctype/batch/batch.js:143
-#: support/doctype/issue/issue.js:100
+#. Description of a DocType
+#: setup/doctype/currency_exchange/currency_exchange.json
+msgid "Specify Exchange Rate to convert one currency into another"
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/shipping_rule/shipping_rule.json
+msgid "Specify conditions to calculate shipping amount"
+msgstr ""
+
+#: assets/doctype/asset/asset.js:540 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:162 support/doctype/issue/issue.js:112
 msgid "Split"
 msgstr "شکاف"
 
-#: assets/doctype/asset/asset.js:111 assets/doctype/asset/asset.js:451
+#: assets/doctype/asset/asset.js:135 assets/doctype/asset/asset.js:524
 msgid "Split Asset"
 msgstr "تقسیم دارایی"
 
-#: stock/doctype/batch/batch.js:142
+#: stock/doctype/batch/batch.js:161
 msgid "Split Batch"
 msgstr "دسته تقسیم"
 
@@ -66211,19 +67345,19 @@
 msgid "Split From"
 msgstr "تقسیم از"
 
-#: support/doctype/issue/issue.js:90
+#: support/doctype/issue/issue.js:100
 msgid "Split Issue"
 msgstr "موضوع تقسیم"
 
-#: assets/doctype/asset/asset.js:457
+#: assets/doctype/asset/asset.js:530
 msgid "Split Qty"
 msgstr "تقسیم تعداد"
 
-#: assets/doctype/asset/asset.py:1050
+#: assets/doctype/asset/asset.py:1054
 msgid "Split qty cannot be grater than or equal to asset qty"
 msgstr "مقدار تقسیم نمی‌تواند بیشتر یا مساوی تعداد دارایی باشد"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1827
+#: accounts/doctype/payment_entry/payment_entry.py:1846
 msgid "Splitting {0} {1} into {2} rows as per Payment Terms"
 msgstr "تقسیم {0} {1} به ردیف‌های {2} طبق شرایط پرداخت"
 
@@ -66286,11 +67420,26 @@
 msgid "Standard Template"
 msgstr "الگوی استاندارد"
 
+#. Description of a DocType
+#: setup/doctype/terms_and_conditions/terms_and_conditions.json
+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
 msgid "Standard rated supplies in {0}"
 msgstr "منابع دارای رتبه استاندارد در {0}"
 
+#. Description of a DocType
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Purchase Transactions. This template can contain a list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\", etc."
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Sales Transactions. This template can contain a list of tax heads and also other expense/income heads like \"Shipping\", \"Insurance\", \"Handling\" etc."
+msgstr ""
+
 #. Label of a Link field in DocType 'Supplier Scorecard Scoring Standing'
 #: buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
 msgctxt "Supplier Scorecard Scoring Standing"
@@ -66303,23 +67452,25 @@
 msgid "Standing Name"
 msgstr "نام ایستاده"
 
-#: manufacturing/doctype/work_order/work_order.js:591
+#: manufacturing/doctype/work_order/work_order.js:630
+#: manufacturing/doctype/workstation/workstation_job_card.html:67
+#: public/js/projects/timer.js:32
 msgid "Start"
 msgstr "شروع کنید"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:44
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:43
 msgid "Start / Resume"
 msgstr "شروع / از سرگیری"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:34
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:34
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:42
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:42
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:16
-#: accounts/report/payment_ledger/payment_ledger.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:68
+#: accounts/report/payment_ledger/payment_ledger.js:16
+#: assets/report/fixed_asset_register/fixed_asset_register.js:67
 #: projects/report/project_summary/project_summary.py:70
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
-#: public/js/financial_statements.js:184
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:17
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:47
+#: public/js/financial_statements.js:193
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:16
 msgid "Start Date"
 msgstr "تاریخ شروع"
 
@@ -66393,11 +67544,16 @@
 msgid "Start Date cannot be before the current date"
 msgstr "تاریخ شروع نمی تواند قبل از تاریخ فعلی باشد"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:133
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
+msgid "Start Deletion"
+msgstr ""
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 msgid "Start Import"
 msgstr "واردات را شروع کنید"
 
-#: manufacturing/doctype/job_card/job_card.js:244
+#: manufacturing/doctype/job_card/job_card.js:269
+#: manufacturing/doctype/workstation/workstation.js:190
 msgid "Start Job"
 msgstr "شروع کار"
 
@@ -66405,10 +67561,14 @@
 msgid "Start Merge"
 msgstr "ادغام را شروع کنید"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:85
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:95
 msgid "Start Reposting"
 msgstr "بازنشر را شروع کنید"
 
+#: manufacturing/doctype/workstation/workstation.js:159
+msgid "Start Time"
+msgstr "زمان شروع"
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -66437,11 +67597,11 @@
 msgid "Start Time can't be greater than or equal to End Time for {0}."
 msgstr "زمان شروع نمی تواند بزرگتر یا مساوی با زمان پایان برای {0} باشد."
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:48
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:48
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:56
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
 #: accounts/report/financial_ratios/financial_ratios.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:82
-#: public/js/financial_statements.js:198
+#: assets/report/fixed_asset_register/fixed_asset_register.js:81
+#: public/js/financial_statements.js:207
 msgid "Start Year"
 msgstr "سال شروع"
 
@@ -66475,7 +67635,7 @@
 msgid "Started Time"
 msgstr "زمان شروع"
 
-#: utilities/bulk_transaction.py:19
+#: utilities/bulk_transaction.py:22
 msgid "Started a background job to create {1} {0}"
 msgstr "یک کار پس‌زمینه برای ایجاد {1} {0} شروع کرد"
 
@@ -66492,7 +67652,7 @@
 msgstr "موقعیت شروع از لبه بالا"
 
 #: crm/report/lead_details/lead_details.py:59
-#: public/js/utils/contact_address_quick_entry.js:81
+#: public/js/utils/contact_address_quick_entry.js:84
 msgid "State"
 msgstr "حالت"
 
@@ -66520,68 +67680,76 @@
 msgid "Statement Import Log"
 msgstr "گزارش واردات بیانیه"
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:17
+#: accounts/report/general_ledger/general_ledger.html:1
+msgid "Statement of Account"
+msgstr ""
+
+#: 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
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order.js:298
-#: buying/doctype/purchase_order/purchase_order.js:300
-#: buying/doctype/purchase_order/purchase_order.js:304
+#: buying/doctype/purchase_order/purchase_order.js:317
+#: buying/doctype/purchase_order/purchase_order.js:323
+#: buying/doctype/purchase_order/purchase_order.js:329
+#: buying/doctype/purchase_order/purchase_order.js:335
+#: buying/doctype/purchase_order/purchase_order.js:337
+#: 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:53
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:52
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:173
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:134
-#: crm/report/lead_details/lead_details.js:31
+#: crm/report/lead_details/lead_details.js:30
 #: crm/report/lead_details/lead_details.py:25
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:34
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:39
-#: manufacturing/doctype/production_plan/production_plan.js:99
-#: manufacturing/doctype/production_plan/production_plan.js:103
-#: manufacturing/doctype/production_plan/production_plan.js:431
-#: manufacturing/doctype/work_order/work_order.js:352
-#: manufacturing/doctype/work_order/work_order.js:389
-#: manufacturing/doctype/work_order/work_order.js:565
-#: manufacturing/doctype/work_order/work_order.js:572
-#: manufacturing/doctype/work_order/work_order.js:576
-#: manufacturing/report/job_card_summary/job_card_summary.js:51
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:32
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:38
+#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:115
+#: manufacturing/doctype/production_plan/production_plan.js:466
+#: manufacturing/doctype/work_order/work_order.js:371
+#: manufacturing/doctype/work_order/work_order.js:407
+#: manufacturing/doctype/work_order/work_order.js:595
+#: manufacturing/doctype/work_order/work_order.js:606
+#: manufacturing/doctype/work_order/work_order.js:614
+#: 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/production_analytics/production_analytics.py:19
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:22
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:21
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:80
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:50
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:49
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:111
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:138
-#: manufacturing/report/work_order_summary/work_order_summary.js:37
+#: manufacturing/report/work_order_summary/work_order_summary.js:36
 #: manufacturing/report/work_order_summary/work_order_summary.py:202
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:35
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:25
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:24
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:92
-#: projects/report/project_summary/project_summary.js:24
+#: projects/report/project_summary/project_summary.js:23
 #: projects/report/project_summary/project_summary.py:58
-#: selling/doctype/sales_order/sales_order.js:517
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:528
-#: selling/doctype/sales_order/sales_order.js:539
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:90
+#: public/js/plant_floor_visual/visual_plant.js:111
+#: selling/doctype/sales_order/sales_order.js:553
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:567
+#: selling/doctype/sales_order/sales_order.js:584
+#: selling/doctype/sales_order/sales_order.js:590
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:88
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:68
-#: selling/report/sales_order_analysis/sales_order_analysis.js:55
+#: selling/report/sales_order_analysis/sales_order_analysis.js:54
 #: selling/report/sales_order_analysis/sales_order_analysis.py:228
-#: stock/doctype/delivery_note/delivery_note.js:210
-#: stock/doctype/delivery_note/delivery_note.js:229
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: stock/report/reserved_stock/reserved_stock.js:127
+#: stock/doctype/delivery_note/delivery_note.js:252
+#: stock/doctype/delivery_note/delivery_note.js:281
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: stock/report/reserved_stock/reserved_stock.js:124
 #: stock/report/reserved_stock/reserved_stock.py:178
 #: stock/report/serial_no_ledger/serial_no_ledger.py:51
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/report/issue_analytics/issue_analytics.js:52
-#: support/report/issue_summary/issue_summary.js:39
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:114
+#: support/report/issue_analytics/issue_analytics.js:51
+#: support/report/issue_summary/issue_summary.js:38
 #: templates/pages/projects.html:24 templates/pages/projects.html:46
-#: templates/pages/projects.html:66
+#: templates/pages/projects.html:66 templates/pages/task_info.html:69
+#: templates/pages/timelog_info.html:40
 msgid "Status"
 msgstr "وضعیت"
 
@@ -67049,12 +68217,24 @@
 msgid "Status"
 msgstr "وضعیت"
 
+#. Label of a Select field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status"
+msgstr "وضعیت"
+
 #. Label of a Section Break field in DocType 'Service Level Agreement'
 #: support/doctype/service_level_agreement/service_level_agreement.json
 msgctxt "Service Level Agreement"
 msgid "Status Details"
 msgstr "جزئیات وضعیت"
 
+#. Label of a Section Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status Illustration"
+msgstr ""
+
 #: projects/doctype/project/project.py:719
 msgid "Status must be Cancelled or Completed"
 msgstr "وضعیت باید لغو یا تکمیل شود"
@@ -67076,7 +68256,7 @@
 #. Label of a Card Break in the Home Workspace
 #. Name of a Workspace
 #: accounts/doctype/item_tax_template/item_tax_template_dashboard.py:11
-#: accounts/report/account_balance/account_balance.js:55
+#: accounts/report/account_balance/account_balance.js:57
 #: manufacturing/doctype/bom/bom_dashboard.py:14 setup/workspace/home/home.json
 #: stock/doctype/material_request/material_request_dashboard.py:17
 #: stock/workspace/stock/stock.json
@@ -67103,8 +68283,8 @@
 
 #: 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:1187
-#: accounts/report/account_balance/account_balance.js:56
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1239
+#: accounts/report/account_balance/account_balance.js:58
 msgid "Stock Adjustment"
 msgstr "تعدیل موجودی"
 
@@ -67128,7 +68308,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: public/js/stock_analytics.js:8
+#: public/js/stock_analytics.js:7
 #: stock/report/stock_analytics/stock_analytics.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Analytics"
@@ -67146,7 +68326,7 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:52
+#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:49
 #: stock/report/stock_balance/stock_balance.json
 #: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py:107
 #: stock/workspace/stock/stock.json
@@ -67159,10 +68339,14 @@
 msgid "Stock Balance"
 msgstr "تراز موجودی"
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:16
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:15
 msgid "Stock Balance Report"
 msgstr "گزارش تراز موجودی"
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:10
+msgid "Stock Capacity"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Stock Settings'
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
@@ -67193,12 +68377,12 @@
 msgid "Stock Details"
 msgstr "جزئیات موجودی"
 
-#: stock/doctype/stock_entry/stock_entry.py:730
+#: stock/doctype/stock_entry/stock_entry.py:685
 msgid "Stock Entries already created for Work Order {0}: {1}"
 msgstr "ورودی‌های موجودی قبلاً برای سفارش کار {0} ایجاد شده‌اند: {1}"
 
 #. Name of a DocType
-#: stock/doctype/pick_list/pick_list.js:104
+#: stock/doctype/pick_list/pick_list.js:116
 #: stock/doctype/stock_entry/stock_entry.json
 msgid "Stock Entry"
 msgstr "ورود موجودی"
@@ -67259,15 +68443,15 @@
 msgid "Stock Entry Type"
 msgstr "نوع ورود موجودی"
 
-#: stock/doctype/pick_list/pick_list.py:1020
+#: stock/doctype/pick_list/pick_list.py:1140
 msgid "Stock Entry has been already created against this Pick List"
 msgstr "ورود موجودی قبلاً در برابر این فهرست انتخابی ایجاد شده است"
 
-#: stock/doctype/batch/batch.js:104
+#: stock/doctype/batch/batch.js:115
 msgid "Stock Entry {0} created"
 msgstr "ورودی موجودی {0} ایجاد شد"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1140
+#: accounts/doctype/journal_entry/journal_entry.py:1167
 msgid "Stock Entry {0} is not submitted"
 msgstr "ورودی موجودی {0} ارسال نشده است"
 
@@ -67302,14 +68486,18 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: public/js/controllers/stock_controller.js:54
-#: public/js/utils/ledger_preview.js:27 stock/doctype/item/item.js:64
+#: public/js/controllers/stock_controller.js:66
+#: public/js/utils/ledger_preview.js:37 stock/doctype/item/item.js:68
 #: stock/doctype/item/item_dashboard.py:8
 #: stock/report/stock_ledger/stock_ledger.json stock/workspace/stock/stock.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:32
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:33
 msgid "Stock Ledger"
 msgstr "دفتر کل موجودی"
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts"
+msgstr ""
+
 #. 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
@@ -67338,7 +68526,7 @@
 msgid "Stock Ledger report contains every submitted stock transaction. You can use filter to narrow down ledger entries."
 msgstr ""
 
-#: stock/doctype/batch/batch.js:50 stock/doctype/item/item.js:403
+#: stock/doctype/batch/batch.js:58 stock/doctype/item/item.js:467
 msgid "Stock Levels"
 msgstr "سطوح موجودی"
 
@@ -67377,6 +68565,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_reconciliation/stock_reconciliation.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
@@ -67395,7 +68584,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: stock/doctype/item/item.js:70
+#: stock/doctype/item/item.js:78
 #: stock/report/stock_projected_qty/stock_projected_qty.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Projected Qty"
@@ -67444,7 +68633,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:90
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:123
-#: accounts/report/account_balance/account_balance.js:57
+#: accounts/report/account_balance/account_balance.js:59
 msgid "Stock Received But Not Billed"
 msgstr "موجودی دریافت شد اما صورتحساب نشد"
 
@@ -67495,20 +68684,20 @@
 msgid "Stock Reposting Settings"
 msgstr "تنظیمات ارسال مجدد موجودی"
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: selling/doctype/sales_order/sales_order.js:74
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:178
-#: stock/doctype/pick_list/pick_list.js:110
-#: stock/doctype/pick_list/pick_list.js:119
-#: stock/doctype/pick_list/pick_list.js:120
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:467
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:965
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:978
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:992
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1006
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1020
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1037
+#: selling/doctype/sales_order/sales_order.js:82
+#: selling/doctype/sales_order/sales_order.js:92
+#: selling/doctype/sales_order/sales_order.js:101
+#: selling/doctype/sales_order/sales_order.js:201
+#: 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_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
 msgid "Stock Reservation"
 msgstr "رزرو موجودی"
 
@@ -67518,18 +68707,18 @@
 msgid "Stock Reservation"
 msgstr "رزرو موجودی"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1144
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1146
 msgid "Stock Reservation Entries Cancelled"
 msgstr "ورودی های رزرو موجودی لغو شد"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1096
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1098
 msgid "Stock Reservation Entries Created"
 msgstr "نوشته های رزرو موجودی ایجاد شد"
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:383
+#: selling/doctype/sales_order/sales_order.js:413
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: stock/report/reserved_stock/reserved_stock.js:56
+#: stock/report/reserved_stock/reserved_stock.js:53
 #: stock/report/reserved_stock/reserved_stock.py:171
 msgid "Stock Reservation Entry"
 msgstr "ورود رزرو موجودی"
@@ -67542,7 +68731,7 @@
 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:614
+#: stock/doctype/delivery_note/delivery_note.py:675
 msgid "Stock Reservation Warehouse Mismatch"
 msgstr "عدم تطابق انبار رزرو انبار"
 
@@ -67562,7 +68751,7 @@
 msgid "Stock Reserved Qty (in Stock UOM)"
 msgstr "تعداد موجودی رزرو شده (در انبار UOM)"
 
-#: stock/doctype/stock_entry/stock_entry.py:1498
+#: stock/doctype/stock_entry/stock_entry.py:1507
 msgid "Stock Return"
 msgstr "بازده موجودی"
 
@@ -67590,6 +68779,13 @@
 msgid "Stock Summary"
 msgstr "خلاصه موجودی"
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Stock Summary"
+msgstr "خلاصه موجودی"
+
 #. Label of a Card Break in the Stock Workspace
 #: stock/workspace/stock/stock.json
 msgid "Stock Transactions"
@@ -67607,8 +68803,8 @@
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:232
 #: 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:398
-#: stock/report/stock_ledger/stock_ledger.py:117
+#: stock/report/stock_balance/stock_balance.py:406
+#: stock/report/stock_ledger/stock_ledger.py:190
 msgid "Stock UOM"
 msgstr "موجودی UOM"
 
@@ -67786,7 +68982,7 @@
 msgid "Stock UOM Quantity"
 msgstr "مقدار موجودی UOM"
 
-#: selling/doctype/sales_order/sales_order.js:368
+#: selling/doctype/sales_order/sales_order.js:398
 msgid "Stock Unreservation"
 msgstr "عدم رزرو موجودی"
 
@@ -67853,6 +69049,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -67893,27 +69090,31 @@
 msgid "Stock cannot be reserved in group warehouse {0}."
 msgstr "موجودی در انبار گروهی {0} قابل رزرو نیست."
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:908
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:910
 msgid "Stock cannot be reserved in the group warehouse {0}."
 msgstr "موجودی در انبار گروهی {0} قابل رزرو نیست."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1011
-msgid "Stock cannot be updated against Delivery Note {0}"
-msgstr "موجودی را نمی توان در مقابل یادداشت تحویل {0} به روز کرد"
-
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:673
 msgid "Stock cannot be updated against Purchase Receipt {0}"
 msgstr "موجودی را نمی توان در برابر رسید خرید به روز کرد {0}"
 
+#: accounts/doctype/sales_invoice/sales_invoice.py:1032
+msgid "Stock cannot be updated against the following Delivery Notes: {0}"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.py:1055
+msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
+msgstr ""
+
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:229
 msgid "Stock not available for Item {0} in Warehouse {1}."
 msgstr "موجودی برای کالای {0} در انبار {1} موجود نیست."
 
-#: selling/page/point_of_sale/pos_controller.js:679
+#: selling/page/point_of_sale/pos_controller.js:714
 msgid "Stock quantity not enough for Item Code: {0} under warehouse {1}. Available quantity {2} {3}."
 msgstr "مقدار موجودی برای کد مورد کافی نیست: {0} در انبار {1}. مقدار موجود {2} {3}."
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:241
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:252
 msgid "Stock transactions before {0} are frozen"
 msgstr "معاملات موجودی قبل از {0} مسدود می شوند"
 
@@ -67931,12 +69132,12 @@
 msgid "Stock will be reserved on submission of <b>Purchase Receipt</b> created against Material Receipt for Sales Order."
 msgstr "موجودی با ارسال <b>رسید خرید</b> ایجاد شده در برابر رسید مواد برای سفارش فروش رزرو می شود."
 
-#: stock/utils.py:579
+#: stock/utils.py:574
 msgid "Stock/Accounts can not be frozen as processing of backdated entries is going on. Please try again later."
 msgstr "موجودی/حساب‌ها را نمی‌توان مسدود کرد زیرا پردازش ورودی‌های به‌تاریخ در حال انجام است. لطفاً بعداً دوباره امتحان کنید."
 
-#: manufacturing/doctype/work_order/work_order.js:570
-#: stock/doctype/material_request/material_request.js:107
+#: manufacturing/doctype/work_order/work_order.js:602
+#: stock/doctype/material_request/material_request.js:109
 msgid "Stop"
 msgstr "متوقف کردن"
 
@@ -68012,11 +69213,11 @@
 msgid "Stopped"
 msgstr "متوقف شد"
 
-#: manufacturing/doctype/work_order/work_order.py:631
+#: manufacturing/doctype/work_order/work_order.py:645
 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
 msgstr "دستور کار متوقف شده را نمی توان لغو کرد، برای لغو، ابتدا آن را لغو کنید"
 
-#: setup/doctype/company/company.py:260
+#: 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
@@ -68053,7 +69254,12 @@
 msgid "Sub Assemblies & Raw Materials"
 msgstr "مجموعه های فرعی و مواد اولیه"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:264
+#: public/js/bom_configurator/bom_configurator.bundle.js:129
+#: public/js/bom_configurator/bom_configurator.bundle.js:159
+msgid "Sub Assembly"
+msgstr ""
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:271
 msgid "Sub Assembly Item"
 msgstr "مورد مونتاژ فرعی"
 
@@ -68125,7 +69331,7 @@
 msgid "Subcontract BOM"
 msgstr "قرارداد فرعی BOM"
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:37
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:36
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:128
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:22
 #: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:22
@@ -68137,7 +69343,7 @@
 msgid "Subcontract Order Summary"
 msgstr "خلاصه سفارش قرارداد فرعی"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:68
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
 msgid "Subcontract Return"
 msgstr "بازگشت قرارداد فرعی"
 
@@ -68173,10 +69379,10 @@
 msgstr "پیمانکاری فرعی BOM"
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: controllers/subcontracting_controller.py:806
+#: buying/doctype/purchase_order/purchase_order.js:369
+#: controllers/subcontracting_controller.py:810
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:78
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:95
 msgid "Subcontracting Order"
 msgstr "سفارش پیمانکاری فرعی"
 
@@ -68226,7 +69432,7 @@
 msgid "Subcontracting Order Supplied Item"
 msgstr "اقلام عرضه شده سفارش پیمانکاری فرعی"
 
-#: buying/doctype/purchase_order/purchase_order.py:861
+#: buying/doctype/purchase_order/purchase_order.py:864
 msgid "Subcontracting Order {0} created."
 msgstr "سفارش قرارداد فرعی {0} ایجاد شد."
 
@@ -68237,7 +69443,7 @@
 msgstr "سفارش خرید پیمانکاری فرعی"
 
 #. Name of a DocType
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:200
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Subcontracting Receipt"
 msgstr "رسید پیمانکاری فرعی"
@@ -68289,10 +69495,10 @@
 msgid "Subdivision"
 msgstr "زير مجموعه"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:219
-#: projects/doctype/task/task_tree.js:62
+#: buying/doctype/request_for_quotation/request_for_quotation.js:237
+#: projects/doctype/task/task_tree.js:65
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:91
-#: support/doctype/issue/issue.js:96
+#: support/doctype/issue/issue.js:106 templates/pages/task_info.html:44
 msgid "Subject"
 msgstr "موضوع"
 
@@ -68344,15 +69550,16 @@
 msgid "Subject"
 msgstr "موضوع"
 
-#: accounts/doctype/payment_order/payment_order.js:120
-#: public/js/payment/payments.js:28
-#: selling/page/point_of_sale/pos_controller.js:101
-#: www/book_appointment/index.html:59
+#: accounts/doctype/payment_order/payment_order.js:137
+#: manufacturing/doctype/workstation/workstation.js:237
+#: public/js/payment/payments.js:30
+#: selling/page/point_of_sale/pos_controller.js:119
+#: templates/pages/task_info.html:101 www/book_appointment/index.html:59
 msgid "Submit"
 msgstr "ارسال"
 
-#: buying/doctype/purchase_order/purchase_order.py:857
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:698
+#: buying/doctype/purchase_order/purchase_order.py:860
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:699
 msgid "Submit Action Failed"
 msgstr "اقدام ارسال نشد"
 
@@ -68380,14 +69587,18 @@
 msgid "Submit Journal Entries"
 msgstr "ارسال مطالب مجله"
 
-#: manufacturing/doctype/work_order/work_order.js:135
+#: manufacturing/doctype/work_order/work_order.js:139
 msgid "Submit this Work Order for further processing."
 msgstr "این سفارش کاری را برای پردازش بیشتر ارسال کنید."
 
-#: assets/doctype/asset/asset_list.js:32
+#: buying/doctype/request_for_quotation/request_for_quotation.py:265
+msgid "Submit your Quotation"
+msgstr ""
+
+#: assets/doctype/asset/asset_list.js:23
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:15
-#: stock/doctype/stock_entry/stock_entry_list.js:21
-#: templates/pages/material_request_info.html:24 templates/pages/order.html:58
+#: stock/doctype/stock_entry/stock_entry_list.js:27
+#: templates/pages/material_request_info.html:24 templates/pages/order.html:70
 msgid "Submitted"
 msgstr "ارسال شده"
 
@@ -68651,11 +69862,11 @@
 msgid "Succeeded"
 msgstr "موفق شد"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:6
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:7
 msgid "Succeeded Entries"
 msgstr "ورودی های موفق"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Success"
 msgstr "موفقیت"
 
@@ -68690,11 +69901,11 @@
 msgid "Successful"
 msgstr "موفقیت آمیز"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:538
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:543
 msgid "Successfully Reconciled"
 msgstr "با موفقیت آشتی کرد"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:164
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:171
 msgid "Successfully Set Supplier"
 msgstr "تامین کننده با موفقیت تنظیم شد"
 
@@ -68702,31 +69913,31 @@
 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM."
 msgstr "UOM موجودی با موفقیت تغییر کرد، لطفاً فاکتورهای تبدیل را برای UOM جدید دوباره تعریف کنید."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:468
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:430
 msgid "Successfully imported {0}"
 msgstr "{0} با موفقیت وارد شد"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:182
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:161
 msgid "Successfully imported {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr "{0} رکورد از {1} با موفقیت وارد شد. روی Export Errored Rows کلیک کنید، خطاها را برطرف کرده و دوباره وارد کنید."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:166
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:145
 msgid "Successfully imported {0} record."
 msgstr "رکورد {0} با موفقیت وارد شد."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:178
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:157
 msgid "Successfully imported {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr "{0} رکورد از {1} با موفقیت وارد شد. روی Export Errored Rows کلیک کنید، خطاها را برطرف کرده و دوباره وارد کنید."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:165
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:144
 msgid "Successfully imported {0} records."
 msgstr "{0} رکورد با موفقیت وارد شد."
 
-#: buying/doctype/supplier/supplier.js:177
+#: buying/doctype/supplier/supplier.js:210
 msgid "Successfully linked to Customer"
 msgstr "با موفقیت به مشتری پیوند داده شد"
 
-#: selling/doctype/customer/customer.js:222
+#: selling/doctype/customer/customer.js:243
 msgid "Successfully linked to Supplier"
 msgstr "با موفقیت به تامین کننده پیوند داده شد"
 
@@ -68734,23 +69945,23 @@
 msgid "Successfully merged {0} out of {1}."
 msgstr "{0} از {1} با موفقیت ادغام شد."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:478
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:438
 msgid "Successfully updated {0}"
 msgstr "با موفقیت به روز شد {0}"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:193
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:172
 msgid "Successfully updated {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr "{0} رکورد از {1} با موفقیت به روز شد. روی Export Errored Rows کلیک کنید، خطاها را برطرف کرده و دوباره وارد کنید."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:171
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:150
 msgid "Successfully updated {0} record."
 msgstr "رکورد {0} با موفقیت به روز شد."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:189
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:168
 msgid "Successfully updated {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr "{0} رکورد از {1} با موفقیت به روز شد. روی Export Errored Rows کلیک کنید، خطاها را برطرف کرده و دوباره وارد کنید."
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:170
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:149
 msgid "Successfully updated {0} records."
 msgstr "رکورد {0} با موفقیت به روز شد."
 
@@ -68880,30 +70091,30 @@
 
 #. Name of a DocType
 #. Label of a Card Break in the Buying Workspace
-#: accounts/doctype/payment_order/payment_order.js:100
+#: accounts/doctype/payment_order/payment_order.js:110
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:61
 #: 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/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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:38
-#: buying/doctype/request_for_quotation/request_for_quotation.js:156
-#: buying/doctype/request_for_quotation/request_for_quotation.js:208
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:167
+#: 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/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:16
+#: 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:16
+#: 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/workspace/buying/buying.json public/js/purchase_trends_filters.js:50
-#: public/js/purchase_trends_filters.js:66
+#: public/js/purchase_trends_filters.js:63
 #: regional/report/irs_1099/irs_1099.py:79
-#: selling/doctype/customer/customer.js:207
-#: selling/doctype/sales_order/sales_order.js:1005
+#: 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
 msgid "Supplier"
 msgstr "تامین کننده"
@@ -69209,15 +70420,15 @@
 msgstr "جزئیات تامین کننده"
 
 #. Name of a DocType
-#: accounts/report/accounts_payable/accounts_payable.js:122
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:105
-#: accounts/report/accounts_receivable/accounts_receivable.py:1110
+#: 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/purchase_register/purchase_register.js:27
 #: accounts/report/purchase_register/purchase_register.py:186
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:56
-#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: 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
@@ -69299,7 +70510,7 @@
 msgid "Supplier Invoice"
 msgstr "فاکتور تامین کننده"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:216
 msgid "Supplier Invoice Date"
 msgstr "تاریخ فاکتور تامین کننده"
 
@@ -69309,13 +70520,14 @@
 msgid "Supplier Invoice Date"
 msgstr "تاریخ فاکتور تامین کننده"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1550
 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.py:656
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: 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
 msgid "Supplier Invoice No"
 msgstr "شماره فاکتور تامین کننده"
 
@@ -69331,7 +70543,7 @@
 msgid "Supplier Invoice No"
 msgstr "شماره فاکتور تامین کننده"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1575
 msgid "Supplier Invoice No exists in Purchase Invoice {0}"
 msgstr "فاکتور تامین کننده در فاکتور خرید وجود ندارد {0}"
 
@@ -69361,12 +70573,12 @@
 msgid "Supplier Ledger Summary"
 msgstr "خلاصه کتاب تامین کننده"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1041
+#: accounts/report/accounts_receivable/accounts_receivable.py:1049
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
 #: 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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:74
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:73
 msgid "Supplier Name"
 msgstr "نام تامین کننده"
 
@@ -69496,14 +70708,14 @@
 msgstr "تماس اصلی تامین کننده"
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:458
-#: buying/doctype/request_for_quotation/request_for_quotation.js:42
+#: buying/doctype/purchase_order/purchase_order.js:529
+#: 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
-#: crm/doctype/opportunity/opportunity.js:82
-#: stock/doctype/material_request/material_request.js:147
+#: crm/doctype/opportunity/opportunity.js:81
+#: stock/doctype/material_request/material_request.js:170
 msgid "Supplier Quotation"
 msgstr "نقل قول تامین کننده"
 
@@ -69555,7 +70767,7 @@
 msgid "Supplier Quotation Item"
 msgstr "مورد نقل قول تامین کننده"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:409
+#: buying/doctype/request_for_quotation/request_for_quotation.py:433
 msgid "Supplier Quotation {0} Created"
 msgstr "نقل قول تامین کننده {0} ایجاد شد"
 
@@ -69683,6 +70895,11 @@
 msgid "Supplier delivers to Customer"
 msgstr "تامین کننده به مشتری تحویل می دهد"
 
+#. Description of a DocType
+#: buying/doctype/supplier/supplier.json
+msgid "Supplier of Goods or Services."
+msgstr ""
+
 #: buying/doctype/supplier_quotation/supplier_quotation.py:167
 msgid "Supplier {0} not found in {1}"
 msgstr "تامین کننده {0} در {1} یافت نشد"
@@ -69773,7 +70990,7 @@
 msgid "Suspended"
 msgstr "معلق"
 
-#: selling/page/point_of_sale/pos_payment.js:308
+#: selling/page/point_of_sale/pos_payment.js:325
 msgid "Switch Between Payment Modes"
 msgstr "جابجایی بین حالت های پرداخت"
 
@@ -69869,6 +71086,7 @@
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 #: manufacturing/doctype/job_card/job_card.json
+#: manufacturing/doctype/plant_floor/plant_floor.json
 #: projects/doctype/activity_type/activity_type.json
 #: projects/doctype/project_template/project_template.json
 #: projects/doctype/project_type/project_type.json
@@ -69956,7 +71174,7 @@
 msgid "System will fetch all the entries if limit value is zero."
 msgstr "اگر مقدار حد صفر باشد، سیستم تمام ورودی ها را واکشی می کند."
 
-#: controllers/accounts_controller.py:1673
+#: controllers/accounts_controller.py:1762
 msgid "System will not check over billing since amount for Item {0} in {1} is zero"
 msgstr "سیستم صورت‌حساب را بررسی نمی‌کند زیرا مبلغ مورد {0} در {1} صفر است"
 
@@ -69967,11 +71185,19 @@
 msgid "System will notify to increase or decrease quantity or amount "
 msgstr " سیستم برای افزایش یا کاهش مقدار یا مقدار اطلاع خواهد داد"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TCS Amount"
+msgstr ""
+
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TCS Rate %"
 msgstr ""
 
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TDS Amount"
+msgstr ""
+
 #. Name of a report
 #: accounts/report/tds_computation_summary/tds_computation_summary.json
 msgid "TDS Computation Summary"
@@ -69981,7 +71207,7 @@
 msgid "TDS Payable"
 msgstr "TDS قابل پرداخت"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TDS Rate %"
 msgstr ""
@@ -69992,7 +71218,12 @@
 msgid "TS-.YYYY.-"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:427
+#. Description of a DocType
+#: stock/doctype/item_website_specification/item_website_specification.json
+msgid "Table for Item that will be shown in Web Site"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:466
 msgid "Tag"
 msgstr "برچسب بزنید"
 
@@ -70034,10 +71265,14 @@
 msgid "Tally Migration"
 msgstr "تالی مهاجرت"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:32
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:34
 msgid "Tally Migration Error"
 msgstr "خطای مهاجرت Tally"
 
+#: templates/form_grid/stock_entry_grid.html:36
+msgid "Target"
+msgstr "هدف"
+
 #. Label of a Data field in DocType 'Quality Goal Objective'
 #: quality_management/doctype/quality_goal_objective/quality_goal_objective.json
 msgctxt "Quality Goal Objective"
@@ -70072,23 +71307,23 @@
 msgid "Target Asset Location"
 msgstr "مکان دارایی مورد نظر"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:248
+#: assets/doctype/asset_capitalization/asset_capitalization.py:254
 msgid "Target Asset {0} cannot be cancelled"
 msgstr "دارایی هدف {0} قابل لغو نیست"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:246
+#: assets/doctype/asset_capitalization/asset_capitalization.py:252
 msgid "Target Asset {0} cannot be submitted"
 msgstr "دارایی هدف {0} قابل ارسال نیست"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:242
+#: assets/doctype/asset_capitalization/asset_capitalization.py:248
 msgid "Target Asset {0} cannot be {1}"
 msgstr "دارایی هدف {0} نمی تواند {1} باشد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:252
+#: assets/doctype/asset_capitalization/asset_capitalization.py:258
 msgid "Target Asset {0} does not belong to company {1}"
 msgstr "دارایی هدف {0} به شرکت {1} تعلق ندارد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:233
+#: assets/doctype/asset_capitalization/asset_capitalization.py:239
 msgid "Target Asset {0} needs to be composite asset"
 msgstr "دارایی هدف {0} باید دارایی ترکیبی باشد"
 
@@ -70168,15 +71403,15 @@
 msgid "Target Item Name"
 msgstr "نام مورد هدف"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:203
+#: assets/doctype/asset_capitalization/asset_capitalization.py:209
 msgid "Target Item {0} is neither a Fixed Asset nor a Stock Item"
 msgstr "مورد هدف {0} نه یک دارایی ثابت است و نه یک کالای موجودی"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:207
+#: assets/doctype/asset_capitalization/asset_capitalization.py:213
 msgid "Target Item {0} must be a Fixed Asset item"
 msgstr "مورد هدف {0} باید یک مورد دارایی ثابت باشد"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:209
+#: assets/doctype/asset_capitalization/asset_capitalization.py:215
 msgid "Target Item {0} must be a Stock Item"
 msgstr "مورد هدف {0} باید یک مورد موجودی باشد"
 
@@ -70198,9 +71433,9 @@
 msgid "Target Location or To Employee is required while receiving Asset {0}"
 msgstr "هنگام دریافت دارایی {0}، مکان هدف یا به کارمند الزامی است"
 
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:42
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:42
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:42
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:41
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:41
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:41
 msgid "Target On"
 msgstr "هدف را روشن کنید"
 
@@ -70216,7 +71451,7 @@
 msgid "Target Qty"
 msgstr "مقدار هدف"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:214
+#: assets/doctype/asset_capitalization/asset_capitalization.py:220
 msgid "Target Qty must be a positive number"
 msgstr "تعداد هدف باید یک عدد مثبت باشد"
 
@@ -70226,8 +71461,8 @@
 msgid "Target Serial No"
 msgstr "شماره سریال هدف"
 
-#: stock/dashboard/item_dashboard.js:222
-#: stock/doctype/stock_entry/stock_entry.js:549
+#: stock/dashboard/item_dashboard.js:230
+#: stock/doctype/stock_entry/stock_entry.js:633
 msgid "Target Warehouse"
 msgstr "انبار هدف"
 
@@ -70286,16 +71521,16 @@
 msgid "Target Warehouse Address"
 msgstr "آدرس انبار هدف"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:224
+#: assets/doctype/asset_capitalization/asset_capitalization.py:230
 msgid "Target Warehouse is mandatory for Decapitalization"
 msgstr "انبار هدف برای کاهش سرمایه اجباری است"
 
-#: controllers/selling_controller.py:685
+#: controllers/selling_controller.py:709
 msgid "Target Warehouse is set for some items but the customer is not an internal customer."
 msgstr "انبار هدف برای برخی اقلام تنظیم شده است اما مشتری مشتری داخلی نیست."
 
-#: stock/doctype/stock_entry/stock_entry.py:623
-#: stock/doctype/stock_entry/stock_entry.py:630
+#: stock/doctype/stock_entry/stock_entry.py:578
+#: stock/doctype/stock_entry/stock_entry.py:585
 msgid "Target warehouse is mandatory for row {0}"
 msgstr "انبار هدف برای ردیف {0} اجباری است"
 
@@ -70327,8 +71562,8 @@
 #: projects/doctype/task/task.json projects/doctype/task/task_tree.js:17
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:33
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:90
-#: public/js/projects/timer.js:11 support/doctype/issue/issue.js:22
-#: templates/pages/projects.html:56
+#: public/js/projects/timer.js:15 support/doctype/issue/issue.js:27
+#: templates/pages/projects.html:56 templates/pages/timelog_info.html:28
 msgid "Task"
 msgstr "وظیفه"
 
@@ -70436,6 +71671,12 @@
 msgid "Tasks"
 msgstr "وظایف"
 
+#. Label of a Section Break field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Tasks"
+msgstr "وظایف"
+
 #: projects/report/project_summary/project_summary.py:62
 msgid "Tasks Completed"
 msgstr "وظایف تکمیل شد"
@@ -70444,7 +71685,7 @@
 msgid "Tasks Overdue"
 msgstr "وظایف عقب افتاده"
 
-#: accounts/report/account_balance/account_balance.js:58
+#: accounts/report/account_balance/account_balance.js:60
 msgid "Tax"
 msgstr "مالیات"
 
@@ -70484,7 +71725,6 @@
 msgid "Tax Account"
 msgstr "حساب مالیاتی"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:247
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:137
 msgid "Tax Amount"
 msgstr "مقدار مالیات"
@@ -70707,11 +71947,11 @@
 msgid "Tax ID"
 msgstr "شناسه مالیاتی"
 
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:86
+#: 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/supplier_ledger_summary/supplier_ledger_summary.js:68
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:67
 msgid "Tax Id"
 msgstr "شناسه مالیاتی"
 
@@ -70746,6 +71986,8 @@
 msgstr "شناسه مالیاتی"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:32
+#: accounts/report/accounts_receivable/accounts_receivable.html:19
+#: accounts/report/general_ledger/general_ledger.html:14
 msgid "Tax Id: "
 msgstr " شناسه مالیاتی:"
 
@@ -70754,7 +71996,7 @@
 msgid "Tax Masters"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:119
+#: accounts/doctype/account/account_tree.js:160
 msgid "Tax Rate"
 msgstr "نرخ مالیات"
 
@@ -70968,7 +72210,7 @@
 msgid "Tax will be withheld only for amount exceeding the cumulative threshold"
 msgstr "مالیات فقط برای مبلغی که بیش از آستانه تجمعی باشد، کسر خواهد شد"
 
-#: controllers/taxes_and_totals.py:1018
+#: controllers/taxes_and_totals.py:1019
 msgid "Taxable Amount"
 msgstr "مبلغ مشمول مالیات"
 
@@ -71123,55 +72365,55 @@
 msgid "Taxes and Charges Added (Company Currency)"
 msgstr "مالیات ها و هزینه های اضافه شده (ارز شرکت)"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "محاسبه مالیات و عوارض"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "محاسبه مالیات و عوارض"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "محاسبه مالیات و عوارض"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "محاسبه مالیات و عوارض"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "محاسبه مالیات و عوارض"
 
-#. Label of a Long Text field in DocType 'Quotation'
+#. Label of a Text Editor field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Taxes and Charges Calculation"
 msgstr "محاسبه مالیات و عوارض"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "محاسبه مالیات و عوارض"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "محاسبه مالیات و عوارض"
 
-#. Label of a Long Text field in DocType 'Supplier Quotation'
+#. Label of a Markdown Editor field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Taxes and Charges Calculation"
@@ -71247,7 +72489,7 @@
 msgid "Telephony Call Type"
 msgstr "نوع تماس تلفنی"
 
-#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:12
+#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:20
 msgid "Template"
 msgstr "قالب"
 
@@ -71263,11 +72505,11 @@
 msgid "Template"
 msgstr "قالب"
 
-#: manufacturing/doctype/bom/bom.js:279
+#: manufacturing/doctype/bom/bom.js:292
 msgid "Template Item"
 msgstr "مورد الگو"
 
-#: stock/get_item_details.py:219
+#: stock/get_item_details.py:224
 msgid "Template Item Selected"
 msgstr "مورد الگو انتخاب شد"
 
@@ -71307,11 +72549,11 @@
 msgid "Template Warnings"
 msgstr "هشدارهای الگو"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:38
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:29
 msgid "Temporarily on Hold"
 msgstr "به طور موقت در حالت تعلیق"
 
-#: accounts/report/account_balance/account_balance.js:59
+#: accounts/report/account_balance/account_balance.js:61
 msgid "Temporary"
 msgstr "موقت"
 
@@ -71578,34 +72820,34 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:145
-#: accounts/report/accounts_receivable/accounts_receivable.py:1094
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1102
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
+#: 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/inactive_sales_items/inactive_sales_items.js:9
+#: 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
-#: crm/report/lead_details/lead_details.js:47
+#: crm/report/lead_details/lead_details.js:46
 #: crm/report/lead_details/lead_details.py:34
-#: crm/report/lost_opportunity/lost_opportunity.js:37
+#: 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/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:48
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:46
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:39
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:60
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:59
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:39
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:48
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:46
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:60
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:59
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:71
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:72
 #: selling/report/territory_wise_sales/territory_wise_sales.py:22
 #: setup/doctype/territory/territory.json
 msgid "Territory"
@@ -71784,7 +73026,7 @@
 msgid "The 'From Package No.' field must neither be empty nor it's value less than 1."
 msgstr "از بسته شماره. فیلد نه باید خالی باشد و نه مقدار آن کمتر از 1 باشد."
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:331
+#: buying/doctype/request_for_quotation/request_for_quotation.py:355
 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings."
 msgstr "دسترسی به درخواست نقل قول از پورتال غیرفعال است. برای اجازه دسترسی، آن را در تنظیمات پورتال فعال کنید."
 
@@ -71830,7 +73072,7 @@
 msgid "The GL Entries will be cancelled in the background, it can take a few minutes."
 msgstr "ورودی‌های GL در پس‌زمینه لغو می‌شوند، ممکن است چند دقیقه طول بکشد."
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:176
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:177
 msgid "The GL Entries will be processed in the background, it can take a few minutes."
 msgstr "ورودی‌های GL در پس‌زمینه پردازش می‌شوند، ممکن است چند دقیقه طول بکشد."
 
@@ -71838,7 +73080,7 @@
 msgid "The Loyalty Program isn't valid for the selected company"
 msgstr "برنامه وفاداری برای شرکت انتخابی معتبر نیست"
 
-#: accounts/doctype/payment_request/payment_request.py:747
+#: accounts/doctype/payment_request/payment_request.py:750
 msgid "The Payment Request {0} is already paid, cannot process payment twice"
 msgstr "درخواست پرداخت {0} قبلاً پرداخت شده است، نمی‌توان پرداخت را دو بار پردازش کرد"
 
@@ -71846,11 +73088,11 @@
 msgid "The Payment Term at row {0} is possibly a duplicate."
 msgstr "مدت پرداخت در ردیف {0} احتمالاً تکراری است."
 
-#: stock/doctype/pick_list/pick_list.py:132
+#: stock/doctype/pick_list/pick_list.py:167
 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:1761
+#: stock/doctype/stock_entry/stock_entry.py:1770
 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
 msgstr "Process Loss Qty مطابق با کارت های شغلی Process Loss Ty بازنشانی شده است"
 
@@ -71859,7 +73101,7 @@
 msgid "The Selling Module is all set up!"
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:17
 msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing. <br><br> When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field."
 msgstr "ورودی موجودی از نوع \"ساخت\" به عنوان پسرفت شناخته می شود. مواد اولیه ای که برای تولید کالاهای نهایی مصرف می شود به عنوان بک فلاشینگ شناخته می شود. <br><br> هنگام ایجاد Entry ساخت، اقلام مواد خام بر اساس BOM اقلام تولیدی، بک فلاش می شوند. اگر می‌خواهید اقلام مواد خام بر اساس ورودی انتقال مواد که در مقابل آن سفارش کار انجام شده است، بک فلاش شوند، می‌توانید آن را در این قسمت تنظیم کنید."
 
@@ -71882,7 +73124,7 @@
 msgid "The accounts are set by the system automatically but do confirm these defaults"
 msgstr "حساب ها توسط سیستم به طور خودکار تنظیم می شوند اما این پیش فرض ها را تأیید کنید"
 
-#: accounts/doctype/payment_request/payment_request.py:144
+#: accounts/doctype/payment_request/payment_request.py:147
 msgid "The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document."
 msgstr "مقدار {0} تنظیم شده در این درخواست پرداخت با مقدار محاسبه شده همه طرح‌های پرداخت متفاوت است: {1}. قبل از ارسال سند از صحت این موضوع اطمینان حاصل کنید."
 
@@ -71890,7 +73132,7 @@
 msgid "The currency of invoice {} ({}) is different from the currency of this dunning ({})."
 msgstr "واحد پول فاکتور {} ({}) با واحد پول این دونینگ ({}) متفاوت است."
 
-#: manufacturing/doctype/work_order/work_order.js:812
+#: manufacturing/doctype/work_order/work_order.js:871
 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM."
 msgstr "BOM پیش‌فرض برای آن مورد توسط سیستم واکشی می‌شود. شما همچنین می توانید BOM را تغییر دهید."
 
@@ -71927,7 +73169,7 @@
 msgid "The following Items, having Putaway Rules, could not be accomodated:"
 msgstr "موارد زیر که دارای قوانین Putaway هستند، قابل استفاده نیستند:"
 
-#: assets/doctype/asset/depreciation.py:414
+#: assets/doctype/asset/depreciation.py:412
 msgid "The following assets have failed to automatically post depreciation entries: {0}"
 msgstr "دارایی های زیر به طور خودکار ورودی های استهلاک را پست نکرده اند: {0}"
 
@@ -71939,7 +73181,7 @@
 msgid "The following employees are currently still reporting to {0}:"
 msgstr "کارمندان زیر در حال حاضر همچنان به {0} گزارش می دهند:"
 
-#: stock/doctype/material_request/material_request.py:773
+#: stock/doctype/material_request/material_request.py:785
 msgid "The following {0} were created: {1}"
 msgstr "{0} زیر ایجاد شد: {1}"
 
@@ -71985,7 +73227,7 @@
 msgid "The parent account {0} does not exists in the uploaded template"
 msgstr "حساب والد {0} در الگوی آپلود شده وجود ندارد"
 
-#: accounts/doctype/payment_request/payment_request.py:133
+#: accounts/doctype/payment_request/payment_request.py:136
 msgid "The payment gateway account in plan {0} is different from the payment gateway account in this payment request"
 msgstr "حساب درگاه پرداخت در طرح {0} با حساب درگاه پرداخت در این درخواست پرداخت متفاوت است"
 
@@ -72010,15 +73252,15 @@
 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:742
+#: public/js/utils.js:814
 msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?"
 msgstr "با به‌روزرسانی موارد، موجودی رزرو شده آزاد می‌شود. آیا مطمئن هستید که می خواهید ادامه دهید؟"
 
-#: stock/doctype/pick_list/pick_list.js:116
+#: stock/doctype/pick_list/pick_list.js:137
 msgid "The reserved stock will be released. Are you certain you wish to proceed?"
 msgstr "موجودی رزرو شده آزاد خواهد شد. آیا مطمئن هستید که می خواهید ادامه دهید؟"
 
-#: accounts/doctype/account/account.py:198
+#: accounts/doctype/account/account.py:217
 msgid "The root account {0} must be a group"
 msgstr "حساب ریشه {0} باید یک گروه باشد"
 
@@ -72034,7 +73276,7 @@
 msgid "The selected item cannot have Batch"
 msgstr "مورد انتخاب شده نمی تواند دسته ای داشته باشد"
 
-#: assets/doctype/asset/asset.js:570
+#: assets/doctype/asset/asset.js:643
 msgid "The selected {0} does not contain the selected Asset Item."
 msgstr "{0} انتخاب شده حاوی مورد دارایی انتخابی نیست."
 
@@ -72058,7 +73300,7 @@
 msgid "The shares don't exist with the {0}"
 msgstr "اشتراک‌گذاری‌ها با {0} وجود ندارند"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:461
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:515
 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 "موجودی برای اقلام و انبارهای زیر رزرو شده است، همان را در {0} تطبیق موجودی لغو کنید: <br /><br /> {1}"
 
@@ -72066,24 +73308,16 @@
 msgid "The sync has started in the background, please check the {0} list for new records."
 msgstr "همگام سازی در پس زمینه شروع شده است، لطفاً لیست {0} را برای رکوردهای جدید بررسی کنید."
 
-#: accounts/doctype/journal_entry/journal_entry.py:155
 #: accounts/doctype/journal_entry/journal_entry.py:162
+#: accounts/doctype/journal_entry/journal_entry.py:169
 msgid "The task has been enqueued as a background job."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:244
-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 Entry and revert to the Draft stage"
-msgstr "وظیفه به عنوان یک کار پس زمینه در نوبت قرار گرفته است. در صورت وجود هرگونه مشکل در پردازش در پس‌زمینه، سیستم نظری در مورد خطا در این ورود موجودی اضافه می‌کند و به مرحله پیش‌نویس باز می‌گردد."
-
-#: stock/doctype/stock_entry/stock_entry.py:255
-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 Entry and revert to the Submitted stage"
-msgstr "وظیفه به عنوان یک کار پس زمینه در نوبت قرار گرفته است. در صورت وجود هرگونه مشکل در پردازش در پس‌زمینه، سیستم نظری در مورد خطا در این ورود موجودی اضافه می‌کند و به مرحله ارسال باز می‌گردد."
-
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:754
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:808
 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:765
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:819
 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 "وظیفه به عنوان یک کار پس زمینه در نوبت قرار گرفته است. در صورت وجود هرگونه مشکل در پردازش در پس‌زمینه، سیستم نظری در مورد خطا در این تطبیق موجودی اضافه می‌کند و به مرحله ارسال باز می‌گردد."
 
@@ -72110,31 +73344,31 @@
 msgid "The value {0} is already assigned to an existing Item {1}."
 msgstr "مقدار {0} قبلاً به یک مورد موجود {1} اختصاص داده شده است."
 
-#: manufacturing/doctype/work_order/work_order.js:832
+#: manufacturing/doctype/work_order/work_order.js:899
 msgid "The warehouse where you store finished Items before they are shipped."
 msgstr "انباری که اقلام تمام شده را قبل از ارسال در آن ذخیره می کنید."
 
-#: manufacturing/doctype/work_order/work_order.js:827
+#: manufacturing/doctype/work_order/work_order.js:892
 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage."
 msgstr "انباری که مواد اولیه خود را در آن نگهداری می کنید. هر کالای مورد نیاز می تواند یک انبار منبع جداگانه داشته باشد. انبار گروهی نیز می تواند به عنوان انبار منبع انتخاب شود. پس از ارسال سفارش کار، مواد اولیه در این انبارها برای استفاده تولید رزرو می شود."
 
-#: manufacturing/doctype/work_order/work_order.js:837
+#: manufacturing/doctype/work_order/work_order.js:904
 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 "انباری که هنگام شروع تولید، اقلام شما در آن منتقل می شوند. انبار گروهی همچنین می تواند به عنوان انبار Work in Progress انتخاب شود."
 
-#: manufacturing/doctype/job_card/job_card.py:671
+#: manufacturing/doctype/job_card/job_card.py:678
 msgid "The {0} ({1}) must be equal to {2} ({3})"
 msgstr "{0} ({1}) باید برابر با {2} ({3}) باشد"
 
-#: stock/doctype/material_request/material_request.py:779
+#: stock/doctype/material_request/material_request.py:791
 msgid "The {0} {1} created successfully"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:762
+#: manufacturing/doctype/job_card/job_card.py:769
 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
 msgstr "{0} {1} برای محاسبه هزینه ارزیابی کالای نهایی {2} استفاده می‌شود."
 
-#: assets/doctype/asset/asset.py:501
+#: assets/doctype/asset/asset.py:503
 msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
 msgstr "تعمیر و نگهداری یا تعمیرات فعال در برابر دارایی وجود دارد. قبل از لغو دارایی، باید همه آنها را تکمیل کنید."
 
@@ -72142,19 +73376,27 @@
 msgid "There are inconsistencies between the rate, no of shares and the amount calculated"
 msgstr "بین نرخ، تعداد سهام و مبلغ محاسبه شده ناهماهنگی وجود دارد"
 
-#: utilities/bulk_transaction.py:41
+#: accounts/doctype/account/account.py:202
+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
 msgid "There are no Failed transactions"
 msgstr "هیچ تراکنش ناموفقی وجود ندارد"
 
-#: www/book_appointment/index.js:89
+#: setup/demo.py:108
+msgid "There are no active Fiscal Years for which Demo Data can be generated."
+msgstr ""
+
+#: www/book_appointment/index.js:95
 msgid "There are no slots available on this date"
 msgstr "هیچ اسلاتی در این تاریخ موجود نیست"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:245
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:273
 msgid "There are only {0} asset created or linked to {1}. Please create or link {2} Assets with respective document."
 msgstr "فقط {0} دارایی ایجاد شده یا به {1} پیوند داده شده است. لطفاً {2} دارایی ها را با سند مربوطه ایجاد یا پیوند دهید."
 
-#: stock/doctype/item/item.js:829
+#: stock/doctype/item/item.js:913
 msgid "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit <a href='https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/item-valuation-fifo-and-moving-average' target='_blank'>Item Valuation, FIFO and Moving Average.</a>"
 msgstr "دو گزینه برای حفظ ارزش موجودی وجود دارد. FIFO (اولین ورود - اولین خروج) و میانگین متحرک. برای درک جزئیات این موضوع، لطفاً از هدف <a href='https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/item-valuation-fifo-and-moving-average دیدن کنید. ='_blank'>ارزش اقلام، FIFO و میانگین متحرک.</a>"
 
@@ -72162,6 +73404,10 @@
 msgid "There aren't any item variants for the selected item"
 msgstr "هیچ نوع موردی برای مورد انتخابی وجود ندارد"
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:10
+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
 msgid "There can only be 1 Account per Company in {0} {1}"
 msgstr "برای هر شرکت فقط 1 حساب در {0} {1} وجود دارد"
@@ -72186,36 +73432,36 @@
 msgid "There is nothing to edit."
 msgstr "چیزی برای ویرایش وجود ندارد."
 
-#: stock/doctype/stock_entry/stock_entry.py:1279
+#: stock/doctype/stock_entry/stock_entry.py:1288
 msgid "There must be atleast 1 Finished Good in this Stock Entry"
 msgstr "باید حداقل 1 کالای تمام شده در این ورودی موجودی وجود داشته باشد"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:135
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:151
 msgid "There was an error creating Bank Account while linking with Plaid."
 msgstr "هنگام پیوند با Plaid خطایی در ایجاد حساب بانکی روی داد."
 
-#: selling/page/point_of_sale/pos_controller.js:205
+#: selling/page/point_of_sale/pos_controller.js:228
 msgid "There was an error saving the document."
 msgstr "هنگام ذخیره سند خطایی روی داد."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:236
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:252
 msgid "There was an error syncing transactions."
 msgstr "هنگام همگام‌سازی تراکنش‌ها خطایی روی داد."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:157
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:173
 msgid "There was an error updating Bank Account {} while linking with Plaid."
 msgstr "هنگام به‌روزرسانی حساب بانکی {} هنگام پیوند با Plaid خطایی روی داد."
 
-#: accounts/doctype/bank/bank.js:113
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:109
+#: accounts/doctype/bank/bank.js:115
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:114
 msgid "There was an issue connecting to Plaid's authentication server. Check browser console for more information"
 msgstr "مشکلی در اتصال به سرور تأیید اعتبار Plaid وجود داشت. برای اطلاعات بیشتر کنسول مرورگر را بررسی کنید"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:279
+#: selling/page/point_of_sale/pos_past_order_summary.js:289
 msgid "There were errors while sending email. Please try again."
 msgstr "هنگام ارسال ایمیل خطاهایی وجود داشت. لطفا دوباره تلاش کنید."
 
-#: accounts/utils.py:924
+#: accounts/utils.py:933
 msgid "There were issues unlinking payment entry {0}."
 msgstr "مشکلاتی در قطع پیوند ورودی پرداخت {0} وجود داشت."
 
@@ -72226,11 +73472,11 @@
 msgid "This Account has '0' balance in either Base Currency or Account Currency"
 msgstr "این حساب دارای موجودی '0' به ارز پایه یا ارز حساب است"
 
-#: stock/doctype/item/item.js:88
+#: stock/doctype/item/item.js:99
 msgid "This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set"
 msgstr "این مورد یک الگو است و نمی توان از آن در معاملات استفاده کرد. ویژگی‌های مورد در انواع مختلف کپی می‌شوند مگر اینکه «بدون کپی» تنظیم شده باشد"
 
-#: stock/doctype/item/item.js:118
+#: stock/doctype/item/item.js:158
 msgid "This Item is a Variant of {0} (Template)."
 msgstr "این مورد یک نوع {0} (الگو) است."
 
@@ -72238,11 +73484,11 @@
 msgid "This Month's Summary"
 msgstr "خلاصه این ماه"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:26
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
 msgid "This Warehouse will be auto-updated in the Target Warehouse field of Work Order."
 msgstr "این انبار به طور خودکار در قسمت Target Warehouse سفارش کار به روز می شود."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:21
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:24
 msgid "This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Orders."
 msgstr "این انبار به طور خودکار در قسمت Work In Progress Warehouse سفارشات کاری به روز می شود."
 
@@ -72266,7 +73512,7 @@
 msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
 msgstr "این سند توسط {0} {1} برای مورد {4} بیش از حد مجاز است. آیا در مقابل همان {2} {3} دیگری می سازید؟"
 
-#: stock/doctype/delivery_note/delivery_note.js:360
+#: stock/doctype/delivery_note/delivery_note.js:406
 msgid "This field is used to set the 'Customer'."
 msgstr "این فیلد برای تنظیم \"مشتری\" استفاده می شود."
 
@@ -72277,7 +73523,7 @@
 msgid "This filter will be applied to Journal Entry."
 msgstr "این فیلتر برای ورود مجله اعمال خواهد شد."
 
-#: manufacturing/doctype/bom/bom.js:158
+#: manufacturing/doctype/bom/bom.js:171
 msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
 msgstr "این یک الگوی BOM است و برای ایجاد سفارش کاری برای {0} مورد {1} استفاده خواهد شد."
 
@@ -72306,7 +73552,7 @@
 msgid "This is a location where scraped materials are stored."
 msgstr "این مکانی است که مواد تراشیده شده در آن ذخیره می شود."
 
-#: accounts/doctype/account/account.js:40
+#: accounts/doctype/account/account.js:36
 msgid "This is a root account and cannot be edited."
 msgstr "این یک حساب کاربری ریشه است و قابل ویرایش نیست."
 
@@ -72318,11 +73564,11 @@
 msgid "This is a root department and cannot be edited."
 msgstr "این بخش ریشه است و قابل ویرایش نیست."
 
-#: setup/doctype/item_group/item_group.js:81
+#: setup/doctype/item_group/item_group.js:98
 msgid "This is a root item group and cannot be edited."
 msgstr "این یک گروه آیتم ریشه است و قابل ویرایش نیست."
 
-#: setup/doctype/sales_person/sales_person.js:36
+#: setup/doctype/sales_person/sales_person.js:46
 msgid "This is a root sales person and cannot be edited."
 msgstr "این یک فروشنده اصلی است و قابل ویرایش نیست."
 
@@ -72354,19 +73600,19 @@
 msgid "This is based on transactions against this Supplier. See timeline below for details"
 msgstr "این بر اساس معاملات علیه این تامین کننده است. برای جزئیات به جدول زمانی زیر مراجعه کنید"
 
-#: stock/doctype/stock_settings/stock_settings.js:24
+#: stock/doctype/stock_settings/stock_settings.js:26
 msgid "This is considered dangerous from accounting point of view."
 msgstr "این از نظر حسابداری خطرناک تلقی می شود."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:529
 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
 msgstr "این کار برای رسیدگی به مواردی که رسید خرید پس از فاکتور خرید ایجاد می شود، انجام می شود."
 
-#: manufacturing/doctype/work_order/work_order.js:822
+#: manufacturing/doctype/work_order/work_order.js:885
 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox."
 msgstr "این به طور پیش فرض فعال است. اگر می‌خواهید مواد را برای مجموعه‌های فرعی موردی که در حال تولید آن هستید برنامه‌ریزی کنید، این گزینه را فعال کنید. اگر مجموعه های فرعی را جداگانه برنامه ریزی و تولید می کنید، می توانید این چک باکس را غیرفعال کنید."
 
-#: stock/doctype/item/item.js:819
+#: stock/doctype/item/item.js:901
 msgid "This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked."
 msgstr "این برای اقلام مواد خام است که برای ایجاد کالاهای نهایی استفاده می شود. اگر مورد یک سرویس اضافی مانند \"شستن\" است که در BOM استفاده می شود، این مورد را علامت نزنید."
 
@@ -72374,7 +73620,7 @@
 msgid "This item filter has already been applied for the {0}"
 msgstr "این فیلتر مورد قبلاً برای {0} اعمال شده است"
 
-#: stock/doctype/delivery_note/delivery_note.js:371
+#: stock/doctype/delivery_note/delivery_note.js:419
 msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
 msgstr "این گزینه برای ویرایش فیلدهای «تاریخ ارسال» و «زمان ارسال» قابل بررسی است."
 
@@ -72382,7 +73628,7 @@
 msgid "This schedule was created when Asset {0} was adjusted through Asset Value Adjustment {1}."
 msgstr "این برنامه زمانی ایجاد شد که دارایی {0} از طریق تنظیم ارزش دارایی {1} تنظیم شد."
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:516
+#: assets/doctype/asset_capitalization/asset_capitalization.py:522
 msgid "This schedule was created when Asset {0} was consumed through Asset Capitalization {1}."
 msgstr "این برنامه زمانی ایجاد شد که دارایی {0} از طریق سرمایه گذاری دارایی {1} مصرف شد."
 
@@ -72390,27 +73636,27 @@
 msgid "This schedule was created when Asset {0} was repaired through Asset Repair {1}."
 msgstr "این برنامه زمانی ایجاد شد که دارایی {0} از طریق تعمیر دارایی {1} تعمیر شد."
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:674
+#: assets/doctype/asset_capitalization/asset_capitalization.py:680
 msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
 msgstr "این برنامه زمانی ایجاد شد که دارایی {0} در لغو دارایی با حروف بزرگ {1} بازیابی شد."
 
-#: assets/doctype/asset/depreciation.py:496
+#: assets/doctype/asset/depreciation.py:494
 msgid "This schedule was created when Asset {0} was restored."
 msgstr "این برنامه زمانی ایجاد شد که دارایی {0} بازیابی شد."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1325
+#: accounts/doctype/sales_invoice/sales_invoice.py:1336
 msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
 msgstr "این برنامه زمانی ایجاد شد که دارایی {0} از طریق فاکتور فروش {1} برگردانده شد."
 
-#: assets/doctype/asset/depreciation.py:454
+#: assets/doctype/asset/depreciation.py:452
 msgid "This schedule was created when Asset {0} was scrapped."
 msgstr "این برنامه زمانی ایجاد شد که دارایی {0} لغو شد."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1336
+#: accounts/doctype/sales_invoice/sales_invoice.py:1347
 msgid "This schedule was created when Asset {0} was sold through Sales Invoice {1}."
 msgstr "این برنامه زمانی ایجاد شد که دارایی {0} از طریق فاکتور فروش {1} فروخته شد."
 
-#: assets/doctype/asset/asset.py:1117
+#: assets/doctype/asset/asset.py:1121
 msgid "This schedule was created when Asset {0} was updated after being split into new Asset {1}."
 msgstr "این برنامه زمانی ایجاد شد که دارایی {0} پس از تقسیم به دارایی جدید {1} به روز شد."
 
@@ -72426,7 +73672,7 @@
 msgid "This schedule was created when Asset {0}'s shifts were adjusted through Asset Shift Allocation {1}."
 msgstr "این برنامه زمانی ایجاد شد که تغییرات دارایی {0} از طریق تخصیص تغییر دارایی {1} تنظیم شد."
 
-#: assets/doctype/asset/asset.py:1180
+#: assets/doctype/asset/asset.py:1184
 msgid "This schedule was created when new Asset {0} was split from Asset {1}."
 msgstr "این برنامه زمانی ایجاد شد که دارایی جدید {0} از دارایی {1} جدا شد."
 
@@ -72437,10 +73683,15 @@
 msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
 msgstr "این بخش به کاربر اجازه می دهد متن Body و Closing نامه Dunning را برای Dunning Type بر اساس زبان تنظیم کند که می تواند در Print استفاده شود."
 
-#: stock/doctype/delivery_note/delivery_note.js:365
+#: stock/doctype/delivery_note/delivery_note.js:412
 msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
 msgstr "این جدول برای تنظیم جزئیات مربوط به \"اقلام\"، \"تعداد\"، \"نرخ پایه\" و غیره استفاده می شود."
 
+#. Description of a DocType
+#: stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses."
+msgstr ""
+
 #. Description of the 'Abbreviation' (Data) field in DocType 'Item Attribute
 #. Value'
 #: stock/doctype/item_attribute_value/item_attribute_value.json
@@ -72455,7 +73706,7 @@
 msgid "This will restrict user access to other employee records"
 msgstr "این امر دسترسی کاربر به سایر سوابق کارمندان را محدود می کند"
 
-#: controllers/selling_controller.py:686
+#: controllers/selling_controller.py:710
 msgid "This {} will be treated as material transfer."
 msgstr "این {} به عنوان انتقال مواد در نظر گرفته می شود."
 
@@ -72681,7 +73932,7 @@
 msgid "Time in mins."
 msgstr "زمان در دقیقه"
 
-#: manufacturing/doctype/job_card/job_card.py:654
+#: manufacturing/doctype/job_card/job_card.py:661
 msgid "Time logs are required for {0} {1}"
 msgstr "گزارش زمان برای {0} {1} مورد نیاز است"
 
@@ -72699,11 +73950,12 @@
 msgid "Timeline"
 msgstr "جدول زمانی"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:31
 #: public/js/projects/timer.js:5
 msgid "Timer"
 msgstr "تایمر"
 
-#: public/js/projects/timer.js:142
+#: public/js/projects/timer.js:149
 msgid "Timer exceeded the given hours."
 msgstr "تایمر از ساعت های داده شده بیشتر شد."
 
@@ -72745,11 +73997,11 @@
 msgid "Timesheet for tasks."
 msgstr "جدول زمانی برای وظایف"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:756
+#: accounts/doctype/sales_invoice/sales_invoice.py:773
 msgid "Timesheet {0} is already completed or cancelled"
 msgstr "جدول زمانی {0} قبلاً تکمیل یا لغو شده است"
 
-#: projects/doctype/timesheet/timesheet.py:520 templates/pages/projects.html:59
+#: projects/doctype/timesheet/timesheet.py:530 templates/pages/projects.html:59
 msgid "Timesheets"
 msgstr "جدول زمانی"
 
@@ -72948,7 +74200,7 @@
 msgid "Title"
 msgstr "عنوان"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:967
+#: accounts/doctype/sales_invoice/sales_invoice.js:1043
 #: templates/pages/projects.html:68
 msgid "To"
 msgstr "به"
@@ -72971,15 +74223,15 @@
 msgid "To"
 msgstr "به"
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "To Be Paid"
 msgstr "پرداخت می شود"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:36
-#: selling/doctype/sales_order/sales_order_list.js:39
-#: stock/doctype/delivery_note/delivery_note_list.js:12
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:12
+#: buying/doctype/purchase_order/purchase_order_list.js:37
+#: selling/doctype/sales_order/sales_order_list.js:50
+#: selling/doctype/sales_order/sales_order_list.js:52
+#: stock/doctype/delivery_note/delivery_note_list.js:22
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:21
 msgid "To Bill"
 msgstr "به بیل"
 
@@ -73020,13 +74272,13 @@
 msgid "To Currency"
 msgstr "به ارز"
 
-#: accounts/doctype/payment_entry/payment_entry.js:648
-#: accounts/doctype/payment_entry/payment_entry.js:652
+#: accounts/doctype/payment_entry/payment_entry.js:794
+#: accounts/doctype/payment_entry/payment_entry.js:798
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:23
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:23
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:15
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:24
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:45
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:23
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:44
 #: accounts/report/financial_ratios/financial_ratios.js:48
 #: accounts/report/general_ledger/general_ledger.js:30
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -73034,76 +74286,76 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:15
 #: 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:25
+#: accounts/report/pos_register/pos_register.js:24
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:15
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:24
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:55
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:55
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:23
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:54
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:54
 #: accounts/report/trial_balance/trial_balance.js:43
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:43
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:22
-#: buying/report/procurement_tracker/procurement_tracker.js:34
-#: buying/report/purchase_analytics/purchase_analytics.js:43
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:26
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:26
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:23
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:30
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:30
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:21
+#: buying/report/procurement_tracker/procurement_tracker.js:33
+#: buying/report/purchase_analytics/purchase_analytics.js:42
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:25
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:25
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:22
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:29
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:29
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:24
 #: crm/report/campaign_efficiency/campaign_efficiency.js:13
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:16
-#: crm/report/lead_conversion_time/lead_conversion_time.js:16
-#: crm/report/lead_details/lead_details.js:24
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:15
+#: crm/report/lead_conversion_time/lead_conversion_time.js:15
+#: crm/report/lead_details/lead_details.js:23
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:13
-#: crm/report/lost_opportunity/lost_opportunity.js:24
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:29
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:21
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:22
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:15
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:24
-#: manufacturing/report/process_loss_report/process_loss_report.js:37
-#: manufacturing/report/production_analytics/production_analytics.js:24
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:15
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:24
+#: crm/report/lost_opportunity/lost_opportunity.js:23
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:27
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:20
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:23
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:16
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:36
+#: manufacturing/report/production_analytics/production_analytics.js:23
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:14
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:23
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:14
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:14
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:37
-#: public/js/stock_analytics.js:48
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:16
-#: regional/report/uae_vat_201/uae_vat_201.js:24
-#: regional/report/vat_audit_report/vat_audit_report.js:25
-#: selling/page/sales_funnel/sales_funnel.js:40
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:13
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:34
+#: public/js/stock_analytics.js:75
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:15
+#: regional/report/uae_vat_201/uae_vat_201.js:23
+#: regional/report/vat_audit_report/vat_audit_report.js:24
+#: selling/page/sales_funnel/sales_funnel.js:44
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:31
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:26
-#: selling/report/sales_analytics/sales_analytics.js:43
-#: selling/report/sales_order_analysis/sales_order_analysis.js:26
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:29
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:28
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:29
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:25
+#: selling/report/sales_analytics/sales_analytics.js:50
+#: selling/report/sales_order_analysis/sales_order_analysis.js:25
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:27
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:27
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:27
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:27
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:16
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:24
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:24
-#: stock/report/delayed_item_report/delayed_item_report.js:24
-#: stock/report/delayed_order_report/delayed_order_report.js:24
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:28
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:22
+#: stock/report/delayed_item_report/delayed_item_report.js:23
+#: stock/report/delayed_order_report/delayed_order_report.js:23
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:27
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:14
-#: stock/report/reserved_stock/reserved_stock.js:26
+#: stock/report/reserved_stock/reserved_stock.js:23
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:22
-#: stock/report/stock_analytics/stock_analytics.js:70
+#: stock/report/stock_analytics/stock_analytics.js:69
 #: stock/report/stock_balance/stock_balance.js:24
 #: stock/report/stock_ledger/stock_ledger.js:23
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:22
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:17
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:16
-#: support/report/issue_analytics/issue_analytics.js:32
-#: support/report/issue_summary/issue_summary.js:32
-#: support/report/support_hour_distribution/support_hour_distribution.js:15
-#: utilities/report/youtube_interactions/youtube_interactions.js:15
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:16
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:15
+#: support/report/issue_analytics/issue_analytics.js:31
+#: support/report/issue_summary/issue_summary.js:31
+#: support/report/support_hour_distribution/support_hour_distribution.js:14
+#: utilities/report/youtube_interactions/youtube_interactions.js:14
 msgid "To Date"
 msgstr "تا تاریخ"
 
@@ -73209,7 +74461,7 @@
 msgid "To Date"
 msgstr "تا تاریخ"
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 #: setup/doctype/holiday_list/holiday_list.py:115
 msgid "To Date cannot be before From Date"
 msgstr "To Date نمی تواند قبل از From Date باشد"
@@ -73238,8 +74490,8 @@
 msgid "To Datetime"
 msgstr "به Datetime"
 
-#: selling/doctype/sales_order/sales_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:30
+#: selling/doctype/sales_order/sales_order_list.js:32
+#: selling/doctype/sales_order/sales_order_list.js:42
 msgid "To Deliver"
 msgstr "رساندن"
 
@@ -73256,7 +74508,7 @@
 msgid "To Deliver"
 msgstr "رساندن"
 
-#: selling/doctype/sales_order/sales_order_list.js:26
+#: selling/doctype/sales_order/sales_order_list.js:36
 msgid "To Deliver and Bill"
 msgstr "برای تحویل و صدور صورت حساب"
 
@@ -73285,7 +74537,7 @@
 msgid "To Doctype"
 msgstr "برای Doctype"
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:85
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:83
 msgid "To Due Date"
 msgstr "به تاریخ سررسید"
 
@@ -73295,7 +74547,7 @@
 msgid "To Employee"
 msgstr "به کارمند"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:53
+#: accounts/report/budget_variance_report/budget_variance_report.js:51
 msgid "To Fiscal Year"
 msgstr "به سال مالی"
 
@@ -73335,8 +74587,8 @@
 msgid "To Package No."
 msgstr "به شماره بسته"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:12
-#: selling/doctype/sales_order/sales_order_list.js:14
+#: buying/doctype/purchase_order/purchase_order_list.js:21
+#: selling/doctype/sales_order/sales_order_list.js:25
 msgid "To Pay"
 msgstr ""
 
@@ -73358,8 +74610,8 @@
 msgid "To Payment Date"
 msgstr "به تاریخ پرداخت"
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:44
-#: manufacturing/report/work_order_summary/work_order_summary.js:30
+#: manufacturing/report/job_card_summary/job_card_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:29
 msgid "To Posting Date"
 msgstr "به تاریخ ارسال"
 
@@ -73375,7 +74627,7 @@
 msgid "To Range"
 msgstr "به محدوده"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:18
+#: buying/doctype/purchase_order/purchase_order_list.js:30
 msgid "To Receive"
 msgstr "برای دریافت"
 
@@ -73385,7 +74637,7 @@
 msgid "To Receive"
 msgstr "برای دریافت"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: buying/doctype/purchase_order/purchase_order_list.js:25
 msgid "To Receive and Bill"
 msgstr "برای دریافت و قبض"
 
@@ -73421,6 +74673,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:92
 #: manufacturing/report/job_card_summary/job_card_summary.py:180
+#: templates/pages/timelog_info.html:34
 msgid "To Time"
 msgstr "به زمان"
 
@@ -73502,7 +74755,8 @@
 msgid "To Value"
 msgstr "بها دادن"
 
-#: stock/doctype/batch/batch.js:83
+#: manufacturing/doctype/plant_floor/plant_floor.js:196
+#: stock/doctype/batch/batch.js:93
 msgid "To Warehouse"
 msgstr "به انبار"
 
@@ -73512,11 +74766,11 @@
 msgid "To Warehouse (Optional)"
 msgstr "به انبار (اختیاری)"
 
-#: manufacturing/doctype/bom/bom.js:735
+#: manufacturing/doctype/bom/bom.js:768
 msgid "To add Operations tick the 'With Operations' checkbox."
 msgstr "برای افزودن عملیات، کادر \"با عملیات\" را علامت بزنید."
 
-#: manufacturing/doctype/production_plan/production_plan.js:550
+#: manufacturing/doctype/production_plan/production_plan.js:598
 msgid "To add subcontracted Item's raw materials if include exploded items is disabled."
 msgstr "افزودن مواد خام قراردادی فرعی در صورت وجود موارد منفجر شده غیرفعال است."
 
@@ -73541,11 +74795,11 @@
 msgid "To be Delivered to Customer"
 msgstr "برای تحویل به مشتری"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:521
+#: accounts/doctype/sales_invoice/sales_invoice.py:534
 msgid "To cancel a {} you need to cancel the POS Closing Entry {}."
 msgstr "برای لغو یک {}، باید ورودی بسته شدن POS {} را لغو کنید."
 
-#: accounts/doctype/payment_request/payment_request.py:99
+#: accounts/doctype/payment_request/payment_request.py:100
 msgid "To create a Payment Request reference document is required"
 msgstr "برای ایجاد سند مرجع درخواست پرداخت مورد نیاز است"
 
@@ -73557,12 +74811,12 @@
 msgid "To enable Capital Work in Progress Accounting,"
 msgstr "برای فعال کردن حسابداری کار سرمایه ای،"
 
-#: manufacturing/doctype/production_plan/production_plan.js:545
+#: manufacturing/doctype/production_plan/production_plan.js:591
 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:1625
-#: controllers/accounts_controller.py:2559
+#: accounts/doctype/payment_entry/payment_entry.py:1644
+#: controllers/accounts_controller.py:2644
 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
 msgstr "برای گنجاندن مالیات در ردیف {0} در نرخ مورد، مالیات‌های ردیف {1} نیز باید لحاظ شود"
 
@@ -73570,7 +74824,7 @@
 msgid "To merge, following properties must be same for both items"
 msgstr "برای ادغام، ویژگی های زیر باید برای هر دو مورد یکسان باشد"
 
-#: accounts/doctype/account/account.py:498
+#: accounts/doctype/account/account.py:517
 msgid "To overrule this, enable '{0}' in company {1}"
 msgstr "برای لغو این مورد، \"{0}\" را در شرکت {1} فعال کنید"
 
@@ -73578,11 +74832,11 @@
 msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
 msgstr "برای ادامه ویرایش این مقدار مشخصه، {0} را در تنظیمات نوع مورد فعال کنید."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:578
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:582
 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
 msgstr "برای ارسال فاکتور بدون سفارش خرید لطفاً {0} را به عنوان {1} در {2} تنظیم کنید"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:598
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:602
 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
 msgstr "برای ارسال فاکتور بدون رسید خرید، لطفاً {0} را به عنوان {1} در {2} تنظیم کنید."
 
@@ -73592,12 +74846,12 @@
 msgstr "برای استفاده از یک کتاب مالی متفاوت، لطفاً علامت «شامل دارایی‌های پیش‌فرض FB» را بردارید."
 
 #: accounts/report/financial_statements.py:576
-#: accounts/report/general_ledger/general_ledger.py:273
+#: accounts/report/general_ledger/general_ledger.py:286
 #: accounts/report/trial_balance/trial_balance.py:278
 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
 msgstr "برای استفاده از یک کتاب مالی متفاوت، لطفاً علامت «شامل ورودی‌های پیش‌فرض FB» را بردارید."
 
-#: selling/page/point_of_sale/pos_controller.js:174
+#: selling/page/point_of_sale/pos_controller.js:192
 msgid "Toggle Recent Orders"
 msgstr "تغییر سفارشات اخیر"
 
@@ -73607,16 +74861,20 @@
 msgid "Token Endpoint"
 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:485
-#: buying/doctype/purchase_order/purchase_order.js:541
-#: buying/doctype/request_for_quotation/request_for_quotation.js:57
-#: buying/doctype/request_for_quotation/request_for_quotation.js:143
-#: buying/doctype/request_for_quotation/request_for_quotation.js:381
-#: buying/doctype/request_for_quotation/request_for_quotation.js:387
-#: buying/doctype/supplier_quotation/supplier_quotation.js:55
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:116
+#: buying/doctype/purchase_order/purchase_order.js:560
+#: buying/doctype/purchase_order/purchase_order.js:636
+#: 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
+#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: buying/doctype/supplier_quotation/supplier_quotation.js:58
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:121
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: stock/workspace/stock/stock.json
 msgid "Tools"
@@ -73631,10 +74889,13 @@
 #: 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/general_ledger/general_ledger.py:56
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:636
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:642
 #: accounts/report/profitability_analysis/profitability_analysis.py:93
 #: accounts/report/profitability_analysis/profitability_analysis.py:98
 #: accounts/report/trial_balance/trial_balance.py:344
@@ -73830,6 +75091,11 @@
 msgid "Total Achieved"
 msgstr "کل به دست آمده است"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Active Items"
+msgstr ""
+
 #: accounts/report/budget_variance_report/budget_variance_report.py:125
 msgid "Total Actual"
 msgstr "کل واقعی"
@@ -73888,7 +75154,7 @@
 msgid "Total Allocations"
 msgstr "مجموع تخصیص ها"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:233
 #: 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
@@ -73932,7 +75198,7 @@
 msgid "Total Amount in Words"
 msgstr "مقدار کل در کلمات"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:181
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:209
 msgid "Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges"
 msgstr "مجموع هزینه های قابل اعمال در جدول اقلام رسید خرید باید با کل مالیات ها و هزینه ها یکسان باشد"
 
@@ -74048,7 +75314,7 @@
 msgid "Total Commission"
 msgstr "کمیسیون کل"
 
-#: manufacturing/doctype/job_card/job_card.py:667
+#: manufacturing/doctype/job_card/job_card.py:674
 #: manufacturing/report/job_card_summary/job_card_summary.py:174
 msgid "Total Completed Qty"
 msgstr "تعداد کل تکمیل شده"
@@ -74065,11 +75331,11 @@
 msgid "Total Consumed Material Cost (via Stock Entry)"
 msgstr "کل هزینه مواد مصرفی (از طریق ورود موجودی)"
 
-#: setup/doctype/sales_person/sales_person.js:12
+#: setup/doctype/sales_person/sales_person.js:17
 msgid "Total Contribution Amount Against Invoices: {0}"
 msgstr "مجموع مبلغ مشارکت در برابر فاکتورها: {0}"
 
-#: setup/doctype/sales_person/sales_person.js:9
+#: setup/doctype/sales_person/sales_person.js:10
 msgid "Total Contribution Amount Against Orders: {0}"
 msgstr "کل مبلغ مشارکت در برابر سفارشات: {0}"
 
@@ -74115,7 +75381,7 @@
 msgid "Total Credit"
 msgstr "کل اعتبار"
 
-#: accounts/doctype/journal_entry/journal_entry.py:225
+#: accounts/doctype/journal_entry/journal_entry.py:241
 msgid "Total Credit/ Debit Amount should be same as linked Journal Entry"
 msgstr "مجموع مبلغ اعتبار/ بدهی باید مانند ورودی مجله مرتبط باشد"
 
@@ -74125,7 +75391,7 @@
 msgid "Total Debit"
 msgstr "کل بدهی"
 
-#: accounts/doctype/journal_entry/journal_entry.py:802
+#: accounts/doctype/journal_entry/journal_entry.py:829
 msgid "Total Debit must be equal to Total Credit. The difference is {0}"
 msgstr "کل بدهی باید برابر با کل اعتبار باشد. تفاوت {0} است"
 
@@ -74195,6 +75461,16 @@
 msgid "Total Income This Year"
 msgstr "کل درآمد امسال"
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
@@ -74208,6 +75484,7 @@
 msgstr "سود کل"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:196
+#: accounts/report/accounts_receivable/accounts_receivable.html:160
 msgid "Total Invoiced Amount"
 msgstr "کل مبلغ صورتحساب"
 
@@ -74215,6 +75492,10 @@
 msgid "Total Issues"
 msgstr "مجموع مسائل"
 
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Total Items"
+msgstr ""
+
 #: accounts/report/balance_sheet/balance_sheet.py:208
 msgid "Total Liability"
 msgstr "کل مسئولیت"
@@ -74323,7 +75604,7 @@
 msgid "Total Order Value"
 msgstr "ارزش کل سفارش"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:629
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:635
 msgid "Total Other Charges"
 msgstr "مجموع سایر هزینه ها"
 
@@ -74331,13 +75612,25 @@
 msgid "Total Outgoing"
 msgstr "کل خروجی"
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Total Outgoing Value (Consumption)"
 msgstr "کل ارزش خروجی (مصرف)"
 
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:9
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:97
+#: accounts/report/accounts_receivable/accounts_receivable.html:79
 msgid "Total Outstanding"
 msgstr "مجموع برجسته"
 
@@ -74348,18 +75641,20 @@
 msgstr "مجموع برجسته"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:205
+#: accounts/report/accounts_receivable/accounts_receivable.html:163
 msgid "Total Outstanding Amount"
 msgstr "کل مبلغ معوقه"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:197
+#: accounts/report/accounts_receivable/accounts_receivable.html:161
 msgid "Total Paid Amount"
 msgstr "کل مبلغ پرداختی"
 
-#: controllers/accounts_controller.py:2266
+#: controllers/accounts_controller.py:2358
 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
 msgstr "کل مبلغ پرداخت در برنامه پرداخت باید برابر با کل کل / گرد شده باشد"
 
-#: accounts/doctype/payment_request/payment_request.py:112
+#: accounts/doctype/payment_request/payment_request.py:115
 msgid "Total Payment Request amount cannot be greater than {0} amount"
 msgstr "مبلغ کل درخواست پرداخت نمی تواند بیشتر از مبلغ {0} باشد"
 
@@ -74391,7 +75686,7 @@
 msgid "Total Purchase Cost (via Purchase Invoice)"
 msgstr "کل هزینه خرید (از طریق فاکتور خرید)"
 
-#: projects/doctype/project/project.js:107
+#: projects/doctype/project/project.js:131
 msgid "Total Purchase Cost has been updated"
 msgstr "کل هزینه خرید به روز شده است"
 
@@ -74407,6 +75702,8 @@
 msgstr "مجموع تعداد"
 
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:23
+#: selling/page/point_of_sale/pos_item_cart.js:520
+#: selling/page/point_of_sale/pos_item_cart.js:524
 msgid "Total Quantity"
 msgstr "مقدار کل"
 
@@ -74517,6 +75814,11 @@
 msgid "Total Stock Summary"
 msgstr "خلاصه کل موجودی"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Stock Value"
+msgstr ""
+
 #. Label of a Float field in DocType 'Purchase Order Item Supplied'
 #: buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
 msgctxt "Purchase Order Item Supplied"
@@ -74539,7 +75841,7 @@
 msgid "Total Tasks"
 msgstr "کل وظایف"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:622
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:628
 #: accounts/report/purchase_register/purchase_register.py:263
 msgid "Total Tax"
 msgstr "کل مالیات"
@@ -74680,7 +75982,7 @@
 msgid "Total Time in Mins"
 msgstr "کل زمان در دقیقه"
 
-#: public/js/utils.js:105
+#: public/js/utils.js:129
 msgid "Total Unpaid: {0}"
 msgstr "مجموع پرداخت نشده: {0}"
 
@@ -74711,6 +76013,11 @@
 msgid "Total Views"
 msgstr "کل بازدیدها"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Warehouses"
+msgstr ""
+
 #. Label of a Float field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
 msgctxt "Delivery Note Item"
@@ -74771,20 +76078,34 @@
 msgid "Total Working Hours"
 msgstr "مجموع ساعات کاری"
 
-#: controllers/accounts_controller.py:1838
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Total Working Hours"
+msgstr "مجموع ساعات کاری"
+
+#: controllers/accounts_controller.py:1930
 msgid "Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})"
 msgstr "کل پیش پرداخت ({0}) در برابر سفارش {1} نمی تواند بیشتر از کل کل ({2}) باشد"
 
-#: controllers/selling_controller.py:186
+#: controllers/selling_controller.py:187
 msgid "Total allocated percentage for sales team should be 100"
 msgstr "کل درصد تخصیص داده شده برای تیم فروش باید 100 باشد"
 
+#: manufacturing/doctype/workstation/workstation.py:229
+msgid "Total completed quantity: {0}"
+msgstr ""
+
 #: selling/doctype/customer/customer.py:157
 msgid "Total contribution percentage should be equal to 100"
 msgstr "درصد کل مشارکت باید برابر با 100 باشد"
 
+#: projects/doctype/project/project_dashboard.html:2
+msgid "Total hours: {0}"
+msgstr ""
+
 #: accounts/doctype/pos_invoice/pos_invoice.py:444
-#: accounts/doctype/sales_invoice/sales_invoice.py:505
+#: accounts/doctype/sales_invoice/sales_invoice.py:518
 msgid "Total payments amount can't be greater than {}"
 msgstr "مبلغ کل پرداخت ها نمی تواند بیشتر از {} باشد"
 
@@ -74799,7 +76120,7 @@
 msgid "Total {0} ({1})"
 msgstr "مجموع {0} ({1})"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:162
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:190
 msgid "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'"
 msgstr "مجموع {0} برای همه موارد صفر است، ممکن است شما باید «توزیع هزینه‌ها بر اساس» را تغییر دهید"
 
@@ -74812,6 +76133,7 @@
 msgstr "مجموع (مقدار)"
 
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.py:88
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Totals"
 msgstr "جمع کل"
 
@@ -74896,6 +76218,11 @@
 msgid "Track Service Level Agreement"
 msgstr "پیگیری قرارداد سطح خدمات"
 
+#. Description of a DocType
+#: accounts/doctype/cost_center/cost_center.json
+msgid "Track separate Income and Expense for product verticals or divisions."
+msgstr ""
+
 #. Label of a Select field in DocType 'Shipment'
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
@@ -74914,7 +76241,7 @@
 msgid "Tracking URL"
 msgstr "URL پیگیری"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: manufacturing/doctype/workstation/workstation_dashboard.py:10
 msgid "Transaction"
 msgstr "معامله"
@@ -74956,7 +76283,7 @@
 msgstr "ارز معامله"
 
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:66
-#: selling/report/territory_wise_sales/territory_wise_sales.js:11
+#: selling/report/territory_wise_sales/territory_wise_sales.js:9
 msgid "Transaction Date"
 msgstr "تاریخ معامله"
 
@@ -74996,12 +76323,21 @@
 msgid "Transaction Date"
 msgstr "تاریخ معامله"
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:490
+msgid "Transaction Deletion Document: {0} is running for this Company. {1}"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
 msgid "Transaction Deletion Record"
 msgstr "رکورد حذف تراکنش"
 
 #. Name of a DocType
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgid "Transaction Deletion Record Details"
+msgstr ""
+
+#. Name of a DocType
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgid "Transaction Deletion Record Item"
 msgstr "مورد رکورد حذف تراکنش"
@@ -75042,7 +76378,7 @@
 msgid "Transaction Settings"
 msgstr "تنظیمات تراکنش"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:256
 msgid "Transaction Type"
 msgstr "نوع معامله"
 
@@ -75052,7 +76388,7 @@
 msgid "Transaction Type"
 msgstr "نوع معامله"
 
-#: accounts/doctype/payment_request/payment_request.py:122
+#: accounts/doctype/payment_request/payment_request.py:125
 msgid "Transaction currency must be same as Payment Gateway currency"
 msgstr "ارز تراکنش باید همان ارز درگاه پرداخت باشد"
 
@@ -75060,15 +76396,15 @@
 msgid "Transaction currency: {0} cannot be different from Bank Account({1}) currency: {2}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:647
+#: manufacturing/doctype/job_card/job_card.py:654
 msgid "Transaction not allowed against stopped Work Order {0}"
 msgstr "تراکنش در برابر دستور کار متوقف شده مجاز نیست {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1112
+#: accounts/doctype/payment_entry/payment_entry.py:1121
 msgid "Transaction reference no {0} dated {1}"
 msgstr "شماره مرجع تراکنش {0} به تاریخ {1}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: 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
@@ -75083,12 +76419,12 @@
 msgid "Transactions Annual History"
 msgstr "تاریخچه سالانه معاملات"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:107
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:117
 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:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:364
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:208
 msgid "Transfer"
 msgstr "انتقال"
 
@@ -75117,11 +76453,11 @@
 msgid "Transfer"
 msgstr "انتقال"
 
-#: assets/doctype/asset/asset.js:83
+#: assets/doctype/asset/asset.js:84
 msgid "Transfer Asset"
 msgstr "انتقال دارایی"
 
-#: manufacturing/doctype/production_plan/production_plan.js:318
+#: manufacturing/doctype/production_plan/production_plan.js:345
 msgid "Transfer From Warehouses"
 msgstr "انتقال از انبارها"
 
@@ -75137,7 +76473,7 @@
 msgid "Transfer Material Against"
 msgstr "انتقال مواد در مقابل"
 
-#: manufacturing/doctype/production_plan/production_plan.js:313
+#: manufacturing/doctype/production_plan/production_plan.js:340
 msgid "Transfer Materials For Warehouse {0}"
 msgstr "انتقال مواد برای انبار {0}"
 
@@ -75157,7 +76493,7 @@
 msgid "Transfer Type"
 msgstr "نوع انتقال"
 
-#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:31
 msgid "Transferred"
 msgstr "منتقل شده"
 
@@ -75167,6 +76503,7 @@
 msgid "Transferred"
 msgstr "منتقل شده"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:96
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:131
 msgid "Transferred Qty"
 msgstr "مقدار منتقل شده"
@@ -75203,7 +76540,7 @@
 msgid "Transit"
 msgstr "ترانزیت"
 
-#: stock/doctype/stock_entry/stock_entry.js:371
+#: stock/doctype/stock_entry/stock_entry.js:425
 msgid "Transit Entry"
 msgstr "ورودی حمل و نقل"
 
@@ -75284,8 +76621,8 @@
 msgid "Tree Details"
 msgstr "جزئیات درخت"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:9
-#: selling/report/sales_analytics/sales_analytics.js:9
+#: buying/report/purchase_analytics/purchase_analytics.js:8
+#: selling/report/sales_analytics/sales_analytics.js:8
 msgid "Tree Type"
 msgstr "نوع درخت"
 
@@ -75565,10 +76902,11 @@
 #: 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
+#: 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:63 public/js/utils.js:632
-#: selling/doctype/sales_order/sales_order.js:999
+#: public/js/stock_analytics.js:94 public/js/utils.js:693
+#: 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
 #: setup/doctype/uom/uom.json
@@ -75899,7 +77237,7 @@
 msgid "UOM Conversion Factor"
 msgstr "ضریب تبدیل UOM"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1248
+#: manufacturing/doctype/production_plan/production_plan.py:1270
 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
 msgstr "ضریب تبدیل UOM ({0} -> {1}) برای مورد یافت نشد: {2}"
 
@@ -75913,7 +77251,7 @@
 msgid "UOM Name"
 msgstr "نام UOM"
 
-#: stock/doctype/stock_entry/stock_entry.py:2773
+#: stock/doctype/stock_entry/stock_entry.py:2809
 msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
 msgstr "ضریب تبدیل UOM مورد نیاز برای UOM: {0} در مورد: {1}"
 
@@ -75957,7 +77295,7 @@
 msgid "URL can only be a string"
 msgstr "URL فقط می تواند یک رشته باشد"
 
-#: public/js/utils/unreconcile.js:20
+#: public/js/utils/unreconcile.js:24
 msgid "UnReconcile"
 msgstr "آشتی نکردن"
 
@@ -75969,15 +77307,15 @@
 msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100"
 msgstr "نمی توان امتیازی را که از {0} شروع می شود پیدا کرد. شما باید نمرات ثابتی داشته باشید که از 0 تا 100 را پوشش دهد"
 
-#: manufacturing/doctype/work_order/work_order.py:603
-msgid "Unable to find the time slot in the next {0} days for the operation {1}."
-msgstr "یافتن شکاف زمانی در {0} روز آینده برای عملیات {1} ممکن نیست."
+#: manufacturing/doctype/work_order/work_order.py:613
+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
 msgid "Unable to find variable:"
 msgstr "قادر به یافتن متغیر نیست:"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:79
+#: public/js/bank_reconciliation_tool/data_table_manager.js:74
 msgid "Unallocated Amount"
 msgstr "مبلغ تخصیص نیافته"
 
@@ -75997,7 +77335,7 @@
 msgid "Unassigned Qty"
 msgstr "تعداد تعیین نشده"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:115
 msgid "Unblock Invoice"
 msgstr "رفع انسداد فاکتور"
 
@@ -76046,7 +77384,7 @@
 msgid "Under Warranty"
 msgstr "تحت ضمانت"
 
-#: manufacturing/doctype/workstation/workstation.js:52
+#: manufacturing/doctype/workstation/workstation.js:78
 msgid "Under Working Hours table, you can add start and end times for a Workstation. For example, a Workstation may be active from 9 am to 1 pm, then 2 pm to 5 pm. You can also specify the working hours based on shifts. While scheduling a Work Order, the system will check for the availability of the Workstation based on the working hours specified."
 msgstr "در جدول ساعات کاری، می توانید زمان شروع و پایان یک ایستگاه کاری را اضافه کنید. به عنوان مثال، یک ایستگاه کاری ممکن است از ساعت 9 صبح تا 1 بعد از ظهر و سپس از 2 بعد از ظهر تا 5 بعد از ظهر فعال باشد. همچنین می توانید ساعت کاری را بر اساس شیفت ها مشخص کنید. هنگام برنامه ریزی یک سفارش کار، سیستم بر اساس ساعات کاری مشخص شده، در دسترس بودن ایستگاه کاری را بررسی می کند."
 
@@ -76077,11 +77415,12 @@
 msgid "Units of Measure"
 msgstr "واحدهای اندازه گیری"
 
-#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:12
+#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:10
+#: projects/doctype/project/project_dashboard.html:7
 msgid "Unknown"
 msgstr "ناشناخته"
 
-#: public/js/call_popup/call_popup.js:109
+#: public/js/call_popup/call_popup.js:110
 msgid "Unknown Caller"
 msgstr "تماس گیرنده ناشناس"
 
@@ -76097,7 +77436,7 @@
 msgid "Unlink Payment on Cancellation of Invoice"
 msgstr "لغو پیوند پرداخت در صورت لغو فاکتور"
 
-#: accounts/doctype/bank_account/bank_account.js:34
+#: accounts/doctype/bank_account/bank_account.js:33
 msgid "Unlink external integrations"
 msgstr "ادغام های خارجی را لغو پیوند کنید"
 
@@ -76107,7 +77446,7 @@
 msgid "Unlinked"
 msgstr "بدون پیوند"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:258
+#: accounts/doctype/sales_invoice/sales_invoice.py:263
 #: accounts/doctype/subscription/subscription_list.js:12
 msgid "Unpaid"
 msgstr "پرداخت نشده"
@@ -76241,20 +77580,24 @@
 msgid "Unreconciled Entries"
 msgstr "ورودی های آشتی نگرفته"
 
-#: selling/doctype/sales_order/sales_order.js:74
-#: stock/doctype/pick_list/pick_list.js:114
+#: selling/doctype/sales_order/sales_order.js:90
+#: stock/doctype/pick_list/pick_list.js:134
 msgid "Unreserve"
 msgstr "لغو رزرو کنید"
 
-#: selling/doctype/sales_order/sales_order.js:418
+#: selling/doctype/sales_order/sales_order.js:448
 msgid "Unreserve Stock"
 msgstr "ذخیره موجودی"
 
-#: selling/doctype/sales_order/sales_order.js:430
-#: stock/doctype/pick_list/pick_list.js:252
+#: selling/doctype/sales_order/sales_order.js:460
+#: stock/doctype/pick_list/pick_list.js:286
 msgid "Unreserving Stock..."
 msgstr "عدم رزرو موجودی..."
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Unresolve"
+msgstr ""
+
 #: accounts/doctype/dunning/dunning_list.js:6
 msgid "Unresolved"
 msgstr "حل نشده"
@@ -76306,6 +77649,7 @@
 msgstr "لغو اشتراک"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:37
+#: accounts/report/accounts_receivable/accounts_receivable.html:24
 msgid "Until"
 msgstr "تا زمان"
 
@@ -76333,22 +77677,23 @@
 msgid "Upcoming Calendar Events "
 msgstr " رویدادهای تقویم آتی"
 
-#: accounts/doctype/account/account.js:210
-#: accounts/doctype/cost_center/cost_center.js:102
-#: public/js/bom_configurator/bom_configurator.bundle.js:367
-#: public/js/utils.js:551 public/js/utils.js:767
-#: public/js/utils/barcode_scanner.js:176
+#: 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/barcode_scanner.js:183
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:164
+#: templates/pages/task_info.html:22
 msgid "Update"
 msgstr "به روز رسانی"
 
-#: accounts/doctype/account/account.js:58
+#: accounts/doctype/account/account.js:53
 msgid "Update Account Name / Number"
 msgstr "به روز رسانی نام / شماره حساب"
 
-#: accounts/doctype/account/account.js:158
+#: accounts/doctype/account/account.js:159
 msgid "Update Account Number / Name"
 msgstr "شماره / نام حساب را به روز کنید"
 
@@ -76394,7 +77739,7 @@
 msgid "Update Auto Repeat Reference"
 msgstr "به روز رسانی مرجع تکرار خودکار"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:35
 msgid "Update BOM Cost Automatically"
 msgstr "به روز رسانی هزینه BOM به صورت خودکار"
 
@@ -76423,6 +77768,18 @@
 msgid "Update Billed Amount in Delivery Note"
 msgstr "مبلغ صورتحساب در یادداشت تحویل را به روز کنید"
 
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Order"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Receipt"
+msgstr ""
+
 #. Label of a Check field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -76435,9 +77792,9 @@
 msgid "Update Billed Amount in Sales Order"
 msgstr "مبلغ صورتحساب در سفارش فروش را به روز کنید"
 
-#: accounts/doctype/bank_clearance/bank_clearance.js:57
-#: accounts/doctype/bank_clearance/bank_clearance.js:71
-#: accounts/doctype/bank_clearance/bank_clearance.js:76
+#: accounts/doctype/bank_clearance/bank_clearance.js:53
+#: accounts/doctype/bank_clearance/bank_clearance.js:67
+#: accounts/doctype/bank_clearance/bank_clearance.js:72
 msgid "Update Clearance Date"
 msgstr "به روز رسانی تاریخ ترخیص"
 
@@ -76447,7 +77804,7 @@
 msgid "Update Consumed Material Cost In Project"
 msgstr "به روز رسانی هزینه مواد مصرفی در پروژه"
 
-#: manufacturing/doctype/bom/bom.js:100
+#: manufacturing/doctype/bom/bom.js:99
 msgid "Update Cost"
 msgstr "هزینه به روز رسانی"
 
@@ -76463,12 +77820,12 @@
 msgid "Update Cost"
 msgstr "هزینه به روز رسانی"
 
-#: accounts/doctype/cost_center/cost_center.js:21
-#: accounts/doctype/cost_center/cost_center.js:50
+#: accounts/doctype/cost_center/cost_center.js:19
+#: accounts/doctype/cost_center/cost_center.js:52
 msgid "Update Cost Center Name / Number"
 msgstr "به روز رسانی نام / شماره مرکز هزینه"
 
-#: stock/doctype/pick_list/pick_list.js:99
+#: stock/doctype/pick_list/pick_list.js:104
 msgid "Update Current Stock"
 msgstr "به روز رسانی موجودی جاری"
 
@@ -76485,12 +77842,24 @@
 msgid "Update Existing Records"
 msgstr "به روز رسانی سوابق موجود"
 
-#: buying/doctype/purchase_order/purchase_order.js:275 public/js/utils.js:721
-#: selling/doctype/sales_order/sales_order.js:56
+#: buying/doctype/purchase_order/purchase_order.js:301 public/js/utils.js:793
+#: selling/doctype/sales_order/sales_order.js:63
 msgid "Update Items"
 msgstr "به روز رسانی موارد"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Update Print Format"
 msgstr "به روز رسانی فرمت چاپ"
 
@@ -76500,7 +77869,7 @@
 msgid "Update Rate and Availability"
 msgstr "به روز رسانی نرخ و در دسترس بودن"
 
-#: buying/doctype/purchase_order/purchase_order.js:475
+#: buying/doctype/purchase_order/purchase_order.js:549
 msgid "Update Rate as per Last Purchase"
 msgstr "نرخ به روز رسانی بر اساس آخرین خرید"
 
@@ -76533,7 +77902,7 @@
 msgid "Update Stock Opening Balance"
 msgstr ""
 
-#: projects/doctype/project/project.js:71
+#: projects/doctype/project/project.js:82
 msgid "Update Total Purchase Cost"
 msgstr "به روز رسانی کل هزینه خرید"
 
@@ -76555,7 +77924,7 @@
 msgid "Update latest price in all BOMs"
 msgstr "آخرین قیمت را در همه BOM ها به روز کنید"
 
-#: assets/doctype/asset/asset.py:338
+#: assets/doctype/asset/asset.py:340
 msgid "Update stock must be enabled for the purchase invoice {0}"
 msgstr "به‌روزرسانی موجودی باید برای فاکتور خرید فعال شود {0}"
 
@@ -76575,19 +77944,19 @@
 msgid "Updating Opening Balances"
 msgstr ""
 
-#: stock/doctype/item/item.py:1348
+#: stock/doctype/item/item.py:1349
 msgid "Updating Variants..."
 msgstr "به روز رسانی انواع..."
 
-#: manufacturing/doctype/work_order/work_order.js:788
+#: manufacturing/doctype/work_order/work_order.js:847
 msgid "Updating Work Order status"
 msgstr "به روز رسانی وضعیت سفارش کار"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:48
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:46
 msgid "Updating {0} of {1}, {2}"
 msgstr "در حال به روز رسانی {0} از {1}، {2}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:44
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:43
 msgid "Upload Bank Statement"
 msgstr "بارگذاری صورت حساب بانکی"
 
@@ -76608,7 +77977,7 @@
 msgid "Urgent"
 msgstr "فوری"
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:37
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:36
 msgid "Use 'Repost in background' button to trigger background job. Job can only be triggered when document is in Queued or Failed status."
 msgstr "برای فعال کردن کار پس‌زمینه از دکمه «بازنشر در پس‌زمینه» استفاده کنید. کار فقط زمانی می تواند فعال شود که سند در وضعیت صف یا ناموفق باشد."
 
@@ -76644,6 +78013,12 @@
 msgid "Use Google Maps Direction API to optimize route"
 msgstr "از Google Maps Direction API برای بهینه سازی مسیر استفاده کنید"
 
+#. Label of a Check field in DocType 'Currency Exchange Settings'
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
+msgctxt "Currency Exchange Settings"
+msgid "Use HTTP Protocol"
+msgstr ""
+
 #. Label of a Check field in DocType 'Stock Reposting Settings'
 #: stock/doctype/stock_reposting_settings/stock_reposting_settings.json
 msgctxt "Stock Reposting Settings"
@@ -76662,6 +78037,84 @@
 msgid "Use Multi-Level BOM"
 msgstr "از BOM چند سطحی استفاده کنید"
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Use Serial / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Asset Capitalization Stock Item'
+#: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
+msgctxt "Asset Capitalization Stock Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Delivery Note Item'
+#: stock/doctype/delivery_note_item/delivery_note_item.json
+msgctxt "Delivery Note Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'POS Invoice Item'
+#: accounts/doctype/pos_invoice_item/pos_invoice_item.json
+msgctxt "POS Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Packed Item'
+#: stock/doctype/packed_item/packed_item.json
+msgctxt "Packed Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Pick List Item'
+#: stock/doctype/pick_list_item/pick_list_item.json
+msgctxt "Pick List Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice Item'
+#: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+msgctxt "Purchase Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Receipt Item'
+#: stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+msgctxt "Purchase Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice Item'
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.json
+msgctxt "Sales Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Entry Detail'
+#: stock/doctype/stock_entry_detail/stock_entry_detail.json
+msgctxt "Stock Entry Detail"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Reconciliation Item'
+#: stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+msgctxt "Stock Reconciliation Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Item'
+#: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgctxt "Subcontracting Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Supplied Item'
+#: subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
+msgctxt "Subcontracting Receipt Supplied Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
 #. Label of a Check field in DocType 'Buying Settings'
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
@@ -76774,7 +78227,7 @@
 msgid "User ID not set for Employee {0}"
 msgstr "شناسه کاربری برای کارمند {0} تنظیم نشده است"
 
-#: accounts/doctype/journal_entry/journal_entry.js:544
+#: accounts/doctype/journal_entry/journal_entry.js:607
 msgid "User Remark"
 msgstr "نظر کاربر"
 
@@ -76893,10 +78346,12 @@
 msgid "VAT Audit Report"
 msgstr "گزارش حسابرسی مالیات بر ارزش افزوده"
 
+#: regional/report/uae_vat_201/uae_vat_201.html:47
 #: regional/report/uae_vat_201/uae_vat_201.py:115
 msgid "VAT on Expenses and All Other Inputs"
 msgstr "مالیات بر ارزش افزوده هزینه ها و سایر ورودی ها"
 
+#: regional/report/uae_vat_201/uae_vat_201.html:15
 #: regional/report/uae_vat_201/uae_vat_201.py:45
 msgid "VAT on Sales and All Other Outputs"
 msgstr "مالیات بر ارزش افزوده بر فروش و سایر خروجی ها"
@@ -76949,10 +78404,6 @@
 msgid "Valid From"
 msgstr "معتبر از"
 
-#: stock/doctype/item_price/item_price.py:62
-msgid "Valid From Date must be lesser than Valid Up To Date."
-msgstr ""
-
 #: regional/doctype/lower_deduction_certificate/lower_deduction_certificate.py:45
 msgid "Valid From date not in Fiscal Year {0}"
 msgstr "معتبر از تاریخ غیر در سال مالی {0}"
@@ -76962,7 +78413,7 @@
 msgstr "معتبر از باید بعد از {0} به عنوان آخرین ورودی GL در برابر مرکز هزینه {1} پست شده در این تاریخ باشد"
 
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:265
-#: templates/pages/order.html:47
+#: templates/pages/order.html:59
 msgid "Valid Till"
 msgstr "معتبر تا"
 
@@ -77106,7 +78557,7 @@
 msgstr "ارزش گذاری"
 
 #: stock/report/stock_balance/stock_balance.js:76
-#: stock/report/stock_ledger/stock_ledger.js:88
+#: stock/report/stock_ledger/stock_ledger.js:96
 msgid "Valuation Field Type"
 msgstr "نوع فیلد ارزش گذاری"
 
@@ -77123,8 +78574,8 @@
 #: accounts/report/gross_profit/gross_profit.py:266
 #: 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:449
-#: stock/report/stock_ledger/stock_ledger.py:207
+#: stock/report/stock_balance/stock_balance.py:457
+#: stock/report/stock_ledger/stock_ledger.py:280
 msgid "Valuation Rate"
 msgstr "نرخ ارزش گذاری"
 
@@ -77189,6 +78640,12 @@
 msgid "Valuation Rate"
 msgstr "نرخ ارزش گذاری"
 
+#. Label of a Float field in DocType 'Serial and Batch Entry'
+#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
+msgctxt "Serial and Batch Entry"
+msgid "Valuation Rate"
+msgstr "نرخ ارزش گذاری"
+
 #. Label of a Currency field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
@@ -77211,11 +78668,11 @@
 msgid "Valuation Rate (In / Out)"
 msgstr "نرخ ارزش گذاری (ورودی/خروجی)"
 
-#: stock/stock_ledger.py:1688
+#: stock/stock_ledger.py:1708
 msgid "Valuation Rate Missing"
 msgstr "نرخ ارزیابی وجود ندارد"
 
-#: stock/stock_ledger.py:1666
+#: stock/stock_ledger.py:1686
 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
 msgstr "نرخ ارزش گذاری برای آیتم {0}، برای انجام ورودی های حسابداری برای {1} {2} لازم است."
 
@@ -77223,7 +78680,7 @@
 msgid "Valuation Rate is mandatory if Opening Stock entered"
 msgstr "در صورت ورود موجودی افتتاحیه، نرخ ارزش گذاری الزامی است"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:514
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:568
 msgid "Valuation Rate required for Item {0} at row {1}"
 msgstr "نرخ ارزش گذاری مورد نیاز برای مورد {0} در ردیف {1}"
 
@@ -77234,12 +78691,12 @@
 msgid "Valuation and Total"
 msgstr "ارزش گذاری و کل"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:731
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:785
 msgid "Valuation rate for customer provided items has been set to zero."
 msgstr "نرخ ارزش گذاری برای اقلام ارائه شده توسط مشتری صفر تعیین شده است."
 
-#: accounts/doctype/payment_entry/payment_entry.py:1649
-#: controllers/accounts_controller.py:2583
+#: accounts/doctype/payment_entry/payment_entry.py:1668
+#: controllers/accounts_controller.py:2668
 msgid "Valuation type charges can not be marked as Inclusive"
 msgstr "هزینه‌های نوع ارزیابی را نمی‌توان به‌عنوان فراگیر علامت‌گذاری کرد"
 
@@ -77247,10 +78704,10 @@
 msgid "Valuation type charges can not marked as Inclusive"
 msgstr "هزینه‌های نوع ارزیابی را نمی‌توان به‌عنوان فراگیر علامت‌گذاری کرد"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:28
-#: public/js/stock_analytics.js:37
-#: selling/report/sales_analytics/sales_analytics.js:28
-#: stock/report/stock_analytics/stock_analytics.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:27
+#: public/js/stock_analytics.js:49
+#: selling/report/sales_analytics/sales_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:26
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:95
 msgid "Value"
 msgstr "ارزش"
@@ -77313,7 +78770,7 @@
 msgid "Value Based Inspection"
 msgstr "بازرسی مبتنی بر ارزش"
 
-#: stock/report/stock_ledger/stock_ledger.py:224
+#: stock/report/stock_ledger/stock_ledger.py:297
 msgid "Value Change"
 msgstr "تغییر ارزش"
 
@@ -77323,9 +78780,9 @@
 msgid "Value Details"
 msgstr "جزئیات ارزش"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:25
-#: selling/report/sales_analytics/sales_analytics.js:25
-#: stock/report/stock_analytics/stock_analytics.js:24
+#: buying/report/purchase_analytics/purchase_analytics.js:24
+#: selling/report/sales_analytics/sales_analytics.js:32
+#: stock/report/stock_analytics/stock_analytics.js:23
 msgid "Value Or Qty"
 msgstr "مقدار یا مقدار"
 
@@ -77347,11 +78804,11 @@
 msgid "Value of goods cannot be 0"
 msgstr "ارزش کالا نمی تواند 0 باشد"
 
-#: public/js/stock_analytics.js:36
+#: public/js/stock_analytics.js:46
 msgid "Value or Qty"
 msgstr "مقدار یا مقدار"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:120
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:121
 msgid "Values Changed"
 msgstr "ارزش ها تغییر کرد"
 
@@ -77382,7 +78839,7 @@
 msgid "Variance ({})"
 msgstr "واریانس ({})"
 
-#: stock/doctype/item/item.js:110 stock/doctype/item/item_list.js:14
+#: stock/doctype/item/item.js:146 stock/doctype/item/item_list.js:22
 #: stock/report/item_variant_details/item_variant_details.py:74
 msgid "Variant"
 msgstr "گونه"
@@ -77391,13 +78848,17 @@
 msgid "Variant Attribute Error"
 msgstr "خطای ویژگی متغیر"
 
+#: public/js/templates/item_quick_entry.html:1
+msgid "Variant Attributes"
+msgstr "ویژگی های متفاوت"
+
 #. Label of a Table field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
 msgid "Variant Attributes"
 msgstr "ویژگی های متفاوت"
 
-#: manufacturing/doctype/bom/bom.js:124
+#: manufacturing/doctype/bom/bom.js:128
 msgid "Variant BOM"
 msgstr "نوع BOM"
 
@@ -77411,7 +78872,7 @@
 msgid "Variant Based On cannot be changed"
 msgstr "متغیر بر اساس قابل تغییر نیست"
 
-#: stock/doctype/item/item.js:98
+#: stock/doctype/item/item.js:122
 msgid "Variant Details Report"
 msgstr "گزارش جزئیات متغیر"
 
@@ -77420,7 +78881,7 @@
 msgid "Variant Field"
 msgstr "فیلد متغیر"
 
-#: manufacturing/doctype/bom/bom.js:219 manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/bom/bom.js:238 manufacturing/doctype/bom/bom.js:300
 msgid "Variant Item"
 msgstr "مورد متفاوت"
 
@@ -77440,7 +78901,7 @@
 msgid "Variant Of"
 msgstr "نوع از"
 
-#: stock/doctype/item/item.js:543
+#: stock/doctype/item/item.js:610
 msgid "Variant creation has been queued."
 msgstr "ایجاد نوع در صف قرار گرفته است."
 
@@ -77539,37 +79000,37 @@
 msgid "Video Settings"
 msgstr "تنظیمات ویدیو"
 
-#: accounts/doctype/account/account.js:79
+#: accounts/doctype/account/account.js:74
 #: accounts/doctype/account/account.js:103
-#: accounts/doctype/account/account_tree.js:135
-#: accounts/doctype/account/account_tree.js:139
-#: accounts/doctype/account/account_tree.js:143
-#: accounts/doctype/cost_center/cost_center_tree.js:37
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:202
-#: accounts/doctype/journal_entry/journal_entry.js:29
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:619
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:8
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:11
-#: buying/doctype/supplier/supplier.js:88
-#: buying/doctype/supplier/supplier.js:92
-#: manufacturing/doctype/production_plan/production_plan.js:94
-#: projects/doctype/project/project.js:84
-#: projects/doctype/project/project.js:92
-#: public/js/controllers/stock_controller.js:64
-#: public/js/controllers/stock_controller.js:83 public/js/utils.js:133
-#: selling/doctype/customer/customer.js:157
-#: selling/doctype/customer/customer.js:162 setup/doctype/company/company.js:88
-#: setup/doctype/company/company.js:94 setup/doctype/company/company.js:100
-#: setup/doctype/company/company.js:106
-#: stock/doctype/delivery_trip/delivery_trip.js:71
-#: stock/doctype/item/item.js:63 stock/doctype/item/item.js:69
-#: stock/doctype/item/item.js:75 stock/doctype/item/item.js:92
-#: stock/doctype/item/item.js:96 stock/doctype/item/item.js:100
-#: stock/doctype/purchase_receipt/purchase_receipt.js:182
-#: stock/doctype/purchase_receipt/purchase_receipt.js:189
-#: stock/doctype/stock_entry/stock_entry.js:257
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:41
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:53
+#: accounts/doctype/account/account_tree.js:185
+#: accounts/doctype/account/account_tree.js:193
+#: accounts/doctype/account/account_tree.js:201
+#: accounts/doctype/cost_center/cost_center_tree.js:56
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:205
+#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:668
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
+#: buying/doctype/supplier/supplier.js:93
+#: buying/doctype/supplier/supplier.js:104
+#: manufacturing/doctype/production_plan/production_plan.js:98
+#: projects/doctype/project/project.js:100
+#: projects/doctype/project/project.js:117
+#: public/js/controllers/stock_controller.js:76
+#: public/js/controllers/stock_controller.js:95 public/js/utils.js:164
+#: selling/doctype/customer/customer.js:160
+#: selling/doctype/customer/customer.js:172 setup/doctype/company/company.js:90
+#: setup/doctype/company/company.js:100 setup/doctype/company/company.js:112
+#: setup/doctype/company/company.js:124
+#: stock/doctype/delivery_trip/delivery_trip.js:83
+#: stock/doctype/item/item.js:65 stock/doctype/item/item.js:75
+#: stock/doctype/item/item.js:85 stock/doctype/item/item.js:110
+#: stock/doctype/item/item.js:118 stock/doctype/item/item.js:126
+#: stock/doctype/purchase_receipt/purchase_receipt.js:207
+#: stock/doctype/purchase_receipt/purchase_receipt.js:218
+#: stock/doctype/stock_entry/stock_entry.js:287
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:44
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:60
 msgid "View"
 msgstr "چشم انداز"
 
@@ -77577,7 +79038,7 @@
 msgid "View BOM Update Log"
 msgstr "مشاهده گزارش به‌روزرسانی BOM"
 
-#: public/js/setup_wizard.js:39
+#: public/js/setup_wizard.js:41
 msgid "View Chart of Accounts"
 msgstr "مشاهده نمودار حساب ها"
 
@@ -77587,24 +79048,24 @@
 msgid "View Cost Center Tree"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:158
+#: accounts/doctype/payment_entry/payment_entry.js:183
 msgid "View Exchange Gain/Loss Journals"
 msgstr "مشاهده مجلات سود/زیان تبادل"
 
-#: assets/doctype/asset/asset.js:128
+#: assets/doctype/asset/asset.js:164
 #: assets/doctype/asset_repair/asset_repair.js:47
 msgid "View General Ledger"
 msgstr "مشاهده دفتر کل"
 
-#: crm/doctype/campaign/campaign.js:11
+#: crm/doctype/campaign/campaign.js:15
 msgid "View Leads"
 msgstr "مشاهده سرنخ ها"
 
-#: accounts/doctype/account/account_tree.js:193 stock/doctype/batch/batch.js:18
+#: accounts/doctype/account/account_tree.js:278 stock/doctype/batch/batch.js:18
 msgid "View Ledger"
 msgstr "مشاهده لجر"
 
-#: stock/doctype/serial_no/serial_no.js:29
+#: stock/doctype/serial_no/serial_no.js:28
 msgid "View Ledgers"
 msgstr "مشاهده دفتر کل"
 
@@ -77627,6 +79088,10 @@
 msgid "View attachments"
 msgstr "مشاهده پیوست ها"
 
+#: public/js/call_popup/call_popup.js:186
+msgid "View call log"
+msgstr ""
+
 #: utilities/report/youtube_interactions/youtube_interactions.py:25
 msgid "Views"
 msgstr "بازدیدها"
@@ -77676,9 +79141,9 @@
 msgid "Voucher"
 msgstr "کوپن"
 
-#: stock/report/stock_ledger/stock_ledger.js:71
-#: stock/report/stock_ledger/stock_ledger.py:160
-#: stock/report/stock_ledger/stock_ledger.py:232
+#: stock/report/stock_ledger/stock_ledger.js:79
+#: stock/report/stock_ledger/stock_ledger.py:233
+#: stock/report/stock_ledger/stock_ledger.py:305
 msgid "Voucher #"
 msgstr "کوپن شماره"
 
@@ -77718,21 +79183,21 @@
 msgid "Voucher Name"
 msgstr "نام کوپن"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:273
-#: accounts/report/accounts_receivable/accounts_receivable.py:1050
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: accounts/report/accounts_receivable/accounts_receivable.py:1058
 #: 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_ledger/general_ledger.js:49
-#: accounts/report/general_ledger/general_ledger.py:625
-#: accounts/report/payment_ledger/payment_ledger.js:65
+#: accounts/report/general_ledger/general_ledger.py:638
+#: 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:61
+#: 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/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/reserved_stock/reserved_stock.js:80
+#: 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
@@ -77807,7 +79272,7 @@
 msgid "Voucher Qty"
 msgstr "تعداد کوپن"
 
-#: accounts/report/general_ledger/general_ledger.py:619
+#: accounts/report/general_ledger/general_ledger.py:632
 msgid "Voucher Subtype"
 msgstr "زیرنوع کوپن"
 
@@ -77817,25 +79282,25 @@
 msgid "Voucher Subtype"
 msgstr "زیرنوع کوپن"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1048
+#: 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:617
+#: accounts/report/general_ledger/general_ledger.py:630
 #: 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/voucher_wise_balance/voucher_wise_balance.py:17
-#: public/js/utils/unreconcile.js:60
+#: 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/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/reserved_stock/reserved_stock.js:68
+#: 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_ledger/stock_ledger.py:230
+#: 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
 msgid "Voucher Type"
@@ -77907,11 +79372,11 @@
 msgid "Voucher Type"
 msgstr "نوع کوپن"
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:177
+#: accounts/doctype/bank_transaction/bank_transaction.py:180
 msgid "Voucher {0} is over-allocated by {1}"
 msgstr "کوپن {0} توسط {1} بیش از حد تخصیص داده شده است"
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:249
+#: accounts/doctype/bank_transaction/bank_transaction.py:252
 msgid "Voucher {0} value is broken: {1}"
 msgstr "ارزش کوپن {0} خراب است: {1}"
 
@@ -78000,12 +79465,12 @@
 msgid "Wages per hour"
 msgstr "دستمزد در ساعت"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:251
+#: accounts/doctype/pos_invoice/pos_invoice.js:270
 msgid "Waiting for payment..."
 msgstr "در انتظار پرداخت..."
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:55
+#: accounts/report/gross_profit/gross_profit.js:56
 #: accounts/report/gross_profit/gross_profit.py:251
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
 #: accounts/report/purchase_register/purchase_register.js:52
@@ -78013,58 +79478,62 @@
 #: 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
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:16
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:11
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:82
+#: 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/work_order_stock_report/work_order_stock_report.js:9
-#: public/js/stock_analytics.js:45 public/js/utils.js:498
-#: public/js/utils/serial_no_batch_selector.js:90
-#: selling/doctype/sales_order/sales_order.js:300
-#: selling/doctype/sales_order/sales_order.js:401
-#: selling/report/sales_order_analysis/sales_order_analysis.js:49
+#: 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/utils/serial_no_batch_selector.js:94
+#: selling/doctype/sales_order/sales_order.js:327
+#: selling/doctype/sales_order/sales_order.js:431
+#: selling/report/sales_order_analysis/sales_order_analysis.js:48
 #: selling/report/sales_order_analysis/sales_order_analysis.py:334
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:78
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:79
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:256
 #: stock/doctype/warehouse/warehouse.json
 #: stock/page/stock_balance/stock_balance.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:22
+#: 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/item_price_stock/item_price_stock.py:27
-#: stock/report/item_shortage_report/item_shortage_report.js:18
+#: stock/report/item_shortage_report/item_shortage_report.js:17
 #: stock/report/item_shortage_report/item_shortage_report.py:81
 #: stock/report/product_bundle_balance/product_bundle_balance.js:42
 #: stock/report/product_bundle_balance/product_bundle_balance.py:89
-#: stock/report/reserved_stock/reserved_stock.js:44
+#: stock/report/reserved_stock/reserved_stock.js:41
 #: stock/report/reserved_stock/reserved_stock.py:96
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:140
-#: stock/report/serial_no_ledger/serial_no_ledger.js:22
+#: 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_analytics/stock_analytics.js:50
+#: stock/report/stock_analytics/stock_analytics.js:49
 #: stock/report/stock_balance/stock_balance.js:51
-#: stock/report/stock_balance/stock_balance.py:376
+#: stock/report/stock_balance/stock_balance.py:384
 #: stock/report/stock_ledger/stock_ledger.js:30
-#: stock/report/stock_ledger/stock_ledger.py:167
+#: stock/report/stock_ledger/stock_ledger.py:240
 #: stock/report/stock_ledger_variance/stock_ledger_variance.js:38
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:55
 #: 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:17
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:39
+#: 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
+#: templates/form_grid/material_request_grid.html:8
+#: templates/form_grid/stock_entry_grid.html:9
 msgid "Warehouse"
 msgstr "انبار"
 
@@ -78122,12 +79591,24 @@
 msgid "Warehouse"
 msgstr "انبار"
 
+#. Label of a Link field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Warehouse"
+msgstr "انبار"
+
 #. Label of a Link field in DocType 'Pick List Item'
 #: stock/doctype/pick_list_item/pick_list_item.json
 msgctxt "Pick List Item"
 msgid "Warehouse"
 msgstr "انبار"
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Warehouse"
+msgstr "انبار"
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -78262,6 +79743,12 @@
 msgid "Warehouse"
 msgstr "انبار"
 
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Warehouse"
+msgstr "انبار"
+
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:4
 msgid "Warehouse Capacity Summary"
 msgstr ""
@@ -78387,12 +79874,12 @@
 msgid "Warehouse not found against the account {0}"
 msgstr "انبار در برابر حساب {0} پیدا نشد"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:367
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:421
 msgid "Warehouse not found in the system"
 msgstr "انباری در سیستم یافت نشد"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1005
-#: stock/doctype/delivery_note/delivery_note.py:362
+#: accounts/doctype/sales_invoice/sales_invoice.py:1022
+#: stock/doctype/delivery_note/delivery_note.py:416
 msgid "Warehouse required for stock Item {0}"
 msgstr "انبار مورد نیاز برای موجودی مورد {0}"
 
@@ -78414,11 +79901,11 @@
 msgid "Warehouse {0} does not belong to Company {1}."
 msgstr "انبار {0} متعلق به شرکت {1} نیست."
 
-#: stock/utils.py:441
+#: stock/utils.py:436
 msgid "Warehouse {0} does not belong to company {1}"
 msgstr "انبار {0} متعلق به شرکت {1} نیست"
 
-#: controllers/stock_controller.py:244
+#: controllers/stock_controller.py:426
 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 "انبار {0} به هیچ حسابی مرتبط نیست، لطفاً حساب را در سابقه انبار ذکر کنید یا حساب موجودی پیش فرض را در شرکت {1} تنظیم کنید."
 
@@ -78430,7 +79917,7 @@
 msgid "Warehouse: {0} does not belong to {1}"
 msgstr "انبار: {0} متعلق به {1} نیست"
 
-#: manufacturing/doctype/production_plan/production_plan.js:379
+#: manufacturing/doctype/production_plan/production_plan.js:407
 msgid "Warehouses"
 msgstr "انبارها"
 
@@ -78540,9 +80027,9 @@
 msgid "Warn for new Request for Quotations"
 msgstr "هشدار برای درخواست جدید برای نقل قول"
 
-#: accounts/doctype/payment_entry/payment_entry.py:639
-#: controllers/accounts_controller.py:1676
-#: stock/doctype/delivery_trip/delivery_trip.js:123
+#: accounts/doctype/payment_entry/payment_entry.py:648
+#: controllers/accounts_controller.py:1765
+#: stock/doctype/delivery_trip/delivery_trip.js:144
 #: utilities/transaction_base.py:122
 msgid "Warning"
 msgstr "هشدار"
@@ -78555,15 +80042,15 @@
 msgid "Warning!"
 msgstr "هشدار!"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1146
+#: accounts/doctype/journal_entry/journal_entry.py:1173
 msgid "Warning: Another {0} # {1} exists against stock entry {2}"
 msgstr "هشدار: یک {0} # {1} دیگر در برابر ورود موجودی {2} وجود دارد"
 
-#: stock/doctype/material_request/material_request.js:415
+#: stock/doctype/material_request/material_request.js:484
 msgid "Warning: Material Requested Qty is less than Minimum Order Qty"
 msgstr "هشدار: تعداد مواد درخواستی کمتر از حداقل تعداد سفارش است"
 
-#: selling/doctype/sales_order/sales_order.py:252
+#: selling/doctype/sales_order/sales_order.py:254
 msgid "Warning: Sales Order {0} already exists against Customer's Purchase Order {1}"
 msgstr "هشدار: سفارش فروش {0} در مقابل سفارش خرید مشتری {1} وجود دارد"
 
@@ -78585,7 +80072,7 @@
 msgstr "گارانتی / وضعیت AMC"
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:97
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:103
 #: support/doctype/warranty_claim/warranty_claim.json
 msgid "Warranty Claim"
 msgstr "ادعای گارانتی"
@@ -78625,6 +80112,10 @@
 msgid "Watch Video"
 msgstr "تماشای ویدیو"
 
+#: controllers/accounts_controller.py:232
+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 ""
+
 #: www/support/index.html:7
 msgid "We're here to help!"
 msgstr "ما برای کمک اینجا هستیم!"
@@ -78834,12 +80325,12 @@
 msgid "Weekday"
 msgstr "روز هفته"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:34
-#: public/js/stock_analytics.js:52
-#: selling/report/sales_analytics/sales_analytics.js:61
-#: stock/report/stock_analytics/stock_analytics.js:80
-#: support/report/issue_analytics/issue_analytics.js:42
+#: buying/report/purchase_analytics/purchase_analytics.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:33
+#: public/js/stock_analytics.js:82
+#: selling/report/sales_analytics/sales_analytics.js:68
+#: stock/report/stock_analytics/stock_analytics.js:79
+#: support/report/issue_analytics/issue_analytics.js:41
 msgid "Weekly"
 msgstr "هفتگی"
 
@@ -79096,15 +80587,22 @@
 msgid "Wheels"
 msgstr "چرخ ها"
 
-#: stock/doctype/item/item.js:834
+#. Description of the 'Sub Assembly Warehouse' (Link) field in DocType
+#. 'Production Plan'
+#: manufacturing/doctype/production_plan/production_plan.json
+msgctxt "Production Plan"
+msgid "When a parent warehouse is chosen, the system conducts stock checks against the associated child warehouses"
+msgstr ""
+
+#: stock/doctype/item/item.js:920
 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:313
+#: accounts/doctype/account/account.py:332
 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account."
 msgstr "هنگام ایجاد حساب برای Child Company {0}، حساب والدین {1} به عنوان یک حساب دفتر کل یافت شد."
 
-#: accounts/doctype/account/account.py:303
+#: accounts/doctype/account/account.py:322
 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA"
 msgstr "هنگام ایجاد حساب برای شرکت فرزند {0}، حساب والدین {1} یافت نشد. لطفاً حساب والد را در COA مربوطه ایجاد کنید"
 
@@ -79167,7 +80665,11 @@
 msgid "With Operations"
 msgstr "با عملیات"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:70
+#: accounts/report/trial_balance/trial_balance.js:82
+msgid "With Period Closing Entry For Opening Balances"
+msgstr ""
+
+#: public/js/bank_reconciliation_tool/data_table_manager.js:67
 msgid "Withdrawal"
 msgstr "برداشت از حساب"
 
@@ -79183,7 +80685,7 @@
 msgid "Work Done"
 msgstr "کار انجام شد"
 
-#: setup/doctype/company/company.py:261
+#: setup/doctype/company/company.py:260
 msgid "Work In Progress"
 msgstr "کار در حال انجام"
 
@@ -79205,7 +80707,7 @@
 msgid "Work In Progress"
 msgstr "کار در حال انجام"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:20
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:23
 msgid "Work In Progress Warehouse"
 msgstr "انبار کار در حال انجام"
 
@@ -79213,19 +80715,20 @@
 #. Title of an Onboarding Step
 #: manufacturing/doctype/bom/bom.js:119
 #: manufacturing/doctype/work_order/work_order.json
+#: manufacturing/doctype/workstation/workstation_job_card.html:26
 #: manufacturing/onboarding_step/work_order/work_order.json
-#: manufacturing/report/bom_variance_report/bom_variance_report.js: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:42
+#: 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/job_card_summary/job_card_summary.py:145
-#: manufacturing/report/process_loss_report/process_loss_report.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:22
 #: manufacturing/report/process_loss_report/process_loss_report.py:68
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:30
+#: 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:560
-#: stock/doctype/material_request/material_request.js:152
-#: stock/doctype/material_request/material_request.py:779
+#: selling/doctype/sales_order/sales_order.js:624
+#: stock/doctype/material_request/material_request.js:178
+#: stock/doctype/material_request/material_request.py:791
 #: templates/pages/material_request_info.html:45
 msgid "Work Order"
 msgstr "سفارش کار"
@@ -79276,7 +80779,7 @@
 msgid "Work Order"
 msgstr "سفارش کار"
 
-#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:121
 msgid "Work Order / Subcontract PO"
 msgstr "سفارش کار / PO قرارداد فرعی"
 
@@ -79323,33 +80826,33 @@
 msgid "Work Order Summary"
 msgstr "خلاصه سفارش کار"
 
-#: stock/doctype/material_request/material_request.py:784
+#: stock/doctype/material_request/material_request.py:796
 msgid "Work Order cannot be created for following reason: <br> {0}"
 msgstr "سفارش کار به دلایل زیر ایجاد نمی شود: <br> {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:927
+#: manufacturing/doctype/work_order/work_order.py:941
 msgid "Work Order cannot be raised against a Item Template"
 msgstr "سفارش کار را نمی توان در برابر یک الگوی مورد مطرح کرد"
 
-#: manufacturing/doctype/work_order/work_order.py:1399
-#: manufacturing/doctype/work_order/work_order.py:1458
+#: manufacturing/doctype/work_order/work_order.py:1413
+#: manufacturing/doctype/work_order/work_order.py:1472
 msgid "Work Order has been {0}"
 msgstr "سفارش کار {0} بوده است"
 
-#: selling/doctype/sales_order/sales_order.js:667
+#: selling/doctype/sales_order/sales_order.js:768
 msgid "Work Order not created"
 msgstr "سفارش کار ایجاد نشد"
 
-#: stock/doctype/stock_entry/stock_entry.py:679
+#: stock/doctype/stock_entry/stock_entry.py:634
 msgid "Work Order {0}: Job Card not found for the operation {1}"
 msgstr "سفارش کار {0}: کارت شغلی برای عملیات {1} یافت نشد"
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:57
-#: stock/doctype/material_request/material_request.py:774
+#: manufacturing/report/job_card_summary/job_card_summary.js:56
+#: stock/doctype/material_request/material_request.py:786
 msgid "Work Orders"
 msgstr "دستورات کاری"
 
-#: selling/doctype/sales_order/sales_order.js:731
+#: selling/doctype/sales_order/sales_order.js:844
 msgid "Work Orders Created: {0}"
 msgstr "سفارش‌های کاری ایجاد شده: {0}"
 
@@ -79376,7 +80879,7 @@
 msgid "Work-in-Progress Warehouse"
 msgstr "انبار کار در حال انجام"
 
-#: manufacturing/doctype/work_order/work_order.py:425
+#: manufacturing/doctype/work_order/work_order.py:436
 msgid "Work-in-Progress Warehouse is required before Submit"
 msgstr "قبل از ارسال، انبار کار در حال انجام الزامی است"
 
@@ -79413,6 +80916,10 @@
 msgid "Workflow State"
 msgstr "وضعیت گردش کار"
 
+#: templates/pages/task_info.html:73
+msgid "Working"
+msgstr "کار کردن"
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -79439,14 +80946,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/work_order/work_order.js:232
+#: manufacturing/doctype/work_order/work_order.js:247
 #: manufacturing/doctype/workstation/workstation.json
 #: manufacturing/onboarding_step/workstation/workstation.json
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:36
+#: 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:61
+#: 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/job_card_summary/job_card_summary.js:73
+#: 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
 msgid "Workstation"
@@ -79488,12 +80995,24 @@
 msgid "Workstation / Machine"
 msgstr "ایستگاه کاری / ماشین"
 
+#. Label of a HTML field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Dashboard"
+msgstr ""
+
 #. Label of a Data field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Workstation Name"
 msgstr "نام ایستگاه کاری"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Status"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/workstation_type/workstation_type.json
 msgid "Workstation Type"
@@ -79536,17 +81055,23 @@
 msgid "Workstation Working Hour"
 msgstr "ساعت کاری ایستگاه کاری"
 
-#: manufacturing/doctype/workstation/workstation.py:199
+#: manufacturing/doctype/workstation/workstation.py:355
 msgid "Workstation is closed on the following dates as per Holiday List: {0}"
 msgstr "ایستگاه کاری در تاریخ‌های زیر طبق فهرست تعطیلات بسته است: {0}"
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Workstations"
+msgstr ""
+
 #: setup/setup_wizard/setup_wizard.py:16 setup/setup_wizard/setup_wizard.py:41
 msgid "Wrapping up"
 msgstr "بسته شدن"
 
 #: 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:510
+#: setup/doctype/company/company.py:509
 msgid "Write Off"
 msgstr "نوشتن خاموش"
 
@@ -79737,7 +81262,7 @@
 msgid "Wrong Company"
 msgstr "شرکت اشتباه"
 
-#: setup/doctype/company/company.js:172
+#: setup/doctype/company/company.js:202
 msgid "Wrong Password"
 msgstr "رمز عبور اشتباه"
 
@@ -79796,20 +81321,20 @@
 msgid "Year start date or end date is overlapping with {0}. To avoid please set company"
 msgstr "تاریخ شروع یا تاریخ پایان سال با {0} همپوشانی دارد. برای اجتناب لطفا شرکت را تنظیم کنید"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:67
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:70
-#: buying/report/purchase_analytics/purchase_analytics.js:64
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:37
-#: public/js/financial_statements.js:220
+#: accounts/report/budget_variance_report/budget_variance_report.js:65
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:78
+#: buying/report/purchase_analytics/purchase_analytics.js:63
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:36
+#: public/js/financial_statements.js:229
 #: public/js/purchase_trends_filters.js:22 public/js/sales_trends_filters.js:14
-#: public/js/stock_analytics.js:55
-#: selling/report/sales_analytics/sales_analytics.js:64
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:36
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:36
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:36
-#: stock/report/stock_analytics/stock_analytics.js:83
-#: support/report/issue_analytics/issue_analytics.js:45
+#: public/js/stock_analytics.js:85
+#: selling/report/sales_analytics/sales_analytics.js:71
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: stock/report/stock_analytics/stock_analytics.js:82
+#: support/report/issue_analytics/issue_analytics.js:44
 msgid "Yearly"
 msgstr "سالانه"
 
@@ -79942,23 +81467,23 @@
 msgid "Yes"
 msgstr "بله"
 
-#: controllers/accounts_controller.py:3151
+#: controllers/accounts_controller.py:3242
 msgid "You are not allowed to update as per the conditions set in {} Workflow."
 msgstr "شما مجاز به به روز رسانی طبق شرایط تنظیم شده در {} گردش کار نیستید."
 
-#: accounts/general_ledger.py:665
+#: accounts/general_ledger.py:674
 msgid "You are not authorized to add or update entries before {0}"
 msgstr "شما مجاز به افزودن یا به‌روزرسانی ورودی‌ها قبل از {0} نیستید"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:317
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
 msgid "You are not authorized to make/edit Stock Transactions for Item {0} under warehouse {1} before this time."
 msgstr "شما مجاز به انجام/ویرایش معاملات موجودی برای کالای {0} در انبار {1} قبل از این زمان نیستید."
 
-#: accounts/doctype/account/account.py:263
+#: accounts/doctype/account/account.py:282
 msgid "You are not authorized to set Frozen value"
 msgstr "شما مجاز به تنظیم مقدار Frozen نیستید"
 
-#: stock/doctype/pick_list/pick_list.py:307
+#: stock/doctype/pick_list/pick_list.py:347
 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 "شما در حال انتخاب بیش از مقدار مورد نیاز برای مورد {0} هستید. بررسی کنید که آیا لیست انتخاب دیگری برای سفارش فروش {1} ایجاد شده است."
 
@@ -79974,7 +81499,7 @@
 msgid "You can also set default CWIP account in Company {}"
 msgstr "همچنین می‌توانید حساب پیش‌فرض CWIP را در شرکت {} تنظیم کنید."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:873
+#: accounts/doctype/sales_invoice/sales_invoice.py:890
 msgid "You can change the parent account to a Balance Sheet account or select a different account."
 msgstr "می توانید حساب مادر را به حساب ترازنامه تغییر دهید یا حساب دیگری را انتخاب کنید."
 
@@ -79982,7 +81507,7 @@
 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:583
+#: accounts/doctype/journal_entry/journal_entry.py:610
 msgid "You can not enter current voucher in 'Against Journal Entry' column"
 msgstr "شما نمی توانید کوپن فعلی را در ستون \"علیه ورود مجله\" وارد کنید"
 
@@ -79990,8 +81515,8 @@
 msgid "You can only have Plans with the same billing cycle in a Subscription"
 msgstr "فقط می‌توانید طرح‌هایی با چرخه صورت‌حساب یکسان در اشتراک داشته باشید"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:239
-#: accounts/doctype/sales_invoice/sales_invoice.js:847
+#: accounts/doctype/pos_invoice/pos_invoice.js:258
+#: accounts/doctype/sales_invoice/sales_invoice.js:915
 msgid "You can only redeem max {0} points in this order."
 msgstr "در این سفارش فقط می‌توانید حداکثر {0} امتیاز را پس‌خرید کنید."
 
@@ -79999,11 +81524,11 @@
 msgid "You can only select one mode of payment as default"
 msgstr "شما فقط می توانید یک روش پرداخت را به عنوان پیش فرض انتخاب کنید"
 
-#: selling/page/point_of_sale/pos_payment.js:478
+#: selling/page/point_of_sale/pos_payment.js:506
 msgid "You can redeem upto {0}."
 msgstr "می توانید حداکثر تا {0} مطالبه کنید."
 
-#: manufacturing/doctype/workstation/workstation.js:37
+#: manufacturing/doctype/workstation/workstation.js:59
 msgid "You can set it as a machine name or operation type. For example, stiching machine 12"
 msgstr "می توانید آن را به عنوان نام ماشین یا نوع عملیات تنظیم کنید. مثلا ماشین دوخت 12"
 
@@ -80012,7 +81537,7 @@
 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:1027
+#: manufacturing/doctype/job_card/job_card.py:1042
 msgid "You can't make any changes to Job Card since Work Order is closed."
 msgstr "از آنجایی که Work Order بسته شده است، نمی توانید هیچ تغییری در Job Card ایجاد کنید."
 
@@ -80020,7 +81545,7 @@
 msgid "You can't redeem Loyalty Points having more value than the Rounded Total."
 msgstr "نمی‌توانید امتیازهای وفاداری را که ارزش بیشتری از مجموع گرد شده دارند، پس‌خرید کنید."
 
-#: manufacturing/doctype/bom/bom.js:532
+#: manufacturing/doctype/bom/bom.js:549
 msgid "You cannot change the rate if BOM is mentioned against any Item."
 msgstr "اگر BOM در برابر هر موردی ذکر شده باشد، نمی توانید نرخ را تغییر دهید."
 
@@ -80028,15 +81553,15 @@
 msgid "You cannot create a {0} within the closed Accounting Period {1}"
 msgstr "شما نمی توانید یک {0} در دوره حسابداری بسته {1} ایجاد کنید"
 
-#: accounts/general_ledger.py:155
+#: accounts/general_ledger.py:159
 msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
 msgstr "شما نمی توانید هیچ ورودی حسابداری را در دوره حسابداری بسته شده ایجاد یا لغو کنید {0}"
 
-#: accounts/general_ledger.py:689
+#: accounts/general_ledger.py:698
 msgid "You cannot create/amend any accounting entries till this date."
 msgstr "تا این تاریخ نمی توانید هیچ ورودی حسابداری ایجاد یا اصلاح کنید."
 
-#: accounts/doctype/journal_entry/journal_entry.py:809
+#: accounts/doctype/journal_entry/journal_entry.py:836
 msgid "You cannot credit and debit same account at the same time"
 msgstr "شما نمی توانید یک حساب را همزمان اعتبار و بدهی کنید"
 
@@ -80048,7 +81573,7 @@
 msgid "You cannot edit root node."
 msgstr "شما نمی توانید گره ریشه را ویرایش کنید."
 
-#: selling/page/point_of_sale/pos_payment.js:507
+#: selling/page/point_of_sale/pos_payment.js:536
 msgid "You cannot redeem more than {0}."
 msgstr "شما نمی توانید بیش از {0} را بازخرید کنید."
 
@@ -80060,15 +81585,15 @@
 msgid "You cannot restart a Subscription that is not cancelled."
 msgstr "نمی توانید اشتراکی را که لغو نشده است راه اندازی مجدد کنید."
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:210
 msgid "You cannot submit empty order."
 msgstr "شما نمی توانید سفارش خالی ارسال کنید."
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:209
 msgid "You cannot submit the order without payment."
 msgstr "شما نمی توانید سفارش را بدون پرداخت ارسال کنید."
 
-#: controllers/accounts_controller.py:3127
+#: controllers/accounts_controller.py:3218
 msgid "You do not have permissions to {} items in a {}."
 msgstr "شما مجوز {} مورد در {} را ندارید."
 
@@ -80076,7 +81601,7 @@
 msgid "You don't have enough Loyalty Points to redeem"
 msgstr "امتیاز وفاداری کافی برای پس‌خرید ندارید"
 
-#: selling/page/point_of_sale/pos_payment.js:474
+#: selling/page/point_of_sale/pos_payment.js:499
 msgid "You don't have enough points to redeem."
 msgstr "امتیاز کافی برای بازخرید ندارید."
 
@@ -80084,7 +81609,7 @@
 msgid "You had {} errors while creating opening invoices. Check {} for more details"
 msgstr "هنگام ایجاد فاکتورهای افتتاحیه {} خطا داشتید. برای جزئیات بیشتر {} را بررسی کنید"
 
-#: public/js/utils.js:822
+#: public/js/utils.js:893
 msgid "You have already selected items from {0} {1}"
 msgstr "شما قبلاً مواردی را از {0} {1} انتخاب کرده اید"
 
@@ -80092,7 +81617,7 @@
 msgid "You have been invited to collaborate on the project: {0}"
 msgstr "از شما برای همکاری در این پروژه دعوت شده است: {0}"
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:442
 msgid "You have entered a duplicate Delivery Note on Row"
 msgstr "شما یک یادداشت تحویل تکراری در ردیف وارد کرده اید"
 
@@ -80104,11 +81629,11 @@
 msgid "You haven't created a {0} yet"
 msgstr "شما هنوز یک {0} ایجاد نکرده اید"
 
-#: selling/page/point_of_sale/pos_controller.js:196
+#: selling/page/point_of_sale/pos_controller.js:218
 msgid "You must add atleast one item to save it as draft."
 msgstr "برای ذخیره آن به عنوان پیش نویس باید حداقل یک مورد اضافه کنید."
 
-#: selling/page/point_of_sale/pos_controller.js:598
+#: selling/page/point_of_sale/pos_controller.js:626
 msgid "You must select a customer before adding an item."
 msgstr "قبل از افزودن یک مورد باید مشتری را انتخاب کنید."
 
@@ -80173,7 +81698,7 @@
 msgid "Youtube Statistics"
 msgstr "آمار یوتیوب"
 
-#: public/js/utils/contact_address_quick_entry.js:68
+#: public/js/utils/contact_address_quick_entry.js:71
 msgid "ZIP Code"
 msgstr "کد پستی"
 
@@ -80187,7 +81712,7 @@
 msgid "Zero Rated"
 msgstr "دارای امتیاز صفر"
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Zero quantity"
 msgstr "مقدار صفر"
 
@@ -80197,7 +81722,7 @@
 msgid "Zip File"
 msgstr "فایل فشرده"
 
-#: stock/reorder_item.py:283
+#: stock/reorder_item.py:368
 msgid "[Important] [ERPNext] Auto Reorder Errors"
 msgstr "[مهم] [ERPNext] خطاهای سفارش مجدد خودکار"
 
@@ -80205,16 +81730,20 @@
 msgid "`Allow Negative rates for Items`"
 msgstr "مجاز نرخ های منفی برای اقلام."
 
-#: stock/doctype/stock_settings/stock_settings.py:89
+#: stock/doctype/stock_settings/stock_settings.py:92
 #, python-format
 msgid "`Freeze Stocks Older Than` should be smaller than %d days."
 msgstr ""
 
+#: stock/stock_ledger.py:1700
+msgid "after"
+msgstr ""
+
 #: accounts/doctype/shipping_rule/shipping_rule.py:204
 msgid "and"
 msgstr "و"
 
-#: manufacturing/doctype/bom/bom.js:759
+#: manufacturing/doctype/bom/bom.js:792
 msgid "as a percentage of finished item quantity"
 msgstr "به عنوان درصدی از مقدار کالای تمام شده"
 
@@ -80222,11 +81751,15 @@
 msgid "at"
 msgstr "در"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:17
-#: selling/report/sales_analytics/sales_analytics.js:17
+#: buying/report/purchase_analytics/purchase_analytics.js:16
+#: selling/report/sales_analytics/sales_analytics.js:24
 msgid "based_on"
 msgstr "بر اساس"
 
+#: public/js/utils/sales_common.js:256
+msgid "cannot be greater than 100"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgctxt "Production Plan Sub Assembly Item"
@@ -80240,8 +81773,12 @@
 msgid "development"
 msgstr "توسعه"
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "discount applied"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:46
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:57
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:58
 msgid "doc_type"
 msgstr "نوع_doc"
 
@@ -80270,6 +81807,10 @@
 msgid "exchangerate.host"
 msgstr "مبادله.میزبان"
 
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:161
+msgid "fieldname"
+msgstr ""
+
 #. Option for the 'Service Provider' (Select) field in DocType 'Currency
 #. Exchange Settings'
 #: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
@@ -80277,13 +81818,21 @@
 msgid "frankfurter.app"
 msgstr ""
 
+#: templates/form_grid/item_grid.html:66 templates/form_grid/item_grid.html:80
+msgid "hidden"
+msgstr ""
+
+#: projects/doctype/project/project_dashboard.html:13
+msgid "hours"
+msgstr ""
+
 #. Label of a Attach Image field in DocType 'Batch'
 #: stock/doctype/batch/batch.json
 msgctxt "Batch"
 msgid "image"
 msgstr "تصویر"
 
-#: accounts/doctype/budget/budget.py:253
+#: accounts/doctype/budget/budget.py:260
 msgid "is already"
 msgstr "است در حال حاضر"
 
@@ -80359,7 +81908,7 @@
 msgid "material_request_item"
 msgstr "ماده_درخواست_آیتم"
 
-#: controllers/selling_controller.py:150
+#: controllers/selling_controller.py:151
 msgid "must be between 0 and 100"
 msgstr "باید بین 0 تا 100 باشد"
 
@@ -80405,7 +81954,11 @@
 msgid "old_parent"
 msgstr "پیر_والد"
 
-#: controllers/accounts_controller.py:1033
+#: templates/pages/task_info.html:90
+msgid "on"
+msgstr ""
+
+#: controllers/accounts_controller.py:1097
 msgid "or"
 msgstr "یا"
 
@@ -80417,7 +81970,7 @@
 msgid "out of 5"
 msgstr "از 5"
 
-#: public/js/utils.js:369
+#: public/js/utils.js:417
 msgid "payments app is not installed. Please install it from {0} or {1}"
 msgstr "برنامه پرداخت نصب نشده است لطفاً آن را از {0} یا {1} نصب کنید"
 
@@ -80458,7 +82011,7 @@
 msgid "per hour"
 msgstr "در ساعت"
 
-#: stock/stock_ledger.py:1681
+#: stock/stock_ledger.py:1701
 msgid "performing either one below:"
 msgstr "انجام هر یک از موارد زیر:"
 
@@ -80486,7 +82039,7 @@
 msgid "ratings"
 msgstr "رتبه بندی ها"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 msgid "received from"
 msgstr "دریافت شده از"
 
@@ -80563,10 +82116,6 @@
 msgid "sandbox"
 msgstr "جعبه شنی"
 
-#: public/js/controllers/transaction.js:920
-msgid "selected Payment Terms Template"
-msgstr "الگوی شرایط پرداخت انتخاب شده"
-
 #: accounts/doctype/subscription/subscription.py:711
 msgid "subscription is already cancelled."
 msgstr "اشتراک در حال حاضر لغو شده است."
@@ -80587,12 +82136,14 @@
 msgid "title"
 msgstr "عنوان"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 #: 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:2737
+#: accounts/doctype/sales_invoice/sales_invoice.py:2706
 msgid "to unallocate the amount of this Return Invoice before cancelling it."
 msgstr "برای تخصیص مبلغ این فاکتور برگشتی قبل از لغو آن."
 
@@ -80615,7 +82166,7 @@
 msgid "via BOM Update Tool"
 msgstr "از طریق BOM Update Tool"
 
-#: accounts/doctype/budget/budget.py:256
+#: accounts/doctype/budget/budget.py:263
 msgid "will be"
 msgstr "خواهد بود"
 
@@ -80628,7 +82179,7 @@
 msgid "{0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:878
+#: controllers/accounts_controller.py:930
 msgid "{0} '{1}' is disabled"
 msgstr "{0} \"{1}\" غیرفعال است"
 
@@ -80636,7 +82187,7 @@
 msgid "{0} '{1}' not in Fiscal Year {2}"
 msgstr "{0} «{1}» در سال مالی {2} نیست"
 
-#: manufacturing/doctype/work_order/work_order.py:355
+#: manufacturing/doctype/work_order/work_order.py:366
 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
 msgstr "{0} ({1}) نمی تواند بیشتر از مقدار برنامه ریزی شده ({2}) در دستور کار {3} باشد"
 
@@ -80644,19 +82195,19 @@
 msgid "{0} - Above"
 msgstr "{0} - بالا"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:253
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:281
 msgid "{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
 msgstr "{0} <b>{1}</b> دارایی‌ها را ارسال کرده است. برای ادامه، مورد <b>{2}</b> را از جدول حذف کنید."
 
-#: controllers/accounts_controller.py:1893
+#: controllers/accounts_controller.py:1985
 msgid "{0} Account not found against Customer {1}."
 msgstr "{0} حساب در مقابل مشتری پیدا نشد {1}."
 
-#: accounts/doctype/budget/budget.py:261
+#: accounts/doctype/budget/budget.py:268
 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It {5} exceed by {6}"
 msgstr "{0} بودجه برای حساب {1} در برابر {2} {3} {4} است. {5} از {6} بیشتر است"
 
-#: accounts/doctype/pricing_rule/utils.py:759
+#: accounts/doctype/pricing_rule/utils.py:758
 msgid "{0} Coupon used are {1}. Allowed quantity is exhausted"
 msgstr "{0} کوپن استفاده شده {1} است. مقدار مجاز تمام شده است"
 
@@ -80664,11 +82215,11 @@
 msgid "{0} Digest"
 msgstr "{0} خلاصه"
 
-#: accounts/utils.py:1286
+#: accounts/utils.py:1255
 msgid "{0} Number {1} is already used in {2} {3}"
 msgstr "{0} شماره {1} قبلاً در {2} {3} استفاده شده است"
 
-#: manufacturing/doctype/work_order/work_order.js:379
+#: manufacturing/doctype/work_order/work_order.js:397
 msgid "{0} Operations: {1}"
 msgstr "{0} عملیات: {1}"
 
@@ -80680,7 +82231,7 @@
 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
 msgstr "{0} Retain Sample بر اساس دسته است، لطفاً شماره دسته ای را دارد تا نمونه مورد را حفظ کنید"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:429
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:428
 msgid "{0} Transaction(s) Reconciled"
 msgstr "{0} معامله(های) تطبیق شد"
 
@@ -80688,23 +82239,23 @@
 msgid "{0} account is not of type {1}"
 msgstr "حساب {0} از نوع {1} نیست"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:447
+#: stock/doctype/purchase_receipt/purchase_receipt.py:448
 msgid "{0} account not found while submitting purchase receipt"
 msgstr "هنگام ارسال رسید خرید، حساب {0} پیدا نشد"
 
-#: accounts/doctype/journal_entry/journal_entry.py:930
+#: accounts/doctype/journal_entry/journal_entry.py:957
 msgid "{0} against Bill {1} dated {2}"
 msgstr "{0} در برابر لایحه {1} مورخ {2}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:939
+#: accounts/doctype/journal_entry/journal_entry.py:966
 msgid "{0} against Purchase Order {1}"
 msgstr "{0} در مقابل سفارش خرید {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:906
+#: accounts/doctype/journal_entry/journal_entry.py:933
 msgid "{0} against Sales Invoice {1}"
 msgstr "{0} در برابر فاکتور فروش {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:913
+#: accounts/doctype/journal_entry/journal_entry.py:940
 msgid "{0} against Sales Order {1}"
 msgstr "{0} در برابر سفارش فروش {1}"
 
@@ -80712,7 +82263,7 @@
 msgid "{0} already has a Parent Procedure {1}."
 msgstr "{0} در حال حاضر یک روش والدین {1} دارد."
 
-#: stock/doctype/delivery_note/delivery_note.py:610
+#: stock/doctype/delivery_note/delivery_note.py:671
 msgid "{0} and {1}"
 msgstr "{0} و {1}"
 
@@ -80733,16 +82284,16 @@
 msgid "{0} cannot be used as a Main Cost Center because it has been used as child in Cost Center Allocation {1}"
 msgstr "{0} نمی‌تواند به‌عنوان مرکز هزینه اصلی استفاده شود زیرا به‌عنوان کودک در تخصیص مرکز هزینه {1} استفاده شده است."
 
-#: manufacturing/doctype/production_plan/production_plan.py:783
-#: manufacturing/doctype/production_plan/production_plan.py:877
+#: manufacturing/doctype/production_plan/production_plan.py:792
+#: manufacturing/doctype/production_plan/production_plan.py:886
 msgid "{0} created"
 msgstr "{0} ایجاد شد"
 
-#: setup/doctype/company/company.py:191
+#: setup/doctype/company/company.py:190
 msgid "{0} currency must be same as company's default currency. Please select another account."
 msgstr "ارز {0} باید با واحد پول پیش‌فرض شرکت یکسان باشد. لطفا حساب دیگری را انتخاب کنید."
 
-#: buying/doctype/purchase_order/purchase_order.py:310
+#: buying/doctype/purchase_order/purchase_order.py:311
 msgid "{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution."
 msgstr "{0} در حال حاضر دارای {1} کارت امتیازی تأمین‌کننده است و سفارش‌های خرید به این تأمین‌کننده باید با احتیاط صادر شوند."
 
@@ -80774,7 +82325,11 @@
 msgid "{0} has been submitted successfully"
 msgstr "{0} با موفقیت ارسال شد"
 
-#: controllers/accounts_controller.py:2212
+#: projects/doctype/project/project_dashboard.html:15
+msgid "{0} hours"
+msgstr ""
+
+#: controllers/accounts_controller.py:2304
 msgid "{0} in row {1}"
 msgstr "{0} در ردیف {1}"
 
@@ -80782,23 +82337,27 @@
 msgid "{0} is a mandatory Accounting Dimension. <br>Please set a value for {0} in Accounting Dimensions section."
 msgstr "{0} یک بعد حسابداری اجباری است. <br>لطفاً یک مقدار برای {0} در بخش ابعاد حسابداری تنظیم کنید."
 
-#: controllers/accounts_controller.py:162
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:189
+msgid "{0} is already running for {1}"
+msgstr ""
+
+#: controllers/accounts_controller.py:164
 msgid "{0} is blocked so this transaction cannot proceed"
 msgstr "{0} مسدود شده است بنابراین این تراکنش نمی تواند ادامه یابد"
 
 #: accounts/doctype/budget/budget.py:57
-#: accounts/doctype/payment_entry/payment_entry.py:542
+#: accounts/doctype/payment_entry/payment_entry.py:551
 #: accounts/report/general_ledger/general_ledger.py:62
 #: accounts/report/pos_register/pos_register.py:110 controllers/trends.py:50
 msgid "{0} is mandatory"
 msgstr "{0} اجباری است"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:975
+#: accounts/doctype/sales_invoice/sales_invoice.py:992
 msgid "{0} is mandatory for Item {1}"
 msgstr "{0} برای مورد {1} اجباری است"
 
-#: accounts/doctype/gl_entry/gl_entry.py:220
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:101
+#: accounts/general_ledger.py:722
 msgid "{0} is mandatory for account {1}"
 msgstr "{0} برای حساب {1} اجباری است"
 
@@ -80806,7 +82365,7 @@
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
 msgstr "{0} اجباری است. شاید رکورد تبادل ارز برای {1} تا {2} ایجاد نشده باشد"
 
-#: controllers/accounts_controller.py:2491
+#: controllers/accounts_controller.py:2576
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
 msgstr "{0} اجباری است. شاید رکورد تبادل ارز برای {1} تا {2} ایجاد نشده باشد."
 
@@ -80818,7 +82377,7 @@
 msgid "{0} is not a group node. Please select a group node as parent cost center"
 msgstr "{0} یک گره گروهی نیست. لطفاً یک گره گروهی را به عنوان مرکز هزینه والدین انتخاب کنید"
 
-#: stock/doctype/stock_entry/stock_entry.py:456
+#: stock/doctype/stock_entry/stock_entry.py:411
 msgid "{0} is not a stock Item"
 msgstr "{0} یک مورد موجودی نیست"
 
@@ -80834,26 +82393,30 @@
 msgid "{0} is not enabled in {1}"
 msgstr "{0} در {1} فعال نیست"
 
-#: stock/doctype/material_request/material_request.py:565
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197
+msgid "{0} is not running. Cannot trigger events for this Document"
+msgstr ""
+
+#: stock/doctype/material_request/material_request.py:566
 msgid "{0} is not the default supplier for any items."
 msgstr "{0} تامین کننده پیش فرض هیچ موردی نیست."
 
-#: accounts/doctype/payment_entry/payment_entry.py:2300
+#: accounts/doctype/payment_entry/payment_entry.py:2325
 msgid "{0} is on hold till {1}"
 msgstr "{0} تا {1} در انتظار است"
 
-#: accounts/doctype/gl_entry/gl_entry.py:131
+#: accounts/doctype/gl_entry/gl_entry.py:121
 #: accounts/doctype/pricing_rule/pricing_rule.py:165
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:182
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:193
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:118
 msgid "{0} is required"
 msgstr "{0} مورد نیاز است"
 
-#: manufacturing/doctype/work_order/work_order.js:343
+#: manufacturing/doctype/work_order/work_order.js:362
 msgid "{0} items in progress"
 msgstr "{0} مورد در حال انجام است"
 
-#: manufacturing/doctype/work_order/work_order.js:327
+#: manufacturing/doctype/work_order/work_order.js:346
 msgid "{0} items produced"
 msgstr "{0} مورد تولید شد"
 
@@ -80861,7 +82424,7 @@
 msgid "{0} must be negative in return document"
 msgstr "{0} باید در سند برگشتی منفی باشد"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1988
+#: accounts/doctype/sales_invoice/sales_invoice.py:1957
 msgid "{0} not allowed to transact with {1}. Please change the Company."
 msgstr "{0} مجاز به تراکنش با {1} نیست. لطفا شرکت را تغییر دهید"
 
@@ -80877,60 +82440,60 @@
 msgid "{0} payment entries can not be filtered by {1}"
 msgstr "{0} ورودی های پرداخت را نمی توان با {1} فیلتر کرد"
 
-#: controllers/stock_controller.py:899
+#: controllers/stock_controller.py:1085
 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
 msgstr "{0} تعداد مورد {1} در انبار {2} با ظرفیت {3} در حال دریافت است."
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:451
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:505
 msgid "{0} units are reserved for Item {1} in Warehouse {2}, please un-reserve the same to {3} the Stock Reconciliation."
 msgstr "{0} واحد برای مورد {1} در انبار {2} رزرو شده است، لطفاً همان را در {3} تطبیق موجودی لغو کنید."
 
-#: stock/doctype/pick_list/pick_list.py:702
+#: stock/doctype/pick_list/pick_list.py:773
 msgid "{0} units of Item {1} is not available."
 msgstr "{0} واحد از مورد {1} در دسترس نیست."
 
-#: stock/doctype/pick_list/pick_list.py:718
+#: stock/doctype/pick_list/pick_list.py:789
 msgid "{0} units of Item {1} is picked in another Pick List."
 msgstr "{0} واحد از مورد {1} در فهرست انتخاب دیگری انتخاب شده است."
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:135
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:145
 msgid "{0} units of {1} are required in {2}{3}, on {4} {5} for {6} to complete the transaction."
 msgstr "{0} واحد از {1} در {2}{3}، در {4} {5} برای {6} برای تکمیل تراکنش مورد نیاز است."
 
-#: stock/stock_ledger.py:1340 stock/stock_ledger.py:1829
-#: stock/stock_ledger.py:1845
+#: stock/stock_ledger.py:1366 stock/stock_ledger.py:1836
+#: stock/stock_ledger.py:1852
 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
 msgstr "برای تکمیل این تراکنش به {0} واحد از {1} در {2} در {3} {4} برای {5} نیاز است."
 
-#: stock/stock_ledger.py:1955 stock/stock_ledger.py:2005
+#: stock/stock_ledger.py:1962 stock/stock_ledger.py:2012
 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
 msgstr "برای تکمیل این تراکنش به {0} واحد از {1} در {2} در {3} {4} نیاز است."
 
-#: stock/stock_ledger.py:1334
+#: stock/stock_ledger.py:1360
 msgid "{0} units of {1} needed in {2} to complete this transaction."
 msgstr "برای تکمیل این تراکنش به {0} واحد از {1} در {2} نیاز است."
 
-#: stock/utils.py:432
+#: stock/utils.py:427
 msgid "{0} valid serial nos for Item {1}"
 msgstr "{0} شماره سریال معتبر برای مورد {1}"
 
-#: stock/doctype/item/item.js:548
+#: stock/doctype/item/item.js:615
 msgid "{0} variants created."
 msgstr "{0} گونه ایجاد شد."
 
-#: accounts/doctype/payment_term/payment_term.js:17
+#: accounts/doctype/payment_term/payment_term.js:19
 msgid "{0} will be given as discount."
 msgstr "{0} به عنوان تخفیف داده می شود."
 
-#: manufacturing/doctype/job_card/job_card.py:773
+#: manufacturing/doctype/job_card/job_card.py:780
 msgid "{0} {1}"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:203
+#: public/js/utils/serial_no_batch_selector.js:206
 msgid "{0} {1} Manually"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:433
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:432
 msgid "{0} {1} Partially Reconciled"
 msgstr "{0} {1} تا حدی آشتی کرد"
 
@@ -80942,9 +82505,9 @@
 msgid "{0} {1} created"
 msgstr "{0} {1} ایجاد شد"
 
-#: accounts/doctype/payment_entry/payment_entry.py:506
-#: accounts/doctype/payment_entry/payment_entry.py:562
-#: accounts/doctype/payment_entry/payment_entry.py:2065
+#: accounts/doctype/payment_entry/payment_entry.py:515
+#: accounts/doctype/payment_entry/payment_entry.py:571
+#: accounts/doctype/payment_entry/payment_entry.py:2084
 msgid "{0} {1} does not exist"
 msgstr "{0} {1} وجود ندارد"
 
@@ -80960,8 +82523,8 @@
 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 "{0} {1} قبلاً تا حدی پرداخت شده است. لطفاً از دکمه «دریافت صورت‌حساب معوق» یا «دریافت سفارش‌های معوق» برای دریافت آخرین مبالغ معوق استفاده کنید."
 
-#: buying/doctype/purchase_order/purchase_order.py:449
-#: selling/doctype/sales_order/sales_order.py:481
+#: buying/doctype/purchase_order/purchase_order.py:450
+#: selling/doctype/sales_order/sales_order.py:484
 #: stock/doctype/material_request/material_request.py:198
 msgid "{0} {1} has been modified. Please refresh."
 msgstr "{0} {1} اصلاح شده است. لطفا رفرش کنید."
@@ -80974,12 +82537,12 @@
 msgid "{0} {1} is allocated twice in this Bank Transaction"
 msgstr "{0} {1} دو بار در این تراکنش بانکی تخصیص داده شده است"
 
-#: accounts/doctype/payment_entry/payment_entry.py:591
+#: accounts/doctype/payment_entry/payment_entry.py:600
 msgid "{0} {1} is associated with {2}, but Party Account is {3}"
 msgstr "{0} {1} با {2} مرتبط است، اما حساب طرف {3} است"
 
-#: controllers/buying_controller.py:624 controllers/selling_controller.py:421
-#: controllers/subcontracting_controller.py:806
+#: controllers/buying_controller.py:649 controllers/selling_controller.py:422
+#: controllers/subcontracting_controller.py:810
 msgid "{0} {1} is cancelled or closed"
 msgstr "{0} {1} لغو یا بسته شده است"
 
@@ -80991,7 +82554,7 @@
 msgid "{0} {1} is cancelled so the action cannot be completed"
 msgstr "{0} {1} لغو شده است بنابراین عمل نمی تواند تکمیل شود"
 
-#: accounts/doctype/journal_entry/journal_entry.py:725
+#: accounts/doctype/journal_entry/journal_entry.py:752
 msgid "{0} {1} is closed"
 msgstr "{0} {1} بسته است"
 
@@ -81003,7 +82566,7 @@
 msgid "{0} {1} is frozen"
 msgstr "{0} {1} ثابت است"
 
-#: accounts/doctype/journal_entry/journal_entry.py:722
+#: accounts/doctype/journal_entry/journal_entry.py:749
 msgid "{0} {1} is fully billed"
 msgstr "{0} {1} به طور کامل صورتحساب دارد"
 
@@ -81011,7 +82574,7 @@
 msgid "{0} {1} is not active"
 msgstr "{0} {1} فعال نیست"
 
-#: accounts/doctype/payment_entry/payment_entry.py:569
+#: accounts/doctype/payment_entry/payment_entry.py:578
 msgid "{0} {1} is not associated with {2} {3}"
 msgstr "{0} {1} با {2} {3} مرتبط نیست"
 
@@ -81019,12 +82582,12 @@
 msgid "{0} {1} is not in any active Fiscal Year"
 msgstr "{0} {1} در هیچ سال مالی فعالی نیست"
 
-#: accounts/doctype/journal_entry/journal_entry.py:719
-#: accounts/doctype/journal_entry/journal_entry.py:760
+#: accounts/doctype/journal_entry/journal_entry.py:746
+#: accounts/doctype/journal_entry/journal_entry.py:787
 msgid "{0} {1} is not submitted"
 msgstr "{0} {1} ارسال نشده است"
 
-#: accounts/doctype/payment_entry/payment_entry.py:598
+#: accounts/doctype/payment_entry/payment_entry.py:607
 msgid "{0} {1} is on hold"
 msgstr "{0} {1} در انتظار است"
 
@@ -81032,11 +82595,11 @@
 msgid "{0} {1} is {2}"
 msgstr "{0} {1} {2} است"
 
-#: accounts/doctype/payment_entry/payment_entry.py:603
+#: accounts/doctype/payment_entry/payment_entry.py:612
 msgid "{0} {1} must be submitted"
 msgstr "{0} {1} باید ارسال شود"
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:213
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:215
 msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
 msgstr "{0} {1} مجاز به ارسال مجدد نیست. برای فعال کردن ارسال مجدد، {2} را تغییر دهید."
 
@@ -81044,58 +82607,58 @@
 msgid "{0} {1} status is {2}"
 msgstr "وضعیت {0} {1} {2} است"
 
-#: public/js/utils/serial_no_batch_selector.js:189
+#: public/js/utils/serial_no_batch_selector.js:191
 msgid "{0} {1} via CSV File"
 msgstr "{0} {1} از طریق فایل CSV"
 
-#: accounts/doctype/gl_entry/gl_entry.py:254
+#: accounts/doctype/gl_entry/gl_entry.py:208
 msgid "{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry"
 msgstr "{0} {1}: نوع حساب \"سود و زیان\" {2} در ورودی باز کردن مجاز نیست"
 
-#: accounts/doctype/gl_entry/gl_entry.py:283
+#: accounts/doctype/gl_entry/gl_entry.py:237
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:87
 msgid "{0} {1}: Account {2} does not belong to Company {3}"
 msgstr "{0} {1}: حساب {2} به شرکت {3} تعلق ندارد"
 
-#: accounts/doctype/gl_entry/gl_entry.py:271
+#: accounts/doctype/gl_entry/gl_entry.py:225
 #: 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 "{0} {1}: حساب {2} یک حساب گروهی است و نمی توان از حساب های گروهی در تراکنش ها استفاده کرد"
 
-#: accounts/doctype/gl_entry/gl_entry.py:278
+#: accounts/doctype/gl_entry/gl_entry.py:232
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:82
 msgid "{0} {1}: Account {2} is inactive"
 msgstr "{0} {1}: حساب {2} غیرفعال است"
 
-#: accounts/doctype/gl_entry/gl_entry.py:322
+#: accounts/doctype/gl_entry/gl_entry.py:276
 msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
 msgstr "{0} {1}: ورود حسابداری برای {2} فقط به ارز انجام می شود: {3}"
 
-#: controllers/stock_controller.py:365
+#: controllers/stock_controller.py:547
 msgid "{0} {1}: Cost Center is mandatory for Item {2}"
 msgstr "{0} {1}: مرکز هزینه برای مورد {2} اجباری است"
 
-#: accounts/doctype/gl_entry/gl_entry.py:171
+#: accounts/doctype/gl_entry/gl_entry.py:161
 msgid "{0} {1}: Cost Center is required for 'Profit and Loss' account {2}."
 msgstr "{0} {1}: مرکز هزینه برای حساب \"سود و زیان\" {2} لازم است."
 
-#: accounts/doctype/gl_entry/gl_entry.py:298
+#: accounts/doctype/gl_entry/gl_entry.py:252
 msgid "{0} {1}: Cost Center {2} does not belong to Company {3}"
 msgstr "{0} {1}: مرکز هزینه {2} به شرکت {3} تعلق ندارد"
 
-#: accounts/doctype/gl_entry/gl_entry.py:305
+#: accounts/doctype/gl_entry/gl_entry.py:259
 msgid "{0} {1}: Cost Center {2} is a group cost center and group cost centers cannot be used in transactions"
 msgstr "{0} {1}: مرکز هزینه {2} یک مرکز هزینه گروهی است و مراکز هزینه گروهی را نمی توان در تراکنش ها استفاده کرد"
 
-#: accounts/doctype/gl_entry/gl_entry.py:137
+#: accounts/doctype/gl_entry/gl_entry.py:127
 msgid "{0} {1}: Customer is required against Receivable account {2}"
 msgstr "{0} {1}: مشتری در مقابل حساب دریافتنی {2} الزامی است"
 
-#: accounts/doctype/gl_entry/gl_entry.py:159
+#: accounts/doctype/gl_entry/gl_entry.py:149
 msgid "{0} {1}: Either debit or credit amount is required for {2}"
 msgstr "{0} {1}: مبلغ بدهی یا اعتباری برای {2} مورد نیاز است"
 
-#: accounts/doctype/gl_entry/gl_entry.py:143
+#: accounts/doctype/gl_entry/gl_entry.py:133
 msgid "{0} {1}: Supplier is required against Payable account {2}"
 msgstr "{0} {1}: تامین‌کننده در برابر حساب پرداختنی {2} الزامی است"
 
@@ -81120,7 +82683,7 @@
 msgid "{0}'s {1} cannot be after {2}'s Expected End Date."
 msgstr "{1} {0} نمی تواند بعد از تاریخ پایان مورد انتظار {2} باشد."
 
-#: manufacturing/doctype/job_card/job_card.py:1009
+#: manufacturing/doctype/job_card/job_card.py:1024
 msgid "{0}, complete the operation {1} before the operation {2}."
 msgstr "{0}، عملیات {1} را قبل از عملیات {2} تکمیل کنید."
 
@@ -81128,7 +82691,7 @@
 msgid "{0}: {1} does not exists"
 msgstr "{0}: {1} وجود ندارد"
 
-#: accounts/doctype/payment_entry/payment_entry.js:724
+#: accounts/doctype/payment_entry/payment_entry.js:889
 msgid "{0}: {1} must be less than {2}"
 msgstr "{0}: {1} باید کمتر از {2} باشد"
 
@@ -81136,11 +82699,11 @@
 msgid "{0}{1} Did you rename the item? Please contact Administrator / Tech support"
 msgstr "{0}{1} آیا نام مورد را تغییر دادید؟ لطفا با مدیر / پشتیبانی فنی تماس بگیرید"
 
-#: controllers/stock_controller.py:1160
+#: controllers/stock_controller.py:1346
 msgid "{item_name}'s Sample Size ({sample_size}) cannot be greater than the Accepted Quantity ({accepted_quantity})"
 msgstr "اندازه نمونه {item_name} ({sample_size}) نمی‌تواند بیشتر از مقدار مورد قبول ({accepted_quantity}) باشد."
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1156
 msgid "{range4}-Above"
 msgstr "{range4}-بالا"
 
@@ -81148,11 +82711,11 @@
 msgid "{}"
 msgstr ""
 
-#: controllers/buying_controller.py:712
+#: controllers/buying_controller.py:737
 msgid "{} Assets created for {}"
 msgstr "{} دارایی ایجاد شده برای {}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1775
+#: accounts/doctype/sales_invoice/sales_invoice.py:1744
 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
 msgstr "{} را نمی توان لغو کرد زیرا امتیازهای وفاداری به دست آمده استفاده شده است. ابتدا {} خیر {} را لغو کنید"
 
diff --git a/erpnext/locale/fr.po b/erpnext/locale/fr.po
index 965f5f2..75c9113 100644
--- a/erpnext/locale/fr.po
+++ b/erpnext/locale/fr.po
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: frappe\n"
 "Report-Msgid-Bugs-To: info@erpnext.com\n"
-"POT-Creation-Date: 2024-01-29 18:13+0053\n"
-"PO-Revision-Date: 2024-02-02 12:58\n"
+"POT-Creation-Date: 2024-03-24 09:35+0000\n"
+"PO-Revision-Date: 2024-03-26 12:47\n"
 "Last-Translator: info@erpnext.com\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
@@ -18,21 +18,17 @@
 "X-Crowdin-File-ID: 46\n"
 "Language: fr_FR\n"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:85
-msgid " "
-msgstr ""
-
 #. Label of a Column Break field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
 msgid "  "
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:76
+#: selling/doctype/quotation/quotation.js:77
 msgid " Address"
 msgstr " Adresse"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:612
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:618
 msgid " Amount"
 msgstr " Montant"
 
@@ -42,29 +38,16 @@
 msgid " Is Child Table"
 msgstr " Est Table Enfant"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:184
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:107
 #: selling/report/sales_analytics/sales_analytics.py:66
 msgid " Name"
 msgstr " Nom"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:108
-msgid " Qty"
-msgstr " Qté"
-
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:603
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:609
 msgid " Rate"
 msgstr " Prix"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:116
-msgid " Raw Material"
-msgstr " Matières Premières"
-
-#: public/js/bom_configurator/bom_configurator.bundle.js:127
-#: public/js/bom_configurator/bom_configurator.bundle.js:157
-msgid " Sub Assembly"
-msgstr " Sous-Ruche"
-
 #: projects/doctype/project_update/project_update.py:110
 msgid " Summary"
 msgstr " Résumé"
@@ -81,6 +64,10 @@
 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item"
 msgstr "'Est un Actif Immobilisé’ doit être coché car il existe une entrée d’Actif pour cet article"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "#"
+msgstr ""
+
 #. Description of the Onboarding Step 'Accounts Settings'
 #: accounts/onboarding_step/accounts_settings/accounts_settings.json
 msgid "# Account Settings\n\n"
@@ -514,7 +501,7 @@
 msgid "% Completed"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:755
+#: manufacturing/doctype/bom/bom.js:788
 #, python-format
 msgid "% Finished Item Quantity"
 msgstr ""
@@ -526,6 +513,7 @@
 msgstr ""
 
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:70
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:16
 msgid "% Occupied"
 msgstr ""
 
@@ -615,11 +603,11 @@
 msgid "% of materials delivered against this Sales Order"
 msgstr "% de matériaux livrés par rapport à cette commande"
 
-#: controllers/accounts_controller.py:1899
+#: controllers/accounts_controller.py:1991
 msgid "'Account' in the Accounting section of Customer {0}"
 msgstr "'Compte' dans la section comptabilité du client {0}"
 
-#: selling/doctype/sales_order/sales_order.py:263
+#: selling/doctype/sales_order/sales_order.py:266
 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'"
 msgstr "Autoriser les commandes multiples contre un bon de commande du client'"
 
@@ -627,7 +615,7 @@
 msgid "'Based On' and 'Group By' can not be same"
 msgstr "'Basé sur' et 'Groupé par' ne peuvent pas être identiques"
 
-#: stock/report/product_bundle_balance/product_bundle_balance.py:232
+#: stock/report/product_bundle_balance/product_bundle_balance.py:230
 msgid "'Date' is required"
 msgstr "La 'date' est obligatoire"
 
@@ -635,11 +623,11 @@
 msgid "'Days Since Last Order' must be greater than or equal to zero"
 msgstr "'Jours Depuis La Dernière Commande' doit être supérieur ou égal à zéro"
 
-#: controllers/accounts_controller.py:1904
+#: controllers/accounts_controller.py:1996
 msgid "'Default {0} Account' in Company {1}"
 msgstr "'Compte {0} par défaut' dans la société {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1048
+#: accounts/doctype/journal_entry/journal_entry.py:1075
 msgid "'Entries' cannot be empty"
 msgstr "'Entrées' ne peuvent pas être vides"
 
@@ -657,10 +645,26 @@
 msgid "'Has Serial No' can not be 'Yes' for non-stock item"
 msgstr "'A un Numéro de Série' ne peut pas être 'Oui' pour un article non géré en stock"
 
-#: stock/report/stock_ledger/stock_ledger.py:436
+#: stock/report/stock_ledger/stock_ledger.py:538
 msgid "'Opening'"
 msgstr "'Ouverture'"
 
+#: stock/doctype/delivery_note/delivery_note.py:388
+msgid "'Sales Invoice Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:381
+msgid "'Sales Invoice' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:364
+msgid "'Sales Order Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:357
+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
@@ -675,10 +679,18 @@
 msgid "'Update Stock' can not be checked because items are not delivered via {0}"
 msgstr "'Mettre à Jour le Stock' ne peut pas être coché car les articles ne sont pas livrés par {0}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:369
+#: accounts/doctype/sales_invoice/sales_invoice.py:380
 msgid "'Update Stock' cannot be checked for fixed asset sale"
 msgstr "'Mettre à Jour Le Stock’ ne peut pas être coché pour la vente d'actifs immobilisés"
 
+#: accounts/doctype/bank_account/bank_account.py:64
+msgid "'{0}' account is already used by {1}. Use another account."
+msgstr ""
+
+#: controllers/accounts_controller.py:392
+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/stock_ledger_invariant_check/stock_ledger_invariant_check.py:180
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:104
@@ -770,7 +782,7 @@
 msgid "* Will be calculated in the transaction."
 msgstr "* Sera calculé lors de la transaction."
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:130
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:140
 msgid ", with the inventory {0}: {1}"
 msgstr ", avec l'inventaire {0}: {1}"
 
@@ -1002,7 +1014,7 @@
 msgid "<div class=\"text-muted text-center\">No Matching Bank Transactions Found</div>"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:258
+#: public/js/bank_reconciliation_tool/dialog_manager.js:262
 msgid "<div class=\"text-muted text-center\">{0}</div>"
 msgstr ""
 
@@ -1194,11 +1206,11 @@
 msgid "A BOM with name {0} already exists for item {1}."
 msgstr "Une nomenclature portant le nom {0} existe déjà pour l'article {1}."
 
-#: selling/doctype/customer/customer.py:297
+#: selling/doctype/customer/customer.py:309
 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group"
 msgstr "Un Groupe de Clients existe avec le même nom, veuillez changer le nom du Client ou renommer le Groupe de Clients"
 
-#: manufacturing/doctype/workstation/workstation.js:47
+#: manufacturing/doctype/workstation/workstation.js:73
 msgid "A Holiday List can be added to exclude counting these days for the Workstation."
 msgstr ""
 
@@ -1210,7 +1222,17 @@
 msgid "A Packing Slip can only be created for Draft Delivery Note."
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:530
+#. Description of a DocType
+#: stock/doctype/price_list/price_list.json
+msgid "A Price List is a collection of Item Prices either Selling, Buying, or both"
+msgstr ""
+
+#. Description of a DocType
+#: stock/doctype/item/item.json
+msgid "A Product or a Service that is bought, sold or kept in stock."
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:535
 msgid "A Reconciliation Job {0} is running for the same filters. Cannot reconcile now"
 msgstr ""
 
@@ -1220,12 +1242,13 @@
 "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:937
-msgid "A Transaction Deletion Job is triggered for {0}"
+#: setup/doctype/company/company.py:916
+msgid "A Transaction Deletion Document: {0} is triggered for {0}"
 msgstr ""
 
-#: setup/doctype/company/company.py:914
-msgid "A Transaction Deletion Job: {0} is already running for {1}"
+#. Description of a DocType
+#: accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+msgid "A condition for a Shipping Rule"
 msgstr ""
 
 #. Description of the 'Send To Primary Contact' (Check) field in DocType
@@ -1243,6 +1266,11 @@
 msgid "A driver must be set to submit."
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/warehouse/warehouse.json
+msgid "A logical Warehouse against which stock entries are made."
+msgstr ""
+
 #: templates/emails/confirm_appointment.html:2
 msgid "A new appointment has been created for you with {0}"
 msgstr "Un nouveau rendez-vous a été créé pour vous avec {0}"
@@ -1251,6 +1279,11 @@
 msgid "A template with tax category {0} already exists. Only one template is allowed with each tax category"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/sales_partner/sales_partner.json
+msgid "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission."
+msgstr ""
+
 #. Option for the 'Blood Group' (Select) field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -1449,11 +1482,11 @@
 msgid "Abbreviation"
 msgstr "Abréviation"
 
-#: setup/doctype/company/company.py:164
+#: setup/doctype/company/company.py:163
 msgid "Abbreviation already used for another company"
 msgstr "Abréviation déjà utilisée pour une autre société"
 
-#: setup/doctype/company/company.py:159
+#: setup/doctype/company/company.py:158
 msgid "Abbreviation is mandatory"
 msgstr "Abréviation est obligatoire"
 
@@ -1467,15 +1500,15 @@
 msgid "About Us Settings"
 msgstr "Paramétrages À Propos"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:39
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
 msgid "About {0} minute remaining"
 msgstr "Il reste environ {0} minute"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:40
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:38
 msgid "About {0} minutes remaining"
 msgstr "Il reste environ {0} minutes"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:35
 msgid "About {0} seconds remaining"
 msgstr "Il reste environ {0} secondes"
 
@@ -1543,7 +1576,7 @@
 msgid "Accepted Qty in Stock UOM"
 msgstr "Quantité acceptée en UOM de Stock"
 
-#: public/js/controllers/transaction.js:2124
+#: public/js/controllers/transaction.js:2167
 msgid "Accepted Quantity"
 msgstr "Quantité Acceptée"
 
@@ -1595,7 +1628,7 @@
 msgid "Access Key"
 msgstr "Clé d'accès"
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:48
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:49
 msgid "Access Key is required for Service Provider: {0}"
 msgstr "La clé d'accès est requise pour le fournisseur de service : {0}"
 
@@ -1617,13 +1650,13 @@
 #: 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_ledger/general_ledger.js:38
-#: accounts/report/general_ledger/general_ledger.py:565
-#: accounts/report/payment_ledger/payment_ledger.js:31
+#: accounts/report/general_ledger/general_ledger.py:578
+#: 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_for_party/trial_balance_for_party.js:70
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:16
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:16
+#: 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
 msgid "Account"
 msgstr "Compte"
 
@@ -1776,12 +1809,6 @@
 msgid "Account Balance"
 msgstr "Solde du Compte"
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Account Balance"
-msgstr "Solde du Compte"
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -1925,8 +1952,8 @@
 msgid "Account Manager"
 msgstr "Gestionnaire de la comptabilité"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
-#: controllers/accounts_controller.py:1908
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
+#: controllers/accounts_controller.py:2000
 msgid "Account Missing"
 msgstr "Compte comptable manquant"
 
@@ -1954,11 +1981,11 @@
 msgid "Account Name"
 msgstr "Nom du Compte"
 
-#: accounts/doctype/account/account.py:306
+#: accounts/doctype/account/account.py:325
 msgid "Account Not Found"
 msgstr "Compte non trouvé"
 
-#: accounts/doctype/account/account_tree.js:108
+#: accounts/doctype/account/account_tree.js:131
 msgid "Account Number"
 msgstr "Numéro de compte"
 
@@ -1968,7 +1995,7 @@
 msgid "Account Number"
 msgstr "Numéro de compte"
 
-#: accounts/doctype/account/account.py:458
+#: accounts/doctype/account/account.py:477
 msgid "Account Number {0} already used in account {1}"
 msgstr "Numéro de compte {0} déjà utilisé dans le compte {1}"
 
@@ -2006,8 +2033,8 @@
 msgid "Account Subtype"
 msgstr "Sous-type de compte"
 
-#: accounts/doctype/account/account_tree.js:115
-#: accounts/report/account_balance/account_balance.js:35
+#: accounts/doctype/account/account_tree.js:152
+#: accounts/report/account_balance/account_balance.js:34
 msgid "Account Type"
 msgstr "Type de compte"
 
@@ -2051,11 +2078,11 @@
 msgid "Account Value"
 msgstr "Valeur du compte"
 
-#: accounts/doctype/account/account.py:279
+#: accounts/doctype/account/account.py:298
 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 msgstr "Le solde du compte est déjà Créditeur, vous n'êtes pas autorisé à mettre en 'Solde Doit Être' comme 'Débiteur'"
 
-#: accounts/doctype/account/account.py:273
+#: accounts/doctype/account/account.py:292
 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
 msgstr "Le solde du compte est déjà débiteur, vous n'êtes pas autorisé à définir 'Solde Doit Être' comme 'Créditeur'"
 
@@ -2077,7 +2104,7 @@
 msgid "Account for Change Amount"
 msgstr "Compte pour le Rendu de Monnaie"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:44
+#: accounts/doctype/bank_clearance/bank_clearance.py:46
 msgid "Account is mandatory to get payment entries"
 msgstr "Le compte est obligatoire pour obtenir les entrées de paiement"
 
@@ -2085,28 +2112,28 @@
 msgid "Account is not set for the dashboard chart {0}"
 msgstr "Le compte n'est pas défini pour le graphique du tableau de bord {0}"
 
-#: assets/doctype/asset/asset.py:677
+#: assets/doctype/asset/asset.py:679
 msgid "Account not Found"
 msgstr ""
 
-#: accounts/doctype/account/account.py:360
+#: accounts/doctype/account/account.py:379
 msgid "Account with child nodes cannot be converted to ledger"
 msgstr "Un compte avec des enfants ne peut pas être converti en grand livre"
 
-#: accounts/doctype/account/account.py:252
+#: accounts/doctype/account/account.py:271
 msgid "Account with child nodes cannot be set as ledger"
 msgstr "Les comptes avec des nœuds enfants ne peuvent pas être défini comme grand livre"
 
-#: accounts/doctype/account/account.py:371
+#: accounts/doctype/account/account.py:390
 msgid "Account with existing transaction can not be converted to group."
 msgstr "Un compte contenant une transaction ne peut pas être converti en groupe"
 
-#: accounts/doctype/account/account.py:400
+#: accounts/doctype/account/account.py:419
 msgid "Account with existing transaction can not be deleted"
 msgstr "Un compte contenant une transaction ne peut pas être supprimé"
 
-#: accounts/doctype/account/account.py:247
-#: accounts/doctype/account/account.py:362
+#: accounts/doctype/account/account.py:266
+#: accounts/doctype/account/account.py:381
 msgid "Account with existing transaction cannot be converted to ledger"
 msgstr "Un compte contenant une transaction ne peut pas être converti en grand livre"
 
@@ -2114,7 +2141,7 @@
 msgid "Account {0} added multiple times"
 msgstr ""
 
-#: setup/doctype/company/company.py:187
+#: setup/doctype/company/company.py:186
 msgid "Account {0} does not belong to company: {1}"
 msgstr "Le compte {0} n'appartient pas à la société : {1}"
 
@@ -2122,7 +2149,7 @@
 msgid "Account {0} does not belongs to company {1}"
 msgstr "Le compte {0} n'appartient pas à la société {1}"
 
-#: accounts/doctype/account/account.py:532
+#: accounts/doctype/account/account.py:551
 msgid "Account {0} does not exist"
 msgstr "Compte {0} n'existe pas"
 
@@ -2138,7 +2165,7 @@
 msgid "Account {0} does not match with Company {1} in Mode of Account: {2}"
 msgstr "Le Compte {0} ne correspond pas à la Société {1} dans le Mode de Compte : {2}"
 
-#: accounts/doctype/account/account.py:490
+#: accounts/doctype/account/account.py:509
 msgid "Account {0} exists in parent company {1}."
 msgstr "Le compte {0} existe dans la société mère {1}."
 
@@ -2146,51 +2173,51 @@
 msgid "Account {0} has been entered multiple times"
 msgstr "Le compte {0} a été entré plusieurs fois"
 
-#: accounts/doctype/account/account.py:344
+#: accounts/doctype/account/account.py:363
 msgid "Account {0} is added in the child company {1}"
 msgstr "Le compte {0} est ajouté dans la société enfant {1}."
 
-#: accounts/doctype/gl_entry/gl_entry.py:443
+#: accounts/doctype/gl_entry/gl_entry.py:397
 msgid "Account {0} is frozen"
 msgstr "Le compte {0} est gelé"
 
-#: controllers/accounts_controller.py:1032
+#: controllers/accounts_controller.py:1096
 msgid "Account {0} is invalid. Account Currency must be {1}"
 msgstr "Le compte {0} est invalide. La Devise du Compte doit être {1}"
 
-#: accounts/doctype/account/account.py:150
+#: accounts/doctype/account/account.py:151
 msgid "Account {0}: Parent account {1} can not be a ledger"
 msgstr "Compte {0}: Le Compte parent {1} ne peut pas être un grand livre"
 
-#: accounts/doctype/account/account.py:156
+#: accounts/doctype/account/account.py:157
 msgid "Account {0}: Parent account {1} does not belong to company: {2}"
 msgstr "Compte {0}: Le Compte parent {1} n'appartient pas à l'entreprise: {2}"
 
-#: accounts/doctype/account/account.py:144
+#: accounts/doctype/account/account.py:145
 msgid "Account {0}: Parent account {1} does not exist"
 msgstr "Compte {0}: Le Compte parent {1} n'existe pas"
 
-#: accounts/doctype/account/account.py:147
+#: accounts/doctype/account/account.py:148
 msgid "Account {0}: You can not assign itself as parent account"
 msgstr "Compte {0}: Vous ne pouvez pas assigner un compte comme son propre parent"
 
-#: accounts/general_ledger.py:403
+#: accounts/general_ledger.py:412
 msgid "Account: <b>{0}</b> is capital Work in progress and can not be updated by Journal Entry"
 msgstr "Compte: <b>{0}</b> est un travail capital et ne peut pas être mis à jour par une écriture au journal."
 
-#: accounts/doctype/journal_entry/journal_entry.py:243
+#: accounts/doctype/journal_entry/journal_entry.py:259
 msgid "Account: {0} can only be updated via Stock Transactions"
 msgstr "Compte : {0} peut uniquement être mis à jour via les Mouvements de Stock"
 
-#: accounts/report/general_ledger/general_ledger.py:325
+#: accounts/report/general_ledger/general_ledger.py:338
 msgid "Account: {0} does not exist"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:2098
+#: accounts/doctype/payment_entry/payment_entry.py:2117
 msgid "Account: {0} is not permitted under Payment Entry"
 msgstr "Compte: {0} n'est pas autorisé sous Saisie du paiement."
 
-#: controllers/accounts_controller.py:2591
+#: controllers/accounts_controller.py:2676
 msgid "Account: {0} with currency: {1} can not be selected"
 msgstr "Compte : {0} avec la devise : {1} ne peut pas être sélectionné"
 
@@ -2350,12 +2377,12 @@
 msgid "Accounting Dimension"
 msgstr "Dimension comptable"
 
-#: accounts/doctype/gl_entry/gl_entry.py:206
+#: accounts/doctype/gl_entry/gl_entry.py:196
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:153
 msgid "Accounting Dimension <b>{0}</b> is required for 'Balance Sheet' account {1}."
 msgstr "La dimension de comptabilité <b>{0}</b> est requise pour le compte &quot;Bilan&quot; {1}."
 
-#: accounts/doctype/gl_entry/gl_entry.py:193
+#: accounts/doctype/gl_entry/gl_entry.py:183
 #: 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 "La dimension de comptabilité <b>{0}</b> est requise pour le compte 'Bénéfices et pertes' {1}."
@@ -2671,53 +2698,54 @@
 msgid "Accounting Entries"
 msgstr "Écritures Comptables"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:82
+#: accounts/doctype/sales_invoice/sales_invoice.js:86
 msgid "Accounting Entries are reposted"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:42
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
 msgid "Accounting Entries are reposted."
 msgstr "Les écritures comptables sont remises."
 
-#: assets/doctype/asset/asset.py:709 assets/doctype/asset/asset.py:724
-#: assets/doctype/asset_capitalization/asset_capitalization.py:572
+#: assets/doctype/asset/asset.py:713 assets/doctype/asset/asset.py:728
+#: assets/doctype/asset_capitalization/asset_capitalization.py:578
 msgid "Accounting Entry for Asset"
 msgstr "Ecriture comptable pour l'actif"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:738
+#: stock/doctype/purchase_receipt/purchase_receipt.py:737
 msgid "Accounting Entry for Service"
 msgstr "Écriture comptable pour le service"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:906
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:926
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:942
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:959
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:978
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1126
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1266
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1284
-#: controllers/stock_controller.py:168 controllers/stock_controller.py:183
-#: stock/doctype/purchase_receipt/purchase_receipt.py:839
-#: stock/doctype/stock_entry/stock_entry.py:1464
-#: stock/doctype/stock_entry/stock_entry.py:1478
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:519
+#: 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
 msgid "Accounting Entry for Stock"
 msgstr "Ecriture comptable pour stock"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:658
+#: stock/doctype/purchase_receipt/purchase_receipt.py:659
 msgid "Accounting Entry for {0}"
 msgstr "Entrée comptable pour {0}"
 
-#: controllers/accounts_controller.py:1950
+#: controllers/accounts_controller.py:2042
 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}"
 msgstr "Écriture Comptable pour {0}: {1} ne peut être effectuée qu'en devise: {2}"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:192
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:193
 #: buying/doctype/supplier/supplier.js:85
-#: public/js/controllers/stock_controller.js:72
-#: public/js/utils/ledger_preview.js:7 selling/doctype/customer/customer.js:159
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:43
+#: public/js/controllers/stock_controller.js:84
+#: public/js/utils/ledger_preview.js:8 selling/doctype/customer/customer.js:164
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:48
 msgid "Accounting Ledger"
 msgstr "Grand livre"
 
@@ -2748,15 +2776,19 @@
 msgid "Accounting entries are frozen up to this date. Nobody can create or modify entries except users with the role specified below"
 msgstr "Les écritures comptables sont gelées jusqu'à cette date. Personne ne peut créer ou modifier des entrées sauf les utilisateurs avec le rôle spécifié ci-dessous"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:69
+#: accounts/doctype/journal_entry/journal_entry.js:30
+msgid "Accounting entries for this Journal Entry need to be reposted. Please click on 'Repost' button to update."
+msgstr ""
+
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:82
 msgid "Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update."
 msgstr "Les entrées comptables de cette facture doivent être republiées. Veuillez cliquer sur le bouton « Reposter» pour mettre à jour."
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:72
+#: accounts/doctype/sales_invoice/sales_invoice.js:73
 msgid "Accounting entries for this invoice needs to be reposted. Please click on 'Repost' button to update."
 msgstr "Les entrées comptables de cette facture doivent être repostées. Veuillez cliquer sur le bouton « Reposter» pour mettre à jour."
 
-#: setup/doctype/company/company.py:317
+#: setup/doctype/company/company.py:316
 msgid "Accounts"
 msgstr "Comptes"
 
@@ -2931,7 +2963,7 @@
 msgid "Accounts Manager"
 msgstr "Responsable de la comptabilité"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:343
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:341
 msgid "Accounts Missing Error"
 msgstr "Erreur de compte manquant"
 
@@ -2941,9 +2973,9 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:85
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117
 #: accounts/report/accounts_payable/accounts_payable.json
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:122
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:125
 #: accounts/workspace/payables/payables.json
-#: buying/doctype/supplier/supplier.js:90
+#: buying/doctype/supplier/supplier.js:97
 msgid "Accounts Payable"
 msgstr "Comptes Créditeurs"
 
@@ -2956,7 +2988,7 @@
 
 #. Name of a report
 #. Label of a Link in the Payables Workspace
-#: accounts/report/accounts_payable/accounts_payable.js:175
+#: accounts/report/accounts_payable/accounts_payable.js:176
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.json
 #: accounts/workspace/payables/payables.json
 msgid "Accounts Payable Summary"
@@ -2969,10 +3001,10 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:12
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:12
 #: accounts/report/accounts_receivable/accounts_receivable.json
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:150
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:153
 #: accounts/workspace/accounting/accounting.json
 #: accounts/workspace/receivables/receivables.json
-#: selling/doctype/customer/customer.js:155
+#: selling/doctype/customer/customer.js:153
 msgid "Accounts Receivable"
 msgstr "Comptes débiteurs"
 
@@ -3131,7 +3163,7 @@
 msgid "Accounts User"
 msgstr "Comptable"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1153
+#: accounts/doctype/journal_entry/journal_entry.py:1180
 msgid "Accounts table cannot be blank."
 msgstr "Le tableau de comptes ne peut être vide."
 
@@ -3148,7 +3180,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:33
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:46
-#: accounts/report/account_balance/account_balance.js:38
+#: accounts/report/account_balance/account_balance.js:37
 msgid "Accumulated Depreciation"
 msgstr "Amortissement Cumulé"
 
@@ -3171,7 +3203,7 @@
 msgstr "Compte d'Amortissement Cumulé"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:155
-#: assets/doctype/asset/asset.js:242
+#: assets/doctype/asset/asset.js:277
 msgid "Accumulated Depreciation Amount"
 msgstr "Montant d'Amortissement Cumulé"
 
@@ -3186,17 +3218,17 @@
 msgid "Accumulated Depreciation as on"
 msgstr "Amortissement Cumulé depuis"
 
-#: accounts/doctype/budget/budget.py:243
+#: accounts/doctype/budget/budget.py:250
 msgid "Accumulated Monthly"
 msgstr "Cumul mensuel"
 
-#: accounts/report/balance_sheet/balance_sheet.js:27
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:13
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:28
+#: accounts/report/balance_sheet/balance_sheet.js:22
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:8
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:23
 msgid "Accumulated Values"
 msgstr "Valeurs accumulées"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:101
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:125
 msgid "Accumulated Values in Group Company"
 msgstr "Valeurs accumulées dans la société mère"
 
@@ -3211,7 +3243,7 @@
 msgstr "Date d'Aquisition"
 
 #: crm/doctype/lead/lead.js:42
-#: public/js/bank_reconciliation_tool/dialog_manager.js:171
+#: public/js/bank_reconciliation_tool/dialog_manager.js:175
 msgid "Action"
 msgstr "Action"
 
@@ -3233,7 +3265,7 @@
 msgid "Action If Same Rate is Not Maintained"
 msgstr "Action si le même taux n'est pas maintenu"
 
-#: quality_management/doctype/quality_review/quality_review_list.js:9
+#: quality_management/doctype/quality_review/quality_review_list.js:7
 msgid "Action Initialised"
 msgstr "Action initialisée"
 
@@ -3279,23 +3311,24 @@
 msgid "Action if Same Rate is Not Maintained Throughout Sales Cycle"
 msgstr "Action si le même taux n'est pas maintenu tout au long du cycle de vente"
 
-#: accounts/doctype/account/account.js:55
-#: accounts/doctype/account/account.js:62
-#: accounts/doctype/account/account.js:91
-#: accounts/doctype/account/account.js:116
-#: accounts/doctype/journal_entry/journal_entry.js:35
-#: accounts/doctype/payment_entry/payment_entry.js:160
+#: accounts/doctype/account/account.js:50
+#: accounts/doctype/account/account.js:57
+#: accounts/doctype/account/account.js:89
+#: accounts/doctype/account/account.js:117
+#: accounts/doctype/journal_entry/journal_entry.js:77
+#: accounts/doctype/payment_entry/payment_entry.js:190
 #: accounts/doctype/subscription/subscription.js:38
 #: accounts/doctype/subscription/subscription.js:44
 #: accounts/doctype/subscription/subscription.js:50
-#: buying/doctype/supplier/supplier.js:104
-#: buying/doctype/supplier/supplier.js:109
-#: projects/doctype/project/project.js:69
-#: projects/doctype/project/project.js:73
-#: projects/doctype/project/project.js:134
-#: public/js/bank_reconciliation_tool/data_table_manager.js:93
-#: public/js/utils/unreconcile.js:22 selling/doctype/customer/customer.js:170
-#: selling/doctype/customer/customer.js:175 stock/doctype/item/item.js:419
+#: buying/doctype/supplier/supplier.js:128
+#: buying/doctype/supplier/supplier.js:137
+#: projects/doctype/project/project.js:78
+#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:160
+#: public/js/bank_reconciliation_tool/data_table_manager.js:88
+#: public/js/bank_reconciliation_tool/data_table_manager.js:121
+#: public/js/utils/unreconcile.js:28 selling/doctype/customer/customer.js:184
+#: selling/doctype/customer/customer.js:193 stock/doctype/item/item.js:486
 #: templates/pages/order.html:20
 msgid "Actions"
 msgstr "Actions"
@@ -3332,7 +3365,7 @@
 msgstr "Actions réalisées"
 
 #: accounts/doctype/subscription/subscription_list.js:6
-#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:11
+#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:18
 #: stock/doctype/putaway_rule/putaway_rule_list.js:7
 msgid "Active"
 msgstr "actif"
@@ -3378,6 +3411,12 @@
 msgid "Active Leads"
 msgstr "Leads actifs"
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Active Status"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -3422,14 +3461,14 @@
 msgid "Activity Cost exists for Employee {0} against Activity Type - {1}"
 msgstr "Des Coûts d'Activité existent pour l'Employé {0} pour le Type d'Activité - {1}"
 
-#: projects/doctype/activity_type/activity_type.js:7
+#: projects/doctype/activity_type/activity_type.js:10
 msgid "Activity Cost per Employee"
 msgstr "Coût de l'Activité par Employé"
 
 #. Name of a DocType
 #: projects/doctype/activity_type/activity_type.json
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:32
-#: public/js/projects/timer.js:8
+#: public/js/projects/timer.js:9 templates/pages/timelog_info.html:25
 msgid "Activity Type"
 msgstr "Type d'activité"
 
@@ -3569,6 +3608,7 @@
 msgid "Actual Posting"
 msgstr ""
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:21
 #: stock/report/product_bundle_balance/product_bundle_balance.py:96
 #: stock/report/stock_projected_qty/stock_projected_qty.py:136
 msgid "Actual Qty"
@@ -3622,10 +3662,19 @@
 msgid "Actual Qty in Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:185
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:196
 msgid "Actual Qty is mandatory"
 msgstr "Qté Réelle est obligatoire"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:37
+#: stock/dashboard/item_dashboard_list.html:28
+msgid "Actual Qty {0} / Waiting Qty {1}"
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Actual Qty: Quantity available in the warehouse."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:95
 msgid "Actual Quantity"
 msgstr "Quantité Réelle"
@@ -3692,18 +3741,20 @@
 msgid "Actual qty in stock"
 msgstr "Qté réelle en stock"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1223
+#: accounts/doctype/payment_entry/payment_entry.js:1470
 #: public/js/controllers/accounts.js:176
 msgid "Actual type tax cannot be included in Item rate in row {0}"
 msgstr "Le type de taxe réel ne peut pas être inclus dans le prix de l'Article à la ligne {0}"
 
-#: crm/doctype/lead/lead.js:82
-#: public/js/bom_configurator/bom_configurator.bundle.js:225
-#: public/js/bom_configurator/bom_configurator.bundle.js:237
-#: public/js/bom_configurator/bom_configurator.bundle.js:291
-#: public/js/utils/crm_activities.js:168
+#: crm/doctype/lead/lead.js:85
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:55
+#: public/js/bom_configurator/bom_configurator.bundle.js:231
+#: public/js/bom_configurator/bom_configurator.bundle.js:244
+#: public/js/bom_configurator/bom_configurator.bundle.js:329
+#: public/js/utils/crm_activities.js:170
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/dashboard/item_dashboard_list.html:59
 msgid "Add"
 msgstr "Ajouter"
 
@@ -3721,11 +3772,11 @@
 msgid "Add"
 msgstr "Ajouter"
 
-#: stock/doctype/item/item.js:417 stock/doctype/price_list/price_list.js:7
+#: stock/doctype/item/item.js:482 stock/doctype/price_list/price_list.js:8
 msgid "Add / Edit Prices"
 msgstr "Ajouter / Modifier Prix"
 
-#: accounts/doctype/account/account_tree.js:176
+#: accounts/doctype/account/account_tree.js:256
 msgid "Add Child"
 msgstr "Ajouter une Sous-Catégorie"
 
@@ -3733,27 +3784,36 @@
 msgid "Add Columns in Transaction Currency"
 msgstr ""
 
+#: templates/pages/task_info.html:94 templates/pages/task_info.html:96
+msgid "Add Comment"
+msgstr ""
+
 #. Label of a Check field in DocType 'Manufacturing Settings'
 #: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
 msgctxt "Manufacturing Settings"
 msgid "Add Corrective Operation Cost in Finished Good Valuation"
 msgstr "Ajouter des opérations de correction de coût pour la valorisation des produits finis"
 
-#: public/js/event.js:19
+#: public/js/event.js:24
 msgid "Add Customers"
 msgstr "Ajouter des clients"
 
-#: public/js/event.js:27
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:411
+msgid "Add Discount"
+msgstr ""
+
+#: public/js/event.js:40
 msgid "Add Employees"
 msgstr "Ajouter des employés"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:224
-#: selling/doctype/sales_order/sales_order.js:207
-#: stock/dashboard/item_dashboard.js:205
+#: public/js/bom_configurator/bom_configurator.bundle.js:230
+#: selling/doctype/sales_order/sales_order.js:228
+#: stock/dashboard/item_dashboard.js:212
 msgid "Add Item"
 msgstr "Ajouter un Article"
 
-#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:33
+#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:35
 msgid "Add Items"
 msgstr "Ajouter des articles"
 
@@ -3761,11 +3821,11 @@
 msgid "Add Items in the Purpose Table"
 msgstr ""
 
-#: crm/doctype/lead/lead.js:82
+#: crm/doctype/lead/lead.js:84
 msgid "Add Lead to Prospect"
 msgstr ""
 
-#: public/js/event.js:15
+#: public/js/event.js:16
 msgid "Add Leads"
 msgstr "Créer des Leads"
 
@@ -3795,12 +3855,12 @@
 msgid "Add Or Deduct"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:269
+#: selling/page/point_of_sale/pos_item_cart.js:267
 msgid "Add Order Discount"
 msgstr "Ajouter une remise de commande"
 
-#: public/js/event.js:17 public/js/event.js:21 public/js/event.js:25
-#: public/js/event.js:29 public/js/event.js:33
+#: public/js/event.js:20 public/js/event.js:28 public/js/event.js:36
+#: public/js/event.js:44 public/js/event.js:52
 msgid "Add Participants"
 msgstr "Ajouter des participants"
 
@@ -3810,7 +3870,7 @@
 msgid "Add Quote"
 msgstr "Ajouter une proposition"
 
-#: public/js/event.js:31
+#: public/js/event.js:48
 msgid "Add Sales Partners"
 msgstr "Ajouter des partenaires commerciaux"
 
@@ -3844,17 +3904,21 @@
 msgid "Add Serial / Batch No (Rejected Qty)"
 msgstr "Ajouter numéro de série / numéro de lot (Qté rejetée)"
 
-#: public/js/utils.js:61
+#: public/js/utils.js:71
 msgid "Add Serial No"
 msgstr "Ajouter un numéro de série"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:231
-#: public/js/bom_configurator/bom_configurator.bundle.js:280
+#: manufacturing/doctype/plant_floor/plant_floor.js:172
+msgid "Add Stock"
+msgstr ""
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:238
+#: public/js/bom_configurator/bom_configurator.bundle.js:318
 msgid "Add Sub Assembly"
 msgstr "Ajouter une sous-Ruche"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:433
-#: public/js/event.js:23
+#: buying/doctype/request_for_quotation/request_for_quotation.js:472
+#: public/js/event.js:32
 msgid "Add Suppliers"
 msgstr "Ajouter des fournisseurs"
 
@@ -3874,7 +3938,7 @@
 msgid "Add Weekly Holidays"
 msgstr "Ajouter des vacances hebdomadaires"
 
-#: public/js/utils/crm_activities.js:140
+#: public/js/utils/crm_activities.js:142
 msgid "Add a Note"
 msgstr "Ajouter une note"
 
@@ -3893,7 +3957,7 @@
 msgstr "Ajouter des détails"
 
 #: stock/doctype/pick_list/pick_list.js:71
-#: stock/doctype/pick_list/pick_list.py:614
+#: stock/doctype/pick_list/pick_list.py:654
 msgid "Add items in the Item Locations table"
 msgstr "Ajouter des articles dans le tableau Emplacements des articles"
 
@@ -3929,10 +3993,14 @@
 msgid "Add to Transit"
 msgstr "Ajouter aux marchandises en transit"
 
-#: accounts/doctype/coupon_code/coupon_code.js:39
+#: accounts/doctype/coupon_code/coupon_code.js:36
 msgid "Add/Edit Coupon Conditions"
 msgstr "Ajouter / Modifier les conditions du coupon"
 
+#: templates/includes/footer/footer_extension.html:26
+msgid "Added"
+msgstr ""
+
 #. Label of a Link field in DocType 'CRM Note'
 #: crm/doctype/crm_note/crm_note.json
 msgctxt "CRM Note"
@@ -3949,7 +4017,7 @@
 msgid "Added Supplier Role to User {0}."
 msgstr "Ajout du rôle de fournisseur à l'utilisateur {0}."
 
-#: public/js/utils/item_selector.js:66 public/js/utils/item_selector.js:80
+#: public/js/utils/item_selector.js:70 public/js/utils/item_selector.js:86
 msgid "Added {0} ({1})"
 msgstr "Ajouté {0} ({1})"
 
@@ -3957,10 +4025,14 @@
 msgid "Added {1} Role to User {0}."
 msgstr "Ajout du rôle {1} à l'utilisateur {0}."
 
-#: crm/doctype/lead/lead.js:80
+#: crm/doctype/lead/lead.js:81
 msgid "Adding Lead to Prospect..."
 msgstr "Ajout du prospect à Prospect..."
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "Additional"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Asset'
 #: assets/doctype/asset/asset.json
 msgctxt "Asset"
@@ -4288,6 +4360,10 @@
 msgid "Additional Info"
 msgstr "Infos supplémentaires"
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Additional Information"
+msgstr "Information additionnelle"
+
 #. Label of a Section Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -4612,7 +4688,7 @@
 msgid "Address HTML"
 msgstr "Adresse HTML"
 
-#: public/js/utils/contact_address_quick_entry.js:58
+#: public/js/utils/contact_address_quick_entry.js:61
 msgid "Address Line 1"
 msgstr "Adresse Ligne 1"
 
@@ -4622,7 +4698,7 @@
 msgid "Address Line 1"
 msgstr "Adresse Ligne 1"
 
-#: public/js/utils/contact_address_quick_entry.js:63
+#: public/js/utils/contact_address_quick_entry.js:66
 msgid "Address Line 2"
 msgstr "Adresse Ligne 2"
 
@@ -4721,15 +4797,15 @@
 msgid "Addresses"
 msgstr "Adresses"
 
-#: assets/doctype/asset/asset.js:116
+#: assets/doctype/asset/asset.js:144
 msgid "Adjust Asset Value"
 msgstr "Ajuster la valeur de l'actif"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:996
+#: accounts/doctype/sales_invoice/sales_invoice.js:1072
 msgid "Adjustment Against"
 msgstr "Ajustement pour"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:581
+#: stock/doctype/purchase_receipt/purchase_receipt.py:582
 msgid "Adjustment based on Purchase Invoice rate"
 msgstr "Ajustement basé sur le taux de la facture d'achat"
 
@@ -4746,7 +4822,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:303
+#: stock/reorder_item.py:388
 msgid "Administrator"
 msgstr "Administrateur"
 
@@ -4778,8 +4854,8 @@
 msgid "Advance Paid"
 msgstr "Avance Payée"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:47
-#: selling/doctype/sales_order/sales_order_list.js:61
+#: buying/doctype/purchase_order/purchase_order_list.js:65
+#: selling/doctype/sales_order/sales_order_list.js:105
 msgid "Advance Payment"
 msgstr ""
 
@@ -4795,7 +4871,7 @@
 msgid "Advance Payment Status"
 msgstr ""
 
-#: controllers/accounts_controller.py:214
+#: controllers/accounts_controller.py:224
 msgid "Advance Payments"
 msgstr "Paiements Anticipés"
 
@@ -4851,11 +4927,11 @@
 msgid "Advance amount"
 msgstr "Montant de l'Avance"
 
-#: controllers/taxes_and_totals.py:743
+#: controllers/taxes_and_totals.py:744
 msgid "Advance amount cannot be greater than {0} {1}"
 msgstr "Montant de l'avance ne peut être supérieur à {0} {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:741
+#: accounts/doctype/journal_entry/journal_entry.py:768
 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
 msgstr ""
 
@@ -4903,6 +4979,10 @@
 msgid "Affected Transactions"
 msgstr ""
 
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:23
+msgid "Against"
+msgstr "Contre"
+
 #. Label of a Text field in DocType 'GL Entry'
 #: accounts/doctype/gl_entry/gl_entry.json
 msgctxt "GL Entry"
@@ -4911,7 +4991,7 @@
 
 #: 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:631
+#: accounts/report/general_ledger/general_ledger.py:644
 msgid "Against Account"
 msgstr "Contrepartie"
 
@@ -4945,11 +5025,11 @@
 msgid "Against Blanket Order"
 msgstr "Contre une ordonnance générale"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:945
+#: accounts/doctype/sales_invoice/sales_invoice.py:962
 msgid "Against Customer Order {0} dated {1}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:967
+#: selling/doctype/sales_order/sales_order.js:1127
 msgid "Against Default Supplier"
 msgstr "Contre le fournisseur par défaut"
 
@@ -5007,12 +5087,12 @@
 msgid "Against Income Account"
 msgstr "Pour le Compte de Produits"
 
-#: accounts/doctype/journal_entry/journal_entry.py:609
-#: accounts/doctype/payment_entry/payment_entry.py:669
+#: accounts/doctype/journal_entry/journal_entry.py:636
+#: accounts/doctype/payment_entry/payment_entry.py:678
 msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
 msgstr "L'Écriture de Journal {0} n'a pas d'entrée non associée {1}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:410
+#: accounts/doctype/gl_entry/gl_entry.py:364
 msgid "Against Journal Entry {0} is already adjusted against some other voucher"
 msgstr "L'Écriture de Journal {0} est déjà ajustée par un autre bon"
 
@@ -5046,11 +5126,11 @@
 msgid "Against Stock Entry"
 msgstr "Contre entrée de stock"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
 msgid "Against Supplier Invoice {0} dated {1}"
 msgstr "Pour la Facture Fournisseur {0} datée {1}"
 
-#: accounts/report/general_ledger/general_ledger.py:650
+#: accounts/report/general_ledger/general_ledger.py:663
 msgid "Against Voucher"
 msgstr "Pour le Bon"
 
@@ -5061,7 +5141,7 @@
 msgstr "Pour le Bon"
 
 #: accounts/report/general_ledger/general_ledger.js:57
-#: accounts/report/payment_ledger/payment_ledger.js:71
+#: accounts/report/payment_ledger/payment_ledger.js:70
 #: accounts/report/payment_ledger/payment_ledger.py:185
 msgid "Against Voucher No"
 msgstr ""
@@ -5072,7 +5152,7 @@
 msgid "Against Voucher No"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:648
+#: accounts/report/general_ledger/general_ledger.py:661
 #: accounts/report/payment_ledger/payment_ledger.py:176
 msgid "Against Voucher Type"
 msgstr "Pour le Type de Bon"
@@ -5090,14 +5170,15 @@
 msgstr "Pour le Type de Bon"
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:117
-#: manufacturing/report/work_order_summary/work_order_summary.js:59
+#: manufacturing/report/work_order_summary/work_order_summary.js:58
 #: manufacturing/report/work_order_summary/work_order_summary.py:259
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:96
 msgid "Age"
 msgstr "Âge"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:151
-#: accounts/report/accounts_receivable/accounts_receivable.py:1134
+#: accounts/report/accounts_receivable/accounts_receivable.html:133
+#: accounts/report/accounts_receivable/accounts_receivable.py:1142
 msgid "Age (Days)"
 msgstr "Age (jours)"
 
@@ -5107,7 +5188,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:58
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:21
-#: accounts/report/accounts_receivable/accounts_receivable.js:83
+#: accounts/report/accounts_receivable/accounts_receivable.js:86
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:21
 msgid "Ageing Based On"
 msgstr "Basé Sur le Vieillissement"
@@ -5120,7 +5201,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:65
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:28
-#: accounts/report/accounts_receivable/accounts_receivable.js:90
+#: accounts/report/accounts_receivable/accounts_receivable.js:93
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:28
 #: stock/report/stock_ageing/stock_ageing.js:49
 msgid "Ageing Range 1"
@@ -5128,7 +5209,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:72
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:35
-#: accounts/report/accounts_receivable/accounts_receivable.js:97
+#: accounts/report/accounts_receivable/accounts_receivable.js:100
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:35
 #: stock/report/stock_ageing/stock_ageing.js:56
 msgid "Ageing Range 2"
@@ -5136,7 +5217,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:79
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:42
-#: accounts/report/accounts_receivable/accounts_receivable.js:104
+#: accounts/report/accounts_receivable/accounts_receivable.js:107
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:42
 #: stock/report/stock_ageing/stock_ageing.js:63
 msgid "Ageing Range 3"
@@ -5144,7 +5225,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:86
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:49
-#: accounts/report/accounts_receivable/accounts_receivable.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:49
 msgid "Ageing Range 4"
 msgstr "Gamme de vieillissement 4"
@@ -5208,6 +5289,11 @@
 msgid "Agents"
 msgstr ""
 
+#. Description of a DocType
+#: selling/doctype/product_bundle/product_bundle.json
+msgid "Aggregate a group of Items into another Item. This is useful if you are maintaining the stock of the packed items and not the bundled item"
+msgstr ""
+
 #. Name of a role
 #: assets/doctype/location/location.json
 msgid "Agriculture Manager"
@@ -5239,10 +5325,10 @@
 msgid "All"
 msgstr "Tout"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:148
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:168
+#: 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:1324 public/js/setup_wizard.js:163
+#: accounts/utils.py:1293 public/js/setup_wizard.js:174
 msgid "All Accounts"
 msgstr "Tous les comptes"
 
@@ -5316,14 +5402,14 @@
 #: 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:310 setup/doctype/company/company.py:313
-#: setup/doctype/company/company.py:318 setup/doctype/company/company.py:324
-#: setup/doctype/company/company.py:330 setup/doctype/company/company.py:336
-#: setup/doctype/company/company.py:342 setup/doctype/company/company.py:348
-#: setup/doctype/company/company.py:354 setup/doctype/company/company.py:360
-#: setup/doctype/company/company.py:366 setup/doctype/company/company.py:372
-#: setup/doctype/company/company.py:378 setup/doctype/company/company.py:384
-#: setup/doctype/company/company.py:390
+#: 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
 msgid "All Departments"
 msgstr "Tous les départements"
 
@@ -5344,6 +5430,10 @@
 msgid "All Item Groups"
 msgstr "Tous les Groupes d'Articles"
 
+#: selling/page/point_of_sale/pos_item_selector.js:25
+msgid "All Items"
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5362,6 +5452,11 @@
 msgid "All Sales Person"
 msgstr "Tous les Commerciaux"
 
+#. Description of a DocType
+#: setup/doctype/sales_person/sales_person.json
+msgid "All Sales Transactions can be tagged against multiple Sales Persons so that you can set and monitor targets."
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5391,7 +5486,7 @@
 msgid "All Territories"
 msgstr "Tous les territoires"
 
-#: setup/doctype/company/company.py:259 setup/doctype/company/company.py:275
+#: setup/doctype/company/company.py:258 setup/doctype/company/company.py:274
 msgid "All Warehouses"
 msgstr "Tous les entrepôts"
 
@@ -5402,19 +5497,19 @@
 msgid "All allocations have been successfully reconciled"
 msgstr ""
 
-#: support/doctype/issue/issue.js:97
+#: support/doctype/issue/issue.js:107
 msgid "All communications including and above this shall be moved into the new Issue"
 msgstr "Toutes les communications, celle-ci et celles au dessus de celle-ci incluses, doivent être transférées dans le nouveau ticket."
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:1170
+#: stock/doctype/purchase_receipt/purchase_receipt.py:1172
 msgid "All items have already been Invoiced/Returned"
 msgstr "Tous les articles ont déjà été facturés / retournés"
 
-#: stock/doctype/stock_entry/stock_entry.py:2191
+#: stock/doctype/stock_entry/stock_entry.py:2222
 msgid "All items have already been transferred for this Work Order."
 msgstr "Tous les articles ont déjà été transférés pour cet ordre de fabrication."
 
-#: public/js/controllers/transaction.js:2210
+#: public/js/controllers/transaction.js:2253
 msgid "All items in this document already have a linked Quality Inspection."
 msgstr ""
 
@@ -5425,17 +5520,17 @@
 msgid "All the Comments and Emails will be copied from one document to another newly created document(Lead -> Opportunity -> Quotation) throughout the CRM documents."
 msgstr "Tous les commentaires et les courriels seront copiés d'un document à un autre document nouvellement créé (Lead -> Opportunité -> Devis) dans l'ensemble des documents CRM."
 
-#: manufacturing/doctype/work_order/work_order.js:847
+#: manufacturing/doctype/work_order/work_order.js:916
 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:899
+#: stock/doctype/delivery_note/delivery_note.py:960
 msgid "All these items have already been Invoiced/Returned"
 msgstr "Tous ces articles ont déjà été facturés / retournés"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:83
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:95
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:84
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:85
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:92
 msgid "Allocate"
 msgstr "Allouer"
 
@@ -5451,7 +5546,7 @@
 msgid "Allocate Advances Automatically (FIFO)"
 msgstr "Allouer automatiquement les avances (FIFO)"
 
-#: accounts/doctype/payment_entry/payment_entry.js:679
+#: accounts/doctype/payment_entry/payment_entry.js:831
 msgid "Allocate Payment Amount"
 msgstr "Allouer le montant du paiement"
 
@@ -5474,7 +5569,7 @@
 msgstr "Alloué"
 
 #: accounts/report/gross_profit/gross_profit.py:314
-#: public/js/utils/unreconcile.js:62
+#: public/js/utils/unreconcile.js:86
 msgid "Allocated Amount"
 msgstr "Montant alloué"
 
@@ -5533,21 +5628,25 @@
 msgid "Allocated Entries"
 msgstr ""
 
+#: public/js/templates/crm_activities.html:49
+msgid "Allocated To:"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Invoice Advance'
 #: accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
 msgctxt "Sales Invoice Advance"
 msgid "Allocated amount"
 msgstr "Montant alloué"
 
-#: accounts/utils.py:614
+#: accounts/utils.py:623
 msgid "Allocated amount cannot be greater than unadjusted amount"
 msgstr "Le montant alloué ne peut être supérieur au montant non ajusté"
 
-#: accounts/utils.py:612
+#: accounts/utils.py:621
 msgid "Allocated amount cannot be negative"
 msgstr "Le montant alloué ne peut être négatif"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:258
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:262
 msgid "Allocation"
 msgstr ""
 
@@ -5557,7 +5656,7 @@
 msgid "Allocation"
 msgstr ""
 
-#: public/js/utils/unreconcile.js:67
+#: public/js/utils/unreconcile.js:97
 msgid "Allocations"
 msgstr ""
 
@@ -5586,7 +5685,7 @@
 msgid "Allow"
 msgstr "Autoriser"
 
-#: accounts/doctype/account/account.py:488
+#: accounts/doctype/account/account.py:507
 #: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68
 msgid "Allow Account Creation Against Child Company"
 msgstr "Autoriser la création de compte contre une entreprise enfant"
@@ -5691,7 +5790,7 @@
 msgid "Allow Material Transfer from Purchase Receipt to Purchase Invoice"
 msgstr "Autoriser le transfert de matériel du reçu d'achat à la facture d'achat"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:9
 msgid "Allow Multiple Material Consumption"
 msgstr "Autoriser la consommation de plusieurs matériaux"
 
@@ -5968,7 +6067,7 @@
 msgid "Allows to keep aside a specific quantity of inventory for a particular order."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:721
+#: stock/doctype/pick_list/pick_list.py:792
 msgid "Already Picked"
 msgstr ""
 
@@ -5980,9 +6079,9 @@
 msgid "Already set default in pos profile {0} for user {1}, kindly disabled default"
 msgstr "Déjà défini par défaut dans le profil pdv {0} pour l'utilisateur {1}, veuillez désactiver la valeur par défaut"
 
-#: manufacturing/doctype/bom/bom.js:141
-#: manufacturing/doctype/work_order/work_order.js:162 public/js/utils.js:466
-#: stock/doctype/stock_entry/stock_entry.js:224
+#: manufacturing/doctype/bom/bom.js:152
+#: manufacturing/doctype/work_order/work_order.js:169 public/js/utils.js:519
+#: stock/doctype/stock_entry/stock_entry.js:245
 msgid "Alternate Item"
 msgstr "Article alternatif"
 
@@ -5998,6 +6097,10 @@
 msgid "Alternative Item Name"
 msgstr "Nom de l'article alternatif"
 
+#: selling/doctype/quotation/quotation.js:360
+msgid "Alternative Items"
+msgstr ""
+
 #: stock/doctype/item_alternative/item_alternative.py:37
 msgid "Alternative item must not be same as item code"
 msgstr "L'article alternatif ne doit pas être le même que le code article"
@@ -6468,7 +6571,7 @@
 msgid "Amended From"
 msgstr "Modifié Depuis"
 
-#: accounts/doctype/journal_entry/journal_entry.js:529
+#: accounts/doctype/journal_entry/journal_entry.js:579
 #: 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
@@ -6482,16 +6585,20 @@
 #: 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
-#: selling/doctype/quotation/quotation.js:286
+#: 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
 #: selling/report/sales_order_analysis/sales_order_analysis.py:290
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:46
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:69
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:67
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:108
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:109
 #: stock/report/delayed_item_report/delayed_item_report.py:152
 #: stock/report/delayed_order_report/delayed_order_report.py:71
-#: templates/pages/order.html:92 templates/pages/rfq.html:46
+#: templates/form_grid/bank_reconciliation_grid.html:4
+#: templates/form_grid/item_grid.html:9
+#: templates/form_grid/stock_entry_grid.html:11 templates/pages/order.html:104
+#: templates/pages/rfq.html:46
 msgid "Amount"
 msgstr ""
 
@@ -7009,19 +7116,19 @@
 msgid "Amount in customer's currency"
 msgstr "Montant dans la devise du client"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1119
+#: accounts/doctype/payment_entry/payment_entry.py:1128
 msgid "Amount {0} {1} against {2} {3}"
 msgstr "Montant {0} {1} pour {2} {3}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1127
+#: accounts/doctype/payment_entry/payment_entry.py:1136
 msgid "Amount {0} {1} deducted against {2}"
 msgstr "Montant {0} {1} déduit de {2}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1095
+#: accounts/doctype/payment_entry/payment_entry.py:1104
 msgid "Amount {0} {1} transferred from {2} to {3}"
 msgstr "Montant {0} {1} transféré de {2} à {3}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1102
+#: accounts/doctype/payment_entry/payment_entry.py:1111
 msgid "Amount {0} {1} {2} {3}"
 msgstr "Montant {0} {1} {2} {3}"
 
@@ -7030,7 +7137,12 @@
 msgid "Amt"
 msgstr "Nb"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:393
+#. Description of a DocType
+#: setup/doctype/item_group/item_group.json
+msgid "An Item Group is a way to classify items based on types."
+msgstr ""
+
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:408
 msgid "An error has been appeared while reposting item valuation via {0}"
 msgstr ""
 
@@ -7039,19 +7151,19 @@
 msgid "An error has occurred during {0}. Check {1} for more details"
 msgstr ""
 
-#: public/js/controllers/buying.js:297 public/js/utils/sales_common.js:364
+#: public/js/controllers/buying.js:292 public/js/utils/sales_common.js:408
 msgid "An error occurred during the update process"
 msgstr "Une erreur s'est produite lors du processus de mise à jour"
 
-#: stock/reorder_item.py:287
+#: stock/reorder_item.py:372
 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:232
+#: accounts/doctype/budget/budget.py:239
 msgid "Annual"
 msgstr "Annuel"
 
-#: public/js/utils.js:103
+#: public/js/utils.js:120
 msgid "Annual Billing: {0}"
 msgstr "Facturation Annuelle : {0}"
 
@@ -7123,6 +7235,10 @@
 msgid "Applicable Dimension"
 msgstr ""
 
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:221
+msgid "Applicable For"
+msgstr "Applicable Pour"
+
 #. Label of a Tab Break field in DocType 'Inventory Dimension'
 #: stock/doctype/inventory_dimension/inventory_dimension.json
 msgctxt "Inventory Dimension"
@@ -7403,6 +7519,12 @@
 msgid "Apply Recursion Over (As Per Transaction UOM)"
 msgstr ""
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Apply Recursion Over (As Per Transaction UOM)"
+msgstr ""
+
 #. Label of a Table field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -7518,7 +7640,7 @@
 msgid "Appointment Confirmation"
 msgstr "Confirmation de rendez-vous"
 
-#: www/book_appointment/index.js:229
+#: www/book_appointment/index.js:237
 msgid "Appointment Created Successfully"
 msgstr ""
 
@@ -7583,11 +7705,11 @@
 msgid "Are you sure you want to clear all demo data?"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:325
+#: public/js/bom_configurator/bom_configurator.bundle.js:363
 msgid "Are you sure you want to delete this Item?"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.js:70
+#: accounts/doctype/subscription/subscription.js:69
 msgid "Are you sure you want to restart this subscription?"
 msgstr ""
 
@@ -7607,13 +7729,13 @@
 msgid "Arrival Quantity"
 msgstr "Quantité d'arrivée"
 
-#: stock/report/serial_no_ledger/serial_no_ledger.js:58
+#: 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:31
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:30
 msgid "As On Date"
 msgstr "Comme à la date"
 
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:16
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:15
 msgid "As on Date"
 msgstr ""
 
@@ -7636,20 +7758,24 @@
 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}."
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:195
+#: stock/doctype/stock_settings/stock_settings.py:198
 msgid "As there are negative stock, you can not enable {0}."
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:209
+#: stock/doctype/stock_settings/stock_settings.py:212
 msgid "As there are reserved stock, you cannot disable {0}."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1600
+#: manufacturing/doctype/production_plan/production_plan.py:915
+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
 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
 msgstr "Comme il y a suffisamment de matières premières, la demande de matériel n'est pas requise pour l'entrepôt {0}."
 
-#: stock/doctype/stock_settings/stock_settings.py:164
-#: stock/doctype/stock_settings/stock_settings.py:178
+#: stock/doctype/stock_settings/stock_settings.py:167
+#: stock/doctype/stock_settings/stock_settings.py:181
 msgid "As {0} is enabled, you can not enable {1}."
 msgstr ""
 
@@ -7660,13 +7786,13 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/account_balance/account_balance.js:26
+#: accounts/report/account_balance/account_balance.js:25
 #: 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
 #: assets/doctype/asset/asset.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:177
+#: stock/doctype/purchase_receipt/purchase_receipt.js:200
 msgid "Asset"
 msgstr "Actif - Immo."
 
@@ -7816,7 +7942,7 @@
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:37
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:355
 #: assets/doctype/asset_category/asset_category.json
-#: assets/report/fixed_asset_register/fixed_asset_register.js:24
+#: assets/report/fixed_asset_register/fixed_asset_register.js:23
 #: assets/report/fixed_asset_register/fixed_asset_register.py:418
 msgid "Asset Category"
 msgstr "Catégorie d'Actif"
@@ -7913,8 +8039,8 @@
 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:898
-#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:944
+#: 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
 msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
 msgstr ""
@@ -7927,7 +8053,7 @@
 msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:181
+#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:183
 msgid "Asset Depreciation Schedules created:<br>{0}<br><br>Please check, edit if needed, and submit the Asset."
 msgstr ""
 
@@ -8022,7 +8148,7 @@
 
 #. Name of a DocType
 #: assets/doctype/asset_movement/asset_movement.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:184
+#: stock/doctype/purchase_receipt/purchase_receipt.js:211
 msgid "Asset Movement"
 msgstr "Mouvement d'Actif"
 
@@ -8037,7 +8163,7 @@
 msgid "Asset Movement Item"
 msgstr "Élément de mouvement d'actif"
 
-#: assets/doctype/asset/asset.py:901
+#: assets/doctype/asset/asset.py:905
 msgid "Asset Movement record {0} created"
 msgstr "Registre de Mouvement de l'Actif {0} créé"
 
@@ -8113,7 +8239,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:91
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:127
-#: accounts/report/account_balance/account_balance.js:39
+#: accounts/report/account_balance/account_balance.js:38
 msgid "Asset Received But Not Billed"
 msgstr "Actif reçu mais non facturé"
 
@@ -8223,35 +8349,35 @@
 msgid "Asset Value Analytics"
 msgstr "Analyse de la valeur des actifs"
 
-#: assets/doctype/asset/asset.py:172
+#: assets/doctype/asset/asset.py:174
 msgid "Asset cancelled"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:506
+#: assets/doctype/asset/asset.py:508
 msgid "Asset cannot be cancelled, as it is already {0}"
 msgstr "L'actif ne peut être annulé, car il est déjà {0}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:687
+#: assets/doctype/asset_capitalization/asset_capitalization.py:693
 msgid "Asset capitalized after Asset Capitalization {0} was submitted"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:194
+#: assets/doctype/asset/asset.py:196
 msgid "Asset created"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:633
+#: assets/doctype/asset_capitalization/asset_capitalization.py:639
 msgid "Asset created after Asset Capitalization {0} was submitted"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1156
+#: assets/doctype/asset/asset.py:1160
 msgid "Asset created after being split from Asset {0}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:695
+#: assets/doctype/asset_capitalization/asset_capitalization.py:701
 msgid "Asset decapitalized after Asset Capitalization {0} was submitted"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:197
+#: assets/doctype/asset/asset.py:199
 msgid "Asset deleted"
 msgstr ""
 
@@ -8267,31 +8393,31 @@
 msgid "Asset received at Location {0} and issued to Employee {1}"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:509
+#: assets/doctype/asset/depreciation.py:507
 msgid "Asset restored"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:703
+#: assets/doctype/asset_capitalization/asset_capitalization.py:709
 msgid "Asset restored after Asset Capitalization {0} was cancelled"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1320
+#: accounts/doctype/sales_invoice/sales_invoice.py:1331
 msgid "Asset returned"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:483
+#: assets/doctype/asset/depreciation.py:481
 msgid "Asset scrapped"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:485
+#: assets/doctype/asset/depreciation.py:483
 msgid "Asset scrapped via Journal Entry {0}"
 msgstr "Actif mis au rebut via Écriture de Journal {0}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1365
 msgid "Asset sold"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:160
+#: assets/doctype/asset/asset.py:161
 msgid "Asset submitted"
 msgstr ""
 
@@ -8299,7 +8425,7 @@
 msgid "Asset transferred to Location {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1080
+#: assets/doctype/asset/asset.py:1084
 msgid "Asset updated after being split into Asset {0}"
 msgstr ""
 
@@ -8315,11 +8441,11 @@
 msgid "Asset {0} cannot be received at a location and given to an employee in a single movement"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:449
+#: assets/doctype/asset/depreciation.py:447
 msgid "Asset {0} cannot be scrapped, as it is already {1}"
 msgstr "L'actif {0} ne peut pas être mis au rebut, car il est déjà {1}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:237
+#: assets/doctype/asset_capitalization/asset_capitalization.py:243
 msgid "Asset {0} does not belong to Item {1}"
 msgstr ""
 
@@ -8335,20 +8461,20 @@
 msgid "Asset {0} does not belongs to the location {1}"
 msgstr "L'élément {0} n'appartient pas à l'emplacement {1}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:759
-#: assets/doctype/asset_capitalization/asset_capitalization.py:859
+#: assets/doctype/asset_capitalization/asset_capitalization.py:765
+#: assets/doctype/asset_capitalization/asset_capitalization.py:865
 msgid "Asset {0} does not exist"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:639
+#: assets/doctype/asset_capitalization/asset_capitalization.py:645
 msgid "Asset {0} has been created. Please set the depreciation details if any and submit it."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:661
+#: assets/doctype/asset_capitalization/asset_capitalization.py:667
 msgid "Asset {0} has been updated. Please set the depreciation details if any and submit it."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:446
+#: assets/doctype/asset/depreciation.py:444
 msgid "Asset {0} must be submitted"
 msgstr "L'actif {0} doit être soumis"
 
@@ -8390,7 +8516,7 @@
 msgid "Assets"
 msgstr "Actifs - Immo."
 
-#: controllers/buying_controller.py:732
+#: controllers/buying_controller.py:757
 msgid "Assets not created for {0}. You will have to create asset manually."
 msgstr "Éléments non créés pour {0}. Vous devrez créer un actif manuellement."
 
@@ -8399,11 +8525,11 @@
 msgid "Assets, Depreciations, Repairs, and more."
 msgstr ""
 
-#: controllers/buying_controller.py:720
+#: controllers/buying_controller.py:745
 msgid "Asset{} {assets_link} created for {}"
 msgstr "Élément {} {assets_link} créé pour {}"
 
-#: manufacturing/doctype/job_card/job_card.js:249
+#: manufacturing/doctype/job_card/job_card.js:281
 msgid "Assign Job to Employee"
 msgstr ""
 
@@ -8425,9 +8551,9 @@
 msgid "Assign to Name"
 msgstr "Attribuer au nom"
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:33
-#: support/report/issue_analytics/issue_analytics.js:82
-#: support/report/issue_summary/issue_summary.js:70
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:32
+#: support/report/issue_analytics/issue_analytics.js:81
+#: support/report/issue_summary/issue_summary.js:69
 msgid "Assigned To"
 msgstr "Assigné À"
 
@@ -8441,7 +8567,7 @@
 msgid "Assignment Conditions"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1011
+#: assets/doctype/asset/asset.py:1015
 msgid "At least one asset has to be selected."
 msgstr ""
 
@@ -8454,7 +8580,7 @@
 msgstr ""
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:405
-#: accounts/doctype/sales_invoice/sales_invoice.py:509
+#: accounts/doctype/sales_invoice/sales_invoice.py:522
 msgid "At least one mode of payment is required for POS invoice."
 msgstr "Au moins un mode de paiement est nécessaire pour une facture de PDV"
 
@@ -8466,7 +8592,7 @@
 msgid "At least one of the Selling or Buying must be selected"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:643
+#: stock/doctype/stock_entry/stock_entry.py:598
 msgid "At least one warehouse is mandatory"
 msgstr ""
 
@@ -8474,22 +8600,26 @@
 msgid "At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}"
 msgstr "À la ligne n ° {0}: l'ID de séquence {1} ne peut pas être inférieur à l'ID de séquence de ligne précédent {2}"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:582
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
 msgid "At row {0}: Batch No is mandatory for Item {1}"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:574
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:569
 msgid "At row {0}: Serial No is mandatory for Item {1}"
 msgstr ""
 
+#: controllers/stock_controller.py:301
+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 ""
+
 #. Description of the 'File to Rename' (Attach) field in DocType 'Rename Tool'
 #: utilities/doctype/rename_tool/rename_tool.json
 msgctxt "Rename Tool"
 msgid "Attach .csv file with two columns, one for the old name and one for the new name"
 msgstr "Attacher un fichier .csv avec deux colonnes, une pour l'ancien nom et une pour le nouveau nom"
 
-#: public/js/utils/serial_no_batch_selector.js:246
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:66
+#: public/js/utils/serial_no_batch_selector.js:250
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:69
 msgid "Attach CSV File"
 msgstr ""
 
@@ -8505,7 +8635,7 @@
 msgid "Attachment"
 msgstr "Pièce jointe"
 
-#: templates/pages/order.html:125 templates/pages/projects.html:83
+#: templates/pages/order.html:137 templates/pages/projects.html:83
 msgid "Attachments"
 msgstr "Pièces jointes"
 
@@ -8685,7 +8815,7 @@
 msgid "Auto Email Report"
 msgstr "Rapport par Email Automatique"
 
-#: public/js/utils/serial_no_batch_selector.js:316
+#: public/js/utils/serial_no_batch_selector.js:322
 msgid "Auto Fetch"
 msgstr "Récupération automatique"
 
@@ -8701,7 +8831,7 @@
 msgid "Auto Material Request"
 msgstr "Demande de Matériel Automatique"
 
-#: stock/reorder_item.py:242
+#: stock/reorder_item.py:327
 msgid "Auto Material Requests Generated"
 msgstr "Demandes de Matériel Générées Automatiquement"
 
@@ -8725,7 +8855,7 @@
 msgid "Auto Opt In (For all customers)"
 msgstr "Adhésion automatique (pour tous les clients)"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:67
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:61
 msgid "Auto Reconcile"
 msgstr ""
 
@@ -8735,7 +8865,7 @@
 msgid "Auto Reconcile Payments"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:414
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:413
 msgid "Auto Reconciliation"
 msgstr ""
 
@@ -8859,7 +8989,7 @@
 msgid "Auto re-order"
 msgstr "Re-commande auto"
 
-#: public/js/controllers/buying.js:295 public/js/utils/sales_common.js:362
+#: public/js/controllers/buying.js:290 public/js/utils/sales_common.js:403
 msgid "Auto repeat document updated"
 msgstr "Document de répétition automatique mis à jour"
 
@@ -8944,7 +9074,7 @@
 msgstr "Date d'utilisation disponible"
 
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:82
-#: public/js/utils.js:522 stock/report/stock_ageing/stock_ageing.py:156
+#: public/js/utils.js:579 stock/report/stock_ageing/stock_ageing.py:156
 msgid "Available Qty"
 msgstr "Qté disponible"
 
@@ -9035,15 +9165,15 @@
 msgid "Available Stock for Packing Items"
 msgstr "Stock Disponible pour les Articles d'Emballage"
 
-#: assets/doctype/asset/asset.py:270
+#: assets/doctype/asset/asset.py:272
 msgid "Available for use date is required"
 msgstr "La date de mise en service est nécessaire"
 
-#: stock/doctype/stock_entry/stock_entry.py:772
+#: stock/doctype/stock_entry/stock_entry.py:727
 msgid "Available quantity is {0}, you need {1}"
 msgstr "La quantité disponible est {0}. Vous avez besoin de {1}."
 
-#: stock/dashboard/item_dashboard.js:239
+#: stock/dashboard/item_dashboard.js:247
 msgid "Available {0}"
 msgstr "Disponible {0}"
 
@@ -9053,13 +9183,13 @@
 msgid "Available-for-use Date"
 msgstr "Date de mise en service"
 
-#: assets/doctype/asset/asset.py:355
+#: assets/doctype/asset/asset.py:357
 msgid "Available-for-use Date should be after purchase date"
 msgstr "La date de disponibilité devrait être postérieure à la date d'achat"
 
 #: stock/report/stock_ageing/stock_ageing.py:157
 #: stock/report/stock_ageing/stock_ageing.py:191
-#: stock/report/stock_balance/stock_balance.py:477
+#: stock/report/stock_balance/stock_balance.py:485
 msgid "Average Age"
 msgstr "Âge moyen"
 
@@ -9099,7 +9229,7 @@
 msgid "Avg Rate"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:197
+#: stock/report/stock_ledger/stock_ledger.py:270
 msgid "Avg Rate (Balance Stock)"
 msgstr ""
 
@@ -9142,14 +9272,14 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/bom/bom.json manufacturing/doctype/bom/bom_tree.js:8
-#: manufacturing/report/bom_explorer/bom_explorer.js:9
+#: manufacturing/report/bom_explorer/bom_explorer.js:8
 #: manufacturing/report/bom_explorer/bom_explorer.py:56
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:9
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:8
 #: manufacturing/report/bom_stock_report/bom_stock_report.js:5
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
-#: selling/doctype/sales_order/sales_order.js:810
-#: stock/doctype/material_request/material_request.js:243
-#: stock/doctype/stock_entry/stock_entry.js:545
+#: 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/report/bom_search/bom_search.py:38
 msgid "BOM"
 msgstr "Nomenclature"
@@ -9220,7 +9350,7 @@
 msgid "BOM 1"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1348
+#: manufacturing/doctype/bom/bom.py:1347
 msgid "BOM 1 {0} and BOM 2 {1} should not be same"
 msgstr "La nomenclature 1 {0} et la nomenclature 2 {1} ne doivent pas être identiques"
 
@@ -9302,7 +9432,7 @@
 msgid "BOM Explosion Item"
 msgstr "Article Eclaté en nomenclature"
 
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:21
+#: manufacturing/report/bom_operations_time/bom_operations_time.js:20
 #: manufacturing/report/bom_operations_time/bom_operations_time.py:101
 msgid "BOM ID"
 msgstr "ID de nomenclature"
@@ -9323,7 +9453,7 @@
 msgid "BOM Level"
 msgstr ""
 
-#: manufacturing/report/bom_variance_report/bom_variance_report.js:9
+#: manufacturing/report/bom_variance_report/bom_variance_report.js:8
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:31
 msgid "BOM No"
 msgstr "N° Nomenclature"
@@ -9434,6 +9564,7 @@
 #. Name of a report
 #. Label of a Link in the Manufacturing Workspace
 #. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:1
 #: manufacturing/report/bom_stock_report/bom_stock_report.json
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "BOM Stock Report"
@@ -9454,7 +9585,7 @@
 msgid "BOM Update Batch"
 msgstr ""
 
-#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:82
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:84
 msgid "BOM Update Initiated"
 msgstr ""
 
@@ -9474,6 +9605,11 @@
 msgid "BOM Update Tool"
 msgstr "Outil de mise à jour des Nomenclatures"
 
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_log/bom_update_log.json
+msgid "BOM Update Tool Log with job status maintained"
+msgstr ""
+
 #: manufacturing/doctype/bom_update_log/bom_update_log.py:99
 msgid "BOM Updation already in progress. Please wait until {0} is complete."
 msgstr ""
@@ -9497,12 +9633,12 @@
 msgid "BOM Website Operation"
 msgstr "Opération de nomenclature du Site Internet"
 
-#: stock/doctype/stock_entry/stock_entry.js:1000
+#: stock/doctype/stock_entry/stock_entry.js:1145
 msgid "BOM and Manufacturing Quantity are required"
 msgstr "Nomenclature et quantité de production sont nécessaires"
 
-#: stock/doctype/material_request/material_request.js:264
-#: stock/doctype/stock_entry/stock_entry.js:581
+#: stock/doctype/material_request/material_request.js:332
+#: stock/doctype/stock_entry/stock_entry.js:669
 msgid "BOM does not contain any stock item"
 msgstr "Nomenclature ne contient aucun article en stock"
 
@@ -9514,15 +9650,15 @@
 msgid "BOM recursion: {1} cannot be parent or child of {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1223
+#: manufacturing/doctype/bom/bom.py:1222
 msgid "BOM {0} does not belong to Item {1}"
 msgstr "Nomenclature {0} n’appartient pas à l'article {1}"
 
-#: manufacturing/doctype/bom/bom.py:1205
+#: manufacturing/doctype/bom/bom.py:1204
 msgid "BOM {0} must be active"
 msgstr "Nomenclature {0} doit être active"
 
-#: manufacturing/doctype/bom/bom.py:1208
+#: manufacturing/doctype/bom/bom.py:1207
 msgid "BOM {0} must be submitted"
 msgstr "Nomenclature {0} doit être soumise"
 
@@ -9544,11 +9680,11 @@
 msgid "BOMs creation has been enqueued, kindly check the status after some time"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:323
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:334
 msgid "Backdated Stock Entry"
 msgstr "Entrée de stock antidatée"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:15
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
 msgid "Backflush Raw Materials"
 msgstr "Matières premières de backflush"
 
@@ -9578,10 +9714,11 @@
 msgstr "Solde"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:41
+#: accounts/report/general_ledger/general_ledger.html:32
 msgid "Balance (Dr - Cr)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:584
+#: accounts/report/general_ledger/general_ledger.py:597
 msgid "Balance ({0})"
 msgstr "Solde ({0})"
 
@@ -9598,8 +9735,8 @@
 msgstr "Solde en devise de base"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:82
-#: stock/report/stock_balance/stock_balance.py:405
-#: stock/report/stock_ledger/stock_ledger.py:153
+#: stock/report/stock_balance/stock_balance.py:413
+#: stock/report/stock_ledger/stock_ledger.py:226
 msgid "Balance Qty"
 msgstr "Solde de la Qté"
 
@@ -9607,10 +9744,6 @@
 msgid "Balance Qty (Stock)"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:259
-msgid "Balance Serial No"
-msgstr "Numéro de série de la balance"
-
 #. Name of a report
 #. Label of a Link in the Financial Reports Workspace
 #: accounts/report/balance_sheet/balance_sheet.json
@@ -9643,18 +9776,22 @@
 msgid "Balance Sheet Summary"
 msgstr ""
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:13
+msgid "Balance Stock Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "Balance Stock Value"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:412
-#: stock/report/stock_ledger/stock_ledger.py:217
+#: stock/report/stock_balance/stock_balance.py:420
+#: stock/report/stock_ledger/stock_ledger.py:290
 msgid "Balance Value"
 msgstr "Valeur du solde"
 
-#: accounts/doctype/gl_entry/gl_entry.py:355
+#: accounts/doctype/gl_entry/gl_entry.py:309
 msgid "Balance for Account {0} must always be {1}"
 msgstr "Solde pour le compte {0} doit toujours être {1}"
 
@@ -9666,7 +9803,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/bank/bank.json
-#: accounts/report/account_balance/account_balance.js:40
+#: accounts/report/account_balance/account_balance.js:39
 msgid "Bank"
 msgstr "Banque"
 
@@ -9746,7 +9883,7 @@
 #: accounts/doctype/bank_account/bank_account.json
 #: 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:94
+#: buying/doctype/supplier/supplier.js:108
 #: setup/setup_wizard/operations/install_fixtures.py:492
 msgid "Bank Account"
 msgstr "Compte bancaire"
@@ -9988,6 +10125,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:4
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Bank Reconciliation Statement"
@@ -10046,23 +10184,23 @@
 msgid "Bank Transaction Payments"
 msgstr "Paiements bancaires"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:496
+#: public/js/bank_reconciliation_tool/dialog_manager.js:485
 msgid "Bank Transaction {0} Matched"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:544
+#: public/js/bank_reconciliation_tool/dialog_manager.js:533
 msgid "Bank Transaction {0} added as Journal Entry"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:520
+#: public/js/bank_reconciliation_tool/dialog_manager.js:508
 msgid "Bank Transaction {0} added as Payment Entry"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:124
+#: accounts/doctype/bank_transaction/bank_transaction.py:127
 msgid "Bank Transaction {0} is already fully reconciled"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:563
+#: public/js/bank_reconciliation_tool/dialog_manager.js:553
 msgid "Bank Transaction {0} updated"
 msgstr ""
 
@@ -10070,15 +10208,15 @@
 msgid "Bank account cannot be named as {0}"
 msgstr "Compte Bancaire ne peut pas être nommé {0}"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:130
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:146
 msgid "Bank account {0} already exists and could not be created again"
 msgstr "Le compte bancaire {0} existe déjà et n'a pas pu être créé à nouveau."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:134
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:153
 msgid "Bank accounts added"
 msgstr "Comptes bancaires ajoutés"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:297
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:313
 msgid "Bank transaction creation error"
 msgstr "Erreur de création de transaction bancaire"
 
@@ -10103,7 +10241,7 @@
 msgid "Banking"
 msgstr "Banque"
 
-#: public/js/utils/barcode_scanner.js:273
+#: public/js/utils/barcode_scanner.js:282
 msgid "Barcode"
 msgstr "code à barre"
 
@@ -10230,7 +10368,7 @@
 msgid "Base Tax Withholding Net Total"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:239
 msgid "Base Total"
 msgstr ""
 
@@ -10258,18 +10396,18 @@
 msgid "Base URL"
 msgstr "URL de base"
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:28
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:27
 #: accounts/report/profitability_analysis/profitability_analysis.js:16
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:9
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:45
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:39
-#: manufacturing/report/production_planning_report/production_planning_report.js:17
-#: manufacturing/report/work_order_summary/work_order_summary.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:8
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:44
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:38
+#: manufacturing/report/production_planning_report/production_planning_report.js:16
+#: manufacturing/report/work_order_summary/work_order_summary.js:15
 #: public/js/purchase_trends_filters.js:45 public/js/sales_trends_filters.js:20
-#: stock/report/delayed_item_report/delayed_item_report.js:55
-#: stock/report/delayed_order_report/delayed_order_report.js:55
-#: support/report/issue_analytics/issue_analytics.js:17
-#: support/report/issue_summary/issue_summary.js:17
+#: stock/report/delayed_item_report/delayed_item_report.js:54
+#: stock/report/delayed_order_report/delayed_order_report.js:54
+#: support/report/issue_analytics/issue_analytics.js:16
+#: support/report/issue_summary/issue_summary.js:16
 msgid "Based On"
 msgstr "Basé Sur"
 
@@ -10285,18 +10423,18 @@
 msgid "Based On"
 msgstr "Basé Sur"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:47
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:46
 msgid "Based On Data ( in years )"
 msgstr "Basé sur les données (en années)"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:31
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:30
 msgid "Based On Document"
 msgstr "Basé sur le document"
 
-#: accounts/report/accounts_payable/accounts_payable.js:134
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:111
-#: accounts/report/accounts_receivable/accounts_receivable.js:156
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:137
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:114
+#: accounts/report/accounts_receivable/accounts_receivable.js:159
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:132
 msgid "Based On Payment Terms"
 msgstr "Basé sur les conditions de paiement"
 
@@ -10368,7 +10506,7 @@
 #: 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/stock_ledger/stock_ledger.py:239
+#: 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
 msgid "Batch"
@@ -10409,11 +10547,11 @@
 msgid "Batch Item Expiry Status"
 msgstr "Statut d'Expiration d'Article du Lot"
 
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:88
+#: 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:2150
-#: public/js/utils/barcode_scanner.js:251
-#: public/js/utils/serial_no_batch_selector.js:367
+#: public/js/controllers/transaction.js:2193
+#: 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
@@ -10541,15 +10679,15 @@
 msgid "Batch No"
 msgstr "N° du Lot"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:585
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:580
 msgid "Batch No is mandatory"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2118
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2137
 msgid "Batch No {0} does not exists"
 msgstr ""
 
-#: stock/utils.py:643
+#: stock/utils.py:638
 msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
 msgstr ""
 
@@ -10559,13 +10697,13 @@
 msgid "Batch No."
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Batch Nos"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1113
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1120
 msgid "Batch Nos are created successfully"
 msgstr ""
 
@@ -10585,7 +10723,7 @@
 msgid "Batch Quantity"
 msgstr "Quantité par lots"
 
-#: manufacturing/doctype/work_order/work_order.js:256
+#: manufacturing/doctype/work_order/work_order.js:271
 msgid "Batch Size"
 msgstr "Taille du lot"
 
@@ -10625,7 +10763,7 @@
 msgid "Batch and Serial No"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:485
+#: manufacturing/doctype/work_order/work_order.py:496
 msgid "Batch not created for item {} since it does not have a batch series."
 msgstr ""
 
@@ -10633,12 +10771,12 @@
 msgid "Batch {0} and Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2345
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:272
+#: stock/doctype/stock_entry/stock_entry.py:2379
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:283
 msgid "Batch {0} of Item {1} has expired."
 msgstr "Lot {0} de l'Article {1} a expiré."
 
-#: stock/doctype/stock_entry/stock_entry.py:2347
+#: stock/doctype/stock_entry/stock_entry.py:2381
 msgid "Batch {0} of Item {1} is disabled."
 msgstr "Le lot {0} de l'élément {1} est désactivé."
 
@@ -10678,7 +10816,7 @@
 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:1061
+#: accounts/report/accounts_receivable/accounts_receivable.py:1069
 #: accounts/report/purchase_register/purchase_register.py:214
 msgid "Bill Date"
 msgstr "Date de la Facture"
@@ -10695,7 +10833,7 @@
 msgid "Bill Date"
 msgstr "Date de la Facture"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1060
+#: accounts/report/accounts_receivable/accounts_receivable.py:1068
 #: accounts/report/purchase_register/purchase_register.py:213
 msgid "Bill No"
 msgstr "Numéro de facture"
@@ -10720,11 +10858,11 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Manufacturing Workspace
-#: manufacturing/doctype/bom/bom.py:1089
+#: manufacturing/doctype/bom/bom.py:1088
 #: 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:533
+#: stock/doctype/stock_entry/stock_entry.js:599
 msgid "Bill of Materials"
 msgstr "Nomenclatures"
 
@@ -11128,8 +11266,8 @@
 msgid "Blanket Order Rate"
 msgstr "Prix unitaire de commande avec limites"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:101
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:265
 msgid "Block Invoice"
 msgstr "Bloquer la facture"
 
@@ -11268,7 +11406,7 @@
 msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
 msgstr ""
 
-#: accounts/general_ledger.py:685
+#: accounts/general_ledger.py:694
 msgid "Books have been closed till the period ending on {0}"
 msgstr ""
 
@@ -11334,11 +11472,11 @@
 #: accounts/report/gross_profit/gross_profit.py:243
 #: 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:41 public/js/stock_analytics.js:62
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:48
+#: public/js/stock_analytics.js:58 public/js/stock_analytics.js:93
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:47
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:61
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:100
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:101
 #: setup/doctype/brand/brand.json
 #: stock/report/item_price_stock/item_price_stock.py:25
 #: stock/report/item_prices/item_prices.py:53
@@ -11348,10 +11486,10 @@
 #: 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_analytics/stock_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:34
 #: stock/report/stock_analytics/stock_analytics.py:45
-#: stock/report/stock_ledger/stock_ledger.js:65
-#: stock/report/stock_ledger/stock_ledger.py:181
+#: 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
 #: stock/report/stock_projected_qty/stock_projected_qty.py:115
 msgid "Brand"
@@ -11510,16 +11648,16 @@
 msgid "Breakdown"
 msgstr "Panne"
 
-#: manufacturing/doctype/bom/bom.js:103
+#: manufacturing/doctype/bom/bom.js:102
 msgid "Browse BOM"
 msgstr "Parcourir la nomenclature"
 
 #. Name of a DocType
 #: accounts/doctype/budget/budget.json
-#: accounts/doctype/cost_center/cost_center.js:44
-#: accounts/doctype/cost_center/cost_center_tree.js:42
-#: accounts/doctype/cost_center/cost_center_tree.js:46
-#: accounts/doctype/cost_center/cost_center_tree.js:50
+#: accounts/doctype/cost_center/cost_center.js:45
+#: accounts/doctype/cost_center/cost_center_tree.js:65
+#: accounts/doctype/cost_center/cost_center_tree.js:73
+#: 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
@@ -11543,7 +11681,7 @@
 msgid "Budget Accounts"
 msgstr "Comptes de Budgets"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:82
+#: accounts/report/budget_variance_report/budget_variance_report.js:80
 msgid "Budget Against"
 msgstr "Budget Pour"
 
@@ -11565,17 +11703,17 @@
 msgid "Budget Detail"
 msgstr "Détail du budget"
 
-#: accounts/doctype/budget/budget.py:278 accounts/doctype/budget/budget.py:280
+#: accounts/doctype/budget/budget.py:285 accounts/doctype/budget/budget.py:287
 msgid "Budget Exceeded"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center_tree.js:40
+#: accounts/doctype/cost_center/cost_center_tree.js:61
 msgid "Budget List"
 msgstr "Liste budgétaire"
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/cost_center/cost_center_tree.js:48
+#: accounts/doctype/cost_center/cost_center_tree.js:77
 #: accounts/report/budget_variance_report/budget_variance_report.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Budget Variance Report"
@@ -11648,6 +11786,11 @@
 msgid "Buy"
 msgstr "Acheter"
 
+#. Description of a DocType
+#: selling/doctype/customer/customer.json
+msgid "Buyer of Goods and Services."
+msgstr ""
+
 #. Name of a Workspace
 #. Label of a Card Break in the Buying Workspace
 #: buying/workspace/buying/buying.json
@@ -11746,7 +11889,7 @@
 msgid "Buying must be checked, if Applicable For is selected as {0}"
 msgstr "Achat doit être vérifié, si Applicable Pour {0} est sélectionné"
 
-#: buying/doctype/buying_settings/buying_settings.js:14
+#: buying/doctype/buying_settings/buying_settings.js:13
 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a <a href='https://docs.erpnext.com/docs/user/manual/en/setting-up/settings/naming-series' target='_blank'>Naming Series</a> choose the 'Naming Series' option."
 msgstr ""
 
@@ -11940,12 +12083,12 @@
 msgid "Call Routing"
 msgstr ""
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:57
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:58
 #: telephony/doctype/incoming_call_settings/incoming_call_settings.py:49
 msgid "Call Schedule Row {0}: To time slot should always be ahead of From time slot."
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:153
+#: public/js/call_popup/call_popup.js:164
 #: telephony/doctype/call_log/call_log.py:135
 msgid "Call Summary"
 msgstr "Résumé d'appel"
@@ -11956,6 +12099,10 @@
 msgid "Call Summary"
 msgstr "Résumé d'appel"
 
+#: public/js/call_popup/call_popup.js:186
+msgid "Call Summary Saved"
+msgstr ""
+
 #. Label of a Data field in DocType 'Telephony Call Type'
 #: telephony/doctype/telephony_call_type/telephony_call_type.json
 msgctxt "Telephony Call Type"
@@ -12102,7 +12249,7 @@
 msgid "Can be approved by {0}"
 msgstr "Peut être approuvé par {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:1451
+#: manufacturing/doctype/work_order/work_order.py:1465
 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
 msgstr ""
 
@@ -12130,20 +12277,24 @@
 msgid "Can not filter based on Voucher No, if grouped by Voucher"
 msgstr "Impossible de filtrer sur la base du N° de Coupon, si les lignes sont regroupées par Coupon"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1226
-#: accounts/doctype/payment_entry/payment_entry.py:2229
+#: accounts/doctype/journal_entry/journal_entry.py:1240
+#: accounts/doctype/payment_entry/payment_entry.py:2254
 msgid "Can only make payment against unbilled {0}"
 msgstr "Le paiement n'est possible qu'avec les {0} non facturés"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1199
-#: controllers/accounts_controller.py:2500 public/js/controllers/accounts.js:90
+#: accounts/doctype/payment_entry/payment_entry.js:1438
+#: controllers/accounts_controller.py:2585 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 "Peut se référer à ligne seulement si le type de charge est 'Montant de la ligne précedente' ou 'Total des lignes précedente'"
 
-#: stock/doctype/stock_settings/stock_settings.py:133
+#: stock/doctype/stock_settings/stock_settings.py:136
 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method"
 msgstr ""
 
+#: templates/pages/task_info.html:24
+msgid "Cancel"
+msgstr "Annuler"
+
 #. Label of a Check field in DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
 msgctxt "Subscription"
@@ -12174,8 +12325,8 @@
 msgid "Cancelation Date"
 msgstr "Date d'annulation"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:18
-#: stock/doctype/stock_entry/stock_entry_list.js:19
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:13
+#: stock/doctype/stock_entry/stock_entry_list.js:25
 msgid "Canceled"
 msgstr "Annulé"
 
@@ -12192,11 +12343,12 @@
 msgstr "Annulé"
 
 #: accounts/doctype/bank_transaction/bank_transaction_list.js:8
-#: accounts/doctype/payment_request/payment_request_list.js:20
+#: accounts/doctype/payment_request/payment_request_list.js:18
 #: accounts/doctype/subscription/subscription_list.js:14
 #: assets/doctype/asset_repair/asset_repair_list.js:9
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:11
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle_list.js:8
+#: templates/pages/task_info.html:77
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -12451,6 +12603,13 @@
 msgid "Cancelled"
 msgstr "Annulé"
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Cancelled"
+msgstr "Annulé"
+
 #. Option for the 'Status' (Select) field in DocType 'Warranty Claim'
 #: support/doctype/warranty_claim/warranty_claim.json
 msgctxt "Warranty Claim"
@@ -12463,7 +12622,7 @@
 msgid "Cancelled"
 msgstr "Annulé"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:76
+#: stock/doctype/delivery_trip/delivery_trip.js:89
 #: stock/doctype/delivery_trip/delivery_trip.py:189
 msgid "Cannot Calculate Arrival Time as Driver Address is Missing."
 msgstr "Impossible de calculer l'heure d'arrivée car l'adresse du conducteur est manquante."
@@ -12473,7 +12632,7 @@
 msgid "Cannot Merge"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:105
+#: stock/doctype/delivery_trip/delivery_trip.js:122
 msgid "Cannot Optimize Route as Driver Address is Missing."
 msgstr "Impossible d'optimiser l'itinéraire car l'adresse du pilote est manquante."
 
@@ -12489,7 +12648,7 @@
 msgid "Cannot amend {0} {1}, please create a new one instead."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:257
+#: accounts/doctype/journal_entry/journal_entry.py:273
 msgid "Cannot apply TDS against multiple parties in one entry"
 msgstr ""
 
@@ -12497,23 +12656,23 @@
 msgid "Cannot be a fixed asset item as Stock Ledger is created."
 msgstr "Ne peut pas être un article immobilisé car un Journal de Stock a été créé."
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:222
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:217
 msgid "Cannot cancel as processing of cancelled documents is pending."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:641
+#: manufacturing/doctype/work_order/work_order.py:655
 msgid "Cannot cancel because submitted Stock Entry {0} exists"
 msgstr "Impossible d'annuler car l'Écriture de Stock soumise {0} existe"
 
-#: stock/stock_ledger.py:196
+#: stock/stock_ledger.py:198
 msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet."
 msgstr ""
 
-#: controllers/buying_controller.py:811
+#: controllers/buying_controller.py:836
 msgid "Cannot cancel this document as it is linked with submitted asset {0}. Please cancel it to continue."
 msgstr "Impossible d'annuler ce document car il est associé à l'élément soumis {0}. Veuillez l'annuler pour continuer."
 
-#: stock/doctype/stock_entry/stock_entry.py:365
+#: stock/doctype/stock_entry/stock_entry.py:320
 msgid "Cannot cancel transaction for Completed Work Order."
 msgstr "Impossible d'annuler la transaction lorsque l'ordre de fabrication est terminé."
 
@@ -12525,7 +12684,7 @@
 msgid "Cannot change Fiscal Year Start Date and Fiscal Year End Date once the Fiscal Year is saved."
 msgstr "Impossible de modifier les dates de début et de fin d'exercice une fois que l'exercice est enregistré."
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:66
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:70
 msgid "Cannot change Reference Document Type."
 msgstr ""
 
@@ -12537,7 +12696,7 @@
 msgid "Cannot change Variant properties after stock transaction. You will have to make a new Item to do this."
 msgstr "Impossible de modifier les propriétés de variante après une transaction de stock. Vous devrez créer un nouvel article pour pouvoir le faire."
 
-#: setup/doctype/company/company.py:209
+#: setup/doctype/company/company.py:208
 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."
 msgstr "Impossible de changer la devise par défaut de la société, parce qu'il y a des opérations existantes. Les transactions doivent être annulées pour changer la devise par défaut."
 
@@ -12549,32 +12708,32 @@
 msgid "Cannot convert Cost Center to ledger as it has child nodes"
 msgstr "Conversion impossible du Centre de Coûts en livre car il possède des nœuds enfants"
 
-#: projects/doctype/task/task.js:48
+#: projects/doctype/task/task.js:50
 msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}."
 msgstr ""
 
-#: accounts/doctype/account/account.py:373
+#: accounts/doctype/account/account.py:392
 msgid "Cannot convert to Group because Account Type is selected."
 msgstr ""
 
-#: accounts/doctype/account/account.py:250
+#: accounts/doctype/account/account.py:269
 msgid "Cannot covert to Group because Account Type is selected."
 msgstr "Conversion impossible en Groupe car le Type de Compte est sélectionné."
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:914
+#: stock/doctype/purchase_receipt/purchase_receipt.py:916
 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note_list.js:25
+#: stock/doctype/delivery_note/delivery_note_list.js:35
 msgid "Cannot create a Delivery Trip from Draft documents."
 msgstr "Impossible de créer un voyage de livraison à partir de documents brouillons."
 
-#: selling/doctype/sales_order/sales_order.py:1576
-#: stock/doctype/pick_list/pick_list.py:104
+#: selling/doctype/sales_order/sales_order.py:1599
+#: stock/doctype/pick_list/pick_list.py:108
 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 ""
 
-#: accounts/general_ledger.py:127
+#: accounts/general_ledger.py:131
 msgid "Cannot create accounting entries against disabled accounts: {0}"
 msgstr ""
 
@@ -12595,32 +12754,40 @@
 msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
 msgstr "Impossible de supprimer les N° de série {0}, s'ils sont dans les mouvements de stock"
 
-#: selling/doctype/sales_order/sales_order.py:638
-#: selling/doctype/sales_order/sales_order.py:661
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:101
+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
 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
 msgstr "Impossible de garantir la livraison par numéro de série car l'article {0} est ajouté avec et sans Assurer la livraison par numéro de série"
 
-#: public/js/utils/barcode_scanner.js:51
+#: public/js/utils/barcode_scanner.js:54
 msgid "Cannot find Item with this Barcode"
 msgstr "Impossible de trouver l'article avec ce code-barres"
 
-#: controllers/accounts_controller.py:3023
+#: controllers/accounts_controller.py:3114
 msgid "Cannot find {} for item {}. Please set the same in Item Master or Stock Settings."
 msgstr "Impossible de trouver {} pour l'élément {}. Veuillez définir la même chose dans le fichier principal ou les paramètres de stock."
 
-#: controllers/accounts_controller.py:1774
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:506
+msgid "Cannot make any transactions until the deletion job is completed"
+msgstr ""
+
+#: controllers/accounts_controller.py:1863
 msgid "Cannot overbill for Item {0} in row {1} more than {2}. To allow over-billing, please set allowance in Accounts Settings"
 msgstr "La surfacturation pour le poste {0} dans la ligne {1} ne peut pas dépasser {2}. Pour autoriser la surfacturation, définissez la provision dans les paramètres du compte."
 
-#: manufacturing/doctype/work_order/work_order.py:292
+#: manufacturing/doctype/work_order/work_order.py:296
 msgid "Cannot produce more Item {0} than Sales Order quantity {1}"
 msgstr "Impossible de produire plus d'Article {0} que la quantité {1} du de la Commande client"
 
-#: manufacturing/doctype/work_order/work_order.py:962
+#: manufacturing/doctype/work_order/work_order.py:976
 msgid "Cannot produce more item for {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:966
+#: manufacturing/doctype/work_order/work_order.py:980
 msgid "Cannot produce more than {0} items for {1}"
 msgstr ""
 
@@ -12628,8 +12795,8 @@
 msgid "Cannot receive from customer against negative outstanding"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1209
-#: controllers/accounts_controller.py:2515
+#: accounts/doctype/payment_entry/payment_entry.js:1455
+#: controllers/accounts_controller.py:2600
 #: public/js/controllers/accounts.js:100
 msgid "Cannot refer row number greater than or equal to current row number for this Charge type"
 msgstr "Impossible de se référer au numéro de la ligne supérieure ou égale au numéro de la ligne courante pour ce type de Charge"
@@ -12638,14 +12805,14 @@
 msgid "Cannot retrieve link token for update. Check Error Log for more information"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:60
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:63
 msgid "Cannot retrieve link token. Check Error Log for more information"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1203
-#: accounts/doctype/payment_entry/payment_entry.js:1374
-#: accounts/doctype/payment_entry/payment_entry.py:1579
-#: controllers/accounts_controller.py:2505 public/js/controllers/accounts.js:94
+#: 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
 #: 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 "Impossible de sélectionner le type de charge comme étant «Le Montant de la Ligne Précédente» ou «Montant Total de la Ligne Précédente» pour la première ligne"
@@ -12662,11 +12829,11 @@
 msgid "Cannot set multiple Item Defaults for a company."
 msgstr "Impossible de définir plusieurs valeurs par défaut pour une entreprise."
 
-#: controllers/accounts_controller.py:3173
+#: controllers/accounts_controller.py:3264
 msgid "Cannot set quantity less than delivered quantity"
 msgstr "Impossible de définir une quantité inférieure à la quantité livrée"
 
-#: controllers/accounts_controller.py:3178
+#: controllers/accounts_controller.py:3269
 msgid "Cannot set quantity less than received quantity"
 msgstr "Impossible de définir une quantité inférieure à la quantité reçue"
 
@@ -12674,7 +12841,7 @@
 msgid "Cannot set the field <b>{0}</b> for copying in variants"
 msgstr "Impossible de définir le champ <b>{0}</b> pour la copie dans les variantes"
 
-#: accounts/doctype/payment_entry/payment_entry.js:876
+#: accounts/doctype/payment_entry/payment_entry.js:1050
 msgid "Cannot {0} {1} {2} without any negative outstanding invoice"
 msgstr "Can not {0} {1} {2} sans aucune facture impayée négative"
 
@@ -12694,7 +12861,7 @@
 msgid "Capacity Planning"
 msgstr "Planification de Capacité"
 
-#: manufacturing/doctype/work_order/work_order.py:627
+#: manufacturing/doctype/work_order/work_order.py:641
 msgid "Capacity Planning Error, planned start time can not be same as end time"
 msgstr "Erreur de planification de capacité, l'heure de début prévue ne peut pas être identique à l'heure de fin"
 
@@ -12736,7 +12903,7 @@
 msgid "Capital Work In Progress Account"
 msgstr "Compte d'immobilisation en cours"
 
-#: accounts/report/account_balance/account_balance.js:43
+#: accounts/report/account_balance/account_balance.js:42
 msgid "Capital Work in Progress"
 msgstr "Immobilisation en cours"
 
@@ -12758,7 +12925,7 @@
 msgid "Capitalization Method"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:155
+#: assets/doctype/asset/asset.js:194
 msgid "Capitalize Asset"
 msgstr ""
 
@@ -12800,7 +12967,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:14
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:18
-#: accounts/report/account_balance/account_balance.js:41
+#: accounts/report/account_balance/account_balance.js:40
 #: setup/setup_wizard/operations/install_fixtures.py:208
 msgid "Cash"
 msgstr "Espèces"
@@ -12864,7 +13031,7 @@
 msgid "Cash In Hand"
 msgstr "Liquidités"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:322
 msgid "Cash or Bank Account is mandatory for making payment entry"
 msgstr "Espèces ou Compte Bancaire est obligatoire pour réaliser une écriture de paiement"
 
@@ -12886,7 +13053,7 @@
 msgid "Cash/Bank Account"
 msgstr "Compte Caisse/Banque"
 
-#: accounts/report/pos_register/pos_register.js:39
+#: accounts/report/pos_register/pos_register.js:38
 #: accounts/report/pos_register/pos_register.py:126
 #: accounts/report/pos_register/pos_register.py:200
 msgid "Cashier"
@@ -12948,7 +13115,7 @@
 msgid "Category-wise Asset Value"
 msgstr "Valeur de l'actif par catégorie"
 
-#: buying/doctype/purchase_order/purchase_order.py:313
+#: buying/doctype/purchase_order/purchase_order.py:314
 #: buying/doctype/request_for_quotation/request_for_quotation.py:99
 msgid "Caution"
 msgstr "Mise en garde"
@@ -12993,7 +13160,7 @@
 msgid "Certificate Required"
 msgstr "Certificat requis"
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "Change"
 msgstr "Changement"
 
@@ -13009,7 +13176,7 @@
 msgid "Change Amount"
 msgstr "Changer le montant"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:90
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:108
 msgid "Change Release Date"
 msgstr "Modifier la date de fin de mise en attente"
 
@@ -13029,7 +13196,7 @@
 msgid "Change in Stock Value"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:885
+#: accounts/doctype/sales_invoice/sales_invoice.py:902
 msgid "Change the account type to Receivable or select a different account."
 msgstr "Changez le type de compte en recevable ou sélectionnez un autre compte."
 
@@ -13050,7 +13217,11 @@
 msgid "Changes"
 msgstr ""
 
-#: stock/doctype/item/item.js:235
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Changes in {0}"
+msgstr ""
+
+#: stock/doctype/item/item.js:277
 msgid "Changing Customer Group for the selected Customer is not allowed."
 msgstr "Le changement de Groupe de Clients n'est pas autorisé pour le Client sélectionné."
 
@@ -13060,12 +13231,12 @@
 msgid "Channel Partner"
 msgstr "Partenaire de Canal"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1634
-#: controllers/accounts_controller.py:2568
+#: accounts/doctype/payment_entry/payment_entry.py:1653
+#: controllers/accounts_controller.py:2653
 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:42
+#: accounts/report/account_balance/account_balance.js:41
 msgid "Chargeable"
 msgstr "Facturable"
 
@@ -13081,7 +13252,15 @@
 msgid "Charges Incurred"
 msgstr "Frais Afférents"
 
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges are updated in Purchase Receipt against each item"
+msgstr ""
+
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges will be distributed proportionately based on item qty or amount, as per your selection"
+msgstr ""
+
+#: selling/page/sales_funnel/sales_funnel.js:45
 msgid "Chart"
 msgstr "Graphique"
 
@@ -13109,10 +13288,10 @@
 msgid "Chart Tree"
 msgstr "Arbre à cartes"
 
-#: accounts/doctype/account/account.js:75
+#: accounts/doctype/account/account.js:70
 #: accounts/doctype/account/account_tree.js:5
-#: accounts/doctype/cost_center/cost_center_tree.js:35
-#: public/js/setup_wizard.js:36 setup/doctype/company/company.js:92
+#: accounts/doctype/cost_center/cost_center_tree.js:52
+#: public/js/setup_wizard.js:37 setup/doctype/company/company.js:96
 msgid "Chart of Accounts"
 msgstr "Plan comptable"
 
@@ -13148,7 +13327,7 @@
 msgid "Chart of Accounts Importer"
 msgstr "Importateur de plans de comptes"
 
-#: accounts/doctype/account/account_tree.js:133
+#: accounts/doctype/account/account_tree.js:181
 #: accounts/doctype/cost_center/cost_center.js:41
 msgid "Chart of Cost Centers"
 msgstr "Tableau des centres de coûts"
@@ -13159,7 +13338,7 @@
 msgid "Chart of Cost Centers"
 msgstr "Tableau des centres de coûts"
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:65
+#: manufacturing/report/work_order_summary/work_order_summary.js:64
 msgid "Charts Based On"
 msgstr "Graphiques basés sur"
 
@@ -13237,7 +13416,12 @@
 msgid "Checking this will round off the tax amount to the nearest integer"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:252
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:148
+msgid "Checkout"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:250
 msgid "Checkout Order / Submit Order / New Order"
 msgstr "Commander la commande / Valider la commande / Nouvelle commande"
 
@@ -13286,7 +13470,7 @@
 msgid "Cheque Width"
 msgstr "Largeur du Chèque"
 
-#: public/js/controllers/transaction.js:2061
+#: public/js/controllers/transaction.js:2104
 msgid "Cheque/Reference Date"
 msgstr "Chèque/Date de Référence"
 
@@ -13307,6 +13491,7 @@
 msgstr "Chèque/N° de Référence"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:131
+#: accounts/report/accounts_receivable/accounts_receivable.html:113
 msgid "Cheques Required"
 msgstr "Chèques requis"
 
@@ -13324,7 +13509,7 @@
 msgid "Child Task exists for this Task. You can not delete this Task."
 msgstr "Une tâche enfant existe pour cette tâche. Vous ne pouvez pas supprimer cette tâche."
 
-#: stock/doctype/warehouse/warehouse_tree.js:17
+#: stock/doctype/warehouse/warehouse_tree.js:21
 msgid "Child nodes can be only created under 'Group' type nodes"
 msgstr "Les noeuds enfants peuvent être créés uniquement dans les nœuds de type 'Groupe'"
 
@@ -13343,7 +13528,7 @@
 msgid "Circular Reference Error"
 msgstr "Erreur de référence circulaire"
 
-#: public/js/utils/contact_address_quick_entry.js:76
+#: public/js/utils/contact_address_quick_entry.js:79
 msgid "City"
 msgstr "Ville"
 
@@ -13371,12 +13556,27 @@
 msgid "Class / Percentage"
 msgstr "Classe / Pourcentage"
 
+#. Description of a DocType
+#: setup/doctype/territory/territory.json
+msgid "Classification of Customers by region"
+msgstr ""
+
 #. Label of a Text Editor field in DocType 'Bank Guarantee'
 #: accounts/doctype/bank_guarantee/bank_guarantee.json
 msgctxt "Bank Guarantee"
 msgid "Clauses and Conditions"
 msgstr "Clauses et conditions"
 
+#: public/js/utils/demo.js:11
+msgid "Clear Demo Data"
+msgstr ""
+
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Clear Notifications"
+msgstr ""
+
 #. Label of a Button field in DocType 'Holiday List'
 #: setup/doctype/holiday_list/holiday_list.json
 msgctxt "Holiday List"
@@ -13384,7 +13584,9 @@
 msgstr "Effacer le tableau"
 
 #: 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
+#: templates/form_grid/bank_reconciliation_grid.html:7
 msgid "Clearance Date"
 msgstr "Date de Compensation"
 
@@ -13424,11 +13626,11 @@
 msgid "Clearance Date"
 msgstr "Date de Compensation"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:115
+#: accounts/doctype/bank_clearance/bank_clearance.py:117
 msgid "Clearance Date not mentioned"
 msgstr "Date de Compensation non indiquée"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:113
+#: accounts/doctype/bank_clearance/bank_clearance.py:115
 msgid "Clearance Date updated"
 msgstr "Date de Compensation mise à jour"
 
@@ -13436,7 +13638,7 @@
 msgid "Clearing Demo Data..."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:535
+#: manufacturing/doctype/production_plan/production_plan.js:577
 msgid "Click on 'Get Finished Goods for Manufacture' to fetch the items from the above Sales Orders. Items only for which a BOM is present will be fetched."
 msgstr ""
 
@@ -13444,7 +13646,7 @@
 msgid "Click on Add to Holidays. This will populate the holidays table with all the dates that fall on the selected weekly off. Repeat the process for populating the dates for all your weekly holidays"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:530
+#: manufacturing/doctype/production_plan/production_plan.js:572
 msgid "Click on Get Sales Orders to fetch sales orders based on the above filters."
 msgstr ""
 
@@ -13459,6 +13661,10 @@
 msgid "Click on the link below to verify your email and confirm the appointment"
 msgstr "Cliquez sur le lien ci-dessous pour vérifier votre email et confirmer le rendez-vous"
 
+#: selling/page/point_of_sale/pos_item_cart.js:468
+msgid "Click to add email / phone"
+msgstr ""
+
 #. Option for the 'Lead Type' (Select) field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -13477,19 +13683,19 @@
 msgid "Client Secret"
 msgstr "Secret Client"
 
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order_list.js:30
-#: crm/doctype/opportunity/opportunity.js:108
-#: manufacturing/doctype/production_plan/production_plan.js:101
-#: manufacturing/doctype/work_order/work_order.js:559
-#: quality_management/doctype/quality_meeting/quality_meeting_list.js:8
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/doctype/sales_order/sales_order_list.js:45
-#: stock/doctype/delivery_note/delivery_note.js:209
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/doctype/issue/issue.js:17
+#: buying/doctype/purchase_order/purchase_order.js:327
+#: buying/doctype/purchase_order/purchase_order_list.js:49
+#: crm/doctype/opportunity/opportunity.js:118
+#: manufacturing/doctype/production_plan/production_plan.js:111
+#: manufacturing/doctype/work_order/work_order.js:589
+#: quality_management/doctype/quality_meeting/quality_meeting_list.js:7
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:588
+#: selling/doctype/sales_order/sales_order_list.js:58
+#: stock/doctype/delivery_note/delivery_note.js:248
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:112
+#: support/doctype/issue/issue.js:21
 msgid "Close"
 msgstr "Fermer"
 
@@ -13499,7 +13705,7 @@
 msgid "Close Issue After Days"
 msgstr "Nbre de jours avant de fermer le ticket"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:67
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:69
 msgid "Close Loan"
 msgstr "Prêt proche"
 
@@ -13509,17 +13715,18 @@
 msgid "Close Replied Opportunity After Days"
 msgstr "Fermer l'opportunité répliquée après des jours"
 
-#: selling/page/point_of_sale/pos_controller.js:178
+#: selling/page/point_of_sale/pos_controller.js:200
 msgid "Close the POS"
 msgstr "Clôturer le point de vente"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:6
-#: selling/doctype/sales_order/sales_order_list.js:7
-#: stock/doctype/delivery_note/delivery_note_list.js:8
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:8
-#: support/report/issue_analytics/issue_analytics.js:59
-#: support/report/issue_summary/issue_summary.js:47
+#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: selling/doctype/sales_order/sales_order_list.js:18
+#: stock/doctype/delivery_note/delivery_note_list.js:18
+#: 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
+#: templates/pages/task_info.html:76
 msgid "Closed"
 msgstr "Fermé"
 
@@ -13626,11 +13833,11 @@
 msgid "Closed Documents"
 msgstr "Documents fermés"
 
-#: manufacturing/doctype/work_order/work_order.py:1395
+#: manufacturing/doctype/work_order/work_order.py:1409
 msgid "Closed Work Order can not be stopped or Re-opened"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:420
+#: selling/doctype/sales_order/sales_order.py:423
 msgid "Closed order cannot be cancelled. Unclose to cancel."
 msgstr "Les commandes fermées ne peuvent être annulées. Réouvrir pour annuler."
 
@@ -13735,7 +13942,7 @@
 msgid "Code"
 msgstr ""
 
-#: public/js/setup_wizard.js:174
+#: public/js/setup_wizard.js:190
 msgid "Collapse All"
 msgstr "Tout réduire"
 
@@ -13803,10 +14010,15 @@
 msgid "Column in Bank File"
 msgstr "Colonne dans le fichier bancaire"
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:389
+msgid "Column {0}"
+msgstr ""
+
 #: accounts/doctype/payment_terms_template/payment_terms_template.py:40
 msgid "Combined invoice portion must equal 100%"
 msgstr ""
 
+#: templates/pages/task_info.html:86
 #: utilities/report/youtube_interactions/youtube_interactions.py:28
 msgid "Comments"
 msgstr "Commentaires"
@@ -13958,7 +14170,7 @@
 msgid "Communication Medium Type"
 msgstr "Type de support de communication"
 
-#: setup/install.py:111
+#: setup/install.py:92
 msgid "Compact Item Print"
 msgstr "Impression de l'Article Compacté"
 
@@ -13971,10 +14183,10 @@
 #. Name of a DocType
 #: accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js:8
 #: accounts/doctype/account/account_tree.js:12
-#: accounts/doctype/account/account_tree.js:149
-#: accounts/doctype/cost_center/cost_center_tree.js:8
-#: accounts/doctype/journal_entry/journal_entry.js:72
-#: accounts/report/account_balance/account_balance.js:9
+#: accounts/doctype/account/account_tree.js:212
+#: accounts/doctype/cost_center/cost_center_tree.js:9
+#: accounts/doctype/journal_entry/journal_entry.js:128
+#: accounts/report/account_balance/account_balance.js:8
 #: accounts/report/accounts_payable/accounts_payable.js:8
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:8
 #: accounts/report/accounts_receivable/accounts_receivable.js:10
@@ -13982,13 +14194,13 @@
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:8
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:8
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:8
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:8
-#: accounts/report/budget_variance_report/budget_variance_report.js:74
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:9
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:9
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:9
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:7
+#: accounts/report/budget_variance_report/budget_variance_report.js:72
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:8
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:8
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:8
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:80
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:9
+#: 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
@@ -13999,9 +14211,9 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:227
 #: 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/payment_ledger/payment_ledger.js:9
+#: 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:9
+#: accounts/report/pos_register/pos_register.js:8
 #: accounts/report/pos_register/pos_register.py:110
 #: accounts/report/profitability_analysis/profitability_analysis.js:8
 #: accounts/report/purchase_register/purchase_register.js:33
@@ -14009,78 +14221,79 @@
 #: accounts/report/sales_payment_summary/sales_payment_summary.js:22
 #: accounts/report/sales_register/sales_register.js:33
 #: accounts/report/share_ledger/share_ledger.py:58
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:9
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:9
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:9
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:8
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:8
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:8
 #: accounts/report/trial_balance/trial_balance.js:8
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:8
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:9
-#: assets/report/fixed_asset_register/fixed_asset_register.js:9
-#: buying/report/procurement_tracker/procurement_tracker.js:9
-#: buying/report/purchase_analytics/purchase_analytics.js:50
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:9
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:8
+#: assets/report/fixed_asset_register/fixed_asset_register.js:8
+#: 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/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:9
+#: 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/subcontract_order_summary/subcontract_order_summary.js:8
+#: 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:9
+#: crm/report/lead_details/lead_details.js:8
 #: crm/report/lead_details/lead_details.py:52
-#: crm/report/lost_opportunity/lost_opportunity.js:9
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:59
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:52
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:119
-#: manufacturing/doctype/bom_creator/bom_creator.js:52
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:9
-#: manufacturing/report/job_card_summary/job_card_summary.js:8
-#: manufacturing/report/process_loss_report/process_loss_report.js:8
-#: manufacturing/report/production_analytics/production_analytics.js:9
-#: manufacturing/report/production_planning_report/production_planning_report.js:9
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:8
-#: manufacturing/report/work_order_summary/work_order_summary.js:8
-#: projects/report/project_summary/project_summary.js:9
+#: crm/report/lost_opportunity/lost_opportunity.js:8
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:51
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:128
+#: manufacturing/doctype/bom_creator/bom_creator.js:51
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:2
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:8
+#: manufacturing/report/job_card_summary/job_card_summary.js:7
+#: manufacturing/report/process_loss_report/process_loss_report.js:7
+#: manufacturing/report/production_analytics/production_analytics.js:8
+#: manufacturing/report/production_planning_report/production_planning_report.js:8
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:7
+#: manufacturing/report/work_order_summary/work_order_summary.js:7
+#: projects/report/project_summary/project_summary.js:8
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:44
 #: public/js/financial_statements.js:153 public/js/purchase_trends_filters.js:8
-#: public/js/sales_trends_filters.js:55
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:28
+#: public/js/sales_trends_filters.js:51
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:27
 #: regional/report/irs_1099/irs_1099.js:8
-#: regional/report/uae_vat_201/uae_vat_201.js:9
-#: regional/report/vat_audit_report/vat_audit_report.js:9
-#: selling/page/point_of_sale/pos_controller.js:64
-#: selling/page/sales_funnel/sales_funnel.js:30
+#: regional/report/uae_vat_201/uae_vat_201.js:8
+#: regional/report/vat_audit_report/vat_audit_report.js:8
+#: selling/page/point_of_sale/pos_controller.js:72
+#: selling/page/sales_funnel/sales_funnel.js:33
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:16
 #: selling/report/customer_credit_balance/customer_credit_balance.js:8
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:9
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:8
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:114
 #: selling/report/lost_quotations/lost_quotations.js:8
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:9
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:8
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:46
-#: selling/report/sales_analytics/sales_analytics.js:50
-#: selling/report/sales_order_analysis/sales_order_analysis.js:9
+#: selling/report/sales_analytics/sales_analytics.js:57
+#: selling/report/sales_order_analysis/sales_order_analysis.js:8
 #: selling/report/sales_order_analysis/sales_order_analysis.py:343
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:35
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:9
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:34
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:9
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:33
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:8
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:33
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:8
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:9
-#: selling/report/territory_wise_sales/territory_wise_sales.js:17
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:8
+#: selling/report/territory_wise_sales/territory_wise_sales.js:18
 #: setup/doctype/company/company.json setup/doctype/company/company_tree.js:10
 #: setup/doctype/department/department_tree.js:10
 #: setup/doctype/employee/employee_tree.js:8
 #: stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.js:8
-#: stock/doctype/warehouse/warehouse_tree.js:10
+#: stock/doctype/warehouse/warehouse_tree.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:12
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:8
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:9
-#: stock/report/delayed_item_report/delayed_item_report.js:9
-#: stock/report/delayed_order_report/delayed_order_report.js:9
-#: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:8
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js: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_stock_value_report/incorrect_stock_value_report.js:8
-#: stock/report/item_shortage_report/item_shortage_report.js:9
+#: 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
 #: stock/report/product_bundle_balance/product_bundle_balance.py:115
 #: stock/report/reserved_stock/reserved_stock.js:8
@@ -14089,20 +14302,20 @@
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:73
 #: stock/report/serial_no_ledger/serial_no_ledger.py:37
 #: stock/report/stock_ageing/stock_ageing.js:8
-#: stock/report/stock_analytics/stock_analytics.js:42
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:8
+#: 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:466
+#: stock/report/stock_balance/stock_balance.py:474
 #: stock/report/stock_ledger/stock_ledger.js:8
-#: stock/report/stock_ledger/stock_ledger.py:268
+#: 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:9
-#: stock/report/total_stock_summary/total_stock_summary.js:18
+#: 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/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:9
-#: support/report/issue_analytics/issue_analytics.js:9
-#: support/report/issue_summary/issue_summary.js:9
+#: 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
 msgid "Company"
 msgstr "Société"
 
@@ -14560,6 +14773,12 @@
 msgid "Company"
 msgstr "Société"
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Company"
+msgstr "Société"
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -14854,7 +15073,7 @@
 msgid "Company Abbreviation"
 msgstr "Abréviation de la Société"
 
-#: public/js/setup_wizard.js:155
+#: public/js/setup_wizard.js:164
 msgid "Company Abbreviation cannot have more than 5 characters"
 msgstr "L'abréviation de l'entreprise ne peut pas comporter plus de 5 caractères"
 
@@ -15038,7 +15257,7 @@
 msgid "Company Name as per Imported Tally Data"
 msgstr "Nom de l'entreprise selon les données de pointage importées"
 
-#: public/js/setup_wizard.js:63
+#: public/js/setup_wizard.js:67
 msgid "Company Name cannot be Company"
 msgstr "Nom de la Société ne peut pas être Company"
 
@@ -15080,28 +15299,28 @@
 msgid "Company and Posting Date is mandatory"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2203
+#: accounts/doctype/sales_invoice/sales_invoice.py:2172
 msgid "Company currencies of both the companies should match for Inter Company Transactions."
 msgstr "Les devises des deux sociétés doivent correspondre pour les transactions inter-sociétés."
 
-#: stock/doctype/material_request/material_request.js:258
-#: stock/doctype/stock_entry/stock_entry.js:575
+#: stock/doctype/material_request/material_request.js:326
+#: stock/doctype/stock_entry/stock_entry.js:663
 msgid "Company field is required"
 msgstr "Le champ de l'entreprise est obligatoire"
 
-#: accounts/doctype/bank_account/bank_account.py:58
+#: accounts/doctype/bank_account/bank_account.py:72
 msgid "Company is mandatory for company account"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:413
-msgid "Company is mandatory was generating invoice. Please set default company in Global Defaults."
+#: accounts/doctype/subscription/subscription.py:412
+msgid "Company is mandatory for generating an invoice. Please set a default company in Global Defaults."
 msgstr ""
 
-#: setup/doctype/company/company.js:161
+#: setup/doctype/company/company.js:191
 msgid "Company name not same"
 msgstr "Le nom de la société n'est pas identique"
 
-#: assets/doctype/asset/asset.py:206
+#: assets/doctype/asset/asset.py:208
 msgid "Company of asset {0} and purchase document {1} doesn't matches."
 msgstr "La société de l'actif {0} et le document d'achat {1} ne correspondent pas."
 
@@ -15132,15 +15351,15 @@
 msgid "Company which internal supplier represents"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:80
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:85
 msgid "Company {0} already exists. Continuing will overwrite the Company and Chart of Accounts"
 msgstr "La société {0} existe déjà. Continuer écrasera la société et le plan comptable"
 
-#: accounts/doctype/account/account.py:443
+#: accounts/doctype/account/account.py:462
 msgid "Company {0} does not exist"
 msgstr "Société {0} n'existe pas"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:76
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:80
 msgid "Company {0} is added more than once"
 msgstr ""
 
@@ -15181,7 +15400,7 @@
 msgid "Competitor Name"
 msgstr ""
 
-#: public/js/utils/sales_common.js:417
+#: public/js/utils/sales_common.js:476
 msgid "Competitors"
 msgstr ""
 
@@ -15197,7 +15416,9 @@
 msgid "Competitors"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:61
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:67
+#: manufacturing/doctype/workstation/workstation_job_card.html:68
+#: public/js/projects/timer.js:32
 msgid "Complete"
 msgstr "Terminé"
 
@@ -15213,23 +15434,26 @@
 msgid "Complete"
 msgstr "Terminé"
 
-#: manufacturing/doctype/job_card/job_card.js:263
+#: manufacturing/doctype/job_card/job_card.js:296
 msgid "Complete Job"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Complete Order"
+msgstr ""
+
 #: accounts/doctype/subscription/subscription_list.js:8
 #: assets/doctype/asset_repair/asset_repair_list.js:7
-#: buying/doctype/purchase_order/purchase_order_list.js:24
+#: buying/doctype/purchase_order/purchase_order_list.js:43
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:9
 #: manufacturing/report/job_card_summary/job_card_summary.py:93
 #: manufacturing/report/work_order_summary/work_order_summary.py:151
 #: projects/doctype/timesheet/timesheet_list.js:13
 #: projects/report/project_summary/project_summary.py:95
-#: selling/doctype/sales_order/sales_order_list.js:12
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:9
-#: stock/doctype/delivery_note/delivery_note_list.js:14
+#: selling/doctype/sales_order/sales_order_list.js:23
+#: stock/doctype/delivery_note/delivery_note_list.js:24
 #: stock/doctype/material_request/material_request_list.js:13
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:25
 msgid "Completed"
 msgstr "Terminé"
 
@@ -15488,11 +15712,12 @@
 msgid "Completed Qty"
 msgstr "Quantité Terminée"
 
-#: manufacturing/doctype/work_order/work_order.py:885
+#: manufacturing/doctype/work_order/work_order.py:899
 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
 msgstr "La quantité terminée ne peut pas être supérieure à la `` quantité à fabriquer ''"
 
-#: manufacturing/doctype/job_card/job_card.js:277
+#: manufacturing/doctype/job_card/job_card.js:313
+#: manufacturing/doctype/workstation/workstation.js:199
 msgid "Completed Quantity"
 msgstr "Quantité terminée"
 
@@ -15627,7 +15852,7 @@
 msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained."
 msgstr "Configurez une action pour stopper la transaction ou alertez simplement su le prix unitaie n'est pas maintenu."
 
-#: buying/doctype/buying_settings/buying_settings.js:19
+#: buying/doctype/buying_settings/buying_settings.js:20
 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List."
 msgstr "Configurez la liste de prix par défaut lors de la création d'une nouvelle transaction d'achat. Les prix des articles seront extraits de cette liste de prix."
 
@@ -15637,12 +15862,12 @@
 msgid "Confirmation Date"
 msgstr "Date de Confirmation"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:37
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:45
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:43
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:51
 msgid "Connect to Quickbooks"
 msgstr "Se connecter à Quickbooks"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:59
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:65
 msgid "Connected to QuickBooks"
 msgstr "Connecté à QuickBooks"
 
@@ -15652,7 +15877,7 @@
 msgid "Connected to QuickBooks"
 msgstr "Connecté à QuickBooks"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:58
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:64
 msgid "Connecting to QuickBooks"
 msgstr "Connexion à QuickBooks"
 
@@ -15758,6 +15983,12 @@
 msgid "Connections"
 msgstr ""
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Connections"
+msgstr ""
+
 #: accounts/report/general_ledger/general_ledger.js:172
 msgid "Consider Accounting Dimensions"
 msgstr "Tenez compte des dimensions comptables"
@@ -15774,6 +16005,12 @@
 msgid "Consider Minimum Order Qty"
 msgstr ""
 
+#. Label of a Check field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Consider Rejected Warehouses"
+msgstr ""
+
 #. Label of a Select field in DocType 'Purchase Taxes and Charges'
 #: accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
 msgctxt "Purchase Taxes and Charges"
@@ -15871,7 +16108,7 @@
 msgid "Consumed Amount"
 msgstr "Montant Consommé"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:318
+#: assets/doctype/asset_capitalization/asset_capitalization.py:324
 msgid "Consumed Asset Items is mandatory for Decapitalization"
 msgstr ""
 
@@ -15942,7 +16179,7 @@
 msgid "Consumed Stock Items"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:321
+#: assets/doctype/asset_capitalization/asset_capitalization.py:327
 msgid "Consumed Stock Items or Consumed Asset Items is mandatory for Capitalization"
 msgstr ""
 
@@ -16477,9 +16714,9 @@
 msgid "Content Type"
 msgstr "Type de Contenu"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
-#: public/js/controllers/transaction.js:2074
-#: selling/doctype/quotation/quotation.js:344
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:157
+#: public/js/controllers/transaction.js:2117
+#: selling/doctype/quotation/quotation.js:356
 msgid "Continue"
 msgstr "Continuer"
 
@@ -16565,7 +16802,7 @@
 msgstr "Termes et conditions du contrat"
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:76
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:121
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:122
 msgid "Contribution %"
 msgstr ""
 
@@ -16576,10 +16813,14 @@
 msgstr ""
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:88
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:123
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
 msgid "Contribution Amount"
 msgstr "Montant de la contribution"
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:124
+msgid "Contribution Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Team'
 #: selling/doctype/sales_team/sales_team.json
 msgctxt "Sales Team"
@@ -16598,7 +16839,7 @@
 msgid "Control Historical Stock Transactions"
 msgstr "Controle de l'historique des stransaction de stock"
 
-#: public/js/utils.js:684
+#: public/js/utils.js:749
 msgid "Conversion Factor"
 msgstr "Facteur de Conversion"
 
@@ -16698,7 +16939,7 @@
 msgid "Conversion Factor"
 msgstr "Facteur de Conversion"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:86
+#: manufacturing/doctype/bom_creator/bom_creator.js:85
 msgid "Conversion Rate"
 msgstr "Taux de Conversion"
 
@@ -16724,7 +16965,7 @@
 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}"
 msgstr "Facteur de conversion de l'Unité de Mesure par défaut doit être 1 dans la ligne {0}"
 
-#: controllers/accounts_controller.py:2384
+#: controllers/accounts_controller.py:2476
 msgid "Conversion rate cannot be 0 or 1"
 msgstr "Le taux de conversion ne peut pas être égal à 0 ou 1"
 
@@ -16734,12 +16975,12 @@
 msgid "Convert Item Description to Clean HTML in Transactions"
 msgstr "Convertir les descriptions d'articles en HTML valide lors des transactions"
 
-#: accounts/doctype/account/account.js:106
-#: accounts/doctype/cost_center/cost_center.js:119
+#: accounts/doctype/account/account.js:107
+#: accounts/doctype/cost_center/cost_center.js:123
 msgid "Convert to Group"
 msgstr "Convertir en groupe"
 
-#: stock/doctype/warehouse/warehouse.js:61
+#: stock/doctype/warehouse/warehouse.js:58
 msgctxt "Warehouse"
 msgid "Convert to Group"
 msgstr "Convertir en groupe"
@@ -16748,17 +16989,17 @@
 msgid "Convert to Item Based Reposting"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.js:60
+#: stock/doctype/warehouse/warehouse.js:57
 msgctxt "Warehouse"
 msgid "Convert to Ledger"
 msgstr ""
 
-#: accounts/doctype/account/account.js:83
-#: accounts/doctype/cost_center/cost_center.js:116
+#: accounts/doctype/account/account.js:79
+#: accounts/doctype/cost_center/cost_center.js:121
 msgid "Convert to Non-Group"
 msgstr "Convertir en non-groupe"
 
-#: crm/report/lead_details/lead_details.js:41
+#: crm/report/lead_details/lead_details.js:40
 #: selling/page/sales_funnel/sales_funnel.py:58
 msgid "Converted"
 msgstr "Converti"
@@ -16805,11 +17046,11 @@
 msgid "Corrective Action"
 msgstr "Action corrective"
 
-#: manufacturing/doctype/job_card/job_card.js:146
+#: manufacturing/doctype/job_card/job_card.js:155
 msgid "Corrective Job Card"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:151
+#: manufacturing/doctype/job_card/job_card.js:162
 msgid "Corrective Operation"
 msgstr ""
 
@@ -16842,23 +17083,23 @@
 #: 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:1047
+#: accounts/report/accounts_receivable/accounts_receivable.py:1055
 #: 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:643
+#: accounts/report/general_ledger/general_ledger.py:656
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:300
 #: 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/trial_balance/trial_balance.js:49
-#: assets/report/fixed_asset_register/fixed_asset_register.js:30
+#: assets/report/fixed_asset_register/fixed_asset_register.js:29
 #: assets/report/fixed_asset_register/fixed_asset_register.py:461
-#: buying/report/procurement_tracker/procurement_tracker.js:16
+#: buying/report/procurement_tracker/procurement_tracker.js:15
 #: buying/report/procurement_tracker/procurement_tracker.py:32
-#: public/js/financial_statements.js:237
+#: public/js/financial_statements.js:246
 msgid "Cost Center"
 msgstr "Centre de coûts"
 
@@ -17234,7 +17475,7 @@
 msgid "Cost Center Allocation Percentages"
 msgstr ""
 
-#: public/js/utils/sales_common.js:383
+#: public/js/utils/sales_common.js:435
 msgid "Cost Center For Item with Item Code {0} has been Changed to {1}"
 msgstr ""
 
@@ -17244,7 +17485,7 @@
 msgid "Cost Center Name"
 msgstr "Nom du centre de coûts"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:25
+#: accounts/doctype/cost_center/cost_center_tree.js:38
 msgid "Cost Center Number"
 msgstr "Numéro du centre de coûts"
 
@@ -17263,8 +17504,8 @@
 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:1235
-#: stock/doctype/purchase_receipt/purchase_receipt.py:788
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1287
+#: stock/doctype/purchase_receipt/purchase_receipt.py:790
 msgid "Cost Center is required in row {0} in Taxes table for type {1}"
 msgstr "Le Centre de Coûts est requis à la ligne {0} dans le tableau des Taxes pour le type {1}"
 
@@ -17284,11 +17525,11 @@
 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:246
+#: assets/doctype/asset/asset.py:248
 msgid "Cost Center {} doesn't belong to Company {}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:253
+#: assets/doctype/asset/asset.py:255
 msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
 msgstr ""
 
@@ -17328,7 +17569,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:45
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:64
-#: accounts/report/account_balance/account_balance.js:44
+#: accounts/report/account_balance/account_balance.js:43
 msgid "Cost of Goods Sold"
 msgstr "Coût des marchandises vendues"
 
@@ -17440,11 +17681,11 @@
 msgid "Could not auto update shifts. Shift with shift factor {0} needed."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:737
+#: stock/doctype/delivery_note/delivery_note.py:798
 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
 msgstr "Impossible de créer une note de crédit automatiquement, décochez la case &quot;Emettre une note de crédit&quot; et soumettez à nouveau"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:339
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:355
 msgid "Could not detect the Company for updating Bank Accounts"
 msgstr ""
 
@@ -17466,10 +17707,6 @@
 msgid "Could not solve weighted score function. Make sure the formula is valid."
 msgstr "Impossible de résoudre la fonction de score pondéré. Assurez-vous que la formule est valide."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1030
-msgid "Could not update stock, invoice contains drop shipping item."
-msgstr "Impossible de mettre à jour de stock, facture contient un élément en livraison directe."
-
 #. Label of a Int field in DocType 'Shipment Parcel'
 #: stock/doctype/shipment_parcel/shipment_parcel.json
 msgctxt "Shipment Parcel"
@@ -17477,7 +17714,7 @@
 msgstr "Compter"
 
 #: crm/report/lead_details/lead_details.py:63
-#: public/js/utils/contact_address_quick_entry.js:86
+#: public/js/utils/contact_address_quick_entry.js:89
 msgid "Country"
 msgstr "Pays"
 
@@ -17576,6 +17813,12 @@
 msgid "Coupon Code"
 msgstr "Code de coupon"
 
+#. Label of a Link field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Coupon Code"
+msgstr "Code de coupon"
+
 #. Label of a Link field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
@@ -17606,147 +17849,149 @@
 msgid "Coupon Type"
 msgstr "Type de coupon"
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Cr"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:148
-#: accounts/doctype/account/account_tree.js:151
-#: accounts/doctype/dunning/dunning.js:54
-#: accounts/doctype/dunning/dunning.js:56
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:31
-#: accounts/doctype/journal_entry/journal_entry.js:85
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/pos_invoice/pos_invoice.js:51
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:97
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:103
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:114
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: accounts/doctype/account/account_tree.js:209
+#: accounts/doctype/account/account_tree.js:216
+#: accounts/doctype/dunning/dunning.js:55
+#: accounts/doctype/dunning/dunning.js:57
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:34
+#: accounts/doctype/journal_entry/journal_entry.js:139
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/pos_invoice/pos_invoice.js:55
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:127
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:189
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:609
-#: accounts/doctype/sales_invoice/sales_invoice.js:106
-#: accounts/doctype/sales_invoice/sales_invoice.js:108
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:134
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:225
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:654
+#: accounts/doctype/sales_invoice/sales_invoice.js:109
+#: accounts/doctype/sales_invoice/sales_invoice.js:110
 #: accounts/doctype/sales_invoice/sales_invoice.js:121
 #: accounts/doctype/sales_invoice/sales_invoice.js:122
-#: accounts/doctype/sales_invoice/sales_invoice.js:135
-#: accounts/doctype/sales_invoice/sales_invoice.js:142
-#: accounts/doctype/sales_invoice/sales_invoice.js:146
-#: accounts/doctype/sales_invoice/sales_invoice.js:157
-#: accounts/doctype/sales_invoice/sales_invoice.js:164
-#: accounts/doctype/sales_invoice/sales_invoice.js:184
-#: buying/doctype/purchase_order/purchase_order.js:94
-#: buying/doctype/purchase_order/purchase_order.js:310
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: buying/doctype/purchase_order/purchase_order.js:324
-#: buying/doctype/purchase_order/purchase_order.js:330
-#: buying/doctype/purchase_order/purchase_order.js:336
-#: buying/doctype/purchase_order/purchase_order.js:348
+#: accounts/doctype/sales_invoice/sales_invoice.js:136
+#: accounts/doctype/sales_invoice/sales_invoice.js:147
+#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:168
+#: 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/request_for_quotation/request_for_quotation.js:43
-#: buying/doctype/request_for_quotation/request_for_quotation.js:146
-#: buying/doctype/request_for_quotation/request_for_quotation.js:169
-#: buying/doctype/supplier/supplier.js:96
-#: buying/doctype/supplier/supplier.js:100
-#: buying/doctype/supplier_quotation/supplier_quotation.js:24
+#: 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:421
+#: 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
+#: buying/doctype/supplier/supplier.js:112
+#: buying/doctype/supplier/supplier.js:120
 #: buying/doctype/supplier_quotation/supplier_quotation.js:25
+#: buying/doctype/supplier_quotation/supplier_quotation.js:26
 #: buying/doctype/supplier_quotation/supplier_quotation.js:27
-#: crm/doctype/lead/lead.js:35 crm/doctype/lead/lead.js:38
+#: crm/doctype/lead/lead.js:31 crm/doctype/lead/lead.js:37
 #: crm/doctype/lead/lead.js:39 crm/doctype/lead/lead.js:41
-#: crm/doctype/lead/lead.js:220 crm/doctype/opportunity/opportunity.js:85
-#: crm/doctype/opportunity/opportunity.js:90
-#: crm/doctype/opportunity/opportunity.js:97
+#: crm/doctype/lead/lead.js:230 crm/doctype/opportunity/opportunity.js:85
+#: crm/doctype/opportunity/opportunity.js:93
 #: crm/doctype/opportunity/opportunity.js:103
-#: crm/doctype/prospect/prospect.js:12 crm/doctype/prospect/prospect.js:20
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:151
-#: manufacturing/doctype/blanket_order/blanket_order.js:31
-#: manufacturing/doctype/blanket_order/blanket_order.js:41
-#: manufacturing/doctype/blanket_order/blanket_order.js:53
-#: manufacturing/doctype/bom/bom.js:121 manufacturing/doctype/bom/bom.js:126
-#: manufacturing/doctype/bom/bom.js:132 manufacturing/doctype/bom/bom.js:135
-#: manufacturing/doctype/bom/bom.js:344
-#: manufacturing/doctype/bom_creator/bom_creator.js:93
-#: manufacturing/doctype/production_plan/production_plan.js:109
-#: manufacturing/doctype/production_plan/production_plan.js:115
-#: manufacturing/doctype/production_plan/production_plan.js:121
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/doctype/work_order/work_order.js:726
-#: projects/doctype/task/task_tree.js:77 public/js/communication.js:16
-#: public/js/communication.js:24 public/js/communication.js:30
-#: public/js/controllers/transaction.js:300
-#: public/js/controllers/transaction.js:301
-#: public/js/controllers/transaction.js:2188
-#: selling/doctype/customer/customer.js:165
-#: selling/doctype/quotation/quotation.js:119
-#: selling/doctype/quotation/quotation.js:129
-#: selling/doctype/sales_order/sales_order.js:548
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order.js:560
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order.js:570
-#: selling/doctype/sales_order/sales_order.js:571
-#: selling/doctype/sales_order/sales_order.js:576
-#: selling/doctype/sales_order/sales_order.js:581
-#: selling/doctype/sales_order/sales_order.js:582
-#: selling/doctype/sales_order/sales_order.js:587
-#: selling/doctype/sales_order/sales_order.js:599
-#: selling/doctype/sales_order/sales_order.js:605
-#: selling/doctype/sales_order/sales_order.js:606
-#: selling/doctype/sales_order/sales_order.js:608
-#: selling/doctype/sales_order/sales_order.js:739
-#: selling/doctype/sales_order/sales_order.js:847
-#: stock/doctype/delivery_note/delivery_note.js:89
-#: stock/doctype/delivery_note/delivery_note.js:90
-#: stock/doctype/delivery_note/delivery_note.js:104
-#: stock/doctype/delivery_note/delivery_note.js:167
-#: stock/doctype/delivery_note/delivery_note.js:172
-#: stock/doctype/delivery_note/delivery_note.js:176
-#: stock/doctype/delivery_note/delivery_note.js:181
-#: stock/doctype/delivery_note/delivery_note.js:190
-#: stock/doctype/delivery_note/delivery_note.js:196
-#: stock/doctype/delivery_note/delivery_note.js:223
-#: stock/doctype/item/item.js:105 stock/doctype/item/item.js:108
-#: stock/doctype/item/item.js:112 stock/doctype/item/item.js:449
-#: stock/doctype/item/item.js:651
-#: stock/doctype/material_request/material_request.js:114
-#: stock/doctype/material_request/material_request.js:120
-#: stock/doctype/material_request/material_request.js:123
-#: stock/doctype/material_request/material_request.js:128
-#: stock/doctype/material_request/material_request.js:133
-#: stock/doctype/material_request/material_request.js:138
-#: stock/doctype/material_request/material_request.js:143
+#: crm/doctype/opportunity/opportunity.js:112
+#: crm/doctype/prospect/prospect.js:15 crm/doctype/prospect/prospect.js:27
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:159
+#: manufacturing/doctype/blanket_order/blanket_order.js:34
+#: manufacturing/doctype/blanket_order/blanket_order.js:48
+#: manufacturing/doctype/blanket_order/blanket_order.js:64
+#: manufacturing/doctype/bom/bom.js:123 manufacturing/doctype/bom/bom.js:132
+#: manufacturing/doctype/bom/bom.js:142 manufacturing/doctype/bom/bom.js:146
+#: manufacturing/doctype/bom/bom.js:360
+#: manufacturing/doctype/bom_creator/bom_creator.js:92
+#: manufacturing/doctype/plant_floor/plant_floor.js:240
+#: manufacturing/doctype/production_plan/production_plan.js:125
+#: manufacturing/doctype/production_plan/production_plan.js:139
+#: manufacturing/doctype/production_plan/production_plan.js:146
+#: manufacturing/doctype/work_order/work_order.js:301
+#: manufacturing/doctype/work_order/work_order.js:782
+#: projects/doctype/task/task_tree.js:81 public/js/communication.js:19
+#: 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
+#: selling/doctype/customer/customer.js:176
+#: selling/doctype/quotation/quotation.js:125
+#: selling/doctype/quotation/quotation.js:134
+#: selling/doctype/sales_order/sales_order.js:601
+#: selling/doctype/sales_order/sales_order.js:621
+#: selling/doctype/sales_order/sales_order.js:626
+#: selling/doctype/sales_order/sales_order.js:635
+#: selling/doctype/sales_order/sales_order.js:647
+#: selling/doctype/sales_order/sales_order.js:652
+#: selling/doctype/sales_order/sales_order.js:661
+#: selling/doctype/sales_order/sales_order.js:670
+#: selling/doctype/sales_order/sales_order.js:675
+#: selling/doctype/sales_order/sales_order.js:681
+#: selling/doctype/sales_order/sales_order.js:698
+#: selling/doctype/sales_order/sales_order.js:711
+#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:715
+#: selling/doctype/sales_order/sales_order.js:853
+#: selling/doctype/sales_order/sales_order.js:992
+#: stock/doctype/delivery_note/delivery_note.js:91
+#: stock/doctype/delivery_note/delivery_note.js:93
+#: stock/doctype/delivery_note/delivery_note.js:112
+#: stock/doctype/delivery_note/delivery_note.js:185
+#: stock/doctype/delivery_note/delivery_note.js:195
+#: stock/doctype/delivery_note/delivery_note.js:204
+#: stock/doctype/delivery_note/delivery_note.js:214
+#: stock/doctype/delivery_note/delivery_note.js:228
+#: stock/doctype/delivery_note/delivery_note.js:234
+#: stock/doctype/delivery_note/delivery_note.js:270
+#: stock/doctype/item/item.js:135 stock/doctype/item/item.js:142
+#: stock/doctype/item/item.js:150 stock/doctype/item/item.js:517
+#: stock/doctype/item/item.js:725
+#: stock/doctype/material_request/material_request.js:117
+#: stock/doctype/material_request/material_request.js:126
+#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:140
 #: stock/doctype/material_request/material_request.js:148
-#: stock/doctype/material_request/material_request.js:153
 #: stock/doctype/material_request/material_request.js:156
-#: stock/doctype/material_request/material_request.js:314
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/pick_list/pick_list.js:104
-#: stock/doctype/purchase_receipt/purchase_receipt.js:78
-#: stock/doctype/purchase_receipt/purchase_receipt.js:79
-#: stock/doctype/purchase_receipt/purchase_receipt.js:88
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
-#: stock/doctype/purchase_receipt/purchase_receipt.js:234
-#: stock/doctype/stock_entry/stock_entry.js:146
-#: stock/doctype/stock_entry/stock_entry.js:147
-#: stock/doctype/stock_entry/stock_entry.js:217
-#: stock/doctype/stock_entry/stock_entry.js:1065
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:159
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:193
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:63
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
+#: stock/doctype/material_request/material_request.js:164
+#: stock/doctype/material_request/material_request.js:172
+#: stock/doctype/material_request/material_request.js:180
+#: stock/doctype/material_request/material_request.js:184
+#: stock/doctype/material_request/material_request.js:384
+#: stock/doctype/pick_list/pick_list.js:112
+#: stock/doctype/pick_list/pick_list.js:118
+#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/purchase_receipt/purchase_receipt.js:85
+#: stock/doctype/purchase_receipt/purchase_receipt.js:97
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
+#: stock/doctype/purchase_receipt/purchase_receipt.js:263
+#: stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: 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
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:169
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:202
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:212
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:74
-#: support/doctype/issue/issue.js:27
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:88
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:90
+#: support/doctype/issue/issue.js:34
 msgid "Create"
 msgstr "Créer"
 
-#: manufacturing/doctype/work_order/work_order.js:179
+#: manufacturing/doctype/work_order/work_order.js:190
 msgid "Create BOM"
 msgstr "Créer une nomenclature"
 
@@ -17756,14 +18001,18 @@
 msgid "Create Chart Of Accounts Based On"
 msgstr "Créer un Plan Comptable Basé Sur"
 
-#: stock/doctype/delivery_note/delivery_note_list.js:59
+#: stock/doctype/delivery_note/delivery_note_list.js:68
 msgid "Create Delivery Trip"
 msgstr "Créer un voyage de livraison"
 
-#: assets/doctype/asset/asset.js:122
+#: assets/doctype/asset/asset.js:154
 msgid "Create Depreciation Entry"
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:316
+msgid "Create Document"
+msgstr ""
+
 #: utilities/activation.py:138
 msgid "Create Employee"
 msgstr "Créer un employé"
@@ -17782,15 +18031,15 @@
 msgid "Create Grouped Asset"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:48
+#: accounts/doctype/journal_entry/journal_entry.js:96
 msgid "Create Inter Company Journal Entry"
 msgstr "Créer une entrée de journal inter-entreprises"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:45
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:49
 msgid "Create Invoices"
 msgstr "Créer des factures"
 
-#: manufacturing/doctype/work_order/work_order.js:152
+#: manufacturing/doctype/work_order/work_order.js:159
 msgid "Create Job Card"
 msgstr "Créer une carte de travail"
 
@@ -17800,7 +18049,7 @@
 msgid "Create Job Card based on Batch Size"
 msgstr ""
 
-#: accounts/doctype/share_transfer/share_transfer.js:20
+#: accounts/doctype/share_transfer/share_transfer.js:18
 msgid "Create Journal Entry"
 msgstr "Créer une entrée de journal"
 
@@ -17819,8 +18068,8 @@
 msgid "Create Ledger Entries for Change Amount"
 msgstr "Créer des écritures de grand livre pour modifier le montant"
 
-#: buying/doctype/supplier/supplier.js:191
-#: selling/doctype/customer/customer.js:236
+#: buying/doctype/supplier/supplier.js:224
+#: selling/doctype/customer/customer.js:257
 msgid "Create Link"
 msgstr ""
 
@@ -17830,45 +18079,45 @@
 msgid "Create Missing Party"
 msgstr "Créer les tiers manquants"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:150
+#: manufacturing/doctype/bom_creator/bom_creator.js:146
 msgid "Create Multi-level BOM"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:119
+#: public/js/call_popup/call_popup.js:122
 msgid "Create New Contact"
 msgstr "Créer un nouveau contact"
 
-#: public/js/call_popup/call_popup.js:124
+#: public/js/call_popup/call_popup.js:128
 msgid "Create New Customer"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:129
+#: public/js/call_popup/call_popup.js:134
 msgid "Create New Lead"
 msgstr "Créer une nouvelle lead"
 
 #. Title of an Onboarding Step
-#: crm/doctype/lead/lead.js:198
+#: crm/doctype/lead/lead.js:208
 #: crm/onboarding_step/create_opportunity/create_opportunity.json
 msgid "Create Opportunity"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:60
+#: selling/page/point_of_sale/pos_controller.js:67
 msgid "Create POS Opening Entry"
 msgstr "Créer une entrée d'ouverture de PDV"
 
-#: accounts/doctype/payment_order/payment_order.js:31
+#: accounts/doctype/payment_order/payment_order.js:39
 msgid "Create Payment Entries"
 msgstr "Créer des entrées de paiement"
 
-#: accounts/doctype/payment_request/payment_request.js:46
+#: accounts/doctype/payment_request/payment_request.js:58
 msgid "Create Payment Entry"
 msgstr "Créer une entrée de paiement"
 
-#: manufacturing/doctype/work_order/work_order.js:588
+#: manufacturing/doctype/work_order/work_order.js:627
 msgid "Create Pick List"
 msgstr "Créer une liste de choix"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Create Print Format"
 msgstr "Créer Format d'Impression"
 
@@ -17899,18 +18148,18 @@
 msgid "Create Receiver List"
 msgstr "Créer une Liste de Réception"
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:45
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:81
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:44
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:76
 msgid "Create Reposting Entries"
 msgstr ""
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:53
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:52
 msgid "Create Reposting Entry"
 msgstr ""
 
 #: projects/doctype/timesheet/timesheet.js:54
-#: projects/doctype/timesheet/timesheet.js:203
-#: projects/doctype/timesheet/timesheet.js:207
+#: projects/doctype/timesheet/timesheet.js:230
+#: projects/doctype/timesheet/timesheet.js:234
 msgid "Create Sales Invoice"
 msgstr "Créer une facture de vente"
 
@@ -17924,24 +18173,24 @@
 msgid "Create Sales Orders to help you plan your work and deliver on-time"
 msgstr "Créez des commandes pour vous aider à planifier votre travail et à livrer à temps"
 
-#: stock/doctype/stock_entry/stock_entry.js:346
+#: stock/doctype/stock_entry/stock_entry.js:399
 msgid "Create Sample Retention Stock Entry"
 msgstr "Créer un échantillon de stock de rétention"
 
-#: public/js/utils/serial_no_batch_selector.js:220
+#: public/js/utils/serial_no_batch_selector.js:223
 msgid "Create Serial Nos"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:271
-#: stock/doctype/material_request/material_request.js:376
+#: stock/dashboard/item_dashboard.js:279
+#: stock/doctype/material_request/material_request.js:446
 msgid "Create Stock Entry"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:153
+#: buying/doctype/request_for_quotation/request_for_quotation.js:163
 msgid "Create Supplier Quotation"
 msgstr "Créer une offre fournisseur"
 
-#: setup/doctype/company/company.js:110
+#: setup/doctype/company/company.js:130
 msgid "Create Tax Template"
 msgstr "Créer un modèle de taxe"
 
@@ -17969,11 +18218,11 @@
 msgid "Create Users"
 msgstr "Créer des utilisateurs"
 
-#: stock/doctype/item/item.js:647
+#: stock/doctype/item/item.js:721
 msgid "Create Variant"
 msgstr "Créer une variante"
 
-#: stock/doctype/item/item.js:495 stock/doctype/item/item.js:530
+#: stock/doctype/item/item.js:563 stock/doctype/item/item.js:597
 msgid "Create Variants"
 msgstr "Créer des variantes"
 
@@ -18080,7 +18329,7 @@
 msgid "Create an Item"
 msgstr ""
 
-#: stock/stock_ledger.py:1684
+#: stock/stock_ledger.py:1704
 msgid "Create an incoming stock transaction for the Item."
 msgstr "Créez une transaction de stock entrante pour l'article."
 
@@ -18137,7 +18386,7 @@
 msgid "Created {0} scorecards for {1} between:"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:126
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:140
 msgid "Creating Accounts..."
 msgstr "Création de comptes ..."
 
@@ -18145,11 +18394,11 @@
 msgid "Creating Company and Importing Chart of Accounts"
 msgstr "Création d'une société et importation d'un plan comptable"
 
-#: selling/doctype/sales_order/sales_order.js:912
+#: selling/doctype/sales_order/sales_order.js:1069
 msgid "Creating Delivery Note ..."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:137
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:143
 msgid "Creating Dimensions..."
 msgstr "Créer des dimensions ..."
 
@@ -18157,34 +18406,34 @@
 msgid "Creating Packing Slip ..."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:1026
+#: selling/doctype/sales_order/sales_order.js:1194
 msgid "Creating Purchase Order ..."
 msgstr "Création d'une commande d'achat ..."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: buying/doctype/purchase_order/purchase_order.js:414
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:709
+#: buying/doctype/purchase_order/purchase_order.js:482
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:71
 msgid "Creating Purchase Receipt ..."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:81
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:146
+#: buying/doctype/purchase_order/purchase_order.js:85
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:155
 msgid "Creating Stock Entry"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:429
+#: buying/doctype/purchase_order/purchase_order.js:497
 msgid "Creating Subcontracting Order ..."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:226
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:247
 msgid "Creating Subcontracting Receipt ..."
 msgstr ""
 
-#: setup/doctype/employee/employee.js:85
+#: setup/doctype/employee/employee.js:87
 msgid "Creating User..."
 msgstr ""
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:52
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:56
 msgid "Creating {0} Invoice"
 msgstr "Création de {0} facture"
 
@@ -18204,22 +18453,24 @@
 msgid "Creation Document No"
 msgstr "N° du Document de Création"
 
-#: utilities/bulk_transaction.py:173
+#: utilities/bulk_transaction.py:185
 msgid "Creation of <b><a href='/app/{0}'>{1}(s)</a></b> successful"
 msgstr ""
 
-#: utilities/bulk_transaction.py:190
+#: utilities/bulk_transaction.py:202
 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:181
+#: utilities/bulk_transaction.py:193
 msgid "Creation of {0} partially successful.\n"
 "\t\t\t\tCheck <b><a href=\"/app/bulk-transaction-log\">Bulk Transaction Log</a></b>"
 msgstr ""
 
 #: 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/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
@@ -18241,15 +18492,15 @@
 msgid "Credit"
 msgstr "Crédit"
 
-#: accounts/report/general_ledger/general_ledger.py:601
+#: accounts/report/general_ledger/general_ledger.py:614
 msgid "Credit (Transaction)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:578
+#: accounts/report/general_ledger/general_ledger.py:591
 msgid "Credit ({0})"
 msgstr "Crédit ({0})"
 
-#: accounts/doctype/journal_entry/journal_entry.js:536
+#: accounts/doctype/journal_entry/journal_entry.js:593
 msgid "Credit Account"
 msgstr "Compte créditeur"
 
@@ -18317,6 +18568,7 @@
 msgstr "Nombre de jours"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:49
+#: accounts/report/accounts_receivable/accounts_receivable.html:36
 #: selling/report/customer_credit_balance/customer_credit_balance.py:65
 msgid "Credit Limit"
 msgstr "Limite de crédit"
@@ -18351,7 +18603,7 @@
 msgid "Credit Limit"
 msgstr "Limite de crédit"
 
-#: selling/doctype/customer/customer.py:546
+#: selling/doctype/customer/customer.py:558
 msgid "Credit Limit Crossed"
 msgstr ""
 
@@ -18392,7 +18644,8 @@
 msgstr "Mois de crédit"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:173
-#: accounts/report/accounts_receivable/accounts_receivable.py:1070
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1078
 #: controllers/sales_and_purchase_return.py:328
 #: setup/setup_wizard/operations/install_fixtures.py:256
 #: stock/doctype/delivery_note/delivery_note.js:84
@@ -18419,10 +18672,11 @@
 msgstr "Note de crédit"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:200
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Credit Note Amount"
 msgstr "Montant de la note de crédit"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:254
+#: accounts/doctype/sales_invoice/sales_invoice.py:259
 msgid "Credit Note Issued"
 msgstr "Note de crédit émise"
 
@@ -18438,7 +18692,14 @@
 msgid "Credit Note Issued"
 msgstr "Note de crédit émise"
 
-#: stock/doctype/delivery_note/delivery_note.py:734
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+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
 msgid "Credit Note {0} has been created automatically"
 msgstr "La note de crédit {0} a été créée automatiquement"
 
@@ -18454,16 +18715,16 @@
 msgid "Credit in Company Currency"
 msgstr "Crédit dans la Devise de la Société"
 
-#: selling/doctype/customer/customer.py:512
-#: selling/doctype/customer/customer.py:566
+#: selling/doctype/customer/customer.py:524
+#: selling/doctype/customer/customer.py:579
 msgid "Credit limit has been crossed for customer {0} ({1}/{2})"
 msgstr "La limite de crédit a été dépassée pour le client {0} ({1} / {2})"
 
-#: selling/doctype/customer/customer.py:328
+#: selling/doctype/customer/customer.py:340
 msgid "Credit limit is already defined for the Company {0}"
 msgstr "La limite de crédit est déjà définie pour la société {0}."
 
-#: selling/doctype/customer/customer.py:565
+#: selling/doctype/customer/customer.py:578
 msgid "Credit limit reached for customer {0}"
 msgstr "Limite de crédit atteinte pour le client {0}"
 
@@ -18532,25 +18793,31 @@
 msgid "Criteria weights must add up to 100%"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/website_item_group/website_item_group.json
+msgid "Cross Listing of Item in multiple groups"
+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 "Seuil de transaction cumulatif"
 
-#: accounts/doctype/account/account_tree.js:121
+#: accounts/doctype/account/account_tree.js:166
 #: accounts/report/account_balance/account_balance.py:28
-#: accounts/report/accounts_receivable/accounts_receivable.py:1079
+#: 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/consolidated_financial_statement/consolidated_financial_statement.js:94
+#: 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/financial_statements.html:29
 #: accounts/report/financial_statements.py:631
 #: 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:644
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:650
 #: accounts/report/payment_ledger/payment_ledger.py:213
 #: accounts/report/profitability_analysis/profitability_analysis.py:175
 #: accounts/report/purchase_register/purchase_register.py:229
@@ -18559,12 +18826,12 @@
 #: 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
-#: manufacturing/doctype/bom_creator/bom_creator.js:77
-#: public/js/financial_statements.js:231 public/js/utils/unreconcile.js:63
+#: 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
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:72
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:85
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:137
 msgid "Currency"
 msgstr "Devise"
 
@@ -18852,12 +19119,12 @@
 msgid "Currency and Price List"
 msgstr "Devise et liste de prix"
 
-#: accounts/doctype/account/account.py:295
+#: accounts/doctype/account/account.py:314
 msgid "Currency can not be changed after making entries using some other currency"
 msgstr "Devise ne peut être modifiée après avoir fait des entrées en utilisant une autre devise"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1360
-#: accounts/doctype/payment_entry/payment_entry.py:1422 accounts/utils.py:2091
+#: accounts/doctype/payment_entry/payment_entry.py:1379
+#: accounts/doctype/payment_entry/payment_entry.py:1441 accounts/utils.py:2059
 msgid "Currency for {0} must be {1}"
 msgstr "Devise pour {0} doit être {1}"
 
@@ -19070,57 +19337,57 @@
 
 #. Name of a DocType
 #. Name of a role
-#: accounts/doctype/sales_invoice/sales_invoice.js:265
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
+#: 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/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:45
+#: 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/sales_register/sales_register.js:21
 #: accounts/report/sales_register/sales_register.py:185
-#: buying/doctype/supplier/supplier.js:162 crm/doctype/lead/lead.js:35
-#: crm/doctype/opportunity/opportunity.js:94 crm/doctype/prospect/prospect.js:7
+#: 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
-#: projects/doctype/timesheet/timesheet.js:195
+#: projects/doctype/timesheet/timesheet.js:222
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:45
-#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:42
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:22
+#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:39
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:21
 #: selling/doctype/customer/customer.json
 #: selling/doctype/sales_order/sales_order_calendar.js:18
-#: selling/page/point_of_sale/pos_item_cart.js:309
+#: selling/page/point_of_sale/pos_item_cart.js:307
 #: 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:8
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:7
 #: selling/report/inactive_customers/inactive_customers.py:78
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:48
+#: 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:38
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:37
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:19
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:41
 #: selling/report/sales_order_analysis/sales_order_analysis.py:230
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:42
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:40
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:32
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:54
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:53
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:32
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:42
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:40
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:53
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:53
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:64
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:65
 #: setup/doctype/customer_group/customer_group.json
 #: setup/doctype/territory/territory.json
-#: stock/doctype/delivery_note/delivery_note.js:359
-#: stock/doctype/stock_entry/stock_entry.js:300
-#: stock/report/delayed_item_report/delayed_item_report.js:37
+#: stock/doctype/delivery_note/delivery_note.js:405
+#: stock/doctype/stock_entry/stock_entry.js:342
+#: stock/report/delayed_item_report/delayed_item_report.js:36
 #: stock/report/delayed_item_report/delayed_item_report.py:117
-#: stock/report/delayed_order_report/delayed_order_report.js:37
+#: stock/report/delayed_order_report/delayed_order_report.js:36
 #: stock/report/delayed_order_report/delayed_order_report.py:46
-#: support/report/issue_analytics/issue_analytics.js:70
+#: support/report/issue_analytics/issue_analytics.js:69
 #: support/report/issue_analytics/issue_analytics.py:37
-#: support/report/issue_summary/issue_summary.js:58
+#: support/report/issue_summary/issue_summary.js:57
 #: support/report/issue_summary/issue_summary.py:34
 msgid "Customer"
 msgstr "Client"
@@ -19489,7 +19756,7 @@
 msgid "Customer Code"
 msgstr "Code Client"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1027
+#: accounts/report/accounts_receivable/accounts_receivable.py:1035
 msgid "Customer Contact"
 msgstr "Contact client"
 
@@ -19569,11 +19836,11 @@
 msgstr "Retour d'Expérience Client"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:118
-#: accounts/report/accounts_receivable/accounts_receivable.py:1097
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:99
+#: accounts/report/accounts_receivable/accounts_receivable.js:121
+#: accounts/report/accounts_receivable/accounts_receivable.py:1105
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:102
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:188
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
+#: 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/item_wise_sales_register/item_wise_sales_register.py:208
@@ -19582,10 +19849,10 @@
 #: public/js/sales_trends_filters.js:26
 #: selling/report/inactive_customers/inactive_customers.py:81
 #: 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:31
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:30
 #: setup/doctype/customer_group/customer_group.json
-#: stock/report/delayed_item_report/delayed_item_report.js:43
-#: stock/report/delayed_order_report/delayed_order_report.js:43
+#: stock/report/delayed_item_report/delayed_item_report.js:42
+#: stock/report/delayed_order_report/delayed_order_report.js:42
 msgid "Customer Group"
 msgstr "Groupe de clients"
 
@@ -19748,7 +20015,7 @@
 msgid "Customer Group Name"
 msgstr "Nom du Groupe Client"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1197
+#: accounts/report/accounts_receivable/accounts_receivable.py:1205
 msgid "Customer Group: {0} does not exist"
 msgstr ""
 
@@ -19769,11 +20036,12 @@
 msgid "Customer Items"
 msgstr "Articles du clients"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1088
+#: accounts/report/accounts_receivable/accounts_receivable.py:1096
 msgid "Customer LPO"
 msgstr "Commande client locale"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:182
+#: accounts/report/accounts_receivable/accounts_receivable.html:152
 msgid "Customer LPO No."
 msgstr "N° de commande client locale"
 
@@ -19790,9 +20058,9 @@
 msgid "Customer Mobile No"
 msgstr "N° de Portable du Client"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1034
+#: accounts/report/accounts_receivable/accounts_receivable.py:1042
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:92
+#: 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
@@ -19944,7 +20212,7 @@
 msgid "Customer PO Details"
 msgstr "Détails de la Commande d'Achat client"
 
-#: public/js/utils/contact_address_quick_entry.js:92
+#: public/js/utils/contact_address_quick_entry.js:95
 msgid "Customer POS Id"
 msgstr "ID PDV du Client"
 
@@ -19991,7 +20259,7 @@
 msgid "Customer Provided"
 msgstr "Client fourni"
 
-#: setup/doctype/company/company.py:359
+#: setup/doctype/company/company.py:358
 msgid "Customer Service"
 msgstr "Service Client"
 
@@ -20019,7 +20287,7 @@
 msgid "Customer Warehouse (Optional)"
 msgstr "Entrepôt des Clients (Facultatif)"
 
-#: selling/page/point_of_sale/pos_item_cart.js:924
+#: selling/page/point_of_sale/pos_item_cart.js:956
 msgid "Customer contact updated successfully."
 msgstr "Contact client mis à jour avec succès."
 
@@ -20042,9 +20310,9 @@
 msgid "Customer required for 'Customerwise Discount'"
 msgstr "Client requis pour appliquer une 'Remise en fonction du Client'"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:986
-#: selling/doctype/sales_order/sales_order.py:335
-#: stock/doctype/delivery_note/delivery_note.py:354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1003
+#: selling/doctype/sales_order/sales_order.py:338
+#: stock/doctype/delivery_note/delivery_note.py:408
 msgid "Customer {0} does not belong to project {1}"
 msgstr "Le Client {0} ne fait pas parti du projet {1}"
 
@@ -20206,7 +20474,7 @@
 msgid "DUNN-.MM.-.YY.-"
 msgstr "DUNN-.MM .-. AA.-"
 
-#: public/js/stock_analytics.js:51
+#: public/js/stock_analytics.js:81
 msgid "Daily"
 msgstr "Quotidien"
 
@@ -20315,7 +20583,7 @@
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:15
 msgid "Data Based On"
 msgstr ""
 
@@ -20336,17 +20604,19 @@
 msgid "Data exported from Tally that consists of the Chart of Accounts, Customers, Suppliers, Addresses, Items and UOMs"
 msgstr "Données exportées à partir de Tally comprenant le plan comptable, les clients, les fournisseurs, les adresses, les articles et les UdM"
 
-#: accounts/doctype/journal_entry/journal_entry.js:542
+#: accounts/doctype/journal_entry/journal_entry.js:603
 #: 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:16
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:37
+#: accounts/report/account_balance/account_balance.js:15
+#: accounts/report/accounts_receivable/accounts_receivable.html:132
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:38
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:26
+#: accounts/report/general_ledger/general_ledger.html:27
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:26
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:22
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:38
-#: accounts/report/share_balance/share_balance.js:10
-#: accounts/report/share_ledger/share_ledger.js:10
+#: 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
@@ -20354,12 +20624,12 @@
 #: 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
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:19
-#: public/js/bank_reconciliation_tool/data_table_manager.js:40
+#: public/js/bank_reconciliation_tool/data_table_manager.js:39
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:34
 #: selling/report/sales_order_analysis/sales_order_analysis.py:220
 #: stock/report/product_bundle_balance/product_bundle_balance.js:8
 #: stock/report/reserved_stock/reserved_stock.py:89
-#: stock/report/stock_ledger/stock_ledger.py:107
+#: stock/report/stock_ledger/stock_ledger.py:180
 #: support/report/first_response_time_for_issues/first_response_time_for_issues.py:11
 #: support/report/support_hour_distribution/support_hour_distribution.py:68
 msgid "Date"
@@ -20539,7 +20809,7 @@
 msgid "Date "
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:98
+#: assets/report/fixed_asset_register/fixed_asset_register.js:97
 msgid "Date Based On"
 msgstr "Date basée sur"
 
@@ -20576,7 +20846,7 @@
 msgid "Date of Commencement"
 msgstr "Date de démarrage"
 
-#: setup/doctype/company/company.js:70
+#: setup/doctype/company/company.js:69
 msgid "Date of Commencement should be greater than Date of Incorporation"
 msgstr "La date de démarrage doit être postérieure à la date de constitution"
 
@@ -20604,7 +20874,7 @@
 msgid "Date of Joining"
 msgstr "Date d'Embauche"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:265
 msgid "Date of Transaction"
 msgstr "Date de transaction"
 
@@ -20709,7 +20979,7 @@
 msgid "Days Since Last Order"
 msgstr "Jours depuis la dernière commande"
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:35
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:34
 msgid "Days Since Last order"
 msgstr "Jours depuis la dernière commande"
 
@@ -20742,12 +21012,14 @@
 msgid "Dear"
 msgstr "Cher/Chère"
 
-#: stock/reorder_item.py:285
+#: stock/reorder_item.py:370
 msgid "Dear System Manager,"
 msgstr "Cher Administrateur Système ,"
 
 #: 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/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
@@ -20769,15 +21041,15 @@
 msgid "Debit"
 msgstr "Débit"
 
-#: accounts/report/general_ledger/general_ledger.py:594
+#: accounts/report/general_ledger/general_ledger.py:607
 msgid "Debit (Transaction)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:572
+#: accounts/report/general_ledger/general_ledger.py:585
 msgid "Debit ({0})"
 msgstr "Débit ({0})"
 
-#: accounts/doctype/journal_entry/journal_entry.js:530
+#: accounts/doctype/journal_entry/journal_entry.js:583
 msgid "Debit Account"
 msgstr "Compte de débit"
 
@@ -20812,10 +21084,11 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:175
-#: accounts/report/accounts_receivable/accounts_receivable.py:1073
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1081
 #: controllers/sales_and_purchase_return.py:332
 #: setup/setup_wizard/operations/install_fixtures.py:257
-#: stock/doctype/purchase_receipt/purchase_receipt.js:73
+#: stock/doctype/purchase_receipt/purchase_receipt.js:76
 msgid "Debit Note"
 msgstr "Note de débit"
 
@@ -20833,6 +21106,7 @@
 msgstr "Note de débit"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:202
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Debit Note Amount"
 msgstr "Montant de la note de débit"
 
@@ -20842,6 +21116,13 @@
 msgid "Debit Note Issued"
 msgstr "Notes de Débit Émises"
 
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Debit Note will update it's own outstanding amount, even if \"Return Against\" is specified."
+msgstr ""
+
 #. Label of a Link field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -20854,11 +21135,11 @@
 msgid "Debit To"
 msgstr "Débit Pour"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
 msgid "Debit To is required"
 msgstr "Compte de Débit Requis"
 
-#: accounts/general_ledger.py:465
+#: accounts/general_ledger.py:474
 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
 msgstr "Débit et Crédit non égaux pour {0} # {1}. La différence est de {2}."
 
@@ -20898,7 +21179,7 @@
 msgid "Decapitalized"
 msgstr ""
 
-#: public/js/utils/sales_common.js:444
+#: public/js/utils/sales_common.js:503
 msgid "Declare Lost"
 msgstr "Déclarer perdu"
 
@@ -21030,15 +21311,15 @@
 msgid "Default BOM ({0}) must be active for this item or its template"
 msgstr "Nomenclature par défaut ({0}) doit être actif pour ce produit ou son modèle"
 
-#: manufacturing/doctype/work_order/work_order.py:1234
+#: manufacturing/doctype/work_order/work_order.py:1248
 msgid "Default BOM for {0} not found"
 msgstr "Nomenclature par défaut {0} introuvable"
 
-#: controllers/accounts_controller.py:3216
+#: controllers/accounts_controller.py:3307
 msgid "Default BOM not found for FG Item {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1231
+#: manufacturing/doctype/work_order/work_order.py:1245
 msgid "Default BOM not found for Item {0} and Project {1}"
 msgstr "La nomenclature par défaut n'a pas été trouvée pour l'Article {0} et le Projet {1}"
 
@@ -21496,11 +21777,11 @@
 msgid "Default Unit of Measure"
 msgstr "Unité de Mesure par Défaut"
 
-#: stock/doctype/item/item.py:1233
+#: stock/doctype/item/item.py:1234
 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:1216
+#: stock/doctype/item/item.py:1217
 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 "L’Unité de Mesure par Défaut pour l’Article {0} ne peut pas être modifiée directement parce que vous avez déjà fait une (des) transaction (s) avec une autre unité de mesure. Vous devez créer un nouvel article pour utiliser une UdM par défaut différente."
 
@@ -21587,7 +21868,12 @@
 msgid "Default account will be automatically updated in POS Invoice when this mode is selected."
 msgstr "Le compte par défaut sera automatiquement mis à jour dans la facture de point de vente lorsque ce mode est sélectionné."
 
-#: setup/doctype/company/company.js:133
+#. Description of a DocType
+#: stock/doctype/stock_settings/stock_settings.json
+msgid "Default settings for your stock-related transactions"
+msgstr ""
+
+#: setup/doctype/company/company.js:160
 msgid "Default tax templates for sales, purchase and items are created."
 msgstr ""
 
@@ -21768,7 +22054,7 @@
 msgid "Delayed Tasks Summary"
 msgstr ""
 
-#: setup/doctype/company/company.js:176
+#: setup/doctype/company/company.js:207
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -21778,21 +22064,39 @@
 msgid "Delete Accounting and Stock Ledger Entries on deletion of Transaction"
 msgstr ""
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Bins"
+msgstr ""
+
 #. Label of a Check field in DocType 'Repost Accounting Ledger'
 #: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
 msgctxt "Repost Accounting Ledger"
 msgid "Delete Cancelled Ledger Entries"
 msgstr ""
 
-#: stock/doctype/inventory_dimension/inventory_dimension.js:50
+#: stock/doctype/inventory_dimension/inventory_dimension.js:66
 msgid "Delete Dimension"
 msgstr ""
 
-#: setup/doctype/company/company.js:117
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Leads and Addresses"
+msgstr ""
+
+#: setup/doctype/company/company.js:141
 msgid "Delete Transactions"
 msgstr "Supprimer les transactions"
 
-#: setup/doctype/company/company.js:176
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Transactions"
+msgstr "Supprimer les transactions"
+
+#: setup/doctype/company/company.js:206
 msgid "Delete all the Transactions for this Company"
 msgstr "Supprimer toutes les transactions pour cette société"
 
@@ -21802,12 +22106,16 @@
 msgid "Deleted Documents"
 msgstr "Documents Supprimés"
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:489
+msgid "Deletion in Progress!"
+msgstr ""
+
 #: regional/__init__.py:14
 msgid "Deletion is not permitted for country {0}"
 msgstr "La suppression n'est pas autorisée pour le pays {0}"
 
-#: buying/doctype/purchase_order/purchase_order.js:297
-#: buying/doctype/purchase_order/purchase_order_list.js:10
+#: 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
 msgid "Delivered"
@@ -21920,7 +22228,7 @@
 msgid "Delivery"
 msgstr "Livraison"
 
-#: public/js/utils.js:678
+#: public/js/utils.js:742 selling/doctype/sales_order/sales_order.js:1012
 #: selling/report/sales_order_analysis/sales_order_analysis.py:321
 msgid "Delivery Date"
 msgstr "Date de livraison"
@@ -21953,17 +22261,17 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:281
-#: accounts/doctype/sales_invoice/sales_invoice_list.js:27
+#: 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
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order_list.js:57
+#: selling/doctype/sales_order/sales_order.js:619
+#: selling/doctype/sales_order/sales_order_list.js:70
 #: stock/doctype/delivery_note/delivery_note.json
-#: stock/doctype/delivery_trip/delivery_trip.js:51
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/delivery_trip/delivery_trip.js:52
+#: stock/doctype/pick_list/pick_list.js:110
+#: stock/doctype/purchase_receipt/purchase_receipt.js:90
 msgid "Delivery Note"
 msgstr "Bon de livraison"
 
@@ -22079,16 +22387,16 @@
 msgid "Delivery Note Trends"
 msgstr "Tendance des Bordereaux de Livraisons"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1148
+#: accounts/doctype/sales_invoice/sales_invoice.py:1155
 msgid "Delivery Note {0} is not submitted"
 msgstr "Bon de Livraison {0} n'est pas soumis"
 
-#: stock/doctype/pick_list/pick_list.py:885
+#: stock/doctype/pick_list/pick_list.py:1005
 msgid "Delivery Note(s) created for the Pick List"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1092
-#: stock/doctype/delivery_trip/delivery_trip.js:67
+#: accounts/report/accounts_receivable/accounts_receivable.py:1100
+#: stock/doctype/delivery_trip/delivery_trip.js:72
 msgid "Delivery Notes"
 msgstr "Bons de livraison"
 
@@ -22135,7 +22443,7 @@
 msgstr "Livraison à"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:180
+#: stock/doctype/delivery_note/delivery_note.js:210
 #: stock/doctype/delivery_trip/delivery_trip.json
 msgid "Delivery Trip"
 msgstr "Service de Livraison"
@@ -22167,7 +22475,7 @@
 msgid "Delivery to"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:351
+#: selling/doctype/sales_order/sales_order.py:354
 msgid "Delivery warehouse required for stock item {0}"
 msgstr "Entrepôt de Livraison requis pour article du stock {0}"
 
@@ -22286,7 +22594,7 @@
 msgid "Depends on Tasks"
 msgstr "Dépend des Tâches"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:61
+#: public/js/bank_reconciliation_tool/data_table_manager.js:60
 msgid "Deposit"
 msgstr ""
 
@@ -22328,7 +22636,7 @@
 
 #: 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:45
+#: accounts/report/account_balance/account_balance.js:44
 #: accounts/report/cash_flow/cash_flow.py:129
 msgid "Depreciation"
 msgstr "Amortissement"
@@ -22347,7 +22655,7 @@
 msgstr "Amortissement"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:149
-#: assets/doctype/asset/asset.js:241
+#: assets/doctype/asset/asset.js:276
 msgid "Depreciation Amount"
 msgstr "Montant d'Amortissement"
 
@@ -22410,7 +22718,7 @@
 msgid "Depreciation Expense Account"
 msgstr "Compte de Dotations aux Amortissement"
 
-#: assets/doctype/asset/depreciation.py:390
+#: assets/doctype/asset/depreciation.py:388
 msgid "Depreciation Expense Account should be an Income or Expense Account."
 msgstr ""
 
@@ -22444,19 +22752,19 @@
 msgid "Depreciation Posting Date"
 msgstr "Date comptable de l'amortissement"
 
-#: assets/doctype/asset/asset.js:661
+#: assets/doctype/asset/asset.js:780
 msgid "Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:491
+#: assets/doctype/asset/asset.py:493
 msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
 msgstr "Ligne d'amortissement {0}: la valeur attendue après la durée de vie utile doit être supérieure ou égale à {1}"
 
-#: assets/doctype/asset/asset.py:460
+#: assets/doctype/asset/asset.py:462
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date"
 msgstr "Ligne d'amortissement {0}: La date d'amortissement suivante ne peut pas être antérieure à la date de mise en service"
 
-#: assets/doctype/asset/asset.py:451
+#: assets/doctype/asset/asset.py:453
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date"
 msgstr "Ligne d'amortissement {0}: la date d'amortissement suivante ne peut pas être antérieure à la date d'achat"
 
@@ -22491,7 +22799,7 @@
 msgid "Depreciation Schedule View"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:347
+#: assets/doctype/asset/asset.py:349
 msgid "Depreciation cannot be calculated for fully depreciated assets"
 msgstr ""
 
@@ -22501,12 +22809,15 @@
 #: 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
+#: manufacturing/doctype/bom/bom_item_preview.html:12
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:58
+#: 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:56
-#: public/js/controllers/transaction.js:2138
-#: selling/doctype/quotation/quotation.js:279
+#: public/js/bank_reconciliation_tool/data_table_manager.js:55
+#: public/js/controllers/transaction.js:2181
+#: 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
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:26
@@ -22517,7 +22828,7 @@
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:59
 #: stock/report/product_bundle_balance/product_bundle_balance.py:112
 #: stock/report/stock_ageing/stock_ageing.py:126
-#: stock/report/stock_ledger/stock_ledger.py:187
+#: 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
@@ -23083,7 +23394,7 @@
 msgid "Desk User"
 msgstr ""
 
-#: public/js/utils/sales_common.js:423
+#: public/js/utils/sales_common.js:482
 msgid "Detailed Reason"
 msgstr "Raison détaillée"
 
@@ -23099,6 +23410,10 @@
 msgid "Detailed Reason"
 msgstr "Raison détaillée"
 
+#: templates/pages/task_info.html:49
+msgid "Details"
+msgstr "Détails"
+
 #. Label of a Long Text field in DocType 'Appointment'
 #: crm/doctype/appointment/appointment.json
 msgctxt "Appointment"
@@ -23159,6 +23474,12 @@
 msgid "Details"
 msgstr "Détails"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Details"
+msgstr "Détails"
+
 #. Label of a Select field in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
 msgctxt "Accounts Settings"
@@ -23172,7 +23493,7 @@
 msgstr ""
 
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:175
-#: public/js/bank_reconciliation_tool/number_card.js:31
+#: 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
 msgid "Difference"
@@ -23202,7 +23523,7 @@
 msgid "Difference (Dr - Cr)"
 msgstr "Écart (Dr - Cr )"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:287
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:294
 msgid "Difference Account"
 msgstr "Compte d’Écart"
 
@@ -23231,15 +23552,15 @@
 msgid "Difference Account"
 msgstr "Compte d’Écart"
 
-#: stock/doctype/stock_entry/stock_entry.py:573
+#: stock/doctype/stock_entry/stock_entry.py:528
 msgid "Difference Account must be a Asset/Liability type account, since this Stock Entry is an Opening Entry"
 msgstr "Le compte d'écart doit être un compte de type actif / passif, car cette entrée de stock est une entrée d'ouverture."
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:714
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:768
 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"
 msgstr "Le Compte d’Écart doit être un compte de type Actif / Passif, puisque cette Réconciliation de Stock est une écriture d'à-nouveau"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:301
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:309
 msgid "Difference Amount"
 msgstr "Écart de Montant"
 
@@ -23303,7 +23624,7 @@
 msgid "Difference Value"
 msgstr "Valeur de différence"
 
-#: stock/doctype/delivery_note/delivery_note.js:366
+#: stock/doctype/delivery_note/delivery_note.js:414
 msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
 msgstr ""
 
@@ -23323,7 +23644,7 @@
 msgid "Dimension Details"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:94
+#: accounts/report/budget_variance_report/budget_variance_report.js:92
 msgid "Dimension Filter"
 msgstr "Filtre de dimension"
 
@@ -23493,7 +23814,7 @@
 msgstr "Désactiver le sélecteur de numéro de lot/série"
 
 #: selling/report/customer_credit_balance/customer_credit_balance.py:70
-#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:8
+#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:16
 #: stock/doctype/putaway_rule/putaway_rule_list.js:5
 msgid "Disabled"
 msgstr "Desactivé"
@@ -23642,19 +23963,19 @@
 msgid "Disabled"
 msgstr "Desactivé"
 
-#: accounts/general_ledger.py:128
+#: accounts/general_ledger.py:132
 msgid "Disabled Account Selected"
 msgstr ""
 
-#: stock/utils.py:454
+#: stock/utils.py:449
 msgid "Disabled Warehouse {0} cannot be used for this transaction."
 msgstr ""
 
-#: controllers/accounts_controller.py:550
+#: controllers/accounts_controller.py:594
 msgid "Disabled pricing rules since this {} is an internal transfer"
 msgstr ""
 
-#: controllers/accounts_controller.py:564
+#: controllers/accounts_controller.py:608
 msgid "Disabled tax included prices since this {} is an internal transfer"
 msgstr ""
 
@@ -23669,11 +23990,11 @@
 msgid "Disables auto-fetching of existing quantity"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:62
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:64
 msgid "Disburse Loan"
 msgstr "Prêt à débourser"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:12
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
 msgid "Disbursed"
 msgstr "Décaissé"
 
@@ -23683,7 +24004,8 @@
 msgid "Disbursed"
 msgstr "Décaissé"
 
-#: selling/page/point_of_sale/pos_item_cart.js:380
+#: selling/page/point_of_sale/pos_item_cart.js:387
+#: templates/form_grid/item_grid.html:71
 msgid "Discount"
 msgstr "Remise"
 
@@ -23949,7 +24271,7 @@
 msgid "Discount and Margin"
 msgstr "Remise et Marge"
 
-#: selling/page/point_of_sale/pos_item_cart.js:761
+#: selling/page/point_of_sale/pos_item_cart.js:791
 msgid "Discount cannot be greater than 100%"
 msgstr ""
 
@@ -23957,7 +24279,7 @@
 msgid "Discount must be less than 100"
 msgstr "La remise doit être inférieure à 100"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2532
+#: accounts/doctype/payment_entry/payment_entry.py:2561
 msgid "Discount of {} applied as per Payment Term"
 msgstr ""
 
@@ -24043,7 +24365,7 @@
 msgid "Dislikes"
 msgstr "N'aime pas"
 
-#: setup/doctype/company/company.py:353
+#: setup/doctype/company/company.py:352
 msgid "Dispatch"
 msgstr "Envoi"
 
@@ -24151,6 +24473,11 @@
 msgid "Distinct Item and Warehouse"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/serial_no/serial_no.json
+msgid "Distinct unit of an Item"
+msgstr ""
+
 #. Label of a Select field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
@@ -24197,7 +24524,7 @@
 msgid "Divorced"
 msgstr "Divorcé"
 
-#: crm/report/lead_details/lead_details.js:42
+#: crm/report/lead_details/lead_details.js:41
 msgid "Do Not Contact"
 msgstr "Ne Pas Contacter"
 
@@ -24219,6 +24546,12 @@
 msgid "Do Not Explode"
 msgstr "Ne pas décomposer"
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Do Not Update Serial / Batch on Creation of Auto Bundle"
+msgstr ""
+
 #. Description of the 'Hide Currency Symbol' (Select) field in DocType 'Global
 #. Defaults'
 #: setup/doctype/global_defaults/global_defaults.json
@@ -24232,29 +24565,49 @@
 msgid "Do not update variants on save"
 msgstr "Ne pas mettre à jour les variantes lors de la sauvegarde"
 
-#: assets/doctype/asset/asset.js:683
+#: assets/doctype/asset/asset.js:800
 msgid "Do you really want to restore this scrapped asset?"
 msgstr "Voulez-vous vraiment restaurer cet actif mis au rebut ?"
 
-#: assets/doctype/asset/asset.js:669
+#: assets/doctype/asset/asset.js:788
 msgid "Do you really want to scrap this asset?"
 msgstr "Voulez-vous vraiment mettre cet actif au rebut ?"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:134
+#: public/js/controllers/transaction.js:978
+msgid "Do you want to clear the selected {0}?"
+msgstr ""
+
+#: stock/doctype/delivery_trip/delivery_trip.js:155
 msgid "Do you want to notify all the customers by email?"
 msgstr "Voulez-vous informer tous les clients par courriel?"
 
-#: manufacturing/doctype/production_plan/production_plan.js:196
+#: manufacturing/doctype/production_plan/production_plan.js:221
 msgid "Do you want to submit the material request"
 msgstr "Voulez-vous valider la demande de matériel"
 
+#. Label of a Data field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocField"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "DocType"
+msgstr ""
+
+#. Label of a Link field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocType"
+msgstr ""
+
 #. Label of a Link field in DocType 'Transaction Deletion Record Item'
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgctxt "Transaction Deletion Record Item"
 msgid "DocType"
 msgstr ""
 
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:45
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:69
 msgid "DocTypes should not be added manually to the 'Excluded DocTypes' table. You are only allowed to remove entries from it."
 msgstr ""
 
@@ -24273,9 +24626,9 @@
 msgstr ""
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:141
-#: manufacturing/report/production_planning_report/production_planning_report.js:43
+#: manufacturing/report/production_planning_report/production_planning_report.js:42
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:102
-#: public/js/bank_reconciliation_tool/dialog_manager.js:104
+#: public/js/bank_reconciliation_tool/dialog_manager.js:111
 msgid "Document Name"
 msgstr "Nom du Document"
 
@@ -24293,15 +24646,15 @@
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:134
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:100
-#: public/js/bank_reconciliation_tool/dialog_manager.js:99
-#: public/js/bank_reconciliation_tool/dialog_manager.js:182
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:16
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:15
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:23
+#: public/js/bank_reconciliation_tool/dialog_manager.js:106
+#: public/js/bank_reconciliation_tool/dialog_manager.js:186
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:14
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:22
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:14
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:14
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:22
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:14
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:23
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:22
 msgid "Document Type"
 msgstr "Type de Document"
 
@@ -24347,11 +24700,11 @@
 msgid "Document Type "
 msgstr "Type de document"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:56
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:60
 msgid "Document Type already used as a dimension"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.js:64
+#: accounts/doctype/bank_transaction/bank_transaction.js:59
 msgid "Document {0} successfully uncleared"
 msgstr "Document {0} non effacé avec succès"
 
@@ -24361,7 +24714,7 @@
 msgid "Documents"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:200
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:202
 msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
 msgstr ""
 
@@ -24398,7 +24751,13 @@
 #: 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
-#: public/js/utils/crm_activities.js:211
+#: public/js/utils/crm_activities.js:212
+msgid "Done"
+msgstr ""
+
+#. Label of a Check field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
 msgid "Done"
 msgstr ""
 
@@ -24434,8 +24793,8 @@
 msgid "Double Declining Balance"
 msgstr "Double Solde Dégressif"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:84
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:93
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:27
 msgid "Download"
 msgstr "Télécharger"
 
@@ -24444,7 +24803,7 @@
 msgid "Download Backups"
 msgstr "Télécharger les Sauvegardes"
 
-#: public/js/utils/serial_no_batch_selector.js:237
+#: public/js/utils/serial_no_batch_selector.js:241
 msgid "Download CSV Template"
 msgstr ""
 
@@ -24460,11 +24819,11 @@
 msgid "Download Materials Request Plan Section"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:60
+#: buying/doctype/request_for_quotation/request_for_quotation.js:70
 msgid "Download PDF"
 msgstr "Télécharger au Format PDF"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:31
 msgid "Download Template"
 msgstr "Télécharger le Modèle"
 
@@ -24520,18 +24879,17 @@
 msgid "Downtime Reason"
 msgstr "Raison du temps d'arrêt"
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Dr"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:6
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:5
 #: accounts/doctype/payment_request/payment_request_list.js:5
-#: assets/doctype/asset/asset_list.js:35
+#: assets/doctype/asset/asset_list.js:25
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:5
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:7
-#: stock/doctype/stock_entry/stock_entry_list.js:10
+#: stock/doctype/stock_entry/stock_entry_list.js:18
 msgid "Draft"
 msgstr "Brouillon"
 
@@ -24728,13 +25086,6 @@
 msgid "Draft"
 msgstr "Brouillon"
 
-#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
-#. Record'
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-msgctxt "Transaction Deletion Record"
-msgid "Draft"
-msgstr "Brouillon"
-
 #. Option for the 'Status' (Select) field in DocType 'Work Order'
 #: manufacturing/doctype/work_order/work_order.json
 msgctxt "Work Order"
@@ -24833,7 +25184,7 @@
 msgid "Due / Reference Date cannot be after {0}"
 msgstr "Date d’échéance / de référence ne peut pas être après le {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.js:649
+#: accounts/doctype/payment_entry/payment_entry.js:795
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:40
 msgid "Due Date"
 msgstr "Date d'Échéance"
@@ -24915,14 +25266,14 @@
 msgid "Due Date cannot be before Posting / Supplier Invoice Date"
 msgstr "La date d'échéance ne peut pas être antérieure à la date de comptabilisation / facture fournisseur"
 
-#: controllers/accounts_controller.py:576
+#: controllers/accounts_controller.py:628
 msgid "Due Date is mandatory"
 msgstr "La Date d’Échéance est obligatoire"
 
 #. Name of a DocType
 #. Label of a Card Break in the Receivables Workspace
 #: accounts/doctype/dunning/dunning.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:164
 #: accounts/workspace/receivables/receivables.json
 msgid "Dunning"
 msgstr "Relance"
@@ -24999,7 +25350,7 @@
 msgid "Dunning Type"
 msgstr "Type de relance"
 
-#: stock/doctype/item/item.js:135 stock/doctype/putaway_rule/putaway_rule.py:55
+#: stock/doctype/item/item.js:178 stock/doctype/putaway_rule/putaway_rule.py:55
 msgid "Duplicate"
 msgstr "Dupliquer"
 
@@ -25015,7 +25366,7 @@
 msgid "Duplicate Entry. Please check Authorization Rule {0}"
 msgstr "Écriture en double. Merci de vérifier la Règle d’Autorisation {0}"
 
-#: assets/doctype/asset/asset.py:301
+#: assets/doctype/asset/asset.py:303
 msgid "Duplicate Finance Book"
 msgstr ""
 
@@ -25028,7 +25379,7 @@
 msgid "Duplicate POS Invoices found"
 msgstr ""
 
-#: projects/doctype/project/project.js:67
+#: projects/doctype/project/project.js:74
 msgid "Duplicate Project with Tasks"
 msgstr "Projet en double avec tâches"
 
@@ -25044,7 +25395,7 @@
 msgid "Duplicate item group found in the item group table"
 msgstr "Groupe d’articles en double trouvé dans la table des groupes d'articles"
 
-#: projects/doctype/project/project.js:146
+#: projects/doctype/project/project.js:174
 msgid "Duplicate project has been created"
 msgstr "Un projet en double a été créé"
 
@@ -25145,7 +25496,7 @@
 msgid "Earliest"
 msgstr "Au plus tôt"
 
-#: stock/report/stock_balance/stock_balance.py:478
+#: stock/report/stock_balance/stock_balance.py:486
 msgid "Earliest Age"
 msgstr "Âge le plus précoce"
 
@@ -25159,6 +25510,14 @@
 msgid "Edit"
 msgstr "modifier"
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.html:37
+msgid "Edit Capacity"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Edit Cart"
+msgstr ""
+
 #: public/js/utils/serial_no_batch_selector.js:30
 msgid "Edit Full Form"
 msgstr "Ouvrir le formulaire complet"
@@ -25167,11 +25526,11 @@
 msgid "Edit Not Allowed"
 msgstr "Modification non autorisée"
 
-#: public/js/utils/crm_activities.js:182
+#: public/js/utils/crm_activities.js:184
 msgid "Edit Note"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.js:370
+#: stock/doctype/delivery_note/delivery_note.js:418
 msgid "Edit Posting Date and Time"
 msgstr "Modifier la Date et l'Heure de la Publication"
 
@@ -25229,15 +25588,15 @@
 msgid "Edit Posting Date and Time"
 msgstr "Modifier la Date et l'Heure de la Publication"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:366
+#: public/js/bom_configurator/bom_configurator.bundle.js:405
 msgid "Edit Qty"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:238
+#: selling/page/point_of_sale/pos_past_order_summary.js:247
 msgid "Edit Receipt"
 msgstr "Modifier le reçu"
 
-#: selling/page/point_of_sale/pos_item_cart.js:717
+#: selling/page/point_of_sale/pos_item_cart.js:745
 msgid "Editing {0} is not allowed as per POS Profile settings"
 msgstr ""
 
@@ -25253,7 +25612,7 @@
 msgid "Educational Qualification"
 msgstr "Qualification pour l'Éducation"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
 msgid "Either 'Selling' or 'Buying' must be selected"
 msgstr ""
 
@@ -25307,9 +25666,9 @@
 msgid "Electronic Invoice Register"
 msgstr "Registre de facture électronique"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:231
+#: 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:874
+#: selling/page/point_of_sale/pos_item_cart.js:904
 msgid "Email"
 msgstr ""
 
@@ -25463,7 +25822,7 @@
 msgid "Email Group"
 msgstr "Groupe Email"
 
-#: public/js/utils/contact_address_quick_entry.js:39
+#: public/js/utils/contact_address_quick_entry.js:42
 msgid "Email Id"
 msgstr "Identifiant Email"
 
@@ -25491,7 +25850,7 @@
 msgid "Email Sent"
 msgstr "Email Envoyé"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:289
+#: buying/doctype/request_for_quotation/request_for_quotation.py:313
 msgid "Email Sent to Supplier {0}"
 msgstr "E-mail envoyé au fournisseur {0}"
 
@@ -25519,15 +25878,15 @@
 msgid "Email Template"
 msgstr "Modèle d&#39;email"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:269
+#: selling/page/point_of_sale/pos_past_order_summary.js:278
 msgid "Email not sent to {0} (unsubscribed / disabled)"
 msgstr "Email pas envoyé à {0} (désabonné / désactivé)"
 
-#: stock/doctype/shipment/shipment.js:153
+#: stock/doctype/shipment/shipment.js:174
 msgid "Email or Phone/Mobile of the Contact are mandatory to continue."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:273
+#: selling/page/point_of_sale/pos_past_order_summary.js:283
 msgid "Email sent successfully."
 msgstr "E-mail envoyé avec succès."
 
@@ -25577,7 +25936,7 @@
 #: projects/doctype/timesheet/timesheet_calendar.js:28
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:27
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:10
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:50
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:45
 #: quality_management/doctype/non_conformance/non_conformance.json
 #: setup/doctype/company/company.json setup/doctype/employee/employee.json
 #: setup/doctype/sales_person/sales_person_tree.js:7
@@ -25780,7 +26139,7 @@
 msgid "Empty"
 msgstr "Vide"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1042
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1044
 msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
 msgstr ""
 
@@ -25818,6 +26177,12 @@
 msgid "Enable Common Party Accounting"
 msgstr "Activer la comptabilité des tiers communs"
 
+#. Label of a Check field in DocType 'Selling Settings'
+#: selling/doctype/selling_settings/selling_settings.json
+msgctxt "Selling Settings"
+msgid "Enable Cut-Off Date on Bulk Delivery Note Creation"
+msgstr ""
+
 #. Label of a Check field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
@@ -25890,6 +26255,13 @@
 msgid "Enable YouTube Tracking"
 msgstr "Activer le suivi YouTube"
 
+#. Description of the 'Consider Rejected Warehouses' (Check) field in DocType
+#. 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Enable it if users want to consider rejected materials to dispatch."
+msgstr ""
+
 #: support/doctype/service_level_agreement/service_level_agreement.js:34
 msgid "Enable to apply SLA on every {0}"
 msgstr ""
@@ -25969,14 +26341,14 @@
 msgid "Encashment Date"
 msgstr "Date de l'Encaissement"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:41
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:41
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:49
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:49
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:23
-#: accounts/report/payment_ledger/payment_ledger.js:24
-#: assets/report/fixed_asset_register/fixed_asset_register.js:75
+#: accounts/report/payment_ledger/payment_ledger.js:23
+#: assets/report/fixed_asset_register/fixed_asset_register.js:74
 #: projects/report/project_summary/project_summary.py:74
-#: public/js/financial_statements.js:191 public/js/setup_wizard.js:42
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:24
+#: public/js/financial_statements.js:200 public/js/setup_wizard.js:44
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:23
 #: templates/pages/projects.html:47
 msgid "End Date"
 msgstr "Date de Fin"
@@ -26045,6 +26417,10 @@
 msgid "End Date cannot be before Start Date."
 msgstr "La date de fin ne peut pas être antérieure à la date de début."
 
+#: manufacturing/doctype/workstation/workstation.js:206
+msgid "End Time"
+msgstr "Heure de Fin"
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -26069,15 +26445,15 @@
 msgid "End Time"
 msgstr "Heure de Fin"
 
-#: stock/doctype/stock_entry/stock_entry.js:241
+#: stock/doctype/stock_entry/stock_entry.js:268
 msgid "End Transit"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
 #: accounts/report/financial_ratios/financial_ratios.js:25
-#: assets/report/fixed_asset_register/fixed_asset_register.js:90
-#: public/js/financial_statements.js:206
+#: assets/report/fixed_asset_register/fixed_asset_register.js:89
+#: public/js/financial_statements.js:215
 msgid "End Year"
 msgstr "Année de Fin"
 
@@ -26085,7 +26461,7 @@
 msgid "End Year cannot be before Start Year"
 msgstr "L'Année de Fin ne peut pas être avant l'Année de Début"
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:43
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:48
 #: accounts/doctype/process_deferred_accounting/process_deferred_accounting.py:37
 msgid "End date cannot be before start date"
 msgstr "La date de fin ne peut pas être antérieure à la date de début"
@@ -26109,6 +26485,8 @@
 msgid "End of the current subscription period"
 msgstr ""
 
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:13
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:23
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:31
 msgid "Enough Parts to Build"
 msgstr "Pièces Suffisantes pour Construire"
@@ -26123,27 +26501,29 @@
 msgid "Enter API key in Google Settings."
 msgstr "Entrez la clé API dans les paramètres Google."
 
-#: setup/doctype/employee/employee.js:102
+#: setup/doctype/employee/employee.js:103
 msgid "Enter First and Last name of Employee, based on Which Full Name will be updated. IN transactions, it will be Full Name which will be fetched."
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:208
+#: public/js/utils/serial_no_batch_selector.js:211
 msgid "Enter Serial Nos"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:313
+#: stock/doctype/material_request/material_request.js:383
 msgid "Enter Supplier"
 msgstr "Entrez le fournisseur"
 
-#: manufacturing/doctype/job_card/job_card.js:280
+#: manufacturing/doctype/job_card/job_card.js:320
+#: manufacturing/doctype/workstation/workstation.js:189
+#: manufacturing/doctype/workstation/workstation.js:236
 msgid "Enter Value"
 msgstr "Entrez une Valeur"
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:91
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:96
 msgid "Enter Visit Details"
 msgstr ""
 
-#: manufacturing/doctype/routing/routing.js:77
+#: manufacturing/doctype/routing/routing.js:78
 msgid "Enter a name for Routing."
 msgstr ""
 
@@ -26155,31 +26535,31 @@
 msgid "Enter a name for this Holiday List."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:499
+#: selling/page/point_of_sale/pos_payment.js:527
 msgid "Enter amount to be redeemed."
 msgstr "Entrez le montant à utiliser."
 
-#: stock/doctype/item/item.js:804
+#: stock/doctype/item/item.js:882
 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:877
+#: selling/page/point_of_sale/pos_item_cart.js:907
 msgid "Enter customer's email"
 msgstr "Entrez l'e-mail du client"
 
-#: selling/page/point_of_sale/pos_item_cart.js:882
+#: selling/page/point_of_sale/pos_item_cart.js:913
 msgid "Enter customer's phone number"
 msgstr "Entrez le numéro de téléphone du client"
 
-#: assets/doctype/asset/asset.py:345
+#: assets/doctype/asset/asset.py:347
 msgid "Enter depreciation details"
 msgstr "Veuillez entrer les détails de l'amortissement"
 
-#: selling/page/point_of_sale/pos_item_cart.js:382
+#: selling/page/point_of_sale/pos_item_cart.js:389
 msgid "Enter discount percentage."
 msgstr "Entrez le pourcentage de remise."
 
-#: public/js/utils/serial_no_batch_selector.js:211
+#: public/js/utils/serial_no_batch_selector.js:214
 msgid "Enter each serial no in a new line"
 msgstr ""
 
@@ -26193,7 +26573,7 @@
 msgid "Enter the Bank Guarantee Number before submitting."
 msgstr ""
 
-#: manufacturing/doctype/routing/routing.js:82
+#: manufacturing/doctype/routing/routing.js:83
 msgid "Enter the Operation, the table will fetch the Operation details like Hourly Rate, Workstation automatically.\n\n"
 " After that, set the Operation Time in minutes and the table will calculate the Operation Costs based on the Hourly Rate and Operation Time."
 msgstr ""
@@ -26206,19 +26586,19 @@
 msgid "Enter the name of the bank or lending institution before submitting."
 msgstr ""
 
-#: stock/doctype/item/item.js:824
+#: stock/doctype/item/item.js:908
 msgid "Enter the opening stock units."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:730
+#: manufacturing/doctype/bom/bom.js:761
 msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:817
+#: manufacturing/doctype/work_order/work_order.js:878
 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:392
+#: selling/page/point_of_sale/pos_payment.js:411
 msgid "Enter {0} amount."
 msgstr "Saisissez le montant de {0}."
 
@@ -26233,7 +26613,7 @@
 msgid "Entity"
 msgstr "Entité"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:203
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:123
 msgid "Entity Type"
 msgstr "Type d'entité"
@@ -26258,8 +26638,8 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:102
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:150
-#: accounts/report/account_balance/account_balance.js:30
-#: accounts/report/account_balance/account_balance.js:46
+#: accounts/report/account_balance/account_balance.js:29
+#: accounts/report/account_balance/account_balance.js:45
 #: accounts/report/balance_sheet/balance_sheet.py:242
 #: setup/setup_wizard/operations/install_fixtures.py:259
 msgid "Equity"
@@ -26284,8 +26664,8 @@
 msgid "Equity/Liability Account"
 msgstr "Compte de capitaux propres / passif"
 
-#: accounts/doctype/payment_request/payment_request.py:410
-#: manufacturing/doctype/job_card/job_card.py:773
+#: 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
 msgid "Error"
 msgstr "Erreur"
@@ -26350,6 +26730,16 @@
 msgid "Error Log"
 msgstr "Journal des Erreurs"
 
+#. Label of a Long Text field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Error Log"
+msgstr "Journal des Erreurs"
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+msgid "Error Message"
+msgstr "Message d&#39;erreur"
+
 #. Label of a Text field in DocType 'Period Closing Voucher'
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgctxt "Period Closing Voucher"
@@ -26372,7 +26762,7 @@
 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:406
+#: assets/doctype/asset/depreciation.py:404
 msgid "Error while posting depreciation entries"
 msgstr ""
 
@@ -26380,11 +26770,15 @@
 msgid "Error while processing deferred accounting for {0}"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:389
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:404
 msgid "Error while reposting item valuation"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:720
+#: templates/includes/footer/footer_extension.html:29
+msgid "Error: Not a valid id?"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.js:883
 msgid "Error: {0} is mandatory field"
 msgstr "Erreur: {0} est un champ obligatoire"
 
@@ -26452,7 +26846,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 "Exemple: ABCD. #####. Si le masque est définie et que le numéro de lot n'est pas mentionné dans les transactions, un numéro de lot sera automatiquement créé en avec ce masque. Si vous préferez mentionner explicitement et systématiquement le numéro de lot pour cet article, laissez ce champ vide. Remarque: ce paramètre aura la priorité sur le préfixe du masque dans les paramètres de stock."
 
-#: stock/stock_ledger.py:1976
+#: stock/stock_ledger.py:1983
 msgid "Example: Serial No {0} reserved in {1}."
 msgstr ""
 
@@ -26462,11 +26856,11 @@
 msgid "Exception Budget Approver Role"
 msgstr "Rôle d'approbateur de budget exceptionnel"
 
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:56
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:55
 msgid "Excess Materials Consumed"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:869
+#: manufacturing/doctype/job_card/job_card.py:876
 msgid "Excess Transfer"
 msgstr ""
 
@@ -26490,7 +26884,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:517
+#: setup/doctype/company/company.py:516
 msgid "Exchange Gain/Loss"
 msgstr "Profits / Pertes sur Change"
 
@@ -26512,8 +26906,8 @@
 msgid "Exchange Gain/Loss"
 msgstr "Profits / Pertes sur Change"
 
-#: controllers/accounts_controller.py:1313
-#: controllers/accounts_controller.py:1394
+#: controllers/accounts_controller.py:1382
+#: controllers/accounts_controller.py:1463
 msgid "Exchange Gain/Loss amount has been booked through {0}"
 msgstr ""
 
@@ -26697,7 +27091,7 @@
 msgid "Excise Entry"
 msgstr "Écriture d'Accise"
 
-#: stock/doctype/stock_entry/stock_entry.js:1060
+#: stock/doctype/stock_entry/stock_entry.js:1213
 msgid "Excise Invoice"
 msgstr "Facture d'Accise"
 
@@ -26746,9 +27140,9 @@
 msgid "Exit Interview Held On"
 msgstr "Entretien de sortie tenu le"
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:138
-#: public/js/bom_configurator/bom_configurator.bundle.js:179
-#: public/js/setup_wizard.js:168
+#: public/js/bom_configurator/bom_configurator.bundle.js:140
+#: public/js/bom_configurator/bom_configurator.bundle.js:183
+#: public/js/setup_wizard.js:181
 msgid "Expand All"
 msgstr "Développer Tout"
 
@@ -26806,11 +27200,13 @@
 msgid "Expected Delivery Date"
 msgstr "Date de livraison prévue"
 
-#: selling/doctype/sales_order/sales_order.py:316
+#: selling/doctype/sales_order/sales_order.py:319
 msgid "Expected Delivery Date should be after Sales Order Date"
 msgstr "La Date de Livraison Prévue doit être après la Date indiquée sur la Commande Client"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:44
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:104
+#: templates/pages/task_info.html:64
 msgid "Expected End Date"
 msgstr "Date de fin prévue"
 
@@ -26836,7 +27232,7 @@
 msgid "Expected End Date should be less than or equal to parent task's Expected End Date {0}."
 msgstr ""
 
-#: public/js/projects/timer.js:12
+#: public/js/projects/timer.js:16
 msgid "Expected Hrs"
 msgstr "Heures prévues"
 
@@ -26846,7 +27242,9 @@
 msgid "Expected Hrs"
 msgstr "Heures prévues"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:40
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:98
+#: templates/pages/task_info.html:59
 msgid "Expected Start Date"
 msgstr "Date de début prévue"
 
@@ -26896,8 +27294,8 @@
 msgid "Expected Value After Useful Life"
 msgstr "Valeur Attendue Après Utilisation Complète"
 
-#: accounts/report/account_balance/account_balance.js:29
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:81
+#: 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/profitability_analysis/profitability_analysis.py:189
 msgid "Expense"
@@ -26928,11 +27326,11 @@
 msgid "Expense"
 msgstr "Charges"
 
-#: controllers/stock_controller.py:359
+#: controllers/stock_controller.py:541
 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
 msgstr "Compte de Charge / d'Écart ({0}) doit être un Compte «de Résultat»"
 
-#: accounts/report/account_balance/account_balance.js:47
+#: accounts/report/account_balance/account_balance.js:46
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:248
 msgid "Expense Account"
 msgstr "Compte de Charge"
@@ -27015,7 +27413,7 @@
 msgid "Expense Account"
 msgstr "Compte de Charge"
 
-#: controllers/stock_controller.py:339
+#: controllers/stock_controller.py:521
 msgid "Expense Account Missing"
 msgstr "Compte de dépenses manquant"
 
@@ -27032,13 +27430,13 @@
 msgid "Expense Head"
 msgstr "Compte de Charges"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:510
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:528
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:514
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:532
 msgid "Expense Head Changed"
 msgstr "Tête de dépense modifiée"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:552
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:556
 msgid "Expense account is mandatory for item {0}"
 msgstr "Compte de charge est obligatoire pour l'article {0}"
 
@@ -27049,7 +27447,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:46
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:65
-#: accounts/report/account_balance/account_balance.js:48
+#: accounts/report/account_balance/account_balance.js:49
 msgid "Expenses Included In Asset Valuation"
 msgstr "Dépenses incluses dans l'évaluation de l'actif"
 
@@ -27061,7 +27459,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:49
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:69
-#: accounts/report/account_balance/account_balance.js:49
+#: accounts/report/account_balance/account_balance.js:51
 msgid "Expenses Included In Valuation"
 msgstr "Charges Incluses dans la Valorisation"
 
@@ -27072,8 +27470,8 @@
 msgstr "Charges Incluses dans la Valorisation"
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:9
-#: selling/doctype/quotation/quotation_list.js:35
-#: stock/doctype/batch/batch_list.js:9 stock/doctype/item/item_list.js:10
+#: selling/doctype/quotation/quotation_list.js:34
+#: stock/doctype/batch/batch_list.js:13 stock/doctype/item/item_list.js:18
 msgid "Expired"
 msgstr "Expiré"
 
@@ -27095,7 +27493,7 @@
 msgid "Expired"
 msgstr "Expiré"
 
-#: stock/doctype/stock_entry/stock_entry.js:316
+#: stock/doctype/stock_entry/stock_entry.js:362
 msgid "Expired Batches"
 msgstr "Lots expirés"
 
@@ -27165,11 +27563,11 @@
 msgid "Export Data"
 msgstr "Exporter des données"
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:35
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:34
 msgid "Export E-Invoices"
 msgstr "Exporter des factures électroniques"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:106
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:93
 msgid "Export Errored Rows"
 msgstr "Exporter les lignes erronées"
 
@@ -27261,7 +27659,7 @@
 msgid "FIFO Stock Queue (qty, rate)"
 msgstr ""
 
-#. Label of a Text field in DocType 'Stock Ledger Entry'
+#. Label of a Long Text field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "FIFO Stock Queue (qty, rate)"
@@ -27273,7 +27671,8 @@
 msgid "FIFO/LIFO Queue"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:62
+#: 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
 msgid "Failed"
 msgstr "Échoué"
@@ -27386,7 +27785,14 @@
 msgid "Failed"
 msgstr "Échoué"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:9
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Failed"
+msgstr "Échoué"
+
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:17
 msgid "Failed Entries"
 msgstr ""
 
@@ -27421,11 +27827,11 @@
 msgid "Failed to setup defaults"
 msgstr "Échec de la configuration par défaut"
 
-#: setup/doctype/company/company.py:699
+#: setup/doctype/company/company.py:698
 msgid "Failed to setup defaults for country {0}. Please contact support."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Failure"
 msgstr "Échec"
 
@@ -27441,6 +27847,10 @@
 msgid "Failure Description"
 msgstr ""
 
+#: accounts/doctype/payment_request/payment_request.js:29
+msgid "Failure: {0}"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -27502,7 +27912,7 @@
 msgid "Fees"
 msgstr "Honoraires"
 
-#: public/js/utils/serial_no_batch_selector.js:332
+#: public/js/utils/serial_no_batch_selector.js:338
 msgid "Fetch Based On"
 msgstr ""
 
@@ -27512,7 +27922,7 @@
 msgid "Fetch Customers"
 msgstr "Récupérer des clients"
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:50
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:56
 msgid "Fetch Data"
 msgstr "Récupérer des données"
 
@@ -27520,7 +27930,7 @@
 msgid "Fetch Items from Warehouse"
 msgstr "Récupérer des articles de l'entrepôt"
 
-#: accounts/doctype/dunning/dunning.js:60
+#: accounts/doctype/dunning/dunning.js:61
 msgid "Fetch Overdue Payments"
 msgstr ""
 
@@ -27528,8 +27938,8 @@
 msgid "Fetch Subscription Updates"
 msgstr "Vérifier les mises à jour des abonnements"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:952
-#: accounts/doctype/sales_invoice/sales_invoice.js:954
+#: accounts/doctype/sales_invoice/sales_invoice.js:1028
+#: accounts/doctype/sales_invoice/sales_invoice.js:1030
 msgid "Fetch Timesheet"
 msgstr "Récuprer les temps saisis"
 
@@ -27539,8 +27949,8 @@
 msgid "Fetch Value From"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:252
-#: stock/doctype/stock_entry/stock_entry.js:554
+#: stock/doctype/material_request/material_request.js:318
+#: stock/doctype/stock_entry/stock_entry.js:640
 msgid "Fetch exploded BOM (including sub-assemblies)"
 msgstr "Récupérer la nomenclature éclatée (y compris les sous-ensembles)"
 
@@ -27551,11 +27961,20 @@
 msgid "Fetch items based on Default Supplier."
 msgstr "Récupérez les articles en fonction du fournisseur par défaut."
 
-#: accounts/doctype/dunning/dunning.js:131
-#: public/js/controllers/transaction.js:1083
+#: accounts/doctype/dunning/dunning.js:135
+#: public/js/controllers/transaction.js:1138
 msgid "Fetching exchange rates ..."
 msgstr ""
 
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:72
+msgid "Fetching..."
+msgstr ""
+
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:106
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Field"
+msgstr "Champ"
+
 #. Label of a Select field in DocType 'POS Search Fields'
 #: accounts/doctype/pos_search_fields/pos_search_fields.json
 msgctxt "POS Search Fields"
@@ -27629,8 +28048,8 @@
 msgid "File to Rename"
 msgstr "Fichier à Renommer"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:17
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:17
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:16
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:16
 #: public/js/financial_statements.js:167
 msgid "Filter Based On"
 msgstr "Filtre basé sur"
@@ -27641,7 +28060,7 @@
 msgid "Filter Duration (Months)"
 msgstr "Durée du filtre (mois)"
 
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:46
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:45
 msgid "Filter Total Zero Qty"
 msgstr "Filtrer les totaux pour les qtés égales à zéro"
 
@@ -27667,8 +28086,8 @@
 msgid "Filter on Payment"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:696
-#: public/js/bank_reconciliation_tool/dialog_manager.js:192
+#: accounts/doctype/payment_entry/payment_entry.js:858
+#: public/js/bank_reconciliation_tool/dialog_manager.js:196
 msgid "Filters"
 msgstr "Filtres"
 
@@ -27727,13 +28146,13 @@
 #: accounts/report/accounts_receivable/accounts_receivable.js:24
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:56
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:48
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:32
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:52
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:104
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:31
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:51
 #: accounts/report/general_ledger/general_ledger.js:16
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:32
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:31
 #: accounts/report/trial_balance/trial_balance.js:70
-#: assets/report/fixed_asset_register/fixed_asset_register.js:49
+#: assets/report/fixed_asset_register/fixed_asset_register.js:48
 #: public/js/financial_statements.js:161
 msgid "Finance Book"
 msgstr "Livre comptable"
@@ -27859,14 +28278,14 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Financial Reports Workspace
-#: accounts/doctype/account/account_tree.js:158
+#: accounts/doctype/account/account_tree.js:234
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/workspace/financial_reports/financial_reports.json
 #: public/js/financial_statements.js:129
 msgid "Financial Statements"
 msgstr "États financiers"
 
-#: public/js/setup_wizard.js:40
+#: public/js/setup_wizard.js:42
 msgid "Financial Year Begins On"
 msgstr ""
 
@@ -27877,13 +28296,13 @@
 msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) "
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:627
-#: manufacturing/doctype/work_order/work_order.js:642
-#: manufacturing/doctype/work_order/work_order.js:651
+#: manufacturing/doctype/work_order/work_order.js:675
+#: manufacturing/doctype/work_order/work_order.js:690
+#: manufacturing/doctype/work_order/work_order.js:699
 msgid "Finish"
 msgstr "terminer"
 
-#: buying/doctype/purchase_order/purchase_order.js:176
+#: buying/doctype/purchase_order/purchase_order.js:182
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:43
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:119
 msgid "Finished Good"
@@ -27919,7 +28338,7 @@
 msgid "Finished Good BOM"
 msgstr ""
 
-#: public/js/utils.js:698
+#: public/js/utils.js:768
 msgid "Finished Good Item"
 msgstr ""
 
@@ -27933,7 +28352,7 @@
 msgid "Finished Good Item Code"
 msgstr "Code d'article fini"
 
-#: public/js/utils.js:715
+#: public/js/utils.js:786
 msgid "Finished Good Item Qty"
 msgstr ""
 
@@ -27943,15 +28362,15 @@
 msgid "Finished Good Item Quantity"
 msgstr ""
 
-#: controllers/accounts_controller.py:3204
+#: controllers/accounts_controller.py:3295
 msgid "Finished Good Item is not specified for service item {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:3219
+#: controllers/accounts_controller.py:3310
 msgid "Finished Good Item {0} Qty can not be zero"
 msgstr ""
 
-#: controllers/accounts_controller.py:3213
+#: controllers/accounts_controller.py:3304
 msgid "Finished Good Item {0} must be a sub-contracted item"
 msgstr ""
 
@@ -27995,15 +28414,15 @@
 msgid "Finished Good {0} must be a sub-contracted item."
 msgstr ""
 
-#: setup/doctype/company/company.py:262
+#: setup/doctype/company/company.py:261
 msgid "Finished Goods"
 msgstr "Produits finis"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:25
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
 msgid "Finished Goods Warehouse"
 msgstr "Entrepôt de produits finis"
 
-#: stock/doctype/stock_entry/stock_entry.py:1264
+#: stock/doctype/stock_entry/stock_entry.py:1273
 msgid "Finished Item {0} does not match with Work Order {1}"
 msgstr ""
 
@@ -28090,16 +28509,17 @@
 
 #. Name of a DocType
 #: accounts/doctype/fiscal_year/fiscal_year.json
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:17
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:1
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:16
 #: accounts/report/profitability_analysis/profitability_analysis.js:38
 #: accounts/report/trial_balance/trial_balance.js:16
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:16
-#: manufacturing/report/job_card_summary/job_card_summary.js:17
-#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:48
+#: manufacturing/report/job_card_summary/job_card_summary.js:16
+#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:44
 #: regional/report/irs_1099/irs_1099.js:17
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:16
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:16
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:15
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:15
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:15
 msgid "Fiscal Year"
 msgstr "Exercice fiscal"
 
@@ -28177,7 +28597,7 @@
 msgid "Fixed"
 msgstr "Fixé"
 
-#: accounts/report/account_balance/account_balance.js:50
+#: accounts/report/account_balance/account_balance.js:52
 msgid "Fixed Asset"
 msgstr "Actif Immobilisé"
 
@@ -28251,11 +28671,23 @@
 msgid "Fleet Manager"
 msgstr "Gestionnaire de Flotte"
 
-#: selling/page/point_of_sale/pos_item_selector.js:303
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor"
+msgstr ""
+
+#. Label of a Data field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor Name"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_selector.js:300
 msgid "Focus on Item Group filter"
 msgstr "Focus sur le filtre de groupe d'articles"
 
-#: selling/page/point_of_sale/pos_item_selector.js:294
+#: selling/page/point_of_sale/pos_item_selector.js:291
 msgid "Focus on search input"
 msgstr "Focus sur l'entrée de recherche"
 
@@ -28275,15 +28707,15 @@
 msgid "Following Material Requests have been raised automatically based on Item's re-order level"
 msgstr "Les Demandes de Matériel suivantes ont été créées automatiquement sur la base du niveau de réapprovisionnement de l’Article"
 
-#: selling/doctype/customer/customer.py:740
+#: selling/doctype/customer/customer.py:751
 msgid "Following fields are mandatory to create address:"
 msgstr "Les champs suivants sont obligatoires pour créer une adresse:"
 
-#: controllers/buying_controller.py:906
+#: controllers/buying_controller.py:932
 msgid "Following item {0} is not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr "L'élément suivant {0} n'est pas marqué comme élément {1}. Vous pouvez les activer en tant qu'élément {1} à partir de sa fiche article."
 
-#: controllers/buying_controller.py:902
+#: controllers/buying_controller.py:928
 msgid "Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr "Les éléments suivants {0} ne sont pas marqués comme {1} élément. Vous pouvez les activer en tant qu'élément {1} à partir de sa fiche article."
 
@@ -28291,7 +28723,7 @@
 msgid "For"
 msgstr "Pour"
 
-#: public/js/utils/sales_common.js:274
+#: public/js/utils/sales_common.js:309
 msgid "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table."
 msgstr "Pour les articles \"Ensembles de Produits\", l’Entrepôt, le N° de Série et le N° de Lot proviendront de la table \"Liste de Colisage\". Si l’Entrepôt et le N° de Lot sont les mêmes pour tous les produits colisés d’un même article 'Produit Groupé', ces valeurs peuvent être entrées dans la table principale de l’article et elles seront copiées dans la table \"Liste de Colisage\"."
 
@@ -28307,11 +28739,16 @@
 msgid "For Company"
 msgstr "Pour la Société"
 
-#: stock/doctype/material_request/material_request.js:293
+#: stock/doctype/material_request/material_request.js:361
 msgid "For Default Supplier (Optional)"
 msgstr "Pour le fournisseur par défaut (facultatif)"
 
-#: controllers/stock_controller.py:770
+#: manufacturing/doctype/plant_floor/plant_floor.js:159
+#: manufacturing/doctype/plant_floor/plant_floor.js:183
+msgid "For Item"
+msgstr ""
+
+#: controllers/stock_controller.py:953
 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
 msgstr ""
 
@@ -28321,7 +28758,7 @@
 msgid "For Job Card"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:160
+#: manufacturing/doctype/job_card/job_card.js:175
 msgid "For Operation"
 msgstr ""
 
@@ -28346,23 +28783,28 @@
 msgid "For Production"
 msgstr "Pour la Production"
 
-#: stock/doctype/stock_entry/stock_entry.py:657
+#: stock/doctype/stock_entry/stock_entry.py:612
 msgid "For Quantity (Manufactured Qty) is mandatory"
 msgstr "Pour Quantité (Qté Produite) est obligatoire"
 
+#: controllers/accounts_controller.py:1070
+msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}"
+msgstr ""
+
 #. Label of a Check field in DocType 'Currency Exchange'
 #: setup/doctype/currency_exchange/currency_exchange.json
 msgctxt "Currency Exchange"
 msgid "For Selling"
 msgstr "A la vente"
 
-#: accounts/doctype/payment_order/payment_order.js:98
+#: accounts/doctype/payment_order/payment_order.js:106
 msgid "For Supplier"
 msgstr "Pour Fournisseur"
 
-#: manufacturing/doctype/production_plan/production_plan.js:331
-#: selling/doctype/sales_order/sales_order.js:808
-#: stock/doctype/material_request/material_request.js:247
+#: manufacturing/doctype/production_plan/production_plan.js:358
+#: selling/doctype/sales_order/sales_order.js:933
+#: stock/doctype/material_request/material_request.js:310
+#: templates/form_grid/material_request_grid.html:36
 msgid "For Warehouse"
 msgstr "Pour l’Entrepôt"
 
@@ -28372,11 +28814,11 @@
 msgid "For Warehouse"
 msgstr "Pour l’Entrepôt"
 
-#: manufacturing/doctype/work_order/work_order.py:427
+#: manufacturing/doctype/work_order/work_order.py:438
 msgid "For Warehouse is required before Submit"
 msgstr "Pour l’Entrepôt est requis avant de Valider"
 
-#: public/js/utils/serial_no_batch_selector.js:116
+#: public/js/utils/serial_no_batch_selector.js:119
 msgid "For Work Order"
 msgstr ""
 
@@ -28418,15 +28860,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:384
+#: stock/doctype/stock_entry/stock_entry.py:339
 msgid "For job card {0}, you can only make the 'Material Transfer for Manufacture' type stock entry"
 msgstr "Pour la carte de travail {0}, vous pouvez uniquement saisir une entrée de stock de type &quot;Transfert d'article pour fabrication&quot;."
 
-#: manufacturing/doctype/work_order/work_order.py:1523
+#: manufacturing/doctype/work_order/work_order.py:1537
 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1302
+#: stock/doctype/stock_entry/stock_entry.py:1311
 msgid "For quantity {0} should not be greater than allowed quantity {1}"
 msgstr ""
 
@@ -28436,12 +28878,12 @@
 msgid "For reference"
 msgstr "Pour référence"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1229
+#: accounts/doctype/payment_entry/payment_entry.js:1477
 #: public/js/controllers/accounts.js:182
 msgid "For row {0} in {1}. To include {2} in Item rate, rows {3} must also be included"
 msgstr "Pour la ligne {0} dans {1}. Pour inclure {2} dans le prix de l'article, les lignes {3} doivent également être incluses"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1498
+#: manufacturing/doctype/production_plan/production_plan.py:1520
 msgid "For row {0}: Enter Planned Qty"
 msgstr "Pour la ligne {0}: entrez la quantité planifiée"
 
@@ -28449,6 +28891,11 @@
 msgid "For the 'Apply Rule On Other' condition the field {0} is mandatory"
 msgstr "Pour la condition &quot;Appliquer la règle à l'autre&quot;, le champ {0} est obligatoire"
 
+#. Description of a DocType
+#: stock/doctype/item_customer_detail/item_customer_detail.json
+msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes"
+msgstr ""
+
 #. Label of a shortcut in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "Forecasting"
@@ -28631,7 +29078,7 @@
 msgid "Friday"
 msgstr "Vendredi"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:957
+#: accounts/doctype/sales_invoice/sales_invoice.js:1033
 #: templates/pages/projects.html:67
 msgid "From"
 msgstr "À partir de"
@@ -28683,13 +29130,13 @@
 msgid "From Customer"
 msgstr "Du Client"
 
-#: accounts/doctype/payment_entry/payment_entry.js:645
-#: accounts/doctype/payment_entry/payment_entry.js:650
+#: accounts/doctype/payment_entry/payment_entry.js:789
+#: accounts/doctype/payment_entry/payment_entry.js:796
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:16
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:16
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:8
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:16
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:38
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:15
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:37
 #: accounts/report/financial_ratios/financial_ratios.js:41
 #: accounts/report/general_ledger/general_ledger.js:22
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -28697,77 +29144,77 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:8
 #: 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:17
+#: accounts/report/pos_register/pos_register.js:16
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:8
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:16
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:47
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:47
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:15
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:46
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:46
 #: accounts/report/trial_balance/trial_balance.js:37
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:37
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:15
-#: buying/report/procurement_tracker/procurement_tracker.js:28
-#: buying/report/purchase_analytics/purchase_analytics.js:36
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:18
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:18
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:16
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:23
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:23
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:14
+#: buying/report/procurement_tracker/procurement_tracker.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:35
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:17
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:17
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:15
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:22
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:22
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:16
 #: crm/report/campaign_efficiency/campaign_efficiency.js:7
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:9
-#: crm/report/lead_conversion_time/lead_conversion_time.js:9
-#: crm/report/lead_details/lead_details.js:17
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:8
+#: crm/report/lead_conversion_time/lead_conversion_time.js:8
+#: crm/report/lead_details/lead_details.js:16
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:7
-#: crm/report/lost_opportunity/lost_opportunity.js:17
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:23
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:16
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:16
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:17
-#: manufacturing/report/process_loss_report/process_loss_report.js:30
-#: manufacturing/report/production_analytics/production_analytics.js:17
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:8
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:16
+#: crm/report/lost_opportunity/lost_opportunity.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:22
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:15
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:15
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:16
+#: manufacturing/report/process_loss_report/process_loss_report.js:29
+#: manufacturing/report/production_analytics/production_analytics.js:16
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:7
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:15
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:8
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:9
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:8
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:28
-#: public/js/stock_analytics.js:47
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:9
-#: regional/report/uae_vat_201/uae_vat_201.js:17
-#: regional/report/vat_audit_report/vat_audit_report.js:17
-#: selling/page/sales_funnel/sales_funnel.js:39
+#: public/js/stock_analytics.js:74
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:8
+#: regional/report/uae_vat_201/uae_vat_201.js:16
+#: regional/report/vat_audit_report/vat_audit_report.js:16
+#: selling/page/sales_funnel/sales_funnel.js:43
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:24
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:18
-#: selling/report/sales_analytics/sales_analytics.js:36
-#: selling/report/sales_order_analysis/sales_order_analysis.js:18
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:22
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:23
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:17
+#: selling/report/sales_analytics/sales_analytics.js:43
+#: selling/report/sales_order_analysis/sales_order_analysis.js:17
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:21
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:21
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:21
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:21
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:8
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:16
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:17
-#: stock/report/delayed_item_report/delayed_item_report.js:17
-#: stock/report/delayed_order_report/delayed_order_report.js:17
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:21
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:31
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:15
+#: stock/report/delayed_item_report/delayed_item_report.js:16
+#: stock/report/delayed_order_report/delayed_order_report.js:16
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:20
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:30
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:8
 #: stock/report/reserved_stock/reserved_stock.js:16
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:16
-#: stock/report/stock_analytics/stock_analytics.js:63
+#: stock/report/stock_analytics/stock_analytics.js:62
 #: stock/report/stock_balance/stock_balance.js:16
 #: stock/report/stock_ledger/stock_ledger.js:16
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:15
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:9
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:9
-#: support/report/issue_analytics/issue_analytics.js:25
-#: support/report/issue_summary/issue_summary.js:25
-#: support/report/support_hour_distribution/support_hour_distribution.js:8
-#: utilities/report/youtube_interactions/youtube_interactions.js:9
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:8
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:8
+#: support/report/issue_analytics/issue_analytics.js:24
+#: support/report/issue_summary/issue_summary.js:24
+#: support/report/support_hour_distribution/support_hour_distribution.js:7
+#: utilities/report/youtube_interactions/youtube_interactions.js:8
 msgid "From Date"
 msgstr "A partir du"
 
@@ -28873,7 +29320,7 @@
 msgid "From Date"
 msgstr "A partir du"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:41
+#: accounts/doctype/bank_clearance/bank_clearance.py:43
 msgid "From Date and To Date are Mandatory"
 msgstr "La date de début et la date de fin sont obligatoires"
 
@@ -28919,7 +29366,7 @@
 msgid "From Delivery Date"
 msgstr ""
 
-#: selling/doctype/installation_note/installation_note.js:58
+#: selling/doctype/installation_note/installation_note.js:59
 msgid "From Delivery Note"
 msgstr "Du Bon de Livraison"
 
@@ -28929,7 +29376,7 @@
 msgid "From Doctype"
 msgstr ""
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:80
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:78
 msgid "From Due Date"
 msgstr ""
 
@@ -28939,7 +29386,7 @@
 msgid "From Employee"
 msgstr "De l'Employé"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:45
+#: accounts/report/budget_variance_report/budget_variance_report.js:43
 msgid "From Fiscal Year"
 msgstr "À partir de l'année fiscale"
 
@@ -29003,8 +29450,8 @@
 msgid "From Payment Date"
 msgstr ""
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:37
-#: manufacturing/report/work_order_summary/work_order_summary.js:23
+#: manufacturing/report/job_card_summary/job_card_summary.js:36
+#: manufacturing/report/work_order_summary/work_order_summary.js:22
 msgid "From Posting Date"
 msgstr "À partir de la date de publication"
 
@@ -29050,6 +29497,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:91
 #: manufacturing/report/job_card_summary/job_card_summary.py:179
+#: templates/pages/timelog_info.html:31
 msgid "From Time"
 msgstr "Horaire de Début"
 
@@ -29135,7 +29583,7 @@
 msgid "From Voucher Detail No"
 msgstr ""
 
-#: stock/report/reserved_stock/reserved_stock.js:106
+#: stock/report/reserved_stock/reserved_stock.js:103
 #: stock/report/reserved_stock/reserved_stock.py:164
 msgid "From Voucher No"
 msgstr ""
@@ -29146,7 +29594,7 @@
 msgid "From Voucher No"
 msgstr ""
 
-#: stock/report/reserved_stock/reserved_stock.js:95
+#: stock/report/reserved_stock/reserved_stock.js:92
 #: stock/report/reserved_stock/reserved_stock.py:158
 msgid "From Voucher Type"
 msgstr ""
@@ -29197,7 +29645,7 @@
 msgid "From and To dates are required"
 msgstr ""
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:47
+#: manufacturing/doctype/blanket_order/blanket_order.py:48
 msgid "From date cannot be greater than To date"
 msgstr "La Date Initiale ne peut pas être postérieure à la Date Finale"
 
@@ -29385,30 +29833,33 @@
 msgid "Furniture and Fixtures"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/account/account_tree.js:138
 msgid "Further accounts can be made under Groups, but entries can be made against non-Groups"
 msgstr "D'autres comptes individuels peuvent être créés dans les groupes, mais les écritures ne peuvent être faites que sur les comptes individuels"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:24
+#: accounts/doctype/cost_center/cost_center_tree.js:31
 msgid "Further cost centers can be made under Groups but entries can be made against non-Groups"
 msgstr "D'autres centres de coûts peuvent être créés dans des Groupes, mais des écritures ne peuvent être faites que sur des centres de coûts individuels."
 
-#: setup/doctype/sales_person/sales_person_tree.js:10
+#: setup/doctype/sales_person/sales_person_tree.js:15
 msgid "Further nodes can be only created under 'Group' type nodes"
 msgstr "D'autres nœuds peuvent être créés uniquement sous les nœuds de type 'Groupe'"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:185
-#: accounts/report/accounts_receivable/accounts_receivable.py:1084
+#: 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
 msgid "Future Payment Amount"
 msgstr "Montant du paiement futur"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:184
-#: accounts/report/accounts_receivable/accounts_receivable.py:1083
+#: accounts/report/accounts_receivable/accounts_receivable.html:154
+#: accounts/report/accounts_receivable/accounts_receivable.py:1091
 msgid "Future Payment Ref"
 msgstr "Paiement futur Ref"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:120
+#: accounts/report/accounts_receivable/accounts_receivable.html:102
 msgid "Future Payments"
 msgstr "Paiements futurs"
 
@@ -29424,7 +29875,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/gl_entry/gl_entry.json
-#: accounts/report/general_ledger/general_ledger.py:557
+#: accounts/report/general_ledger/general_ledger.py:570
 msgid "GL Entry"
 msgstr "Écriture GL"
 
@@ -29485,11 +29936,11 @@
 
 #: 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:525
+#: setup/doctype/company/company.py:524
 msgid "Gain/Loss on Asset Disposal"
 msgstr "Gain/Perte sur Cessions des Immobilisations"
 
-#: projects/doctype/project/project.js:79
+#: projects/doctype/project/project.js:93
 msgid "Gantt Chart"
 msgstr "Diagramme de Gantt"
 
@@ -29525,7 +29976,7 @@
 #. Name of a report
 #. Label of a shortcut in the Accounting Workspace
 #. Label of a Link in the Financial Reports Workspace
-#: accounts/doctype/account/account.js:95
+#: accounts/doctype/account/account.js:93
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/report/general_ledger/general_ledger.json
 #: accounts/workspace/accounting/accounting.json
@@ -29546,7 +29997,7 @@
 msgid "General Ledger"
 msgstr "Grand Livre"
 
-#: stock/doctype/warehouse/warehouse.js:74
+#: stock/doctype/warehouse/warehouse.js:68
 msgctxt "Warehouse"
 msgid "General Ledger"
 msgstr "Grand Livre"
@@ -29566,7 +30017,7 @@
 msgid "Generate Closing Stock Balance"
 msgstr ""
 
-#: public/js/setup_wizard.js:46
+#: public/js/setup_wizard.js:48
 msgid "Generate Demo Data for Exploration"
 msgstr ""
 
@@ -29592,6 +30043,11 @@
 msgid "Generate Schedule"
 msgstr "Créer un Échéancier"
 
+#. Description of a DocType
+#: stock/doctype/packing_slip/packing_slip.json
+msgid "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight."
+msgstr ""
+
 #. Label of a Check field in DocType 'Bisect Nodes'
 #: accounts/doctype/bisect_nodes/bisect_nodes.json
 msgctxt "Bisect Nodes"
@@ -29638,7 +30094,7 @@
 msgid "Get Current Stock"
 msgstr "Obtenir le Stock Actuel"
 
-#: selling/doctype/customer/customer.js:168
+#: selling/doctype/customer/customer.js:180
 msgid "Get Customer Group Details"
 msgstr ""
 
@@ -29654,12 +30110,12 @@
 msgid "Get Finished Goods for Manufacture"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:55
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:157
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:57
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:159
 msgid "Get Invoices"
 msgstr "Obtenir des factures"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:102
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:104
 msgid "Get Invoices based on Filters"
 msgstr "Obtenir les factures en fonction des filtres"
 
@@ -29669,11 +30125,11 @@
 msgid "Get Item Locations"
 msgstr "Obtenir les emplacements des articles"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:351
-#: manufacturing/doctype/production_plan/production_plan.js:342
-#: stock/doctype/pick_list/pick_list.js:161
-#: stock/doctype/pick_list/pick_list.js:202
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: buying/doctype/request_for_quotation/request_for_quotation.js:377
+#: manufacturing/doctype/production_plan/production_plan.js:369
+#: stock/doctype/pick_list/pick_list.js:193
+#: stock/doctype/pick_list/pick_list.js:236
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:163
 msgid "Get Items"
 msgstr "Obtenir les Articles"
 
@@ -29683,37 +30139,37 @@
 msgid "Get Items"
 msgstr "Obtenir les Articles"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:147
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:165
-#: accounts/doctype/sales_invoice/sales_invoice.js:252
-#: accounts/doctype/sales_invoice/sales_invoice.js:276
-#: accounts/doctype/sales_invoice/sales_invoice.js:304
-#: buying/doctype/purchase_order/purchase_order.js:456
-#: buying/doctype/purchase_order/purchase_order.js:473
-#: buying/doctype/request_for_quotation/request_for_quotation.js:315
-#: buying/doctype/request_for_quotation/request_for_quotation.js:334
-#: buying/doctype/request_for_quotation/request_for_quotation.js:375
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:195
+#: 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/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
 #: buying/doctype/supplier_quotation/supplier_quotation.js:49
-#: buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:78
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:96
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:112
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:132
-#: public/js/controllers/buying.js:267
-#: selling/doctype/quotation/quotation.js:160
-#: selling/doctype/sales_order/sales_order.js:132
-#: selling/doctype/sales_order/sales_order.js:643
-#: stock/doctype/delivery_note/delivery_note.js:160
-#: stock/doctype/material_request/material_request.js:100
-#: stock/doctype/material_request/material_request.js:162
-#: stock/doctype/purchase_receipt/purchase_receipt.js:130
-#: stock/doctype/purchase_receipt/purchase_receipt.js:217
-#: stock/doctype/stock_entry/stock_entry.js:275
-#: stock/doctype/stock_entry/stock_entry.js:312
-#: stock/doctype/stock_entry/stock_entry.js:336
-#: stock/doctype/stock_entry/stock_entry.js:387
-#: stock/doctype/stock_entry/stock_entry.js:535
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
+#: buying/doctype/supplier_quotation/supplier_quotation.js:82
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:80
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:100
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:119
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:142
+#: public/js/controllers/buying.js:262
+#: selling/doctype/quotation/quotation.js:167
+#: selling/doctype/sales_order/sales_order.js:158
+#: selling/doctype/sales_order/sales_order.js:743
+#: stock/doctype/delivery_note/delivery_note.js:173
+#: stock/doctype/material_request/material_request.js:101
+#: stock/doctype/material_request/material_request.js:192
+#: stock/doctype/purchase_receipt/purchase_receipt.js:145
+#: stock/doctype/purchase_receipt/purchase_receipt.js:249
+#: 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:119
 msgid "Get Items From"
 msgstr "Obtenir les articles de"
 
@@ -29729,13 +30185,13 @@
 msgid "Get Items From Purchase Receipts"
 msgstr "Obtenir des Articles à partir des Reçus d'Achat"
 
-#: stock/doctype/material_request/material_request.js:241
-#: stock/doctype/stock_entry/stock_entry.js:555
-#: stock/doctype/stock_entry/stock_entry.js:568
+#: stock/doctype/material_request/material_request.js:295
+#: stock/doctype/stock_entry/stock_entry.js:643
+#: stock/doctype/stock_entry/stock_entry.js:656
 msgid "Get Items from BOM"
 msgstr "Obtenir les Articles depuis nomenclature"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:348
+#: buying/doctype/request_for_quotation/request_for_quotation.js:374
 msgid "Get Items from Material Requests against this Supplier"
 msgstr "Obtenir des articles à partir de demandes d'articles auprès de ce fournisseur"
 
@@ -29745,7 +30201,7 @@
 msgid "Get Items from Open Material Requests"
 msgstr "Obtenir des Articles de Demandes Matérielles Ouvertes"
 
-#: public/js/controllers/buying.js:507
+#: public/js/controllers/buying.js:504
 msgid "Get Items from Product Bundle"
 msgstr "Obtenir les Articles du Produit Groupé"
 
@@ -29779,18 +30235,24 @@
 msgid "Get Outstanding Orders"
 msgstr ""
 
+#: accounts/doctype/bank_clearance/bank_clearance.js:38
 #: accounts/doctype/bank_clearance/bank_clearance.js:40
-#: accounts/doctype/bank_clearance/bank_clearance.js:44
-#: accounts/doctype/bank_clearance/bank_clearance.js:56
-#: accounts/doctype/bank_clearance/bank_clearance.js:75
+#: accounts/doctype/bank_clearance/bank_clearance.js:52
+#: accounts/doctype/bank_clearance/bank_clearance.js:71
 msgid "Get Payment Entries"
 msgstr "Obtenir les Écritures de Paiement"
 
-#: accounts/doctype/payment_order/payment_order.js:20
-#: accounts/doctype/payment_order/payment_order.js:24
+#: accounts/doctype/payment_order/payment_order.js:23
+#: accounts/doctype/payment_order/payment_order.js:31
 msgid "Get Payments from"
 msgstr "Obtenez des paiements de"
 
+#. Label of a Check field in DocType 'Manufacturing Settings'
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+msgctxt "Manufacturing Settings"
+msgid "Get Raw Materials Cost from Consumption Entry"
+msgstr ""
+
 #. Label of a Button field in DocType 'Production Plan'
 #: manufacturing/doctype/production_plan/production_plan.json
 msgctxt "Production Plan"
@@ -29821,7 +30283,7 @@
 msgid "Get Started Sections"
 msgstr "Sections d'aide"
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:432
 msgid "Get Stock"
 msgstr ""
 
@@ -29831,29 +30293,29 @@
 msgid "Get Sub Assembly Items"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:102
+#: buying/doctype/supplier/supplier.js:124
 msgid "Get Supplier Group Details"
 msgstr "Appliquer les informations depuis le Groupe de fournisseur"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:384
-#: buying/doctype/request_for_quotation/request_for_quotation.js:402
+#: buying/doctype/request_for_quotation/request_for_quotation.js:416
+#: buying/doctype/request_for_quotation/request_for_quotation.js:436
 msgid "Get Suppliers"
 msgstr "Obtenir des fournisseurs"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:405
+#: buying/doctype/request_for_quotation/request_for_quotation.js:440
 msgid "Get Suppliers By"
 msgstr "Obtenir des Fournisseurs"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:989
+#: accounts/doctype/sales_invoice/sales_invoice.js:1065
 msgid "Get Timesheets"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:81
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:84
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:77
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:80
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:87
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:94
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:75
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:81
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:91
 msgid "Get Unreconciled Entries"
 msgstr "Obtenir les Écritures non Réconcilliées"
 
@@ -29861,11 +30323,11 @@
 msgid "Get Updates"
 msgstr "Obtenir les mises à jour"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:65
+#: stock/doctype/delivery_trip/delivery_trip.js:68
 msgid "Get stops from"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:125
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:149
 msgid "Getting Scrap Items"
 msgstr ""
 
@@ -29882,6 +30344,13 @@
 msgid "Give free item for every N quantity"
 msgstr ""
 
+#. Description of the 'Recurse Every (As Per Transaction UOM)' (Float) field in
+#. DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Give free item for every N quantity"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/global_defaults/global_defaults.json
 msgid "Global Defaults"
@@ -29898,7 +30367,7 @@
 msgid "Go back"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:113
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:97
 msgid "Go to {0} List"
 msgstr "Aller à la liste {0}"
 
@@ -29937,16 +30406,16 @@
 msgid "Goods"
 msgstr ""
 
-#: setup/doctype/company/company.py:263
-#: stock/doctype/stock_entry/stock_entry_list.js:14
+#: setup/doctype/company/company.py:262
+#: stock/doctype/stock_entry/stock_entry_list.js:21
 msgid "Goods In Transit"
 msgstr "Les marchandises en transit"
 
-#: stock/doctype/stock_entry/stock_entry_list.js:17
+#: stock/doctype/stock_entry/stock_entry_list.js:23
 msgid "Goods Transferred"
 msgstr "Marchandises transférées"
 
-#: stock/doctype/stock_entry/stock_entry.py:1618
+#: stock/doctype/stock_entry/stock_entry.py:1627
 msgid "Goods are already received against the outward entry {0}"
 msgstr "Les marchandises sont déjà reçues pour l'entrée sortante {0}"
 
@@ -29970,7 +30439,12 @@
 #: accounts/report/pos_register/pos_register.py:207
 #: 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:253
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:251
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:154
+#: selling/page/point_of_sale/pos_payment.js:590
 #: templates/includes/order/order_taxes.html:105 templates/pages/rfq.html:58
 msgid "Grand Total"
 msgstr "Total TTC"
@@ -30192,7 +30666,7 @@
 msgid "Grant Commission"
 msgstr "Eligible aux commissions"
 
-#: accounts/doctype/payment_entry/payment_entry.js:654
+#: accounts/doctype/payment_entry/payment_entry.js:802
 msgid "Greater Than Amount"
 msgstr "Plus grand que le montant"
 
@@ -30301,11 +30775,11 @@
 msgid "Gross Purchase Amount"
 msgstr "Montant d'Achat Brut"
 
-#: assets/doctype/asset/asset.py:317
+#: assets/doctype/asset/asset.py:319
 msgid "Gross Purchase Amount is mandatory"
 msgstr "Montant d'Achat Brut est obligatoire"
 
-#: assets/doctype/asset/asset.py:362
+#: assets/doctype/asset/asset.py:364
 msgid "Gross Purchase Amount should be <b>equal</b> to purchase amount of one single Asset."
 msgstr ""
 
@@ -30334,11 +30808,11 @@
 #: accounts/report/gross_profit/gross_profit.js:36
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:52
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:58
-#: assets/report/fixed_asset_register/fixed_asset_register.js:36
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
+#: assets/report/fixed_asset_register/fixed_asset_register.js:35
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:41
 #: public/js/purchase_trends_filters.js:61 public/js/sales_trends_filters.js:37
 #: selling/report/lost_quotations/lost_quotations.js:33
-#: stock/report/total_stock_summary/total_stock_summary.js:9
+#: stock/report/total_stock_summary/total_stock_summary.js:8
 msgid "Group By"
 msgstr "Grouper par"
 
@@ -30348,15 +30822,15 @@
 msgid "Group By"
 msgstr "Grouper par"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:151
+#: accounts/report/accounts_receivable/accounts_receivable.js:154
 msgid "Group By Customer"
 msgstr "Regrouper par client"
 
-#: accounts/report/accounts_payable/accounts_payable.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:132
 msgid "Group By Supplier"
 msgstr "Regrouper par fournisseur"
 
-#: setup/doctype/sales_person/sales_person_tree.js:9
+#: setup/doctype/sales_person/sales_person_tree.js:14
 msgid "Group Node"
 msgstr "Niveau parent"
 
@@ -30366,12 +30840,12 @@
 msgid "Group Same Items"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:112
+#: stock/doctype/stock_settings/stock_settings.py:115
 msgid "Group Warehouses cannot be used in transactions. Please change the value of {0}"
 msgstr "Les entrepôts de groupe ne peuvent pas être utilisés dans les transactions. Veuillez modifier la valeur de {0}"
 
 #: accounts/report/general_ledger/general_ledger.js:115
-#: accounts/report/pos_register/pos_register.js:57
+#: accounts/report/pos_register/pos_register.js:56
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:78
 msgid "Group by"
 msgstr ""
@@ -30380,34 +30854,34 @@
 msgid "Group by Account"
 msgstr "Grouper par compte"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:82
 msgid "Group by Item"
 msgstr "Grouper par article"
 
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:62
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:61
 msgid "Group by Material Request"
 msgstr "Regrouper par demande de matériel"
 
 #: accounts/report/general_ledger/general_ledger.js:132
-#: accounts/report/payment_ledger/payment_ledger.js:83
+#: accounts/report/payment_ledger/payment_ledger.js:82
 msgid "Group by Party"
 msgstr "Groupe par parti"
 
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:71
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:70
 msgid "Group by Purchase Order"
 msgstr "Regrouper par Commande d'Achat"
 
-#: selling/report/sales_order_analysis/sales_order_analysis.js:73
+#: selling/report/sales_order_analysis/sales_order_analysis.js:72
 msgid "Group by Sales Order"
 msgstr "Regrouper par commande client"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:81
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:84
 msgid "Group by Supplier"
 msgstr "Regrouper par fournisseur"
 
-#: accounts/report/accounts_payable/accounts_payable.js:159
-#: accounts/report/accounts_receivable/accounts_receivable.js:191
+#: accounts/report/accounts_payable/accounts_payable.js:162
+#: accounts/report/accounts_receivable/accounts_receivable.js:194
 #: accounts/report/general_ledger/general_ledger.js:120
 msgid "Group by Voucher"
 msgstr "Groupe par Bon"
@@ -30430,7 +30904,7 @@
 msgid "Group by Voucher (Consolidated)"
 msgstr "Grouper par bon (consolidé)"
 
-#: stock/utils.py:448
+#: stock/utils.py:443
 msgid "Group node warehouse is not allowed to select for transactions"
 msgstr "Un noeud de groupe d'entrepôt ne peut pas être sélectionné pour les transactions"
 
@@ -30492,8 +30966,8 @@
 msgid "Groups"
 msgstr "Groupes"
 
-#: accounts/report/balance_sheet/balance_sheet.js:18
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:18
+#: accounts/report/balance_sheet/balance_sheet.js:14
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
 msgid "Growth View"
 msgstr ""
 
@@ -30539,14 +31013,14 @@
 msgid "Half Yearly"
 msgstr "Semestriel"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:66
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:69
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
-#: public/js/financial_statements.js:219
+#: accounts/report/budget_variance_report/budget_variance_report.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
+#: public/js/financial_statements.js:228
 #: public/js/purchase_trends_filters.js:21 public/js/sales_trends_filters.js:13
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
 msgid "Half-Yearly"
 msgstr ""
 
@@ -30705,6 +31179,11 @@
 msgid "Have Default Naming Series for Batch ID?"
 msgstr "Masque de numérotation par défaut pour les Lots ou Séries"
 
+#. Description of a DocType
+#: accounts/doctype/account/account.json
+msgid "Heads (or groups) against which Accounting Entries are made and balances are maintained."
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -30729,7 +31208,7 @@
 msgid "Height (cm)"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:412
+#: assets/doctype/asset/depreciation.py:410
 msgid "Hello,"
 msgstr ""
 
@@ -30763,11 +31242,16 @@
 msgid "Help Text"
 msgstr "Texte d'aide"
 
-#: assets/doctype/asset/depreciation.py:419
+#. Description of a DocType
+#: accounts/doctype/monthly_distribution/monthly_distribution.json
+msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
+msgstr ""
+
+#: assets/doctype/asset/depreciation.py:417
 msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
 msgstr ""
 
-#: stock/stock_ledger.py:1669
+#: stock/stock_ledger.py:1689
 msgid "Here are the options to proceed:"
 msgstr ""
 
@@ -30784,15 +31268,15 @@
 msgid "Here you can maintain height, weight, allergies, medical concerns etc"
 msgstr "Ici vous pouvez conserver la hauteur, le poids, les allergies, les préoccupations médicales etc."
 
-#: setup/doctype/employee/employee.js:122
+#: setup/doctype/employee/employee.js:129
 msgid "Here, you can select a senior of this Employee. Based on this, Organization Chart will be populated."
 msgstr ""
 
-#: setup/doctype/holiday_list/holiday_list.js:75
+#: setup/doctype/holiday_list/holiday_list.js:77
 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:391
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:406
 msgid "Hi,"
 msgstr ""
 
@@ -30854,12 +31338,12 @@
 msgid "History In Company"
 msgstr "Ancienneté dans la Société"
 
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: selling/doctype/sales_order/sales_order.js:539
+#: buying/doctype/purchase_order/purchase_order.js:315
+#: selling/doctype/sales_order/sales_order.js:582
 msgid "Hold"
 msgstr "Mettre en attente"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
 msgid "Hold Invoice"
 msgstr "Facture en attente"
 
@@ -30965,6 +31449,13 @@
 msgstr "Horaire"
 
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:31
+#: templates/pages/timelog_info.html:37
+msgid "Hours"
+msgstr "Heures"
+
+#. Label of a Float field in DocType 'Workstation Working Hour'
+#: manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
+msgctxt "Workstation Working Hour"
 msgid "Hours"
 msgstr "Heures"
 
@@ -31003,7 +31494,7 @@
 msgid "Hrs"
 msgstr ""
 
-#: setup/doctype/company/company.py:365
+#: setup/doctype/company/company.py:364
 msgid "Human Resources"
 msgstr "Ressources humaines"
 
@@ -31041,8 +31532,8 @@
 msgid "IBAN"
 msgstr ""
 
-#: accounts/doctype/bank_account/bank_account.py:84
-#: accounts/doctype/bank_account/bank_account.py:87
+#: accounts/doctype/bank_account/bank_account.py:98
+#: accounts/doctype/bank_account/bank_account.py:101
 msgid "IBAN is not valid"
 msgstr "IBAN n'est pas valide"
 
@@ -31117,6 +31608,12 @@
 msgid "Identifying Decision Makers"
 msgstr "Identifier les décideurs"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Idle"
+msgstr ""
+
 #. Description of the 'Book Deferred Entries Based On' (Select) field in
 #. DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31124,6 +31621,10 @@
 msgid "If \"Months\" is selected, a fixed amount will be booked as deferred revenue or expense for each month irrespective of the number of days in a month. It will be prorated if deferred revenue or expense is not booked for an entire month"
 msgstr "Si «Mois» est sélectionné, un montant fixe sera comptabilisé en tant que revenus ou dépenses différés pour chaque mois, quel que soit le nombre de jours dans un mois. Il sera calculé au prorata si les revenus ou les dépenses différés ne sont pas comptabilisés pour un mois entier"
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)"
+msgstr ""
+
 #. Description of the 'Cost Center' (Link) field in DocType 'Journal Entry
 #. Account'
 #: accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -31131,7 +31632,7 @@
 msgid "If Income or Expense"
 msgstr "Si Produits ou Charges"
 
-#: manufacturing/doctype/operation/operation.js:30
+#: manufacturing/doctype/operation/operation.js:32
 msgid "If an operation is divided into sub operations, they can be added here."
 msgstr ""
 
@@ -31188,7 +31689,7 @@
 msgid "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 msgstr "Si cochée, le montant de la taxe sera considéré comme déjà inclus dans le Taux / Prix des documents (PDF, impressions)"
 
-#: public/js/setup_wizard.js:48
+#: public/js/setup_wizard.js:50
 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later."
 msgstr ""
 
@@ -31234,6 +31735,14 @@
 msgid "If enabled, all files attached to this document will be attached to each email"
 msgstr ""
 
+#. Description of the 'Do Not Update Serial / Batch on Creation of Auto Bundle'
+#. (Check) field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "If enabled, do not update serial / batch values in the stock transactions on creation of auto Serial \n"
+" / Batch Bundle. "
+msgstr ""
+
 #. Description of the 'Create Ledger Entries for Change Amount' (Check) field
 #. in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31274,7 +31783,7 @@
 msgid "If more than one package of the same type (for print)"
 msgstr "Si plus d'un paquet du même type (pour l'impression)"
 
-#: stock/stock_ledger.py:1679
+#: stock/stock_ledger.py:1699
 msgid "If not, you can Cancel / Submit this entry"
 msgstr ""
 
@@ -31292,7 +31801,7 @@
 msgid "If subcontracted to a vendor"
 msgstr "Si sous-traité à un fournisseur"
 
-#: manufacturing/doctype/work_order/work_order.js:842
+#: manufacturing/doctype/work_order/work_order.js:911
 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."
 msgstr ""
 
@@ -31302,11 +31811,11 @@
 msgid "If the account is frozen, entries are allowed to restricted users."
 msgstr "Si le compte est gelé, les écritures ne sont autorisés que pour un nombre restreint d'utilisateurs."
 
-#: stock/stock_ledger.py:1672
+#: stock/stock_ledger.py:1692
 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 "Si l'article est traité comme un article à taux de valorisation nul dans cette entrée, veuillez activer &quot;Autoriser le taux de valorisation nul&quot; dans le {0} tableau des articles."
 
-#: manufacturing/doctype/work_order/work_order.js:857
+#: manufacturing/doctype/work_order/work_order.js:930
 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
 msgstr ""
 
@@ -31352,7 +31861,7 @@
 msgid "If this is unchecked, direct GL entries will be created to book deferred revenue or expense"
 msgstr "Si cette case n'est pas cochée, des entrées GL directes seront créées pour enregistrer les revenus ou les dépenses différés"
 
-#: accounts/doctype/payment_entry/payment_entry.py:638
+#: accounts/doctype/payment_entry/payment_entry.py:647
 msgid "If this is undesirable please cancel the corresponding Payment Entry."
 msgstr ""
 
@@ -31362,23 +31871,34 @@
 msgid "If this item has variants, then it cannot be selected in sales orders etc."
 msgstr "Si cet article a des variantes, alors il ne peut pas être sélectionné dans les commandes clients, etc."
 
-#: buying/doctype/buying_settings/buying_settings.js:24
+#: buying/doctype/buying_settings/buying_settings.js:27
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master."
 msgstr "Si cette option est configurée «Oui», ERPNext vous empêchera de créer une facture d'achat ou un reçu sans créer d'abord une Commande d'Achat. Cette configuration peut être remplacée pour un fournisseur particulier en cochant la case «Autoriser la création de facture d'achat sans commmande d'achat» dans la fiche fournisseur."
 
-#: buying/doctype/buying_settings/buying_settings.js:29
+#: buying/doctype/buying_settings/buying_settings.js:34
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master."
 msgstr "Si cette option est configurée «Oui», ERPNext vous empêchera de créer une facture d'achat sans créer d'abord un reçu d'achat. Cette configuration peut être remplacée pour un fournisseur particulier en cochant la case &quot;Autoriser la création de facture d'achat sans reçu d'achat&quot; dans la fiche fournisseur."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:11
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
 msgid "If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured."
 msgstr "Si coché, plusieurs articles peuvent être utilisés pour un seul ordre de fabrication. Ceci est utile si un ou plusieurs produits chronophages sont en cours de fabrication."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:36
 msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
 msgstr "Si coché, le coût de la nomenclature sera automatiquement mis à jour en fonction du taux de valorisation / prix de la liste prix / dernier prix d'achat des matières premières."
 
-#: stock/doctype/item/item.js:814
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
+msgstr ""
+
+#. Description of the 'Is Rejected Warehouse' (Check) field in DocType
+#. 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "If yes, then this warehouse will be used to store rejected materials"
+msgstr ""
+
+#: stock/doctype/item/item.js:894
 msgid "If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item."
 msgstr ""
 
@@ -31389,7 +31909,11 @@
 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:1605
+#: manufacturing/doctype/production_plan/production_plan.py:920
+msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.py:1625
 msgid "If you still want to proceed, please enable {0}."
 msgstr ""
 
@@ -31456,17 +31980,21 @@
 msgid "Ignore Empty Stock"
 msgstr ""
 
+#: accounts/report/general_ledger/general_ledger.js:209
+msgid "Ignore Exchange Rate Revaluation Journals"
+msgstr ""
+
 #. Label of a Check field in DocType 'Process Statement Of Accounts'
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 msgctxt "Process Statement Of Accounts"
 msgid "Ignore Exchange Rate Revaluation Journals"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:800
+#: selling/doctype/sales_order/sales_order.js:916
 msgid "Ignore Existing Ordered Qty"
 msgstr "Ignorer la quantité commandée existante"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1597
+#: manufacturing/doctype/production_plan/production_plan.py:1617
 msgid "Ignore Existing Projected Quantity"
 msgstr "Ignorer la quantité projetée existante"
 
@@ -31530,7 +32058,7 @@
 msgid "Ignore Pricing Rule"
 msgstr "Ignorez Règle de Prix"
 
-#: selling/page/point_of_sale/pos_payment.js:187
+#: selling/page/point_of_sale/pos_payment.js:188
 msgid "Ignore Pricing Rule is enabled. Cannot apply coupon code."
 msgstr ""
 
@@ -31853,10 +32381,15 @@
 msgid "Image View"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:118
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:132
 msgid "Import"
 msgstr "Importer"
 
+#. Description of a DocType
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json
+msgid "Import Chart of Accounts from a csv file"
+msgstr ""
+
 #. Label of a Link in the Home Workspace
 #. Label of a Link in the Settings Workspace
 #: setup/workspace/home/home.json setup/workspace/settings/settings.json
@@ -31869,7 +32402,7 @@
 msgid "Import Data from Spreadsheet"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:66
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:71
 msgid "Import Day Book Data"
 msgstr "Données du journal d'importation"
 
@@ -31909,7 +32442,7 @@
 msgid "Import Log Preview"
 msgstr "Importer l&#39;aperçu du journal"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:54
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:59
 msgid "Import Master Data"
 msgstr "Importer des données de base"
 
@@ -31919,11 +32452,11 @@
 msgid "Import Preview"
 msgstr "Aperçu d&#39;importation"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:61
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
 msgid "Import Progress"
 msgstr "Progression de l&#39;importation"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:130
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:144
 msgid "Import Successful"
 msgstr "Importation réussie"
 
@@ -31944,8 +32477,8 @@
 msgid "Import Type"
 msgstr "Type d&#39;importation"
 
-#: public/js/utils/serial_no_batch_selector.js:197
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:77
+#: public/js/utils/serial_no_batch_selector.js:200
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:80
 msgid "Import Using CSV file"
 msgstr ""
 
@@ -31961,7 +32494,7 @@
 msgid "Import from Google Sheets"
 msgstr "Importer depuis Google Sheets"
 
-#: stock/doctype/item_price/item_price.js:27
+#: stock/doctype/item_price/item_price.js:29
 msgid "Import in Bulk"
 msgstr "Importer en Masse"
 
@@ -31973,7 +32506,7 @@
 msgid "Importing Parties and Addresses"
 msgstr "Parties importatrices et adresses"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:47
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:45
 msgid "Importing {0} of {1}, {2}"
 msgstr "Importation de {0} de {1}, {2}"
 
@@ -31984,7 +32517,7 @@
 msgid "In House"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:20
+#: assets/doctype/asset/asset_list.js:15
 msgid "In Maintenance"
 msgstr "En maintenance"
 
@@ -32012,8 +32545,8 @@
 msgid "In Minutes"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:149
-#: accounts/report/accounts_receivable/accounts_receivable.js:181
+#: accounts/report/accounts_payable/accounts_payable.js:152
+#: accounts/report/accounts_receivable/accounts_receivable.js:184
 msgid "In Party Currency"
 msgstr ""
 
@@ -32060,10 +32593,10 @@
 msgid "In Production"
 msgstr "En production"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:65
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:52
 #: accounts/doctype/ledger_merge/ledger_merge.js:19
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:36
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:60
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:40
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:66
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:7
 msgid "In Progress"
 msgstr "En cours"
@@ -32124,11 +32657,17 @@
 msgstr "En cours"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:80
-#: stock/report/stock_balance/stock_balance.py:433
-#: stock/report/stock_ledger/stock_ledger.py:139
+#: stock/report/stock_balance/stock_balance.py:441
+#: stock/report/stock_ledger/stock_ledger.py:212
 msgid "In Qty"
 msgstr "En Qté"
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "In Stock"
+msgstr ""
+
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:12
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:22
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:30
 msgid "In Stock Qty"
 msgstr "Qté En Stock"
@@ -32150,15 +32689,15 @@
 msgid "In Transit"
 msgstr "En transit"
 
-#: stock/doctype/material_request/material_request.js:375
+#: stock/doctype/material_request/material_request.js:445
 msgid "In Transit Transfer"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:344
+#: stock/doctype/material_request/material_request.js:414
 msgid "In Transit Warehouse"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:439
+#: stock/report/stock_balance/stock_balance.py:447
 msgid "In Value"
 msgstr "En valeur"
 
@@ -32343,7 +32882,7 @@
 msgid "In minutes"
 msgstr "En minutes"
 
-#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:7
+#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:8
 msgid "In row {0} of Appointment Booking Slots: \"To Time\" must be later than \"From Time\"."
 msgstr ""
 
@@ -32358,7 +32897,11 @@
 msgid "In the case of 'Use Multi-Level BOM' in a work order, if the user wishes to add sub-assembly costs to Finished Goods items without using a job card as well the scrap items, then this option needs to be enable."
 msgstr ""
 
-#: stock/doctype/item/item.js:839
+#: accounts/doctype/loyalty_program/loyalty_program.js:12
+msgid "In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent"
+msgstr ""
+
+#: stock/doctype/item/item.js:927
 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc."
 msgstr ""
 
@@ -32394,6 +32937,12 @@
 msgid "Inactive Sales Items"
 msgstr "Articles de vente inactifs"
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Inactive Status"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:93
 msgid "Incentives"
 msgstr "Incitations"
@@ -32404,7 +32953,7 @@
 msgid "Incentives"
 msgstr "Incitations"
 
-#: accounts/report/payment_ledger/payment_ledger.js:77
+#: accounts/report/payment_ledger/payment_ledger.js:76
 msgid "Include Account Currency"
 msgstr ""
 
@@ -32415,27 +32964,27 @@
 msgstr "Inclure le résumé du vieillissement"
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:54
-#: assets/report/fixed_asset_register/fixed_asset_register.js:55
+#: assets/report/fixed_asset_register/fixed_asset_register.js:54
 msgid "Include Default FB Assets"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:34
-#: accounts/report/cash_flow/cash_flow.js:20
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:107
+#: accounts/report/balance_sheet/balance_sheet.js:29
+#: 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/trial_balance/trial_balance.js:98
+#: accounts/report/trial_balance/trial_balance.js:104
 msgid "Include Default FB Entries"
 msgstr "Inclure les entrées de livre par défaut"
 
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:60
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:55
 msgid "Include Disabled"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:85
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:88
 msgid "Include Expired"
 msgstr "Inclure expiré"
 
-#: selling/doctype/sales_order/sales_order.js:798
+#: selling/doctype/sales_order/sales_order.js:912
 msgid "Include Exploded Items"
 msgstr "Inclure les articles éclatés"
 
@@ -32505,7 +33054,7 @@
 msgid "Include Non Stock Items"
 msgstr "Inclure les articles non stockés"
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:44
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:45
 msgid "Include POS Transactions"
 msgstr "Inclure les transactions du point de vente"
 
@@ -32539,7 +33088,7 @@
 msgid "Include Safety Stock in Required Qty Calculation"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:88
+#: manufacturing/report/production_planning_report/production_planning_report.js:87
 msgid "Include Sub-assembly Raw Materials"
 msgstr "Inclure les matières premières de sous-assemblage"
 
@@ -32549,12 +33098,12 @@
 msgid "Include Subcontracted Items"
 msgstr "Inclure les articles sous-traités"
 
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:57
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
 msgid "Include Timesheets in Draft Status"
 msgstr ""
 
 #: stock/report/stock_balance/stock_balance.js:84
-#: stock/report/stock_ledger/stock_ledger.js:82
+#: stock/report/stock_ledger/stock_ledger.js:90
 #: stock/report/stock_projected_qty/stock_projected_qty.js:51
 msgid "Include UOM"
 msgstr "Inclure UdM"
@@ -32585,10 +33134,10 @@
 
 #: 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:28
+#: accounts/report/account_balance/account_balance.js:27
 #: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:172
 #: accounts/report/profitability_analysis/profitability_analysis.py:182
-#: public/js/financial_statements.js:35
+#: public/js/financial_statements.js:36
 msgid "Income"
 msgstr "Revenus"
 
@@ -32611,7 +33160,7 @@
 msgid "Income"
 msgstr "Revenus"
 
-#: accounts/report/account_balance/account_balance.js:51
+#: 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
 msgid "Income Account"
@@ -32684,7 +33233,7 @@
 msgstr ""
 
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:163
-#: stock/report/stock_ledger/stock_ledger.py:189
+#: 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
 msgid "Incoming Rate"
@@ -32708,12 +33257,6 @@
 msgid "Incoming Rate"
 msgstr "Prix d'Entrée"
 
-#. Label of a Float field in DocType 'Serial and Batch Entry'
-#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
-msgctxt "Serial and Batch Entry"
-msgid "Incoming Rate"
-msgstr "Prix d'Entrée"
-
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
@@ -32735,16 +33278,16 @@
 msgid "Incorrect Balance Qty After Transaction"
 msgstr "Equilibre des quantités aprés une transaction"
 
-#: controllers/subcontracting_controller.py:710
+#: controllers/subcontracting_controller.py:714
 msgid "Incorrect Batch Consumed"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:278
+#: assets/doctype/asset/asset.py:280
 #: assets/doctype/asset_value_adjustment/asset_value_adjustment.py:74
 msgid "Incorrect Date"
 msgstr "Date incorrecte"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:99
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:120
 msgid "Incorrect Invoice"
 msgstr ""
 
@@ -32757,12 +33300,16 @@
 msgid "Incorrect Payment Type"
 msgstr ""
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+msgid "Incorrect Reference Document (Purchase Receipt Item)"
+msgstr ""
+
 #. Name of a report
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.json
 msgid "Incorrect Serial No Valuation"
 msgstr "Valorisation inccorecte par Num. Série / Lots"
 
-#: controllers/subcontracting_controller.py:723
+#: controllers/subcontracting_controller.py:727
 msgid "Incorrect Serial Number Consumed"
 msgstr ""
 
@@ -32771,15 +33318,15 @@
 msgid "Incorrect Stock Value Report"
 msgstr ""
 
-#: stock/serial_batch_bundle.py:95
+#: stock/serial_batch_bundle.py:96
 msgid "Incorrect Type of Transaction"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:115
+#: stock/doctype/stock_settings/stock_settings.py:118
 msgid "Incorrect Warehouse"
 msgstr "Entrepôt incorrect"
 
-#: accounts/general_ledger.py:47
+#: accounts/general_ledger.py:51
 msgid "Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction."
 msgstr "Nombre incorrect d'Écritures Grand Livre trouvées. Vous avez peut-être choisi le mauvais Compte dans la transaction."
 
@@ -32930,11 +33477,11 @@
 msgid "Individual"
 msgstr "Individuel"
 
-#: accounts/doctype/gl_entry/gl_entry.py:336
+#: accounts/doctype/gl_entry/gl_entry.py:290
 msgid "Individual GL Entry cannot be cancelled."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:326
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:337
 msgid "Individual Stock Ledger Entry cannot be cancelled."
 msgstr ""
 
@@ -32979,7 +33526,13 @@
 msgid "Initial Email Notification Sent"
 msgstr "Notification initiale par e-mail envoyée"
 
-#: accounts/doctype/payment_request/payment_request_list.js:11
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Initialize Summary Table"
+msgstr ""
+
+#: accounts/doctype/payment_request/payment_request_list.js:10
 msgid "Initiated"
 msgstr "Initié"
 
@@ -33010,7 +33563,7 @@
 msgid "Insert New Records"
 msgstr "Insérer de nouveaux enregistrements"
 
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:34
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:33
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:109
 msgid "Inspected By"
 msgstr "Inspecté Par"
@@ -33021,11 +33574,11 @@
 msgid "Inspected By"
 msgstr "Inspecté Par"
 
-#: controllers/stock_controller.py:666
+#: controllers/stock_controller.py:849
 msgid "Inspection Rejected"
 msgstr ""
 
-#: controllers/stock_controller.py:636 controllers/stock_controller.py:638
+#: controllers/stock_controller.py:819 controllers/stock_controller.py:821
 msgid "Inspection Required"
 msgstr "Inspection obligatoire"
 
@@ -33047,7 +33600,7 @@
 msgid "Inspection Required before Purchase"
 msgstr "Inspection Requise à la réception"
 
-#: controllers/stock_controller.py:653
+#: controllers/stock_controller.py:836
 msgid "Inspection Submission"
 msgstr ""
 
@@ -33069,7 +33622,7 @@
 
 #. Name of a DocType
 #: selling/doctype/installation_note/installation_note.json
-#: stock/doctype/delivery_note/delivery_note.js:171
+#: stock/doctype/delivery_note/delivery_note.js:191
 msgid "Installation Note"
 msgstr "Note d'Installation"
 
@@ -33086,7 +33639,7 @@
 msgid "Installation Note Item"
 msgstr "Article Remarque d'Installation"
 
-#: stock/doctype/delivery_note/delivery_note.py:688
+#: stock/doctype/delivery_note/delivery_note.py:749
 msgid "Installation Note {0} has already been submitted"
 msgstr "Note d'Installation {0} à déjà été sousmise"
 
@@ -33151,19 +33704,19 @@
 msgid "Insufficient Capacity"
 msgstr ""
 
-#: controllers/accounts_controller.py:3130
-#: controllers/accounts_controller.py:3154
+#: controllers/accounts_controller.py:3221
+#: controllers/accounts_controller.py:3245
 msgid "Insufficient Permissions"
 msgstr "Permissions insuffisantes"
 
-#: stock/doctype/pick_list/pick_list.py:705
-#: stock/doctype/stock_entry/stock_entry.py:776
-#: stock/serial_batch_bundle.py:880 stock/stock_ledger.py:1369
-#: stock/stock_ledger.py:1840
+#: stock/doctype/pick_list/pick_list.py:776
+#: stock/doctype/stock_entry/stock_entry.py:731
+#: stock/serial_batch_bundle.py:899 stock/stock_ledger.py:1395
+#: stock/stock_ledger.py:1847
 msgid "Insufficient Stock"
 msgstr "Stock insuffisant"
 
-#: stock/stock_ledger.py:1855
+#: stock/stock_ledger.py:1862
 msgid "Insufficient Stock for Batch"
 msgstr ""
 
@@ -33304,11 +33857,11 @@
 msgid "Interest"
 msgstr "Intérêt"
 
-#: accounts/doctype/payment_entry/payment_entry.py:2339
+#: accounts/doctype/payment_entry/payment_entry.py:2364
 msgid "Interest and/or dunning fee"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:40
+#: crm/report/lead_details/lead_details.js:39
 msgid "Interested"
 msgstr "Intéressé"
 
@@ -33332,11 +33885,11 @@
 msgid "Internal Customer for company {0} already exists"
 msgstr ""
 
-#: controllers/accounts_controller.py:533
+#: controllers/accounts_controller.py:577
 msgid "Internal Sale or Delivery Reference missing."
 msgstr ""
 
-#: controllers/accounts_controller.py:535
+#: controllers/accounts_controller.py:579
 msgid "Internal Sales Reference Missing"
 msgstr ""
 
@@ -33385,7 +33938,7 @@
 msgid "Internal Transfer"
 msgstr "Transfert Interne"
 
-#: controllers/accounts_controller.py:544
+#: controllers/accounts_controller.py:588
 msgid "Internal Transfer Reference Missing"
 msgstr ""
 
@@ -33399,7 +33952,7 @@
 msgid "Internal Work History"
 msgstr "Historique de Travail Interne"
 
-#: controllers/stock_controller.py:735
+#: controllers/stock_controller.py:918
 msgid "Internal transfers can only be done in company's default currency"
 msgstr ""
 
@@ -33434,14 +33987,14 @@
 msgid "Invalid"
 msgstr "Invalide"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:377
-#: accounts/doctype/sales_invoice/sales_invoice.py:876
-#: accounts/doctype/sales_invoice/sales_invoice.py:886
+#: 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:2531
-#: controllers/accounts_controller.py:2537
+#: controllers/accounts_controller.py:2616
+#: controllers/accounts_controller.py:2622
 msgid "Invalid Account"
 msgstr "Compte invalide"
 
@@ -33449,7 +34002,7 @@
 msgid "Invalid Attribute"
 msgstr "Attribut invalide"
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 msgid "Invalid Auto Repeat Date"
 msgstr ""
 
@@ -33457,7 +34010,7 @@
 msgid "Invalid Barcode. There is no Item attached to this barcode."
 msgstr "Code à barres invalide. Il n'y a pas d'article attaché à ce code à barres."
 
-#: public/js/controllers/transaction.js:2360
+#: public/js/controllers/transaction.js:2413
 msgid "Invalid Blanket Order for the selected Customer and Item"
 msgstr "Commande avec limites non valide pour le client et l'article sélectionnés"
 
@@ -33465,12 +34018,12 @@
 msgid "Invalid Child Procedure"
 msgstr "Procédure enfant non valide"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1977
+#: accounts/doctype/sales_invoice/sales_invoice.py:1946
 msgid "Invalid Company for Inter Company Transaction."
 msgstr "Société non valide pour une transaction inter-sociétés."
 
-#: assets/doctype/asset/asset.py:249 assets/doctype/asset/asset.py:256
-#: controllers/accounts_controller.py:2552
+#: assets/doctype/asset/asset.py:251 assets/doctype/asset/asset.py:258
+#: controllers/accounts_controller.py:2637
 msgid "Invalid Cost Center"
 msgstr ""
 
@@ -33478,11 +34031,11 @@
 msgid "Invalid Credentials"
 msgstr "Les informations d&#39;identification invalides"
 
-#: selling/doctype/sales_order/sales_order.py:318
+#: selling/doctype/sales_order/sales_order.py:321
 msgid "Invalid Delivery Date"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:88
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
 msgid "Invalid Document"
 msgstr ""
 
@@ -33495,7 +34048,7 @@
 msgid "Invalid Formula"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:367
+#: assets/doctype/asset/asset.py:369
 msgid "Invalid Gross Purchase Amount"
 msgstr "Montant d'achat brut non valide"
 
@@ -33507,12 +34060,12 @@
 msgid "Invalid Item"
 msgstr "Élément non valide"
 
-#: stock/doctype/item/item.py:1371
+#: stock/doctype/item/item.py:1372
 msgid "Invalid Item Defaults"
 msgstr ""
 
 #: accounts/doctype/pos_closing_entry/pos_closing_entry.py:59
-#: accounts/general_ledger.py:677
+#: accounts/general_ledger.py:686
 msgid "Invalid Opening Entry"
 msgstr "Entrée d'ouverture non valide"
 
@@ -33520,11 +34073,11 @@
 msgid "Invalid POS Invoices"
 msgstr "Factures PDV non valides"
 
-#: accounts/doctype/account/account.py:320
+#: accounts/doctype/account/account.py:339
 msgid "Invalid Parent Account"
 msgstr "Compte parent non valide"
 
-#: public/js/controllers/buying.js:338
+#: public/js/controllers/buying.js:333
 msgid "Invalid Part Number"
 msgstr "Numéro de pièce non valide"
 
@@ -33544,24 +34097,24 @@
 msgid "Invalid Process Loss Configuration"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:599
+#: accounts/doctype/payment_entry/payment_entry.py:608
 msgid "Invalid Purchase Invoice"
 msgstr ""
 
-#: controllers/accounts_controller.py:3169
+#: controllers/accounts_controller.py:3260
 msgid "Invalid Qty"
 msgstr ""
 
-#: controllers/accounts_controller.py:1021
+#: controllers/accounts_controller.py:1085
 msgid "Invalid Quantity"
 msgstr "Quantité invalide"
 
-#: assets/doctype/asset/asset.py:411 assets/doctype/asset/asset.py:417
-#: assets/doctype/asset/asset.py:444
+#: assets/doctype/asset/asset.py:413 assets/doctype/asset/asset.py:419
+#: assets/doctype/asset/asset.py:446
 msgid "Invalid Schedule"
 msgstr ""
 
-#: controllers/selling_controller.py:225
+#: controllers/selling_controller.py:226
 msgid "Invalid Selling Price"
 msgstr "Prix de vente invalide"
 
@@ -33594,22 +34147,21 @@
 msgid "Invalid reference {0} {1}"
 msgstr "Référence invalide {0} {1}"
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:101
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:102
 msgid "Invalid result key. Response:"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:229
-#: accounts/doctype/gl_entry/gl_entry.py:239
 #: 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
 msgid "Invalid value {0} for {1} against account {2}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:569
+#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:642
 msgid "Invalid {0}"
 msgstr "Invalide {0}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1975
+#: accounts/doctype/sales_invoice/sales_invoice.py:1944
 msgid "Invalid {0} for Inter Company Transaction."
 msgstr "{0} non valide pour la transaction inter-société."
 
@@ -33629,7 +34181,7 @@
 msgid "Inventory Dimension"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:147
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:157
 msgid "Inventory Dimension Negative Stock"
 msgstr ""
 
@@ -33687,7 +34239,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/invoice_discounting/invoice_discounting.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:144
+#: accounts/doctype/sales_invoice/sales_invoice.js:151
 msgid "Invoice Discounting"
 msgstr "Rabais de facture"
 
@@ -33698,7 +34250,7 @@
 msgid "Invoice Discounting"
 msgstr "Rabais de facture"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1065
+#: accounts/report/accounts_receivable/accounts_receivable.py:1073
 msgid "Invoice Grand Total"
 msgstr "Total général de la facture"
 
@@ -33775,7 +34327,8 @@
 msgid "Invoice Status"
 msgstr "État de la facture"
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:7
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:85
 msgid "Invoice Type"
 msgstr "Type de facture"
 
@@ -33810,7 +34363,7 @@
 msgid "Invoice Type"
 msgstr "Type de facture"
 
-#: projects/doctype/timesheet/timesheet.py:376
+#: projects/doctype/timesheet/timesheet.py:386
 msgid "Invoice already created for all billing hours"
 msgstr "Facture déjà créée pour toutes les heures facturées"
 
@@ -33820,12 +34373,13 @@
 msgid "Invoice and Billing"
 msgstr "Facturation"
 
-#: projects/doctype/timesheet/timesheet.py:373
+#: projects/doctype/timesheet/timesheet.py:383
 msgid "Invoice can't be made for zero billing hour"
 msgstr "La facture ne peut pas être faite pour une heure facturée à zéro"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:168
-#: accounts/report/accounts_receivable/accounts_receivable.py:1067
+#: 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
 msgid "Invoiced Amount"
@@ -33835,7 +34389,7 @@
 msgid "Invoiced Qty"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2028
+#: accounts/doctype/sales_invoice/sales_invoice.py:1997
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
 msgid "Invoices"
 msgstr "Factures"
@@ -33917,7 +34471,7 @@
 msgid "Is Account Payable"
 msgstr "Est Compte Créditeur"
 
-#: projects/report/project_summary/project_summary.js:17
+#: projects/report/project_summary/project_summary.js:16
 msgid "Is Active"
 msgstr "Est Active"
 
@@ -33976,7 +34530,7 @@
 msgid "Is Advance"
 msgstr "Est Accompte"
 
-#: selling/doctype/quotation/quotation.js:294
+#: selling/doctype/quotation/quotation.js:306
 msgid "Is Alternative"
 msgstr ""
 
@@ -34284,9 +34838,9 @@
 msgid "Is Fully Depreciated"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:110
-#: accounts/doctype/cost_center/cost_center_tree.js:23
-#: stock/doctype/warehouse/warehouse_tree.js:16
+#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/cost_center/cost_center_tree.js:30
+#: stock/doctype/warehouse/warehouse_tree.js:20
 msgid "Is Group"
 msgstr "Est un Groupe"
 
@@ -34560,7 +35114,13 @@
 msgid "Is Rejected"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.js:64
+#. Label of a Check field in DocType 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "Is Rejected Warehouse"
+msgstr ""
+
+#: accounts/report/pos_register/pos_register.js:63
 #: accounts/report/pos_register/pos_register.py:226
 msgid "Is Return"
 msgstr "Est un Retour"
@@ -34710,7 +35270,7 @@
 msgstr "Cette Taxe est-elle incluse dans le Prix de Base ?"
 
 #. Name of a DocType
-#: assets/doctype/asset/asset_list.js:26 public/js/communication.js:12
+#: assets/doctype/asset/asset_list.js:19 public/js/communication.js:13
 #: support/doctype/issue/issue.json
 msgid "Issue"
 msgstr "Ticket"
@@ -34775,15 +35335,15 @@
 msgid "Issue Date"
 msgstr "Date d'Émission"
 
-#: stock/doctype/material_request/material_request.js:127
+#: stock/doctype/material_request/material_request.js:138
 msgid "Issue Material"
 msgstr "Problème Matériel"
 
 #. Name of a DocType
 #: support/doctype/issue_priority/issue_priority.json
-#: support/report/issue_analytics/issue_analytics.js:64
+#: support/report/issue_analytics/issue_analytics.js:63
 #: support/report/issue_analytics/issue_analytics.py:64
-#: support/report/issue_summary/issue_summary.js:52
+#: support/report/issue_summary/issue_summary.js:51
 #: support/report/issue_summary/issue_summary.py:61
 msgid "Issue Priority"
 msgstr "Priorité d'émission"
@@ -34831,7 +35391,7 @@
 msgid "Issue a debit note with 0 qty against an existing Sales Invoice"
 msgstr "Creer une note de débit avec une quatité à O pour la facture"
 
-#: stock/doctype/material_request/material_request_list.js:29
+#: stock/doctype/material_request/material_request_list.js:33
 msgid "Issued"
 msgstr "Publié"
 
@@ -34883,70 +35443,79 @@
 msgid "It can take upto few hours for accurate stock values to be visible after merging items."
 msgstr ""
 
-#: public/js/controllers/transaction.js:1839
+#: public/js/controllers/transaction.js:1882
 msgid "It is needed to fetch Item Details."
 msgstr "Nécessaire pour aller chercher les Détails de l'Article."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:135
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:156
 msgid "It's not possible to distribute charges equally when total amount is zero, please set 'Distribute Charges Based On' as 'Quantity'"
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:16
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:15
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:32
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:22
 #: buying/report/procurement_tracker/procurement_tracker.py:60
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:50
+#: 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:1018
+#: controllers/taxes_and_totals.py:1019
+#: 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_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:67
-#: manufacturing/report/process_loss_report/process_loss_report.js:16
+#: 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
-#: public/js/bom_configurator/bom_configurator.bundle.js:202
-#: public/js/bom_configurator/bom_configurator.bundle.js:270
+#: 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
 #: public/js/purchase_trends_filters.js:48
-#: public/js/purchase_trends_filters.js:65 public/js/sales_trends_filters.js:23
-#: public/js/sales_trends_filters.js:41 public/js/stock_analytics.js:61
-#: selling/doctype/sales_order/sales_order.js:977
-#: selling/report/customer_wise_item_price/customer_wise_item_price.js:15
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:37
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:63
-#: stock/dashboard/item_dashboard.js:208 stock/doctype/item/item.json
+#: public/js/purchase_trends_filters.js:63 public/js/sales_trends_filters.js:23
+#: public/js/sales_trends_filters.js:39 public/js/stock_analytics.js:92
+#: selling/doctype/sales_order/sales_order.js:1139
+#: selling/page/point_of_sale/pos_item_cart.js:46
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:14
+#: 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/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
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:24
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:32
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:74
-#: stock/report/item_price_stock/item_price_stock.js:9
+#: stock/report/item_price_stock/item_price_stock.js:8
 #: 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:11
+#: stock/report/item_variant_details/item_variant_details.js:10
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55
 #: 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:33
+#: stock/report/reserved_stock/reserved_stock.js:30
 #: stock/report/reserved_stock/reserved_stock.py:103
 #: 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:16
+#: stock/report/stock_analytics/stock_analytics.js:15
 #: stock/report/stock_analytics/stock_analytics.py:30
 #: stock/report/stock_balance/stock_balance.js:39
-#: stock/report/stock_balance/stock_balance.py:361
+#: stock/report/stock_balance/stock_balance.py:369
 #: stock/report/stock_ledger/stock_ledger.js:42
-#: stock/report/stock_ledger/stock_ledger.py:109
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:32
+#: 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 templates/generators/bom.html:19
-#: templates/pages/material_request_info.html:42 templates/pages/order.html:83
+#: templates/emails/reorder_item.html:8
+#: templates/form_grid/material_request_grid.html:6
+#: templates/form_grid/stock_entry_grid.html:8 templates/generators/bom.html:19
+#: templates/pages/material_request_info.html:42 templates/pages/order.html:95
 msgid "Item"
 msgstr "Article"
 
@@ -35140,6 +35709,10 @@
 msgid "Item Barcode"
 msgstr "Code barre article"
 
+#: selling/page/point_of_sale/pos_item_cart.js:46
+msgid "Item Cart"
+msgstr ""
+
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:69
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:36
 #: accounts/report/gross_profit/gross_profit.py:224
@@ -35149,40 +35722,41 @@
 #: 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/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:9
+#: 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/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:76
+#: 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/quality_inspection_summary/quality_inspection_summary.js:28
+#: 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:187
-#: public/js/controllers/transaction.js:2112 public/js/utils.js:459
-#: public/js/utils.js:606 selling/doctype/quotation/quotation.js:268
-#: selling/doctype/sales_order/sales_order.js:291
-#: selling/doctype/sales_order/sales_order.js:392
-#: selling/doctype/sales_order/sales_order.js:682
-#: selling/doctype/sales_order/sales_order.js:806
+#: 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
+#: selling/doctype/sales_order/sales_order.js:318
+#: selling/doctype/sales_order/sales_order.js:422
+#: selling/doctype/sales_order/sales_order.js:784
+#: selling/doctype/sales_order/sales_order.js:926
 #: selling/report/customer_wise_item_price/customer_wise_item_price.py:29
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:27
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:19
 #: selling/report/sales_order_analysis/sales_order_analysis.py:241
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:86
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:16
+#: 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:8
+#: 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/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:8
+#: stock/report/serial_no_ledger/serial_no_ledger.js:7
 #: stock/report/stock_ageing/stock_ageing.py:119
 #: 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
@@ -35574,7 +36148,7 @@
 msgid "Item Code"
 msgstr "Code de l'Article"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:61
+#: manufacturing/doctype/bom_creator/bom_creator.js:60
 msgid "Item Code (Final Product)"
 msgstr ""
 
@@ -35582,12 +36156,12 @@
 msgid "Item Code cannot be changed for Serial No."
 msgstr "Code de l'Article ne peut pas être modifié pour le Numéro de Série"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:444
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:448
 msgid "Item Code required at Row No {0}"
 msgstr "Code de l'Article est requis à la Ligne No {0}"
 
-#: selling/page/point_of_sale/pos_controller.js:672
-#: selling/page/point_of_sale/pos_item_details.js:251
+#: selling/page/point_of_sale/pos_controller.js:704
+#: selling/page/point_of_sale/pos_item_details.js:262
 msgid "Item Code: {0} is not available under warehouse {1}."
 msgstr "Code d'article: {0} n'est pas disponible dans l'entrepôt {1}."
 
@@ -35655,6 +36229,10 @@
 msgid "Item Description"
 msgstr "Description de l'Article"
 
+#: selling/page/point_of_sale/pos_item_details.js:28
+msgid "Item Details"
+msgstr "Détails d'article"
+
 #. Label of a Section Break field in DocType 'Production Plan Sub Assembly
 #. Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -35663,9 +36241,9 @@
 msgstr "Détails d'article"
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:43
+#: accounts/report/gross_profit/gross_profit.js:44
 #: accounts/report/gross_profit/gross_profit.py:237
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:22
+#: 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
@@ -35673,36 +36251,38 @@
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:181
 #: accounts/report/purchase_register/purchase_register.js:58
 #: accounts/report/sales_register/sales_register.js:70
+#: manufacturing/doctype/plant_floor/plant_floor.js:100
+#: manufacturing/doctype/workstation/workstation_job_card.html:94
 #: public/js/purchase_trends_filters.js:49 public/js/sales_trends_filters.js:24
-#: selling/page/point_of_sale/pos_item_selector.js:159
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:31
+#: selling/page/point_of_sale/pos_item_selector.js:156
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:30
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:35
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:55
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:54
 #: selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:89
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:42
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:41
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:54
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:41
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:93
+#: 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/delayed_item_report/delayed_item_report.js:49
-#: stock/report/delayed_order_report/delayed_order_report.js:49
+#: 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/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_analytics/stock_analytics.js:9
+#: stock/report/stock_analytics/stock_analytics.js:8
 #: stock/report/stock_analytics/stock_analytics.py:39
 #: stock/report/stock_balance/stock_balance.js:32
-#: stock/report/stock_balance/stock_balance.py:369
+#: stock/report/stock_balance/stock_balance.py:377
 #: stock/report/stock_ledger/stock_ledger.js:53
-#: stock/report/stock_ledger/stock_ledger.py:174
+#: stock/report/stock_ledger/stock_ledger.py:247
 #: stock/report/stock_projected_qty/stock_projected_qty.js:39
 #: stock/report/stock_projected_qty/stock_projected_qty.py:108
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:25
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:24
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:94
 msgid "Item Group"
 msgstr "Groupe d'Article"
@@ -35922,7 +36502,7 @@
 msgid "Item Group Name"
 msgstr "Nom du Groupe d'Article"
 
-#: setup/doctype/item_group/item_group.js:65
+#: setup/doctype/item_group/item_group.js:82
 msgid "Item Group Tree"
 msgstr "Arborescence de Groupe d'Article"
 
@@ -35988,7 +36568,8 @@
 #: 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
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:95
+#: 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
@@ -35997,7 +36578,7 @@
 #: manufacturing/report/production_planning_report/production_planning_report.py:356
 #: 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:2118
+#: public/js/controllers/transaction.js:2161
 #: 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
@@ -36011,8 +36592,8 @@
 #: 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:367
-#: stock/report/stock_ledger/stock_ledger.py:115
+#: stock/report/stock_balance/stock_balance.py:375
+#: 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
@@ -36395,15 +36976,15 @@
 msgid "Item Price Stock"
 msgstr "Stock et prix de l'article"
 
-#: stock/get_item_details.py:878
+#: stock/get_item_details.py:889
 msgid "Item Price added for {0} in Price List {1}"
 msgstr "Prix de l'Article ajouté pour {0} dans la Liste de Prix {1}"
 
-#: stock/doctype/item_price/item_price.py:142
+#: stock/doctype/item_price/item_price.py:136
 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:862
+#: stock/get_item_details.py:873
 msgid "Item Price updated for {0} in Price List {1}"
 msgstr "Prix de l'Article mis à jour pour {0} dans la Liste des Prix {1}"
 
@@ -36447,7 +37028,7 @@
 msgid "Item Reorder"
 msgstr "Réorganiser les Articles"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:130
 msgid "Item Row {0}: {1} {2} does not exist in above '{1}' table"
 msgstr "Ligne d'objet {0}: {1} {2} n'existe pas dans la table '{1}' ci-dessus"
 
@@ -36661,7 +37242,7 @@
 msgstr "Détails de la variante de l'article"
 
 #. Name of a DocType
-#: stock/doctype/item/item.js:94
+#: stock/doctype/item/item.js:114
 #: stock/doctype/item_variant_settings/item_variant_settings.json
 msgid "Item Variant Settings"
 msgstr "Paramètres de Variante d'Article"
@@ -36672,7 +37253,7 @@
 msgid "Item Variant Settings"
 msgstr "Paramètres de Variante d'Article"
 
-#: stock/doctype/item/item.js:667
+#: stock/doctype/item/item.js:744
 msgid "Item Variant {0} already exists with same attributes"
 msgstr "La Variante de l'Article {0} existe déjà avec les mêmes caractéristiques"
 
@@ -36767,7 +37348,7 @@
 msgid "Item and Warranty Details"
 msgstr "Détails de l'Article et de la Garantie"
 
-#: stock/doctype/stock_entry/stock_entry.py:2325
+#: stock/doctype/stock_entry/stock_entry.py:2359
 msgid "Item for row {0} does not match Material Request"
 msgstr "L'élément de la ligne {0} ne correspond pas à la demande de matériel"
 
@@ -36775,16 +37356,16 @@
 msgid "Item has variants."
 msgstr "L'article a des variantes."
 
-#: selling/page/point_of_sale/pos_item_details.js:110
+#: selling/page/point_of_sale/pos_item_details.js:108
 msgid "Item is removed since no serial / batch no selected."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:105
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:126
 msgid "Item must be added using 'Get Items from Purchase Receipts' button"
 msgstr "L'article doit être ajouté à l'aide du bouton 'Obtenir des éléments de Reçus d'Achat'"
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: selling/doctype/sales_order/sales_order.js:984
+#: selling/doctype/sales_order/sales_order.js:1146
 msgid "Item name"
 msgstr "Libellé de l'article"
 
@@ -36794,11 +37375,11 @@
 msgid "Item operation"
 msgstr "Opération de l'article"
 
-#: controllers/accounts_controller.py:3196
+#: controllers/accounts_controller.py:3287
 msgid "Item qty can not be updated as raw materials are already processed."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:857
+#: stock/doctype/stock_entry/stock_entry.py:813
 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
 msgstr ""
 
@@ -36808,7 +37389,11 @@
 msgid "Item to be manufactured or repacked"
 msgstr "Article à produire ou à réemballer"
 
-#: stock/utils.py:564
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Item valuation rate is recalculated considering landed cost voucher amount"
+msgstr ""
+
+#: stock/utils.py:559
 msgid "Item valuation reposting in progress. Report might show incorrect item valuation."
 msgstr ""
 
@@ -36820,11 +37405,11 @@
 msgid "Item {0} cannot be added as a sub-assembly of itself"
 msgstr ""
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:146
+#: manufacturing/doctype/blanket_order/blanket_order.py:189
 msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:231 stock/doctype/item/item.py:603
+#: assets/doctype/asset/asset.py:233 stock/doctype/item/item.py:603
 msgid "Item {0} does not exist"
 msgstr "Article {0} n'existe pas"
 
@@ -36832,7 +37417,7 @@
 msgid "Item {0} does not exist in the system or has expired"
 msgstr "L'article {0} n'existe pas dans le système ou a expiré"
 
-#: controllers/selling_controller.py:655
+#: controllers/selling_controller.py:679
 msgid "Item {0} entered multiple times."
 msgstr ""
 
@@ -36840,11 +37425,11 @@
 msgid "Item {0} has already been returned"
 msgstr "L'article {0} a déjà été retourné"
 
-#: assets/doctype/asset/asset.py:233
+#: assets/doctype/asset/asset.py:235
 msgid "Item {0} has been disabled"
 msgstr "L'article {0} a été désactivé"
 
-#: selling/doctype/sales_order/sales_order.py:645
+#: selling/doctype/sales_order/sales_order.py:651
 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No"
 msgstr ""
 
@@ -36852,7 +37437,7 @@
 msgid "Item {0} has reached its end of life on {1}"
 msgstr "L'article {0} a atteint sa fin de vie le {1}"
 
-#: stock/stock_ledger.py:111
+#: stock/stock_ledger.py:113
 msgid "Item {0} ignored since it is not a stock item"
 msgstr "L'article {0} est ignoré puisqu'il n'est pas en stock"
 
@@ -36876,43 +37461,43 @@
 msgid "Item {0} is not a stock Item"
 msgstr "Article {0} n'est pas un article stocké"
 
-#: stock/doctype/stock_entry/stock_entry.py:1538
+#: stock/doctype/stock_entry/stock_entry.py:1547
 msgid "Item {0} is not active or end of life has been reached"
 msgstr "L'article {0} n’est pas actif ou sa fin de vie a été atteinte"
 
-#: assets/doctype/asset/asset.py:235
+#: assets/doctype/asset/asset.py:237
 msgid "Item {0} must be a Fixed Asset Item"
 msgstr "L'article {0} doit être une Immobilisation"
 
-#: stock/get_item_details.py:228
+#: stock/get_item_details.py:233
 msgid "Item {0} must be a Non-Stock Item"
 msgstr ""
 
-#: stock/get_item_details.py:225
+#: stock/get_item_details.py:230
 msgid "Item {0} must be a Sub-contracted Item"
 msgstr "L'article {0} doit être un Article Sous-traité"
 
-#: assets/doctype/asset/asset.py:237
+#: assets/doctype/asset/asset.py:239
 msgid "Item {0} must be a non-stock item"
 msgstr "L'article {0} doit être un article hors stock"
 
-#: stock/doctype/stock_entry/stock_entry.py:1086
+#: stock/doctype/stock_entry/stock_entry.py:1095
 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}"
 msgstr ""
 
-#: stock/doctype/item_price/item_price.py:57
+#: stock/doctype/item_price/item_price.py:56
 msgid "Item {0} not found."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:342
+#: buying/doctype/purchase_order/purchase_order.py:343
 msgid "Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item)."
 msgstr "L'article {0} : Qté commandée {1} ne peut pas être inférieure à la qté de commande minimum {2} (défini dans l'Article)."
 
-#: manufacturing/doctype/production_plan/production_plan.js:418
+#: manufacturing/doctype/production_plan/production_plan.js:453
 msgid "Item {0}: {1} qty produced. "
 msgstr "Article {0}: {1} quantité produite."
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1131
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1190
 msgid "Item {} does not exist."
 msgstr ""
 
@@ -36958,9 +37543,12 @@
 msgid "Item: {0} does not exist in the system"
 msgstr "Article : {0} n'existe pas dans le système"
 
-#: public/js/utils.js:442 setup/doctype/item_group/item_group.js:70
-#: stock/doctype/delivery_note/delivery_note.js:364
-#: templates/generators/bom.html:38 templates/pages/rfq.html:37
+#: public/js/utils.js:489
+#: 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
+#: templates/form_grid/item_grid.html:6 templates/generators/bom.html:38
+#: templates/pages/rfq.html:37
 msgid "Items"
 msgstr "Articles"
 
@@ -37131,8 +37719,8 @@
 msgid "Items Filter"
 msgstr "Filtre d'articles"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1462
-#: selling/doctype/sales_order/sales_order.js:1018
+#: manufacturing/doctype/production_plan/production_plan.py:1484
+#: selling/doctype/sales_order/sales_order.js:1182
 msgid "Items Required"
 msgstr "Articles requis"
 
@@ -37148,15 +37736,15 @@
 msgid "Items and Pricing"
 msgstr "Articles et prix"
 
-#: controllers/accounts_controller.py:3416
+#: controllers/accounts_controller.py:3507
 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:824
+#: selling/doctype/sales_order/sales_order.js:962
 msgid "Items for Raw Material Request"
 msgstr "Articles pour demande de matière première"
 
-#: stock/doctype/stock_entry/stock_entry.py:853
+#: stock/doctype/stock_entry/stock_entry.py:809
 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}"
 msgstr ""
 
@@ -37166,7 +37754,7 @@
 msgid "Items to Be Repost"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1461
+#: manufacturing/doctype/production_plan/production_plan.py:1483
 msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
 msgstr "Les articles à fabriquer doivent extraire les matières premières qui leur sont associées."
 
@@ -37175,11 +37763,11 @@
 msgid "Items to Order and Receive"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:252
+#: selling/doctype/sales_order/sales_order.js:278
 msgid "Items to Reserve"
 msgstr ""
 
-#. Description of the 'Parent Warehouse' (Link) field in DocType 'Pick List'
+#. Description of the 'Warehouse' (Link) field in DocType 'Pick List'
 #: stock/doctype/pick_list/pick_list.json
 msgctxt "Pick List"
 msgid "Items under this warehouse will be suggested"
@@ -37204,11 +37792,18 @@
 msgid "JAN"
 msgstr ""
 
+#. Label of a Int field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Capacity"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/job_card/job_card.json
-#: manufacturing/doctype/job_card/job_card.py:765
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:28
+#: manufacturing/doctype/job_card/job_card.py:772
+#: 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
 msgid "Job Card"
 msgstr "Carte de travail"
@@ -37312,11 +37907,17 @@
 msgid "Job Card Time Log"
 msgstr "Journal de temps de la carte de travail"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:94
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Cards"
+msgstr ""
+
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:95
 msgid "Job Paused"
 msgstr ""
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:54
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:53
 msgid "Job Started"
 msgstr "Travail commencé"
 
@@ -37338,11 +37939,11 @@
 msgid "Job Title"
 msgstr "Titre de l'Emploi"
 
-#: manufacturing/doctype/work_order/work_order.py:1562
+#: manufacturing/doctype/work_order/work_order.py:1576
 msgid "Job card {0} created"
 msgstr "Job card {0} créée"
 
-#: utilities/bulk_transaction.py:48
+#: utilities/bulk_transaction.py:52
 msgid "Job: {0} has been triggered for processing failed transactions"
 msgstr ""
 
@@ -37356,19 +37957,20 @@
 msgid "Joining"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:29
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:30
 msgid "Journal Entries"
 msgstr ""
 
-#: accounts/utils.py:866
+#: accounts/utils.py:875
 msgid "Journal Entries {0} are un-linked"
 msgstr "Les Écritures de Journal {0} ne sont pas liées"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:146
+#: accounts/doctype/account/account_tree.js:205
 #: accounts/doctype/journal_entry/journal_entry.json
 #: accounts/print_format/journal_auditing_voucher/journal_auditing_voucher.html:10
-#: assets/doctype/asset/asset.js:246 assets/doctype/asset/asset.js:249
+#: assets/doctype/asset/asset.js:282 assets/doctype/asset/asset.js:291
+#: templates/form_grid/bank_reconciliation_grid.html:3
 msgid "Journal Entry"
 msgstr "Écriture de Journal"
 
@@ -37453,7 +38055,7 @@
 msgid "Journal Entry Type"
 msgstr "Type d'écriture au journal"
 
-#: accounts/doctype/journal_entry/journal_entry.py:471
+#: accounts/doctype/journal_entry/journal_entry.py:487
 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset."
 msgstr ""
 
@@ -37463,11 +38065,11 @@
 msgid "Journal Entry for Scrap"
 msgstr "Écriture de Journal pour la Mise au Rebut"
 
-#: accounts/doctype/journal_entry/journal_entry.py:232
+#: accounts/doctype/journal_entry/journal_entry.py:248
 msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:597
+#: accounts/doctype/journal_entry/journal_entry.py:624
 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
 msgstr "L’Écriture de Journal {0} n'a pas le compte {1} ou est déjà réconciliée avec une autre pièce justificative"
 
@@ -37477,14 +38079,19 @@
 msgid "Journals"
 msgstr "Journaux"
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:95
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:99
 msgid "Journals have been created"
 msgstr ""
 
-#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:104
 msgid "Kanban Board"
 msgstr "Tableau Kanban"
 
+#. Description of a DocType
+#: crm/doctype/campaign/campaign.json
+msgid "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. "
+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"
@@ -37505,11 +38112,11 @@
 msgid "Key Reports"
 msgstr "Rapports clés"
 
-#: manufacturing/doctype/job_card/job_card.py:768
+#: manufacturing/doctype/job_card/job_card.py:775
 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}."
 msgstr ""
 
-#: public/js/utils/party.js:221
+#: public/js/utils/party.js:264
 msgid "Kindly select the company first"
 msgstr "Veuillez d'abord sélectionner l'entreprise"
 
@@ -37649,7 +38256,7 @@
 msgid "Last Name"
 msgstr "Nom de Famille"
 
-#: stock/doctype/shipment/shipment.js:247
+#: stock/doctype/shipment/shipment.js:275
 msgid "Last Name, Email or Phone/Mobile of the user are mandatory to continue."
 msgstr ""
 
@@ -37692,7 +38299,7 @@
 msgid "Last Purchase Rate"
 msgstr "Dernier Prix d'Achat"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:313
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:324
 msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
 msgstr "La dernière transaction de stock pour l'article {0} dans l'entrepôt {1} a eu lieu le {2}."
 
@@ -37704,7 +38311,7 @@
 msgid "Latest"
 msgstr "Dernier"
 
-#: stock/report/stock_balance/stock_balance.py:479
+#: stock/report/stock_balance/stock_balance.py:487
 msgid "Latest Age"
 msgstr "Dernier âge"
 
@@ -37721,11 +38328,11 @@
 msgstr ""
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:34
+#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:33
 #: crm/report/lead_details/lead_details.py:18
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:8
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:28
-#: public/js/communication.js:20
+#: public/js/communication.js:25
 msgid "Lead"
 msgstr ""
 
@@ -37990,9 +38597,9 @@
 msgid "Leave blank to use the standard Delivery Note format"
 msgstr "Laissez vide pour utiliser le format de bon de livraison standard"
 
-#: accounts/doctype/journal_entry/journal_entry.js:18
-#: accounts/doctype/payment_entry/payment_entry.js:265
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:24
+#: accounts/doctype/journal_entry/journal_entry.js:54
+#: accounts/doctype/payment_entry/payment_entry.js:343
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:25
 msgid "Ledger"
 msgstr ""
 
@@ -38035,10 +38642,15 @@
 msgid "Left Index"
 msgstr "Index gauche"
 
-#: setup/doctype/company/company.py:389
+#: setup/doctype/company/company.py:388
 msgid "Legal"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/company/company.json
+msgid "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization."
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:59
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:84
 msgid "Legal Expenses"
@@ -38064,7 +38676,7 @@
 msgid "Length (cm)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:657
+#: accounts/doctype/payment_entry/payment_entry.js:807
 msgid "Less Than Amount"
 msgstr "Moins que le montant"
 
@@ -38385,7 +38997,7 @@
 msgid "Liabilities"
 msgstr "Passifs"
 
-#: accounts/report/account_balance/account_balance.js:27
+#: accounts/report/account_balance/account_balance.js:26
 msgid "Liability"
 msgstr "Passif"
 
@@ -38482,20 +39094,20 @@
 msgid "Link existing Quality Procedure."
 msgstr "Lier la procédure qualité existante."
 
-#: buying/doctype/purchase_order/purchase_order.js:487
+#: buying/doctype/purchase_order/purchase_order.js:564
 msgid "Link to Material Request"
 msgstr "Lien vers la demande de matériel"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:378
-#: buying/doctype/supplier_quotation/supplier_quotation.js:52
+#: buying/doctype/request_for_quotation/request_for_quotation.js:407
+#: buying/doctype/supplier_quotation/supplier_quotation.js:54
 msgid "Link to Material Requests"
 msgstr "Lien vers les demandes de matériel"
 
-#: buying/doctype/supplier/supplier.js:107
+#: buying/doctype/supplier/supplier.js:133
 msgid "Link with Customer"
 msgstr ""
 
-#: selling/doctype/customer/customer.js:173
+#: selling/doctype/customer/customer.js:189
 msgid "Link with Supplier"
 msgstr ""
 
@@ -38520,16 +39132,16 @@
 msgid "Linked with submitted documents"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:185
-#: selling/doctype/customer/customer.js:230
+#: buying/doctype/supplier/supplier.js:218
+#: selling/doctype/customer/customer.js:251
 msgid "Linking Failed"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:184
+#: buying/doctype/supplier/supplier.js:217
 msgid "Linking to Customer Failed. Please try again."
 msgstr ""
 
-#: selling/doctype/customer/customer.js:229
+#: selling/doctype/customer/customer.js:250
 msgid "Linking to Supplier Failed. Please try again."
 msgstr ""
 
@@ -38551,7 +39163,7 @@
 msgid "Load All Criteria"
 msgstr "Charger tous les critères"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:298
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:276
 msgid "Loading import file..."
 msgstr "Chargement du fichier d&#39;importation ..."
 
@@ -38660,6 +39272,11 @@
 msgid "Log Entries"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/item_price/item_price.json
+msgid "Log the selling and buying rate of an Item"
+msgstr ""
+
 #. Label of a Attach Image field in DocType 'Manufacturer'
 #: stock/doctype/manufacturer/manufacturer.json
 msgctxt "Manufacturer"
@@ -38685,7 +39302,7 @@
 msgstr ""
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:7
-#: selling/doctype/quotation/quotation_list.js:33
+#: selling/doctype/quotation/quotation_list.js:32
 msgid "Lost"
 msgstr "Perdu"
 
@@ -38712,7 +39329,7 @@
 msgid "Lost Opportunity"
 msgstr "Occasion perdue"
 
-#: crm/report/lead_details/lead_details.js:39
+#: crm/report/lead_details/lead_details.js:38
 msgid "Lost Quotation"
 msgstr "Devis Perdu"
 
@@ -38732,7 +39349,7 @@
 msgid "Lost Quotations %"
 msgstr ""
 
-#: crm/report/lost_opportunity/lost_opportunity.js:31
+#: crm/report/lost_opportunity/lost_opportunity.js:30
 #: selling/report/lost_quotations/lost_quotations.py:24
 msgid "Lost Reason"
 msgstr "Raison de la Perte"
@@ -38749,7 +39366,7 @@
 msgstr "Motif perdu"
 
 #: crm/report/lost_opportunity/lost_opportunity.py:49
-#: public/js/utils/sales_common.js:410
+#: public/js/utils/sales_common.js:466
 msgid "Lost Reasons"
 msgstr "Raisons perdues"
 
@@ -38767,7 +39384,7 @@
 msgid "Lost Reasons"
 msgstr "Raisons perdues"
 
-#: crm/doctype/opportunity/opportunity.js:29
+#: crm/doctype/opportunity/opportunity.js:28
 msgid "Lost Reasons are required in case opportunity is Lost."
 msgstr ""
 
@@ -38845,7 +39462,7 @@
 msgid "Loyalty Point Entry Redemption"
 msgstr "Utilisation d'une entrée de point de fidélité"
 
-#: selling/page/point_of_sale/pos_item_cart.js:891
+#: selling/page/point_of_sale/pos_item_cart.js:924
 msgid "Loyalty Points"
 msgstr "Points de fidélité"
 
@@ -38892,14 +39509,18 @@
 msgid "Loyalty Points Redemption"
 msgstr "Utilisation des points de fidélité"
 
-#: public/js/utils.js:109
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+msgid "Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned."
+msgstr ""
+
+#: public/js/utils.js:136
 msgid "Loyalty Points: {0}"
 msgstr "Points de fidélité: {0}"
 
 #. Name of a DocType
 #: accounts/doctype/loyalty_program/loyalty_program.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:1041
-#: selling/page/point_of_sale/pos_item_cart.js:885
+#: accounts/doctype/sales_invoice/sales_invoice.js:1117
+#: selling/page/point_of_sale/pos_item_cart.js:917
 msgid "Loyalty Program"
 msgstr "Programme de fidélité"
 
@@ -39082,11 +39703,16 @@
 msgid "MFG-WO-.YYYY.-"
 msgstr ""
 
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:22
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:23
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:78
+#: public/js/plant_floor_visual/visual_plant.js:86
 msgid "Machine"
 msgstr ""
 
+#: public/js/plant_floor_visual/visual_plant.js:70
+msgid "Machine Type"
+msgstr ""
+
 #. Option for the 'Stop Reason' (Select) field in DocType 'Downtime Entry'
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 msgctxt "Downtime Entry"
@@ -39099,8 +39725,8 @@
 msgid "Machine operator errors"
 msgstr "Erreurs de l'opérateur de la machine"
 
-#: setup/doctype/company/company.py:563 setup/doctype/company/company.py:578
-#: setup/doctype/company/company.py:579 setup/doctype/company/company.py:580
+#: setup/doctype/company/company.py:562 setup/doctype/company/company.py:577
+#: setup/doctype/company/company.py:578 setup/doctype/company/company.py:579
 msgid "Main"
 msgstr "Principal"
 
@@ -39114,7 +39740,7 @@
 msgid "Main Cost Center {0} cannot be entered in the child table"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:102
+#: assets/doctype/asset/asset.js:118
 msgid "Maintain Asset"
 msgstr ""
 
@@ -39171,6 +39797,12 @@
 msgid "Maintenance"
 msgstr "Entretien"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Maintenance"
+msgstr "Entretien"
+
 #. Label of a Date field in DocType 'Maintenance Visit'
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
 msgctxt "Maintenance Visit"
@@ -39183,7 +39815,7 @@
 msgid "Maintenance Details"
 msgstr ""
 
-#: assets/doctype/asset_maintenance/asset_maintenance.js:43
+#: assets/doctype/asset_maintenance/asset_maintenance.js:41
 msgid "Maintenance Log"
 msgstr "Journal de maintenance"
 
@@ -39230,10 +39862,10 @@
 msgstr "Rôle de maintenance"
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:162
+#: accounts/doctype/sales_invoice/sales_invoice.js:175
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.json
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:78
-#: selling/doctype/sales_order/sales_order.js:582
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
+#: selling/doctype/sales_order/sales_order.js:673
 msgid "Maintenance Schedule"
 msgstr "Échéancier d'Entretien"
 
@@ -39376,10 +40008,10 @@
 msgstr "Maintenance Utilisateur"
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:83
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:87
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
-#: selling/doctype/sales_order/sales_order.js:581
-#: support/doctype/warranty_claim/warranty_claim.js:50
+#: selling/doctype/sales_order/sales_order.js:668
+#: support/doctype/warranty_claim/warranty_claim.js:47
 msgid "Maintenance Visit"
 msgstr "Visite d'Entretien"
 
@@ -39412,16 +40044,16 @@
 msgid "Major/Optional Subjects"
 msgstr "Sujets Principaux / En Option"
 
-#: accounts/doctype/journal_entry/journal_entry.js:51
-#: manufacturing/doctype/job_card/job_card.js:174
+#: accounts/doctype/journal_entry/journal_entry.js:100
+#: manufacturing/doctype/job_card/job_card.js:196
 msgid "Make"
 msgstr "Faire"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:56
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:54
 msgid "Make "
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:39
+#: assets/doctype/asset/asset_list.js:29
 msgid "Make Asset Movement"
 msgstr ""
 
@@ -39451,7 +40083,7 @@
 msgid "Make Quotation"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:335
 msgid "Make Return Entry"
 msgstr ""
 
@@ -39467,7 +40099,7 @@
 msgid "Make Serial No / Batch from Work Order"
 msgstr "Générer des numéros de séries / lots depuis les Ordres de Fabrications"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
+#: stock/doctype/purchase_receipt/purchase_receipt.js:261
 msgid "Make Stock Entry"
 msgstr "Faire une entrée de stock"
 
@@ -39475,20 +40107,20 @@
 msgid "Make project from a template."
 msgstr "Faire un projet à partir d'un modèle."
 
-#: stock/doctype/item/item.js:502
+#: stock/doctype/item/item.js:569
 msgid "Make {0} Variant"
 msgstr ""
 
-#: stock/doctype/item/item.js:504
+#: stock/doctype/item/item.js:571
 msgid "Make {0} Variants"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:85 assets/doctype/asset/asset.js:89
-#: assets/doctype/asset/asset.js:93 assets/doctype/asset/asset.js:98
-#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:109
-#: assets/doctype/asset/asset.js:113 assets/doctype/asset/asset.js:118
-#: assets/doctype/asset/asset.js:124 assets/doctype/asset/asset.js:136
-#: setup/doctype/company/company.js:112 setup/doctype/company/company.js:119
+#: assets/doctype/asset/asset.js:88 assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:112
+#: assets/doctype/asset/asset.js:122 assets/doctype/asset/asset.js:131
+#: assets/doctype/asset/asset.js:139 assets/doctype/asset/asset.js:148
+#: assets/doctype/asset/asset.js:158 assets/doctype/asset/asset.js:174
+#: setup/doctype/company/company.js:134 setup/doctype/company/company.js:145
 msgid "Manage"
 msgstr ""
 
@@ -39512,22 +40144,22 @@
 msgid "Manage your orders"
 msgstr "Gérer vos commandes"
 
-#: setup/doctype/company/company.py:371
+#: setup/doctype/company/company.py:370
 msgid "Management"
 msgstr "Gestion"
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
-#: manufacturing/doctype/bom/bom.js:71 manufacturing/doctype/bom/bom.js:482
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: 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
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484 public/js/utils/party.js:273
-#: stock/doctype/delivery_note/delivery_note.js:138
-#: stock/doctype/purchase_receipt/purchase_receipt.js:113
-#: stock/doctype/purchase_receipt/purchase_receipt.js:198
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
+#: public/js/controllers/transaction.js:2537 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:99
 msgid "Mandatory"
 msgstr "Obligatoire"
 
@@ -39553,7 +40185,7 @@
 msgid "Mandatory Depends On"
 msgstr "Obligatoire dépend de"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
 msgid "Mandatory Field"
 msgstr ""
 
@@ -39573,11 +40205,11 @@
 msgid "Mandatory Missing"
 msgstr "Obligatoire manquant"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:587
 msgid "Mandatory Purchase Order"
 msgstr "Commande d'achat obligatoire"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
 msgid "Mandatory Purchase Receipt"
 msgstr "Reçu d'achat obligatoire"
 
@@ -39645,7 +40277,7 @@
 msgid "Manual Inspection"
 msgstr ""
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:34
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:36
 msgid "Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again"
 msgstr "La saisie manuelle ne peut pas être créée! Désactivez la saisie automatique pour la comptabilité différée dans les paramètres des comptes et réessayez"
 
@@ -39741,7 +40373,7 @@
 msgid "Manufacture against Material Request"
 msgstr "Production liée à une Demande de Matériel"
 
-#: stock/doctype/material_request/material_request_list.js:33
+#: stock/doctype/material_request/material_request_list.js:37
 msgid "Manufactured"
 msgstr "Fabriqué"
 
@@ -39873,10 +40505,15 @@
 msgid "Manufacturer Part Number"
 msgstr "Numéro de Pièce du Fabricant"
 
-#: public/js/controllers/buying.js:337
+#: public/js/controllers/buying.js:332
 msgid "Manufacturer Part Number <b>{0}</b> is invalid"
 msgstr "Le numéro de <b>pièce du</b> fabricant <b>{0}</b> n'est pas valide"
 
+#. Description of a DocType
+#: stock/doctype/manufacturer/manufacturer.json
+msgid "Manufacturers used in Items"
+msgstr ""
+
 #. Name of a Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: selling/doctype/sales_order/sales_order_dashboard.py:26
@@ -39923,7 +40560,7 @@
 msgid "Manufacturing Manager"
 msgstr "Responsable de Production"
 
-#: stock/doctype/stock_entry/stock_entry.py:1689
+#: stock/doctype/stock_entry/stock_entry.py:1698
 msgid "Manufacturing Quantity is mandatory"
 msgstr "Quantité de production obligatoire"
 
@@ -39987,15 +40624,15 @@
 msgid "Manufacturing module is all set up!"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:148
+#: stock/doctype/purchase_receipt/purchase_receipt.js:168
 msgid "Mapping Purchase Receipt ..."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:98
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:97
 msgid "Mapping Subcontracting Order ..."
 msgstr ""
 
-#: public/js/utils.js:843
+#: public/js/utils.js:913
 msgid "Mapping {0} ..."
 msgstr ""
 
@@ -40131,7 +40768,7 @@
 msgid "Margin Type"
 msgstr "Type de Marge"
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:19
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:15
 msgid "Margin View"
 msgstr ""
 
@@ -40141,6 +40778,15 @@
 msgid "Marital Status"
 msgstr "État Civil"
 
+#: public/js/templates/crm_activities.html:39
+#: public/js/templates/crm_activities.html:82
+msgid "Mark As Closed"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:323
+msgid "Mark as unresolved"
+msgstr ""
+
 #. Name of a DocType
 #: crm/doctype/market_segment/market_segment.json
 msgid "Market Segment"
@@ -40176,7 +40822,7 @@
 msgid "Market Segment"
 msgstr "Part de Marché"
 
-#: setup/doctype/company/company.py:323
+#: setup/doctype/company/company.py:322
 msgid "Marketing"
 msgstr ""
 
@@ -40216,7 +40862,7 @@
 msgid "Material"
 msgstr "Matériel"
 
-#: manufacturing/doctype/work_order/work_order.js:613
+#: manufacturing/doctype/work_order/work_order.js:655
 msgid "Material Consumption"
 msgstr "Consommation de matériel"
 
@@ -40232,7 +40878,7 @@
 msgid "Material Consumption for Manufacture"
 msgstr "Consommation de matériaux pour la production"
 
-#: stock/doctype/stock_entry/stock_entry.js:420
+#: stock/doctype/stock_entry/stock_entry.js:480
 msgid "Material Consumption is not set in Manufacturing Settings."
 msgstr "La consommation de matériaux n'est pas définie dans Paramètres de Production."
 
@@ -40274,7 +40920,7 @@
 msgid "Material Issue"
 msgstr "Sortie de Matériel"
 
-#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:146
 msgid "Material Receipt"
 msgstr "Réception Matériel"
 
@@ -40291,20 +40937,21 @@
 msgstr "Réception Matériel"
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:435
-#: buying/doctype/request_for_quotation/request_for_quotation.js:297
-#: buying/doctype/supplier_quotation/supplier_quotation.js:31
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:34
+#: buying/doctype/purchase_order/purchase_order.js:504
+#: 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
-#: manufacturing/doctype/job_card/job_card.js:57
-#: manufacturing/doctype/production_plan/production_plan.js:113
-#: selling/doctype/sales_order/sales_order.js:570
+#: 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/stock_entry/stock_entry.js:192
-#: stock/doctype/stock_entry/stock_entry.js:277
+#: stock/doctype/stock_entry/stock_entry.js:210
+#: stock/doctype/stock_entry/stock_entry.js:313
 msgid "Material Request"
 msgstr "Demande de matériel"
 
@@ -40522,13 +41169,17 @@
 msgid "Material Request Planning"
 msgstr "Planification des demandes de matériel"
 
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:1
+msgid "Material Request Type"
+msgstr "Type de Demande de Matériel"
+
 #. Label of a Select field in DocType 'Item Reorder'
 #: stock/doctype/item_reorder/item_reorder.json
 msgctxt "Item Reorder"
 msgid "Material Request Type"
 msgstr "Type de Demande de Matériel"
 
-#: selling/doctype/sales_order/sales_order.py:1521
+#: selling/doctype/sales_order/sales_order.py:1544
 msgid "Material Request not created, as quantity for Raw Materials already available."
 msgstr "Demande de matériel non créée, car la quantité de matières premières est déjà disponible."
 
@@ -40543,11 +41194,11 @@
 msgid "Material Request used to make this Stock Entry"
 msgstr "Demande de Matériel utilisée pour réaliser cette Écriture de Stock"
 
-#: controllers/subcontracting_controller.py:974
+#: controllers/subcontracting_controller.py:979
 msgid "Material Request {0} is cancelled or stopped"
 msgstr "Demande de Matériel {0} est annulé ou arrêté"
 
-#: selling/doctype/sales_order/sales_order.js:839
+#: selling/doctype/sales_order/sales_order.js:978
 msgid "Material Request {0} submitted."
 msgstr "Demande de matériel {0} soumise."
 
@@ -40563,7 +41214,7 @@
 msgid "Material Requests"
 msgstr "Les Demandes de Matériel"
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Material Requests Required"
 msgstr "Demandes de matériel requises"
 
@@ -40574,12 +41225,12 @@
 msgid "Material Requests for which Supplier Quotations are not created"
 msgstr "Demandes de Matériel dont les Devis Fournisseur ne sont pas créés"
 
-#: stock/doctype/stock_entry/stock_entry_list.js:7
+#: stock/doctype/stock_entry/stock_entry_list.js:13
 msgid "Material Returned from WIP"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:67
-#: stock/doctype/material_request/material_request.js:119
+#: manufacturing/doctype/job_card/job_card.js:64
+#: stock/doctype/material_request/material_request.js:124
 msgid "Material Transfer"
 msgstr "Transfert de matériel"
 
@@ -40620,7 +41271,7 @@
 msgid "Material Transfer"
 msgstr "Transfert de matériel"
 
-#: stock/doctype/material_request/material_request.js:122
+#: stock/doctype/material_request/material_request.js:130
 msgid "Material Transfer (In Transit)"
 msgstr ""
 
@@ -40674,8 +41325,8 @@
 msgid "Material Transferred for Subcontract"
 msgstr "Matériel transféré pour sous-traitance"
 
-#: buying/doctype/purchase_order/purchase_order.js:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:360
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:206
 msgid "Material to Supplier"
 msgstr "Du Matériel au Fournisseur"
 
@@ -40685,11 +41336,11 @@
 msgid "Materials Required (Exploded)"
 msgstr "Matériel Requis (Éclaté)"
 
-#: controllers/subcontracting_controller.py:1164
+#: controllers/subcontracting_controller.py:1169
 msgid "Materials are already received against the {0} {1}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:636
+#: manufacturing/doctype/job_card/job_card.py:643
 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}"
 msgstr ""
 
@@ -40769,8 +41420,8 @@
 msgid "Max discount allowed for item: {0} is {1}%"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:715
-#: stock/doctype/pick_list/pick_list.js:147
+#: manufacturing/doctype/work_order/work_order.js:768
+#: stock/doctype/pick_list/pick_list.js:176
 msgid "Max: {0}"
 msgstr "Max : {0}"
 
@@ -40792,11 +41443,11 @@
 msgid "Maximum Payment Amount"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2842
+#: stock/doctype/stock_entry/stock_entry.py:2878
 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
 msgstr "Maximum d'échantillons - {0} peut être conservé pour le lot {1} et l'article {2}."
 
-#: stock/doctype/stock_entry/stock_entry.py:2833
+#: stock/doctype/stock_entry/stock_entry.py:2869
 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
 msgstr "Nombre maximum d'échantillons - {0} ont déjà été conservés pour le lot {1} et l'article {2} dans le lot {3}."
 
@@ -40818,11 +41469,11 @@
 msgid "Maximum Value"
 msgstr ""
 
-#: controllers/selling_controller.py:194
+#: controllers/selling_controller.py:195
 msgid "Maximum discount for Item {0} is {1}%"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:94
+#: public/js/utils/barcode_scanner.js:99
 msgid "Maximum quantity scanned for item {0}."
 msgstr ""
 
@@ -40860,7 +41511,7 @@
 msgid "Meeting"
 msgstr "Réunion"
 
-#: stock/stock_ledger.py:1685
+#: stock/stock_ledger.py:1705
 msgid "Mention Valuation Rate in the Item master."
 msgstr "Mentionnez le taux de valorisation dans la fiche article."
 
@@ -40888,11 +41539,11 @@
 msgid "Mention if non-standard receivable account applicable"
 msgstr "Mentionner si le compte débiteur applicable n'est pas standard"
 
-#: accounts/doctype/account/account.js:151
+#: accounts/doctype/account/account.js:152
 msgid "Merge"
 msgstr "Fusionner"
 
-#: accounts/doctype/account/account.js:51
+#: accounts/doctype/account/account.js:46
 msgid "Merge Account"
 msgstr "Fusionner le compte"
 
@@ -40912,15 +41563,15 @@
 msgid "Merge Similar Account Heads"
 msgstr ""
 
-#: public/js/utils.js:873
+#: public/js/utils.js:943
 msgid "Merge taxes from multiple documents"
 msgstr ""
 
-#: accounts/doctype/account/account.js:123
+#: accounts/doctype/account/account.js:124
 msgid "Merge with Existing Account"
 msgstr "Fusionner avec un compte existant"
 
-#: accounts/doctype/cost_center/cost_center.js:66
+#: accounts/doctype/cost_center/cost_center.js:68
 msgid "Merge with existing"
 msgstr "Fusionner avec existant"
 
@@ -40930,7 +41581,7 @@
 msgid "Merged"
 msgstr ""
 
-#: accounts/doctype/account/account.py:546
+#: accounts/doctype/account/account.py:565
 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency"
 msgstr ""
 
@@ -40938,6 +41589,10 @@
 msgid "Merging {0} of {1}"
 msgstr ""
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Message"
+msgstr ""
+
 #. Label of a Text field in DocType 'Payment Request'
 #: accounts/doctype/payment_request/payment_request.json
 msgctxt "Payment Request"
@@ -40968,7 +41623,7 @@
 msgid "Message Examples"
 msgstr "Exemples de Messages"
 
-#: accounts/doctype/payment_request/payment_request.js:38
+#: accounts/doctype/payment_request/payment_request.js:47
 #: setup/doctype/email_digest/email_digest.js:26
 msgid "Message Sent"
 msgstr "Message envoyé"
@@ -40997,6 +41652,10 @@
 msgid "Messages greater than 160 characters will be split into multiple messages"
 msgstr "Message de plus de 160 caractères sera découpé en plusieurs messages"
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Meta Data"
+msgstr ""
+
 #: setup/setup_wizard/operations/install_fixtures.py:263
 #: setup/setup_wizard/operations/install_fixtures.py:379
 msgid "Middle Income"
@@ -41163,32 +41822,32 @@
 msgid "Mismatch"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1132
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1191
 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:548
-#: accounts/doctype/sales_invoice/sales_invoice.py:2044
-#: accounts/doctype/sales_invoice/sales_invoice.py:2602
+#: 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
 msgid "Missing Account"
 msgstr "Compte manquant"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1403
+#: accounts/doctype/sales_invoice/sales_invoice.py:1414
 msgid "Missing Asset"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:179 assets/doctype/asset/asset.py:265
+#: accounts/doctype/gl_entry/gl_entry.py:169 assets/doctype/asset/asset.py:267
 msgid "Missing Cost Center"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:309
+#: assets/doctype/asset/asset.py:311
 msgid "Missing Finance Book"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1280
+#: stock/doctype/stock_entry/stock_entry.py:1289
 msgid "Missing Finished Good"
 msgstr ""
 
@@ -41208,7 +41867,7 @@
 msgid "Missing Serial No Bundle"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:743
+#: selling/doctype/customer/customer.py:754
 msgid "Missing Values Required"
 msgstr "Valeurs Manquantes Requises"
 
@@ -41216,12 +41875,12 @@
 msgid "Missing Warehouse"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:132
+#: stock/doctype/delivery_trip/delivery_trip.js:153
 msgid "Missing email template for dispatch. Please set one in Delivery Settings."
 msgstr "Modèle de courrier électronique manquant pour l'envoi. Veuillez en définir un dans les paramètres de livraison."
 
 #: manufacturing/doctype/bom/bom.py:957
-#: manufacturing/doctype/work_order/work_order.py:979
+#: manufacturing/doctype/work_order/work_order.py:993
 msgid "Missing value"
 msgstr ""
 
@@ -41361,7 +42020,7 @@
 msgid "Mobile No"
 msgstr "N° Mobile"
 
-#: public/js/utils/contact_address_quick_entry.js:48
+#: public/js/utils/contact_address_quick_entry.js:51
 msgid "Mobile Number"
 msgstr ""
 
@@ -41374,7 +42033,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/mode_of_payment/mode_of_payment.json
-#: accounts/doctype/payment_order/payment_order.js:109
+#: accounts/doctype/payment_order/payment_order.js:124
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:40
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:47
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:35
@@ -41614,21 +42273,21 @@
 msgid "Month(s) after the end of the invoice month"
 msgstr "Mois (s) après la fin du mois de la facture"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:67
+#: 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
-#: buying/report/purchase_analytics/purchase_analytics.js:62
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
-#: manufacturing/report/production_analytics/production_analytics.js:35
-#: public/js/financial_statements.js:217
+#: 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
+#: public/js/financial_statements.js:226
 #: public/js/purchase_trends_filters.js:19 public/js/sales_trends_filters.js:11
-#: public/js/stock_analytics.js:53
-#: selling/report/sales_analytics/sales_analytics.js:62
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
-#: stock/report/stock_analytics/stock_analytics.js:81
-#: support/report/issue_analytics/issue_analytics.js:43
+#: public/js/stock_analytics.js:83
+#: selling/report/sales_analytics/sales_analytics.js:69
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:32
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:32
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:32
+#: stock/report/stock_analytics/stock_analytics.js:80
+#: support/report/issue_analytics/issue_analytics.js:42
 msgid "Monthly"
 msgstr "Mensuel"
 
@@ -41678,7 +42337,7 @@
 msgstr "Bons de travail terminés mensuellement"
 
 #. Name of a DocType
-#: accounts/doctype/cost_center/cost_center_tree.js:44
+#: accounts/doctype/cost_center/cost_center_tree.js:69
 #: accounts/doctype/monthly_distribution/monthly_distribution.json
 msgid "Monthly Distribution"
 msgstr "Répartition Mensuelle"
@@ -41924,14 +42583,20 @@
 msgid "More columns found than expected. Please compare the uploaded file with standard template"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:111 stock/doctype/batch/batch_dashboard.py:10
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:58
+#: stock/dashboard/item_dashboard_list.html:52 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:128 stock/doctype/batch/batch_dashboard.py:10
 msgid "Move"
 msgstr "mouvement"
 
-#: stock/dashboard/item_dashboard.js:205
+#: stock/dashboard/item_dashboard.js:212
 msgid "Move Item"
 msgstr "Déplacer l'Article"
 
+#: manufacturing/doctype/plant_floor/plant_floor.js:211
+msgid "Move Stock"
+msgstr ""
+
 #: templates/includes/macros.html:169
 msgid "Move to Cart"
 msgstr ""
@@ -41974,11 +42639,11 @@
 msgid "Multi Currency"
 msgstr "Multi-devise"
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:42
+#: manufacturing/doctype/bom_creator/bom_creator.js:41
 msgid "Multi-level BOM Creator"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:369
+#: selling/doctype/customer/customer.py:381
 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually."
 msgstr ""
 
@@ -41993,7 +42658,7 @@
 msgid "Multiple Tier Program"
 msgstr "Programme à plusieurs échelons"
 
-#: stock/doctype/item/item.js:106
+#: stock/doctype/item/item.js:138
 msgid "Multiple Variants"
 msgstr "Variantes multiples"
 
@@ -42001,11 +42666,11 @@
 msgid "Multiple Warehouse Accounts"
 msgstr ""
 
-#: controllers/accounts_controller.py:899
+#: controllers/accounts_controller.py:951
 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
 msgstr "Plusieurs Exercices existent pour la date {0}. Veuillez définir la société dans l'Exercice"
 
-#: stock/doctype/stock_entry/stock_entry.py:1287
+#: stock/doctype/stock_entry/stock_entry.py:1296
 msgid "Multiple items cannot be marked as finished item"
 msgstr ""
 
@@ -42042,9 +42707,9 @@
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.py:86
 #: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:357
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:29
-#: manufacturing/doctype/bom_creator/bom_creator.js:45
-#: public/js/utils/serial_no_batch_selector.js:404
-#: selling/doctype/quotation/quotation.js:261
+#: manufacturing/doctype/bom_creator/bom_creator.js:44
+#: public/js/utils/serial_no_batch_selector.js:413
+#: selling/doctype/quotation/quotation.js:273
 msgid "Name"
 msgstr "Nom"
 
@@ -42102,7 +42767,7 @@
 msgid "Name of Beneficiary"
 msgstr "Nom du bénéficiaire"
 
-#: accounts/doctype/account/account_tree.js:107
+#: accounts/doctype/account/account_tree.js:124
 msgid "Name of new Account. Note: Please don't create accounts for Customers and Suppliers"
 msgstr "Nom du Nouveau Compte. Note: Veuillez ne pas créer de comptes Clients et Fournisseurs"
 
@@ -42281,11 +42946,11 @@
 msgid "Needs Analysis"
 msgstr "Analyse des besoins"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:431
 msgid "Negative Quantity is not allowed"
 msgstr "Quantité Négative n'est pas autorisée"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:381
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:435
 msgid "Negative Valuation Rate is not allowed"
 msgstr "Taux de Valorisation Négatif n'est pas autorisé"
 
@@ -42582,6 +43247,10 @@
 #: 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
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:124
 #: templates/includes/order/order_taxes.html:5
 msgid "Net Total"
 msgstr "Total net"
@@ -42769,15 +43438,15 @@
 msgid "Net Weight UOM"
 msgstr "UdM Poids Net"
 
-#: controllers/accounts_controller.py:1210
+#: controllers/accounts_controller.py:1277
 msgid "Net total calculation precision loss"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:164
+#: accounts/doctype/account/account_tree.js:241
 msgid "New"
 msgstr "Nouveau"
 
-#: accounts/doctype/account/account_tree.js:106
+#: accounts/doctype/account/account_tree.js:122
 msgid "New Account Name"
 msgstr "Nouveau Nom de Compte"
 
@@ -42791,7 +43460,7 @@
 msgid "New Assets (This Year)"
 msgstr "Nouveaux actifs (cette année)"
 
-#: manufacturing/doctype/bom/bom_tree.js:56
+#: manufacturing/doctype/bom/bom_tree.js:55
 msgid "New BOM"
 msgstr "Nouvelle nomenclature"
 
@@ -42819,21 +43488,21 @@
 msgid "New Balance In Base Currency"
 msgstr "Nouveau solde en devise de base"
 
-#: stock/doctype/batch/batch.js:127
+#: stock/doctype/batch/batch.js:146
 msgid "New Batch ID (Optional)"
 msgstr "Nouveau Numéro de Lot (Optionnel)"
 
-#: stock/doctype/batch/batch.js:121
+#: stock/doctype/batch/batch.js:140
 msgid "New Batch Qty"
 msgstr "Nouvelle Qté de Lot"
 
-#: accounts/doctype/account/account_tree.js:100
-#: accounts/doctype/cost_center/cost_center_tree.js:16
+#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/cost_center/cost_center_tree.js:18
 #: setup/doctype/company/company_tree.js:23
 msgid "New Company"
 msgstr "Nouvelle Société"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:22
+#: accounts/doctype/cost_center/cost_center_tree.js:26
 msgid "New Cost Center Name"
 msgstr "Nom du Nouveau Centre de Coûts"
 
@@ -42853,7 +43522,8 @@
 msgid "New Employee"
 msgstr "Nouvel employé"
 
-#: public/js/utils/crm_activities.js:81
+#: public/js/templates/crm_activities.html:14
+#: public/js/utils/crm_activities.js:85
 msgid "New Event"
 msgstr "Nouvel évènement"
 
@@ -42879,6 +43549,10 @@
 msgid "New Location"
 msgstr "Nouveau lieu"
 
+#: public/js/templates/crm_notes.html:7
+msgid "New Note"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
@@ -42913,7 +43587,7 @@
 msgid "New Sales Orders"
 msgstr "Nouvelles Commandes Client"
 
-#: setup/doctype/sales_person/sales_person_tree.js:5
+#: setup/doctype/sales_person/sales_person_tree.js:3
 msgid "New Sales Person Name"
 msgstr "Nouveau Nom de Commercial"
 
@@ -42921,15 +43595,16 @@
 msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
 msgstr "Les Nouveaux N° de Série ne peuvent avoir d'entrepot. L'Entrepôt doit être établi par Écriture de Stock ou Reçus d'Achat"
 
-#: public/js/utils/crm_activities.js:63
+#: public/js/templates/crm_activities.html:8
+#: public/js/utils/crm_activities.js:67
 msgid "New Task"
 msgstr "Nv. Tâche à faire"
 
-#: manufacturing/doctype/bom/bom.js:112
+#: manufacturing/doctype/bom/bom.js:111
 msgid "New Version"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse_tree.js:15
+#: stock/doctype/warehouse/warehouse_tree.js:16
 msgid "New Warehouse Name"
 msgstr "Nouveau Nom d'Entrepôt"
 
@@ -42939,10 +43614,14 @@
 msgid "New Workplace"
 msgstr "Nouveau Lieu de Travail"
 
-#: selling/doctype/customer/customer.py:338
+#: selling/doctype/customer/customer.py:350
 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}"
 msgstr "Nouvelle limite de crédit est inférieure à l'encours actuel pour le client. Limite de crédit doit être au moins de {0}"
 
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:3
+msgid "New fiscal year created :- "
+msgstr ""
+
 #. Description of the 'Generate New Invoices Past Due Date' (Check) field in
 #. DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
@@ -42950,7 +43629,7 @@
 msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
 msgstr "De nouvelles factures seront générées selon le calendrier, même si les factures actuelles sont impayées ou en retard"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:218
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:255
 msgid "New release date should be in the future"
 msgstr "La nouvelle date de sortie devrait être dans le futur"
 
@@ -42958,7 +43637,7 @@
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:211
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:213
 msgid "New {0} pricing rules are created"
 msgstr "De nouvelles règles de tarification {0} sont créées."
 
@@ -43100,7 +43779,7 @@
 msgid "No Account matched these filters: {}"
 msgstr "Aucun compte ne correspond à ces filtres: {}"
 
-#: quality_management/doctype/quality_review/quality_review_list.js:6
+#: quality_management/doctype/quality_review/quality_review_list.js:5
 msgid "No Action"
 msgstr "Pas d'action"
 
@@ -43110,44 +43789,52 @@
 msgid "No Answer"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2146
+#: accounts/doctype/sales_invoice/sales_invoice.py:2115
 msgid "No Customer found for Inter Company Transactions which represents company {0}"
 msgstr "Aucun client trouvé pour les transactions intersociétés qui représentent l'entreprise {0}"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:118
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:362
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:115
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:350
 msgid "No Customers found with selected options."
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:48
+#: selling/page/sales_funnel/sales_funnel.js:59
 msgid "No Data"
 msgstr "Aucune Donnée"
 
-#: stock/doctype/delivery_trip/delivery_trip.js:122
+#: stock/doctype/delivery_trip/delivery_trip.js:143
 msgid "No Delivery Note selected for Customer {}"
 msgstr "Aucun bon de livraison sélectionné pour le client {}"
 
-#: stock/get_item_details.py:199
+#: stock/get_item_details.py:204
 msgid "No Item with Barcode {0}"
 msgstr "Aucun Article avec le Code Barre {0}"
 
-#: stock/get_item_details.py:203
+#: stock/get_item_details.py:208
 msgid "No Item with Serial No {0}"
 msgstr "Aucun Article avec le N° de Série {0}"
 
-#: controllers/subcontracting_controller.py:1084
+#: controllers/subcontracting_controller.py:1089
 msgid "No Items selected for transfer."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:668
+#: selling/doctype/sales_order/sales_order.js:769
 msgid "No Items with Bill of Materials to Manufacture"
 msgstr "Aucun Article avec une nomenclature à Produire"
 
-#: selling/doctype/sales_order/sales_order.js:782
+#: selling/doctype/sales_order/sales_order.js:898
 msgid "No Items with Bill of Materials."
 msgstr "Aucun article avec nomenclature."
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:213
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:15
+msgid "No Matching Bank Transactions Found"
+msgstr ""
+
+#: public/js/templates/crm_notes.html:44
+msgid "No Notes"
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:219
 msgid "No Outstanding Invoices found for this party"
 msgstr ""
 
@@ -43155,28 +43842,32 @@
 msgid "No POS Profile found. Please create a New POS Profile first"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1420
-#: accounts/doctype/journal_entry/journal_entry.py:1486
-#: accounts/doctype/journal_entry/journal_entry.py:1509
-#: stock/doctype/item/item.py:1332
+#: 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
 msgid "No Permission"
 msgstr "Aucune autorisation"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:23
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:38
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:22
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:39
 msgid "No Records for these settings."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
-#: accounts/doctype/sales_invoice/sales_invoice.py:949
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:337
+#: accounts/doctype/sales_invoice/sales_invoice.py:966
 msgid "No Remarks"
 msgstr "Aucune Remarque"
 
-#: stock/dashboard/item_dashboard.js:147
+#: stock/dashboard/item_dashboard.js:150
 msgid "No Stock Available Currently"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2130
+#: public/js/templates/call_link.html:30
+msgid "No Summary"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.py:2099
 msgid "No Supplier found for Inter Company Transactions which represents company {0}"
 msgstr "Aucun fournisseur trouvé pour les transactions intersociétés qui représentent l'entreprise {0}"
 
@@ -43188,32 +43879,32 @@
 msgid "No Terms"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:211
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:216
 msgid "No Unreconciled Invoices and Payments found for this party and account"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:215
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:221
 msgid "No Unreconciled Payments found for this party"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:682
+#: manufacturing/doctype/production_plan/production_plan.py:691
 msgid "No Work Orders were created"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:727
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:606
+#: stock/doctype/purchase_receipt/purchase_receipt.py:726
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:607
 msgid "No accounting entries for the following warehouses"
 msgstr "Pas d’écritures comptables pour les entrepôts suivants"
 
-#: selling/doctype/sales_order/sales_order.py:651
+#: selling/doctype/sales_order/sales_order.py:657
 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured"
 msgstr "Aucune nomenclature active trouvée pour l'article {0}. La livraison par numéro de série ne peut pas être assurée"
 
-#: stock/doctype/item_variant_settings/item_variant_settings.js:31
+#: stock/doctype/item_variant_settings/item_variant_settings.js:46
 msgid "No additional fields available"
 msgstr ""
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:429
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:417
 msgid "No billing email found for customer: {0}"
 msgstr ""
 
@@ -43221,7 +43912,7 @@
 msgid "No contacts with email IDs found."
 msgstr "Aucun contact avec des identifiants de messagerie trouvés."
 
-#: selling/page/sales_funnel/sales_funnel.js:115
+#: selling/page/sales_funnel/sales_funnel.js:130
 msgid "No data for this period"
 msgstr "Aucune donnée pour cette période"
 
@@ -43229,7 +43920,7 @@
 msgid "No data found. Seems like you uploaded a blank file"
 msgstr ""
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:38
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:37
 msgid "No data to export"
 msgstr "Aucune donnée à exporter"
 
@@ -43241,11 +43932,15 @@
 msgid "No employee was scheduled for call popup"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1064
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:486
+msgid "No failed logs"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.js:1289
 msgid "No gain or loss in the exchange rate"
 msgstr "Aucun gain ou perte dans le taux de change"
 
-#: controllers/subcontracting_controller.py:1005
+#: controllers/subcontracting_controller.py:1010
 msgid "No item available for transfer."
 msgstr ""
 
@@ -43258,30 +43953,40 @@
 msgid "No items are available in the sales order {0} for production"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_selector.js:320
+#: selling/page/point_of_sale/pos_item_selector.js:317
 msgid "No items found. Scan barcode again."
 msgstr "Aucun élément trouvé. Scannez à nouveau le code-barres."
 
+#: selling/page/point_of_sale/pos_item_cart.js:76
+msgid "No items in cart"
+msgstr ""
+
 #: setup/doctype/email_digest/email_digest.py:168
 msgid "No items to be received are overdue"
 msgstr "Aucun article à recevoir n'est en retard"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:424
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:423
 msgid "No matches occurred via auto reconciliation"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:879
+#: manufacturing/doctype/production_plan/production_plan.py:888
 msgid "No material request created"
 msgstr "Aucune demande de matériel créée"
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:198
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:199
 msgid "No more children on Left"
 msgstr ""
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:212
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:213
 msgid "No more children on Right"
 msgstr ""
 
+#. Label of a Int field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "No of Docs"
+msgstr ""
+
 #. Label of a Select field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -43333,6 +44038,14 @@
 msgid "No of Visits"
 msgstr "Nb de Visites"
 
+#: public/js/templates/crm_activities.html:104
+msgid "No open event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:57
+msgid "No open task"
+msgstr ""
+
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:315
 msgid "No outstanding invoices found"
 msgstr "Aucune facture en attente trouvée"
@@ -43341,15 +44054,15 @@
 msgid "No outstanding invoices require exchange rate revaluation"
 msgstr "Aucune facture en attente ne nécessite une réévaluation du taux de change"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1801
+#: accounts/doctype/payment_entry/payment_entry.py:1820
 msgid "No outstanding {0} found for the {1} {2} which qualify the filters you have specified."
 msgstr ""
 
-#: public/js/controllers/buying.js:439
+#: public/js/controllers/buying.js:436
 msgid "No pending Material Requests found to link for the given items."
 msgstr "Aucune demande de matériel en attente n'a été trouvée pour créer un lien vers les articles donnés."
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:436
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:424
 msgid "No primary email found for customer: {0}"
 msgstr ""
 
@@ -43363,15 +44076,15 @@
 msgid "No record found"
 msgstr "Aucun Enregistrement Trouvé"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:677
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:687
 msgid "No records found in Allocation table"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:579
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:584
 msgid "No records found in the Invoices table"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:582
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:587
 msgid "No records found in the Payments table"
 msgstr ""
 
@@ -43382,7 +44095,7 @@
 msgid "No stock transactions can be created or modified before this date."
 msgstr "Aucune transaction ne peux être créée ou modifié avant cette date."
 
-#: controllers/accounts_controller.py:2435
+#: controllers/accounts_controller.py:2520
 msgid "No updates pending for reposting"
 msgstr ""
 
@@ -43390,15 +44103,15 @@
 msgid "No values"
 msgstr "Pas de valeurs"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:340
 msgid "No {0} Accounts found for this company."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2197
+#: accounts/doctype/sales_invoice/sales_invoice.py:2166
 msgid "No {0} found for Inter Company Transactions."
 msgstr "Aucun {0} n'a été trouvé pour les transactions inter-sociétés."
 
-#: assets/doctype/asset/asset.js:239
+#: assets/doctype/asset/asset.js:274
 msgid "No."
 msgstr ""
 
@@ -43408,7 +44121,7 @@
 msgid "No. of Employees"
 msgstr "Nb de salarié(e)s"
 
-#: manufacturing/doctype/workstation/workstation.js:42
+#: manufacturing/doctype/workstation/workstation.js:66
 msgid "No. of parallel job cards which can be allowed on this workstation. Example: 2 would mean this workstation can process production for two Work Orders at a time."
 msgstr ""
 
@@ -43434,7 +44147,7 @@
 msgid "Non Profit"
 msgstr "À But Non Lucratif"
 
-#: manufacturing/doctype/bom/bom.py:1305
+#: manufacturing/doctype/bom/bom.py:1304
 msgid "Non stock items"
 msgstr "Articles hors stock"
 
@@ -43445,7 +44158,7 @@
 msgid "None"
 msgstr "Aucun"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:315
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:369
 msgid "None of the items have any change in quantity or value."
 msgstr "Aucun des Articles n’a de changement en quantité ou en valeur."
 
@@ -43458,11 +44171,11 @@
 
 #: 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:525
-#: assets/doctype/asset/asset.js:530 assets/doctype/asset/asset.js:547
+#: accounts/doctype/sales_invoice/sales_invoice.py:538
+#: assets/doctype/asset/asset.js:603 assets/doctype/asset/asset.js:620
 #: controllers/buying_controller.py:206
 #: selling/doctype/product_bundle/product_bundle.py:71
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:48
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:72
 msgid "Not Allowed"
 msgstr "Non Autorisé"
 
@@ -43478,8 +44191,8 @@
 msgid "Not Applicable"
 msgstr "Non Applicable"
 
-#: selling/page/point_of_sale/pos_controller.js:671
-#: selling/page/point_of_sale/pos_controller.js:694
+#: selling/page/point_of_sale/pos_controller.js:703
+#: selling/page/point_of_sale/pos_controller.js:732
 msgid "Not Available"
 msgstr "Indisponible"
 
@@ -43502,8 +44215,8 @@
 msgid "Not Initiated"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:744
-#: templates/pages/material_request_info.py:21 templates/pages/order.py:32
+#: buying/doctype/purchase_order/purchase_order.py:747
+#: templates/pages/material_request_info.py:21 templates/pages/order.py:34
 #: templates/pages/rfq.py:48
 msgid "Not Permitted"
 msgstr "Non Autorisé"
@@ -43523,7 +44236,7 @@
 msgstr "Non précisé"
 
 #: manufacturing/doctype/production_plan/production_plan_list.js:7
-#: manufacturing/doctype/work_order/work_order_list.js:7
+#: manufacturing/doctype/work_order/work_order_list.js:15
 #: stock/doctype/material_request/material_request_list.js:9
 msgid "Not Started"
 msgstr "Non Commencé"
@@ -43555,11 +44268,11 @@
 msgid "Not allow to set alternative item for the item {0}"
 msgstr "Ne permet pas de définir un autre article pour l'article {0}"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:48
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:52
 msgid "Not allowed to create accounting dimension for {0}"
 msgstr "Non autorisé à créer une dimension comptable pour {0}"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:254
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:265
 msgid "Not allowed to update stock transactions older than {0}"
 msgstr "Non autorisé à mettre à jour les transactions du stock antérieures à {0}"
 
@@ -43567,31 +44280,37 @@
 msgid "Not authorized since {0} exceeds limits"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:445
+#: accounts/doctype/gl_entry/gl_entry.py:399
 msgid "Not authorized to edit frozen Account {0}"
 msgstr "Vous n'êtes pas autorisé à modifier le compte gelé {0}"
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "Not in Stock"
+msgstr ""
+
 #: templates/includes/products_as_grid.html:20
 msgid "Not in stock"
 msgstr "En rupture"
 
-#: buying/doctype/purchase_order/purchase_order.py:667
-#: manufacturing/doctype/work_order/work_order.py:1256
-#: manufacturing/doctype/work_order/work_order.py:1390
-#: manufacturing/doctype/work_order/work_order.py:1440
-#: selling/doctype/sales_order/sales_order.py:755
-#: selling/doctype/sales_order/sales_order.py:1504
+#: 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
 msgid "Not permitted"
 msgstr "Pas permis"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:240
+#: 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:1607
-#: public/js/controllers/buying.js:440 selling/doctype/customer/customer.py:125
-#: selling/doctype/sales_order/sales_order.js:957
-#: stock/doctype/item/item.js:426 stock/doctype/item/item.py:539
-#: stock/doctype/stock_entry/stock_entry.py:1288
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:732
+#: 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
+#: 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
+#: templates/pages/timelog_info.html:43
 msgid "Note"
 msgstr ""
 
@@ -43628,15 +44347,15 @@
 msgid "Note: Email will not be sent to disabled users"
 msgstr "Remarque : Email ne sera pas envoyé aux utilisateurs désactivés"
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:53
+#: manufacturing/doctype/blanket_order/blanket_order.py:91
 msgid "Note: Item {0} added multiple times"
 msgstr "Remarque: l'élément {0} a été ajouté plusieurs fois"
 
-#: controllers/accounts_controller.py:450
+#: controllers/accounts_controller.py:494
 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
 msgstr "Remarque : Écriture de Paiement ne sera pas créée car le compte 'Compte Bancaire ou de Caisse' n'a pas été spécifié"
 
-#: accounts/doctype/cost_center/cost_center.js:32
+#: accounts/doctype/cost_center/cost_center.js:30
 msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups."
 msgstr "Remarque : Ce Centre de Coûts est un Groupe. Vous ne pouvez pas faire des écritures comptables sur des groupes."
 
@@ -43644,10 +44363,12 @@
 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:895
+#: accounts/doctype/journal_entry/journal_entry.py:922
 msgid "Note: {0}"
 msgstr "Note : {0}"
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
 #: www/book_appointment/index.html:55
 msgid "Notes"
 msgstr "Remarques"
@@ -43839,12 +44560,6 @@
 msgid "Number of Depreciations Booked"
 msgstr "Nombre d’Amortissements Comptabilisés"
 
-#. Label of a Data field in DocType 'Transaction Deletion Record Item'
-#: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
-msgctxt "Transaction Deletion Record Item"
-msgid "Number of Docs"
-msgstr ""
-
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:14
 msgid "Number of Interaction"
 msgstr "Nombre d'Interactions"
@@ -43879,11 +44594,11 @@
 msgid "Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days"
 msgstr "Nombre d'intervalles pour le champ d'intervalle, par exemple si Intervalle est &quot;Jours&quot; et si le décompte d'intervalle de facturation est 3, les factures seront générées tous les 3 jours"
 
-#: accounts/doctype/account/account_tree.js:109
+#: accounts/doctype/account/account_tree.js:132
 msgid "Number of new Account, it will be included in the account name as a prefix"
 msgstr "Numéro du nouveau compte, il sera inclus dans le nom du compte en tant que préfixe"
 
-#: accounts/doctype/cost_center/cost_center_tree.js:26
+#: accounts/doctype/cost_center/cost_center_tree.js:39
 msgid "Number of new Cost Center, it will be included in the cost center name as a prefix"
 msgstr "Numéro du nouveau centre de coûts, qui sera le préfixe du nom du centre de coûts"
 
@@ -43958,6 +44673,12 @@
 msgid "Odometer Value (Last)"
 msgstr "Valeur Compteur Kilométrique (Dernier)"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Off"
+msgstr "De"
+
 #. Label of a Date field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -43985,7 +44706,7 @@
 msgid "Offsetting Account"
 msgstr ""
 
-#: accounts/general_ledger.py:77
+#: accounts/general_ledger.py:81
 msgid "Offsetting for Accounting Dimension"
 msgstr ""
 
@@ -44035,11 +44756,11 @@
 msgid "On Converting Opportunity"
 msgstr "Sur l'opportunité de conversion"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:31
-#: buying/doctype/purchase_order/purchase_order_list.js:8
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:27
+#: buying/doctype/purchase_order/purchase_order_list.js:17
 #: buying/doctype/supplier/supplier_list.js:5
-#: selling/doctype/sales_order/sales_order_list.js:10
-#: support/report/issue_summary/issue_summary.js:45
+#: 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
 msgid "On Hold"
 msgstr ""
@@ -44156,10 +44877,17 @@
 msgid "On Track"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:540
+#: manufacturing/doctype/production_plan/production_plan.js:584
 msgid "On expanding a row in the Items to Manufacture table, you'll see an option to 'Include Exploded Items'. Ticking this includes raw materials of the sub-assembly items in the production process."
 msgstr ""
 
+#. Description of the 'Use Serial / Batch Fields' (Check) field in DocType
+#. 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "On submission of the stock transaction, system will auto create the Serial and Batch Bundle based on the Serial No / Batch fields."
+msgstr ""
+
 #: setup/default_energy_point_rules.py:43
 msgid "On {0} Creation"
 msgstr "Sur {0} Creation"
@@ -44176,10 +44904,14 @@
 msgid "Once set, this invoice will be on hold till the set date"
 msgstr "Une fois définie, cette facture sera mise en attente jusqu'à la date fixée"
 
-#: manufacturing/doctype/work_order/work_order.js:560
+#: manufacturing/doctype/work_order/work_order.js:591
 msgid "Once the Work Order is Closed. It can't be resumed."
 msgstr ""
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:16
+msgid "One customer can be part of only single Loyalty Program."
+msgstr ""
+
 #: manufacturing/dashboard_fixtures.py:228
 msgid "Ongoing Job Cards"
 msgstr "Cartes de travail en cours"
@@ -44206,11 +44938,11 @@
 msgid "Only Include Allocated Payments"
 msgstr ""
 
-#: accounts/doctype/account/account.py:134
+#: accounts/doctype/account/account.py:135
 msgid "Only Parent can be of type {0}"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:44
+#: assets/report/fixed_asset_register/fixed_asset_register.js:43
 msgid "Only existing assets"
 msgstr ""
 
@@ -44230,6 +44962,10 @@
 msgid "Only one Subcontracting Order can be created against a Purchase Order, cancel the existing Subcontracting Order to create a new one."
 msgstr ""
 
+#: stock/doctype/stock_entry/stock_entry.py:898
+msgid "Only one {0} entry can be created against the Work Order {1}"
+msgstr ""
+
 #. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
 #: accounts/doctype/pos_profile/pos_profile.json
 msgctxt "POS Profile"
@@ -44254,13 +44990,14 @@
 msgid "Only {0} are supported"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:35
+#: crm/report/lead_details/lead_details.js:34
 #: manufacturing/report/job_card_summary/job_card_summary.py:92
 #: quality_management/doctype/quality_meeting/quality_meeting_list.js:5
-#: selling/doctype/quotation/quotation_list.js:27
-#: support/report/issue_analytics/issue_analytics.js:56
-#: support/report/issue_summary/issue_summary.js:43
+#: 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
+#: templates/pages/task_info.html:72
 msgid "Open"
 msgstr "Ouvert"
 
@@ -44391,11 +45128,27 @@
 msgid "Open Activities HTML"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:114
+#: manufacturing/doctype/bom/bom_item_preview.html:21
+msgid "Open BOM {0}"
+msgstr ""
+
+#: public/js/templates/call_link.html:11
+msgid "Open Call Log"
+msgstr ""
+
+#: public/js/call_popup/call_popup.js:116
 msgid "Open Contact"
 msgstr "Contact ouvert"
 
-#: selling/page/point_of_sale/pos_controller.js:172
+#: public/js/templates/crm_activities.html:76
+msgid "Open Event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:63
+msgid "Open Events"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_controller.js:189
 msgid "Open Form View"
 msgstr "Ouvrir la vue formulaire"
 
@@ -44409,6 +45162,11 @@
 msgid "Open Issues "
 msgstr "Tickets ouverts"
 
+#: manufacturing/doctype/bom/bom_item_preview.html:25
+#: manufacturing/doctype/work_order/work_order_preview.html:28
+msgid "Open Item {0}"
+msgstr ""
+
 #: setup/doctype/email_digest/templates/default.html:154
 msgid "Open Notifications"
 msgstr "Notifications ouvertes"
@@ -44444,6 +45202,14 @@
 msgid "Open Sales Orders"
 msgstr ""
 
+#: public/js/templates/crm_activities.html:33
+msgid "Open Task"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:21
+msgid "Open Tasks"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
@@ -44454,6 +45220,10 @@
 msgid "Open To Do "
 msgstr "ToDo ouvertes"
 
+#: manufacturing/doctype/work_order/work_order_preview.html:24
+msgid "Open Work Order {0}"
+msgstr ""
+
 #. Name of a report
 #: manufacturing/report/open_work_orders/open_work_orders.json
 msgid "Open Work Orders"
@@ -44464,7 +45234,7 @@
 msgstr "Ouvrir un nouveau ticket"
 
 #: accounts/report/general_ledger/general_ledger.py:56
-#: public/js/stock_analytics.js:64
+#: public/js/stock_analytics.js:97
 msgid "Opening"
 msgstr "Ouverture"
 
@@ -44502,7 +45272,7 @@
 msgid "Opening Accumulated Depreciation"
 msgstr "Amortissement Cumulé d'Ouverture"
 
-#: assets/doctype/asset/asset.py:428
+#: assets/doctype/asset/asset.py:430
 msgid "Opening Accumulated Depreciation must be less than or equal to {0}"
 msgstr ""
 
@@ -44552,7 +45322,7 @@
 msgid "Opening Entry"
 msgstr "Écriture d'Ouverture"
 
-#: accounts/general_ledger.py:676
+#: accounts/general_ledger.py:685
 msgid "Opening Entry can not be created after Period Closing Voucher is created."
 msgstr ""
 
@@ -44561,7 +45331,7 @@
 msgstr "Ouverture de la création de facture en cours"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/account/account_tree.js:189
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
 msgid "Opening Invoice Creation Tool"
 msgstr "Ouverture de l'outil de création de facture"
@@ -44582,12 +45352,16 @@
 msgid "Opening Invoice Item"
 msgstr "Ouverture d'un poste de facture"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:125
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:8
+msgid "Opening Invoices"
+msgstr ""
+
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:128
 msgid "Opening Invoices Summary"
 msgstr "Ouverture des factures Résumé"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:79
-#: stock/report/stock_balance/stock_balance.py:419
+#: stock/report/stock_balance/stock_balance.py:427
 msgid "Opening Qty"
 msgstr "Quantité d'Ouverture"
 
@@ -44613,7 +45387,7 @@
 msgid "Opening Time"
 msgstr "Horaire d'Ouverture"
 
-#: stock/report/stock_balance/stock_balance.py:426
+#: stock/report/stock_balance/stock_balance.py:434
 msgid "Opening Value"
 msgstr "Valeur d'Ouverture"
 
@@ -44622,7 +45396,7 @@
 msgid "Opening and Closing"
 msgstr "Ouverture et fermeture"
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:30
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:31
 msgid "Opening {0} Invoices created"
 msgstr ""
 
@@ -44654,7 +45428,7 @@
 msgid "Operating Cost Per BOM Quantity"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1321
+#: manufacturing/doctype/bom/bom.py:1320
 msgid "Operating Cost as per Work Order / BOM"
 msgstr "Coût d'exploitation selon l'ordre de fabrication / nomenclature"
 
@@ -44678,14 +45452,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/bom/bom.js:319
+#: manufacturing/doctype/bom/bom.js:332
 #: manufacturing/doctype/operation/operation.json
-#: manufacturing/doctype/work_order/work_order.js:225
+#: manufacturing/doctype/work_order/work_order.js:240
 #: 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:48
+#: 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/job_card_summary/job_card_summary.js:79
+#: manufacturing/report/job_card_summary/job_card_summary.js:78
 #: manufacturing/report/job_card_summary/job_card_summary.py:167
 msgid "Operation"
 msgstr "Opération"
@@ -44780,7 +45554,7 @@
 msgid "Operation ID"
 msgstr "ID d'opération"
 
-#: manufacturing/doctype/work_order/work_order.js:239
+#: manufacturing/doctype/work_order/work_order.js:254
 msgid "Operation Id"
 msgstr "ID de l'Opération"
 
@@ -44808,7 +45582,7 @@
 msgid "Operation Time "
 msgstr "Durée de l'opération"
 
-#: manufacturing/doctype/work_order/work_order.py:985
+#: manufacturing/doctype/work_order/work_order.py:999
 msgid "Operation Time must be greater than 0 for Operation {0}"
 msgstr "Temps de l'Opération doit être supérieur à 0 pour l'Opération {0}"
 
@@ -44825,20 +45599,20 @@
 msgid "Operation time does not depend on quantity to produce"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:215
+#: manufacturing/doctype/job_card/job_card.js:238
 msgid "Operation {0} added multiple times in the work order {1}"
 msgstr "Opération {0} ajoutée plusieurs fois dans l'ordre de fabrication {1}"
 
-#: manufacturing/doctype/job_card/job_card.py:975
+#: manufacturing/doctype/job_card/job_card.py:990
 msgid "Operation {0} does not belong to the work order {1}"
 msgstr "L'opération {0} ne fait pas partie de l'ordre de fabrication {1}"
 
-#: manufacturing/doctype/workstation/workstation.py:179
+#: manufacturing/doctype/workstation/workstation.py:335
 msgid "Operation {0} longer than any available working hours in workstation {1}, break down the operation into multiple operations"
 msgstr "Opération {0} plus longue que toute heure de travail disponible dans la station de travail {1}, veuillez séparer l'opération en plusieurs opérations"
 
-#: manufacturing/doctype/work_order/work_order.js:220
-#: setup/doctype/company/company.py:341 templates/generators/bom.html:61
+#: manufacturing/doctype/work_order/work_order.js:235
+#: setup/doctype/company/company.py:340 templates/generators/bom.html:61
 msgid "Operations"
 msgstr "Opérations"
 
@@ -44868,6 +45642,7 @@
 msgid "Operations cannot be left blank"
 msgstr "Les opérations ne peuvent pas être laissées vides"
 
+#: manufacturing/doctype/workstation/workstation.js:165
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:85
 msgid "Operator"
 msgstr "Opérateur"
@@ -44899,17 +45674,17 @@
 msgid "Opportunities"
 msgstr "Opportunités"
 
-#: selling/page/sales_funnel/sales_funnel.js:43
+#: selling/page/sales_funnel/sales_funnel.js:48
 msgid "Opportunities by lead source"
 msgstr "Opportunités par source de lead"
 
 #. Name of a DocType
-#: buying/doctype/request_for_quotation/request_for_quotation.js:318
-#: crm/doctype/lead/lead.js:36 crm/doctype/opportunity/opportunity.json
-#: crm/doctype/prospect/prospect.js:15
-#: crm/report/lead_details/lead_details.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: crm/doctype/lead/lead.js:33 crm/doctype/opportunity/opportunity.json
+#: crm/doctype/prospect/prospect.js:20
+#: crm/report/lead_details/lead_details.js:36
 #: crm/report/lost_opportunity/lost_opportunity.py:17
-#: public/js/communication.js:26 selling/doctype/quotation/quotation.js:133
+#: public/js/communication.js:35 selling/doctype/quotation/quotation.js:139
 msgid "Opportunity"
 msgstr "Opportunité"
 
@@ -44978,7 +45753,7 @@
 msgid "Opportunity Date"
 msgstr "Date d'Opportunité"
 
-#: crm/report/lost_opportunity/lost_opportunity.js:43
+#: crm/report/lost_opportunity/lost_opportunity.js:42
 #: crm/report/lost_opportunity/lost_opportunity.py:24
 msgid "Opportunity From"
 msgstr "Opportunité De"
@@ -45023,7 +45798,7 @@
 msgstr "Détail de la raison perdue de l'opportunité"
 
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:32
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:55
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:57
 msgid "Opportunity Owner"
 msgstr ""
 
@@ -45033,8 +45808,8 @@
 msgid "Opportunity Owner"
 msgstr ""
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:47
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:59
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:45
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:58
 msgid "Opportunity Source"
 msgstr ""
 
@@ -45051,9 +45826,9 @@
 #. Name of a DocType
 #: crm/doctype/opportunity_type/opportunity_type.json
 #: crm/report/lost_opportunity/lost_opportunity.py:44
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:53
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:51
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:48
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:65
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:64
 msgid "Opportunity Type"
 msgstr "Type d'Opportunité"
 
@@ -45069,7 +45844,7 @@
 msgid "Opportunity Value"
 msgstr ""
 
-#: public/js/communication.js:86
+#: public/js/communication.js:102
 msgid "Opportunity {0} created"
 msgstr "Opportunité {0} créée"
 
@@ -45079,11 +45854,11 @@
 msgid "Optimize Route"
 msgstr "Optimiser l'itinéraire"
 
-#: accounts/doctype/account/account_tree.js:122
+#: accounts/doctype/account/account_tree.js:168
 msgid "Optional. Sets company's default currency, if not specified."
 msgstr "Optionnel. Défini la devise par défaut de l'entreprise, si non spécifié."
 
-#: accounts/doctype/account/account_tree.js:117
+#: accounts/doctype/account/account_tree.js:155
 msgid "Optional. This setting will be used to filter in various transactions."
 msgstr "Facultatif. Ce paramètre sera utilisé pour filtrer différentes transactions."
 
@@ -45111,7 +45886,7 @@
 msgid "Order Amount"
 msgstr "Montant de la commande"
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:81
+#: manufacturing/report/production_planning_report/production_planning_report.js:80
 msgid "Order By"
 msgstr "Commandé par"
 
@@ -45156,9 +45931,13 @@
 msgid "Order Status"
 msgstr "Statut de la commande"
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:30
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:8
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:8
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:4
+msgid "Order Summary"
+msgstr ""
+
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:29
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:7
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:7
 msgid "Order Type"
 msgstr "Type de Commande"
 
@@ -45191,8 +45970,8 @@
 msgstr ""
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:5
-#: selling/doctype/quotation/quotation_list.js:31
-#: stock/doctype/material_request/material_request_list.js:25
+#: selling/doctype/quotation/quotation_list.js:30
+#: stock/doctype/material_request/material_request_list.js:29
 msgid "Ordered"
 msgstr "Commandé"
 
@@ -45245,6 +46024,10 @@
 msgid "Ordered Qty"
 msgstr "Qté Commandée"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Ordered Qty: Quantity ordered for purchase, but not received."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:102
 msgid "Ordered Quantity"
 msgstr "Quantité Commandée"
@@ -45257,7 +46040,7 @@
 
 #: buying/doctype/supplier/supplier_dashboard.py:14
 #: selling/doctype/customer/customer_dashboard.py:21
-#: selling/doctype/sales_order/sales_order.py:745
+#: selling/doctype/sales_order/sales_order.py:751
 #: setup/doctype/company/company_dashboard.py:23
 msgid "Orders"
 msgstr "Commandes"
@@ -45389,12 +46172,12 @@
 msgstr "Autres Paramètres"
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:81
-#: stock/report/stock_balance/stock_balance.py:441
-#: stock/report/stock_ledger/stock_ledger.py:146
+#: stock/report/stock_balance/stock_balance.py:449
+#: stock/report/stock_ledger/stock_ledger.py:219
 msgid "Out Qty"
 msgstr "Qté Sortante"
 
-#: stock/report/stock_balance/stock_balance.py:447
+#: stock/report/stock_balance/stock_balance.py:455
 msgid "Out Value"
 msgstr "Valeur Sortante"
 
@@ -45411,7 +46194,7 @@
 msgid "Out of AMC"
 msgstr "Sur AMC"
 
-#: assets/doctype/asset/asset_list.js:23
+#: assets/doctype/asset/asset_list.js:17
 msgid "Out of Order"
 msgstr "Hors service"
 
@@ -45421,7 +46204,7 @@
 msgid "Out of Order"
 msgstr "Hors service"
 
-#: stock/doctype/pick_list/pick_list.py:386
+#: stock/doctype/pick_list/pick_list.py:426
 msgid "Out of Stock"
 msgstr "En rupture de stock"
 
@@ -45492,9 +46275,10 @@
 msgid "Outstanding"
 msgstr "Solde"
 
-#: accounts/doctype/payment_entry/payment_entry.js:653
+#: 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.py:1074
+#: 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/purchase_register/purchase_register.py:289
 #: accounts/report/sales_register/sales_register.py:317
@@ -45551,7 +46335,7 @@
 msgid "Outstanding Cheques and Deposits to clear"
 msgstr "Chèques et Dépôts en suspens à compenser"
 
-#: accounts/doctype/gl_entry/gl_entry.py:422
+#: accounts/doctype/gl_entry/gl_entry.py:376
 msgid "Outstanding for {0} cannot be less than zero ({1})"
 msgstr "Solde pour {0} ne peut pas être inférieur à zéro ({1})"
 
@@ -45600,7 +46384,7 @@
 msgid "Over Delivery/Receipt Allowance (%)"
 msgstr ""
 
-#: controllers/stock_controller.py:896
+#: controllers/stock_controller.py:1082
 msgid "Over Receipt"
 msgstr ""
 
@@ -45624,13 +46408,14 @@
 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role."
 msgstr ""
 
-#: controllers/accounts_controller.py:1713
+#: controllers/accounts_controller.py:1802
 msgid "Overbilling of {} ignored because you have {} role."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:261
+#: accounts/doctype/sales_invoice/sales_invoice.py:266
 #: projects/report/project_summary/project_summary.py:94
-#: selling/doctype/sales_order/sales_order_list.js:18
+#: selling/doctype/sales_order/sales_order_list.js:29
+#: templates/pages/task_info.html:75
 msgid "Overdue"
 msgstr "En retard"
 
@@ -45840,11 +46625,11 @@
 msgid "POS Closing Entry Taxes"
 msgstr "Taxes d'entrée à la clôture du PDV"
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:30
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:31
 msgid "POS Closing Failed"
 msgstr ""
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:54
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:55
 msgid "POS Closing failed while running in a background process. You can resolve the {0} and retry the process again."
 msgstr ""
 
@@ -45991,10 +46776,10 @@
 
 #. Name of a DocType
 #: accounts/doctype/pos_profile/pos_profile.json
-#: accounts/report/pos_register/pos_register.js:33
+#: accounts/report/pos_register/pos_register.js:32
 #: accounts/report/pos_register/pos_register.py:120
 #: accounts/report/pos_register/pos_register.py:193
-#: selling/page/point_of_sale/pos_controller.js:68
+#: selling/page/point_of_sale/pos_controller.js:80
 msgid "POS Profile"
 msgstr "Profil PDV"
 
@@ -46031,7 +46816,7 @@
 msgid "POS Profile doesn't matches {}"
 msgstr "Le profil de point de vente ne correspond pas à {}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1119
+#: accounts/doctype/sales_invoice/sales_invoice.py:1135
 msgid "POS Profile required to make POS Entry"
 msgstr "Profil PDV nécessaire pour faire une écriture de PDV"
 
@@ -46082,7 +46867,7 @@
 msgid "POS Transactions"
 msgstr "Transactions POS"
 
-#: selling/page/point_of_sale/pos_controller.js:363
+#: selling/page/point_of_sale/pos_controller.js:392
 msgid "POS invoice {0} created successfully"
 msgstr ""
 
@@ -46155,7 +46940,7 @@
 msgid "Package Weight Details"
 msgstr "Détails du Poids du Paquet"
 
-#: stock/doctype/delivery_note/delivery_note_list.js:65
+#: stock/doctype/delivery_note/delivery_note_list.js:74
 msgid "Packaging Slip From Delivery Note"
 msgstr ""
 
@@ -46188,7 +46973,7 @@
 msgid "Packed Items"
 msgstr "Articles Emballés"
 
-#: controllers/stock_controller.py:739
+#: controllers/stock_controller.py:922
 msgid "Packed Items cannot be transferred internally"
 msgstr ""
 
@@ -46229,7 +47014,7 @@
 msgstr "Liste de Colisage"
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:186
+#: stock/doctype/delivery_note/delivery_note.js:221
 #: stock/doctype/packing_slip/packing_slip.json
 msgid "Packing Slip"
 msgstr "Bordereau de Colis"
@@ -46245,7 +47030,7 @@
 msgid "Packing Slip Item"
 msgstr "Article Emballé"
 
-#: stock/doctype/delivery_note/delivery_note.py:704
+#: stock/doctype/delivery_note/delivery_note.py:765
 msgid "Packing Slip(s) cancelled"
 msgstr "Bordereau(x) de Colis annulé(s)"
 
@@ -46355,8 +47140,8 @@
 msgid "Page {0} of {1}"
 msgstr "Page {0} sur {1}"
 
-#: accounts/doctype/payment_request/payment_request_list.js:17
-#: accounts/doctype/sales_invoice/sales_invoice.py:267
+#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/sales_invoice/sales_invoice.py:272
 msgid "Paid"
 msgstr "Payé"
 
@@ -46385,10 +47170,12 @@
 msgstr "Payé"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:170
-#: accounts/report/accounts_receivable/accounts_receivable.py:1068
+#: 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
+#: 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"
 msgstr "Montant payé"
@@ -46465,7 +47252,7 @@
 msgid "Paid Amount After Tax (Company Currency)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:881
+#: accounts/doctype/payment_entry/payment_entry.js:1059
 msgid "Paid Amount cannot be greater than total negative outstanding amount {0}"
 msgstr "Le Montant Payé ne peut pas être supérieur au montant impayé restant {0}"
 
@@ -46487,8 +47274,8 @@
 msgid "Paid To Account Type"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:324
-#: accounts/doctype/sales_invoice/sales_invoice.py:994
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:328
+#: accounts/doctype/sales_invoice/sales_invoice.py:1011
 msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
 msgstr "Le Montant Payé + Montant Repris ne peut pas être supérieur au Total Général"
 
@@ -46632,7 +47419,7 @@
 msgid "Parent Company"
 msgstr "Maison mère"
 
-#: setup/doctype/company/company.py:460
+#: setup/doctype/company/company.py:459
 msgid "Parent Company must be a group company"
 msgstr "La société mère doit être une société du groupe"
 
@@ -46742,12 +47529,6 @@
 msgid "Parent Warehouse"
 msgstr "Entrepôt Parent"
 
-#. Label of a Link field in DocType 'Pick List'
-#: stock/doctype/pick_list/pick_list.json
-msgctxt "Pick List"
-msgid "Parent Warehouse"
-msgstr "Entrepôt Parent"
-
 #. Label of a Link field in DocType 'Warehouse'
 #: stock/doctype/warehouse/warehouse.json
 msgctxt "Warehouse"
@@ -46760,7 +47541,7 @@
 msgid "Partial Material Transferred"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1043
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1045
 msgid "Partial Stock Reservation"
 msgstr ""
 
@@ -46803,7 +47584,7 @@
 msgid "Partially Delivered"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:8
+#: assets/doctype/asset/asset_list.js:7
 msgid "Partially Depreciated"
 msgstr "Partiellement déprécié"
 
@@ -46819,7 +47600,7 @@
 msgid "Partially Fulfilled"
 msgstr "Partiellement rempli"
 
-#: selling/doctype/quotation/quotation_list.js:29
+#: selling/doctype/quotation/quotation_list.js:28
 msgid "Partially Ordered"
 msgstr "Partiellement commandé"
 
@@ -46835,7 +47616,7 @@
 msgid "Partially Ordered"
 msgstr "Partiellement commandé"
 
-#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/payment_request/payment_request_list.js:12
 msgid "Partially Paid"
 msgstr "Partiellement payé"
 
@@ -46859,7 +47640,7 @@
 msgid "Partially Paid"
 msgstr "Partiellement payé"
 
-#: stock/doctype/material_request/material_request_list.js:21
+#: stock/doctype/material_request/material_request_list.js:25
 msgid "Partially Received"
 msgstr "Partiellement reçu"
 
@@ -46905,7 +47686,7 @@
 msgid "Parties"
 msgstr "Des soirées"
 
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:14
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:23
 msgid "Partly Billed"
 msgstr "Partiellement Facturé"
 
@@ -46963,30 +47744,38 @@
 msgid "Partnership"
 msgstr ""
 
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Parts Per Hour"
+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
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:193
 #: accounts/doctype/tax_category/tax_category_dashboard.py:11
-#: accounts/report/accounts_payable/accounts_payable.js:109
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:86
-#: accounts/report/accounts_receivable/accounts_receivable.js:54
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:86
+#: accounts/report/accounts_payable/accounts_payable.js:112
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:89
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.js:74
-#: accounts/report/general_ledger/general_ledger.py:633
-#: accounts/report/payment_ledger/payment_ledger.js:52
+#: accounts/report/general_ledger/general_ledger.py:646
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:92
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:27
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:27
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:26
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:26
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:57
-#: crm/report/lost_opportunity/lost_opportunity.js:56
+#: crm/report/lost_opportunity/lost_opportunity.js:55
 #: crm/report/lost_opportunity/lost_opportunity.py:31
-#: public/js/bank_reconciliation_tool/data_table_manager.js:51
-#: public/js/bank_reconciliation_tool/dialog_manager.js:128
+#: public/js/bank_reconciliation_tool/data_table_manager.js:50
+#: public/js/bank_reconciliation_tool/dialog_manager.js:135
 msgid "Party"
 msgstr "Tiers"
 
@@ -47128,16 +47917,10 @@
 msgid "Party Account No. (Bank Statement)"
 msgstr ""
 
-#: controllers/accounts_controller.py:1983
+#: controllers/accounts_controller.py:2075
 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same"
 msgstr ""
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Party Balance"
-msgstr "Solde du Tiers"
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47180,13 +47963,19 @@
 msgid "Party Information"
 msgstr "Informations sur le tier"
 
+#. Label of a Data field in DocType 'Blanket Order Item'
+#: manufacturing/doctype/blanket_order_item/blanket_order_item.json
+msgctxt "Blanket Order Item"
+msgid "Party Item Code"
+msgstr ""
+
 #. Name of a DocType
 #: accounts/doctype/party_link/party_link.json
 msgid "Party Link"
 msgstr ""
 
 #: accounts/report/general_ledger/general_ledger.js:109
-#: selling/report/address_and_contacts/address_and_contacts.js:23
+#: selling/report/address_and_contacts/address_and_contacts.js:22
 msgid "Party Name"
 msgstr "Nom du Tiers"
 
@@ -47239,16 +48028,16 @@
 #: 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/general_ledger/general_ledger.js:65
-#: accounts/report/general_ledger/general_ledger.py:632
-#: accounts/report/payment_ledger/payment_ledger.js:42
+#: accounts/report/general_ledger/general_ledger.py:645
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:16
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:16
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:15
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:15
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:49
-#: public/js/bank_reconciliation_tool/data_table_manager.js:46
-#: selling/report/address_and_contacts/address_and_contacts.js:10
+#: public/js/bank_reconciliation_tool/data_table_manager.js:45
+#: selling/report/address_and_contacts/address_and_contacts.js:9
 #: setup/doctype/party_type/party_type.json
 msgid "Party Type"
 msgstr "Type de Tiers"
@@ -47353,7 +48142,7 @@
 msgid "Party Type and Party is mandatory for {0} account"
 msgstr "Le type de tiers et le tiers sont obligatoires pour le compte {0}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:162
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:161
 msgid "Party Type and Party is required for Receivable / Payable account {0}"
 msgstr ""
 
@@ -47367,7 +48156,7 @@
 msgid "Party User"
 msgstr "Utilisateur tiers"
 
-#: accounts/doctype/payment_entry/payment_entry.js:308
+#: accounts/doctype/payment_entry/payment_entry.js:390
 msgid "Party can only be one of {0}"
 msgstr ""
 
@@ -47421,7 +48210,7 @@
 msgid "Path"
 msgstr "Chemin"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:84
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:85
 msgid "Pause"
 msgstr ""
 
@@ -47431,7 +48220,7 @@
 msgid "Pause"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:259
+#: manufacturing/doctype/job_card/job_card.js:292
 msgid "Pause Job"
 msgstr ""
 
@@ -47454,6 +48243,10 @@
 msgid "Paused"
 msgstr ""
 
+#: templates/pages/order.html:43
+msgid "Pay"
+msgstr "Payer"
+
 #. Option for the 'Payment Type' (Select) field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47466,7 +48259,7 @@
 msgid "Pay To / Recd From"
 msgstr "Payé À / Reçu De"
 
-#: accounts/report/account_balance/account_balance.js:52
+#: accounts/report/account_balance/account_balance.js:54
 msgid "Payable"
 msgstr "Créditeur"
 
@@ -47515,15 +48308,15 @@
 
 #: accounts/doctype/dunning/dunning.js:51
 #: accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:110
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:65
-#: accounts/doctype/sales_invoice/sales_invoice.js:104
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:52
+#: 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:31
-#: buying/doctype/purchase_order/purchase_order.js:328
+#: accounts/doctype/sales_invoice/sales_invoice_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:385
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:20
-#: selling/doctype/sales_order/sales_order.js:606
+#: selling/doctype/sales_order/sales_order.js:713
 #: selling/doctype/sales_order/sales_order_dashboard.py:28
 msgid "Payment"
 msgstr "Paiement"
@@ -47631,15 +48424,16 @@
 msgid "Payment Entries"
 msgstr "Écritures de Paiement"
 
-#: accounts/utils.py:937
+#: accounts/utils.py:946
 msgid "Payment Entries {0} are un-linked"
 msgstr "Écritures de Paiement {0} ne sont pas liées"
 
 #. Name of a DocType
 #: accounts/doctype/payment_entry/payment_entry.json
-#: accounts/doctype/payment_order/payment_order.js:22
+#: accounts/doctype/payment_order/payment_order.js:27
 #: accounts/print_format/bank_and_cash_payment_voucher/bank_and_cash_payment_voucher.html:12
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.py:29
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:11
 msgid "Payment Entry"
 msgstr "Écriture de Paiement"
 
@@ -47692,23 +48486,24 @@
 msgid "Payment Entry Reference"
 msgstr "Référence d’Écriture de Paiement"
 
-#: accounts/doctype/payment_request/payment_request.py:410
+#: accounts/doctype/payment_request/payment_request.py:413
 msgid "Payment Entry already exists"
 msgstr "L’Écriture de Paiement existe déjà"
 
-#: accounts/utils.py:604
+#: accounts/utils.py:613
 msgid "Payment Entry has been modified after you pulled it. Please pull it again."
 msgstr "L’Écriture de Paiement a été modifié après que vous l’ayez récupérée. Veuillez la récupérer à nouveau."
 
-#: accounts/doctype/payment_request/payment_request.py:568
+#: accounts/doctype/payment_request/payment_request.py:111
+#: accounts/doctype/payment_request/payment_request.py:460
 msgid "Payment Entry is already created"
 msgstr "L’Écriture de Paiement est déjà créée"
 
-#: controllers/accounts_controller.py:1164
+#: controllers/accounts_controller.py:1231
 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:261
+#: selling/page/point_of_sale/pos_payment.js:271
 msgid "Payment Failed"
 msgstr "Le Paiement a Échoué"
 
@@ -47759,7 +48554,7 @@
 msgid "Payment Gateway Account"
 msgstr "Compte Passerelle de Paiement"
 
-#: accounts/utils.py:1227
+#: accounts/utils.py:1196
 msgid "Payment Gateway Account not created, please create one manually."
 msgstr "Le Compte Passerelle de Paiement n’existe pas, veuillez en créer un manuellement."
 
@@ -47789,9 +48584,10 @@
 msgid "Payment Limit"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.js:51
+#: accounts/report/pos_register/pos_register.js:50
 #: accounts/report/pos_register/pos_register.py:129
 #: accounts/report/pos_register/pos_register.py:221
+#: selling/page/point_of_sale/pos_payment.js:19
 msgid "Payment Method"
 msgstr "Mode de paiement"
 
@@ -47883,7 +48679,7 @@
 msgid "Payment Receipt Note"
 msgstr "Bon de Réception du Paiement"
 
-#: selling/page/point_of_sale/pos_payment.js:248
+#: selling/page/point_of_sale/pos_payment.js:252
 msgid "Payment Received"
 msgstr "Paiement reçu"
 
@@ -47916,7 +48712,7 @@
 msgid "Payment Reconciliation Invoice"
 msgstr "Facture de Réconciliation des Paiements"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:120
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:123
 msgid "Payment Reconciliation Job: {0} is running for this party. Can't reconcile now."
 msgstr ""
 
@@ -47944,12 +48740,12 @@
 msgstr "Références de Paiement"
 
 #. Name of a DocType
-#: accounts/doctype/payment_order/payment_order.js:18
+#: accounts/doctype/payment_order/payment_order.js:19
 #: accounts/doctype/payment_request/payment_request.json
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:125
-#: accounts/doctype/sales_invoice/sales_invoice.js:140
-#: buying/doctype/purchase_order/purchase_order.js:335
-#: selling/doctype/sales_order/sales_order.js:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:145
+#: accounts/doctype/sales_invoice/sales_invoice.js:143
+#: buying/doctype/purchase_order/purchase_order.js:393
+#: selling/doctype/sales_order/sales_order.js:709
 msgid "Payment Request"
 msgstr "Requête de Paiement"
 
@@ -47978,15 +48774,15 @@
 msgid "Payment Request Type"
 msgstr "Type de demande de paiement"
 
-#: accounts/doctype/payment_request/payment_request.py:502
+#: accounts/doctype/payment_request/payment_request.py:507
 msgid "Payment Request for {0}"
 msgstr "Demande de paiement pour {0}"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:268
+#: accounts/doctype/pos_invoice/pos_invoice.js:289
 msgid "Payment Request took too long to respond. Please try requesting for payment again."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:450
+#: accounts/doctype/payment_request/payment_request.py:453
 msgid "Payment Requests cannot be created against: {0}"
 msgstr ""
 
@@ -48037,13 +48833,9 @@
 msgid "Payment Schedule"
 msgstr "Calendrier de paiement"
 
-#: public/js/controllers/transaction.js:925
-msgid "Payment Schedule Table"
-msgstr ""
-
 #. Name of a DocType
 #: accounts/doctype/payment_term/payment_term.json
-#: accounts/report/accounts_receivable/accounts_receivable.py:1064
+#: accounts/report/accounts_receivable/accounts_receivable.py:1072
 #: accounts/report/gross_profit/gross_profit.py:348
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
 msgid "Payment Term"
@@ -48086,6 +48878,7 @@
 msgstr "Nom du terme de paiement"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:44
+#: accounts/report/accounts_receivable/accounts_receivable.html:31
 msgid "Payment Terms"
 msgstr "Termes de paiement"
 
@@ -48139,11 +48932,11 @@
 #. Name of a DocType
 #: accounts/doctype/payment_terms_template/payment_terms_template.json
 #: accounts/report/accounts_payable/accounts_payable.js:93
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:99
-#: accounts/report/accounts_receivable/accounts_receivable.js:127
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:105
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:62
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:62
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:102
+#: accounts/report/accounts_receivable/accounts_receivable.js:130
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:108
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:61
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:61
 msgid "Payment Terms Template"
 msgstr "Modèle de termes de paiement"
 
@@ -48211,15 +49004,15 @@
 msgid "Payment Type"
 msgstr "Type de paiement"
 
-#: accounts/doctype/payment_entry/payment_entry.py:501
+#: accounts/doctype/payment_entry/payment_entry.py:510
 msgid "Payment Type must be one of Receive, Pay and Internal Transfer"
 msgstr "Type de Paiement doit être Recevoir, Payer ou Transfert Interne"
 
-#: accounts/utils.py:927
+#: accounts/utils.py:936
 msgid "Payment Unlink Error"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:764
+#: accounts/doctype/journal_entry/journal_entry.py:791
 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
 msgstr "Paiement pour {0} {1} ne peut pas être supérieur à Encours {2}"
 
@@ -48231,12 +49024,12 @@
 msgid "Payment methods are mandatory. Please add at least one payment method."
 msgstr "Les modes de paiement sont obligatoires. Veuillez ajouter au moins un mode de paiement."
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:277
-#: selling/page/point_of_sale/pos_payment.js:252
+#: accounts/doctype/pos_invoice/pos_invoice.js:301
+#: selling/page/point_of_sale/pos_payment.js:259
 msgid "Payment of {0} received successfully."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:257
+#: selling/page/point_of_sale/pos_payment.js:266
 msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
 msgstr ""
 
@@ -48244,11 +49037,11 @@
 msgid "Payment related to {0} is not completed"
 msgstr "Le paiement lié à {0} n'est pas terminé"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:259
+#: accounts/doctype/pos_invoice/pos_invoice.js:278
 msgid "Payment request failed"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:713
+#: accounts/doctype/payment_entry/payment_entry.py:722
 msgid "Payment term {0} not used in {1}"
 msgstr ""
 
@@ -48263,6 +49056,7 @@
 #: accounts/workspace/receivables/receivables.json
 #: buying/doctype/supplier/supplier_dashboard.py:15
 #: selling/doctype/customer/customer_dashboard.py:22
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Payments"
 msgstr "Paiements"
 
@@ -48327,11 +49121,11 @@
 msgstr "Fiche de paie"
 
 #: assets/doctype/asset_repair/asset_repair_list.js:5
-#: buying/doctype/request_for_quotation/request_for_quotation.py:314
+#: buying/doctype/request_for_quotation/request_for_quotation.py:338
 #: 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
-#: templates/pages/order.html:56
+#: templates/pages/order.html:68
 msgid "Pending"
 msgstr "En Attente"
 
@@ -48409,9 +49203,9 @@
 msgstr "Montant en attente"
 
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:218
-#: manufacturing/doctype/work_order/work_order.js:244
+#: 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:991
+#: selling/doctype/sales_order/sales_order.js:1153
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
 msgid "Pending Qty"
 msgstr "Qté en Attente"
@@ -48427,6 +49221,10 @@
 msgid "Pending Quantity"
 msgstr "Quantité en attente"
 
+#: templates/pages/task_info.html:74
+msgid "Pending Review"
+msgstr "Revue en Attente"
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -48448,7 +49246,7 @@
 msgid "Pending activities for today"
 msgstr "Activités en Attente pour aujourd'hui"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:224
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:219
 msgid "Pending processing"
 msgstr ""
 
@@ -48601,25 +49399,25 @@
 msgid "Perception Analysis"
 msgstr "Analyse de perception"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:61
+#: accounts/report/budget_variance_report/budget_variance_report.js:59
 #: public/js/purchase_trends_filters.js:16 public/js/sales_trends_filters.js:8
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:30
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:30
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:30
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:29
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:29
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:29
 msgid "Period"
 msgstr "Période"
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:61
+#: assets/report/fixed_asset_register/fixed_asset_register.js:60
 msgid "Period Based On"
 msgstr "Période basée sur"
 
-#: accounts/general_ledger.py:690
+#: accounts/general_ledger.py:699
 msgid "Period Closed"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.js:82
-msgid "Period Closing Entry"
-msgstr "Écriture de Clôture de la Période"
+#: accounts/report/trial_balance/trial_balance.js:88
+msgid "Period Closing Entry For Current Period"
+msgstr ""
 
 #. Label of a Section Break field in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -48628,7 +49426,7 @@
 msgstr "Paramètres de clôture de la période"
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:141
+#: accounts/doctype/account/account_tree.js:197
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgid "Period Closing Voucher"
 msgstr "Bon de Clôture de la Période"
@@ -48715,10 +49513,10 @@
 msgid "Period_from_date"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:72
 #: accounts/report/financial_ratios/financial_ratios.js:33
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:55
-#: public/js/financial_statements.js:214
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:54
+#: public/js/financial_statements.js:223
 msgid "Periodicity"
 msgstr "Périodicité"
 
@@ -48853,7 +49651,7 @@
 msgid "Phone No"
 msgstr "N° de Téléphone"
 
-#: selling/page/point_of_sale/pos_item_cart.js:880
+#: selling/page/point_of_sale/pos_item_cart.js:911
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
@@ -48863,13 +49661,13 @@
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
-#: public/js/utils.js:64
+#: public/js/utils.js:78
 msgid "Pick Batch No"
 msgstr ""
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:548
-#: stock/doctype/material_request/material_request.js:113
+#: selling/doctype/sales_order/sales_order.js:599
+#: stock/doctype/material_request/material_request.js:115
 #: stock/doctype/pick_list/pick_list.json
 msgid "Pick List"
 msgstr "Liste de sélection"
@@ -48899,7 +49697,7 @@
 msgid "Pick List"
 msgstr "Liste de sélection"
 
-#: stock/doctype/pick_list/pick_list.py:116
+#: stock/doctype/pick_list/pick_list.py:120
 msgid "Pick List Incomplete"
 msgstr ""
 
@@ -48980,7 +49778,7 @@
 msgid "Pickup Date"
 msgstr ""
 
-#: stock/doctype/shipment/shipment.js:364
+#: stock/doctype/shipment/shipment.js:398
 msgid "Pickup Date cannot be before this day"
 msgstr ""
 
@@ -49014,7 +49812,7 @@
 msgid "Pickup to"
 msgstr ""
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:9
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:8
 msgid "Pipeline By"
 msgstr ""
 
@@ -49042,16 +49840,16 @@
 msgid "Plaid Environment"
 msgstr "Environnement écossais"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:136
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:160
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:152
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:176
 msgid "Plaid Link Failed"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:238
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:254
 msgid "Plaid Link Refresh Required"
 msgstr ""
 
-#: accounts/doctype/bank/bank.js:121
+#: accounts/doctype/bank/bank.js:131
 msgid "Plaid Link Updated"
 msgstr ""
 
@@ -49072,7 +49870,7 @@
 msgid "Plaid Settings"
 msgstr "Paramètres de plaid"
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:211
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:227
 msgid "Plaid transactions sync error"
 msgstr "Erreur de synchronisation des transactions plaid"
 
@@ -49173,6 +49971,10 @@
 msgid "Planned Qty"
 msgstr "Qté Planifiée"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:109
 msgid "Planned Quantity"
 msgstr "Quantité Planifiée"
@@ -49228,12 +50030,36 @@
 msgid "Plans"
 msgstr ""
 
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Plant Dashboard"
+msgstr ""
+
+#. Name of a DocType
+#: manufacturing/doctype/plant_floor/plant_floor.json
+#: public/js/plant_floor_visual/visual_plant.js:53
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/workspace/manufacturing/manufacturing.json
+msgctxt "Plant Floor"
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Plant Floor"
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:30
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:43
 msgid "Plants and Machineries"
 msgstr "Usines et Machines"
 
-#: stock/doctype/pick_list/pick_list.py:383
+#: stock/doctype/pick_list/pick_list.py:423
 msgid "Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List."
 msgstr "Veuillez réapprovisionner les articles et mettre à jour la liste de sélection pour continuer. Pour interrompre, annulez la liste de sélection."
 
@@ -49241,17 +50067,17 @@
 msgid "Please Select a Company"
 msgstr "Veuillez sélectionner une entreprise"
 
-#: selling/page/sales_funnel/sales_funnel.js:94
+#: selling/page/sales_funnel/sales_funnel.js:109
 msgid "Please Select a Company."
 msgstr "Veuillez sélectionner une entreprise."
 
-#: stock/doctype/delivery_note/delivery_note.js:139
+#: stock/doctype/delivery_note/delivery_note.js:151
 msgid "Please Select a Customer"
 msgstr "Veuillez sélectionner un client"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:114
-#: stock/doctype/purchase_receipt/purchase_receipt.js:199
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:82
+#: stock/doctype/purchase_receipt/purchase_receipt.js:128
+#: stock/doctype/purchase_receipt/purchase_receipt.js:230
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
 msgid "Please Select a Supplier"
 msgstr "Veuillez sélectionner un fournisseur"
 
@@ -49259,7 +50085,7 @@
 msgid "Please Set Supplier Group in Buying Settings."
 msgstr "Veuillez définir un groupe de fournisseurs par défaut dans les paramètres d'achat."
 
-#: accounts/doctype/payment_entry/payment_entry.js:1071
+#: accounts/doctype/payment_entry/payment_entry.js:1297
 msgid "Please Specify Account"
 msgstr ""
 
@@ -49267,7 +50093,7 @@
 msgid "Please add 'Supplier' role to user {0}."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:87
+#: selling/page/point_of_sale/pos_controller.js:101
 msgid "Please add Mode of payments and opening balance details."
 msgstr "Veuillez ajouter le mode de paiement et les détails du solde d'ouverture."
 
@@ -49283,7 +50109,7 @@
 msgid "Please add a Temporary Opening account in Chart of Accounts"
 msgstr "Veuillez ajouter un compte d'ouverture temporaire dans le plan comptable"
 
-#: public/js/utils/serial_no_batch_selector.js:535
+#: public/js/utils/serial_no_batch_selector.js:542
 msgid "Please add atleast one Serial No / Batch No"
 msgstr ""
 
@@ -49291,11 +50117,11 @@
 msgid "Please add the Bank Account column"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:168
+#: accounts/doctype/account/account_tree.js:246
 msgid "Please add the account to root level Company - {0}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:215
+#: accounts/doctype/account/account.py:234
 msgid "Please add the account to root level Company - {}"
 msgstr "Veuillez ajouter le compte à la société au niveau racine - {}"
 
@@ -49303,28 +50129,28 @@
 msgid "Please add {1} role to user {0}."
 msgstr ""
 
-#: controllers/stock_controller.py:909
+#: controllers/stock_controller.py:1095
 msgid "Please adjust the qty or edit {0} to proceed."
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:121
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:124
 msgid "Please attach CSV file"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2735
+#: accounts/doctype/sales_invoice/sales_invoice.py:2704
 msgid "Please cancel and amend the Payment Entry"
 msgstr ""
 
-#: accounts/utils.py:926
+#: accounts/utils.py:935
 msgid "Please cancel payment entry manually first"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:337
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:327
+#: accounts/doctype/gl_entry/gl_entry.py:291
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:338
 msgid "Please cancel related transaction."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:836
+#: accounts/doctype/journal_entry/journal_entry.py:863
 msgid "Please check Multi Currency option to allow accounts with other currency"
 msgstr "Veuillez vérifier l'option Multi-Devises pour permettre les comptes avec une autre devise"
 
@@ -49332,11 +50158,11 @@
 msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:71
+#: manufacturing/doctype/bom/bom.js:70
 msgid "Please check either with operations or FG Based Operating Cost."
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:397
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:412
 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again."
 msgstr ""
 
@@ -49344,14 +50170,10 @@
 msgid "Please check your Plaid client ID and secret values"
 msgstr "Veuillez vérifier votre identifiant client Plaid et vos valeurs secrètes"
 
-#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:227
+#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:235
 msgid "Please check your email to confirm the appointment"
 msgstr ""
 
-#: public/js/controllers/transaction.js:917
-msgid "Please clear the"
-msgstr ""
-
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:377
 msgid "Please click on 'Generate Schedule'"
 msgstr "Veuillez cliquer sur \"Générer calendrier''"
@@ -49364,19 +50186,19 @@
 msgid "Please click on 'Generate Schedule' to get schedule"
 msgstr "Veuillez cliquer sur ‘Générer Calendrier’ pour obtenir le calendrier"
 
-#: selling/doctype/customer/customer.py:538
+#: selling/doctype/customer/customer.py:550
 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:321
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:332
 msgid "Please contact any of the following users to {} this transaction."
 msgstr ""
 
-#: selling/doctype/customer/customer.py:531
+#: selling/doctype/customer/customer.py:543
 msgid "Please contact your administrator to extend the credit limits for {0}."
 msgstr ""
 
-#: accounts/doctype/account/account.py:317
+#: accounts/doctype/account/account.py:336
 msgid "Please convert the parent account in corresponding child company to a group account."
 msgstr "Veuillez convertir le compte parent de l'entreprise enfant correspondante en compte de groupe."
 
@@ -49384,19 +50206,19 @@
 msgid "Please create Customer from Lead {0}."
 msgstr "Veuillez créer un client à partir du lead {0}."
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:96
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:117
 msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:67
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:71
 msgid "Please create a new Accounting Dimension if required."
 msgstr ""
 
-#: controllers/accounts_controller.py:534
+#: controllers/accounts_controller.py:578
 msgid "Please create purchase from internal sale or delivery document itself"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:327
+#: assets/doctype/asset/asset.py:329
 msgid "Please create purchase receipt or purchase invoice for the item {0}"
 msgstr "Veuillez créer un reçu d'achat ou une facture d'achat pour l'article {0}"
 
@@ -49404,7 +50226,7 @@
 msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:366
+#: assets/doctype/asset/asset.py:368
 msgid "Please do not book expense of multiple assets against one single Asset."
 msgstr ""
 
@@ -49420,8 +50242,12 @@
 msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses"
 msgstr "Veuillez activer les options : Applicable sur la base des bons de commande d'achat et Applicable sur la base des bons de commande d'achat"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:135
-#: public/js/utils/serial_no_batch_selector.js:289
+#: stock/doctype/pick_list/pick_list.py:143
+msgid "Please enable Use Old Serial / Batch Fields to make_bundle"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:145
+#: public/js/utils/serial_no_batch_selector.js:295
 #: regional/report/electronic_invoice_register/electronic_invoice_register.js:49
 msgid "Please enable pop-ups"
 msgstr "Veuillez autoriser les pop-ups"
@@ -49430,32 +50256,32 @@
 msgid "Please enable {0} in the {1}."
 msgstr ""
 
-#: controllers/selling_controller.py:657
+#: controllers/selling_controller.py:681
 msgid "Please enable {} in {} to allow same item in multiple rows"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:871
+#: accounts/doctype/sales_invoice/sales_invoice.py:888
 msgid "Please ensure {} account is a Balance Sheet account."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:366
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:370
 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 "Veuillez vous assurer que {} compte est un compte de bilan. Vous pouvez changer le compte parent en compte de bilan ou sélectionner un autre compte."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:374
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:378
 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:880
+#: accounts/doctype/sales_invoice/sales_invoice.py:897
 msgid "Please ensure {} account {} is a Receivable account."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:563
+#: stock/doctype/stock_entry/stock_entry.py:518
 msgid "Please enter <b>Difference Account</b> or set default <b>Stock Adjustment Account</b> for company {0}"
 msgstr "Veuillez saisir un <b>compte d'écart</b> ou définir un <b>compte d'ajustement de stock</b> par défaut pour la société {0}"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:430
-#: accounts/doctype/sales_invoice/sales_invoice.py:1024
+#: accounts/doctype/sales_invoice/sales_invoice.py:1046
 msgid "Please enter Account for Change Amount"
 msgstr "Veuillez entrez un Compte pour le Montant de Change"
 
@@ -49463,32 +50289,32 @@
 msgid "Please enter Approving Role or Approving User"
 msgstr "Veuillez entrer un Rôle Approbateur ou un Rôle Utilisateur"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:697
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:751
 msgid "Please enter Cost Center"
 msgstr "Veuillez entrer un Centre de Coûts"
 
-#: selling/doctype/sales_order/sales_order.py:322
+#: selling/doctype/sales_order/sales_order.py:325
 msgid "Please enter Delivery Date"
 msgstr "Entrez la Date de Livraison"
 
-#: setup/doctype/sales_person/sales_person_tree.js:8
+#: setup/doctype/sales_person/sales_person_tree.js:9
 msgid "Please enter Employee Id of this sales person"
 msgstr "Veuillez entrer l’ID Employé de ce commercial"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:708
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:762
 msgid "Please enter Expense Account"
 msgstr "Veuillez entrer un Compte de Charges"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.js:87
-#: stock/doctype/stock_entry/stock_entry.js:82
+#: assets/doctype/asset_capitalization/asset_capitalization.js:89
+#: stock/doctype/stock_entry/stock_entry.js:87
 msgid "Please enter Item Code to get Batch Number"
 msgstr "Veuillez entrer le Code d'Article pour obtenir le Numéro de Lot"
 
-#: public/js/controllers/transaction.js:2236
+#: public/js/controllers/transaction.js:2289
 msgid "Please enter Item Code to get batch no"
 msgstr "Veuillez entrer le Code d'Article pour obtenir n° de lot"
 
-#: manufacturing/doctype/production_plan/production_plan.js:67
+#: manufacturing/doctype/production_plan/production_plan.js:66
 msgid "Please enter Item first"
 msgstr "Veuillez d’abord entrer l'Article"
 
@@ -49500,27 +50326,27 @@
 msgid "Please enter Planned Qty for Item {0} at row {1}"
 msgstr "Veuillez entrer la Qté Planifiée pour l'Article {0} à la ligne {1}"
 
-#: setup/doctype/employee/employee.js:76
+#: setup/doctype/employee/employee.js:78
 msgid "Please enter Preferred Contact Email"
 msgstr "Veuillez entrer l’Email de Contact Préférré"
 
-#: manufacturing/doctype/work_order/work_order.js:71
+#: manufacturing/doctype/work_order/work_order.js:73
 msgid "Please enter Production Item first"
 msgstr "Veuillez d’abord entrer l'Article en Production"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:74
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:76
 msgid "Please enter Purchase Receipt first"
 msgstr "Veuillez d’abord entrer un Reçu d'Achat"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:77
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:98
 msgid "Please enter Receipt Document"
 msgstr "Veuillez entrer le Document de Réception"
 
-#: accounts/doctype/journal_entry/journal_entry.py:901
+#: accounts/doctype/journal_entry/journal_entry.py:928
 msgid "Please enter Reference date"
 msgstr "Veuillez entrer la date de Référence"
 
-#: controllers/buying_controller.py:851
+#: controllers/buying_controller.py:877
 msgid "Please enter Reqd by Date"
 msgstr "Veuillez entrer Reqd par date"
 
@@ -49528,7 +50354,7 @@
 msgid "Please enter Root Type for account- {0}"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:258
+#: public/js/utils/serial_no_batch_selector.js:262
 msgid "Please enter Serial Nos"
 msgstr ""
 
@@ -49540,7 +50366,7 @@
 msgid "Please enter Stock Items consumed during the Repair."
 msgstr ""
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:29
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:30
 msgid "Please enter Warehouse and Date"
 msgstr "Veuillez entrer entrepôt et date"
 
@@ -49548,20 +50374,20 @@
 msgid "Please enter Warehouse from which Stock Items consumed during the Repair were taken."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
-#: accounts/doctype/sales_invoice/sales_invoice.py:1020
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:613
+#: accounts/doctype/sales_invoice/sales_invoice.py:1042
 msgid "Please enter Write Off Account"
 msgstr "Veuillez entrer un Compte de Reprise"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:23
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:26
 msgid "Please enter company first"
 msgstr "Veuillez d’abord entrer une Société"
 
-#: accounts/doctype/cost_center/cost_center.js:109
+#: accounts/doctype/cost_center/cost_center.js:114
 msgid "Please enter company name first"
 msgstr "Veuillez d’abord entrer le nom de l'entreprise"
 
-#: controllers/accounts_controller.py:2378
+#: controllers/accounts_controller.py:2470
 msgid "Please enter default currency in Company Master"
 msgstr "Veuillez entrer la devise par défaut dans les Données de Base de la Société"
 
@@ -49569,7 +50395,7 @@
 msgid "Please enter message before sending"
 msgstr "Veuillez entrer le message avant d'envoyer"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:247
+#: accounts/doctype/pos_invoice/pos_invoice.js:266
 msgid "Please enter mobile number first."
 msgstr ""
 
@@ -49577,7 +50403,7 @@
 msgid "Please enter parent cost center"
 msgstr "Veuillez entrer le centre de coût parent"
 
-#: public/js/utils/barcode_scanner.js:160
+#: public/js/utils/barcode_scanner.js:165
 msgid "Please enter quantity for item {0}"
 msgstr ""
 
@@ -49585,11 +50411,11 @@
 msgid "Please enter relieving date."
 msgstr "Veuillez entrer la date de relève."
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:125
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:128
 msgid "Please enter serial nos"
 msgstr ""
 
-#: setup/doctype/company/company.js:155
+#: setup/doctype/company/company.js:183
 msgid "Please enter the company name to confirm"
 msgstr "Veuillez saisir le nom de l'entreprise pour confirmer"
 
@@ -49597,19 +50423,23 @@
 msgid "Please enter the phone number first"
 msgstr "Veuillez d'abord saisir le numéro de téléphone"
 
-#: public/js/setup_wizard.js:83
+#: public/js/setup_wizard.js:87
 msgid "Please enter valid Financial Year Start and End Dates"
 msgstr "Veuillez entrer des Dates de Début et de Fin d’Exercice Comptable valides"
 
+#: templates/includes/footer/footer_extension.html:37
+msgid "Please enter valid email address"
+msgstr ""
+
 #: setup/doctype/employee/employee.py:225
 msgid "Please enter {0}"
 msgstr "Veuillez saisir {0}"
 
-#: public/js/utils/party.js:273
+#: public/js/utils/party.js:317
 msgid "Please enter {0} first"
 msgstr "Veuillez d’abord entrer {0}"
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Please fill the Material Requests table"
 msgstr "Veuillez remplir le tableau des demandes de matériel"
 
@@ -49617,11 +50447,11 @@
 msgid "Please fill the Sales Orders table"
 msgstr "Veuillez remplir le tableau des commandes client"
 
-#: stock/doctype/shipment/shipment.js:248
+#: stock/doctype/shipment/shipment.js:277
 msgid "Please first set Last Name, Email and Phone for the user"
 msgstr ""
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:92
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:94
 msgid "Please fix overlapping time slots for {0}"
 msgstr ""
 
@@ -49633,6 +50463,10 @@
 msgid "Please import accounts against parent company or enable {} in company master."
 msgstr ""
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:175
+msgid "Please keep one Applicable Charges, when 'Distribute Charges Based On' is 'Distribute Manually'. For more charges, please create another Landed Cost Voucher."
+msgstr ""
+
 #: setup/doctype/employee/employee.py:184
 msgid "Please make sure the employees above report to another Active employee."
 msgstr "Veuillez vous assurer que les employés ci-dessus font rapport à un autre employé actif."
@@ -49641,19 +50475,19 @@
 msgid "Please make sure the file you are using has 'Parent Account' column present in the header."
 msgstr ""
 
-#: setup/doctype/company/company.js:157
+#: setup/doctype/company/company.js:185
 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone."
 msgstr "Veuillez vous assurer que vous voulez vraiment supprimer tous les transactions de cette société. Vos données de base resteront intactes. Cette action ne peut être annulée."
 
-#: stock/doctype/item/item.js:425
+#: stock/doctype/item/item.js:493
 msgid "Please mention 'Weight UOM' along with Weight."
 msgstr ""
 
-#: accounts/general_ledger.py:555
+#: accounts/general_ledger.py:564
 msgid "Please mention Round Off Account in Company"
 msgstr "Veuillez indiquer le Compte d’Arrondi de la Société"
 
-#: accounts/general_ledger.py:558
+#: accounts/general_ledger.py:567
 msgid "Please mention Round Off Cost Center in Company"
 msgstr "Veuillez indiquer le Centre de Coûts d’Arrondi de la Société"
 
@@ -49669,16 +50503,16 @@
 msgid "Please pull items from Delivery Note"
 msgstr "Veuillez récupérer les articles des Bons de Livraison"
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:444
 msgid "Please rectify and try again."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:237
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:253
 msgid "Please refresh or reset the Plaid linking of the Bank {}."
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:12
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:29
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
 msgid "Please save before proceeding."
 msgstr ""
 
@@ -49686,16 +50520,16 @@
 msgid "Please save first"
 msgstr "S'il vous plaît enregistrer en premier"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:70
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:79
 msgid "Please select <b>Template Type</b> to download template"
 msgstr "Veuillez sélectionner le <b>type</b> de modèle pour télécharger le modèle"
 
-#: controllers/taxes_and_totals.py:651
+#: controllers/taxes_and_totals.py:652
 #: public/js/controllers/taxes_and_totals.js:688
 msgid "Please select Apply Discount On"
 msgstr "Veuillez sélectionnez Appliquer Remise Sur"
 
-#: selling/doctype/sales_order/sales_order.py:1469
+#: selling/doctype/sales_order/sales_order.py:1492
 msgid "Please select BOM against item {0}"
 msgstr "Veuillez sélectionner la nomenclature pour l'article {0}"
 
@@ -49707,25 +50541,26 @@
 msgid "Please select BOM in BOM field for Item {0}"
 msgstr "Veuillez sélectionner une nomenclature dans le champ nomenclature pour l’Article {0}"
 
-#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:12
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:13
 msgid "Please select Category first"
 msgstr "Veuillez d’abord sélectionner une Catégorie"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1195
+#: accounts/doctype/payment_entry/payment_entry.js:1429
 #: public/js/controllers/accounts.js:86 public/js/controllers/accounts.js:124
 msgid "Please select Charge Type first"
 msgstr "Veuillez d’abord sélectionner le Type de Facturation"
 
-#: accounts/doctype/journal_entry/journal_entry.js:401
+#: accounts/doctype/journal_entry/journal_entry.js:443
 msgid "Please select Company"
 msgstr "Veuillez sélectionner une Société"
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:135
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:141
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:75
 msgid "Please select Company and Posting Date to getting entries"
 msgstr "Veuillez sélectionner la société et la date de comptabilisation pour obtenir les écritures"
 
-#: accounts/doctype/journal_entry/journal_entry.js:606
+#: accounts/doctype/journal_entry/journal_entry.js:688
+#: manufacturing/doctype/plant_floor/plant_floor.js:12
 msgid "Please select Company first"
 msgstr "Veuillez d’abord sélectionner une Société"
 
@@ -49733,12 +50568,12 @@
 msgid "Please select Completion Date for Completed Asset Maintenance Log"
 msgstr "Veuillez sélectionner la date d'achèvement pour le journal de maintenance des actifs terminé"
 
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:116
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:84
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:125
 msgid "Please select Customer first"
 msgstr "S'il vous plaît sélectionnez d'abord le client"
 
-#: setup/doctype/company/company.py:407
+#: setup/doctype/company/company.py:406
 msgid "Please select Existing Company for creating Chart of Accounts"
 msgstr "Veuillez sélectionner une Société Existante pour créer un Plan de Compte"
 
@@ -49746,7 +50581,7 @@
 msgid "Please select Finished Good Item for Service Item {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:531 assets/doctype/asset/asset.js:548
+#: assets/doctype/asset/asset.js:604 assets/doctype/asset/asset.js:621
 msgid "Please select Item Code first"
 msgstr "Veuillez d'abord sélectionner le code d'article"
 
@@ -49755,18 +50590,18 @@
 msgstr "Veuillez sélectionner le statut de maintenance comme terminé ou supprimer la date de fin"
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:52
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:33
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:33
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:32
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:32
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:63
-#: selling/report/address_and_contacts/address_and_contacts.js:28
+#: selling/report/address_and_contacts/address_and_contacts.js:27
 msgid "Please select Party Type first"
 msgstr "Veuillez d’abord sélectionner le Type de Tiers"
 
-#: accounts/doctype/payment_entry/payment_entry.js:342
+#: accounts/doctype/payment_entry/payment_entry.js:429
 msgid "Please select Posting Date before selecting Party"
 msgstr "Veuillez sélectionner la Date de Comptabilisation avant de sélectionner le Tiers"
 
-#: accounts/doctype/journal_entry/journal_entry.js:607
+#: accounts/doctype/journal_entry/journal_entry.js:689
 msgid "Please select Posting Date first"
 msgstr "Veuillez d’abord sélectionner la Date de Comptabilisation"
 
@@ -49774,7 +50609,7 @@
 msgid "Please select Price List"
 msgstr "Veuillez sélectionner une Liste de Prix"
 
-#: selling/doctype/sales_order/sales_order.py:1471
+#: selling/doctype/sales_order/sales_order.py:1494
 msgid "Please select Qty against item {0}"
 msgstr "Veuillez sélectionner Qté par rapport à l'élément {0}"
 
@@ -49790,15 +50625,15 @@
 msgid "Please select Start Date and End Date for Item {0}"
 msgstr "Veuillez sélectionner la Date de Début et Date de Fin pour l'Article {0}"
 
-#: stock/doctype/stock_entry/stock_entry.py:1202
+#: stock/doctype/stock_entry/stock_entry.py:1211
 msgid "Please select Subcontracting Order instead of Purchase Order {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2288
+#: controllers/accounts_controller.py:2380
 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1229
+#: manufacturing/doctype/bom/bom.py:1228
 msgid "Please select a BOM"
 msgstr "Veuillez sélectionner une nomenclature"
 
@@ -49806,10 +50641,10 @@
 msgid "Please select a Company"
 msgstr "Veuillez sélectionner une Société"
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: manufacturing/doctype/bom/bom.js:482 manufacturing/doctype/bom/bom.py:245
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: manufacturing/doctype/bom/bom.js:499 manufacturing/doctype/bom/bom.py:245
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484
+#: public/js/controllers/transaction.js:2537
 msgid "Please select a Company first."
 msgstr "Veuillez d'abord sélectionner une entreprise."
 
@@ -49825,11 +50660,15 @@
 msgid "Please select a Subcontracting Purchase Order."
 msgstr ""
 
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
+#: buying/doctype/supplier_quotation/supplier_quotation.js:65
 msgid "Please select a Supplier"
 msgstr "Veuillez sélectionner un fournisseur"
 
-#: manufacturing/doctype/job_card/job_card.py:1063
+#: public/js/utils/serial_no_batch_selector.js:546
+msgid "Please select a Warehouse"
+msgstr ""
+
+#: manufacturing/doctype/job_card/job_card.py:1084
 msgid "Please select a Work Order first."
 msgstr ""
 
@@ -49841,11 +50680,11 @@
 msgid "Please select a customer for fetching payments."
 msgstr ""
 
-#: www/book_appointment/index.js:63
+#: www/book_appointment/index.js:67
 msgid "Please select a date"
 msgstr ""
 
-#: www/book_appointment/index.js:48
+#: www/book_appointment/index.js:52
 msgid "Please select a date and time"
 msgstr ""
 
@@ -49853,11 +50692,11 @@
 msgid "Please select a default mode of payment"
 msgstr "Veuillez sélectionner un mode de paiement par défaut"
 
-#: selling/page/point_of_sale/pos_item_cart.js:753
+#: selling/page/point_of_sale/pos_item_cart.js:783
 msgid "Please select a field to edit from numpad"
 msgstr "Veuillez sélectionner un champ à modifier sur le pavé numérique"
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:68
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:67
 msgid "Please select a row to create a Reposting Entry"
 msgstr ""
 
@@ -49873,11 +50712,11 @@
 msgid "Please select a valid Purchase Order that is configured for Subcontracting."
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:220
+#: selling/doctype/quotation/quotation.js:229
 msgid "Please select a value for {0} quotation_to {1}"
 msgstr "Veuillez sélectionner une valeur pour {0} devis à {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1570
+#: accounts/doctype/journal_entry/journal_entry.py:1574
 msgid "Please select correct account"
 msgstr "Veuillez sélectionner un compte correct"
 
@@ -49894,12 +50733,12 @@
 msgid "Please select item code"
 msgstr "Veuillez sélectionner un code d'article"
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:71
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:69
 msgid "Please select only one row to create a Reposting Entry"
 msgstr ""
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:60
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:96
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:59
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:91
 msgid "Please select rows to create Reposting Entries"
 msgstr ""
 
@@ -49907,7 +50746,7 @@
 msgid "Please select the Company"
 msgstr "Veuillez sélectionner la société"
 
-#: accounts/doctype/loyalty_program/loyalty_program.js:57
+#: accounts/doctype/loyalty_program/loyalty_program.js:65
 msgid "Please select the Multiple Tier Program type for more than one collection rules."
 msgstr "Veuillez sélectionner le type de programme à plusieurs niveaux pour plus d'une règle de collecte."
 
@@ -49918,7 +50757,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:21
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:21
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:42
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:53
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:54
 msgid "Please select the document type first"
 msgstr "Veuillez d’abord sélectionner le type de document"
 
@@ -49934,25 +50773,25 @@
 msgid "Please select weekly off day"
 msgstr "Veuillez sélectionnez les jours de congé hebdomadaires"
 
-#: public/js/utils.js:891
+#: public/js/utils.js:961
 msgid "Please select {0}"
 msgstr "Veuillez sélectionner {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.js:991
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:575
+#: 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
 msgid "Please select {0} first"
 msgstr "Veuillez d’abord sélectionner {0}"
 
-#: public/js/controllers/transaction.js:76
+#: public/js/controllers/transaction.js:77
 msgid "Please set 'Apply Additional Discount On'"
 msgstr "Veuillez définir ‘Appliquer Réduction Supplémentaire Sur ‘"
 
-#: assets/doctype/asset/depreciation.py:790
+#: assets/doctype/asset/depreciation.py:788
 msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
 msgstr "Veuillez définir 'Centre de Coûts des Amortissements d’Actifs’ de la Société {0}"
 
-#: assets/doctype/asset/depreciation.py:787
+#: assets/doctype/asset/depreciation.py:785
 msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
 msgstr "Veuillez définir ‘Compte de Gain/Perte sur les Cessions d’Immobilisations’ de la Société {0}"
 
@@ -49960,6 +50799,10 @@
 msgid "Please set Account"
 msgstr ""
 
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
+msgid "Please set Account for Change Amount"
+msgstr ""
+
 #: stock/__init__.py:88
 msgid "Please set Account in Warehouse {0} or Default Inventory Account in Company {1}"
 msgstr "Veuillez définir le compte dans l’entrepôt {0} ou le compte d’inventaire par défaut dans la société {1}."
@@ -49970,23 +50813,23 @@
 
 #: accounts/doctype/ledger_merge/ledger_merge.js:23
 #: accounts/doctype/ledger_merge/ledger_merge.js:34
-#: accounts/doctype/pos_profile/pos_profile.js:27
-#: accounts/doctype/pos_profile/pos_profile.js:50
-#: accounts/doctype/pos_profile/pos_profile.js:64
-#: accounts/doctype/pos_profile/pos_profile.js:78
-#: accounts/doctype/pos_profile/pos_profile.js:91
-#: accounts/doctype/sales_invoice/sales_invoice.js:707
-#: accounts/doctype/sales_invoice/sales_invoice.js:721
-#: selling/doctype/quotation/quotation.js:28
-#: selling/doctype/sales_order/sales_order.js:28
+#: accounts/doctype/pos_profile/pos_profile.js:25
+#: accounts/doctype/pos_profile/pos_profile.js:48
+#: accounts/doctype/pos_profile/pos_profile.js:62
+#: accounts/doctype/pos_profile/pos_profile.js:76
+#: accounts/doctype/pos_profile/pos_profile.js:89
+#: accounts/doctype/sales_invoice/sales_invoice.js:763
+#: accounts/doctype/sales_invoice/sales_invoice.js:777
+#: selling/doctype/quotation/quotation.js:29
+#: selling/doctype/sales_order/sales_order.js:31
 msgid "Please set Company"
 msgstr "Veuillez sélectionner une Société"
 
-#: assets/doctype/asset/depreciation.py:372
+#: assets/doctype/asset/depreciation.py:370
 msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
 msgstr "Veuillez définir le Compte relatif aux Amortissements dans la Catégorie d’Actifs {0} ou la Société {1}"
 
-#: stock/doctype/shipment/shipment.js:154
+#: stock/doctype/shipment/shipment.js:176
 msgid "Please set Email/Phone for the contact"
 msgstr ""
 
@@ -50000,11 +50843,11 @@
 msgid "Please set Fiscal Code for the public administration '%s'"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:547
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:551
 msgid "Please set Fixed Asset Account in {} against {}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:435
+#: assets/doctype/asset/asset.py:437
 msgid "Please set Number of Depreciations Booked"
 msgstr "Veuillez définir le Nombre d’Amortissements Comptabilisés"
 
@@ -50034,11 +50877,11 @@
 msgid "Please set a Company"
 msgstr "Veuillez définir une entreprise"
 
-#: assets/doctype/asset/asset.py:262
+#: assets/doctype/asset/asset.py:264
 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:1260
+#: selling/doctype/sales_order/sales_order.py:1283
 msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
 msgstr "Veuillez définir un fournisseur par rapport aux articles à prendre en compte dans la Commande d'Achat."
 
@@ -50050,7 +50893,7 @@
 msgid "Please set a default Holiday List for Employee {0} or Company {1}"
 msgstr "Veuillez définir une Liste de Vacances par défaut pour l'Employé {0} ou la Société {1}"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:991
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1019
 msgid "Please set account in Warehouse {0}"
 msgstr "Veuillez définir un compte dans l'entrepôt {0}"
 
@@ -50059,7 +50902,7 @@
 msgid "Please set an Address on the Company '%s'"
 msgstr ""
 
-#: controllers/stock_controller.py:334
+#: controllers/stock_controller.py:516
 msgid "Please set an Expense Account in the Items table"
 msgstr ""
 
@@ -50071,23 +50914,23 @@
 msgid "Please set at least one row in the Taxes and Charges Table"
 msgstr "Veuillez définir au moins une ligne dans le tableau des taxes et des frais."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2041
+#: accounts/doctype/sales_invoice/sales_invoice.py:2010
 msgid "Please set default Cash or Bank account in Mode of Payment {0}"
 msgstr "Veuillez définir un compte de Caisse ou de Banque par défaut pour le Mode de Paiement {0}"
 
 #: 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:2599
+#: accounts/doctype/sales_invoice/sales_invoice.py:2568
 msgid "Please set default Cash or Bank account in Mode of Payment {}"
 msgstr "Veuillez définir le compte de trésorerie ou bancaire par défaut dans le mode de paiement {}"
 
 #: 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:2601
+#: accounts/doctype/sales_invoice/sales_invoice.py:2570
 msgid "Please set default Cash or Bank account in Mode of Payments {}"
 msgstr "Veuillez définir le compte par défaut en espèces ou en banque dans Mode de paiement {}"
 
-#: accounts/utils.py:2086
+#: accounts/utils.py:2054
 msgid "Please set default Exchange Gain/Loss Account in Company {}"
 msgstr ""
 
@@ -50099,11 +50942,11 @@
 msgid "Please set default UOM in Stock Settings"
 msgstr "Veuillez définir l'UdM par défaut dans les paramètres de stock"
 
-#: controllers/stock_controller.py:204
+#: controllers/stock_controller.py:386
 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:946
+#: accounts/utils.py:955
 msgid "Please set default {0} in Company {1}"
 msgstr "Veuillez définir {0} par défaut dans la Société {1}"
 
@@ -50120,11 +50963,11 @@
 msgid "Please set filters"
 msgstr "Veuillez définir des filtres"
 
-#: controllers/accounts_controller.py:1896
+#: controllers/accounts_controller.py:1988
 msgid "Please set one of the following:"
 msgstr ""
 
-#: public/js/controllers/transaction.js:1967
+#: public/js/controllers/transaction.js:2010
 msgid "Please set recurring after saving"
 msgstr "Veuillez définir la récurrence après avoir sauvegardé"
 
@@ -50136,7 +50979,7 @@
 msgid "Please set the Default Cost Center in {0} company."
 msgstr "Veuillez définir un centre de coûts par défaut pour la société {0}."
 
-#: manufacturing/doctype/work_order/work_order.js:487
+#: manufacturing/doctype/work_order/work_order.js:512
 msgid "Please set the Item Code first"
 msgstr "Veuillez définir le Code d'Article en premier"
 
@@ -50144,7 +50987,7 @@
 msgid "Please set the Payment Schedule"
 msgstr "Veuillez définir le calendrier de paiement"
 
-#: accounts/doctype/gl_entry/gl_entry.py:175
+#: accounts/doctype/gl_entry/gl_entry.py:165
 msgid "Please set the cost center field in {0} or setup a default Cost Center for the Company."
 msgstr ""
 
@@ -50152,8 +50995,8 @@
 msgid "Please set up the Campaign Schedule in the Campaign {0}"
 msgstr "Configurez le calendrier de la campagne dans la campagne {0}."
 
-#: public/js/queries.js:39 public/js/queries.js:49 public/js/queries.js:66
-#: public/js/queries.js:95 stock/report/reserved_stock/reserved_stock.py:26
+#: public/js/queries.js:32 public/js/queries.js:44 public/js/queries.js:64
+#: public/js/queries.js:96 stock/report/reserved_stock/reserved_stock.py:26
 msgid "Please set {0}"
 msgstr "Veuillez définir {0}"
 
@@ -50169,34 +51012,34 @@
 msgid "Please set {0} in BOM Creator {1}"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:95
-msgid "Please setup a default bank account for company {0}"
-msgstr "Veuillez configurer un compte bancaire par défaut pour la société {0}."
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:97
+msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
+msgstr ""
 
-#: assets/doctype/asset/depreciation.py:424
+#: assets/doctype/asset/depreciation.py:422
 msgid "Please share this email with your support team so that they can find and fix the issue."
 msgstr ""
 
-#: public/js/controllers/transaction.js:1837
+#: public/js/controllers/transaction.js:1880
 msgid "Please specify"
 msgstr "Veuillez spécifier"
 
-#: stock/get_item_details.py:210
+#: stock/get_item_details.py:215
 msgid "Please specify Company"
 msgstr "Veuillez spécifier la Société"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:81
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:380
-#: accounts/doctype/sales_invoice/sales_invoice.js:452
+#: accounts/doctype/pos_invoice/pos_invoice.js:88
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:420
+#: accounts/doctype/sales_invoice/sales_invoice.js:501
 msgid "Please specify Company to proceed"
 msgstr "Veuillez spécifier la Société pour continuer"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1206
-#: controllers/accounts_controller.py:2511 public/js/controllers/accounts.js:97
+#: accounts/doctype/payment_entry/payment_entry.js:1452
+#: controllers/accounts_controller.py:2596 public/js/controllers/accounts.js:97
 msgid "Please specify a valid Row ID for row {0} in table {1}"
 msgstr "Veuillez spécifier un N° de Ligne valide pour la ligne {0} de la table {1}"
 
-#: public/js/queries.js:104
+#: public/js/queries.js:106
 msgid "Please specify a {0}"
 msgstr ""
 
@@ -50204,7 +51047,7 @@
 msgid "Please specify at least one attribute in the Attributes table"
 msgstr "Veuillez spécifier au moins un attribut dans la table Attributs"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:372
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:426
 msgid "Please specify either Quantity or Valuation Rate or both"
 msgstr "Veuillez spécifier la Quantité, le Taux de Valorisation ou les deux"
 
@@ -50212,11 +51055,11 @@
 msgid "Please specify from/to range"
 msgstr "Veuillez préciser la plage de / à"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:35
+#: buying/doctype/request_for_quotation/request_for_quotation.js:37
 msgid "Please supply the specified items at the best possible rates"
 msgstr "Veuillez fournir les articles spécifiés aux meilleurs tarifs possibles"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:223
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:218
 msgid "Please try again in an hour."
 msgstr ""
 
@@ -50273,7 +51116,7 @@
 msgid "Portrait"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:337
+#: buying/doctype/request_for_quotation/request_for_quotation.js:362
 msgid "Possible Supplier"
 msgstr "Fournisseur Potentiel"
 
@@ -50340,17 +51183,18 @@
 msgid "Postal Expenses"
 msgstr "Frais postaux"
 
-#: accounts/doctype/payment_entry/payment_entry.js:644
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: 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/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:563
+#: 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/item_wise_sales_register/item_wise_sales_register.py:200
@@ -50365,7 +51209,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:45
 #: 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:84
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:89
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:129
@@ -50375,6 +51219,7 @@
 #: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
 #: 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
 msgid "Posting Date"
 msgstr "Date de Comptabilisation"
 
@@ -50559,11 +51404,17 @@
 msgid "Posting Date cannot be future date"
 msgstr "La Date de Publication ne peut pas être une date future"
 
+#. Label of a Datetime field in DocType 'Stock Ledger Entry'
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+msgctxt "Stock Ledger Entry"
+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
-#: stock/report/serial_no_ledger/serial_no_ledger.js:64
+#: 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_ledger_invariant_check/stock_ledger_invariant_check.py:126
@@ -50661,7 +51512,7 @@
 msgid "Posting Time"
 msgstr "Heure de Publication"
 
-#: stock/doctype/stock_entry/stock_entry.py:1641
+#: stock/doctype/stock_entry/stock_entry.py:1650
 msgid "Posting date and posting time is mandatory"
 msgstr "La Date et l’heure de comptabilisation sont obligatoires"
 
@@ -50669,6 +51520,11 @@
 msgid "Posting timestamp must be after {0}"
 msgstr "Horodatage de Publication doit être après {0}"
 
+#. Description of a DocType
+#: crm/doctype/opportunity/opportunity.json
+msgid "Potential Sales Deal"
+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
@@ -50767,7 +51623,7 @@
 msgid "Preventive Maintenance"
 msgstr "Maintenance préventive"
 
-#: public/js/utils/ledger_preview.js:20 public/js/utils/ledger_preview.js:40
+#: public/js/utils/ledger_preview.js:28 public/js/utils/ledger_preview.js:57
 msgid "Preview"
 msgstr "Aperçu"
 
@@ -50783,7 +51639,7 @@
 msgid "Preview"
 msgstr "Aperçu"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:205
+#: buying/doctype/request_for_quotation/request_for_quotation.js:223
 msgid "Preview Email"
 msgstr "Aperçu de l'e-mail"
 
@@ -50804,7 +51660,7 @@
 msgid "Previous Work Experience"
 msgstr "Expérience de Travail Antérieure"
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:152
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:153
 msgid "Previous Year is not closed, please close it first"
 msgstr ""
 
@@ -51015,7 +51871,7 @@
 msgid "Price List Currency"
 msgstr "Devise de la Liste de Prix"
 
-#: stock/get_item_details.py:1029
+#: stock/get_item_details.py:1040
 msgid "Price List Currency not selected"
 msgstr "Devise de la Liste de Prix non sélectionnée"
 
@@ -51103,6 +51959,12 @@
 msgid "Price List Rate"
 msgstr "Prix de la Liste des Prix"
 
+#. Label of a Currency field in DocType 'Material Request Item'
+#: stock/doctype/material_request_item/material_request_item.json
+msgctxt "Material Request Item"
+msgid "Price List Rate"
+msgstr "Prix de la Liste des Prix"
+
 #. Label of a Currency field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
@@ -51223,7 +52085,7 @@
 msgid "Price Per Unit ({0})"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:553
+#: selling/page/point_of_sale/pos_controller.js:581
 msgid "Price is not set for the item."
 msgstr ""
 
@@ -51237,7 +52099,7 @@
 msgid "Price or Product Discount"
 msgstr "Prix ou remise de produit"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:145
 msgid "Price or product discount slabs are required"
 msgstr "Des dalles de prix ou de remise de produit sont requises"
 
@@ -51253,7 +52115,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/pricing_rule/pricing_rule.json
-#: buying/doctype/supplier/supplier.js:98
+#: buying/doctype/supplier/supplier.js:116
 msgid "Pricing Rule"
 msgstr "Règle de tarification"
 
@@ -51370,7 +52232,7 @@
 msgid "Pricing Rule Item Group"
 msgstr "Groupe de postes de règle de tarification"
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:208
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:210
 msgid "Pricing Rule {0} is updated"
 msgstr "La règle de tarification {0} est mise à jour"
 
@@ -51494,7 +52356,7 @@
 msgid "Primary Address"
 msgstr "Adresse principale"
 
-#: public/js/utils/contact_address_quick_entry.js:54
+#: public/js/utils/contact_address_quick_entry.js:57
 msgid "Primary Address Details"
 msgstr "Détails de l'adresse principale"
 
@@ -51516,7 +52378,7 @@
 msgid "Primary Contact"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:35
+#: public/js/utils/contact_address_quick_entry.js:38
 msgid "Primary Contact Details"
 msgstr "Détails du contact principal"
 
@@ -51545,7 +52407,7 @@
 msgid "Primary Settings"
 msgstr "Paramètres Principaux"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:69
+#: selling/page/point_of_sale/pos_past_order_summary.js:67
 #: templates/pages/material_request_info.html:15 templates/pages/order.html:33
 msgid "Print"
 msgstr "Impression"
@@ -51786,7 +52648,7 @@
 msgid "Print Preferences"
 msgstr "Préférences d'impression"
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:223
+#: selling/page/point_of_sale/pos_past_order_summary.js:231
 msgid "Print Receipt"
 msgstr "Imprimer le reçu"
 
@@ -51851,7 +52713,7 @@
 msgid "Print Style"
 msgstr "Style d'Impression"
 
-#: setup/install.py:118
+#: setup/install.py:99
 msgid "Print UOM after Quantity"
 msgstr "Imprimer UdM après la quantité"
 
@@ -51866,15 +52728,16 @@
 msgid "Print and Stationery"
 msgstr "Impression et Papeterie"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:73
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:75
 msgid "Print settings updated in respective print format"
 msgstr "Paramètres d'impression mis à jour avec le format d'impression indiqué"
 
-#: setup/install.py:125
+#: setup/install.py:106
 msgid "Print taxes with zero amount"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:364
+#: accounts/report/accounts_receivable/accounts_receivable.html:285
 msgid "Printed On "
 msgstr "Imprimé sur"
 
@@ -51955,9 +52818,10 @@
 msgid "Priorities"
 msgstr "Les priorités"
 
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:19
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:18
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:93
-#: projects/report/project_summary/project_summary.js:37
+#: projects/report/project_summary/project_summary.js:36
+#: templates/pages/task_info.html:54
 msgid "Priority"
 msgstr "Priorité"
 
@@ -52045,6 +52909,12 @@
 msgid "Problem"
 msgstr "Problème"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Problem"
+msgstr "Problème"
+
 #. Label of a Link field in DocType 'Non Conformance'
 #: quality_management/doctype/non_conformance/non_conformance.json
 msgctxt "Non Conformance"
@@ -52069,7 +52939,7 @@
 msgid "Procedure"
 msgstr "Procédure"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:70
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:75
 msgid "Process Day Book Data"
 msgstr "Traiter les données du registre journalier"
 
@@ -52155,7 +53025,7 @@
 msgid "Process Loss Value"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:58
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:63
 msgid "Process Master Data"
 msgstr "Traiter les données de base"
 
@@ -52207,6 +53077,12 @@
 msgid "Process Subscription"
 msgstr ""
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Process in Single Transaction"
+msgstr ""
+
 #. Label of a Long Text field in DocType 'BOM Update Log'
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 msgctxt "BOM Update Log"
@@ -52237,7 +53113,7 @@
 msgid "Processing Party Addresses"
 msgstr "Traitement des adresses de partie"
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:115
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:122
 msgid "Processing Sales! Please Wait..."
 msgstr ""
 
@@ -52310,7 +53186,7 @@
 msgstr "Produit"
 
 #. Name of a DocType
-#: public/js/controllers/buying.js:265 public/js/controllers/buying.js:511
+#: public/js/controllers/buying.js:260 public/js/controllers/buying.js:508
 #: selling/doctype/product_bundle/product_bundle.json
 msgid "Product Bundle"
 msgstr "Ensemble de Produits"
@@ -52414,7 +53290,13 @@
 
 #. Label of a Card Break in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
-#: setup/doctype/company/company.py:347
+#: setup/doctype/company/company.py:346
+msgid "Production"
+msgstr ""
+
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
 msgid "Production"
 msgstr ""
 
@@ -52425,18 +53307,18 @@
 msgid "Production Analytics"
 msgstr "Analyse de la Production"
 
-#. Label of a Int field in DocType 'Workstation'
+#. Label of a Section Break field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Production Capacity"
 msgstr "Capacité de production"
 
 #: manufacturing/doctype/work_order/work_order_calendar.js:38
-#: manufacturing/report/job_card_summary/job_card_summary.js:65
+#: manufacturing/report/job_card_summary/job_card_summary.js:64
 #: manufacturing/report/job_card_summary/job_card_summary.py:152
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:43
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:42
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:113
-#: manufacturing/report/work_order_summary/work_order_summary.js:51
+#: manufacturing/report/work_order_summary/work_order_summary.js:50
 #: manufacturing/report/work_order_summary/work_order_summary.py:208
 msgid "Production Item"
 msgstr "Article de production"
@@ -52461,7 +53343,7 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/production_plan/production_plan.json
-#: manufacturing/report/production_plan_summary/production_plan_summary.js:9
+#: manufacturing/report/production_plan_summary/production_plan_summary.js:8
 msgid "Production Plan"
 msgstr "Plan de production"
 
@@ -52668,7 +53550,7 @@
 msgid "Profitability Analysis"
 msgstr "Analyse de Profitabilité"
 
-#: templates/pages/projects.html:25
+#: projects/doctype/task/task_list.js:52 templates/pages/projects.html:25
 msgid "Progress"
 msgstr "Progression"
 
@@ -52688,10 +53570,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:973
+#: 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:634
+#: 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
@@ -52699,30 +53581,31 @@
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:73
 #: accounts/report/sales_register/sales_register.py:228
 #: accounts/report/trial_balance/trial_balance.js:64
-#: buying/report/procurement_tracker/procurement_tracker.js:22
+#: 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:34
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:33
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:182
 #: projects/doctype/project/project.json
 #: projects/doctype/project/project_dashboard.py:11
 #: projects/doctype/task/task_calendar.js:19
-#: projects/doctype/task/task_tree.js:11
+#: projects/doctype/task/task_list.js:45 projects/doctype/task/task_tree.js:11
 #: projects/doctype/timesheet/timesheet_calendar.js:22
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:34
 #: projects/report/project_summary/project_summary.py:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:19
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:51
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:25
-#: public/js/financial_statements.js:247 public/js/projects/timer.js:10
+#: public/js/financial_statements.js:256 public/js/projects/timer.js:14
 #: public/js/purchase_trends_filters.js:52 public/js/sales_trends_filters.js:28
-#: selling/doctype/sales_order/sales_order.js:587
+#: selling/doctype/sales_order/sales_order.js:681
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:94
-#: stock/report/reserved_stock/reserved_stock.js:139
+#: stock/report/reserved_stock/reserved_stock.js:130
 #: stock/report/reserved_stock/reserved_stock.py:184
-#: stock/report/stock_ledger/stock_ledger.js:76
-#: stock/report/stock_ledger/stock_ledger.py:261
-#: support/report/issue_analytics/issue_analytics.js:76
-#: support/report/issue_summary/issue_summary.js:64
+#: stock/report/stock_ledger/stock_ledger.js:84
+#: stock/report/stock_ledger/stock_ledger.py:333
+#: support/report/issue_analytics/issue_analytics.js:75
+#: support/report/issue_summary/issue_summary.js:63
+#: templates/pages/task_info.html:39 templates/pages/timelog_info.html:22
 msgid "Project"
 msgstr "Projet"
 
@@ -52787,6 +53670,12 @@
 msgid "Project"
 msgstr "Projet"
 
+#. Label of a Link field in DocType 'Installation Note'
+#: selling/doctype/installation_note/installation_note.json
+msgctxt "Installation Note"
+msgid "Project"
+msgstr "Projet"
+
 #. Label of a Link field in DocType 'Issue'
 #: support/doctype/issue/issue.json
 msgctxt "Issue"
@@ -53092,7 +53981,7 @@
 
 #. Name of a DocType
 #: projects/doctype/project_type/project_type.json
-#: projects/report/project_summary/project_summary.js:31
+#: projects/report/project_summary/project_summary.js:30
 msgid "Project Type"
 msgstr "Type de Projet"
 
@@ -53168,6 +54057,8 @@
 msgid "Project-wise data is not available for Quotation"
 msgstr "Les données par projet ne sont pas disponibles pour un devis"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:46
+#: stock/dashboard/item_dashboard_list.html:37
 #: stock/report/item_shortage_report/item_shortage_report.py:73
 #: stock/report/stock_projected_qty/stock_projected_qty.py:199
 #: templates/emails/reorder_item.html:12
@@ -53220,6 +54111,10 @@
 msgid "Projected Quantity"
 msgstr "Quantité projetée"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Projected Quantity Formula"
+msgstr ""
+
 #: stock/page/stock_balance/stock_balance.js:51
 msgid "Projected qty"
 msgstr "Qté Projetée"
@@ -53350,7 +54245,7 @@
 msgstr "Calculer au prorata"
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:61
+#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:62
 #: crm/doctype/prospect/prospect.json
 msgid "Prospect"
 msgstr ""
@@ -53445,7 +54340,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:335
+#: setup/doctype/company/company.py:334
 msgid "Purchase"
 msgstr "achat"
 
@@ -53538,15 +54433,15 @@
 #. Name of a DocType
 #: 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:23
+#: 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:323
-#: buying/doctype/purchase_order/purchase_order_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:378
+#: 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:110
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:22
-#: stock/doctype/stock_entry/stock_entry.js:262
+#: stock/doctype/purchase_receipt/purchase_receipt.js:123
+#: stock/doctype/purchase_receipt/purchase_receipt.js:268
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:30
+#: stock/doctype/stock_entry/stock_entry.js:294
 msgid "Purchase Invoice"
 msgstr "Facture d’Achat"
 
@@ -53669,16 +54564,16 @@
 msgid "Purchase Invoice Trends"
 msgstr "Tendances des Factures d'Achat"
 
-#: assets/doctype/asset/asset.py:213
+#: assets/doctype/asset/asset.py:215
 msgid "Purchase Invoice cannot be made against an existing asset {0}"
 msgstr "La facture d'achat ne peut pas être effectuée sur un élément existant {0}"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:389
-#: stock/doctype/purchase_receipt/purchase_receipt.py:403
+#: stock/doctype/purchase_receipt/purchase_receipt.py:390
+#: stock/doctype/purchase_receipt/purchase_receipt.py:404
 msgid "Purchase Invoice {0} is already submitted"
 msgstr "La Facture d’Achat {0} est déjà soumise"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1769
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1828
 msgid "Purchase Invoices"
 msgstr "Factures d'achat"
 
@@ -53696,6 +54591,7 @@
 #: setup/doctype/supplier_group/supplier_group.json stock/doctype/bin/bin.json
 #: stock/doctype/material_request/material_request.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgid "Purchase Manager"
 msgstr "Responsable des Achats"
@@ -53710,21 +54606,21 @@
 msgstr "Responsable des Données d’Achats"
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:131
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:155
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:234
 #: accounts/report/purchase_register/purchase_register.py:216
 #: buying/doctype/purchase_order/purchase_order.json
-#: buying/doctype/supplier_quotation/supplier_quotation.js:23
+#: 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:41
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:40
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:167
-#: controllers/buying_controller.py:624
-#: manufacturing/doctype/blanket_order/blanket_order.js:45
-#: selling/doctype/sales_order/sales_order.js:112
-#: selling/doctype/sales_order/sales_order.js:576
-#: stock/doctype/material_request/material_request.js:137
-#: stock/doctype/purchase_receipt/purchase_receipt.js:194
+#: controllers/buying_controller.py:649
+#: manufacturing/doctype/blanket_order/blanket_order.js:54
+#: selling/doctype/sales_order/sales_order.js:136
+#: selling/doctype/sales_order/sales_order.js:659
+#: stock/doctype/material_request/material_request.js:154
+#: stock/doctype/purchase_receipt/purchase_receipt.js:225
 msgid "Purchase Order"
 msgstr "Commande d'Achat"
 
@@ -53895,7 +54791,7 @@
 msgid "Purchase Order Item Supplied"
 msgstr "Article Fourni depuis la Commande d'Achat"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:684
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:685
 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}"
 msgstr ""
 
@@ -53909,11 +54805,11 @@
 msgid "Purchase Order Pricing Rule"
 msgstr "Règle de tarification des bons de commande"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:579
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
 msgid "Purchase Order Required"
 msgstr "Commande d'Achat requise"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:576
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:580
 msgid "Purchase Order Required for item {}"
 msgstr "Commande d'Achat requise pour l'article {}"
 
@@ -53925,7 +54821,7 @@
 msgid "Purchase Order Trends"
 msgstr "Tendances des Bons de Commande"
 
-#: selling/doctype/sales_order/sales_order.js:957
+#: selling/doctype/sales_order/sales_order.js:1115
 msgid "Purchase Order already created for all Sales Order items"
 msgstr "Commande d'Achat déjà créé pour tous les articles de commande client"
 
@@ -53933,11 +54829,11 @@
 msgid "Purchase Order number required for Item {0}"
 msgstr "Numéro de la Commande d'Achat requis pour l'Article {0}"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:618
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:622
 msgid "Purchase Order {0} is not submitted"
 msgstr "La Commande d'Achat {0} n’est pas soumise"
 
-#: buying/doctype/purchase_order/purchase_order.py:824
+#: buying/doctype/purchase_order/purchase_order.py:827
 msgid "Purchase Orders"
 msgstr "Acheter en ligne"
 
@@ -53947,7 +54843,7 @@
 msgid "Purchase Orders Items Overdue"
 msgstr "Articles de commandes d'achat en retard"
 
-#: buying/doctype/purchase_order/purchase_order.py:301
+#: buying/doctype/purchase_order/purchase_order.py:302
 msgid "Purchase Orders are not allowed for {0} due to a scorecard standing of {1}."
 msgstr "Les Commandes d'Achats ne sont pas autorisés pour {0} en raison d'une note sur la fiche d'évaluation de {1}."
 
@@ -53963,7 +54859,7 @@
 msgid "Purchase Orders to Receive"
 msgstr "Commandes d'achat à recevoir"
 
-#: controllers/accounts_controller.py:1517
+#: controllers/accounts_controller.py:1606
 msgid "Purchase Orders {0} are un-linked"
 msgstr ""
 
@@ -53972,17 +54868,17 @@
 msgstr "Liste des Prix d'Achat"
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:607
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:613
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: 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/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:310
-#: buying/doctype/purchase_order/purchase_order_list.js:43
+#: buying/doctype/purchase_order/purchase_order.js:352
+#: buying/doctype/purchase_order/purchase_order_list.js:61
 #: stock/doctype/purchase_receipt/purchase_receipt.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:56
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:65
 msgid "Purchase Receipt"
 msgstr "Reçu d’Achat"
 
@@ -54099,11 +54995,11 @@
 msgid "Purchase Receipt No"
 msgstr "N° du Reçu d'Achat"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:601
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
 msgid "Purchase Receipt Required"
 msgstr "Reçu d’Achat Requis"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:600
 msgid "Purchase Receipt Required for item {}"
 msgstr "Reçu d'achat requis pour l'article {}"
 
@@ -54116,15 +55012,15 @@
 msgid "Purchase Receipt Trends"
 msgstr "Tendances des Reçus d'Achats"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:314
+#: stock/doctype/purchase_receipt/purchase_receipt.js:363
 msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
 msgstr "Le reçu d’achat ne contient aucun élément pour lequel Conserver échantillon est activé."
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:702
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:703
 msgid "Purchase Receipt {0} created."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:628
 msgid "Purchase Receipt {0} is not submitted"
 msgstr "Le Reçu d’Achat {0} n'est pas soumis"
 
@@ -54141,11 +55037,11 @@
 msgid "Purchase Register"
 msgstr "Registre des Achats"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
 msgid "Purchase Return"
 msgstr "Retour d'Achat"
 
-#: setup/doctype/company/company.js:104
+#: setup/doctype/company/company.js:118
 msgid "Purchase Tax Template"
 msgstr "Modèle de Taxes pour les Achats"
 
@@ -54262,6 +55158,7 @@
 #: stock/doctype/price_list/price_list.json
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -54327,7 +55224,7 @@
 msgid "Purple"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:287
+#: stock/doctype/stock_entry/stock_entry.js:329
 msgid "Purpose"
 msgstr "Objet"
 
@@ -54367,7 +55264,7 @@
 msgid "Purpose"
 msgstr "Objet"
 
-#: stock/doctype/stock_entry/stock_entry.py:380
+#: stock/doctype/stock_entry/stock_entry.py:335
 msgid "Purpose must be one of {0}"
 msgstr "L'Objet doit être parmi {0}"
 
@@ -54408,18 +55305,21 @@
 #: controllers/trends.py:240 controllers/trends.py:252
 #: controllers/trends.py:257
 #: manufacturing/report/bom_explorer/bom_explorer.py:57
-#: public/js/bom_configurator/bom_configurator.bundle.js:203
-#: public/js/bom_configurator/bom_configurator.bundle.js:266
-#: public/js/bom_configurator/bom_configurator.bundle.js:271
-#: public/js/bom_configurator/bom_configurator.bundle.js:344
-#: public/js/utils.js:660 selling/doctype/sales_order/sales_order.js:315
-#: selling/doctype/sales_order/sales_order.js:410
-#: selling/doctype/sales_order/sales_order.js:698
-#: selling/doctype/sales_order/sales_order.js:815
+#: 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
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:106
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:166
 #: 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
+#: templates/form_grid/stock_entry_grid.html:10
 #: templates/generators/bom.html:50 templates/pages/rfq.html:40
 msgid "Qty"
 msgstr "Qté"
@@ -54566,7 +55466,7 @@
 msgid "Qty"
 msgstr "Qté"
 
-#: templates/pages/order.html:167
+#: templates/pages/order.html:179
 msgid "Qty "
 msgstr ""
 
@@ -54616,7 +55516,7 @@
 msgid "Qty Per Unit"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:237
+#: manufacturing/doctype/bom/bom.js:256
 #: manufacturing/report/process_loss_report/process_loss_report.py:83
 msgid "Qty To Manufacture"
 msgstr "Quantité À Produire"
@@ -54707,7 +55607,14 @@
 msgid "Qty for which recursion isn't applicable."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:713
+#. Description of the 'Apply Recursion Over (As Per Transaction UOM)' (Float)
+#. field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Qty for which recursion isn't applicable."
+msgstr ""
+
+#: manufacturing/doctype/work_order/work_order.js:766
 msgid "Qty for {0}"
 msgstr "Qté pour {0}"
 
@@ -54727,7 +55634,7 @@
 msgid "Qty in Stock UOM"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.js:145
+#: stock/doctype/pick_list/pick_list.js:174
 msgid "Qty of Finished Goods Item"
 msgstr "Quantité de produits finis"
 
@@ -54737,7 +55644,7 @@
 msgid "Qty of Finished Goods Item"
 msgstr "Quantité de produits finis"
 
-#: stock/doctype/pick_list/pick_list.py:430
+#: stock/doctype/pick_list/pick_list.py:470
 msgid "Qty of Finished Goods Item should be greater than 0."
 msgstr ""
 
@@ -54767,11 +55674,12 @@
 msgid "Qty to Deliver"
 msgstr "Quantité à Livrer"
 
-#: public/js/utils/serial_no_batch_selector.js:321
+#: public/js/utils/serial_no_batch_selector.js:327
 msgid "Qty to Fetch"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:668
+#: manufacturing/doctype/job_card/job_card.py:675
+#: manufacturing/doctype/workstation/workstation_job_card.html:56
 msgid "Qty to Manufacture"
 msgstr "Quantité À Produire"
 
@@ -54952,7 +55860,7 @@
 msgstr "Objectif de qualité Objectif"
 
 #. Name of a DocType
-#: manufacturing/doctype/bom/bom.js:130
+#: manufacturing/doctype/bom/bom.js:138
 #: stock/doctype/quality_inspection/quality_inspection.json
 msgid "Quality Inspection"
 msgstr "Inspection de la Qualité"
@@ -55112,12 +56020,12 @@
 msgid "Quality Inspection Template Name"
 msgstr "Nom du modèle d'inspection de la qualité"
 
-#: public/js/controllers/transaction.js:298
-#: stock/doctype/stock_entry/stock_entry.js:143
+#: public/js/controllers/transaction.js:324
+#: stock/doctype/stock_entry/stock_entry.js:157
 msgid "Quality Inspection(s)"
 msgstr "Inspection(s) Qualite"
 
-#: setup/doctype/company/company.py:377
+#: setup/doctype/company/company.py:376
 msgid "Quality Management"
 msgstr "Gestion de la qualité"
 
@@ -55216,23 +56124,26 @@
 
 #: 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:29
+#: buying/report/purchase_analytics/purchase_analytics.js:28
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:215
-#: manufacturing/doctype/bom/bom.js:306
-#: manufacturing/doctype/bom_creator/bom_creator.js:69
-#: public/js/controllers/buying.js:518 public/js/stock_analytics.js:37
-#: public/js/utils/serial_no_batch_selector.js:393
+#: 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/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
-#: selling/report/sales_analytics/sales_analytics.js:29
+#: selling/report/sales_analytics/sales_analytics.js:36
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:67
-#: stock/dashboard/item_dashboard.js:236
-#: stock/doctype/material_request/material_request.js:249
-#: stock/doctype/stock_entry/stock_entry.js:551
+#: stock/dashboard/item_dashboard.js:244
+#: stock/doctype/material_request/material_request.js:314
+#: stock/doctype/stock_entry/stock_entry.js:636
 #: 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:28
+#: stock/report/stock_analytics/stock_analytics.js:27
 #: templates/emails/reorder_item.html:10 templates/generators/bom.html:30
-#: templates/pages/material_request_info.html:48 templates/pages/order.html:86
+#: templates/pages/material_request_info.html:48 templates/pages/order.html:98
 msgid "Quantity"
 msgstr "Quantité"
 
@@ -55471,16 +56382,20 @@
 msgid "Quantity and Warehouse"
 msgstr "Quantité et Entrepôt"
 
-#: stock/doctype/stock_entry/stock_entry.py:1270
+#: stock/doctype/stock_entry/stock_entry.py:1279
 msgid "Quantity in row {0} ({1}) must be same as manufactured quantity {2}"
 msgstr "Quantité à la ligne {0} ({1}) doit être égale a la quantité produite {2}"
 
-#: stock/dashboard/item_dashboard.js:273
+#: manufacturing/doctype/plant_floor/plant_floor.js:246
+msgid "Quantity is required"
+msgstr ""
+
+#: stock/dashboard/item_dashboard.js:281
 msgid "Quantity must be greater than zero, and less or equal to {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:721
-#: stock/doctype/pick_list/pick_list.js:152
+#: manufacturing/doctype/work_order/work_order.js:775
+#: stock/doctype/pick_list/pick_list.js:182
 msgid "Quantity must not be more than {0}"
 msgstr "Quantité ne doit pas être plus de {0}"
 
@@ -55495,26 +56410,27 @@
 msgstr "Quantité requise pour l'Article {0} à la ligne {1}"
 
 #: manufacturing/doctype/bom/bom.py:568
+#: manufacturing/doctype/workstation/workstation.js:216
 msgid "Quantity should be greater than 0"
 msgstr "Quantité doit être supérieure à 0"
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:22
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:21
 msgid "Quantity to Make"
 msgstr "Quantité à faire"
 
-#: manufacturing/doctype/work_order/work_order.js:249
+#: manufacturing/doctype/work_order/work_order.js:264
 msgid "Quantity to Manufacture"
 msgstr "Quantité à fabriquer"
 
-#: manufacturing/doctype/work_order/work_order.py:1516
+#: manufacturing/doctype/work_order/work_order.py:1530
 msgid "Quantity to Manufacture can not be zero for the operation {0}"
 msgstr "La quantité à fabriquer ne peut pas être nulle pour l'opération {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:934
+#: manufacturing/doctype/work_order/work_order.py:948
 msgid "Quantity to Manufacture must be greater than 0."
 msgstr "La quantité à produire doit être supérieur à 0."
 
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:21
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:24
 msgid "Quantity to Produce"
 msgstr "Quantité à produire"
 
@@ -55522,7 +56438,7 @@
 msgid "Quantity to Produce should be greater than zero."
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:227
+#: public/js/utils/barcode_scanner.js:236
 msgid "Quantity to Scan"
 msgstr ""
 
@@ -55531,20 +56447,20 @@
 msgid "Quarter {0} {1}"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:65
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:68
-#: buying/report/purchase_analytics/purchase_analytics.js:63
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
-#: manufacturing/report/production_analytics/production_analytics.js:36
-#: public/js/financial_statements.js:218
+#: accounts/report/budget_variance_report/budget_variance_report.js:63
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:76
+#: buying/report/purchase_analytics/purchase_analytics.js:62
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
+#: manufacturing/report/production_analytics/production_analytics.js:35
+#: public/js/financial_statements.js:227
 #: public/js/purchase_trends_filters.js:20 public/js/sales_trends_filters.js:12
-#: public/js/stock_analytics.js:54
-#: selling/report/sales_analytics/sales_analytics.js:63
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
-#: stock/report/stock_analytics/stock_analytics.js:82
-#: support/report/issue_analytics/issue_analytics.js:44
+#: public/js/stock_analytics.js:84
+#: selling/report/sales_analytics/sales_analytics.js:70
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
+#: stock/report/stock_analytics/stock_analytics.js:81
+#: support/report/issue_analytics/issue_analytics.js:43
 msgid "Quarterly"
 msgstr "Trimestriel"
 
@@ -55632,11 +56548,18 @@
 msgid "Queued"
 msgstr "Dans la file d'attente"
 
-#: accounts/doctype/journal_entry/journal_entry.js:39
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Queued"
+msgstr "Dans la file d'attente"
+
+#: accounts/doctype/journal_entry/journal_entry.js:82
 msgid "Quick Entry"
 msgstr "Écriture rapide"
 
-#: accounts/doctype/journal_entry/journal_entry.js:527
+#: accounts/doctype/journal_entry/journal_entry.js:577
 msgid "Quick Journal Entry"
 msgstr "Écriture Rapide dans le Journal"
 
@@ -55673,13 +56596,14 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:257
-#: buying/doctype/supplier_quotation/supplier_quotation.js:26
-#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:100
-#: crm/report/lead_details/lead_details.js:38
-#: manufacturing/doctype/blanket_order/blanket_order.js:33
+#: accounts/doctype/sales_invoice/sales_invoice.js:287
+#: buying/doctype/supplier_quotation/supplier_quotation.js:27
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
+#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:108
+#: crm/report/lead_details/lead_details.js:37
+#: manufacturing/doctype/blanket_order/blanket_order.js:38
 #: selling/doctype/quotation/quotation.json
-#: selling/doctype/sales_order/sales_order.js:613
+#: selling/doctype/sales_order/sales_order.js:721
 msgid "Quotation"
 msgstr "Devis"
 
@@ -55787,11 +56711,11 @@
 msgid "Quotation Trends"
 msgstr "Tendances des Devis"
 
-#: selling/doctype/sales_order/sales_order.py:383
+#: selling/doctype/sales_order/sales_order.py:386
 msgid "Quotation {0} is cancelled"
 msgstr "Devis {0} est annulée"
 
-#: selling/doctype/sales_order/sales_order.py:300
+#: selling/doctype/sales_order/sales_order.py:303
 msgid "Quotation {0} not of type {1}"
 msgstr "Le devis {0} n'est pas du type {1}"
 
@@ -55847,13 +56771,13 @@
 msgid "Random"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:58
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:26
-#: manufacturing/report/production_analytics/production_analytics.js:31
-#: public/js/stock_analytics.js:49
-#: selling/report/sales_analytics/sales_analytics.js:58
-#: stock/report/stock_analytics/stock_analytics.js:77
-#: support/report/issue_analytics/issue_analytics.js:39
+#: buying/report/purchase_analytics/purchase_analytics.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:25
+#: manufacturing/report/production_analytics/production_analytics.js:30
+#: public/js/stock_analytics.js:78
+#: selling/report/sales_analytics/sales_analytics.js:65
+#: stock/report/stock_analytics/stock_analytics.js:76
+#: support/report/issue_analytics/issue_analytics.js:38
 msgid "Range"
 msgstr "Plage"
 
@@ -55873,12 +56797,13 @@
 #: 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:669
+#: accounts/report/share_ledger/share_ledger.py:56 public/js/utils.js:732
 #: 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:243
+#: stock/dashboard/item_dashboard.js:251
 #: stock/report/delayed_item_report/delayed_item_report.py:151
-#: templates/pages/order.html:89 templates/pages/rfq.html:43
+#: templates/form_grid/item_grid.html:8 templates/pages/order.html:101
+#: templates/pages/rfq.html:43
 msgid "Rate"
 msgstr "Prix"
 
@@ -56488,6 +57413,7 @@
 msgstr ""
 
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:52
+#: public/js/bom_configurator/bom_configurator.bundle.js:118
 #: setup/setup_wizard/operations/install_fixtures.py:46
 #: setup/setup_wizard/operations/install_fixtures.py:167
 msgid "Raw Material"
@@ -56557,12 +57483,13 @@
 msgid "Raw Material Value"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:66
+#: manufacturing/report/production_planning_report/production_planning_report.js:65
 msgid "Raw Material Warehouse"
 msgstr "Entrepôt de matières premières"
 
-#: manufacturing/doctype/bom/bom.js:274
-#: public/js/bom_configurator/bom_configurator.bundle.js:268
+#: manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/workstation/workstation_job_card.html:76
+#: public/js/bom_configurator/bom_configurator.bundle.js:289
 msgid "Raw Materials"
 msgstr "Matières premières"
 
@@ -56648,12 +57575,12 @@
 msgid "Raw Materials cannot be blank."
 msgstr "Matières Premières ne peuvent pas être vides."
 
-#: buying/doctype/purchase_order/purchase_order.js:304
-#: manufacturing/doctype/production_plan/production_plan.js:97
-#: manufacturing/doctype/work_order/work_order.js:574
-#: selling/doctype/sales_order/sales_order.js:526
-#: selling/doctype/sales_order/sales_order_list.js:49
-#: stock/doctype/material_request/material_request.js:166
+#: buying/doctype/purchase_order/purchase_order.js:342
+#: manufacturing/doctype/production_plan/production_plan.js:103
+#: manufacturing/doctype/work_order/work_order.js:610
+#: selling/doctype/sales_order/sales_order.js:563
+#: selling/doctype/sales_order/sales_order_list.js:62
+#: stock/doctype/material_request/material_request.js:197
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 msgid "Re-open"
 msgstr "Ré-ouvrir"
@@ -56670,7 +57597,7 @@
 msgid "Re-order Qty"
 msgstr "Qté de Réapprovisionnement"
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:226
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:227
 msgid "Reached Root"
 msgstr ""
 
@@ -56757,11 +57684,11 @@
 msgid "Readings"
 msgstr "Lectures"
 
-#: support/doctype/issue/issue.js:44
+#: support/doctype/issue/issue.js:51
 msgid "Reason"
 msgstr "Raison"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:242
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:279
 msgid "Reason For Putting On Hold"
 msgstr "Raison de la mise en attente"
 
@@ -56771,8 +57698,14 @@
 msgid "Reason For Putting On Hold"
 msgstr "Raison de la mise en attente"
 
-#: buying/doctype/purchase_order/purchase_order.js:565
-#: selling/doctype/sales_order/sales_order.js:1112
+#. Label of a Data field in DocType 'Payment Request'
+#: accounts/doctype/payment_request/payment_request.json
+msgctxt "Payment Request"
+msgid "Reason for Failure"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:661
+#: selling/doctype/sales_order/sales_order.js:1274
 msgid "Reason for Hold"
 msgstr "Raison de tenir"
 
@@ -56782,11 +57715,11 @@
 msgid "Reason for Leaving"
 msgstr "Raison du Départ"
 
-#: selling/doctype/sales_order/sales_order.js:1127
+#: selling/doctype/sales_order/sales_order.js:1289
 msgid "Reason for hold:"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:144
+#: manufacturing/doctype/bom_creator/bom_creator.js:140
 msgid "Rebuild Tree"
 msgstr ""
 
@@ -56800,11 +57733,11 @@
 msgid "Recalculate Incoming/Outgoing Rate"
 msgstr ""
 
-#: projects/doctype/project/project.js:104
+#: projects/doctype/project/project.js:128
 msgid "Recalculating Purchase Cost against this Project..."
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:29
+#: assets/doctype/asset/asset_list.js:21
 msgid "Receipt"
 msgstr "Reçu"
 
@@ -56850,7 +57783,7 @@
 msgid "Receipt Document Type"
 msgstr "Type de Reçu"
 
-#: accounts/report/account_balance/account_balance.js:53
+#: accounts/report/account_balance/account_balance.js:55
 msgid "Receivable"
 msgstr "Créance"
 
@@ -56879,7 +57812,7 @@
 msgid "Receivable / Payable Account"
 msgstr "Compte Débiteur / Créditeur"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:67
+#: 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
@@ -56913,10 +57846,10 @@
 msgid "Receive"
 msgstr "Recevoir"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:297
+#: buying/doctype/request_for_quotation/request_for_quotation.py:321
 #: buying/doctype/supplier_quotation/supplier_quotation.py:175
-#: stock/doctype/material_request/material_request_list.js:23
-#: stock/doctype/material_request/material_request_list.js:31
+#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:35
 msgid "Received"
 msgstr "Reçu"
 
@@ -56957,7 +57890,7 @@
 msgid "Received Amount After Tax (Company Currency)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:891
+#: accounts/doctype/payment_entry/payment_entry.py:900
 msgid "Received Amount cannot be greater than Paid Amount"
 msgstr ""
 
@@ -57031,6 +57964,7 @@
 msgstr ""
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:50
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:9
 msgid "Received Quantity"
 msgstr "Quantité reçue"
 
@@ -57046,7 +57980,7 @@
 msgid "Received Quantity"
 msgstr "Quantité reçue"
 
-#: stock/doctype/stock_entry/stock_entry.js:250
+#: stock/doctype/stock_entry/stock_entry.js:278
 msgid "Received Stock Entries"
 msgstr "Entrées de stock reçues"
 
@@ -57079,6 +58013,10 @@
 msgid "Receiving"
 msgstr "Reçue"
 
+#: selling/page/point_of_sale/pos_past_order_list.js:17
+msgid "Recent Orders"
+msgstr ""
+
 #. Label of a Dynamic Link field in DocType 'Email Campaign'
 #: crm/doctype/email_campaign/email_campaign.json
 msgctxt "Email Campaign"
@@ -57109,8 +58047,8 @@
 msgid "Recipients"
 msgstr "Destinataires"
 
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:89
 #: accounts/doctype/payment_reconciliation/payment_reconciliation.js:90
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:93
 msgid "Reconcile"
 msgstr "Réconcilier"
 
@@ -57120,11 +58058,11 @@
 msgid "Reconcile"
 msgstr "Réconcilier"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:325
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:341
 msgid "Reconcile Entries"
 msgstr "Réconcilier les entrées"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:217
+#: public/js/bank_reconciliation_tool/dialog_manager.js:221
 msgid "Reconcile the Bank Transaction"
 msgstr ""
 
@@ -57201,6 +58139,12 @@
 msgid "Recurse Every (As Per Transaction UOM)"
 msgstr ""
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Recurse Every (As Per Transaction UOM)"
+msgstr ""
+
 #: accounts/doctype/pricing_rule/pricing_rule.py:232
 msgid "Recurse Over Qty cannot be less than 0"
 msgstr ""
@@ -57229,7 +58173,7 @@
 msgid "Redeem Against"
 msgstr "Échanger contre"
 
-#: selling/page/point_of_sale/pos_payment.js:497
+#: selling/page/point_of_sale/pos_payment.js:525
 msgid "Redeem Loyalty Points"
 msgstr "Échanger des points de fidélité"
 
@@ -57310,7 +58254,12 @@
 #: accounts/doctype/promotional_scheme/promotional_scheme_dashboard.py:7
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:22
 #: accounts/doctype/sales_invoice/sales_invoice_dashboard.py:34
+#: accounts/report/accounts_receivable/accounts_receivable.html:136
+#: 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/general_ledger/general_ledger.html:28
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:22
 #: buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:15
 #: manufacturing/doctype/job_card/job_card_dashboard.py:10
@@ -57464,11 +58413,12 @@
 msgid "Reference"
 msgstr "Référence"
 
-#: accounts/doctype/journal_entry/journal_entry.py:899
+#: accounts/doctype/journal_entry/journal_entry.py:926
 msgid "Reference #{0} dated {1}"
 msgstr "Référence #{0} datée du {1}"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:112
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:27
+#: public/js/bank_reconciliation_tool/dialog_manager.js:119
 msgid "Reference Date"
 msgstr "Date de Référence"
 
@@ -57478,7 +58428,7 @@
 msgid "Reference Date"
 msgstr "Date de Référence"
 
-#: public/js/controllers/transaction.js:2073
+#: public/js/controllers/transaction.js:2116
 msgid "Reference Date for Early Payment Discount"
 msgstr ""
 
@@ -57500,7 +58450,7 @@
 msgid "Reference Doctype"
 msgstr "DocType de la Référence"
 
-#: accounts/doctype/payment_entry/payment_entry.py:555
+#: accounts/doctype/payment_entry/payment_entry.py:564
 msgid "Reference Doctype must be one of {0}"
 msgstr "Doctype de la Référence doit être parmi {0}"
 
@@ -57669,24 +58619,30 @@
 msgid "Reference Name"
 msgstr "Nom de référence"
 
-#: accounts/doctype/journal_entry/journal_entry.py:532
+#. Label of a Data field in DocType 'Sales Invoice Payment'
+#: accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
+msgctxt "Sales Invoice Payment"
+msgid "Reference No"
+msgstr ""
+
+#: accounts/doctype/journal_entry/journal_entry.py:548
 msgid "Reference No & Reference Date is required for {0}"
 msgstr "N° et Date de Référence sont nécessaires pour {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1087
+#: accounts/doctype/payment_entry/payment_entry.py:1096
 msgid "Reference No and Reference Date is mandatory for Bank transaction"
 msgstr "Le N° de Référence et la Date de Référence sont nécessaires pour une Transaction Bancaire"
 
-#: accounts/doctype/journal_entry/journal_entry.py:537
+#: accounts/doctype/journal_entry/journal_entry.py:553
 msgid "Reference No is mandatory if you entered Reference Date"
 msgstr "N° de Référence obligatoire si vous avez entré une date"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
 msgid "Reference No."
 msgstr "Numéro de référence"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:88
-#: public/js/bank_reconciliation_tool/dialog_manager.js:123
+#: public/js/bank_reconciliation_tool/data_table_manager.js:83
+#: public/js/bank_reconciliation_tool/dialog_manager.js:130
 msgid "Reference Number"
 msgstr "Numéro de réference"
 
@@ -57862,7 +58818,15 @@
 msgid "References"
 msgstr "Références"
 
-#: accounts/doctype/payment_entry/payment_entry.py:631
+#: stock/doctype/delivery_note/delivery_note.py:395
+msgid "References to Sales Invoices are Incomplete"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:371
+msgid "References to Sales Orders are Incomplete"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.py:640
 msgid "References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount."
 msgstr ""
 
@@ -57878,7 +58842,8 @@
 msgid "Referral Sales Partner"
 msgstr "Partenaire commercial de référence"
 
-#: selling/page/sales_funnel/sales_funnel.js:44
+#: public/js/plant_floor_visual/visual_plant.js:151
+#: selling/page/sales_funnel/sales_funnel.js:51
 msgid "Refresh"
 msgstr "Actualiser"
 
@@ -57888,7 +58853,7 @@
 msgid "Refresh Google Sheet"
 msgstr "Actualiser Google Sheet"
 
-#: accounts/doctype/bank/bank.js:22
+#: accounts/doctype/bank/bank.js:21
 msgid "Refresh Plaid Link"
 msgstr ""
 
@@ -57898,7 +58863,7 @@
 msgid "Refresh Token"
 msgstr "Jeton de Rafraîchissement"
 
-#: stock/reorder_item.py:303
+#: stock/reorder_item.py:388
 msgid "Regards,"
 msgstr "Cordialement,"
 
@@ -58040,8 +59005,8 @@
 msgid "Relation"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:234
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:278
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:271
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:315
 msgid "Release Date"
 msgstr "Date de la fin de mise en attente"
 
@@ -58057,7 +59022,7 @@
 msgid "Release Date"
 msgstr "Date de la fin de mise en attente"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:314
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
 msgid "Release date must be in the future"
 msgstr "La date de sortie doit être dans le futur"
 
@@ -58067,17 +59032,18 @@
 msgid "Relieving Date"
 msgstr "Date de Relève"
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:118
+#: public/js/bank_reconciliation_tool/dialog_manager.js:125
 msgid "Remaining"
 msgstr "Restant"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:186
-#: accounts/report/accounts_receivable/accounts_receivable.py:1085
+#: 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
 msgid "Remaining Balance"
 msgstr "Solde restant"
 
-#: selling/page/point_of_sale/pos_payment.js:350
+#: selling/page/point_of_sale/pos_payment.js:367
 msgid "Remark"
 msgstr "Remarque"
 
@@ -58100,8 +59066,14 @@
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:240
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:311
 #: accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:11
-#: accounts/report/accounts_receivable/accounts_receivable.py:1117
-#: accounts/report/general_ledger/general_ledger.py:661
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.html:29
+#: accounts/report/general_ledger/general_ledger.html:51
+#: accounts/report/general_ledger/general_ledger.py:674
 #: 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
@@ -58224,11 +59196,15 @@
 msgid "Remarks Column Length"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:323
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Remove item if charges is not applicable to that item"
+msgstr ""
+
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
 msgid "Removed items with no change in quantity or value."
 msgstr "Les articles avec aucune modification de quantité ou de valeur ont étés retirés."
 
-#: utilities/doctype/rename_tool/rename_tool.js:25
+#: utilities/doctype/rename_tool/rename_tool.js:24
 msgid "Rename"
 msgstr "Renommer"
 
@@ -58245,7 +59221,7 @@
 msgid "Rename Log"
 msgstr "Journal des Renommages"
 
-#: accounts/doctype/account/account.py:502
+#: accounts/doctype/account/account.py:521
 msgid "Rename Not Allowed"
 msgstr "Renommer non autorisé"
 
@@ -58254,7 +59230,7 @@
 msgid "Rename Tool"
 msgstr "Outil de Renommage"
 
-#: accounts/doctype/account/account.py:494
+#: accounts/doctype/account/account.py:513
 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch."
 msgstr "Le renommer n'est autorisé que via la société mère {0}, pour éviter les incompatibilités."
 
@@ -58277,11 +59253,11 @@
 msgid "Rented"
 msgstr "Loué"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:34
-#: crm/doctype/opportunity/opportunity.js:113
-#: stock/doctype/delivery_note/delivery_note.js:228
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: support/doctype/issue/issue.js:30
+#: buying/doctype/purchase_order/purchase_order_list.js:53
+#: crm/doctype/opportunity/opportunity.js:123
+#: stock/doctype/delivery_note/delivery_note.js:277
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: support/doctype/issue/issue.js:37
 msgid "Reopen"
 msgstr "Ré-ouvrir"
 
@@ -58318,7 +59294,7 @@
 msgid "Repair"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:107
+#: assets/doctype/asset/asset.js:127
 msgid "Repair Asset"
 msgstr ""
 
@@ -58366,9 +59342,15 @@
 msgid "Replace BOM"
 msgstr "Remplacer la nomenclature"
 
-#: crm/report/lead_details/lead_details.js:36
-#: support/report/issue_analytics/issue_analytics.js:57
-#: support/report/issue_summary/issue_summary.js:44
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.json
+msgid "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM.\n"
+"It also updates latest price in all the BOMs."
+msgstr ""
+
+#: 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
 msgid "Replied"
 msgstr "Répondu"
@@ -58397,7 +59379,7 @@
 msgid "Replied"
 msgstr "Répondu"
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:86
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:110
 msgid "Report"
 msgstr "Rapport"
 
@@ -58417,7 +59399,7 @@
 msgid "Report Date"
 msgstr "Date du Rapport"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:213
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:192
 msgid "Report Error"
 msgstr ""
 
@@ -58433,12 +59415,12 @@
 msgid "Report Type"
 msgstr "Type de Rapport"
 
-#: accounts/doctype/account/account.py:395
+#: accounts/doctype/account/account.py:414
 msgid "Report Type is mandatory"
 msgstr "Le Type de Rapport est nécessaire"
 
-#: accounts/report/balance_sheet/balance_sheet.js:17
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:17
+#: accounts/report/balance_sheet/balance_sheet.js:13
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:13
 msgid "Report View"
 msgstr ""
 
@@ -58472,8 +59454,9 @@
 msgid "Reports to"
 msgstr "Rapports À"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:70
-#: accounts/doctype/sales_invoice/sales_invoice.js:73
+#: accounts/doctype/journal_entry/journal_entry.js:34
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:87
+#: accounts/doctype/sales_invoice/sales_invoice.js:78
 msgid "Repost Accounting Entries"
 msgstr ""
 
@@ -58518,6 +59501,12 @@
 msgid "Repost Payment Ledger Items"
 msgstr ""
 
+#. Label of a Check field in DocType 'Journal Entry'
+#: accounts/doctype/journal_entry/journal_entry.json
+msgctxt "Journal Entry"
+msgid "Repost Required"
+msgstr ""
+
 #. Label of a Check field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
@@ -58536,11 +59525,11 @@
 msgid "Repost Status"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:137
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:138
 msgid "Repost has started in the background"
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:38
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:40
 msgid "Repost in background"
 msgstr ""
 
@@ -58548,7 +59537,7 @@
 msgid "Repost started in the background"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:105
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:115
 msgid "Reposting Completed {0}%"
 msgstr ""
 
@@ -58564,7 +59553,7 @@
 msgid "Reposting Info"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:113
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:123
 msgid "Reposting Progress"
 msgstr ""
 
@@ -58573,16 +59562,17 @@
 msgid "Reposting entries created: {0}"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:89
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:99
 msgid "Reposting has been started in the background."
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:47
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:49
 msgid "Reposting in the background."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:76
-#: accounts/doctype/sales_invoice/sales_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:39
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/sales_invoice/sales_invoice.js:83
 msgid "Reposting..."
 msgstr ""
 
@@ -58640,11 +59630,20 @@
 msgid "Represents Company"
 msgstr "Représente la société"
 
-#: public/js/utils.js:678
+#. Description of a DocType
+#: accounts/doctype/fiscal_year/fiscal_year.json
+msgid "Represents a Financial Year. All accounting entries and other major transactions are tracked against the Fiscal Year."
+msgstr ""
+
+#: templates/form_grid/material_request_grid.html:25
+msgid "Reqd By Date"
+msgstr ""
+
+#: public/js/utils.js:742
 msgid "Reqd by date"
 msgstr "Reqd par date"
 
-#: crm/doctype/opportunity/opportunity.js:87
+#: crm/doctype/opportunity/opportunity.js:89
 msgid "Request For Quotation"
 msgstr "Demande de devis"
 
@@ -58654,7 +59653,7 @@
 msgid "Request Parameters"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:269
+#: accounts/doctype/pos_invoice/pos_invoice.js:292
 msgid "Request Timeout"
 msgstr ""
 
@@ -58678,11 +59677,11 @@
 
 #. Name of a DocType
 #: buying/doctype/request_for_quotation/request_for_quotation.json
-#: buying/doctype/request_for_quotation/request_for_quotation.py:346
-#: buying/doctype/supplier_quotation/supplier_quotation.js:57
+#: buying/doctype/request_for_quotation/request_for_quotation.py:370
+#: 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
-#: stock/doctype/material_request/material_request.js:142
+#: stock/doctype/material_request/material_request.js:162
 msgid "Request for Quotation"
 msgstr "Appel d'Offre"
 
@@ -58720,7 +59719,7 @@
 msgid "Request for Quotation Supplier"
 msgstr "Fournisseur de l'Appel d'Offre"
 
-#: selling/doctype/sales_order/sales_order.js:571
+#: selling/doctype/sales_order/sales_order.js:650
 msgid "Request for Raw Materials"
 msgstr "Demande de matières premières"
 
@@ -58776,6 +59775,10 @@
 msgid "Requested Qty"
 msgstr "Qté demandée"
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Requested Qty: Quantity requested for purchase, but not ordered."
+msgstr ""
+
 #: buying/report/procurement_tracker/procurement_tracker.py:46
 msgid "Requesting Site"
 msgstr "Site demandeur"
@@ -58862,8 +59865,15 @@
 msgid "Required Items"
 msgstr "Articles Requis"
 
+#: templates/form_grid/material_request_grid.html:7
+msgid "Required On"
+msgstr ""
+
 #: 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_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
@@ -58940,7 +59950,7 @@
 msgid "Research"
 msgstr "Recherche"
 
-#: setup/doctype/company/company.py:383
+#: setup/doctype/company/company.py:382
 msgid "Research & Development"
 msgstr "Recherche & Développement"
 
@@ -58972,11 +59982,11 @@
 msgid "Reselect, if the chosen contact is edited after save"
 msgstr "Re-sélectionner, si le contact choisi est édité après l'enregistrement"
 
-#: accounts/doctype/payment_request/payment_request.js:30
+#: accounts/doctype/payment_request/payment_request.js:39
 msgid "Resend Payment Email"
 msgstr "Renvoyer Email de Paiement"
 
-#: stock/report/reserved_stock/reserved_stock.js:121
+#: stock/report/reserved_stock/reserved_stock.js:118
 msgid "Reservation Based On"
 msgstr ""
 
@@ -58986,12 +59996,12 @@
 msgid "Reservation Based On"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: stock/doctype/pick_list/pick_list.js:110
+#: selling/doctype/sales_order/sales_order.js:80
+#: stock/doctype/pick_list/pick_list.js:126
 msgid "Reserve"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:322
+#: selling/doctype/sales_order/sales_order.js:347
 msgid "Reserve Stock"
 msgstr ""
 
@@ -59025,6 +60035,8 @@
 msgid "Reserved"
 msgstr "Réservé"
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:29
+#: stock/dashboard/item_dashboard_list.html:20
 #: stock/report/reserved_stock/reserved_stock.py:124
 #: stock/report/stock_projected_qty/stock_projected_qty.py:164
 msgid "Reserved Qty"
@@ -59064,16 +60076,28 @@
 msgid "Reserved Qty for Production Plan"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Production: Raw materials quantity to make manufacturing items."
+msgstr ""
+
 #. Label of a Float field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "Reserved Qty for Subcontract"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
+msgstr ""
+
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:497
 msgid "Reserved Qty should be greater than Delivered Qty."
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty: Quantity ordered for sale, but not delivered."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:116
 msgid "Reserved Quantity"
 msgstr "Quantité Réservée"
@@ -59082,16 +60106,18 @@
 msgid "Reserved Quantity for Production"
 msgstr "Quantité réservée pour la production"
 
-#: stock/stock_ledger.py:1982
+#: stock/stock_ledger.py:1989
 msgid "Reserved Serial No."
 msgstr ""
 
 #. Name of a report
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:374
-#: stock/doctype/pick_list/pick_list.js:120
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:24
+#: selling/doctype/sales_order/sales_order.js:99
+#: selling/doctype/sales_order/sales_order.js:404
+#: 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:459 stock/stock_ledger.py:1962
+#: stock/report/stock_balance/stock_balance.py:467 stock/stock_ledger.py:1969
 msgid "Reserved Stock"
 msgstr ""
 
@@ -59101,7 +60127,7 @@
 msgid "Reserved Stock"
 msgstr ""
 
-#: stock/stock_ledger.py:2012
+#: stock/stock_ledger.py:2019
 msgid "Reserved Stock for Batch"
 msgstr ""
 
@@ -59133,21 +60159,27 @@
 msgid "Reserved for sub contracting"
 msgstr "Réservé à la sous-traitance"
 
-#: selling/doctype/sales_order/sales_order.js:335
-#: stock/doctype/pick_list/pick_list.js:237
+#: selling/doctype/sales_order/sales_order.js:360
+#: stock/doctype/pick_list/pick_list.js:271
 msgid "Reserving Stock..."
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:139
-#: support/doctype/issue/issue.js:48
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:155
+#: support/doctype/issue/issue.js:55
 msgid "Reset"
 msgstr "Réinitialiser"
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Reset Company Default Values"
+msgstr ""
+
 #: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:19
 msgid "Reset Plaid Link"
 msgstr ""
 
-#: support/doctype/issue/issue.js:39
+#: support/doctype/issue/issue.js:46
 msgid "Reset Service Level Agreement"
 msgstr "Réinitialiser l'accord de niveau de service"
 
@@ -59157,7 +60189,7 @@
 msgid "Reset Service Level Agreement"
 msgstr "Réinitialiser l'accord de niveau de service"
 
-#: support/doctype/issue/issue.js:56
+#: support/doctype/issue/issue.js:63
 msgid "Resetting Service Level Agreement."
 msgstr "Réinitialisation de l'accord de niveau de service."
 
@@ -59246,8 +60278,8 @@
 msgstr "Résoudre"
 
 #: accounts/doctype/dunning/dunning_list.js:4
-#: support/report/issue_analytics/issue_analytics.js:58
-#: support/report/issue_summary/issue_summary.js:46
+#: support/report/issue_analytics/issue_analytics.js:57
+#: support/report/issue_summary/issue_summary.js:45
 #: support/report/issue_summary/issue_summary.py:366
 msgid "Resolved"
 msgstr "Résolu"
@@ -59327,7 +60359,7 @@
 msgid "Rest Of The World"
 msgstr "Reste du monde"
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:72
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:82
 msgid "Restart"
 msgstr ""
 
@@ -59335,7 +60367,7 @@
 msgid "Restart Subscription"
 msgstr "Redémarrer l'abonnement"
 
-#: assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:108
 msgid "Restore Asset"
 msgstr ""
 
@@ -59382,12 +60414,12 @@
 msgid "Result Title Field"
 msgstr "Champ du titre du résultat"
 
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: selling/doctype/sales_order/sales_order.js:515
+#: buying/doctype/purchase_order/purchase_order.js:321
+#: selling/doctype/sales_order/sales_order.js:549
 msgid "Resume"
 msgstr "CV"
 
-#: manufacturing/doctype/job_card/job_card.js:255
+#: manufacturing/doctype/job_card/job_card.js:288
 msgid "Resume Job"
 msgstr ""
 
@@ -59414,11 +60446,11 @@
 msgid "Retained Earnings"
 msgstr "Bénéfices Non Répartis"
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: stock/doctype/purchase_receipt/purchase_receipt.js:274
 msgid "Retention Stock Entry"
 msgstr "Entrée de stock de rétention"
 
-#: stock/doctype/stock_entry/stock_entry.js:450
+#: stock/doctype/stock_entry/stock_entry.js:510
 msgid "Retention Stock Entry already created or Sample Quantity not provided"
 msgstr "Saisie de stock de rétention déjà créée ou quantité d'échantillon non fournie"
 
@@ -59428,20 +60460,21 @@
 msgid "Retried"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:134
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 #: accounts/doctype/ledger_merge/ledger_merge.js:72
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:65
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:66
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
 msgid "Retry"
 msgstr "Recommencez"
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:13
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:27
 msgid "Retry Failed Transactions"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/sales_invoice/sales_invoice.py:263
-#: stock/doctype/delivery_note/delivery_note_list.js:6
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:6
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/sales_invoice/sales_invoice.py:268
+#: stock/doctype/delivery_note/delivery_note_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:15
 msgid "Return"
 msgstr "Retour"
 
@@ -59469,11 +60502,11 @@
 msgid "Return"
 msgstr "Retour"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:120
+#: accounts/doctype/sales_invoice/sales_invoice.js:121
 msgid "Return / Credit Note"
 msgstr "Retour / Note de crédit"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
 msgid "Return / Debit Note"
 msgstr "Retour / Note de Débit"
 
@@ -59519,12 +60552,12 @@
 msgid "Return Against Subcontracting Receipt"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:194
+#: manufacturing/doctype/work_order/work_order.js:205
 msgid "Return Components"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note_list.js:10
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:10
+#: stock/doctype/delivery_note/delivery_note_list.js:20
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:19
 msgid "Return Issued"
 msgstr ""
 
@@ -59546,16 +60579,16 @@
 msgid "Return Issued"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:334
 msgid "Return Qty"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:265
+#: stock/doctype/purchase_receipt/purchase_receipt.js:310
 msgid "Return Qty from Rejected Warehouse"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:77
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:142
+#: buying/doctype/purchase_order/purchase_order.js:80
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:150
 msgid "Return of Components"
 msgstr ""
 
@@ -59635,7 +60668,7 @@
 msgid "Returned Qty in Stock UOM"
 msgstr ""
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:103
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:104
 msgid "Returned exchange rate is neither integer not float."
 msgstr ""
 
@@ -59653,14 +60686,14 @@
 msgid "Returns"
 msgstr "Retours"
 
-#: accounts/report/accounts_payable/accounts_payable.js:154
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:116
-#: accounts/report/accounts_receivable/accounts_receivable.js:186
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:144
+#: accounts/report/accounts_payable/accounts_payable.js:157
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:119
+#: accounts/report/accounts_receivable/accounts_receivable.js:189
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:147
 msgid "Revaluation Journals"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
 msgid "Revenue"
 msgstr ""
 
@@ -59670,7 +60703,7 @@
 msgid "Reversal Of"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:33
+#: accounts/doctype/journal_entry/journal_entry.js:73
 msgid "Reverse Journal Entry"
 msgstr "Ecriture de journal de contre-passation"
 
@@ -59827,12 +60860,12 @@
 msgid "Root"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:41
+#: accounts/doctype/account/account_tree.js:47
 msgid "Root Company"
 msgstr "Compagnie Racine"
 
-#: accounts/doctype/account/account_tree.js:112
-#: accounts/report/account_balance/account_balance.js:23
+#: accounts/doctype/account/account_tree.js:145
+#: accounts/report/account_balance/account_balance.js:22
 msgid "Root Type"
 msgstr "Type de racine"
 
@@ -59852,11 +60885,11 @@
 msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity"
 msgstr ""
 
-#: accounts/doctype/account/account.py:392
+#: accounts/doctype/account/account.py:411
 msgid "Root Type is mandatory"
 msgstr "Le type de racine est obligatoire"
 
-#: accounts/doctype/account/account.py:195
+#: accounts/doctype/account/account.py:214
 msgid "Root cannot be edited."
 msgstr "La racine ne peut pas être modifiée."
 
@@ -59872,7 +60905,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:66
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:90
-#: accounts/report/account_balance/account_balance.js:54
+#: accounts/report/account_balance/account_balance.js:56
 msgid "Round Off"
 msgstr "Arrondi"
 
@@ -60133,12 +61166,12 @@
 msgid "Rounding Loss Allowance"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:41
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:45
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:48
 msgid "Rounding Loss Allowance should be between 0 and 1"
 msgstr ""
 
-#: controllers/stock_controller.py:216 controllers/stock_controller.py:231
+#: controllers/stock_controller.py:398 controllers/stock_controller.py:413
 msgid "Rounding gain/loss Entry for Stock Transfer"
 msgstr ""
 
@@ -60179,11 +61212,11 @@
 msgid "Routing Name"
 msgstr "Nom d'acheminement"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:428
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:482
 msgid "Row #"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:334
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:388
 msgid "Row # {0}:"
 msgstr ""
 
@@ -60200,12 +61233,12 @@
 msgstr "Ligne n ° {0}: l'élément renvoyé {1} n'existe pas dans {2} {3}"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:439
-#: accounts/doctype/sales_invoice/sales_invoice.py:1715
+#: accounts/doctype/sales_invoice/sales_invoice.py:1684
 msgid "Row #{0} (Payment Table): Amount must be negative"
 msgstr "Row # {0} (Table de paiement): le montant doit être négatif"
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:437
-#: accounts/doctype/sales_invoice/sales_invoice.py:1710
+#: accounts/doctype/sales_invoice/sales_invoice.py:1679
 msgid "Row #{0} (Payment Table): Amount must be positive"
 msgstr "Ligne #{0} (Table de paiement): Le montant doit être positif"
 
@@ -60222,7 +61255,7 @@
 msgstr ""
 
 #: controllers/subcontracting_controller.py:72
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:413
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:414
 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same"
 msgstr ""
 
@@ -60230,11 +61263,11 @@
 msgid "Row #{0}: Accepted Warehouse and Supplier Warehouse cannot be same"
 msgstr "Ligne # {0}: l'entrepôt accepté et l'entrepôt fournisseur ne peuvent pas être identiques"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:406
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:407
 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
 msgstr ""
 
-#: controllers/accounts_controller.py:887
+#: controllers/accounts_controller.py:939
 msgid "Row #{0}: Account {1} does not belong to company {2}"
 msgstr "Ligne # {0}: le compte {1} n'appartient pas à la société {2}"
 
@@ -60247,15 +61280,15 @@
 msgid "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:309
+#: assets/doctype/asset_capitalization/asset_capitalization.py:315
 msgid "Row #{0}: Amount must be a positive number"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:375
+#: accounts/doctype/sales_invoice/sales_invoice.py:386
 msgid "Row #{0}: Asset {1} cannot be submitted, it is already {2}"
 msgstr "Ligne #{0} : L’Actif {1} ne peut pas être soumis, il est déjà {2}"
 
-#: buying/doctype/purchase_order/purchase_order.py:351
+#: buying/doctype/purchase_order/purchase_order.py:352
 msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
 msgstr ""
 
@@ -60263,27 +61296,27 @@
 msgid "Row #{0}: Batch No {1} is already selected."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:736
+#: accounts/doctype/payment_entry/payment_entry.py:745
 msgid "Row #{0}: Cannot allocate more than {1} against payment term {2}"
 msgstr ""
 
-#: controllers/accounts_controller.py:3064
+#: controllers/accounts_controller.py:3155
 msgid "Row #{0}: Cannot delete item {1} which has already been billed."
 msgstr "Ligne # {0}: impossible de supprimer l'élément {1} qui a déjà été facturé."
 
-#: controllers/accounts_controller.py:3038
+#: controllers/accounts_controller.py:3129
 msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
 msgstr "Ligne # {0}: impossible de supprimer l'élément {1} qui a déjà été livré"
 
-#: controllers/accounts_controller.py:3057
+#: controllers/accounts_controller.py:3148
 msgid "Row #{0}: Cannot delete item {1} which has already been received"
 msgstr "Ligne # {0}: impossible de supprimer l'élément {1} qui a déjà été reçu"
 
-#: controllers/accounts_controller.py:3044
+#: controllers/accounts_controller.py:3135
 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
 msgstr "Ligne # {0}: impossible de supprimer l'élément {1} auquel un bon de travail est affecté."
 
-#: controllers/accounts_controller.py:3050
+#: controllers/accounts_controller.py:3141
 msgid "Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order."
 msgstr "Ligne # {0}: impossible de supprimer l'article {1} affecté à la commande d'achat du client."
 
@@ -60291,11 +61324,11 @@
 msgid "Row #{0}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor"
 msgstr "Ligne # {0}: Impossible de sélectionner l'entrepôt fournisseur lors de la fourniture de matières premières au sous-traitant"
 
-#: controllers/accounts_controller.py:3309
+#: controllers/accounts_controller.py:3400
 msgid "Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}."
 msgstr "Ligne n ° {0}: impossible de définir le prix si le montant est supérieur au montant facturé pour l'élément {1}."
 
-#: manufacturing/doctype/job_card/job_card.py:864
+#: manufacturing/doctype/job_card/job_card.py:871
 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
 msgstr ""
 
@@ -60303,31 +61336,31 @@
 msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
 msgstr "Ligne n ° {0}: l'élément enfant ne doit pas être un ensemble de produits. Veuillez supprimer l'élément {1} et enregistrer"
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:97
+#: accounts/doctype/bank_clearance/bank_clearance.py:99
 msgid "Row #{0}: Clearance date {1} cannot be before Cheque Date {2}"
 msgstr "Ligne #{0} : Date de compensation {1} ne peut pas être antérieure à la Date du Chèque {2}"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:286
+#: assets/doctype/asset_capitalization/asset_capitalization.py:292
 msgid "Row #{0}: Consumed Asset {1} cannot be Draft"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:288
+#: assets/doctype/asset_capitalization/asset_capitalization.py:294
 msgid "Row #{0}: Consumed Asset {1} cannot be cancelled"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:273
+#: assets/doctype/asset_capitalization/asset_capitalization.py:279
 msgid "Row #{0}: Consumed Asset {1} cannot be the same as the Target Asset"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:282
+#: assets/doctype/asset_capitalization/asset_capitalization.py:288
 msgid "Row #{0}: Consumed Asset {1} cannot be {2}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:292
+#: assets/doctype/asset_capitalization/asset_capitalization.py:298
 msgid "Row #{0}: Consumed Asset {1} does not belong to company {2}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:385
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:105
 msgid "Row #{0}: Cost Center {1} does not belong to company {2}"
 msgstr "Ligne # {0}: le centre de coûts {1} n'appartient pas à l'entreprise {2}"
 
@@ -60339,7 +61372,7 @@
 msgid "Row #{0}: Dates overlapping with other row"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:375
+#: buying/doctype/purchase_order/purchase_order.py:376
 msgid "Row #{0}: Default BOM not found for FG Item {1}"
 msgstr ""
 
@@ -60347,35 +61380,35 @@
 msgid "Row #{0}: Duplicate entry in References {1} {2}"
 msgstr "Ligne # {0}: entrée en double dans les références {1} {2}"
 
-#: selling/doctype/sales_order/sales_order.py:237
+#: selling/doctype/sales_order/sales_order.py:239
 msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
 msgstr "Ligne {0}: la date de livraison prévue ne peut pas être avant la date de commande"
 
-#: controllers/stock_controller.py:336
+#: controllers/stock_controller.py:518
 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:378
+#: buying/doctype/purchase_order/purchase_order.py:379
 msgid "Row #{0}: Finished Good Item Qty can not be zero"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:362
+#: buying/doctype/purchase_order/purchase_order.py:363
 msgid "Row #{0}: Finished Good Item is not specified for service item {1}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:369
+#: buying/doctype/purchase_order/purchase_order.py:370
 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:394
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:395
 msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:571
+#: accounts/doctype/journal_entry/journal_entry.py:594
 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:577
+#: accounts/doctype/journal_entry/journal_entry.py:604
 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
 msgstr ""
 
@@ -60383,7 +61416,7 @@
 msgid "Row #{0}: From Date cannot be before To Date"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:489
+#: public/js/utils/barcode_scanner.js:394
 msgid "Row #{0}: Item added"
 msgstr "Ligne n ° {0}: élément ajouté"
 
@@ -60391,23 +61424,23 @@
 msgid "Row #{0}: Item {1} does not exist"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:949
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:951
 msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:491
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:545
 msgid "Row #{0}: Item {1} is not a Serialized/Batched Item. It cannot have a Serial No/Batch No against it."
 msgstr "Ligne # {0}: l'article {1} n'est pas un article sérialisé / en lot. Il ne peut pas avoir de numéro de série / de lot contre lui."
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:303
+#: assets/doctype/asset_capitalization/asset_capitalization.py:309
 msgid "Row #{0}: Item {1} is not a service item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:261
+#: assets/doctype/asset_capitalization/asset_capitalization.py:267
 msgid "Row #{0}: Item {1} is not a stock item"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:657
+#: accounts/doctype/payment_entry/payment_entry.py:666
 msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
 msgstr "Ligne #{0} : L’Écriture de Journal {1} n'a pas le compte {2} ou est déjà réconciliée avec une autre référence"
 
@@ -60415,48 +61448,48 @@
 msgid "Row #{0}: Maximum Net Rate cannot be greater than Minimum Net Rate"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:535
+#: selling/doctype/sales_order/sales_order.py:541
 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
 msgstr "Ligne #{0} : Changement de Fournisseur non autorisé car une Commande d'Achat existe déjà"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1032
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1034
 msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:687
+#: stock/doctype/stock_entry/stock_entry.py:642
 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 "Ligne n ° {0}: l'opération {1} n'est pas terminée pour {2} quantité de produits finis dans l'ordre de fabrication {3}. Veuillez mettre à jour le statut de l'opération via la carte de travail {4}."
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:93
+#: accounts/doctype/bank_clearance/bank_clearance.py:95
 msgid "Row #{0}: Payment document is required to complete the transaction"
 msgstr "Ligne n ° {0}: Un document de paiement est requis pour effectuer la transaction."
 
-#: manufacturing/doctype/production_plan/production_plan.py:892
+#: manufacturing/doctype/production_plan/production_plan.py:901
 msgid "Row #{0}: Please select Item Code in Assembly Items"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:895
+#: manufacturing/doctype/production_plan/production_plan.py:904
 msgid "Row #{0}: Please select the BOM No in Assembly Items"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:889
-msgid "Row #{0}: Please select the FG Warehouse in Assembly Items"
+#: manufacturing/doctype/production_plan/production_plan.py:898
+msgid "Row #{0}: Please select the Sub Assembly Warehouse"
 msgstr ""
 
 #: stock/doctype/item/item.py:487
 msgid "Row #{0}: Please set reorder quantity"
 msgstr "Ligne #{0} : Veuillez définir la quantité de réapprovisionnement"
 
-#: controllers/accounts_controller.py:367
+#: controllers/accounts_controller.py:411
 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:487
+#: public/js/utils/barcode_scanner.js:392
 msgid "Row #{0}: Qty increased by {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:264
-#: assets/doctype/asset_capitalization/asset_capitalization.py:306
+#: assets/doctype/asset_capitalization/asset_capitalization.py:270
+#: assets/doctype/asset_capitalization/asset_capitalization.py:312
 msgid "Row #{0}: Qty must be a positive number"
 msgstr ""
 
@@ -60464,12 +61497,12 @@
 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:1018
-#: controllers/accounts_controller.py:3166
+#: controllers/accounts_controller.py:1082
+#: controllers/accounts_controller.py:3257
 msgid "Row #{0}: Quantity for Item {1} cannot be zero."
 msgstr "Ligne n° {0}: La quantité de l'article {1} ne peut être nulle"
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1017
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1019
 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
 msgstr ""
 
@@ -60481,11 +61514,11 @@
 msgid "Row #{0}: Received Qty must be equal to Accepted + Rejected Qty for Item {1}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1016
+#: accounts/doctype/payment_entry/payment_entry.js:1234
 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry"
 msgstr "Ligne #{0} : Type de Document de Référence doit être une Commande d'Achat, une Facture d'Achat ou une Écriture de Journal"
 
-#: accounts/doctype/payment_entry/payment_entry.js:1008
+#: accounts/doctype/payment_entry/payment_entry.js:1220
 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning"
 msgstr "Ligne n ° {0}: le type de document de référence doit être l'un des suivants: Commande client, facture client, écriture de journal ou relance"
 
@@ -60493,7 +61526,7 @@
 msgid "Row #{0}: Rejected Qty can not be entered in Purchase Return"
 msgstr "Ligne #{0} : Qté Rejetée ne peut pas être entrée dans le Retour d’Achat"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:387
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:388
 msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}."
 msgstr ""
 
@@ -60501,22 +61534,22 @@
 msgid "Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}"
 msgstr ""
 
-#: controllers/buying_controller.py:849
+#: controllers/buying_controller.py:875
 msgid "Row #{0}: Reqd by Date cannot be before Transaction Date"
 msgstr "La ligne # {0}: Reqd par date ne peut pas être antérieure à la date de la transaction"
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:382
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:383
 msgid "Row #{0}: Scrap Item Qty cannot be zero"
 msgstr ""
 
-#: controllers/selling_controller.py:212
+#: controllers/selling_controller.py:213
 msgid "Row #{0}: Selling rate for item {1} is lower than its {2}.\n"
 "\t\t\t\t\tSelling {3} should be atleast {4}.<br><br>Alternatively,\n"
 "\t\t\t\t\tyou can disable selling price validation in {5} to bypass\n"
 "\t\t\t\t\tthis validation."
 msgstr ""
 
-#: controllers/stock_controller.py:97
+#: controllers/stock_controller.py:129
 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
 msgstr "Ligne # {0}: le numéro de série {1} n'appartient pas au lot {2}"
 
@@ -60528,27 +61561,35 @@
 msgid "Row #{0}: Serial No {1} is already selected."
 msgstr ""
 
-#: controllers/accounts_controller.py:395
+#: controllers/accounts_controller.py:439
 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date"
 msgstr "Ligne # {0}: la date de fin du service ne peut pas être antérieure à la date de validation de la facture"
 
-#: controllers/accounts_controller.py:391
+#: controllers/accounts_controller.py:435
 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date"
 msgstr "Ligne # {0}: la date de début du service ne peut pas être supérieure à la date de fin du service"
 
-#: controllers/accounts_controller.py:387
+#: controllers/accounts_controller.py:431
 msgid "Row #{0}: Service Start and End Date is required for deferred accounting"
 msgstr "Ligne # {0}: la date de début et de fin du service est requise pour la comptabilité différée"
 
-#: selling/doctype/sales_order/sales_order.py:391
+#: selling/doctype/sales_order/sales_order.py:394
 msgid "Row #{0}: Set Supplier for item {1}"
 msgstr "Ligne #{0} : Définir Fournisseur pour l’article {1}"
 
+#: manufacturing/doctype/workstation/workstation.py:80
+msgid "Row #{0}: Start Time and End Time are required"
+msgstr ""
+
+#: manufacturing/doctype/workstation/workstation.py:83
+msgid "Row #{0}: Start Time must be before End Time"
+msgstr ""
+
 #: stock/doctype/quality_inspection/quality_inspection.py:120
 msgid "Row #{0}: Status is mandatory"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:381
+#: accounts/doctype/journal_entry/journal_entry.py:397
 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
 msgstr "Ligne n ° {0}: l'état doit être {1} pour l'actualisation de facture {2}."
 
@@ -60556,19 +61597,19 @@
 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:962
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:964
 msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:975
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:977
 msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:989
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:991
 msgid "Row #{0}: Stock is already reserved for the Item {1}."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:605
+#: stock/doctype/delivery_note/delivery_note.py:666
 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
 msgstr ""
 
@@ -60576,19 +61617,19 @@
 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:1003
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1005
 msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
 msgstr ""
 
-#: controllers/stock_controller.py:110
+#: controllers/stock_controller.py:142
 msgid "Row #{0}: The batch {1} has already expired."
 msgstr "Ligne n ° {0}: le lot {1} a déjà expiré."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1687
-msgid "Row #{0}: The following Serial Nos are not present in Delivery Note {1}:"
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:150
+msgid "Row #{0}: The following serial numbers are not present in Delivery Note {1}:"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.py:116
+#: manufacturing/doctype/workstation/workstation.py:137
 msgid "Row #{0}: Timings conflicts with row {1}"
 msgstr "Ligne #{0}: Minutage en conflit avec la ligne {1}"
 
@@ -60596,15 +61637,11 @@
 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:1402
+#: accounts/doctype/sales_invoice/sales_invoice.py:1413
 msgid "Row #{0}: You must select an Asset for Item {1}."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1696
-msgid "Row #{0}: {1} Serial numbers required for Item {2}. You have provided {3}."
-msgstr ""
-
-#: controllers/buying_controller.py:483 public/js/controllers/buying.js:208
+#: controllers/buying_controller.py:483 public/js/controllers/buying.js:203
 msgid "Row #{0}: {1} can not be negative for item {2}"
 msgstr "Ligne #{0} : {1} ne peut pas être négatif pour l’article {2}"
 
@@ -60620,6 +61657,10 @@
 msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account."
 msgstr ""
 
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:161
+msgid "Row #{0}: {1} serial numbers are required for Item {2}. You have provided {3} serial numbers."
+msgstr ""
+
 #: buying/utils.py:106
 msgid "Row #{1}: Warehouse is mandatory for stock Item {0}"
 msgstr ""
@@ -60628,11 +61669,11 @@
 msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
 msgstr "Ligne n ° {}: la devise de {} - {} ne correspond pas à la devise de l'entreprise."
 
-#: assets/doctype/asset/asset.py:275
+#: assets/doctype/asset/asset.py:277
 msgid "Row #{}: Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr "Ligne n ° {}: la date comptable de l'amortissement ne doit pas être égale à la date de disponibilité."
 
-#: assets/doctype/asset/asset.py:308
+#: assets/doctype/asset/asset.py:310
 msgid "Row #{}: Finance Book should not be empty since you're using multiple."
 msgstr ""
 
@@ -60660,7 +61701,7 @@
 msgid "Row #{}: Please assign task to a member."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:300
+#: assets/doctype/asset/asset.py:302
 msgid "Row #{}: Please use a different Finance Book."
 msgstr ""
 
@@ -60676,7 +61717,7 @@
 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:83
+#: stock/doctype/pick_list/pick_list.py:87
 msgid "Row #{}: item {} has been picked already."
 msgstr ""
 
@@ -60688,39 +61729,47 @@
 msgid "Row #{}: {} {} does not exist."
 msgstr "Ligne n ° {}: {} {} n'existe pas."
 
-#: stock/doctype/item/item.py:1364
+#: stock/doctype/item/item.py:1365
 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:433
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:437
 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:599
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Row Number"
+msgstr ""
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:376
+msgid "Row {0}"
+msgstr ""
+
+#: manufacturing/doctype/job_card/job_card.py:606
 msgid "Row {0} : Operation is required against the raw material item {1}"
 msgstr "Ligne {0}: l'opération est requise pour l'article de matière première {1}"
 
-#: stock/doctype/pick_list/pick_list.py:113
+#: stock/doctype/pick_list/pick_list.py:117
 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1135
+#: stock/doctype/stock_entry/stock_entry.py:1144
 msgid "Row {0}# Item {1} cannot be transferred more than {2} against {3} {4}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1159
+#: stock/doctype/stock_entry/stock_entry.py:1168
 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:190
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:191
 msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:509
+#: accounts/doctype/journal_entry/journal_entry.py:525
 msgid "Row {0}: Account {1} and Party Type {2} have different account types"
 msgstr ""
 
-#: controllers/accounts_controller.py:2536
+#: controllers/accounts_controller.py:2621
 msgid "Row {0}: Account {1} is a Group Account"
 msgstr ""
 
@@ -60728,43 +61777,47 @@
 msgid "Row {0}: Activity Type is mandatory."
 msgstr "Ligne {0} : Le Type d'Activité est obligatoire."
 
-#: accounts/doctype/journal_entry/journal_entry.py:561
+#: accounts/doctype/journal_entry/journal_entry.py:577
 msgid "Row {0}: Advance against Customer must be credit"
 msgstr "Ligne {0} : L’Avance du Client doit être un crédit"
 
-#: accounts/doctype/journal_entry/journal_entry.py:563
+#: accounts/doctype/journal_entry/journal_entry.py:579
 msgid "Row {0}: Advance against Supplier must be debit"
 msgstr "Ligne {0} : L’Avance du Fournisseur doit être un débit"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:671
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:681
 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:663
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:673
 msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:763
+#: stock/doctype/stock_entry/stock_entry.py:884
+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
 msgid "Row {0}: Bill of Materials not found for the Item {1}"
 msgstr "Ligne {0} : Nomenclature non trouvée pour l’Article {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:796
+#: accounts/doctype/journal_entry/journal_entry.py:823
 msgid "Row {0}: Both Debit and Credit values cannot be zero"
 msgstr ""
 
-#: controllers/buying_controller.py:438 controllers/selling_controller.py:204
+#: controllers/buying_controller.py:438 controllers/selling_controller.py:205
 msgid "Row {0}: Conversion Factor is mandatory"
 msgstr "Ligne {0} : Le Facteur de Conversion est obligatoire"
 
-#: controllers/accounts_controller.py:2549
+#: controllers/accounts_controller.py:2634
 msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:116
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:137
 msgid "Row {0}: Cost center is required for an item {1}"
 msgstr "Ligne {0}: le Centre de Coûts est requis pour un article {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:647
+#: accounts/doctype/journal_entry/journal_entry.py:674
 msgid "Row {0}: Credit entry can not be linked with a {1}"
 msgstr "Ligne {0} : L’Écriture de crédit ne peut pas être liée à un {1}"
 
@@ -60772,19 +61825,19 @@
 msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
 msgstr "Ligne {0} : La devise de la nomenclature #{1} doit être égale à la devise sélectionnée {2}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:642
+#: accounts/doctype/journal_entry/journal_entry.py:669
 msgid "Row {0}: Debit entry can not be linked with a {1}"
 msgstr "Ligne {0} : L’Écriture de Débit ne peut pas être lié à un {1}"
 
-#: controllers/selling_controller.py:679
+#: controllers/selling_controller.py:703
 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
 msgstr "Ligne {0}: l'entrepôt de livraison ({1}) et l'entrepôt client ({2}) ne peuvent pas être identiques"
 
-#: assets/doctype/asset/asset.py:417
+#: assets/doctype/asset/asset.py:419
 msgid "Row {0}: Depreciation Start Date is required"
 msgstr "Ligne {0}: la date de début de l'amortissement est obligatoire"
 
-#: controllers/accounts_controller.py:2209
+#: controllers/accounts_controller.py:2301
 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
 msgstr "Ligne {0}: la date d'échéance dans le tableau des conditions de paiement ne peut pas être antérieure à la date comptable"
 
@@ -60792,28 +61845,28 @@
 msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
 msgstr ""
 
-#: controllers/buying_controller.py:742
+#: controllers/buying_controller.py:767
 msgid "Row {0}: Enter location for the asset item {1}"
 msgstr "Ligne {0}: entrez la localisation de l'actif {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:886
-#: controllers/taxes_and_totals.py:1115
+#: accounts/doctype/journal_entry/journal_entry.py:913
+#: controllers/taxes_and_totals.py:1116
 msgid "Row {0}: Exchange Rate is mandatory"
 msgstr "Ligne {0} : Le Taux de Change est obligatoire"
 
-#: assets/doctype/asset/asset.py:408
+#: assets/doctype/asset/asset.py:410
 msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
 msgstr "Ligne {0}: la valeur attendue après la durée de vie utile doit être inférieure au montant brut de l'achat"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:523
 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:482
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:486
 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 ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:505
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:509
 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
 msgstr ""
 
@@ -60830,7 +61883,7 @@
 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
 msgstr "Ligne {0} : Heure de Début et Heure de Fin de {1} sont en conflit avec {2}"
 
-#: controllers/stock_controller.py:730
+#: controllers/stock_controller.py:913
 msgid "Row {0}: From Warehouse is mandatory for internal transfers"
 msgstr ""
 
@@ -60842,15 +61895,15 @@
 msgid "Row {0}: Hours value must be greater than zero."
 msgstr "Ligne {0} : La valeur des heures doit être supérieure à zéro."
 
-#: accounts/doctype/journal_entry/journal_entry.py:665
+#: accounts/doctype/journal_entry/journal_entry.py:692
 msgid "Row {0}: Invalid reference {1}"
 msgstr "Ligne {0} : Référence {1} non valide"
 
-#: controllers/taxes_and_totals.py:128
+#: controllers/taxes_and_totals.py:129
 msgid "Row {0}: Item Tax template updated as per validity and rate applied"
 msgstr ""
 
-#: controllers/buying_controller.py:400 controllers/selling_controller.py:479
+#: controllers/buying_controller.py:400 controllers/selling_controller.py:484
 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer"
 msgstr ""
 
@@ -60862,7 +61915,7 @@
 msgid "Row {0}: Item {1} must be a subcontracted item."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:661
+#: stock/doctype/delivery_note/delivery_note.py:722
 msgid "Row {0}: Packed Qty must be equal to {1} Qty."
 msgstr ""
 
@@ -60870,11 +61923,11 @@
 msgid "Row {0}: Packing Slip is already created for Item {1}."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:687
+#: accounts/doctype/journal_entry/journal_entry.py:714
 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
 msgstr "Ligne {0} : Tiers / Compte ne correspond pas à {1} / {2} en {3} {4}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:500
+#: accounts/doctype/journal_entry/journal_entry.py:516
 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}"
 msgstr "Ligne {0} : Le Type de Tiers et le Tiers sont requis pour le compte Débiteur / Créditeur {1}"
 
@@ -60882,11 +61935,11 @@
 msgid "Row {0}: Payment Term is mandatory"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:554
+#: accounts/doctype/journal_entry/journal_entry.py:570
 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
 msgstr "Ligne {0} : Paiements contre Commandes Client / Fournisseur doivent toujours être marqués comme des avances"
 
-#: accounts/doctype/journal_entry/journal_entry.py:547
+#: accounts/doctype/journal_entry/journal_entry.py:563
 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
 msgstr "Ligne {0} : Veuillez vérifier 'Est Avance' sur le compte {1} si c'est une avance."
 
@@ -60922,7 +61975,7 @@
 msgid "Row {0}: Project must be same as the one set in the Timesheet: {1}."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:114
 msgid "Row {0}: Purchase Invoice {1} has no stock impact."
 msgstr ""
 
@@ -60930,7 +61983,7 @@
 msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Row {0}: Qty in Stock UOM can not be zero."
 msgstr ""
 
@@ -60938,7 +61991,7 @@
 msgid "Row {0}: Qty must be greater than 0."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:762
+#: stock/doctype/stock_entry/stock_entry.py:717
 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})"
 msgstr "Ligne {0}: quantité non disponible pour {4} dans l'entrepôt {1} au moment de la comptabilisation de l'entrée ({2} {3})."
 
@@ -60946,15 +61999,15 @@
 msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1170
+#: stock/doctype/stock_entry/stock_entry.py:1179
 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
 msgstr "Ligne {0}: l'article sous-traité est obligatoire pour la matière première {1}"
 
-#: controllers/stock_controller.py:721
+#: controllers/stock_controller.py:904
 msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:450
+#: stock/doctype/stock_entry/stock_entry.py:405
 msgid "Row {0}: The item {1}, quantity must be positive number"
 msgstr "Ligne {0}: l'article {1}, la quantité doit être un nombre positif"
 
@@ -60962,15 +62015,15 @@
 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:441
+#: assets/doctype/asset/asset.py:443
 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:401
+#: stock/doctype/stock_entry/stock_entry.py:356
 msgid "Row {0}: UOM Conversion Factor is mandatory"
 msgstr "Ligne {0} : Facteur de Conversion nomenclature est obligatoire"
 
-#: controllers/accounts_controller.py:786
+#: controllers/accounts_controller.py:838
 msgid "Row {0}: user has not applied the rule {1} on the item {2}"
 msgstr "Ligne {0}: l'utilisateur n'a pas appliqué la règle {1} sur l'élément {2}"
 
@@ -60982,15 +62035,19 @@
 msgid "Row {0}: {1} must be greater than 0"
 msgstr "Ligne {0}: {1} doit être supérieure à 0"
 
-#: controllers/accounts_controller.py:511
+#: controllers/accounts_controller.py:555
 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:701
+#: accounts/doctype/journal_entry/journal_entry.py:728
 msgid "Row {0}: {1} {2} does not match with {3}"
 msgstr "Ligne {0} : {1} {2} ne correspond pas à {3}"
 
-#: controllers/accounts_controller.py:2528
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:87
+msgid "Row {0}: {2} Item {1} does not exist in {2} {3}"
+msgstr ""
+
+#: controllers/accounts_controller.py:2613
 msgid "Row {0}: {3} Account {1} does not belong to Company {2}"
 msgstr ""
 
@@ -60998,7 +62055,7 @@
 msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}."
 msgstr "Ligne {1}: la quantité ({0}) ne peut pas être une fraction. Pour autoriser cela, désactivez «{2}» dans UdM {3}."
 
-#: controllers/buying_controller.py:726
+#: controllers/buying_controller.py:751
 msgid "Row {}: Asset Naming Series is mandatory for the auto creation for item {}"
 msgstr "Ligne {}: Le masque de numérotation d'éléments est obligatoire pour la création automatique de l'élément {}"
 
@@ -61010,11 +62067,11 @@
 msgid "Row({0}): {1} is already discounted in {2}"
 msgstr "Ligne ({0}): {1} est déjà réduit dans {2}."
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:193
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:200
 msgid "Rows Added in {0}"
 msgstr "Lignes ajoutées dans {0}"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:194
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:201
 msgid "Rows Removed in {0}"
 msgstr "Lignes supprimées dans {0}"
 
@@ -61025,15 +62082,15 @@
 msgid "Rows with Same Account heads will be merged on Ledger"
 msgstr "Les lignes associées aux mêmes codes comptables seront fusionnées dans le grand livre"
 
-#: controllers/accounts_controller.py:2218
+#: controllers/accounts_controller.py:2310
 msgid "Rows with duplicate due dates in other rows were found: {0}"
 msgstr "Des lignes avec des dates d'échéance en double dans les autres lignes ont été trouvées: {0}"
 
-#: accounts/doctype/journal_entry/journal_entry.js:61
+#: accounts/doctype/journal_entry/journal_entry.js:115
 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually."
 msgstr ""
 
-#: controllers/accounts_controller.py:211
+#: controllers/accounts_controller.py:221
 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry."
 msgstr ""
 
@@ -61061,6 +62118,12 @@
 msgid "Rule Description"
 msgstr "Description de la règle"
 
+#. Description of the 'Job Capacity' (Int) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Run parallel job cards in a workstation"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Process Payment
 #. Reconciliation'
 #: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
@@ -61075,6 +62138,13 @@
 msgid "Running"
 msgstr ""
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Running"
+msgstr ""
+
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:28
 msgid "S.O. No."
 msgstr "S.O. N°."
@@ -61139,7 +62209,7 @@
 msgid "SLA Paused On"
 msgstr ""
 
-#: public/js/utils.js:1015
+#: public/js/utils.js:1098
 msgid "SLA is on hold since {0}"
 msgstr "SLA est en attente depuis le {0}"
 
@@ -61178,6 +62248,10 @@
 msgid "SO Qty"
 msgstr "SO Qté"
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:107
+msgid "SO Total Qty"
+msgstr ""
+
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:16
 msgid "STATEMENTS OF ACCOUNTS"
 msgstr ""
@@ -61272,7 +62346,7 @@
 #: 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:329 setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:328 setup/doctype/company/company.py:491
 #: setup/doctype/company/company_dashboard.py:9
 #: setup/doctype/sales_person/sales_person_dashboard.py:12
 #: setup/setup_wizard/operations/install_fixtures.py:250
@@ -61310,7 +62384,7 @@
 msgid "Sales"
 msgstr "Ventes"
 
-#: setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:491
 msgid "Sales Account"
 msgstr "Compte de vente"
 
@@ -61344,7 +62418,7 @@
 #. Label of a Link in the CRM Workspace
 #. Label of a Link in the Selling Workspace
 #: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:7
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: selling/page/sales_funnel/sales_funnel.js:46
 #: selling/workspace/selling/selling.json
 msgid "Sales Funnel"
 msgstr "Entonnoir de vente"
@@ -61355,11 +62429,11 @@
 #: accounts/report/gross_profit/gross_profit.js:30
 #: accounts/report/gross_profit/gross_profit.py:199
 #: accounts/report/gross_profit/gross_profit.py:206
-#: selling/doctype/quotation/quotation_list.js:20
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order_list.js:53
-#: stock/doctype/delivery_note/delivery_note.js:222
-#: stock/doctype/delivery_note/delivery_note_list.js:61
+#: selling/doctype/quotation/quotation_list.js:19
+#: selling/doctype/sales_order/sales_order.js:633
+#: selling/doctype/sales_order/sales_order_list.js:66
+#: stock/doctype/delivery_note/delivery_note.js:266
+#: stock/doctype/delivery_note/delivery_note_list.js:70
 msgid "Sales Invoice"
 msgstr "Facture de vente"
 
@@ -61509,11 +62583,11 @@
 msgid "Sales Invoice Trends"
 msgstr "Tendances des Factures de Vente"
 
-#: stock/doctype/delivery_note/delivery_note.py:679
+#: stock/doctype/delivery_note/delivery_note.py:740
 msgid "Sales Invoice {0} has already been submitted"
 msgstr "La Facture Vente {0} a déjà été transmise"
 
-#: selling/doctype/sales_order/sales_order.py:472
+#: selling/doctype/sales_order/sales_order.py:475
 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order"
 msgstr ""
 
@@ -61547,6 +62621,7 @@
 #: setup/doctype/sales_person/sales_person.json
 #: setup/doctype/territory/territory.json stock/doctype/bin/bin.json
 #: stock/doctype/packing_slip/packing_slip.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 msgid "Sales Manager"
 msgstr "Responsable des Ventes"
 
@@ -61576,36 +62651,36 @@
 msgid "Sales Monthly History"
 msgstr "Historique des Ventes Mensuel"
 
-#: selling/page/sales_funnel/sales_funnel.js:129
+#: selling/page/sales_funnel/sales_funnel.js:144
 msgid "Sales Opportunities by Source"
 msgstr ""
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: accounts/doctype/sales_invoice/sales_invoice.js:236
+#: 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:421
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:64
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:113
-#: manufacturing/doctype/blanket_order/blanket_order.js:23
+#: controllers/selling_controller.py:422
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:65
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:122
+#: manufacturing/doctype/blanket_order/blanket_order.js:24
 #: manufacturing/doctype/work_order/work_order_calendar.js:32
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:127
 #: manufacturing/report/work_order_summary/work_order_summary.py:217
-#: selling/doctype/quotation/quotation.js:117
+#: selling/doctype/quotation/quotation.js:125
 #: selling/doctype/quotation/quotation_dashboard.py:11
-#: selling/doctype/quotation/quotation_list.js:16
+#: selling/doctype/quotation/quotation_list.js:15
 #: selling/doctype/sales_order/sales_order.json
 #: selling/onboarding_step/sales_order/sales_order.json
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:59
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13
-#: selling/report/sales_order_analysis/sales_order_analysis.js:34
+#: selling/report/sales_order_analysis/sales_order_analysis.js:33
 #: selling/report/sales_order_analysis/sales_order_analysis.py:222
-#: stock/doctype/delivery_note/delivery_note.js:134
-#: stock/doctype/material_request/material_request.js:161
-#: stock/report/delayed_item_report/delayed_item_report.js:31
+#: stock/doctype/delivery_note/delivery_note.js:146
+#: stock/doctype/material_request/material_request.js:190
+#: stock/report/delayed_item_report/delayed_item_report.js:30
 #: stock/report/delayed_item_report/delayed_item_report.py:155
-#: stock/report/delayed_order_report/delayed_order_report.js:31
+#: stock/report/delayed_order_report/delayed_order_report.js:30
 #: stock/report/delayed_order_report/delayed_order_report.py:74
 msgid "Sales Order"
 msgstr "Commande client"
@@ -61756,8 +62831,8 @@
 msgstr "Date de la Commande Client"
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:260
-#: selling/doctype/sales_order/sales_order.js:704
+#: selling/doctype/sales_order/sales_order.js:286
+#: selling/doctype/sales_order/sales_order.js:809
 #: selling/doctype/sales_order_item/sales_order_item.json
 msgid "Sales Order Item"
 msgstr "Article de la Commande Client"
@@ -61846,11 +62921,11 @@
 msgid "Sales Order required for Item {0}"
 msgstr "Commande Client requise pour l'Article {0}"
 
-#: selling/doctype/sales_order/sales_order.py:258
+#: selling/doctype/sales_order/sales_order.py:261
 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:1142
+#: accounts/doctype/sales_invoice/sales_invoice.py:1149
 msgid "Sales Order {0} is not submitted"
 msgstr "Commande Client {0} n'a pas été transmise"
 
@@ -61858,12 +62933,12 @@
 msgid "Sales Order {0} is not valid"
 msgstr "Commande Client {0} invalide"
 
-#: controllers/selling_controller.py:402
+#: controllers/selling_controller.py:403
 #: manufacturing/doctype/work_order/work_order.py:223
 msgid "Sales Order {0} is {1}"
 msgstr "Commande Client {0} est {1}"
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:42
 msgid "Sales Orders"
 msgstr "Commandes Clients"
 
@@ -61891,14 +62966,14 @@
 msgstr "Commandes de vente à livrer"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:133
-#: accounts/report/accounts_receivable/accounts_receivable.py:1106
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:117
+#: accounts/report/accounts_receivable/accounts_receivable.js:136
+#: accounts/report/accounts_receivable/accounts_receivable.py:1114
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:197
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:74
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:10
+#: 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
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:9
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:8
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:71
 #: setup/doctype/sales_partner/sales_partner.json
 msgid "Sales Partner"
@@ -62041,17 +63116,18 @@
 
 #. Name of a DocType
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:155
-#: accounts/report/accounts_receivable/accounts_receivable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.py:1103
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:123
+#: 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_summary/accounts_receivable_summary.js:126
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:194
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
-#: accounts/report/gross_profit/gross_profit.js:49
+#: 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
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:10
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:115
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:116
 #: setup/doctype/sales_person/sales_person.json
 msgid "Sales Person"
 msgstr "Vendeur"
@@ -62127,7 +63203,7 @@
 msgstr "Résumé des Transactions par Commerciaux"
 
 #. Label of a Card Break in the CRM Workspace
-#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:42
+#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:47
 msgid "Sales Pipeline"
 msgstr "Pipeline de Ventes"
 
@@ -62138,7 +63214,7 @@
 msgid "Sales Pipeline Analytics"
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:131
+#: selling/page/sales_funnel/sales_funnel.js:146
 msgid "Sales Pipeline by Stage"
 msgstr ""
 
@@ -62154,14 +63230,14 @@
 msgstr "Registre des Ventes"
 
 #: accounts/report/gross_profit/gross_profit.py:777
-#: stock/doctype/delivery_note/delivery_note.js:175
+#: stock/doctype/delivery_note/delivery_note.js:200
 msgid "Sales Return"
 msgstr "Retour de Ventes"
 
 #. Name of a DocType
 #: crm/doctype/sales_stage/sales_stage.json
 #: crm/report/lost_opportunity/lost_opportunity.py:51
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:59
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:61
 msgid "Sales Stage"
 msgstr "Stade de vente"
 
@@ -62181,7 +63257,7 @@
 msgid "Sales Summary"
 msgstr "Récapitulatif des ventes"
 
-#: setup/doctype/company/company.js:98
+#: setup/doctype/company/company.js:106
 msgid "Sales Tax Template"
 msgstr "Modèle de la Taxe de Vente"
 
@@ -62368,6 +63444,7 @@
 #: stock/doctype/delivery_note/delivery_note.json stock/doctype/item/item.json
 #: stock/doctype/packing_slip/packing_slip.json
 #: stock/doctype/price_list/price_list.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
@@ -62427,7 +63504,7 @@
 msgid "Same Item"
 msgstr "Même article"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:350
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:404
 msgid "Same item and warehouse combination already entered."
 msgstr ""
 
@@ -62458,7 +63535,7 @@
 msgstr "Entrepôt de stockage des échantillons"
 
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: public/js/controllers/transaction.js:2131
+#: public/js/controllers/transaction.js:2174
 msgid "Sample Size"
 msgstr "Taille de l'Échantillon"
 
@@ -62468,11 +63545,11 @@
 msgid "Sample Size"
 msgstr "Taille de l'Échantillon"
 
-#: stock/doctype/stock_entry/stock_entry.py:2824
+#: stock/doctype/stock_entry/stock_entry.py:2860
 msgid "Sample quantity {0} cannot be more than received quantity {1}"
 msgstr "La quantité d'échantillon {0} ne peut pas dépasser la quantité reçue {1}"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:7
 msgid "Sanctioned"
 msgstr "Sanctionné"
 
@@ -62541,16 +63618,16 @@
 msgid "Saturday"
 msgstr "Samedi"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:139
-#: accounts/doctype/journal_entry/journal_entry.js:550
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:118
+#: accounts/doctype/journal_entry/journal_entry.js:619
 #: accounts/doctype/ledger_merge/ledger_merge.js:75
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:252
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:288
-#: public/js/call_popup/call_popup.js:157
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:289
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:325
+#: public/js/call_popup/call_popup.js:169
 msgid "Save"
 msgstr "Sauvegarder"
 
-#: selling/page/point_of_sale/pos_controller.js:176
+#: selling/page/point_of_sale/pos_controller.js:198
 msgid "Save as Draft"
 msgstr "Enregistrer comme brouillon"
 
@@ -62563,7 +63640,7 @@
 msgid "Savings"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:206
+#: public/js/utils/barcode_scanner.js:215
 msgid "Scan Barcode"
 msgstr "Scan Code Barre"
 
@@ -62639,7 +63716,7 @@
 msgid "Scan Barcode"
 msgstr "Scan Code Barre"
 
-#: public/js/utils/serial_no_batch_selector.js:151
+#: public/js/utils/serial_no_batch_selector.js:154
 msgid "Scan Batch No"
 msgstr ""
 
@@ -62655,11 +63732,11 @@
 msgid "Scan Mode"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:136
+#: public/js/utils/serial_no_batch_selector.js:139
 msgid "Scan Serial No"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:172
+#: public/js/utils/barcode_scanner.js:179
 msgid "Scan barcode for item {0}"
 msgstr ""
 
@@ -62673,7 +63750,7 @@
 msgid "Scanned Cheque"
 msgstr "Chèque Numérisé"
 
-#: public/js/utils/barcode_scanner.js:238
+#: public/js/utils/barcode_scanner.js:247
 msgid "Scanned Quantity"
 msgstr ""
 
@@ -62683,7 +63760,7 @@
 msgid "Schedule"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:240
+#: assets/doctype/asset/asset.js:275
 msgid "Schedule Date"
 msgstr "Date du Calendrier"
 
@@ -62718,7 +63795,7 @@
 msgid "Scheduled"
 msgstr "Prévu"
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:111
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:118
 msgid "Scheduled Date"
 msgstr "Date Prévue"
 
@@ -62746,7 +63823,7 @@
 msgid "Scheduled Time Logs"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: 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
@@ -62765,7 +63842,7 @@
 msgid "Scheduler is inactive. Cannot enqueue job."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:232
 msgid "Scheduler is inactive. Cannot import data."
 msgstr "Le planificateur est inactif. Impossible d&#39;importer des données."
@@ -62847,7 +63924,7 @@
 msgid "Scrap & Process Loss"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:87
+#: assets/doctype/asset/asset.js:92
 msgid "Scrap Asset"
 msgstr ""
 
@@ -62901,7 +63978,7 @@
 msgid "Scrap Warehouse"
 msgstr "Entrepôt de Rebut"
 
-#: assets/doctype/asset/asset_list.js:17
+#: assets/doctype/asset/asset_list.js:13
 msgid "Scrapped"
 msgstr "Mis au rebut"
 
@@ -62911,7 +63988,7 @@
 msgid "Scrapped"
 msgstr "Mis au rebut"
 
-#: selling/page/point_of_sale/pos_item_selector.js:150
+#: selling/page/point_of_sale/pos_item_selector.js:147
 #: selling/page/point_of_sale/pos_past_order_list.js:51
 #: templates/pages/help.html:14
 msgid "Search"
@@ -62934,7 +64011,7 @@
 msgid "Search Term Param Name"
 msgstr "Nom du paramètre de recherche"
 
-#: selling/page/point_of_sale/pos_item_cart.js:312
+#: selling/page/point_of_sale/pos_item_cart.js:310
 msgid "Search by customer name, phone, email."
 msgstr "Recherche par nom de client, téléphone, e-mail."
 
@@ -62942,7 +64019,7 @@
 msgid "Search by invoice id or customer name"
 msgstr "Recherche par numéro de facture ou nom de client"
 
-#: selling/page/point_of_sale/pos_item_selector.js:152
+#: selling/page/point_of_sale/pos_item_selector.js:149
 msgid "Search by item code, serial number or barcode"
 msgstr ""
 
@@ -62964,7 +64041,7 @@
 msgid "Secondary Role"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:172
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:117
 msgid "Section Code"
 msgstr "Code de section"
@@ -62987,8 +64064,13 @@
 msgid "See all open tickets"
 msgstr "Voir tous les tickets ouverts"
 
-#: buying/doctype/purchase_order/purchase_order.js:180
-#: selling/doctype/sales_order/sales_order.js:888
+#: stock/report/stock_ledger/stock_ledger.js:104
+msgid "Segregate Serial / Batch Bundle"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:186
+#: selling/doctype/sales_order/sales_order.js:1043
+#: selling/doctype/sales_order/sales_order_list.js:85
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -62996,33 +64078,33 @@
 msgid "Select Accounting Dimension."
 msgstr ""
 
-#: public/js/utils.js:440
+#: public/js/utils.js:487
 msgid "Select Alternate Item"
 msgstr "Sélectionnez un autre élément"
 
-#: selling/doctype/quotation/quotation.js:312
+#: selling/doctype/quotation/quotation.js:324
 msgid "Select Alternative Items for Sales Order"
 msgstr ""
 
-#: stock/doctype/item/item.js:518
+#: stock/doctype/item/item.js:585
 msgid "Select Attribute Values"
 msgstr "Sélectionner les valeurs d'attribut"
 
-#: selling/doctype/sales_order/sales_order.js:689
+#: selling/doctype/sales_order/sales_order.js:792
 msgid "Select BOM"
 msgstr "Sélectionner une nomenclature"
 
-#: selling/doctype/sales_order/sales_order.js:678
+#: selling/doctype/sales_order/sales_order.js:779
 msgid "Select BOM and Qty for Production"
 msgstr "Sélectionner la nomenclature et la Qté pour la Production"
 
-#: selling/doctype/sales_order/sales_order.js:803
+#: selling/doctype/sales_order/sales_order.js:921
 msgid "Select BOM, Qty and For Warehouse"
 msgstr "Sélectionner une nomenclature, une quantité et un entrepôt"
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: selling/page/point_of_sale/pos_item_details.js:212
+#: stock/doctype/pick_list/pick_list.js:352
 msgid "Select Batch No"
 msgstr ""
 
@@ -63038,15 +64120,15 @@
 msgid "Select Billing Address"
 msgstr "Selectionner l'adresse de facturation"
 
-#: public/js/stock_analytics.js:42
+#: public/js/stock_analytics.js:61
 msgid "Select Brand..."
 msgstr "Sélectionner une Marque ..."
 
-#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/journal_entry/journal_entry.js:123
 msgid "Select Company"
 msgstr "Sélectionnez une entreprise"
 
-#: manufacturing/doctype/job_card/job_card.js:173
+#: manufacturing/doctype/job_card/job_card.js:193
 msgid "Select Corrective Operation"
 msgstr ""
 
@@ -63056,24 +64138,24 @@
 msgid "Select Customers By"
 msgstr "Sélectionner les clients par"
 
-#: setup/doctype/employee/employee.js:112
+#: setup/doctype/employee/employee.js:115
 msgid "Select Date of Birth. This will validate Employees age and prevent hiring of under-age staff."
 msgstr ""
 
-#: setup/doctype/employee/employee.js:117
+#: setup/doctype/employee/employee.js:122
 msgid "Select Date of joining. It will have impact on the first salary calculation, Leave allocation on pro-rata bases."
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:111
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:131
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:114
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:138
 msgid "Select Default Supplier"
 msgstr "Sélectionner le Fournisseur par Défaut"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:252
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:256
 msgid "Select Difference Account"
 msgstr "Sélectionnez compte différentiel"
 
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:58
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:57
 msgid "Select Dimension"
 msgstr ""
 
@@ -63083,27 +64165,27 @@
 msgid "Select DocType"
 msgstr "Sélectionner le DocType"
 
-#: manufacturing/doctype/job_card/job_card.js:246
+#: manufacturing/doctype/job_card/job_card.js:274
 msgid "Select Employees"
 msgstr "Sélectionner les Employés"
 
-#: buying/doctype/purchase_order/purchase_order.js:170
+#: buying/doctype/purchase_order/purchase_order.js:176
 msgid "Select Finished Good"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:962
+#: selling/doctype/sales_order/sales_order.js:1122
 msgid "Select Items"
 msgstr "Sélectionner des éléments"
 
-#: selling/doctype/sales_order/sales_order.js:861
+#: selling/doctype/sales_order/sales_order.js:1008
 msgid "Select Items based on Delivery Date"
 msgstr "Sélectionnez les articles en fonction de la Date de Livraison"
 
-#: public/js/controllers/transaction.js:2159
+#: public/js/controllers/transaction.js:2202
 msgid "Select Items for Quality Inspection"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:820
 msgid "Select Items to Manufacture"
 msgstr "Sélectionner les articles à produire"
 
@@ -63113,27 +64195,31 @@
 msgid "Select Items to Manufacture"
 msgstr "Sélectionner les articles à produire"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1038
-#: selling/page/point_of_sale/pos_item_cart.js:888
+#: selling/doctype/sales_order/sales_order_list.js:76
+msgid "Select Items up to Delivery Date"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.js:1114
+#: selling/page/point_of_sale/pos_item_cart.js:920
 msgid "Select Loyalty Program"
 msgstr "Sélectionner un programme de fidélité"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: buying/doctype/request_for_quotation/request_for_quotation.js:366
 msgid "Select Possible Supplier"
 msgstr "Sélectionner le Fournisseur Possible"
 
-#: manufacturing/doctype/work_order/work_order.js:726
-#: stock/doctype/pick_list/pick_list.js:161
+#: manufacturing/doctype/work_order/work_order.js:781
+#: stock/doctype/pick_list/pick_list.js:192
 msgid "Select Quantity"
 msgstr "Sélectionner Quantité"
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: 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:328 stock/doctype/pick_list/pick_list.js:321
+#: public/js/utils/sales_common.js:364 stock/doctype/pick_list/pick_list.js:355
 msgid "Select Serial and Batch"
 msgstr ""
 
@@ -63161,40 +64247,40 @@
 msgid "Select Supplier Address"
 msgstr "Sélectionner l'Adresse du Fournisseur"
 
-#: stock/doctype/batch/batch.js:110
+#: stock/doctype/batch/batch.js:127
 msgid "Select Target Warehouse"
 msgstr "Sélectionner l'Entrepôt Cible"
 
-#: www/book_appointment/index.js:69
+#: www/book_appointment/index.js:73
 msgid "Select Time"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:14
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
+#: accounts/report/balance_sheet/balance_sheet.js:10
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:10
 msgid "Select View"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:248
+#: public/js/bank_reconciliation_tool/dialog_manager.js:251
 msgid "Select Vouchers to Match"
 msgstr ""
 
-#: public/js/stock_analytics.js:46
+#: public/js/stock_analytics.js:72
 msgid "Select Warehouse..."
 msgstr "Sélectionner l'Entrepôt ..."
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:431
 msgid "Select Warehouses to get Stock for Materials Planning"
 msgstr ""
 
-#: public/js/communication.js:67
+#: public/js/communication.js:80
 msgid "Select a Company"
 msgstr "Sélectionnez une entreprise"
 
-#: setup/doctype/employee/employee.js:107
+#: setup/doctype/employee/employee.js:110
 msgid "Select a Company this Employee belongs to."
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:160
+#: buying/doctype/supplier/supplier.js:188
 msgid "Select a Customer"
 msgstr ""
 
@@ -63202,19 +64288,19 @@
 msgid "Select a Default Priority."
 msgstr "Sélectionnez une priorité par défaut."
 
-#: selling/doctype/customer/customer.js:205
+#: selling/doctype/customer/customer.js:221
 msgid "Select a Supplier"
 msgstr "Sélectionnez un fournisseur"
 
-#: stock/doctype/material_request/material_request.js:297
+#: stock/doctype/material_request/material_request.js:365
 msgid "Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only."
 msgstr "Sélectionnez un fournisseur parmi les fournisseurs par défaut des articles ci-dessous. Lors de la sélection, une commande d'achat sera effectué contre des articles appartenant uniquement au fournisseur sélectionné."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:156
 msgid "Select a company"
 msgstr "Sélectionnez une entreprise"
 
-#: stock/doctype/item/item.js:809
+#: stock/doctype/item/item.js:889
 msgid "Select an Item Group."
 msgstr ""
 
@@ -63222,15 +64308,19 @@
 msgid "Select an account to print in account currency"
 msgstr "Sélectionnez un compte à imprimer dans la devise du compte"
 
-#: selling/doctype/quotation/quotation.js:327
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
+msgid "Select an invoice to load summary data"
+msgstr ""
+
+#: selling/doctype/quotation/quotation.js:339
 msgid "Select an item from each set to be used in the Sales Order."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
-msgid "Select change amount account"
-msgstr "Sélectionner le compte de change"
+#: stock/doctype/item/item.js:590
+msgid "Select at least one value from each of the attributes."
+msgstr ""
 
-#: public/js/utils/party.js:305
+#: public/js/utils/party.js:352
 msgid "Select company first"
 msgstr "Sélectionnez d'abord la société"
 
@@ -63241,15 +64331,15 @@
 msgid "Select company name first."
 msgstr "Sélectionner d'abord le nom de la société."
 
-#: controllers/accounts_controller.py:2394
+#: controllers/accounts_controller.py:2486
 msgid "Select finance book for the item {0} at row {1}"
 msgstr "Sélectionnez le livre de financement pour l'élément {0} à la ligne {1}."
 
-#: selling/page/point_of_sale/pos_item_selector.js:162
+#: selling/page/point_of_sale/pos_item_selector.js:159
 msgid "Select item group"
 msgstr "Sélectionnez un groupe d'articles"
 
-#: manufacturing/doctype/bom/bom.js:293
+#: manufacturing/doctype/bom/bom.js:306
 msgid "Select template item"
 msgstr "Sélectionnez l'élément de modèle"
 
@@ -63263,16 +64353,16 @@
 msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:807
+#: manufacturing/doctype/work_order/work_order.js:866
 msgid "Select the Item to be manufactured."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:725
+#: manufacturing/doctype/bom/bom.js:754
 msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:294
-#: manufacturing/doctype/production_plan/production_plan.js:305
+#: manufacturing/doctype/production_plan/production_plan.js:319
+#: manufacturing/doctype/production_plan/production_plan.js:332
 msgid "Select the Warehouse"
 msgstr ""
 
@@ -63284,15 +64374,15 @@
 msgid "Select the date and your timezone"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:740
+#: manufacturing/doctype/bom/bom.js:773
 msgid "Select the raw materials (Items) required to manufacture the Item"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:338
+#: manufacturing/doctype/bom/bom.js:353
 msgid "Select variant item code for the template item {0}"
 msgstr "Sélectionnez le code d'article de variante pour l'article de modèle {0}"
 
-#: manufacturing/doctype/production_plan/production_plan.js:525
+#: manufacturing/doctype/production_plan/production_plan.js:565
 msgid "Select whether to get items from a Sales Order or a Material Request. For now select <b>Sales Order</b>.\n"
 " A Production Plan can also be created manually where you can select the Items to manufacture."
 msgstr ""
@@ -63312,7 +64402,7 @@
 msgid "Selected POS Opening Entry should be open."
 msgstr "L'entrée d'ouverture de PDV sélectionnée doit être ouverte."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2192
+#: accounts/doctype/sales_invoice/sales_invoice.py:2161
 msgid "Selected Price List should have buying and selling fields checked."
 msgstr "La liste de prix sélectionnée doit avoir les champs d'achat et de vente cochés."
 
@@ -63326,7 +64416,7 @@
 msgid "Selected date is"
 msgstr ""
 
-#: public/js/bulk_transaction_processing.js:26
+#: public/js/bulk_transaction_processing.js:34
 msgid "Selected document must be in submitted state"
 msgstr ""
 
@@ -63341,7 +64431,7 @@
 msgid "Sell"
 msgstr "Vendre"
 
-#: assets/doctype/asset/asset.js:91
+#: assets/doctype/asset/asset.js:100
 msgid "Sell Asset"
 msgstr ""
 
@@ -63471,7 +64561,7 @@
 msgid "Send Emails"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:46
+#: buying/doctype/request_for_quotation/request_for_quotation.js:53
 msgid "Send Emails to Suppliers"
 msgstr "Envoyer des e-mails aux fournisseurs"
 
@@ -63479,7 +64569,7 @@
 msgid "Send Now"
 msgstr "Envoyer Maintenant"
 
-#: public/js/controllers/transaction.js:440
+#: public/js/controllers/transaction.js:479
 msgid "Send SMS"
 msgstr "Envoyer un SMS"
 
@@ -63501,6 +64591,11 @@
 msgid "Send To Primary Contact"
 msgstr "Envoyer au contact principal"
 
+#. Description of a DocType
+#: setup/doctype/email_digest/email_digest.json
+msgid "Send regular summary reports via Email."
+msgstr ""
+
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
@@ -63531,7 +64626,7 @@
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: accounts/doctype/payment_request/payment_request.js:35
+#: accounts/doctype/payment_request/payment_request.js:44
 msgid "Sending"
 msgstr "Envoi"
 
@@ -63553,7 +64648,7 @@
 msgid "Sequence ID"
 msgstr "ID de séquence"
 
-#: manufacturing/doctype/work_order/work_order.js:262
+#: manufacturing/doctype/work_order/work_order.js:277
 msgid "Sequence Id"
 msgstr ""
 
@@ -63604,26 +64699,26 @@
 msgid "Serial / Batch No"
 msgstr ""
 
-#: public/js/utils.js:124
+#: public/js/utils.js:153
 msgid "Serial / Batch Nos"
 msgstr ""
 
 #. Name of a DocType
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:73
+#: 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:2144
-#: public/js/utils/serial_no_batch_selector.js:350
+#: public/js/controllers/transaction.js:2187
+#: 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/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_no_ledger/serial_no_ledger.js:39
+#: 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:246
+#: stock/report/stock_ledger/stock_ledger.py:319
 msgid "Serial No"
 msgstr "N° de Série"
 
-#. Label of a Small Text field in DocType 'Asset Capitalization Stock Item'
+#. Label of a Text field in DocType 'Asset Capitalization Stock Item'
 #: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
 msgctxt "Asset Capitalization Stock Item"
 msgid "Serial No"
@@ -63671,7 +64766,7 @@
 msgid "Serial No"
 msgstr "N° de Série"
 
-#. Label of a Small Text field in DocType 'POS Invoice Item'
+#. Label of a Text field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
 msgid "Serial No"
@@ -63707,7 +64802,7 @@
 msgid "Serial No"
 msgstr "N° de Série"
 
-#. Label of a Small Text field in DocType 'Sales Invoice Item'
+#. Label of a Text field in DocType 'Sales Invoice Item'
 #: accounts/doctype/sales_invoice_item/sales_invoice_item.json
 msgctxt "Sales Invoice Item"
 msgid "Serial No"
@@ -63728,7 +64823,7 @@
 msgid "Serial No"
 msgstr "N° de Série"
 
-#. Label of a Small Text field in DocType 'Stock Entry Detail'
+#. Label of a Text field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
 msgid "Serial No"
@@ -63823,7 +64918,7 @@
 msgid "Serial No and Batch for Finished Good"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:572
 msgid "Serial No is mandatory"
 msgstr ""
 
@@ -63831,11 +64926,11 @@
 msgid "Serial No is mandatory for Item {0}"
 msgstr "N° de Série est obligatoire pour l'Article {0}"
 
-#: public/js/utils/serial_no_batch_selector.js:480
+#: public/js/utils/serial_no_batch_selector.js:488
 msgid "Serial No {0} already exists"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:311
+#: public/js/utils/barcode_scanner.js:321
 msgid "Serial No {0} already scanned"
 msgstr ""
 
@@ -63852,16 +64947,11 @@
 msgid "Serial No {0} does not exist"
 msgstr "N° de Série {0} n’existe pas"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2112
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2131
 msgid "Serial No {0} does not exists"
 msgstr ""
 
 #: public/js/utils/barcode_scanner.js:402
-msgid "Serial No {0} has already scanned."
-msgstr ""
-
-#: public/js/utils/barcode_scanner.js:499
-#: public/js/utils/barcode_scanner.js:506
 msgid "Serial No {0} is already added"
 msgstr ""
 
@@ -63877,23 +64967,23 @@
 msgid "Serial No {0} not found"
 msgstr "N° de Série {0} introuvable"
 
-#: selling/page/point_of_sale/pos_controller.js:695
+#: selling/page/point_of_sale/pos_controller.js:734
 msgid "Serial No: {0} has already been transacted into another POS Invoice."
 msgstr "Numéro de série: {0} a déjà été traité sur une autre facture PDV."
 
-#: public/js/utils/barcode_scanner.js:262
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/barcode_scanner.js:271
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Serial Nos"
 msgstr ""
 
 #: public/js/utils/serial_no_batch_selector.js:20
-#: public/js/utils/serial_no_batch_selector.js:183
+#: public/js/utils/serial_no_batch_selector.js:185
 msgid "Serial Nos / Batch Nos"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1692
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:157
 msgid "Serial Nos Mismatch"
 msgstr ""
 
@@ -63903,11 +64993,11 @@
 msgid "Serial Nos and Batches"
 msgstr "N° de Série et Lots"
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1074
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1081
 msgid "Serial Nos are created successfully"
 msgstr ""
 
-#: stock/stock_ledger.py:1972
+#: stock/stock_ledger.py:1979
 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
 msgstr ""
 
@@ -63933,7 +65023,7 @@
 #. Name of a DocType
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:80
-#: stock/report/stock_ledger/stock_ledger.py:253
+#: stock/report/stock_ledger/stock_ledger.py:326
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:154
 msgid "Serial and Batch Bundle"
 msgstr ""
@@ -64028,14 +65118,18 @@
 msgid "Serial and Batch Bundle"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1253
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1260
 msgid "Serial and Batch Bundle created"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1295
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1309
 msgid "Serial and Batch Bundle updated"
 msgstr ""
 
+#: controllers/stock_controller.py:82
+msgid "Serial and Batch Bundle {0} is already used in {1} {2}."
+msgstr ""
+
 #. Label of a Section Break field in DocType 'Subcontracting Receipt Item'
 #: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
 msgctxt "Subcontracting Receipt Item"
@@ -64059,7 +65153,7 @@
 msgid "Serial and Batch No"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:51
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:49
 msgid "Serial and Batch Nos"
 msgstr ""
 
@@ -64087,11 +65181,11 @@
 msgid "Serial and Batch Summary"
 msgstr ""
 
-#: stock/utils.py:427
+#: stock/utils.py:422
 msgid "Serial number {0} entered more than once"
 msgstr "Numéro de série {0} est entré plus d'une fois"
 
-#: accounts/doctype/journal_entry/journal_entry.js:545
+#: accounts/doctype/journal_entry/journal_entry.js:611
 msgid "Series"
 msgstr "Séries"
 
@@ -64549,7 +65643,7 @@
 msgid "Service Level Agreement has been changed to {0}."
 msgstr "L'accord de niveau de service a été remplacé par {0}."
 
-#: support/doctype/issue/issue.js:67
+#: support/doctype/issue/issue.js:77
 msgid "Service Level Agreement was reset."
 msgstr "L'accord de niveau de service a été réinitialisé."
 
@@ -64630,11 +65724,11 @@
 msgid "Service Stop Date"
 msgstr "Date d'arrêt du service"
 
-#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1239
+#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1298
 msgid "Service Stop Date cannot be after Service End Date"
 msgstr "La date d'arrêt du service ne peut pas être postérieure à la date de fin du service"
 
-#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1236
+#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1295
 msgid "Service Stop Date cannot be before Service Start Date"
 msgstr "La date d'arrêt du service ne peut pas être antérieure à la date de début du service"
 
@@ -64667,7 +65761,7 @@
 msgid "Set Basic Rate Manually"
 msgstr "Définir manuellement le prix de base"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:150
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:157
 msgid "Set Default Supplier"
 msgstr ""
 
@@ -64708,11 +65802,11 @@
 msgid "Set Landed Cost Based on Purchase Invoice Rate"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1050
+#: accounts/doctype/sales_invoice/sales_invoice.js:1126
 msgid "Set Loyalty Program"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:272
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:309
 msgid "Set New Release Date"
 msgstr "Définir la nouvelle date de fin de mise en attente"
 
@@ -64728,27 +65822,31 @@
 msgid "Set Operating Cost Based On BOM Quantity"
 msgstr ""
 
+#: buying/doctype/request_for_quotation/request_for_quotation.py:264
+msgid "Set Password"
+msgstr "Définir mot de passe"
+
 #. Label of a Check field in DocType 'POS Opening Entry'
 #: accounts/doctype/pos_opening_entry/pos_opening_entry.json
 msgctxt "POS Opening Entry"
 msgid "Set Posting Date"
 msgstr "Définir la date de publication"
 
-#: manufacturing/doctype/bom/bom.js:767
+#: manufacturing/doctype/bom/bom.js:800
 msgid "Set Process Loss Item Quantity"
 msgstr ""
 
-#: projects/doctype/project/project.js:116
-#: projects/doctype/project/project.js:118
-#: projects/doctype/project/project.js:132
+#: projects/doctype/project/project.js:140
+#: projects/doctype/project/project.js:143
+#: projects/doctype/project/project.js:157
 msgid "Set Project Status"
 msgstr ""
 
-#: projects/doctype/project/project.js:154
+#: projects/doctype/project/project.js:182
 msgid "Set Project and all Tasks to status {0}?"
 msgstr "Définir le projet et toutes les tâches sur le statut {0}?"
 
-#: manufacturing/doctype/bom/bom.js:768
+#: manufacturing/doctype/bom/bom.js:801
 msgid "Set Quantity"
 msgstr "Définir Quantité"
 
@@ -64828,7 +65926,7 @@
 msgid "Set Valuation Rate Based on Source Warehouse"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:184
+#: selling/doctype/sales_order/sales_order.js:207
 msgid "Set Warehouse"
 msgstr ""
 
@@ -64837,25 +65935,25 @@
 msgid "Set as Closed"
 msgstr "Définir comme fermé"
 
-#: projects/doctype/task/task_list.js:12
+#: projects/doctype/task/task_list.js:20
 msgid "Set as Completed"
 msgstr "Définir comme terminé"
 
-#: public/js/utils/sales_common.js:406
-#: selling/doctype/quotation/quotation.js:124
+#: public/js/utils/sales_common.js:462
+#: selling/doctype/quotation/quotation.js:129
 msgid "Set as Lost"
 msgstr "Définir comme perdu"
 
 #: crm/doctype/opportunity/opportunity_list.js:13
-#: projects/doctype/task/task_list.js:8 support/doctype/issue/issue_list.js:8
+#: projects/doctype/task/task_list.js:16 support/doctype/issue/issue_list.js:8
 msgid "Set as Open"
 msgstr "Définir comme ouvert"
 
-#: setup/doctype/company/company.py:419
+#: setup/doctype/company/company.py:418
 msgid "Set default inventory account for perpetual inventory"
 msgstr "Configurer le compte d'inventaire par défaut pour l'inventaire perpétuel"
 
-#: setup/doctype/company/company.py:429
+#: setup/doctype/company/company.py:428
 msgid "Set default {0} account for non stock items"
 msgstr ""
 
@@ -64866,7 +65964,7 @@
 msgid "Set fieldname from which you want to fetch the data from the parent form."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:757
+#: manufacturing/doctype/bom/bom.js:790
 msgid "Set quantity of process loss item:"
 msgstr ""
 
@@ -64883,7 +65981,7 @@
 msgid "Set targets Item Group-wise for this Sales Person."
 msgstr "Définir des objectifs par Groupe d'Articles pour ce Commercial"
 
-#: manufacturing/doctype/work_order/work_order.js:852
+#: manufacturing/doctype/work_order/work_order.js:923
 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
 msgstr ""
 
@@ -64905,15 +66003,15 @@
 msgid "Set up your Warehouse"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:672
+#: assets/doctype/asset/asset.py:674
 msgid "Set {0} in asset category {1} for company {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:953
+#: assets/doctype/asset/asset.py:957
 msgid "Set {0} in asset category {1} or company {2}"
 msgstr "Définissez {0} dans la catégorie d'actifs {1} ou la société {2}"
 
-#: assets/doctype/asset/asset.py:949
+#: assets/doctype/asset/asset.py:953
 msgid "Set {0} in company {1}"
 msgstr "Définissez {0} dans l'entreprise {1}"
 
@@ -64994,7 +66092,7 @@
 msgstr "Création d'entreprise"
 
 #: manufacturing/doctype/bom/bom.py:956
-#: manufacturing/doctype/work_order/work_order.py:978
+#: manufacturing/doctype/work_order/work_order.py:992
 msgid "Setting {} is required"
 msgstr ""
 
@@ -65027,7 +66125,13 @@
 msgid "Settings"
 msgstr "Paramètres"
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:15
+#. Description of a DocType
+#: crm/doctype/crm_settings/crm_settings.json
+#: selling/doctype/selling_settings/selling_settings.json
+msgid "Settings for Selling Module"
+msgstr ""
+
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:11
 msgid "Settled"
 msgstr "Colonisé"
 
@@ -65043,6 +66147,12 @@
 msgid "Settled"
 msgstr "Colonisé"
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Setup"
+msgstr "Configuration"
+
 #. Title of an Onboarding Step
 #: setup/onboarding_step/letterhead/letterhead.json
 msgid "Setup Your Letterhead"
@@ -65061,7 +66171,7 @@
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
 #: accounts/doctype/share_balance/share_balance.json
-#: accounts/doctype/shareholder/shareholder.js:22
+#: accounts/doctype/shareholder/shareholder.js:21
 #: accounts/report/share_balance/share_balance.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Balance"
@@ -65076,7 +66186,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/shareholder/shareholder.js:28
+#: accounts/doctype/shareholder/shareholder.js:27
 #: accounts/report/share_ledger/share_ledger.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Ledger"
@@ -65120,9 +66230,9 @@
 
 #. Name of a DocType
 #: accounts/doctype/shareholder/shareholder.json
-#: accounts/report/share_balance/share_balance.js:17
+#: accounts/report/share_balance/share_balance.js:16
 #: accounts/report/share_balance/share_balance.py:57
-#: accounts/report/share_ledger/share_ledger.js:17
+#: accounts/report/share_ledger/share_ledger.js:16
 #: accounts/report/share_ledger/share_ledger.py:51
 msgid "Shareholder"
 msgstr "Actionnaire"
@@ -65139,7 +66249,7 @@
 msgid "Shelf Life In Days"
 msgstr "Durée de conservation en jours"
 
-#: assets/doctype/asset/asset.js:247
+#: assets/doctype/asset/asset.js:288
 msgid "Shift"
 msgstr ""
 
@@ -65162,7 +66272,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:166
+#: stock/doctype/delivery_note/delivery_note.js:181
 #: stock/doctype/shipment/shipment.json
 msgid "Shipment"
 msgstr ""
@@ -65230,7 +66340,7 @@
 msgid "Shipment details"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:846
+#: stock/doctype/delivery_note/delivery_note.py:907
 msgid "Shipments"
 msgstr "Livraisons"
 
@@ -65578,31 +66688,35 @@
 msgid "Show Cancelled Entries"
 msgstr "Afficher les entrées annulées"
 
-#: templates/pages/projects.js:64
+#: templates/pages/projects.js:61
 msgid "Show Completed"
 msgstr "Montrer terminé"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:107
+#: accounts/report/budget_variance_report/budget_variance_report.js:105
 msgid "Show Cumulative Amount"
 msgstr "Afficher le montant cumulatif"
 
-#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:17
+#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:16
 msgid "Show Disabled Warehouses"
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:306
+msgid "Show Document"
+msgstr "Afficher le document"
+
 #. Label of a Check field in DocType 'Bank Statement Import'
 #: accounts/doctype/bank_statement_import/bank_statement_import.json
 msgctxt "Bank Statement Import"
 msgid "Show Failed Logs"
 msgstr "Afficher les journaux ayant échoué"
 
-#: accounts/report/accounts_payable/accounts_payable.js:144
-#: accounts/report/accounts_receivable/accounts_receivable.js:161
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:134
+#: accounts/report/accounts_payable/accounts_payable.js:147
+#: accounts/report/accounts_receivable/accounts_receivable.js:164
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:137
 msgid "Show Future Payments"
 msgstr "Afficher les paiements futurs"
 
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:139
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:142
 msgid "Show GL Balance"
 msgstr ""
 
@@ -65635,7 +66749,7 @@
 msgid "Show Ledger View"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:166
+#: accounts/report/accounts_receivable/accounts_receivable.js:169
 msgid "Show Linked Delivery Notes"
 msgstr "Afficher les bons de livraison liés"
 
@@ -65649,7 +66763,7 @@
 msgid "Show Net Values in Party Account"
 msgstr ""
 
-#: templates/pages/projects.js:66
+#: templates/pages/projects.js:63
 msgid "Show Open"
 msgstr "Afficher ouverte"
 
@@ -65683,18 +66797,18 @@
 msgid "Show Preview"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.js:176
+#: accounts/report/accounts_payable/accounts_payable.js:142
+#: accounts/report/accounts_receivable/accounts_receivable.js:179
 #: accounts/report/general_ledger/general_ledger.js:204
 msgid "Show Remarks"
 msgstr ""
 
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:66
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:65
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:65
 msgid "Show Return Entries"
 msgstr "Afficher les entrées de retour"
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:171
+#: accounts/report/accounts_receivable/accounts_receivable.js:174
 msgid "Show Sales Person"
 msgstr "Afficher le vendeur"
 
@@ -65708,11 +66822,16 @@
 msgid "Show Taxes as Table in Print"
 msgstr ""
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:456
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:296
+msgid "Show Traceback"
+msgstr ""
+
 #: stock/report/stock_balance/stock_balance.js:90
 msgid "Show Variant Attributes"
 msgstr "Afficher les attributs de variante"
 
-#: stock/doctype/item/item.js:90
+#: stock/doctype/item/item.js:106
 msgid "Show Variants"
 msgstr "Afficher les variantes"
 
@@ -65720,8 +66839,8 @@
 msgid "Show Warehouse-wise Stock"
 msgstr "Afficher le stock entre les magasins"
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:29
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:17
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:28
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:19
 msgid "Show exploded view"
 msgstr "Afficher la vue éclatée"
 
@@ -65731,7 +66850,7 @@
 msgid "Show in Website"
 msgstr "Afficher sur le site Web"
 
-#: accounts/report/trial_balance/trial_balance.js:104
+#: accounts/report/trial_balance/trial_balance.js:110
 msgid "Show net values in opening and closing columns"
 msgstr ""
 
@@ -65739,30 +66858,30 @@
 msgid "Show only POS"
 msgstr "Afficher uniquement les points de vente"
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:108
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:106
 msgid "Show only the Immediate Upcoming Term"
 msgstr ""
 
-#: stock/utils.py:588
+#: stock/utils.py:583
 msgid "Show pending entries"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.js:93
+#: accounts/report/trial_balance/trial_balance.js:99
 msgid "Show unclosed fiscal year's P&L balances"
 msgstr "Afficher le solde du compte de résulat des exercices non cloturés"
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:96
 msgid "Show with upcoming revenue/expense"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:113
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:137
 #: accounts/report/profitability_analysis/profitability_analysis.js:71
-#: accounts/report/trial_balance/trial_balance.js:88
+#: accounts/report/trial_balance/trial_balance.js:94
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:85
 msgid "Show zero values"
 msgstr "Afficher les valeurs nulles"
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.js:30
+#: accounts/doctype/accounting_dimension/accounting_dimension.js:35
 msgid "Show {0}"
 msgstr "Montrer {0}"
 
@@ -65846,7 +66965,7 @@
 msgid "Simultaneous"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:551
+#: stock/doctype/stock_entry/stock_entry.py:506
 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 ""
 
@@ -65869,7 +66988,7 @@
 msgid "Single Transaction Threshold"
 msgstr "Seuil de transaction unique"
 
-#: stock/doctype/item/item.js:103
+#: stock/doctype/item/item.js:131
 msgid "Single Variant"
 msgstr "Variante unique"
 
@@ -65905,7 +67024,7 @@
 msgid "Skipping Tax Withholding Category {0} as there is no associated account set for Company {1} in it."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:49
 msgid "Skipping {0} of {1}, {2}"
 msgstr ""
 
@@ -65919,7 +67038,7 @@
 msgid "Small"
 msgstr "Petit"
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:68
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:67
 msgid "Smoothing Constant"
 msgstr "Constante de lissage"
 
@@ -65928,7 +67047,7 @@
 msgid "Software"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:11
+#: assets/doctype/asset/asset_list.js:9
 msgid "Sold"
 msgstr "Vendu"
 
@@ -65938,24 +67057,29 @@
 msgid "Sold"
 msgstr "Vendu"
 
-#: www/book_appointment/index.js:239
+#: selling/page/point_of_sale/pos_past_order_summary.js:80
+msgid "Sold by"
+msgstr ""
+
+#: www/book_appointment/index.js:248
 msgid "Something went wrong please try again"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:747
+#: accounts/doctype/pricing_rule/utils.py:746
 msgid "Sorry, this coupon code is no longer valid"
 msgstr "Désolé, ce code promo n'est plus valide"
 
-#: accounts/doctype/pricing_rule/utils.py:745
+#: accounts/doctype/pricing_rule/utils.py:744
 msgid "Sorry, this coupon code's validity has expired"
 msgstr "Désolé, la validité de ce code promo a expiré"
 
-#: accounts/doctype/pricing_rule/utils.py:742
+#: accounts/doctype/pricing_rule/utils.py:741
 msgid "Sorry, this coupon code's validity has not started"
 msgstr "Désolé, la validité de ce code promo n'a pas commencé"
 
 #: crm/report/lead_details/lead_details.py:40
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:38
+#: templates/form_grid/stock_entry_grid.html:29
 msgid "Source"
 msgstr ""
 
@@ -66061,10 +67185,10 @@
 msgid "Source Type"
 msgstr "Type de source"
 
-#: manufacturing/doctype/bom/bom.js:313
+#: manufacturing/doctype/bom/bom.js:326
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:126
-#: stock/dashboard/item_dashboard.js:215
-#: stock/doctype/stock_entry/stock_entry.js:547
+#: stock/dashboard/item_dashboard.js:223
+#: stock/doctype/stock_entry/stock_entry.js:627
 msgid "Source Warehouse"
 msgstr "Entrepôt source"
 
@@ -66139,11 +67263,11 @@
 msgid "Source and Target Location cannot be same"
 msgstr "Les localisations source et cible ne peuvent pas être identiques"
 
-#: stock/doctype/stock_entry/stock_entry.py:640
+#: stock/doctype/stock_entry/stock_entry.py:595
 msgid "Source and target warehouse cannot be same for row {0}"
 msgstr "L'entrepôt source et destination ne peuvent être similaire dans la ligne {0}"
 
-#: stock/dashboard/item_dashboard.js:278
+#: stock/dashboard/item_dashboard.js:286
 msgid "Source and target warehouse must be different"
 msgstr "Entrepôt source et destination doivent être différents"
 
@@ -66152,8 +67276,8 @@
 msgid "Source of Funds (Liabilities)"
 msgstr "Source des Fonds (Passif)"
 
-#: stock/doctype/stock_entry/stock_entry.py:617
-#: stock/doctype/stock_entry/stock_entry.py:634
+#: stock/doctype/stock_entry/stock_entry.py:572
+#: stock/doctype/stock_entry/stock_entry.py:589
 msgid "Source warehouse is mandatory for row {0}"
 msgstr "Entrepôt source est obligatoire à la ligne {0}"
 
@@ -66191,16 +67315,26 @@
 msgid "Spacer"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:467 stock/doctype/batch/batch.js:143
-#: support/doctype/issue/issue.js:100
+#. Description of a DocType
+#: setup/doctype/currency_exchange/currency_exchange.json
+msgid "Specify Exchange Rate to convert one currency into another"
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/shipping_rule/shipping_rule.json
+msgid "Specify conditions to calculate shipping amount"
+msgstr ""
+
+#: assets/doctype/asset/asset.js:540 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:162 support/doctype/issue/issue.js:112
 msgid "Split"
 msgstr "Fractionner"
 
-#: assets/doctype/asset/asset.js:111 assets/doctype/asset/asset.js:451
+#: assets/doctype/asset/asset.js:135 assets/doctype/asset/asset.js:524
 msgid "Split Asset"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:142
+#: stock/doctype/batch/batch.js:161
 msgid "Split Batch"
 msgstr "Lot Fractionné"
 
@@ -66217,19 +67351,19 @@
 msgid "Split From"
 msgstr ""
 
-#: support/doctype/issue/issue.js:90
+#: support/doctype/issue/issue.js:100
 msgid "Split Issue"
 msgstr "Diviser le ticket"
 
-#: assets/doctype/asset/asset.js:457
+#: assets/doctype/asset/asset.js:530
 msgid "Split Qty"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1050
+#: assets/doctype/asset/asset.py:1054
 msgid "Split qty cannot be grater than or equal to asset qty"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1827
+#: accounts/doctype/payment_entry/payment_entry.py:1846
 msgid "Splitting {0} {1} into {2} rows as per Payment Terms"
 msgstr ""
 
@@ -66292,11 +67426,26 @@
 msgid "Standard Template"
 msgstr "Modèle Standard"
 
+#. Description of a DocType
+#: setup/doctype/terms_and_conditions/terms_and_conditions.json
+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
 msgid "Standard rated supplies in {0}"
 msgstr ""
 
+#. Description of a DocType
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Purchase Transactions. This template can contain a list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\", etc."
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Sales Transactions. This template can contain a list of tax heads and also other expense/income heads like \"Shipping\", \"Insurance\", \"Handling\" etc."
+msgstr ""
+
 #. Label of a Link field in DocType 'Supplier Scorecard Scoring Standing'
 #: buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
 msgctxt "Supplier Scorecard Scoring Standing"
@@ -66309,23 +67458,25 @@
 msgid "Standing Name"
 msgstr "Nom du Classement"
 
-#: manufacturing/doctype/work_order/work_order.js:591
+#: manufacturing/doctype/work_order/work_order.js:630
+#: manufacturing/doctype/workstation/workstation_job_card.html:67
+#: public/js/projects/timer.js:32
 msgid "Start"
 msgstr "Démarrer"
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:44
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:43
 msgid "Start / Resume"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:34
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:34
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:42
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:42
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:16
-#: accounts/report/payment_ledger/payment_ledger.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:68
+#: accounts/report/payment_ledger/payment_ledger.js:16
+#: assets/report/fixed_asset_register/fixed_asset_register.js:67
 #: projects/report/project_summary/project_summary.py:70
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
-#: public/js/financial_statements.js:184
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:17
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:47
+#: public/js/financial_statements.js:193
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:16
 msgid "Start Date"
 msgstr "Date de Début"
 
@@ -66399,11 +67550,16 @@
 msgid "Start Date cannot be before the current date"
 msgstr "La date de début ne peut pas être antérieure à la date du jour"
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:133
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
+msgid "Start Deletion"
+msgstr ""
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 msgid "Start Import"
 msgstr "Démarrer l'import"
 
-#: manufacturing/doctype/job_card/job_card.js:244
+#: manufacturing/doctype/job_card/job_card.js:269
+#: manufacturing/doctype/workstation/workstation.js:190
 msgid "Start Job"
 msgstr ""
 
@@ -66411,10 +67567,14 @@
 msgid "Start Merge"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:85
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:95
 msgid "Start Reposting"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation.js:159
+msgid "Start Time"
+msgstr "Heure de Début"
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -66443,11 +67603,11 @@
 msgid "Start Time can't be greater than or equal to End Time for {0}."
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:48
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:48
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:56
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
 #: accounts/report/financial_ratios/financial_ratios.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:82
-#: public/js/financial_statements.js:198
+#: assets/report/fixed_asset_register/fixed_asset_register.js:81
+#: public/js/financial_statements.js:207
 msgid "Start Year"
 msgstr "Année de début"
 
@@ -66481,7 +67641,7 @@
 msgid "Started Time"
 msgstr "Heure de début"
 
-#: utilities/bulk_transaction.py:19
+#: utilities/bulk_transaction.py:22
 msgid "Started a background job to create {1} {0}"
 msgstr ""
 
@@ -66498,7 +67658,7 @@
 msgstr "Position initiale depuis bord haut"
 
 #: crm/report/lead_details/lead_details.py:59
-#: public/js/utils/contact_address_quick_entry.js:81
+#: public/js/utils/contact_address_quick_entry.js:84
 msgid "State"
 msgstr "Etat"
 
@@ -66526,68 +67686,76 @@
 msgid "Statement Import Log"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:17
+#: accounts/report/general_ledger/general_ledger.html:1
+msgid "Statement of Account"
+msgstr ""
+
+#: 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
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order.js:298
-#: buying/doctype/purchase_order/purchase_order.js:300
-#: buying/doctype/purchase_order/purchase_order.js:304
+#: buying/doctype/purchase_order/purchase_order.js:317
+#: buying/doctype/purchase_order/purchase_order.js:323
+#: buying/doctype/purchase_order/purchase_order.js:329
+#: buying/doctype/purchase_order/purchase_order.js:335
+#: buying/doctype/purchase_order/purchase_order.js:337
+#: 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:53
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:52
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:173
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:134
-#: crm/report/lead_details/lead_details.js:31
+#: crm/report/lead_details/lead_details.js:30
 #: crm/report/lead_details/lead_details.py:25
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:34
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:39
-#: manufacturing/doctype/production_plan/production_plan.js:99
-#: manufacturing/doctype/production_plan/production_plan.js:103
-#: manufacturing/doctype/production_plan/production_plan.js:431
-#: manufacturing/doctype/work_order/work_order.js:352
-#: manufacturing/doctype/work_order/work_order.js:389
-#: manufacturing/doctype/work_order/work_order.js:565
-#: manufacturing/doctype/work_order/work_order.js:572
-#: manufacturing/doctype/work_order/work_order.js:576
-#: manufacturing/report/job_card_summary/job_card_summary.js:51
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:32
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:38
+#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:115
+#: manufacturing/doctype/production_plan/production_plan.js:466
+#: manufacturing/doctype/work_order/work_order.js:371
+#: manufacturing/doctype/work_order/work_order.js:407
+#: manufacturing/doctype/work_order/work_order.js:595
+#: manufacturing/doctype/work_order/work_order.js:606
+#: manufacturing/doctype/work_order/work_order.js:614
+#: 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/production_analytics/production_analytics.py:19
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:22
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:21
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:80
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:50
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:49
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:111
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:138
-#: manufacturing/report/work_order_summary/work_order_summary.js:37
+#: manufacturing/report/work_order_summary/work_order_summary.js:36
 #: manufacturing/report/work_order_summary/work_order_summary.py:202
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:35
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:25
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:24
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:92
-#: projects/report/project_summary/project_summary.js:24
+#: projects/report/project_summary/project_summary.js:23
 #: projects/report/project_summary/project_summary.py:58
-#: selling/doctype/sales_order/sales_order.js:517
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:528
-#: selling/doctype/sales_order/sales_order.js:539
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:90
+#: public/js/plant_floor_visual/visual_plant.js:111
+#: selling/doctype/sales_order/sales_order.js:553
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:567
+#: selling/doctype/sales_order/sales_order.js:584
+#: selling/doctype/sales_order/sales_order.js:590
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:88
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:68
-#: selling/report/sales_order_analysis/sales_order_analysis.js:55
+#: selling/report/sales_order_analysis/sales_order_analysis.js:54
 #: selling/report/sales_order_analysis/sales_order_analysis.py:228
-#: stock/doctype/delivery_note/delivery_note.js:210
-#: stock/doctype/delivery_note/delivery_note.js:229
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: stock/report/reserved_stock/reserved_stock.js:127
+#: stock/doctype/delivery_note/delivery_note.js:252
+#: stock/doctype/delivery_note/delivery_note.js:281
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: stock/report/reserved_stock/reserved_stock.js:124
 #: stock/report/reserved_stock/reserved_stock.py:178
 #: stock/report/serial_no_ledger/serial_no_ledger.py:51
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/report/issue_analytics/issue_analytics.js:52
-#: support/report/issue_summary/issue_summary.js:39
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:114
+#: support/report/issue_analytics/issue_analytics.js:51
+#: support/report/issue_summary/issue_summary.js:38
 #: templates/pages/projects.html:24 templates/pages/projects.html:46
-#: templates/pages/projects.html:66
+#: templates/pages/projects.html:66 templates/pages/task_info.html:69
+#: templates/pages/timelog_info.html:40
 msgid "Status"
 msgstr "Statut"
 
@@ -67055,12 +68223,24 @@
 msgid "Status"
 msgstr "Statut"
 
+#. Label of a Select field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status"
+msgstr "Statut"
+
 #. Label of a Section Break field in DocType 'Service Level Agreement'
 #: support/doctype/service_level_agreement/service_level_agreement.json
 msgctxt "Service Level Agreement"
 msgid "Status Details"
 msgstr ""
 
+#. Label of a Section Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status Illustration"
+msgstr ""
+
 #: projects/doctype/project/project.py:719
 msgid "Status must be Cancelled or Completed"
 msgstr "Le statut doit être annulé ou complété"
@@ -67082,7 +68262,7 @@
 #. Label of a Card Break in the Home Workspace
 #. Name of a Workspace
 #: accounts/doctype/item_tax_template/item_tax_template_dashboard.py:11
-#: accounts/report/account_balance/account_balance.js:55
+#: accounts/report/account_balance/account_balance.js:57
 #: manufacturing/doctype/bom/bom_dashboard.py:14 setup/workspace/home/home.json
 #: stock/doctype/material_request/material_request_dashboard.py:17
 #: stock/workspace/stock/stock.json
@@ -67109,8 +68289,8 @@
 
 #: 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:1187
-#: accounts/report/account_balance/account_balance.js:56
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1239
+#: accounts/report/account_balance/account_balance.js:58
 msgid "Stock Adjustment"
 msgstr "Ajustement du Stock"
 
@@ -67134,7 +68314,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: public/js/stock_analytics.js:8
+#: public/js/stock_analytics.js:7
 #: stock/report/stock_analytics/stock_analytics.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Analytics"
@@ -67152,7 +68332,7 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:52
+#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:49
 #: stock/report/stock_balance/stock_balance.json
 #: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py:107
 #: stock/workspace/stock/stock.json
@@ -67165,10 +68345,14 @@
 msgid "Stock Balance"
 msgstr "Solde du Stock"
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:16
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:15
 msgid "Stock Balance Report"
 msgstr "Rapport de solde des stocks"
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:10
+msgid "Stock Capacity"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Stock Settings'
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
@@ -67199,12 +68383,12 @@
 msgid "Stock Details"
 msgstr "Détails du Stock"
 
-#: stock/doctype/stock_entry/stock_entry.py:730
+#: stock/doctype/stock_entry/stock_entry.py:685
 msgid "Stock Entries already created for Work Order {0}: {1}"
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/pick_list/pick_list.js:104
+#: stock/doctype/pick_list/pick_list.js:116
 #: stock/doctype/stock_entry/stock_entry.json
 msgid "Stock Entry"
 msgstr "Écriture de Stock"
@@ -67265,15 +68449,15 @@
 msgid "Stock Entry Type"
 msgstr "Type d'entrée de stock"
 
-#: stock/doctype/pick_list/pick_list.py:1020
+#: stock/doctype/pick_list/pick_list.py:1140
 msgid "Stock Entry has been already created against this Pick List"
 msgstr "Une entrée de stock a déjà été créée dans cette liste de choix"
 
-#: stock/doctype/batch/batch.js:104
+#: stock/doctype/batch/batch.js:115
 msgid "Stock Entry {0} created"
 msgstr "Écriture de Stock {0} créée"
 
-#: accounts/doctype/journal_entry/journal_entry.py:1140
+#: accounts/doctype/journal_entry/journal_entry.py:1167
 msgid "Stock Entry {0} is not submitted"
 msgstr "Écriture de Stock {0} n'est pas soumise"
 
@@ -67308,14 +68492,18 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: public/js/controllers/stock_controller.js:54
-#: public/js/utils/ledger_preview.js:27 stock/doctype/item/item.js:64
+#: public/js/controllers/stock_controller.js:66
+#: public/js/utils/ledger_preview.js:37 stock/doctype/item/item.js:68
 #: stock/doctype/item/item_dashboard.py:8
 #: stock/report/stock_ledger/stock_ledger.json stock/workspace/stock/stock.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:32
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:33
 msgid "Stock Ledger"
 msgstr "Livre d'Inventaire"
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts"
+msgstr ""
+
 #. 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
@@ -67344,7 +68532,7 @@
 msgid "Stock Ledger report contains every submitted stock transaction. You can use filter to narrow down ledger entries."
 msgstr ""
 
-#: stock/doctype/batch/batch.js:50 stock/doctype/item/item.js:403
+#: stock/doctype/batch/batch.js:58 stock/doctype/item/item.js:467
 msgid "Stock Levels"
 msgstr "Niveaux du Stocks"
 
@@ -67383,6 +68571,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_reconciliation/stock_reconciliation.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
@@ -67401,7 +68590,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: stock/doctype/item/item.js:70
+#: stock/doctype/item/item.js:78
 #: stock/report/stock_projected_qty/stock_projected_qty.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Projected Qty"
@@ -67450,7 +68639,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:90
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:123
-#: accounts/report/account_balance/account_balance.js:57
+#: accounts/report/account_balance/account_balance.js:59
 msgid "Stock Received But Not Billed"
 msgstr "Stock Reçus Mais Non Facturés"
 
@@ -67501,20 +68690,20 @@
 msgid "Stock Reposting Settings"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: selling/doctype/sales_order/sales_order.js:74
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:178
-#: stock/doctype/pick_list/pick_list.js:110
-#: stock/doctype/pick_list/pick_list.js:119
-#: stock/doctype/pick_list/pick_list.js:120
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:467
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:965
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:978
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:992
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1006
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1020
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1037
+#: selling/doctype/sales_order/sales_order.js:82
+#: selling/doctype/sales_order/sales_order.js:92
+#: selling/doctype/sales_order/sales_order.js:101
+#: selling/doctype/sales_order/sales_order.js:201
+#: 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_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
 msgid "Stock Reservation"
 msgstr ""
 
@@ -67524,18 +68713,18 @@
 msgid "Stock Reservation"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1144
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1146
 msgid "Stock Reservation Entries Cancelled"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1096
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1098
 msgid "Stock Reservation Entries Created"
 msgstr ""
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:383
+#: selling/doctype/sales_order/sales_order.js:413
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: stock/report/reserved_stock/reserved_stock.js:56
+#: stock/report/reserved_stock/reserved_stock.js:53
 #: stock/report/reserved_stock/reserved_stock.py:171
 msgid "Stock Reservation Entry"
 msgstr ""
@@ -67548,7 +68737,7 @@
 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:614
+#: stock/doctype/delivery_note/delivery_note.py:675
 msgid "Stock Reservation Warehouse Mismatch"
 msgstr ""
 
@@ -67568,7 +68757,7 @@
 msgid "Stock Reserved Qty (in Stock UOM)"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1498
+#: stock/doctype/stock_entry/stock_entry.py:1507
 msgid "Stock Return"
 msgstr ""
 
@@ -67596,6 +68785,13 @@
 msgid "Stock Summary"
 msgstr "Résumé du Stock"
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Stock Summary"
+msgstr "Résumé du Stock"
+
 #. Label of a Card Break in the Stock Workspace
 #: stock/workspace/stock/stock.json
 msgid "Stock Transactions"
@@ -67613,8 +68809,8 @@
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:232
 #: 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:398
-#: stock/report/stock_ledger/stock_ledger.py:117
+#: stock/report/stock_balance/stock_balance.py:406
+#: stock/report/stock_ledger/stock_ledger.py:190
 msgid "Stock UOM"
 msgstr "UdM du Stock"
 
@@ -67792,7 +68988,7 @@
 msgid "Stock UOM Quantity"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:368
+#: selling/doctype/sales_order/sales_order.js:398
 msgid "Stock Unreservation"
 msgstr ""
 
@@ -67859,6 +69055,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -67899,27 +69096,31 @@
 msgid "Stock cannot be reserved in group warehouse {0}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:908
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:910
 msgid "Stock cannot be reserved in the group warehouse {0}."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1011
-msgid "Stock cannot be updated against Delivery Note {0}"
-msgstr "Stock ne peut pas être mis à jour pour le Bon de Livraison {0}"
-
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:669
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:673
 msgid "Stock cannot be updated against Purchase Receipt {0}"
 msgstr "Stock ne peut pas être mis à jour pour le Reçu d'Achat {0}"
 
+#: accounts/doctype/sales_invoice/sales_invoice.py:1032
+msgid "Stock cannot be updated against the following Delivery Notes: {0}"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.py:1055
+msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
+msgstr ""
+
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:229
 msgid "Stock not available for Item {0} in Warehouse {1}."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:679
+#: selling/page/point_of_sale/pos_controller.js:714
 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:241
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:252
 msgid "Stock transactions before {0} are frozen"
 msgstr "Les transactions du stock avant {0} sont gelées"
 
@@ -67937,12 +69138,12 @@
 msgid "Stock will be reserved on submission of <b>Purchase Receipt</b> created against Material Receipt for Sales Order."
 msgstr ""
 
-#: stock/utils.py:579
+#: stock/utils.py:574
 msgid "Stock/Accounts can not be frozen as processing of backdated entries is going on. Please try again later."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:570
-#: stock/doctype/material_request/material_request.js:107
+#: manufacturing/doctype/work_order/work_order.js:602
+#: stock/doctype/material_request/material_request.js:109
 msgid "Stop"
 msgstr ""
 
@@ -68018,11 +69219,11 @@
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: manufacturing/doctype/work_order/work_order.py:631
+#: manufacturing/doctype/work_order/work_order.py:645
 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
 msgstr "Un ordre de fabrication arrêté ne peut être annulé, Re-démarrez le pour pouvoir l'annuler"
 
-#: setup/doctype/company/company.py:260
+#: 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
@@ -68059,7 +69260,12 @@
 msgid "Sub Assemblies & Raw Materials"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:264
+#: public/js/bom_configurator/bom_configurator.bundle.js:129
+#: public/js/bom_configurator/bom_configurator.bundle.js:159
+msgid "Sub Assembly"
+msgstr ""
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:271
 msgid "Sub Assembly Item"
 msgstr ""
 
@@ -68131,7 +69337,7 @@
 msgid "Subcontract BOM"
 msgstr ""
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:37
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:36
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:128
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:22
 #: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:22
@@ -68143,7 +69349,7 @@
 msgid "Subcontract Order Summary"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:68
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
 msgid "Subcontract Return"
 msgstr ""
 
@@ -68179,10 +69385,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: controllers/subcontracting_controller.py:806
+#: buying/doctype/purchase_order/purchase_order.js:369
+#: controllers/subcontracting_controller.py:810
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:78
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:95
 msgid "Subcontracting Order"
 msgstr ""
 
@@ -68232,7 +69438,7 @@
 msgid "Subcontracting Order Supplied Item"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:861
+#: buying/doctype/purchase_order/purchase_order.py:864
 msgid "Subcontracting Order {0} created."
 msgstr ""
 
@@ -68243,7 +69449,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:200
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Subcontracting Receipt"
 msgstr ""
@@ -68295,10 +69501,10 @@
 msgid "Subdivision"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:219
-#: projects/doctype/task/task_tree.js:62
+#: buying/doctype/request_for_quotation/request_for_quotation.js:237
+#: projects/doctype/task/task_tree.js:65
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:91
-#: support/doctype/issue/issue.js:96
+#: support/doctype/issue/issue.js:106 templates/pages/task_info.html:44
 msgid "Subject"
 msgstr "Sujet"
 
@@ -68350,15 +69556,16 @@
 msgid "Subject"
 msgstr "Sujet"
 
-#: accounts/doctype/payment_order/payment_order.js:120
-#: public/js/payment/payments.js:28
-#: selling/page/point_of_sale/pos_controller.js:101
-#: www/book_appointment/index.html:59
+#: accounts/doctype/payment_order/payment_order.js:137
+#: manufacturing/doctype/workstation/workstation.js:237
+#: public/js/payment/payments.js:30
+#: selling/page/point_of_sale/pos_controller.js:119
+#: templates/pages/task_info.html:101 www/book_appointment/index.html:59
 msgid "Submit"
 msgstr "Valider"
 
-#: buying/doctype/purchase_order/purchase_order.py:857
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:698
+#: buying/doctype/purchase_order/purchase_order.py:860
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:699
 msgid "Submit Action Failed"
 msgstr ""
 
@@ -68386,14 +69593,18 @@
 msgid "Submit Journal Entries"
 msgstr "Valider les entrées de journal"
 
-#: manufacturing/doctype/work_order/work_order.js:135
+#: manufacturing/doctype/work_order/work_order.js:139
 msgid "Submit this Work Order for further processing."
 msgstr "Valider cet ordre de fabrication pour continuer son traitement."
 
-#: assets/doctype/asset/asset_list.js:32
+#: buying/doctype/request_for_quotation/request_for_quotation.py:265
+msgid "Submit your Quotation"
+msgstr ""
+
+#: assets/doctype/asset/asset_list.js:23
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:15
-#: stock/doctype/stock_entry/stock_entry_list.js:21
-#: templates/pages/material_request_info.html:24 templates/pages/order.html:58
+#: stock/doctype/stock_entry/stock_entry_list.js:27
+#: templates/pages/material_request_info.html:24 templates/pages/order.html:70
 msgid "Submitted"
 msgstr "Validé"
 
@@ -68657,11 +69868,11 @@
 msgid "Succeeded"
 msgstr ""
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:6
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:7
 msgid "Succeeded Entries"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Success"
 msgstr "Succès"
 
@@ -68696,11 +69907,11 @@
 msgid "Successful"
 msgstr "Réussi"
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:538
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:543
 msgid "Successfully Reconciled"
 msgstr "Réconcilié avec succès"
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:164
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:171
 msgid "Successfully Set Supplier"
 msgstr "Fournisseur défini avec succès"
 
@@ -68708,31 +69919,31 @@
 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:468
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:430
 msgid "Successfully imported {0}"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:182
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:161
 msgid "Successfully imported {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:166
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:145
 msgid "Successfully imported {0} record."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:178
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:157
 msgid "Successfully imported {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:165
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:144
 msgid "Successfully imported {0} records."
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:177
+#: buying/doctype/supplier/supplier.js:210
 msgid "Successfully linked to Customer"
 msgstr ""
 
-#: selling/doctype/customer/customer.js:222
+#: selling/doctype/customer/customer.js:243
 msgid "Successfully linked to Supplier"
 msgstr ""
 
@@ -68740,23 +69951,23 @@
 msgid "Successfully merged {0} out of {1}."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:478
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:438
 msgid "Successfully updated {0}"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:193
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:172
 msgid "Successfully updated {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:171
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:150
 msgid "Successfully updated {0} record."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:189
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:168
 msgid "Successfully updated {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:170
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:149
 msgid "Successfully updated {0} records."
 msgstr ""
 
@@ -68886,30 +70097,30 @@
 
 #. Name of a DocType
 #. Label of a Card Break in the Buying Workspace
-#: accounts/doctype/payment_order/payment_order.js:100
+#: accounts/doctype/payment_order/payment_order.js:110
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:61
 #: 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/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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:38
-#: buying/doctype/request_for_quotation/request_for_quotation.js:156
-#: buying/doctype/request_for_quotation/request_for_quotation.js:208
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:167
+#: 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/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:16
+#: 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:16
+#: 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/workspace/buying/buying.json public/js/purchase_trends_filters.js:50
-#: public/js/purchase_trends_filters.js:66
+#: public/js/purchase_trends_filters.js:63
 #: regional/report/irs_1099/irs_1099.py:79
-#: selling/doctype/customer/customer.js:207
-#: selling/doctype/sales_order/sales_order.js:1005
+#: 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
 msgid "Supplier"
 msgstr "Fournisseur"
@@ -69215,15 +70426,15 @@
 msgstr "Détails du Fournisseur"
 
 #. Name of a DocType
-#: accounts/report/accounts_payable/accounts_payable.js:122
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:105
-#: accounts/report/accounts_receivable/accounts_receivable.py:1110
+#: 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/purchase_register/purchase_register.js:27
 #: accounts/report/purchase_register/purchase_register.py:186
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:56
-#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: 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
@@ -69305,7 +70516,7 @@
 msgid "Supplier Invoice"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:216
 msgid "Supplier Invoice Date"
 msgstr "Date de la Facture du Fournisseur"
 
@@ -69315,13 +70526,14 @@
 msgid "Supplier Invoice Date"
 msgstr "Date de la Facture du Fournisseur"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1550
 msgid "Supplier Invoice Date cannot be greater than Posting Date"
 msgstr "Fournisseur Date de la Facture du Fournisseur ne peut pas être postérieure à Date de Publication"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:59
-#: accounts/report/general_ledger/general_ledger.py:656
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: 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
 msgid "Supplier Invoice No"
 msgstr "N° de Facture du Fournisseur"
 
@@ -69337,7 +70549,7 @@
 msgid "Supplier Invoice No"
 msgstr "N° de Facture du Fournisseur"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1575
 msgid "Supplier Invoice No exists in Purchase Invoice {0}"
 msgstr "N° de la Facture du Fournisseur existe dans la Facture d'Achat {0}"
 
@@ -69367,12 +70579,12 @@
 msgid "Supplier Ledger Summary"
 msgstr "Récapitulatif du grand livre des fournisseurs"
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1041
+#: accounts/report/accounts_receivable/accounts_receivable.py:1049
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
 #: 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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:74
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:73
 msgid "Supplier Name"
 msgstr "Nom du fournisseur"
 
@@ -69502,14 +70714,14 @@
 msgstr "Contact fournisseur principal"
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:458
-#: buying/doctype/request_for_quotation/request_for_quotation.js:42
+#: buying/doctype/purchase_order/purchase_order.js:529
+#: 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
-#: crm/doctype/opportunity/opportunity.js:82
-#: stock/doctype/material_request/material_request.js:147
+#: crm/doctype/opportunity/opportunity.js:81
+#: stock/doctype/material_request/material_request.js:170
 msgid "Supplier Quotation"
 msgstr "Devis fournisseur"
 
@@ -69561,7 +70773,7 @@
 msgid "Supplier Quotation Item"
 msgstr "Article Devis Fournisseur"
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:409
+#: buying/doctype/request_for_quotation/request_for_quotation.py:433
 msgid "Supplier Quotation {0} Created"
 msgstr "Devis fournisseur {0} créé"
 
@@ -69689,6 +70901,11 @@
 msgid "Supplier delivers to Customer"
 msgstr "Fournisseur livre au Client"
 
+#. Description of a DocType
+#: buying/doctype/supplier/supplier.json
+msgid "Supplier of Goods or Services."
+msgstr ""
+
 #: buying/doctype/supplier_quotation/supplier_quotation.py:167
 msgid "Supplier {0} not found in {1}"
 msgstr "Fournisseur {0} introuvable dans {1}"
@@ -69779,7 +70996,7 @@
 msgid "Suspended"
 msgstr "Suspendu"
 
-#: selling/page/point_of_sale/pos_payment.js:308
+#: selling/page/point_of_sale/pos_payment.js:325
 msgid "Switch Between Payment Modes"
 msgstr "Basculer entre les modes de paiement"
 
@@ -69875,6 +71092,7 @@
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 #: manufacturing/doctype/job_card/job_card.json
+#: manufacturing/doctype/plant_floor/plant_floor.json
 #: projects/doctype/activity_type/activity_type.json
 #: projects/doctype/project_template/project_template.json
 #: projects/doctype/project_type/project_type.json
@@ -69962,7 +71180,7 @@
 msgid "System will fetch all the entries if limit value is zero."
 msgstr "Le système récupérera toutes les entrées si la valeur limite est zéro."
 
-#: controllers/accounts_controller.py:1673
+#: controllers/accounts_controller.py:1762
 msgid "System will not check over billing since amount for Item {0} in {1} is zero"
 msgstr ""
 
@@ -69973,11 +71191,19 @@
 msgid "System will notify to increase or decrease quantity or amount "
 msgstr "Le système notifiera d'augmenter ou de diminuer la quantité ou le montant"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TCS Amount"
+msgstr ""
+
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TCS Rate %"
 msgstr ""
 
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TDS Amount"
+msgstr ""
+
 #. Name of a report
 #: accounts/report/tds_computation_summary/tds_computation_summary.json
 msgid "TDS Computation Summary"
@@ -69987,7 +71213,7 @@
 msgid "TDS Payable"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TDS Rate %"
 msgstr ""
@@ -69998,7 +71224,12 @@
 msgid "TS-.YYYY.-"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:427
+#. Description of a DocType
+#: stock/doctype/item_website_specification/item_website_specification.json
+msgid "Table for Item that will be shown in Web Site"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:466
 msgid "Tag"
 msgstr "Étiquette"
 
@@ -70040,10 +71271,14 @@
 msgid "Tally Migration"
 msgstr "Migration Tally"
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:32
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:34
 msgid "Tally Migration Error"
 msgstr "Erreur de migration de Tally"
 
+#: templates/form_grid/stock_entry_grid.html:36
+msgid "Target"
+msgstr "Cible"
+
 #. Label of a Data field in DocType 'Quality Goal Objective'
 #: quality_management/doctype/quality_goal_objective/quality_goal_objective.json
 msgctxt "Quality Goal Objective"
@@ -70078,23 +71313,23 @@
 msgid "Target Asset Location"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:248
+#: assets/doctype/asset_capitalization/asset_capitalization.py:254
 msgid "Target Asset {0} cannot be cancelled"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:246
+#: assets/doctype/asset_capitalization/asset_capitalization.py:252
 msgid "Target Asset {0} cannot be submitted"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:242
+#: assets/doctype/asset_capitalization/asset_capitalization.py:248
 msgid "Target Asset {0} cannot be {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:252
+#: assets/doctype/asset_capitalization/asset_capitalization.py:258
 msgid "Target Asset {0} does not belong to company {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:233
+#: assets/doctype/asset_capitalization/asset_capitalization.py:239
 msgid "Target Asset {0} needs to be composite asset"
 msgstr ""
 
@@ -70174,15 +71409,15 @@
 msgid "Target Item Name"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:203
+#: assets/doctype/asset_capitalization/asset_capitalization.py:209
 msgid "Target Item {0} is neither a Fixed Asset nor a Stock Item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:207
+#: assets/doctype/asset_capitalization/asset_capitalization.py:213
 msgid "Target Item {0} must be a Fixed Asset item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:209
+#: assets/doctype/asset_capitalization/asset_capitalization.py:215
 msgid "Target Item {0} must be a Stock Item"
 msgstr ""
 
@@ -70204,9 +71439,9 @@
 msgid "Target Location or To Employee is required while receiving Asset {0}"
 msgstr "L'emplacement cible ou l'employé est requis lors de la réception de l'élément {0}"
 
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:42
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:42
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:42
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:41
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:41
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:41
 msgid "Target On"
 msgstr "Cible sur"
 
@@ -70222,7 +71457,7 @@
 msgid "Target Qty"
 msgstr "Qté Cible"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:214
+#: assets/doctype/asset_capitalization/asset_capitalization.py:220
 msgid "Target Qty must be a positive number"
 msgstr ""
 
@@ -70232,8 +71467,8 @@
 msgid "Target Serial No"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:222
-#: stock/doctype/stock_entry/stock_entry.js:549
+#: stock/dashboard/item_dashboard.js:230
+#: stock/doctype/stock_entry/stock_entry.js:633
 msgid "Target Warehouse"
 msgstr "Entrepôt cible"
 
@@ -70292,16 +71527,16 @@
 msgid "Target Warehouse Address"
 msgstr "Adresse de l'entrepôt cible"
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:224
+#: assets/doctype/asset_capitalization/asset_capitalization.py:230
 msgid "Target Warehouse is mandatory for Decapitalization"
 msgstr ""
 
-#: controllers/selling_controller.py:685
+#: controllers/selling_controller.py:709
 msgid "Target Warehouse is set for some items but the customer is not an internal customer."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:623
-#: stock/doctype/stock_entry/stock_entry.py:630
+#: stock/doctype/stock_entry/stock_entry.py:578
+#: stock/doctype/stock_entry/stock_entry.py:585
 msgid "Target warehouse is mandatory for row {0}"
 msgstr "L’Entrepôt cible est obligatoire pour la ligne {0}"
 
@@ -70333,8 +71568,8 @@
 #: projects/doctype/task/task.json projects/doctype/task/task_tree.js:17
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:33
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:90
-#: public/js/projects/timer.js:11 support/doctype/issue/issue.js:22
-#: templates/pages/projects.html:56
+#: public/js/projects/timer.js:15 support/doctype/issue/issue.js:27
+#: templates/pages/projects.html:56 templates/pages/timelog_info.html:28
 msgid "Task"
 msgstr "Tâche"
 
@@ -70442,6 +71677,12 @@
 msgid "Tasks"
 msgstr ""
 
+#. Label of a Section Break field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Tasks"
+msgstr ""
+
 #: projects/report/project_summary/project_summary.py:62
 msgid "Tasks Completed"
 msgstr "Tâches terminées"
@@ -70450,7 +71691,7 @@
 msgid "Tasks Overdue"
 msgstr "Tâches en retard"
 
-#: accounts/report/account_balance/account_balance.js:58
+#: accounts/report/account_balance/account_balance.js:60
 msgid "Tax"
 msgstr "Taxe"
 
@@ -70490,7 +71731,6 @@
 msgid "Tax Account"
 msgstr "Compte de taxes"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:247
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:137
 msgid "Tax Amount"
 msgstr ""
@@ -70713,11 +71953,11 @@
 msgid "Tax ID"
 msgstr "Numéro d'identification fiscale"
 
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:86
+#: 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/supplier_ledger_summary/supplier_ledger_summary.js:68
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:67
 msgid "Tax Id"
 msgstr "Numéro d'identification fiscale"
 
@@ -70752,6 +71992,8 @@
 msgstr "Numéro d'identification fiscale"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:32
+#: accounts/report/accounts_receivable/accounts_receivable.html:19
+#: accounts/report/general_ledger/general_ledger.html:14
 msgid "Tax Id: "
 msgstr "Numéro d'identification fiscale:"
 
@@ -70760,7 +72002,7 @@
 msgid "Tax Masters"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:119
+#: accounts/doctype/account/account_tree.js:160
 msgid "Tax Rate"
 msgstr "Taux d'Imposition"
 
@@ -70974,7 +72216,7 @@
 msgid "Tax will be withheld only for amount exceeding the cumulative threshold"
 msgstr ""
 
-#: controllers/taxes_and_totals.py:1018
+#: controllers/taxes_and_totals.py:1019
 msgid "Taxable Amount"
 msgstr "Montant Taxable"
 
@@ -71129,55 +72371,55 @@
 msgid "Taxes and Charges Added (Company Currency)"
 msgstr "Taxes et Frais Additionnels (Devise Société)"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Calcul des Frais et Taxes"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Calcul des Frais et Taxes"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Calcul des Frais et Taxes"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Calcul des Frais et Taxes"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Calcul des Frais et Taxes"
 
-#. Label of a Long Text field in DocType 'Quotation'
+#. Label of a Text Editor field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Taxes and Charges Calculation"
 msgstr "Calcul des Frais et Taxes"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Calcul des Frais et Taxes"
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr "Calcul des Frais et Taxes"
 
-#. Label of a Long Text field in DocType 'Supplier Quotation'
+#. Label of a Markdown Editor field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Taxes and Charges Calculation"
@@ -71253,7 +72495,7 @@
 msgid "Telephony Call Type"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:12
+#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:20
 msgid "Template"
 msgstr "Modèle"
 
@@ -71269,11 +72511,11 @@
 msgid "Template"
 msgstr "Modèle"
 
-#: manufacturing/doctype/bom/bom.js:279
+#: manufacturing/doctype/bom/bom.js:292
 msgid "Template Item"
 msgstr "Élément de modèle"
 
-#: stock/get_item_details.py:219
+#: stock/get_item_details.py:224
 msgid "Template Item Selected"
 msgstr ""
 
@@ -71313,11 +72555,11 @@
 msgid "Template Warnings"
 msgstr "Avertissements de modèles"
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:38
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:29
 msgid "Temporarily on Hold"
 msgstr "Temporairement en attente"
 
-#: accounts/report/account_balance/account_balance.js:59
+#: accounts/report/account_balance/account_balance.js:61
 msgid "Temporary"
 msgstr "Temporaire"
 
@@ -71584,34 +72826,34 @@
 msgstr "Modèle des Termes et Conditions"
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:145
-#: accounts/report/accounts_receivable/accounts_receivable.py:1094
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1102
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
+#: 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/inactive_sales_items/inactive_sales_items.js:9
+#: 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
-#: crm/report/lead_details/lead_details.js:47
+#: crm/report/lead_details/lead_details.js:46
 #: crm/report/lead_details/lead_details.py:34
-#: crm/report/lost_opportunity/lost_opportunity.js:37
+#: 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/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:48
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:46
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:39
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:60
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:59
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:39
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:48
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:46
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:60
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:59
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:71
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:72
 #: selling/report/territory_wise_sales/territory_wise_sales.py:22
 #: setup/doctype/territory/territory.json
 msgid "Territory"
@@ -71790,7 +73032,7 @@
 msgid "The 'From Package No.' field must neither be empty nor it's value less than 1."
 msgstr "Le champ 'N° de Paquet' ne doit pas être vide ni sa valeur être inférieure à 1."
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:331
+#: buying/doctype/request_for_quotation/request_for_quotation.py:355
 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings."
 msgstr "L'accès à la demande de devis du portail est désactivé. Pour autoriser l'accès, activez-le dans les paramètres du portail."
 
@@ -71836,7 +73078,7 @@
 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:176
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:177
 msgid "The GL Entries will be processed in the background, it can take a few minutes."
 msgstr ""
 
@@ -71844,7 +73086,7 @@
 msgid "The Loyalty Program isn't valid for the selected company"
 msgstr "Le programme de fidélité n'est pas valable pour la société sélectionnée"
 
-#: accounts/doctype/payment_request/payment_request.py:747
+#: accounts/doctype/payment_request/payment_request.py:750
 msgid "The Payment Request {0} is already paid, cannot process payment twice"
 msgstr ""
 
@@ -71852,11 +73094,11 @@
 msgid "The Payment Term at row {0} is possibly a duplicate."
 msgstr "Le délai de paiement à la ligne {0} est probablement un doublon."
 
-#: stock/doctype/pick_list/pick_list.py:132
+#: stock/doctype/pick_list/pick_list.py:167
 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:1761
+#: stock/doctype/stock_entry/stock_entry.py:1770
 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
 msgstr ""
 
@@ -71865,7 +73107,7 @@
 msgid "The Selling Module is all set up!"
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:17
 msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing. <br><br> When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field."
 msgstr "L'entrée de stock de type «Fabrication» est connue sous le nom de post-consommation. Les matières premières consommées pour fabriquer des produits finis sont connues sous le nom de rétro-consommation.<br><br> Lors de la création d'une entrée de fabrication, les articles de matières premières sont rétro-consommés en fonction de la nomenclature de l'article de production. Si vous souhaitez plutôt que les articles de matières premières soient postconsommés en fonction de l'entrée de transfert de matières effectuée par rapport à cet ordre de fabrication, vous pouvez la définir dans ce champ."
 
@@ -71888,7 +73130,7 @@
 msgid "The accounts are set by the system automatically but do confirm these defaults"
 msgstr "Les comptes sont définis automatiquement par le système mais confirment ces valeurs par défaut"
 
-#: accounts/doctype/payment_request/payment_request.py:144
+#: accounts/doctype/payment_request/payment_request.py:147
 msgid "The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document."
 msgstr "Le montant {0} défini dans cette requête de paiement est différent du montant calculé de tous les plans de paiement: {1}.\\nVeuillez vérifier que c'est correct avant de valider le document."
 
@@ -71896,7 +73138,7 @@
 msgid "The currency of invoice {} ({}) is different from the currency of this dunning ({})."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:812
+#: manufacturing/doctype/work_order/work_order.js:871
 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM."
 msgstr ""
 
@@ -71933,7 +73175,7 @@
 msgid "The following Items, having Putaway Rules, could not be accomodated:"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:414
+#: assets/doctype/asset/depreciation.py:412
 msgid "The following assets have failed to automatically post depreciation entries: {0}"
 msgstr ""
 
@@ -71945,7 +73187,7 @@
 msgid "The following employees are currently still reporting to {0}:"
 msgstr "Les employés suivants relèvent toujours de {0}:"
 
-#: stock/doctype/material_request/material_request.py:773
+#: stock/doctype/material_request/material_request.py:785
 msgid "The following {0} were created: {1}"
 msgstr "Les {0} suivants ont été créés: {1}"
 
@@ -71991,7 +73233,7 @@
 msgid "The parent account {0} does not exists in the uploaded template"
 msgstr "Le compte parent {0} n'existe pas dans le modèle téléchargé"
 
-#: accounts/doctype/payment_request/payment_request.py:133
+#: accounts/doctype/payment_request/payment_request.py:136
 msgid "The payment gateway account in plan {0} is different from the payment gateway account in this payment request"
 msgstr "Le compte passerelle de paiement dans le plan {0} est différent du compte passerelle de paiement dans cette requête de paiement."
 
@@ -72016,15 +73258,15 @@
 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:742
+#: public/js/utils.js:814
 msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.js:116
+#: stock/doctype/pick_list/pick_list.js:137
 msgid "The reserved stock will be released. Are you certain you wish to proceed?"
 msgstr ""
 
-#: accounts/doctype/account/account.py:198
+#: accounts/doctype/account/account.py:217
 msgid "The root account {0} must be a group"
 msgstr "Le compte racine {0} doit être un groupe"
 
@@ -72040,7 +73282,7 @@
 msgid "The selected item cannot have Batch"
 msgstr "L’article sélectionné ne peut pas avoir de Lot"
 
-#: assets/doctype/asset/asset.js:570
+#: assets/doctype/asset/asset.js:643
 msgid "The selected {0} does not contain the selected Asset Item."
 msgstr ""
 
@@ -72064,7 +73306,7 @@
 msgid "The shares don't exist with the {0}"
 msgstr "Les actions n'existent pas pour {0}"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:461
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:515
 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 ""
 
@@ -72072,24 +73314,16 @@
 msgid "The sync has started in the background, please check the {0} list for new records."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:155
 #: accounts/doctype/journal_entry/journal_entry.py:162
+#: accounts/doctype/journal_entry/journal_entry.py:169
 msgid "The task has been enqueued as a background job."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:244
-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 Entry and revert to the Draft stage"
-msgstr ""
-
-#: stock/doctype/stock_entry/stock_entry.py:255
-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 Entry and revert to the Submitted stage"
-msgstr ""
-
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:754
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:808
 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 "La tâche a été mise en file d'attente en tant que tâche en arrière-plan. En cas de problème de traitement en arrière-plan, le système ajoute un commentaire concernant l'erreur sur ce rapprochement des stocks et revient au stade de brouillon."
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:765
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:819
 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 ""
 
@@ -72116,31 +73350,31 @@
 msgid "The value {0} is already assigned to an existing Item {1}."
 msgstr "La valeur {0} est déjà attribuée à un élément existant {1}."
 
-#: manufacturing/doctype/work_order/work_order.js:832
+#: manufacturing/doctype/work_order/work_order.js:899
 msgid "The warehouse where you store finished Items before they are shipped."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:827
+#: manufacturing/doctype/work_order/work_order.js:892
 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:837
+#: manufacturing/doctype/work_order/work_order.js:904
 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:671
+#: manufacturing/doctype/job_card/job_card.py:678
 msgid "The {0} ({1}) must be equal to {2} ({3})"
 msgstr "Le {0} ({1}) doit être égal à {2} ({3})"
 
-#: stock/doctype/material_request/material_request.py:779
+#: stock/doctype/material_request/material_request.py:791
 msgid "The {0} {1} created successfully"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:762
+#: manufacturing/doctype/job_card/job_card.py:769
 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:501
+#: assets/doctype/asset/asset.py:503
 msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
 msgstr "Il y a une maintenance active ou des réparations sur l'actif. Vous devez les compléter tous avant d'annuler l'élément."
 
@@ -72148,19 +73382,27 @@
 msgid "There are inconsistencies between the rate, no of shares and the amount calculated"
 msgstr "Il existe des incohérences entre le prix unitaire, le nombre d'actions et le montant calculé"
 
-#: utilities/bulk_transaction.py:41
+#: accounts/doctype/account/account.py:202
+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
 msgid "There are no Failed transactions"
 msgstr ""
 
-#: www/book_appointment/index.js:89
+#: setup/demo.py:108
+msgid "There are no active Fiscal Years for which Demo Data can be generated."
+msgstr ""
+
+#: www/book_appointment/index.js:95
 msgid "There are no slots available on this date"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:245
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:273
 msgid "There are only {0} asset created or linked to {1}. Please create or link {2} Assets with respective document."
 msgstr ""
 
-#: stock/doctype/item/item.js:829
+#: stock/doctype/item/item.js:913
 msgid "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit <a href='https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/item-valuation-fifo-and-moving-average' target='_blank'>Item Valuation, FIFO and Moving Average.</a>"
 msgstr ""
 
@@ -72168,6 +73410,10 @@
 msgid "There aren't any item variants for the selected item"
 msgstr ""
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:10
+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
 msgid "There can only be 1 Account per Company in {0} {1}"
 msgstr "Il ne peut y avoir qu’un Compte par Société dans {0} {1}"
@@ -72192,36 +73438,36 @@
 msgid "There is nothing to edit."
 msgstr "Il n'y a rien à modifier."
 
-#: stock/doctype/stock_entry/stock_entry.py:1279
+#: stock/doctype/stock_entry/stock_entry.py:1288
 msgid "There must be atleast 1 Finished Good in this Stock Entry"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:135
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:151
 msgid "There was an error creating Bank Account while linking with Plaid."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:205
+#: selling/page/point_of_sale/pos_controller.js:228
 msgid "There was an error saving the document."
 msgstr "Une erreur s'est produite lors de l'enregistrement du document."
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:236
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:252
 msgid "There was an error syncing transactions."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:157
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:173
 msgid "There was an error updating Bank Account {} while linking with Plaid."
 msgstr ""
 
-#: accounts/doctype/bank/bank.js:113
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:109
+#: accounts/doctype/bank/bank.js:115
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:114
 msgid "There was an issue connecting to Plaid's authentication server. Check browser console for more information"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:279
+#: selling/page/point_of_sale/pos_past_order_summary.js:289
 msgid "There were errors while sending email. Please try again."
 msgstr "Il y a eu des erreurs lors de l'envoi d’emails. Veuillez essayer à nouveau."
 
-#: accounts/utils.py:924
+#: accounts/utils.py:933
 msgid "There were issues unlinking payment entry {0}."
 msgstr ""
 
@@ -72232,11 +73478,11 @@
 msgid "This Account has '0' balance in either Base Currency or Account Currency"
 msgstr ""
 
-#: stock/doctype/item/item.js:88
+#: stock/doctype/item/item.js:99
 msgid "This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set"
 msgstr "Cet Article est un Modèle et ne peut être utilisé dans les transactions. Les Attributs d’Articles seront copiés dans les variantes sauf si ‘Pas de Copie’ est coché"
 
-#: stock/doctype/item/item.js:118
+#: stock/doctype/item/item.js:158
 msgid "This Item is a Variant of {0} (Template)."
 msgstr "Cet article est une Variante de {0} (Modèle)."
 
@@ -72244,11 +73490,11 @@
 msgid "This Month's Summary"
 msgstr "Résumé Mensuel"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:26
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
 msgid "This Warehouse will be auto-updated in the Target Warehouse field of Work Order."
 msgstr "Cet entrepôt sera mis à jour automatiquement dans le champ Entrepôt cible de l'ordre de fabrication."
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:21
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:24
 msgid "This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Orders."
 msgstr "Cet entrepôt sera mis à jour automatiquement dans le champ Entrepôt de travaux en cours des bons de travail."
 
@@ -72272,7 +73518,7 @@
 msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
 msgstr "Ce document excède la limite de {0} {1} pour l’article {4}. Faites-vous un autre {3} contre le même {2} ?"
 
-#: stock/doctype/delivery_note/delivery_note.js:360
+#: stock/doctype/delivery_note/delivery_note.js:406
 msgid "This field is used to set the 'Customer'."
 msgstr ""
 
@@ -72283,7 +73529,7 @@
 msgid "This filter will be applied to Journal Entry."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:158
+#: manufacturing/doctype/bom/bom.js:171
 msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
 msgstr ""
 
@@ -72312,7 +73558,7 @@
 msgid "This is a location where scraped materials are stored."
 msgstr "Il s'agit d'un emplacement où les matériaux raclés sont stockés."
 
-#: accounts/doctype/account/account.js:40
+#: accounts/doctype/account/account.js:36
 msgid "This is a root account and cannot be edited."
 msgstr "Il s'agit d'un compte racine qui ne peut être modifié."
 
@@ -72324,11 +73570,11 @@
 msgid "This is a root department and cannot be edited."
 msgstr "Ceci est un département racine et ne peut pas être modifié."
 
-#: setup/doctype/item_group/item_group.js:81
+#: setup/doctype/item_group/item_group.js:98
 msgid "This is a root item group and cannot be edited."
 msgstr "Il s’agit d’un groupe d'élément racine qui ne peut être modifié."
 
-#: setup/doctype/sales_person/sales_person.js:36
+#: setup/doctype/sales_person/sales_person.js:46
 msgid "This is a root sales person and cannot be edited."
 msgstr "C’est un commercial racine qui ne peut être modifié."
 
@@ -72360,19 +73606,19 @@
 msgid "This is based on transactions against this Supplier. See timeline below for details"
 msgstr "Basé sur les transactions avec ce fournisseur. Voir la chronologie ci-dessous pour plus de détails"
 
-#: stock/doctype/stock_settings/stock_settings.js:24
+#: stock/doctype/stock_settings/stock_settings.js:26
 msgid "This is considered dangerous from accounting point of view."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:529
 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
 msgstr "Ceci est fait pour gérer la comptabilité des cas où le reçu d'achat est créé après la facture d'achat"
 
-#: manufacturing/doctype/work_order/work_order.js:822
+#: manufacturing/doctype/work_order/work_order.js:885
 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox."
 msgstr ""
 
-#: stock/doctype/item/item.js:819
+#: stock/doctype/item/item.js:901
 msgid "This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked."
 msgstr ""
 
@@ -72380,7 +73626,7 @@
 msgid "This item filter has already been applied for the {0}"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.js:371
+#: stock/doctype/delivery_note/delivery_note.js:419
 msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
 msgstr ""
 
@@ -72388,7 +73634,7 @@
 msgid "This schedule was created when Asset {0} was adjusted through Asset Value Adjustment {1}."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:516
+#: assets/doctype/asset_capitalization/asset_capitalization.py:522
 msgid "This schedule was created when Asset {0} was consumed through Asset Capitalization {1}."
 msgstr ""
 
@@ -72396,27 +73642,27 @@
 msgid "This schedule was created when Asset {0} was repaired through Asset Repair {1}."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:674
+#: assets/doctype/asset_capitalization/asset_capitalization.py:680
 msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:496
+#: assets/doctype/asset/depreciation.py:494
 msgid "This schedule was created when Asset {0} was restored."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1325
+#: accounts/doctype/sales_invoice/sales_invoice.py:1336
 msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:454
+#: assets/doctype/asset/depreciation.py:452
 msgid "This schedule was created when Asset {0} was scrapped."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1336
+#: accounts/doctype/sales_invoice/sales_invoice.py:1347
 msgid "This schedule was created when Asset {0} was sold through Sales Invoice {1}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1117
+#: assets/doctype/asset/asset.py:1121
 msgid "This schedule was created when Asset {0} was updated after being split into new Asset {1}."
 msgstr ""
 
@@ -72432,7 +73678,7 @@
 msgid "This schedule was created when Asset {0}'s shifts were adjusted through Asset Shift Allocation {1}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1180
+#: assets/doctype/asset/asset.py:1184
 msgid "This schedule was created when new Asset {0} was split from Asset {1}."
 msgstr ""
 
@@ -72443,10 +73689,15 @@
 msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
 msgstr "Cette section permet à l'utilisateur de définir le corps et le texte de clôture de la lettre de relance pour le type de relance en fonction de la langue, qui peut être utilisée dans l'impression."
 
-#: stock/doctype/delivery_note/delivery_note.js:365
+#: stock/doctype/delivery_note/delivery_note.js:412
 msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses."
+msgstr ""
+
 #. Description of the 'Abbreviation' (Data) field in DocType 'Item Attribute
 #. Value'
 #: stock/doctype/item_attribute_value/item_attribute_value.json
@@ -72461,7 +73712,7 @@
 msgid "This will restrict user access to other employee records"
 msgstr "Cela limitera l'accès des utilisateurs aux données des autres employés"
 
-#: controllers/selling_controller.py:686
+#: controllers/selling_controller.py:710
 msgid "This {} will be treated as material transfer."
 msgstr ""
 
@@ -72687,7 +73938,7 @@
 msgid "Time in mins."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:654
+#: manufacturing/doctype/job_card/job_card.py:661
 msgid "Time logs are required for {0} {1}"
 msgstr "Des journaux horaires sont requis pour {0} {1}"
 
@@ -72705,11 +73956,12 @@
 msgid "Timeline"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:31
 #: public/js/projects/timer.js:5
 msgid "Timer"
 msgstr "Minuteur"
 
-#: public/js/projects/timer.js:142
+#: public/js/projects/timer.js:149
 msgid "Timer exceeded the given hours."
 msgstr "La minuterie a dépassé les heures configurées."
 
@@ -72751,11 +74003,11 @@
 msgid "Timesheet for tasks."
 msgstr "Feuille de temps pour les tâches."
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:756
+#: accounts/doctype/sales_invoice/sales_invoice.py:773
 msgid "Timesheet {0} is already completed or cancelled"
 msgstr "La Feuille de Temps {0} est déjà terminée ou annulée"
 
-#: projects/doctype/timesheet/timesheet.py:520 templates/pages/projects.html:59
+#: projects/doctype/timesheet/timesheet.py:530 templates/pages/projects.html:59
 msgid "Timesheets"
 msgstr "Feuilles de temps"
 
@@ -72954,7 +74206,7 @@
 msgid "Title"
 msgstr "Titre"
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:967
+#: accounts/doctype/sales_invoice/sales_invoice.js:1043
 #: templates/pages/projects.html:68
 msgid "To"
 msgstr "À"
@@ -72977,15 +74229,15 @@
 msgid "To"
 msgstr "À"
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "To Be Paid"
 msgstr "Être payé"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:36
-#: selling/doctype/sales_order/sales_order_list.js:39
-#: stock/doctype/delivery_note/delivery_note_list.js:12
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:12
+#: buying/doctype/purchase_order/purchase_order_list.js:37
+#: selling/doctype/sales_order/sales_order_list.js:50
+#: selling/doctype/sales_order/sales_order_list.js:52
+#: stock/doctype/delivery_note/delivery_note_list.js:22
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:21
 msgid "To Bill"
 msgstr "À Facturer"
 
@@ -73026,13 +74278,13 @@
 msgid "To Currency"
 msgstr "Devise Finale"
 
-#: accounts/doctype/payment_entry/payment_entry.js:648
-#: accounts/doctype/payment_entry/payment_entry.js:652
+#: accounts/doctype/payment_entry/payment_entry.js:794
+#: accounts/doctype/payment_entry/payment_entry.js:798
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:23
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:23
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:15
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:24
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:45
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:23
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:44
 #: accounts/report/financial_ratios/financial_ratios.js:48
 #: accounts/report/general_ledger/general_ledger.js:30
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -73040,76 +74292,76 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:15
 #: 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:25
+#: accounts/report/pos_register/pos_register.js:24
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:15
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:24
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:55
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:55
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:23
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:54
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:54
 #: accounts/report/trial_balance/trial_balance.js:43
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:43
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:22
-#: buying/report/procurement_tracker/procurement_tracker.js:34
-#: buying/report/purchase_analytics/purchase_analytics.js:43
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:26
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:26
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:23
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:30
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:30
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:21
+#: buying/report/procurement_tracker/procurement_tracker.js:33
+#: buying/report/purchase_analytics/purchase_analytics.js:42
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:25
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:25
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:22
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:29
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:29
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:24
 #: crm/report/campaign_efficiency/campaign_efficiency.js:13
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:16
-#: crm/report/lead_conversion_time/lead_conversion_time.js:16
-#: crm/report/lead_details/lead_details.js:24
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:15
+#: crm/report/lead_conversion_time/lead_conversion_time.js:15
+#: crm/report/lead_details/lead_details.js:23
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:13
-#: crm/report/lost_opportunity/lost_opportunity.js:24
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:29
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:21
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:22
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:15
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:24
-#: manufacturing/report/process_loss_report/process_loss_report.js:37
-#: manufacturing/report/production_analytics/production_analytics.js:24
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:15
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:24
+#: crm/report/lost_opportunity/lost_opportunity.js:23
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:27
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:20
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:23
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:16
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:36
+#: manufacturing/report/production_analytics/production_analytics.js:23
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:14
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:23
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:14
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:14
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:37
-#: public/js/stock_analytics.js:48
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:16
-#: regional/report/uae_vat_201/uae_vat_201.js:24
-#: regional/report/vat_audit_report/vat_audit_report.js:25
-#: selling/page/sales_funnel/sales_funnel.js:40
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:13
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:34
+#: public/js/stock_analytics.js:75
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:15
+#: regional/report/uae_vat_201/uae_vat_201.js:23
+#: regional/report/vat_audit_report/vat_audit_report.js:24
+#: selling/page/sales_funnel/sales_funnel.js:44
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:31
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:26
-#: selling/report/sales_analytics/sales_analytics.js:43
-#: selling/report/sales_order_analysis/sales_order_analysis.js:26
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:29
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:28
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:29
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:25
+#: selling/report/sales_analytics/sales_analytics.js:50
+#: selling/report/sales_order_analysis/sales_order_analysis.js:25
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:27
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:27
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:27
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:27
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:16
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:24
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:24
-#: stock/report/delayed_item_report/delayed_item_report.js:24
-#: stock/report/delayed_order_report/delayed_order_report.js:24
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:28
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:22
+#: stock/report/delayed_item_report/delayed_item_report.js:23
+#: stock/report/delayed_order_report/delayed_order_report.js:23
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:27
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:14
-#: stock/report/reserved_stock/reserved_stock.js:26
+#: stock/report/reserved_stock/reserved_stock.js:23
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:22
-#: stock/report/stock_analytics/stock_analytics.js:70
+#: stock/report/stock_analytics/stock_analytics.js:69
 #: stock/report/stock_balance/stock_balance.js:24
 #: stock/report/stock_ledger/stock_ledger.js:23
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:22
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:17
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:16
-#: support/report/issue_analytics/issue_analytics.js:32
-#: support/report/issue_summary/issue_summary.js:32
-#: support/report/support_hour_distribution/support_hour_distribution.js:15
-#: utilities/report/youtube_interactions/youtube_interactions.js:15
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:16
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:15
+#: support/report/issue_analytics/issue_analytics.js:31
+#: support/report/issue_summary/issue_summary.js:31
+#: support/report/support_hour_distribution/support_hour_distribution.js:14
+#: utilities/report/youtube_interactions/youtube_interactions.js:14
 msgid "To Date"
 msgstr "Jusqu'au"
 
@@ -73215,7 +74467,7 @@
 msgid "To Date"
 msgstr "Jusqu'au"
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 #: setup/doctype/holiday_list/holiday_list.py:115
 msgid "To Date cannot be before From Date"
 msgstr "La date de fin ne peut être antérieure à la date de début"
@@ -73244,8 +74496,8 @@
 msgid "To Datetime"
 msgstr "À la Date"
 
-#: selling/doctype/sales_order/sales_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:30
+#: selling/doctype/sales_order/sales_order_list.js:32
+#: selling/doctype/sales_order/sales_order_list.js:42
 msgid "To Deliver"
 msgstr "À Livrer"
 
@@ -73262,7 +74514,7 @@
 msgid "To Deliver"
 msgstr "À Livrer"
 
-#: selling/doctype/sales_order/sales_order_list.js:26
+#: selling/doctype/sales_order/sales_order_list.js:36
 msgid "To Deliver and Bill"
 msgstr "À Livrer et Facturer"
 
@@ -73291,7 +74543,7 @@
 msgid "To Doctype"
 msgstr ""
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:85
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:83
 msgid "To Due Date"
 msgstr ""
 
@@ -73301,7 +74553,7 @@
 msgid "To Employee"
 msgstr "À l'employé"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:53
+#: accounts/report/budget_variance_report/budget_variance_report.js:51
 msgid "To Fiscal Year"
 msgstr "À l'année fiscale"
 
@@ -73341,8 +74593,8 @@
 msgid "To Package No."
 msgstr "Au N° de Paquet"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:12
-#: selling/doctype/sales_order/sales_order_list.js:14
+#: buying/doctype/purchase_order/purchase_order_list.js:21
+#: selling/doctype/sales_order/sales_order_list.js:25
 msgid "To Pay"
 msgstr ""
 
@@ -73364,8 +74616,8 @@
 msgid "To Payment Date"
 msgstr ""
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:44
-#: manufacturing/report/work_order_summary/work_order_summary.js:30
+#: manufacturing/report/job_card_summary/job_card_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:29
 msgid "To Posting Date"
 msgstr "À la date de publication"
 
@@ -73381,7 +74633,7 @@
 msgid "To Range"
 msgstr "Au Rang"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:18
+#: buying/doctype/purchase_order/purchase_order_list.js:30
 msgid "To Receive"
 msgstr "À Recevoir"
 
@@ -73391,7 +74643,7 @@
 msgid "To Receive"
 msgstr "À Recevoir"
 
-#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: buying/doctype/purchase_order/purchase_order_list.js:25
 msgid "To Receive and Bill"
 msgstr "À Recevoir et Facturer"
 
@@ -73427,6 +74679,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:92
 #: manufacturing/report/job_card_summary/job_card_summary.py:180
+#: templates/pages/timelog_info.html:34
 msgid "To Time"
 msgstr "Horaire de Fin"
 
@@ -73508,7 +74761,8 @@
 msgid "To Value"
 msgstr "Valeur Finale"
 
-#: stock/doctype/batch/batch.js:83
+#: manufacturing/doctype/plant_floor/plant_floor.js:196
+#: stock/doctype/batch/batch.js:93
 msgid "To Warehouse"
 msgstr "À l'Entrepôt"
 
@@ -73518,11 +74772,11 @@
 msgid "To Warehouse (Optional)"
 msgstr "À l'Entrepôt (Facultatif)"
 
-#: manufacturing/doctype/bom/bom.js:735
+#: manufacturing/doctype/bom/bom.js:768
 msgid "To add Operations tick the 'With Operations' checkbox."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:550
+#: manufacturing/doctype/production_plan/production_plan.js:598
 msgid "To add subcontracted Item's raw materials if include exploded items is disabled."
 msgstr ""
 
@@ -73547,11 +74801,11 @@
 msgid "To be Delivered to Customer"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:521
+#: accounts/doctype/sales_invoice/sales_invoice.py:534
 msgid "To cancel a {} you need to cancel the POS Closing Entry {}."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:99
+#: accounts/doctype/payment_request/payment_request.py:100
 msgid "To create a Payment Request reference document is required"
 msgstr "Pour créer une Demande de Paiement, un document de référence est requis"
 
@@ -73563,12 +74817,12 @@
 msgid "To enable Capital Work in Progress Accounting,"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:545
+#: manufacturing/doctype/production_plan/production_plan.js:591
 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:1625
-#: controllers/accounts_controller.py:2559
+#: accounts/doctype/payment_entry/payment_entry.py:1644
+#: controllers/accounts_controller.py:2644
 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
 msgstr "Pour inclure la taxe de la ligne {0} dans le prix de l'Article, les taxes des lignes {1} doivent également être incluses"
 
@@ -73576,7 +74830,7 @@
 msgid "To merge, following properties must be same for both items"
 msgstr "Pour fusionner, les propriétés suivantes doivent être les mêmes pour les deux articles"
 
-#: accounts/doctype/account/account.py:498
+#: accounts/doctype/account/account.py:517
 msgid "To overrule this, enable '{0}' in company {1}"
 msgstr "Pour contourner ce problème, activez «{0}» dans l'entreprise {1}"
 
@@ -73584,11 +74838,11 @@
 msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
 msgstr "Pour continuer à modifier cette valeur d'attribut, activez {0} dans les paramètres de variante d'article."
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:578
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:582
 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:598
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:602
 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
 msgstr ""
 
@@ -73598,12 +74852,12 @@
 msgstr ""
 
 #: accounts/report/financial_statements.py:576
-#: accounts/report/general_ledger/general_ledger.py:273
+#: accounts/report/general_ledger/general_ledger.py:286
 #: accounts/report/trial_balance/trial_balance.py:278
 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:174
+#: selling/page/point_of_sale/pos_controller.js:192
 msgid "Toggle Recent Orders"
 msgstr "Toggle Commandes récentes"
 
@@ -73613,16 +74867,20 @@
 msgid "Token Endpoint"
 msgstr "Point de terminaison de jeton"
 
+#: 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:485
-#: buying/doctype/purchase_order/purchase_order.js:541
-#: buying/doctype/request_for_quotation/request_for_quotation.js:57
-#: buying/doctype/request_for_quotation/request_for_quotation.js:143
-#: buying/doctype/request_for_quotation/request_for_quotation.js:381
-#: buying/doctype/request_for_quotation/request_for_quotation.js:387
-#: buying/doctype/supplier_quotation/supplier_quotation.js:55
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:116
+#: buying/doctype/purchase_order/purchase_order.js:560
+#: buying/doctype/purchase_order/purchase_order.js:636
+#: 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
+#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: buying/doctype/supplier_quotation/supplier_quotation.js:58
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:121
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: stock/workspace/stock/stock.json
 msgid "Tools"
@@ -73637,10 +74895,13 @@
 #: 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/general_ledger/general_ledger.py:56
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:636
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:642
 #: accounts/report/profitability_analysis/profitability_analysis.py:93
 #: accounts/report/profitability_analysis/profitability_analysis.py:98
 #: accounts/report/trial_balance/trial_balance.py:344
@@ -73836,6 +75097,11 @@
 msgid "Total Achieved"
 msgstr "Total Obtenu"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Active Items"
+msgstr ""
+
 #: accounts/report/budget_variance_report/budget_variance_report.py:125
 msgid "Total Actual"
 msgstr "Total réel"
@@ -73894,7 +75160,7 @@
 msgid "Total Allocations"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:233
 #: 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
@@ -73938,7 +75204,7 @@
 msgid "Total Amount in Words"
 msgstr "Montant Total En Toutes Lettres"
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:181
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:209
 msgid "Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges"
 msgstr "Total des Frais Applicables dans la Table des Articles de Reçus d’Achat doit être égal au Total des Taxes et Frais"
 
@@ -74054,7 +75320,7 @@
 msgid "Total Commission"
 msgstr "Total de la Commission"
 
-#: manufacturing/doctype/job_card/job_card.py:667
+#: manufacturing/doctype/job_card/job_card.py:674
 #: manufacturing/report/job_card_summary/job_card_summary.py:174
 msgid "Total Completed Qty"
 msgstr "Total terminé Quantité"
@@ -74071,11 +75337,11 @@
 msgid "Total Consumed Material Cost (via Stock Entry)"
 msgstr "Coût total du matériel consommé (via écriture de stock)"
 
-#: setup/doctype/sales_person/sales_person.js:12
+#: setup/doctype/sales_person/sales_person.js:17
 msgid "Total Contribution Amount Against Invoices: {0}"
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person.js:9
+#: setup/doctype/sales_person/sales_person.js:10
 msgid "Total Contribution Amount Against Orders: {0}"
 msgstr ""
 
@@ -74121,7 +75387,7 @@
 msgid "Total Credit"
 msgstr "Total Crédit"
 
-#: accounts/doctype/journal_entry/journal_entry.py:225
+#: accounts/doctype/journal_entry/journal_entry.py:241
 msgid "Total Credit/ Debit Amount should be same as linked Journal Entry"
 msgstr "Le montant total du crédit / débit doit être le même que dans l'écriture de journal liée"
 
@@ -74131,7 +75397,7 @@
 msgid "Total Debit"
 msgstr "Total Débit"
 
-#: accounts/doctype/journal_entry/journal_entry.py:802
+#: accounts/doctype/journal_entry/journal_entry.py:829
 msgid "Total Debit must be equal to Total Credit. The difference is {0}"
 msgstr "Le Total du Débit doit être égal au Total du Crédit. La différence est de {0}"
 
@@ -74201,6 +75467,16 @@
 msgid "Total Income This Year"
 msgstr "Revenu total cette année"
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
@@ -74214,6 +75490,7 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:196
+#: accounts/report/accounts_receivable/accounts_receivable.html:160
 msgid "Total Invoiced Amount"
 msgstr "Montant total facturé"
 
@@ -74221,6 +75498,10 @@
 msgid "Total Issues"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Total Items"
+msgstr ""
+
 #: accounts/report/balance_sheet/balance_sheet.py:208
 msgid "Total Liability"
 msgstr ""
@@ -74329,7 +75610,7 @@
 msgid "Total Order Value"
 msgstr "Total de la Valeur de la Commande"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:629
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:635
 msgid "Total Other Charges"
 msgstr ""
 
@@ -74337,13 +75618,25 @@
 msgid "Total Outgoing"
 msgstr "Total sortant"
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Total Outgoing Value (Consumption)"
 msgstr ""
 
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:9
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:97
+#: accounts/report/accounts_receivable/accounts_receivable.html:79
 msgid "Total Outstanding"
 msgstr "Total en suspens"
 
@@ -74354,18 +75647,20 @@
 msgstr "Total en suspens"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:205
+#: accounts/report/accounts_receivable/accounts_receivable.html:163
 msgid "Total Outstanding Amount"
 msgstr "Encours total"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:197
+#: accounts/report/accounts_receivable/accounts_receivable.html:161
 msgid "Total Paid Amount"
 msgstr "Montant total payé"
 
-#: controllers/accounts_controller.py:2266
+#: controllers/accounts_controller.py:2358
 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
 msgstr "Le montant total du paiement dans l'échéancier doit être égal au Total Général / Total Arrondi"
 
-#: accounts/doctype/payment_request/payment_request.py:112
+#: accounts/doctype/payment_request/payment_request.py:115
 msgid "Total Payment Request amount cannot be greater than {0} amount"
 msgstr "Le montant total de la demande de paiement ne peut être supérieur à {0}."
 
@@ -74397,7 +75692,7 @@
 msgid "Total Purchase Cost (via Purchase Invoice)"
 msgstr "Coût d'Achat Total (via Facture d'Achat)"
 
-#: projects/doctype/project/project.js:107
+#: projects/doctype/project/project.js:131
 msgid "Total Purchase Cost has been updated"
 msgstr ""
 
@@ -74413,6 +75708,8 @@
 msgstr "Qté Totale"
 
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:23
+#: selling/page/point_of_sale/pos_item_cart.js:520
+#: selling/page/point_of_sale/pos_item_cart.js:524
 msgid "Total Quantity"
 msgstr "Quantité totale"
 
@@ -74523,6 +75820,11 @@
 msgid "Total Stock Summary"
 msgstr "Récapitulatif de l'Inventaire Total"
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Stock Value"
+msgstr ""
+
 #. Label of a Float field in DocType 'Purchase Order Item Supplied'
 #: buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
 msgctxt "Purchase Order Item Supplied"
@@ -74545,7 +75847,7 @@
 msgid "Total Tasks"
 msgstr "Total des tâches"
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:622
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:628
 #: accounts/report/purchase_register/purchase_register.py:263
 msgid "Total Tax"
 msgstr "Total des Taxes"
@@ -74686,7 +75988,7 @@
 msgid "Total Time in Mins"
 msgstr "Temps total en minutes"
 
-#: public/js/utils.js:105
+#: public/js/utils.js:129
 msgid "Total Unpaid: {0}"
 msgstr "Total des Impayés : {0}"
 
@@ -74717,6 +76019,11 @@
 msgid "Total Views"
 msgstr ""
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Warehouses"
+msgstr ""
+
 #. Label of a Float field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
 msgctxt "Delivery Note Item"
@@ -74777,20 +76084,34 @@
 msgid "Total Working Hours"
 msgstr "Total des Heures Travaillées"
 
-#: controllers/accounts_controller.py:1838
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Total Working Hours"
+msgstr "Total des Heures Travaillées"
+
+#: controllers/accounts_controller.py:1930
 msgid "Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})"
 msgstr "Avance totale ({0}) pour la Commande {1} ne peut pas être supérieure au Total Général ({2})"
 
-#: controllers/selling_controller.py:186
+#: controllers/selling_controller.py:187
 msgid "Total allocated percentage for sales team should be 100"
 msgstr "Pourcentage total attribué à l'équipe commerciale devrait être de 100"
 
+#: manufacturing/doctype/workstation/workstation.py:229
+msgid "Total completed quantity: {0}"
+msgstr ""
+
 #: selling/doctype/customer/customer.py:157
 msgid "Total contribution percentage should be equal to 100"
 msgstr "Le pourcentage total de contribution devrait être égal à 100"
 
+#: projects/doctype/project/project_dashboard.html:2
+msgid "Total hours: {0}"
+msgstr ""
+
 #: accounts/doctype/pos_invoice/pos_invoice.py:444
-#: accounts/doctype/sales_invoice/sales_invoice.py:505
+#: accounts/doctype/sales_invoice/sales_invoice.py:518
 msgid "Total payments amount can't be greater than {}"
 msgstr "Le montant total des paiements ne peut être supérieur à {}"
 
@@ -74805,7 +76126,7 @@
 msgid "Total {0} ({1})"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:162
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:190
 msgid "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'"
 msgstr "Le Total {0} pour tous les articles est nul, peut-être devriez-vous modifier ‘Distribuez les Frais sur la Base de’"
 
@@ -74818,6 +76139,7 @@
 msgstr "Total (Qté)"
 
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.py:88
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Totals"
 msgstr "Totaux"
 
@@ -74902,6 +76224,11 @@
 msgid "Track Service Level Agreement"
 msgstr "Suivi du contrat de niveau de service"
 
+#. Description of a DocType
+#: accounts/doctype/cost_center/cost_center.json
+msgid "Track separate Income and Expense for product verticals or divisions."
+msgstr ""
+
 #. Label of a Select field in DocType 'Shipment'
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
@@ -74920,7 +76247,7 @@
 msgid "Tracking URL"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: manufacturing/doctype/workstation/workstation_dashboard.py:10
 msgid "Transaction"
 msgstr ""
@@ -74962,7 +76289,7 @@
 msgstr "Devise de la Transaction"
 
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:66
-#: selling/report/territory_wise_sales/territory_wise_sales.js:11
+#: selling/report/territory_wise_sales/territory_wise_sales.js:9
 msgid "Transaction Date"
 msgstr "Date de la transaction"
 
@@ -75002,12 +76329,21 @@
 msgid "Transaction Date"
 msgstr "Date de la transaction"
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:490
+msgid "Transaction Deletion Document: {0} is running for this Company. {1}"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
 msgid "Transaction Deletion Record"
 msgstr ""
 
 #. Name of a DocType
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgid "Transaction Deletion Record Details"
+msgstr ""
+
+#. Name of a DocType
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgid "Transaction Deletion Record Item"
 msgstr ""
@@ -75048,7 +76384,7 @@
 msgid "Transaction Settings"
 msgstr "Paramètres des transactions"
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:256
 msgid "Transaction Type"
 msgstr "Type de transaction"
 
@@ -75058,7 +76394,7 @@
 msgid "Transaction Type"
 msgstr "Type de transaction"
 
-#: accounts/doctype/payment_request/payment_request.py:122
+#: accounts/doctype/payment_request/payment_request.py:125
 msgid "Transaction currency must be same as Payment Gateway currency"
 msgstr "La devise de la Transaction doit être la même que la devise de la Passerelle de Paiement"
 
@@ -75066,15 +76402,15 @@
 msgid "Transaction currency: {0} cannot be different from Bank Account({1}) currency: {2}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:647
+#: manufacturing/doctype/job_card/job_card.py:654
 msgid "Transaction not allowed against stopped Work Order {0}"
 msgstr "La transaction n'est pas autorisée pour l'ordre de fabrication arrêté {0}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1112
+#: accounts/doctype/payment_entry/payment_entry.py:1121
 msgid "Transaction reference no {0} dated {1}"
 msgstr "Référence de la transaction n° {0} datée du {1}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: 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
@@ -75089,12 +76425,12 @@
 msgid "Transactions Annual History"
 msgstr "Historique annuel des transactions"
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:107
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:117
 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:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:364
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:208
 msgid "Transfer"
 msgstr "Transférer"
 
@@ -75123,11 +76459,11 @@
 msgid "Transfer"
 msgstr "Transférer"
 
-#: assets/doctype/asset/asset.js:83
+#: assets/doctype/asset/asset.js:84
 msgid "Transfer Asset"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:318
+#: manufacturing/doctype/production_plan/production_plan.js:345
 msgid "Transfer From Warehouses"
 msgstr ""
 
@@ -75143,7 +76479,7 @@
 msgid "Transfer Material Against"
 msgstr "Transférer du matériel contre"
 
-#: manufacturing/doctype/production_plan/production_plan.js:313
+#: manufacturing/doctype/production_plan/production_plan.js:340
 msgid "Transfer Materials For Warehouse {0}"
 msgstr "Transférer des matériaux pour l'entrepôt {0}"
 
@@ -75163,7 +76499,7 @@
 msgid "Transfer Type"
 msgstr "Type de transfert"
 
-#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:31
 msgid "Transferred"
 msgstr "Transféré"
 
@@ -75173,6 +76509,7 @@
 msgid "Transferred"
 msgstr "Transféré"
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:96
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:131
 msgid "Transferred Qty"
 msgstr "Quantité Transférée"
@@ -75209,7 +76546,7 @@
 msgid "Transit"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:371
+#: stock/doctype/stock_entry/stock_entry.js:425
 msgid "Transit Entry"
 msgstr ""
 
@@ -75290,8 +76627,8 @@
 msgid "Tree Details"
 msgstr "Détails de l’Arbre"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:9
-#: selling/report/sales_analytics/sales_analytics.js:9
+#: buying/report/purchase_analytics/purchase_analytics.js:8
+#: selling/report/sales_analytics/sales_analytics.js:8
 msgid "Tree Type"
 msgstr "Type d'Arbre"
 
@@ -75571,10 +76908,11 @@
 #: 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
+#: 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:63 public/js/utils.js:632
-#: selling/doctype/sales_order/sales_order.js:999
+#: public/js/stock_analytics.js:94 public/js/utils.js:693
+#: 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
 #: setup/doctype/uom/uom.json
@@ -75905,7 +77243,7 @@
 msgid "UOM Conversion Factor"
 msgstr "Facteur de Conversion de l'UdM"
 
-#: manufacturing/doctype/production_plan/production_plan.py:1248
+#: manufacturing/doctype/production_plan/production_plan.py:1270
 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
 msgstr "Facteur de conversion UdM ({0} -&gt; {1}) introuvable pour l'article: {2}"
 
@@ -75919,7 +77257,7 @@
 msgid "UOM Name"
 msgstr "Nom UdM"
 
-#: stock/doctype/stock_entry/stock_entry.py:2773
+#: stock/doctype/stock_entry/stock_entry.py:2809
 msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
 msgstr ""
 
@@ -75963,7 +77301,7 @@
 msgid "URL can only be a string"
 msgstr "L'URL ne peut être qu'une chaîne"
 
-#: public/js/utils/unreconcile.js:20
+#: public/js/utils/unreconcile.js:24
 msgid "UnReconcile"
 msgstr ""
 
@@ -75975,15 +77313,15 @@
 msgid "Unable to find score starting at {0}. You need to have standing scores covering 0 to 100"
 msgstr "Impossible de trouver un score démarrant à {0}. Vous devez avoir des scores couvrant 0 à 100"
 
-#: manufacturing/doctype/work_order/work_order.py:603
-msgid "Unable to find the time slot in the next {0} days for the operation {1}."
-msgstr "Impossible de trouver l'intervalle de temps dans les {0} jours suivants pour l'opération {1}."
+#: manufacturing/doctype/work_order/work_order.py:613
+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
 msgid "Unable to find variable:"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:79
+#: public/js/bank_reconciliation_tool/data_table_manager.js:74
 msgid "Unallocated Amount"
 msgstr "Montant Non Alloué"
 
@@ -76003,7 +77341,7 @@
 msgid "Unassigned Qty"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:115
 msgid "Unblock Invoice"
 msgstr "Débloquer la facture"
 
@@ -76052,7 +77390,7 @@
 msgid "Under Warranty"
 msgstr "Sous Garantie"
 
-#: manufacturing/doctype/workstation/workstation.js:52
+#: manufacturing/doctype/workstation/workstation.js:78
 msgid "Under Working Hours table, you can add start and end times for a Workstation. For example, a Workstation may be active from 9 am to 1 pm, then 2 pm to 5 pm. You can also specify the working hours based on shifts. While scheduling a Work Order, the system will check for the availability of the Workstation based on the working hours specified."
 msgstr ""
 
@@ -76083,11 +77421,12 @@
 msgid "Units of Measure"
 msgstr "Unités de Mesure"
 
-#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:12
+#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:10
+#: projects/doctype/project/project_dashboard.html:7
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: public/js/call_popup/call_popup.js:109
+#: public/js/call_popup/call_popup.js:110
 msgid "Unknown Caller"
 msgstr "Appelant inconnu"
 
@@ -76103,7 +77442,7 @@
 msgid "Unlink Payment on Cancellation of Invoice"
 msgstr "Délier Paiement à l'Annulation de la Facture"
 
-#: accounts/doctype/bank_account/bank_account.js:34
+#: accounts/doctype/bank_account/bank_account.js:33
 msgid "Unlink external integrations"
 msgstr "Dissocier les intégrations externes"
 
@@ -76113,7 +77452,7 @@
 msgid "Unlinked"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:258
+#: accounts/doctype/sales_invoice/sales_invoice.py:263
 #: accounts/doctype/subscription/subscription_list.js:12
 msgid "Unpaid"
 msgstr "Impayé"
@@ -76247,20 +77586,24 @@
 msgid "Unreconciled Entries"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:74
-#: stock/doctype/pick_list/pick_list.js:114
+#: selling/doctype/sales_order/sales_order.js:90
+#: stock/doctype/pick_list/pick_list.js:134
 msgid "Unreserve"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:418
+#: selling/doctype/sales_order/sales_order.js:448
 msgid "Unreserve Stock"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:430
-#: stock/doctype/pick_list/pick_list.js:252
+#: selling/doctype/sales_order/sales_order.js:460
+#: stock/doctype/pick_list/pick_list.js:286
 msgid "Unreserving Stock..."
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Unresolve"
+msgstr ""
+
 #: accounts/doctype/dunning/dunning_list.js:6
 msgid "Unresolved"
 msgstr "Non résolu"
@@ -76312,6 +77655,7 @@
 msgstr "Désinscrit"
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:37
+#: accounts/report/accounts_receivable/accounts_receivable.html:24
 msgid "Until"
 msgstr "Jusqu'à"
 
@@ -76339,22 +77683,23 @@
 msgid "Upcoming Calendar Events "
 msgstr "Prochains Événements du Calendrier"
 
-#: accounts/doctype/account/account.js:210
-#: accounts/doctype/cost_center/cost_center.js:102
-#: public/js/bom_configurator/bom_configurator.bundle.js:367
-#: public/js/utils.js:551 public/js/utils.js:767
-#: public/js/utils/barcode_scanner.js:176
+#: 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/barcode_scanner.js:183
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:164
+#: templates/pages/task_info.html:22
 msgid "Update"
 msgstr "Mettre à Jour"
 
-#: accounts/doctype/account/account.js:58
+#: accounts/doctype/account/account.js:53
 msgid "Update Account Name / Number"
 msgstr "Mettre à jour le nom / numéro du compte"
 
-#: accounts/doctype/account/account.js:158
+#: accounts/doctype/account/account.js:159
 msgid "Update Account Number / Name"
 msgstr "Mettre à jour le numéro de compte / nom"
 
@@ -76400,7 +77745,7 @@
 msgid "Update Auto Repeat Reference"
 msgstr "Mettre à jour la référence de répétition automatique"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:35
 msgid "Update BOM Cost Automatically"
 msgstr "Mettre à jour automatiquement le coût de la nomenclature"
 
@@ -76429,6 +77774,18 @@
 msgid "Update Billed Amount in Delivery Note"
 msgstr ""
 
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Order"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Receipt"
+msgstr ""
+
 #. Label of a Check field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -76441,9 +77798,9 @@
 msgid "Update Billed Amount in Sales Order"
 msgstr "Mettre à jour le montant facturé dans la commande client"
 
-#: accounts/doctype/bank_clearance/bank_clearance.js:57
-#: accounts/doctype/bank_clearance/bank_clearance.js:71
-#: accounts/doctype/bank_clearance/bank_clearance.js:76
+#: accounts/doctype/bank_clearance/bank_clearance.js:53
+#: accounts/doctype/bank_clearance/bank_clearance.js:67
+#: accounts/doctype/bank_clearance/bank_clearance.js:72
 msgid "Update Clearance Date"
 msgstr "Mettre à Jour la Date de Compensation"
 
@@ -76453,7 +77810,7 @@
 msgid "Update Consumed Material Cost In Project"
 msgstr "Mettre à jour le coût des matières consommées dans le projet"
 
-#: manufacturing/doctype/bom/bom.js:100
+#: manufacturing/doctype/bom/bom.js:99
 msgid "Update Cost"
 msgstr "Mettre à jour le Coût"
 
@@ -76469,12 +77826,12 @@
 msgid "Update Cost"
 msgstr "Mettre à jour le Coût"
 
-#: accounts/doctype/cost_center/cost_center.js:21
-#: accounts/doctype/cost_center/cost_center.js:50
+#: accounts/doctype/cost_center/cost_center.js:19
+#: accounts/doctype/cost_center/cost_center.js:52
 msgid "Update Cost Center Name / Number"
 msgstr "Mettre à jour le nom / numéro du centre de coûts"
 
-#: stock/doctype/pick_list/pick_list.js:99
+#: stock/doctype/pick_list/pick_list.js:104
 msgid "Update Current Stock"
 msgstr "Mettre à jour le stock actuel"
 
@@ -76491,12 +77848,24 @@
 msgid "Update Existing Records"
 msgstr "Mettre à jour les enregistrements existants"
 
-#: buying/doctype/purchase_order/purchase_order.js:275 public/js/utils.js:721
-#: selling/doctype/sales_order/sales_order.js:56
+#: buying/doctype/purchase_order/purchase_order.js:301 public/js/utils.js:793
+#: selling/doctype/sales_order/sales_order.js:63
 msgid "Update Items"
 msgstr "Mise à jour des articles"
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Update Print Format"
 msgstr "Mettre à Jour le Format d'Impression"
 
@@ -76506,7 +77875,7 @@
 msgid "Update Rate and Availability"
 msgstr "Mettre à Jour le Prix et la Disponibilité"
 
-#: buying/doctype/purchase_order/purchase_order.js:475
+#: buying/doctype/purchase_order/purchase_order.js:549
 msgid "Update Rate as per Last Purchase"
 msgstr "Mettre à jour avec les derniers prix d'achats"
 
@@ -76539,7 +77908,7 @@
 msgid "Update Stock Opening Balance"
 msgstr ""
 
-#: projects/doctype/project/project.js:71
+#: projects/doctype/project/project.js:82
 msgid "Update Total Purchase Cost"
 msgstr ""
 
@@ -76561,7 +77930,7 @@
 msgid "Update latest price in all BOMs"
 msgstr "Mettre à jour le prix le plus récent dans toutes les nomenclatures"
 
-#: assets/doctype/asset/asset.py:338
+#: assets/doctype/asset/asset.py:340
 msgid "Update stock must be enabled for the purchase invoice {0}"
 msgstr ""
 
@@ -76581,19 +77950,19 @@
 msgid "Updating Opening Balances"
 msgstr ""
 
-#: stock/doctype/item/item.py:1348
+#: stock/doctype/item/item.py:1349
 msgid "Updating Variants..."
 msgstr "Mise à jour des variantes ..."
 
-#: manufacturing/doctype/work_order/work_order.js:788
+#: manufacturing/doctype/work_order/work_order.js:847
 msgid "Updating Work Order status"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:48
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:46
 msgid "Updating {0} of {1}, {2}"
 msgstr "Mise à jour de {0} sur {1}, {2}"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:44
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:43
 msgid "Upload Bank Statement"
 msgstr ""
 
@@ -76614,7 +77983,7 @@
 msgid "Urgent"
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:37
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:36
 msgid "Use 'Repost in background' button to trigger background job. Job can only be triggered when document is in Queued or Failed status."
 msgstr ""
 
@@ -76650,6 +78019,12 @@
 msgid "Use Google Maps Direction API to optimize route"
 msgstr "Utiliser l'API Google Maps Direction pour optimiser l'itinéraire"
 
+#. Label of a Check field in DocType 'Currency Exchange Settings'
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
+msgctxt "Currency Exchange Settings"
+msgid "Use HTTP Protocol"
+msgstr ""
+
 #. Label of a Check field in DocType 'Stock Reposting Settings'
 #: stock/doctype/stock_reposting_settings/stock_reposting_settings.json
 msgctxt "Stock Reposting Settings"
@@ -76668,6 +78043,84 @@
 msgid "Use Multi-Level BOM"
 msgstr "Utiliser les nomenclatures à plusieurs niveaux"
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Use Serial / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Asset Capitalization Stock Item'
+#: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
+msgctxt "Asset Capitalization Stock Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Delivery Note Item'
+#: stock/doctype/delivery_note_item/delivery_note_item.json
+msgctxt "Delivery Note Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'POS Invoice Item'
+#: accounts/doctype/pos_invoice_item/pos_invoice_item.json
+msgctxt "POS Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Packed Item'
+#: stock/doctype/packed_item/packed_item.json
+msgctxt "Packed Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Pick List Item'
+#: stock/doctype/pick_list_item/pick_list_item.json
+msgctxt "Pick List Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice Item'
+#: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+msgctxt "Purchase Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Receipt Item'
+#: stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+msgctxt "Purchase Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice Item'
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.json
+msgctxt "Sales Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Entry Detail'
+#: stock/doctype/stock_entry_detail/stock_entry_detail.json
+msgctxt "Stock Entry Detail"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Reconciliation Item'
+#: stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+msgctxt "Stock Reconciliation Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Item'
+#: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgctxt "Subcontracting Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Supplied Item'
+#: subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
+msgctxt "Subcontracting Receipt Supplied Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
 #. Label of a Check field in DocType 'Buying Settings'
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
@@ -76780,7 +78233,7 @@
 msgid "User ID not set for Employee {0}"
 msgstr "ID de l'Utilisateur non défini pour l'Employé {0}"
 
-#: accounts/doctype/journal_entry/journal_entry.js:544
+#: accounts/doctype/journal_entry/journal_entry.js:607
 msgid "User Remark"
 msgstr "Remarque de l'Utilisateur"
 
@@ -76899,10 +78352,12 @@
 msgid "VAT Audit Report"
 msgstr ""
 
+#: regional/report/uae_vat_201/uae_vat_201.html:47
 #: regional/report/uae_vat_201/uae_vat_201.py:115
 msgid "VAT on Expenses and All Other Inputs"
 msgstr ""
 
+#: regional/report/uae_vat_201/uae_vat_201.html:15
 #: regional/report/uae_vat_201/uae_vat_201.py:45
 msgid "VAT on Sales and All Other Outputs"
 msgstr ""
@@ -76955,10 +78410,6 @@
 msgid "Valid From"
 msgstr "Valide à partir de"
 
-#: stock/doctype/item_price/item_price.py:62
-msgid "Valid From Date must be lesser than Valid Up To Date."
-msgstr ""
-
 #: regional/doctype/lower_deduction_certificate/lower_deduction_certificate.py:45
 msgid "Valid From date not in Fiscal Year {0}"
 msgstr "Date de début de validité non comprise dans l'exercice {0}"
@@ -76968,7 +78419,7 @@
 msgstr ""
 
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:265
-#: templates/pages/order.html:47
+#: templates/pages/order.html:59
 msgid "Valid Till"
 msgstr "Valable Jusqu'au"
 
@@ -77112,7 +78563,7 @@
 msgstr "Valorisation"
 
 #: stock/report/stock_balance/stock_balance.js:76
-#: stock/report/stock_ledger/stock_ledger.js:88
+#: stock/report/stock_ledger/stock_ledger.js:96
 msgid "Valuation Field Type"
 msgstr ""
 
@@ -77129,8 +78580,8 @@
 #: accounts/report/gross_profit/gross_profit.py:266
 #: 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:449
-#: stock/report/stock_ledger/stock_ledger.py:207
+#: stock/report/stock_balance/stock_balance.py:457
+#: stock/report/stock_ledger/stock_ledger.py:280
 msgid "Valuation Rate"
 msgstr "Taux de Valorisation"
 
@@ -77195,6 +78646,12 @@
 msgid "Valuation Rate"
 msgstr "Taux de Valorisation"
 
+#. Label of a Float field in DocType 'Serial and Batch Entry'
+#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
+msgctxt "Serial and Batch Entry"
+msgid "Valuation Rate"
+msgstr "Taux de Valorisation"
+
 #. Label of a Currency field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
@@ -77217,11 +78674,11 @@
 msgid "Valuation Rate (In / Out)"
 msgstr ""
 
-#: stock/stock_ledger.py:1688
+#: stock/stock_ledger.py:1708
 msgid "Valuation Rate Missing"
 msgstr "Taux de valorisation manquant"
 
-#: stock/stock_ledger.py:1666
+#: stock/stock_ledger.py:1686
 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
 msgstr "Le taux de valorisation de l'article {0} est requis pour effectuer des écritures comptables pour {1} {2}."
 
@@ -77229,7 +78686,7 @@
 msgid "Valuation Rate is mandatory if Opening Stock entered"
 msgstr "Le Taux de Valorisation est obligatoire si un Stock Initial est entré"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:514
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:568
 msgid "Valuation Rate required for Item {0} at row {1}"
 msgstr "Taux de valorisation requis pour le poste {0} à la ligne {1}"
 
@@ -77240,12 +78697,12 @@
 msgid "Valuation and Total"
 msgstr "Valorisation et Total"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:731
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:785
 msgid "Valuation rate for customer provided items has been set to zero."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1649
-#: controllers/accounts_controller.py:2583
+#: accounts/doctype/payment_entry/payment_entry.py:1668
+#: controllers/accounts_controller.py:2668
 msgid "Valuation type charges can not be marked as Inclusive"
 msgstr "Les frais de type d'évaluation ne peuvent pas être marqués comme inclusifs"
 
@@ -77253,10 +78710,10 @@
 msgid "Valuation type charges can not marked as Inclusive"
 msgstr "Frais de type valorisation ne peuvent pas être marqués comme inclus"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:28
-#: public/js/stock_analytics.js:37
-#: selling/report/sales_analytics/sales_analytics.js:28
-#: stock/report/stock_analytics/stock_analytics.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:27
+#: public/js/stock_analytics.js:49
+#: selling/report/sales_analytics/sales_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:26
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:95
 msgid "Value"
 msgstr "Valeur"
@@ -77319,7 +78776,7 @@
 msgid "Value Based Inspection"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:224
+#: stock/report/stock_ledger/stock_ledger.py:297
 msgid "Value Change"
 msgstr "Modification de Valeur"
 
@@ -77329,9 +78786,9 @@
 msgid "Value Details"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:25
-#: selling/report/sales_analytics/sales_analytics.js:25
-#: stock/report/stock_analytics/stock_analytics.js:24
+#: buying/report/purchase_analytics/purchase_analytics.js:24
+#: selling/report/sales_analytics/sales_analytics.js:32
+#: stock/report/stock_analytics/stock_analytics.js:23
 msgid "Value Or Qty"
 msgstr "Valeur ou Qté"
 
@@ -77353,11 +78810,11 @@
 msgid "Value of goods cannot be 0"
 msgstr ""
 
-#: public/js/stock_analytics.js:36
+#: public/js/stock_analytics.js:46
 msgid "Value or Qty"
 msgstr "Valeur ou Qté"
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:120
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:121
 msgid "Values Changed"
 msgstr ""
 
@@ -77388,7 +78845,7 @@
 msgid "Variance ({})"
 msgstr ""
 
-#: stock/doctype/item/item.js:110 stock/doctype/item/item_list.js:14
+#: stock/doctype/item/item.js:146 stock/doctype/item/item_list.js:22
 #: stock/report/item_variant_details/item_variant_details.py:74
 msgid "Variant"
 msgstr "Variante"
@@ -77397,13 +78854,17 @@
 msgid "Variant Attribute Error"
 msgstr "Erreur d'attribut de variante"
 
+#: public/js/templates/item_quick_entry.html:1
+msgid "Variant Attributes"
+msgstr "Attributs Variant"
+
 #. Label of a Table field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
 msgid "Variant Attributes"
 msgstr "Attributs Variant"
 
-#: manufacturing/doctype/bom/bom.js:124
+#: manufacturing/doctype/bom/bom.js:128
 msgid "Variant BOM"
 msgstr "Variante de nomenclature"
 
@@ -77417,7 +78878,7 @@
 msgid "Variant Based On cannot be changed"
 msgstr "Les variantes basées sur ne peuvent pas être modifiées"
 
-#: stock/doctype/item/item.js:98
+#: stock/doctype/item/item.js:122
 msgid "Variant Details Report"
 msgstr "Rapport détaillé des variantes"
 
@@ -77426,7 +78887,7 @@
 msgid "Variant Field"
 msgstr "Champ de Variante"
 
-#: manufacturing/doctype/bom/bom.js:219 manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/bom/bom.js:238 manufacturing/doctype/bom/bom.js:300
 msgid "Variant Item"
 msgstr "Élément de variante"
 
@@ -77446,7 +78907,7 @@
 msgid "Variant Of"
 msgstr "Variante de"
 
-#: stock/doctype/item/item.js:543
+#: stock/doctype/item/item.js:610
 msgid "Variant creation has been queued."
 msgstr "La création de variantes a été placée en file d'attente."
 
@@ -77545,37 +79006,37 @@
 msgid "Video Settings"
 msgstr "Paramètres vidéo"
 
-#: accounts/doctype/account/account.js:79
+#: accounts/doctype/account/account.js:74
 #: accounts/doctype/account/account.js:103
-#: accounts/doctype/account/account_tree.js:135
-#: accounts/doctype/account/account_tree.js:139
-#: accounts/doctype/account/account_tree.js:143
-#: accounts/doctype/cost_center/cost_center_tree.js:37
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:202
-#: accounts/doctype/journal_entry/journal_entry.js:29
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:619
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:8
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:11
-#: buying/doctype/supplier/supplier.js:88
-#: buying/doctype/supplier/supplier.js:92
-#: manufacturing/doctype/production_plan/production_plan.js:94
-#: projects/doctype/project/project.js:84
-#: projects/doctype/project/project.js:92
-#: public/js/controllers/stock_controller.js:64
-#: public/js/controllers/stock_controller.js:83 public/js/utils.js:133
-#: selling/doctype/customer/customer.js:157
-#: selling/doctype/customer/customer.js:162 setup/doctype/company/company.js:88
-#: setup/doctype/company/company.js:94 setup/doctype/company/company.js:100
-#: setup/doctype/company/company.js:106
-#: stock/doctype/delivery_trip/delivery_trip.js:71
-#: stock/doctype/item/item.js:63 stock/doctype/item/item.js:69
-#: stock/doctype/item/item.js:75 stock/doctype/item/item.js:92
-#: stock/doctype/item/item.js:96 stock/doctype/item/item.js:100
-#: stock/doctype/purchase_receipt/purchase_receipt.js:182
-#: stock/doctype/purchase_receipt/purchase_receipt.js:189
-#: stock/doctype/stock_entry/stock_entry.js:257
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:41
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:53
+#: accounts/doctype/account/account_tree.js:185
+#: accounts/doctype/account/account_tree.js:193
+#: accounts/doctype/account/account_tree.js:201
+#: accounts/doctype/cost_center/cost_center_tree.js:56
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:205
+#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:668
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
+#: buying/doctype/supplier/supplier.js:93
+#: buying/doctype/supplier/supplier.js:104
+#: manufacturing/doctype/production_plan/production_plan.js:98
+#: projects/doctype/project/project.js:100
+#: projects/doctype/project/project.js:117
+#: public/js/controllers/stock_controller.js:76
+#: public/js/controllers/stock_controller.js:95 public/js/utils.js:164
+#: selling/doctype/customer/customer.js:160
+#: selling/doctype/customer/customer.js:172 setup/doctype/company/company.js:90
+#: setup/doctype/company/company.js:100 setup/doctype/company/company.js:112
+#: setup/doctype/company/company.js:124
+#: stock/doctype/delivery_trip/delivery_trip.js:83
+#: stock/doctype/item/item.js:65 stock/doctype/item/item.js:75
+#: stock/doctype/item/item.js:85 stock/doctype/item/item.js:110
+#: stock/doctype/item/item.js:118 stock/doctype/item/item.js:126
+#: stock/doctype/purchase_receipt/purchase_receipt.js:207
+#: stock/doctype/purchase_receipt/purchase_receipt.js:218
+#: stock/doctype/stock_entry/stock_entry.js:287
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:44
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:60
 msgid "View"
 msgstr ""
 
@@ -77583,7 +79044,7 @@
 msgid "View BOM Update Log"
 msgstr ""
 
-#: public/js/setup_wizard.js:39
+#: public/js/setup_wizard.js:41
 msgid "View Chart of Accounts"
 msgstr "Voir le plan comptable"
 
@@ -77593,24 +79054,24 @@
 msgid "View Cost Center Tree"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:158
+#: accounts/doctype/payment_entry/payment_entry.js:183
 msgid "View Exchange Gain/Loss Journals"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:128
+#: assets/doctype/asset/asset.js:164
 #: assets/doctype/asset_repair/asset_repair.js:47
 msgid "View General Ledger"
 msgstr ""
 
-#: crm/doctype/campaign/campaign.js:11
+#: crm/doctype/campaign/campaign.js:15
 msgid "View Leads"
 msgstr "Voir Lead"
 
-#: accounts/doctype/account/account_tree.js:193 stock/doctype/batch/batch.js:18
+#: accounts/doctype/account/account_tree.js:278 stock/doctype/batch/batch.js:18
 msgid "View Ledger"
 msgstr "Voir le Journal"
 
-#: stock/doctype/serial_no/serial_no.js:29
+#: stock/doctype/serial_no/serial_no.js:28
 msgid "View Ledgers"
 msgstr ""
 
@@ -77633,6 +79094,10 @@
 msgid "View attachments"
 msgstr "Voir les pièces jointes"
 
+#: public/js/call_popup/call_popup.js:186
+msgid "View call log"
+msgstr ""
+
 #: utilities/report/youtube_interactions/youtube_interactions.py:25
 msgid "Views"
 msgstr ""
@@ -77682,9 +79147,9 @@
 msgid "Voucher"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.js:71
-#: stock/report/stock_ledger/stock_ledger.py:160
-#: stock/report/stock_ledger/stock_ledger.py:232
+#: stock/report/stock_ledger/stock_ledger.js:79
+#: stock/report/stock_ledger/stock_ledger.py:233
+#: stock/report/stock_ledger/stock_ledger.py:305
 msgid "Voucher #"
 msgstr "Référence #"
 
@@ -77724,21 +79189,21 @@
 msgid "Voucher Name"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:273
-#: accounts/report/accounts_receivable/accounts_receivable.py:1050
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: accounts/report/accounts_receivable/accounts_receivable.py:1058
 #: 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_ledger/general_ledger.js:49
-#: accounts/report/general_ledger/general_ledger.py:625
-#: accounts/report/payment_ledger/payment_ledger.js:65
+#: accounts/report/general_ledger/general_ledger.py:638
+#: 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:61
+#: 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/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/reserved_stock/reserved_stock.js:80
+#: 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
@@ -77813,7 +79278,7 @@
 msgid "Voucher Qty"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:619
+#: accounts/report/general_ledger/general_ledger.py:632
 msgid "Voucher Subtype"
 msgstr ""
 
@@ -77823,25 +79288,25 @@
 msgid "Voucher Subtype"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1048
+#: 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:617
+#: accounts/report/general_ledger/general_ledger.py:630
 #: 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/voucher_wise_balance/voucher_wise_balance.py:17
-#: public/js/utils/unreconcile.js:60
+#: 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/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/reserved_stock/reserved_stock.js:68
+#: 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_ledger/stock_ledger.py:230
+#: 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
 msgid "Voucher Type"
@@ -77913,11 +79378,11 @@
 msgid "Voucher Type"
 msgstr "Type de Référence"
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:177
+#: accounts/doctype/bank_transaction/bank_transaction.py:180
 msgid "Voucher {0} is over-allocated by {1}"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:249
+#: accounts/doctype/bank_transaction/bank_transaction.py:252
 msgid "Voucher {0} value is broken: {1}"
 msgstr ""
 
@@ -78006,12 +79471,12 @@
 msgid "Wages per hour"
 msgstr "Salaires par heure"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:251
+#: accounts/doctype/pos_invoice/pos_invoice.js:270
 msgid "Waiting for payment..."
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:55
+#: accounts/report/gross_profit/gross_profit.js:56
 #: accounts/report/gross_profit/gross_profit.py:251
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
 #: accounts/report/purchase_register/purchase_register.js:52
@@ -78019,58 +79484,62 @@
 #: 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
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:16
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:11
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:82
+#: 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/work_order_stock_report/work_order_stock_report.js:9
-#: public/js/stock_analytics.js:45 public/js/utils.js:498
-#: public/js/utils/serial_no_batch_selector.js:90
-#: selling/doctype/sales_order/sales_order.js:300
-#: selling/doctype/sales_order/sales_order.js:401
-#: selling/report/sales_order_analysis/sales_order_analysis.js:49
+#: 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/utils/serial_no_batch_selector.js:94
+#: selling/doctype/sales_order/sales_order.js:327
+#: selling/doctype/sales_order/sales_order.js:431
+#: selling/report/sales_order_analysis/sales_order_analysis.js:48
 #: selling/report/sales_order_analysis/sales_order_analysis.py:334
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:78
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:79
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:256
 #: stock/doctype/warehouse/warehouse.json
 #: stock/page/stock_balance/stock_balance.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:22
+#: 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/item_price_stock/item_price_stock.py:27
-#: stock/report/item_shortage_report/item_shortage_report.js:18
+#: stock/report/item_shortage_report/item_shortage_report.js:17
 #: stock/report/item_shortage_report/item_shortage_report.py:81
 #: stock/report/product_bundle_balance/product_bundle_balance.js:42
 #: stock/report/product_bundle_balance/product_bundle_balance.py:89
-#: stock/report/reserved_stock/reserved_stock.js:44
+#: stock/report/reserved_stock/reserved_stock.js:41
 #: stock/report/reserved_stock/reserved_stock.py:96
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:140
-#: stock/report/serial_no_ledger/serial_no_ledger.js:22
+#: 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_analytics/stock_analytics.js:50
+#: stock/report/stock_analytics/stock_analytics.js:49
 #: stock/report/stock_balance/stock_balance.js:51
-#: stock/report/stock_balance/stock_balance.py:376
+#: stock/report/stock_balance/stock_balance.py:384
 #: stock/report/stock_ledger/stock_ledger.js:30
-#: stock/report/stock_ledger/stock_ledger.py:167
+#: stock/report/stock_ledger/stock_ledger.py:240
 #: stock/report/stock_ledger_variance/stock_ledger_variance.js:38
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:55
 #: 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:17
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:39
+#: 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
+#: templates/form_grid/material_request_grid.html:8
+#: templates/form_grid/stock_entry_grid.html:9
 msgid "Warehouse"
 msgstr "Entrepôt"
 
@@ -78128,12 +79597,24 @@
 msgid "Warehouse"
 msgstr "Entrepôt"
 
+#. Label of a Link field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Warehouse"
+msgstr "Entrepôt"
+
 #. Label of a Link field in DocType 'Pick List Item'
 #: stock/doctype/pick_list_item/pick_list_item.json
 msgctxt "Pick List Item"
 msgid "Warehouse"
 msgstr "Entrepôt"
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Warehouse"
+msgstr "Entrepôt"
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -78268,6 +79749,12 @@
 msgid "Warehouse"
 msgstr "Entrepôt"
 
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Warehouse"
+msgstr "Entrepôt"
+
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:4
 msgid "Warehouse Capacity Summary"
 msgstr ""
@@ -78393,12 +79880,12 @@
 msgid "Warehouse not found against the account {0}"
 msgstr "Entrepôt introuvable sur le compte {0}"
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:367
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:421
 msgid "Warehouse not found in the system"
 msgstr "L'entrepôt n'a pas été trouvé dans le système"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1005
-#: stock/doctype/delivery_note/delivery_note.py:362
+#: accounts/doctype/sales_invoice/sales_invoice.py:1022
+#: stock/doctype/delivery_note/delivery_note.py:416
 msgid "Warehouse required for stock Item {0}"
 msgstr "Magasin requis pour l'article en stock {0}"
 
@@ -78420,11 +79907,11 @@
 msgid "Warehouse {0} does not belong to Company {1}."
 msgstr ""
 
-#: stock/utils.py:441
+#: stock/utils.py:436
 msgid "Warehouse {0} does not belong to company {1}"
 msgstr "L'entrepôt {0} n'appartient pas à la société {1}"
 
-#: controllers/stock_controller.py:244
+#: controllers/stock_controller.py:426
 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 ""
 
@@ -78436,7 +79923,7 @@
 msgid "Warehouse: {0} does not belong to {1}"
 msgstr "Entrepôt: {0} n'appartient pas à {1}"
 
-#: manufacturing/doctype/production_plan/production_plan.js:379
+#: manufacturing/doctype/production_plan/production_plan.js:407
 msgid "Warehouses"
 msgstr "Entrepôts"
 
@@ -78546,9 +80033,9 @@
 msgid "Warn for new Request for Quotations"
 msgstr "Avertir lors d'une nouvelle Demande de Devis"
 
-#: accounts/doctype/payment_entry/payment_entry.py:639
-#: controllers/accounts_controller.py:1676
-#: stock/doctype/delivery_trip/delivery_trip.js:123
+#: accounts/doctype/payment_entry/payment_entry.py:648
+#: controllers/accounts_controller.py:1765
+#: stock/doctype/delivery_trip/delivery_trip.js:144
 #: utilities/transaction_base.py:122
 msgid "Warning"
 msgstr "Avertissement"
@@ -78561,15 +80048,15 @@
 msgid "Warning!"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1146
+#: accounts/doctype/journal_entry/journal_entry.py:1173
 msgid "Warning: Another {0} # {1} exists against stock entry {2}"
 msgstr "Attention : Un autre {0} {1} # existe pour l'écriture de stock {2}"
 
-#: stock/doctype/material_request/material_request.js:415
+#: stock/doctype/material_request/material_request.js:484
 msgid "Warning: Material Requested Qty is less than Minimum Order Qty"
 msgstr "Attention : La Quantité de Matériel Commandé est inférieure à la Qté Minimum de Commande"
 
-#: selling/doctype/sales_order/sales_order.py:252
+#: selling/doctype/sales_order/sales_order.py:254
 msgid "Warning: Sales Order {0} already exists against Customer's Purchase Order {1}"
 msgstr "Attention : La Commande Client {0} existe déjà pour la Commande d'Achat du Client {1}"
 
@@ -78591,7 +80078,7 @@
 msgstr "Garantie / Statut AMC"
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:97
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:103
 #: support/doctype/warranty_claim/warranty_claim.json
 msgid "Warranty Claim"
 msgstr "Réclamation de Garantie"
@@ -78631,6 +80118,10 @@
 msgid "Watch Video"
 msgstr "Regarder la vidéo"
 
+#: controllers/accounts_controller.py:232
+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 ""
+
 #: www/support/index.html:7
 msgid "We're here to help!"
 msgstr "Nous sommes là pour vous aider!"
@@ -78840,12 +80331,12 @@
 msgid "Weekday"
 msgstr "Jour de la semaine"
 
-#: buying/report/purchase_analytics/purchase_analytics.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:34
-#: public/js/stock_analytics.js:52
-#: selling/report/sales_analytics/sales_analytics.js:61
-#: stock/report/stock_analytics/stock_analytics.js:80
-#: support/report/issue_analytics/issue_analytics.js:42
+#: buying/report/purchase_analytics/purchase_analytics.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:33
+#: public/js/stock_analytics.js:82
+#: selling/report/sales_analytics/sales_analytics.js:68
+#: stock/report/stock_analytics/stock_analytics.js:79
+#: support/report/issue_analytics/issue_analytics.js:41
 msgid "Weekly"
 msgstr "Hebdomadaire"
 
@@ -79102,15 +80593,22 @@
 msgid "Wheels"
 msgstr "Roues"
 
-#: stock/doctype/item/item.js:834
+#. Description of the 'Sub Assembly Warehouse' (Link) field in DocType
+#. 'Production Plan'
+#: manufacturing/doctype/production_plan/production_plan.json
+msgctxt "Production Plan"
+msgid "When a parent warehouse is chosen, the system conducts stock checks against the associated child warehouses"
+msgstr ""
+
+#: stock/doctype/item/item.js:920
 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:313
+#: accounts/doctype/account/account.py:332
 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account."
 msgstr "Lors de la création du compte pour l'entreprise enfant {0}, le compte parent {1} a été trouvé en tant que compte du grand livre."
 
-#: accounts/doctype/account/account.py:303
+#: accounts/doctype/account/account.py:322
 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA"
 msgstr "Lors de la création du compte pour l'entreprise enfant {0}, le compte parent {1} est introuvable. Veuillez créer le compte parent dans le COA correspondant"
 
@@ -79173,7 +80671,11 @@
 msgid "With Operations"
 msgstr "Avec des Opérations"
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:70
+#: accounts/report/trial_balance/trial_balance.js:82
+msgid "With Period Closing Entry For Opening Balances"
+msgstr ""
+
+#: public/js/bank_reconciliation_tool/data_table_manager.js:67
 msgid "Withdrawal"
 msgstr ""
 
@@ -79189,7 +80691,7 @@
 msgid "Work Done"
 msgstr "Travaux Effectués"
 
-#: setup/doctype/company/company.py:261
+#: setup/doctype/company/company.py:260
 msgid "Work In Progress"
 msgstr "Travaux en cours"
 
@@ -79211,7 +80713,7 @@
 msgid "Work In Progress"
 msgstr "Travaux en cours"
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:20
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:23
 msgid "Work In Progress Warehouse"
 msgstr "Entrepôt de travaux en cours"
 
@@ -79219,19 +80721,20 @@
 #. Title of an Onboarding Step
 #: manufacturing/doctype/bom/bom.js:119
 #: manufacturing/doctype/work_order/work_order.json
+#: manufacturing/doctype/workstation/workstation_job_card.html:26
 #: manufacturing/onboarding_step/work_order/work_order.json
-#: manufacturing/report/bom_variance_report/bom_variance_report.js: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:42
+#: 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/job_card_summary/job_card_summary.py:145
-#: manufacturing/report/process_loss_report/process_loss_report.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:22
 #: manufacturing/report/process_loss_report/process_loss_report.py:68
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:30
+#: 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:560
-#: stock/doctype/material_request/material_request.js:152
-#: stock/doctype/material_request/material_request.py:779
+#: selling/doctype/sales_order/sales_order.js:624
+#: stock/doctype/material_request/material_request.js:178
+#: stock/doctype/material_request/material_request.py:791
 #: templates/pages/material_request_info.html:45
 msgid "Work Order"
 msgstr "Ordre de fabrication"
@@ -79282,7 +80785,7 @@
 msgid "Work Order"
 msgstr "Ordre de fabrication"
 
-#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:121
 msgid "Work Order / Subcontract PO"
 msgstr ""
 
@@ -79329,33 +80832,33 @@
 msgid "Work Order Summary"
 msgstr "Résumé de l'ordre de fabrication"
 
-#: stock/doctype/material_request/material_request.py:784
+#: stock/doctype/material_request/material_request.py:796
 msgid "Work Order cannot be created for following reason: <br> {0}"
 msgstr "L'ordre de fabrication ne peut pas être créé pour la raison suivante:<br> {0}"
 
-#: manufacturing/doctype/work_order/work_order.py:927
+#: manufacturing/doctype/work_order/work_order.py:941
 msgid "Work Order cannot be raised against a Item Template"
 msgstr "Un ordre de fabrication ne peut pas être créé pour un modèle d'article"
 
-#: manufacturing/doctype/work_order/work_order.py:1399
-#: manufacturing/doctype/work_order/work_order.py:1458
+#: manufacturing/doctype/work_order/work_order.py:1413
+#: manufacturing/doctype/work_order/work_order.py:1472
 msgid "Work Order has been {0}"
 msgstr "L'ordre de fabrication a été {0}"
 
-#: selling/doctype/sales_order/sales_order.js:667
+#: selling/doctype/sales_order/sales_order.js:768
 msgid "Work Order not created"
 msgstr "Ordre de fabrication non créé"
 
-#: stock/doctype/stock_entry/stock_entry.py:679
+#: stock/doctype/stock_entry/stock_entry.py:634
 msgid "Work Order {0}: Job Card not found for the operation {1}"
 msgstr "Bon de travail {0}: carte de travail non trouvée pour l'opération {1}"
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:57
-#: stock/doctype/material_request/material_request.py:774
+#: manufacturing/report/job_card_summary/job_card_summary.js:56
+#: stock/doctype/material_request/material_request.py:786
 msgid "Work Orders"
 msgstr "Bons de travail"
 
-#: selling/doctype/sales_order/sales_order.js:731
+#: selling/doctype/sales_order/sales_order.js:844
 msgid "Work Orders Created: {0}"
 msgstr "Ordres de travail créés: {0}"
 
@@ -79382,7 +80885,7 @@
 msgid "Work-in-Progress Warehouse"
 msgstr "Entrepôt des Travaux en Cours"
 
-#: manufacturing/doctype/work_order/work_order.py:425
+#: manufacturing/doctype/work_order/work_order.py:436
 msgid "Work-in-Progress Warehouse is required before Submit"
 msgstr "L'entrepôt des Travaux en Cours est nécessaire avant de Valider"
 
@@ -79419,6 +80922,10 @@
 msgid "Workflow State"
 msgstr "État du Flux de Travail"
 
+#: templates/pages/task_info.html:73
+msgid "Working"
+msgstr "Travail en cours"
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -79445,14 +80952,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/work_order/work_order.js:232
+#: manufacturing/doctype/work_order/work_order.js:247
 #: manufacturing/doctype/workstation/workstation.json
 #: manufacturing/onboarding_step/workstation/workstation.json
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:36
+#: 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:61
+#: 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/job_card_summary/job_card_summary.js:73
+#: 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
 msgid "Workstation"
@@ -79494,12 +81001,24 @@
 msgid "Workstation / Machine"
 msgstr "Poste de travail / machine"
 
+#. Label of a HTML field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Dashboard"
+msgstr ""
+
 #. Label of a Data field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Workstation Name"
 msgstr "Nom de la station de travail"
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Status"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/workstation_type/workstation_type.json
 msgid "Workstation Type"
@@ -79542,17 +81061,23 @@
 msgid "Workstation Working Hour"
 msgstr "Heures de travail de la station de travail"
 
-#: manufacturing/doctype/workstation/workstation.py:199
+#: manufacturing/doctype/workstation/workstation.py:355
 msgid "Workstation is closed on the following dates as per Holiday List: {0}"
 msgstr "La station de travail est fermée aux dates suivantes d'après la liste de vacances : {0}"
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Workstations"
+msgstr ""
+
 #: setup/setup_wizard/setup_wizard.py:16 setup/setup_wizard/setup_wizard.py:41
 msgid "Wrapping up"
 msgstr "Emballer"
 
 #: 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:510
+#: setup/doctype/company/company.py:509
 msgid "Write Off"
 msgstr "Reprise"
 
@@ -79743,7 +81268,7 @@
 msgid "Wrong Company"
 msgstr ""
 
-#: setup/doctype/company/company.js:172
+#: setup/doctype/company/company.js:202
 msgid "Wrong Password"
 msgstr "Mauvais mot de passe"
 
@@ -79802,20 +81327,20 @@
 msgid "Year start date or end date is overlapping with {0}. To avoid please set company"
 msgstr "Année de début ou de fin chevauche avec {0}. Pour l'éviter veuillez définir la société"
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:67
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:70
-#: buying/report/purchase_analytics/purchase_analytics.js:64
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:37
-#: public/js/financial_statements.js:220
+#: accounts/report/budget_variance_report/budget_variance_report.js:65
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:78
+#: buying/report/purchase_analytics/purchase_analytics.js:63
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:36
+#: public/js/financial_statements.js:229
 #: public/js/purchase_trends_filters.js:22 public/js/sales_trends_filters.js:14
-#: public/js/stock_analytics.js:55
-#: selling/report/sales_analytics/sales_analytics.js:64
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:36
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:36
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:36
-#: stock/report/stock_analytics/stock_analytics.js:83
-#: support/report/issue_analytics/issue_analytics.js:45
+#: public/js/stock_analytics.js:85
+#: selling/report/sales_analytics/sales_analytics.js:71
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: stock/report/stock_analytics/stock_analytics.js:82
+#: support/report/issue_analytics/issue_analytics.js:44
 msgid "Yearly"
 msgstr "Annuel"
 
@@ -79948,23 +81473,23 @@
 msgid "Yes"
 msgstr "Oui"
 
-#: controllers/accounts_controller.py:3151
+#: controllers/accounts_controller.py:3242
 msgid "You are not allowed to update as per the conditions set in {} Workflow."
 msgstr "Vous n'êtes pas autorisé à effectuer la mise à jour selon les conditions définies dans {} Workflow."
 
-#: accounts/general_ledger.py:665
+#: accounts/general_ledger.py:674
 msgid "You are not authorized to add or update entries before {0}"
 msgstr "Vous n'êtes pas autorisé à ajouter ou faire une mise à jour des écritures avant le {0}"
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:317
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
 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:263
+#: accounts/doctype/account/account.py:282
 msgid "You are not authorized to set Frozen value"
 msgstr "Vous n'êtes pas autorisé à définir des valeurs gelées"
 
-#: stock/doctype/pick_list/pick_list.py:307
+#: stock/doctype/pick_list/pick_list.py:347
 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 ""
 
@@ -79980,7 +81505,7 @@
 msgid "You can also set default CWIP account in Company {}"
 msgstr "Vous pouvez également définir le compte CWIP par défaut dans Entreprise {}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:873
+#: accounts/doctype/sales_invoice/sales_invoice.py:890
 msgid "You can change the parent account to a Balance Sheet account or select a different account."
 msgstr "Vous pouvez changer le compte parent en compte de bilan ou sélectionner un autre compte."
 
@@ -79988,7 +81513,7 @@
 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:583
+#: accounts/doctype/journal_entry/journal_entry.py:610
 msgid "You can not enter current voucher in 'Against Journal Entry' column"
 msgstr "Vous ne pouvez pas entrer le bon actuel dans la colonne 'Pour l'Écriture de Journal'"
 
@@ -79996,8 +81521,8 @@
 msgid "You can only have Plans with the same billing cycle in a Subscription"
 msgstr "Vous ne pouvez avoir que des plans ayant le même cycle de facturation dans le même abonnement"
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:239
-#: accounts/doctype/sales_invoice/sales_invoice.js:847
+#: accounts/doctype/pos_invoice/pos_invoice.js:258
+#: accounts/doctype/sales_invoice/sales_invoice.js:915
 msgid "You can only redeem max {0} points in this order."
 msgstr "Vous pouvez uniquement échanger un maximum de {0} points dans cet commande."
 
@@ -80005,11 +81530,11 @@
 msgid "You can only select one mode of payment as default"
 msgstr "Vous ne pouvez sélectionner qu'un seul mode de paiement par défaut"
 
-#: selling/page/point_of_sale/pos_payment.js:478
+#: selling/page/point_of_sale/pos_payment.js:506
 msgid "You can redeem upto {0}."
 msgstr "Vous pouvez utiliser jusqu'à {0}."
 
-#: manufacturing/doctype/workstation/workstation.js:37
+#: manufacturing/doctype/workstation/workstation.js:59
 msgid "You can set it as a machine name or operation type. For example, stiching machine 12"
 msgstr ""
 
@@ -80018,7 +81543,7 @@
 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:1027
+#: manufacturing/doctype/job_card/job_card.py:1042
 msgid "You can't make any changes to Job Card since Work Order is closed."
 msgstr ""
 
@@ -80026,7 +81551,7 @@
 msgid "You can't redeem Loyalty Points having more value than the Rounded Total."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:532
+#: manufacturing/doctype/bom/bom.js:549
 msgid "You cannot change the rate if BOM is mentioned against any Item."
 msgstr ""
 
@@ -80034,15 +81559,15 @@
 msgid "You cannot create a {0} within the closed Accounting Period {1}"
 msgstr ""
 
-#: accounts/general_ledger.py:155
+#: accounts/general_ledger.py:159
 msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
 msgstr "Vous ne pouvez pas créer ou annuler des écritures comptables dans la période comptable clôturée {0}"
 
-#: accounts/general_ledger.py:689
+#: accounts/general_ledger.py:698
 msgid "You cannot create/amend any accounting entries till this date."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:809
+#: accounts/doctype/journal_entry/journal_entry.py:836
 msgid "You cannot credit and debit same account at the same time"
 msgstr "Vous ne pouvez pas créditer et débiter le même compte simultanément"
 
@@ -80054,7 +81579,7 @@
 msgid "You cannot edit root node."
 msgstr "Vous ne pouvez pas modifier le nœud racine."
 
-#: selling/page/point_of_sale/pos_payment.js:507
+#: selling/page/point_of_sale/pos_payment.js:536
 msgid "You cannot redeem more than {0}."
 msgstr "Vous ne pouvez pas utiliser plus de {0}."
 
@@ -80066,15 +81591,15 @@
 msgid "You cannot restart a Subscription that is not cancelled."
 msgstr "Vous ne pouvez pas redémarrer un abonnement qui n'est pas annulé."
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:210
 msgid "You cannot submit empty order."
 msgstr "Vous ne pouvez pas valider de commande vide."
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:209
 msgid "You cannot submit the order without payment."
 msgstr "Vous ne pouvez pas valider la commande sans paiement."
 
-#: controllers/accounts_controller.py:3127
+#: controllers/accounts_controller.py:3218
 msgid "You do not have permissions to {} items in a {}."
 msgstr "Vous ne disposez pas des autorisations nécessaires pour {} éléments dans un {}."
 
@@ -80082,7 +81607,7 @@
 msgid "You don't have enough Loyalty Points to redeem"
 msgstr "Vous n'avez pas assez de points de fidélité à échanger"
 
-#: selling/page/point_of_sale/pos_payment.js:474
+#: selling/page/point_of_sale/pos_payment.js:499
 msgid "You don't have enough points to redeem."
 msgstr "Vous n'avez pas assez de points à échanger."
 
@@ -80090,7 +81615,7 @@
 msgid "You had {} errors while creating opening invoices. Check {} for more details"
 msgstr "Vous avez rencontré {} erreurs lors de la création des factures d'ouverture. Consultez {} pour plus de détails"
 
-#: public/js/utils.js:822
+#: public/js/utils.js:893
 msgid "You have already selected items from {0} {1}"
 msgstr "Vous avez déjà choisi des articles de {0} {1}"
 
@@ -80098,7 +81623,7 @@
 msgid "You have been invited to collaborate on the project: {0}"
 msgstr "Vous avez été invité à collaborer sur le projet : {0}"
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:442
 msgid "You have entered a duplicate Delivery Note on Row"
 msgstr ""
 
@@ -80110,11 +81635,11 @@
 msgid "You haven't created a {0} yet"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:196
+#: selling/page/point_of_sale/pos_controller.js:218
 msgid "You must add atleast one item to save it as draft."
 msgstr "Vous devez ajouter au moins un élément pour l'enregistrer en tant que brouillon."
 
-#: selling/page/point_of_sale/pos_controller.js:598
+#: selling/page/point_of_sale/pos_controller.js:626
 msgid "You must select a customer before adding an item."
 msgstr "Vous devez sélectionner un client avant d'ajouter un article."
 
@@ -80179,7 +81704,7 @@
 msgid "Youtube Statistics"
 msgstr "Statistiques Youtube"
 
-#: public/js/utils/contact_address_quick_entry.js:68
+#: public/js/utils/contact_address_quick_entry.js:71
 msgid "ZIP Code"
 msgstr "Code postal"
 
@@ -80193,7 +81718,7 @@
 msgid "Zero Rated"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Zero quantity"
 msgstr ""
 
@@ -80203,7 +81728,7 @@
 msgid "Zip File"
 msgstr "Fichier zip"
 
-#: stock/reorder_item.py:283
+#: stock/reorder_item.py:368
 msgid "[Important] [ERPNext] Auto Reorder Errors"
 msgstr "[Important] [ERPNext] Erreurs de réorganisation automatique"
 
@@ -80211,16 +81736,20 @@
 msgid "`Allow Negative rates for Items`"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:89
+#: stock/doctype/stock_settings/stock_settings.py:92
 #, python-format
 msgid "`Freeze Stocks Older Than` should be smaller than %d days."
 msgstr ""
 
+#: stock/stock_ledger.py:1700
+msgid "after"
+msgstr ""
+
 #: accounts/doctype/shipping_rule/shipping_rule.py:204
 msgid "and"
 msgstr "et"
 
-#: manufacturing/doctype/bom/bom.js:759
+#: manufacturing/doctype/bom/bom.js:792
 msgid "as a percentage of finished item quantity"
 msgstr ""
 
@@ -80228,11 +81757,15 @@
 msgid "at"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:17
-#: selling/report/sales_analytics/sales_analytics.js:17
+#: buying/report/purchase_analytics/purchase_analytics.js:16
+#: selling/report/sales_analytics/sales_analytics.js:24
 msgid "based_on"
 msgstr "basé sur"
 
+#: public/js/utils/sales_common.js:256
+msgid "cannot be greater than 100"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgctxt "Production Plan Sub Assembly Item"
@@ -80246,8 +81779,12 @@
 msgid "development"
 msgstr "développement"
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "discount applied"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:46
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:57
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:58
 msgid "doc_type"
 msgstr ""
 
@@ -80276,6 +81813,10 @@
 msgid "exchangerate.host"
 msgstr ""
 
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:161
+msgid "fieldname"
+msgstr ""
+
 #. Option for the 'Service Provider' (Select) field in DocType 'Currency
 #. Exchange Settings'
 #: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
@@ -80283,13 +81824,21 @@
 msgid "frankfurter.app"
 msgstr ""
 
+#: templates/form_grid/item_grid.html:66 templates/form_grid/item_grid.html:80
+msgid "hidden"
+msgstr ""
+
+#: projects/doctype/project/project_dashboard.html:13
+msgid "hours"
+msgstr ""
+
 #. Label of a Attach Image field in DocType 'Batch'
 #: stock/doctype/batch/batch.json
 msgctxt "Batch"
 msgid "image"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:253
+#: accounts/doctype/budget/budget.py:260
 msgid "is already"
 msgstr ""
 
@@ -80365,7 +81914,7 @@
 msgid "material_request_item"
 msgstr "article_demande_de_materiel"
 
-#: controllers/selling_controller.py:150
+#: controllers/selling_controller.py:151
 msgid "must be between 0 and 100"
 msgstr ""
 
@@ -80411,7 +81960,11 @@
 msgid "old_parent"
 msgstr "grand_parent"
 
-#: controllers/accounts_controller.py:1033
+#: templates/pages/task_info.html:90
+msgid "on"
+msgstr ""
+
+#: controllers/accounts_controller.py:1097
 msgid "or"
 msgstr "ou"
 
@@ -80423,7 +81976,7 @@
 msgid "out of 5"
 msgstr ""
 
-#: public/js/utils.js:369
+#: public/js/utils.js:417
 msgid "payments app is not installed. Please install it from {0} or {1}"
 msgstr ""
 
@@ -80464,7 +82017,7 @@
 msgid "per hour"
 msgstr "par heure"
 
-#: stock/stock_ledger.py:1681
+#: stock/stock_ledger.py:1701
 msgid "performing either one below:"
 msgstr ""
 
@@ -80492,7 +82045,7 @@
 msgid "ratings"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 msgid "received from"
 msgstr "reçu de"
 
@@ -80569,10 +82122,6 @@
 msgid "sandbox"
 msgstr "bac à sable"
 
-#: public/js/controllers/transaction.js:920
-msgid "selected Payment Terms Template"
-msgstr ""
-
 #: accounts/doctype/subscription/subscription.py:711
 msgid "subscription is already cancelled."
 msgstr ""
@@ -80593,12 +82142,14 @@
 msgid "title"
 msgstr "Titre"
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 #: 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:2737
+#: accounts/doctype/sales_invoice/sales_invoice.py:2706
 msgid "to unallocate the amount of this Return Invoice before cancelling it."
 msgstr ""
 
@@ -80621,7 +82172,7 @@
 msgid "via BOM Update Tool"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:256
+#: accounts/doctype/budget/budget.py:263
 msgid "will be"
 msgstr ""
 
@@ -80634,7 +82185,7 @@
 msgid "{0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:878
+#: controllers/accounts_controller.py:930
 msgid "{0} '{1}' is disabled"
 msgstr "{0} '{1}' est désactivé(e)"
 
@@ -80642,7 +82193,7 @@
 msgid "{0} '{1}' not in Fiscal Year {2}"
 msgstr "{0} '{1}' n'est pas dans l’Exercice {2}"
 
-#: manufacturing/doctype/work_order/work_order.py:355
+#: manufacturing/doctype/work_order/work_order.py:366
 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
 msgstr "{0} ({1}) ne peut pas être supérieur à la quantité planifiée ({2}) dans l'ordre de fabrication {3}"
 
@@ -80650,19 +82201,19 @@
 msgid "{0} - Above"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:253
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:281
 msgid "{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
 msgstr ""
 
-#: controllers/accounts_controller.py:1893
+#: controllers/accounts_controller.py:1985
 msgid "{0} Account not found against Customer {1}."
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:261
+#: accounts/doctype/budget/budget.py:268
 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It {5} exceed by {6}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:759
+#: accounts/doctype/pricing_rule/utils.py:758
 msgid "{0} Coupon used are {1}. Allowed quantity is exhausted"
 msgstr "Le {0} coupon utilisé est {1}. La quantité autorisée est épuisée"
 
@@ -80670,11 +82221,11 @@
 msgid "{0} Digest"
 msgstr "Résumé {0}"
 
-#: accounts/utils.py:1286
+#: accounts/utils.py:1255
 msgid "{0} Number {1} is already used in {2} {3}"
 msgstr "Le {0} numéro {1} est déjà utilisé dans {2} {3}"
 
-#: manufacturing/doctype/work_order/work_order.js:379
+#: manufacturing/doctype/work_order/work_order.js:397
 msgid "{0} Operations: {1}"
 msgstr "{0} Opérations: {1}"
 
@@ -80686,7 +82237,7 @@
 msgid "{0} Retain Sample is based on batch, please check Has Batch No to retain sample of item"
 msgstr "{0} Conserver l'échantillon est basé sur le lot, veuillez cocher A un numéro de lot pour conserver l'échantillon d'article"
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:429
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:428
 msgid "{0} Transaction(s) Reconciled"
 msgstr ""
 
@@ -80694,23 +82245,23 @@
 msgid "{0} account is not of type {1}"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:447
+#: stock/doctype/purchase_receipt/purchase_receipt.py:448
 msgid "{0} account not found while submitting purchase receipt"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:930
+#: accounts/doctype/journal_entry/journal_entry.py:957
 msgid "{0} against Bill {1} dated {2}"
 msgstr "{0} pour la Facture {1} du {2}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:939
+#: accounts/doctype/journal_entry/journal_entry.py:966
 msgid "{0} against Purchase Order {1}"
 msgstr "{0} pour la Commande d'Achat {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:906
+#: accounts/doctype/journal_entry/journal_entry.py:933
 msgid "{0} against Sales Invoice {1}"
 msgstr "{0} pour la Facture de Vente {1}"
 
-#: accounts/doctype/journal_entry/journal_entry.py:913
+#: accounts/doctype/journal_entry/journal_entry.py:940
 msgid "{0} against Sales Order {1}"
 msgstr "{0} pour la Commande Client {1}"
 
@@ -80718,7 +82269,7 @@
 msgid "{0} already has a Parent Procedure {1}."
 msgstr "{0} a déjà une procédure parent {1}."
 
-#: stock/doctype/delivery_note/delivery_note.py:610
+#: stock/doctype/delivery_note/delivery_note.py:671
 msgid "{0} and {1}"
 msgstr "{0} et {1}"
 
@@ -80739,16 +82290,16 @@
 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:783
-#: manufacturing/doctype/production_plan/production_plan.py:877
+#: manufacturing/doctype/production_plan/production_plan.py:792
+#: manufacturing/doctype/production_plan/production_plan.py:886
 msgid "{0} created"
 msgstr "{0} créé"
 
-#: setup/doctype/company/company.py:191
+#: setup/doctype/company/company.py:190
 msgid "{0} currency must be same as company's default currency. Please select another account."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:310
+#: buying/doctype/purchase_order/purchase_order.py:311
 msgid "{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution."
 msgstr "{0} est actuellement associé avec une fiche d'évaluation fournisseur {1}. Les bons de commande pour ce fournisseur doivent être édités avec précaution."
 
@@ -80780,7 +82331,11 @@
 msgid "{0} has been submitted successfully"
 msgstr "{0} a été envoyé avec succès"
 
-#: controllers/accounts_controller.py:2212
+#: projects/doctype/project/project_dashboard.html:15
+msgid "{0} hours"
+msgstr ""
+
+#: controllers/accounts_controller.py:2304
 msgid "{0} in row {1}"
 msgstr "{0} dans la ligne {1}"
 
@@ -80788,23 +82343,27 @@
 msgid "{0} is a mandatory Accounting Dimension. <br>Please set a value for {0} in Accounting Dimensions section."
 msgstr ""
 
-#: controllers/accounts_controller.py:162
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:189
+msgid "{0} is already running for {1}"
+msgstr ""
+
+#: controllers/accounts_controller.py:164
 msgid "{0} is blocked so this transaction cannot proceed"
 msgstr "{0} est bloqué donc cette transaction ne peut pas continuer"
 
 #: accounts/doctype/budget/budget.py:57
-#: accounts/doctype/payment_entry/payment_entry.py:542
+#: accounts/doctype/payment_entry/payment_entry.py:551
 #: accounts/report/general_ledger/general_ledger.py:62
 #: accounts/report/pos_register/pos_register.py:110 controllers/trends.py:50
 msgid "{0} is mandatory"
 msgstr "{0} est obligatoire"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:975
+#: accounts/doctype/sales_invoice/sales_invoice.py:992
 msgid "{0} is mandatory for Item {1}"
 msgstr "{0} est obligatoire pour l’Article {1}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:220
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:101
+#: accounts/general_ledger.py:722
 msgid "{0} is mandatory for account {1}"
 msgstr ""
 
@@ -80812,7 +82371,7 @@
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
 msgstr "{0} est obligatoire. L'enregistrement de change de devises n'est peut-être pas créé pour le {1} au {2}"
 
-#: controllers/accounts_controller.py:2491
+#: controllers/accounts_controller.py:2576
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
 msgstr "{0} est obligatoire. Peut-être qu’un enregistrement de Taux de Change n'est pas créé pour {1} et {2}."
 
@@ -80824,7 +82383,7 @@
 msgid "{0} is not a group node. Please select a group node as parent cost center"
 msgstr "{0} n'est pas un nœud de groupe. Veuillez sélectionner un nœud de groupe comme centre de coûts parent"
 
-#: stock/doctype/stock_entry/stock_entry.py:456
+#: stock/doctype/stock_entry/stock_entry.py:411
 msgid "{0} is not a stock Item"
 msgstr "{0} n'est pas un Article de stock"
 
@@ -80840,26 +82399,30 @@
 msgid "{0} is not enabled in {1}"
 msgstr "{0} n'est pas activé dans {1}"
 
-#: stock/doctype/material_request/material_request.py:565
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197
+msgid "{0} is not running. Cannot trigger events for this Document"
+msgstr ""
+
+#: stock/doctype/material_request/material_request.py:566
 msgid "{0} is not the default supplier for any items."
 msgstr "{0} n'est le fournisseur par défaut d'aucun élément."
 
-#: accounts/doctype/payment_entry/payment_entry.py:2300
+#: accounts/doctype/payment_entry/payment_entry.py:2325
 msgid "{0} is on hold till {1}"
 msgstr "{0} est en attente jusqu'à {1}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:131
+#: accounts/doctype/gl_entry/gl_entry.py:121
 #: accounts/doctype/pricing_rule/pricing_rule.py:165
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:182
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:193
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:118
 msgid "{0} is required"
 msgstr "{0} est nécessaire"
 
-#: manufacturing/doctype/work_order/work_order.js:343
+#: manufacturing/doctype/work_order/work_order.js:362
 msgid "{0} items in progress"
 msgstr "{0} articles en cours"
 
-#: manufacturing/doctype/work_order/work_order.js:327
+#: manufacturing/doctype/work_order/work_order.js:346
 msgid "{0} items produced"
 msgstr "{0} articles produits"
 
@@ -80867,7 +82430,7 @@
 msgid "{0} must be negative in return document"
 msgstr "{0} doit être négatif dans le document de retour"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1988
+#: accounts/doctype/sales_invoice/sales_invoice.py:1957
 msgid "{0} not allowed to transact with {1}. Please change the Company."
 msgstr "{0} n'est pas autorisé à traiter avec {1}. Veuillez changer la société."
 
@@ -80883,60 +82446,60 @@
 msgid "{0} payment entries can not be filtered by {1}"
 msgstr "{0} écritures de paiement ne peuvent pas être filtrées par {1}"
 
-#: controllers/stock_controller.py:899
+#: controllers/stock_controller.py:1085
 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:451
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:505
 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:702
+#: stock/doctype/pick_list/pick_list.py:773
 msgid "{0} units of Item {1} is not available."
 msgstr "{0} unités de l'élément {1} ne sont pas disponibles."
 
-#: stock/doctype/pick_list/pick_list.py:718
+#: stock/doctype/pick_list/pick_list.py:789
 msgid "{0} units of Item {1} is picked in another Pick List."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:135
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:145
 msgid "{0} units of {1} are required in {2}{3}, on {4} {5} for {6} to complete the transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1340 stock/stock_ledger.py:1829
-#: stock/stock_ledger.py:1845
+#: stock/stock_ledger.py:1366 stock/stock_ledger.py:1836
+#: stock/stock_ledger.py:1852
 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
 msgstr "{0} unités de {1} nécessaires dans {2} sur {3} {4} pour {5} pour compléter cette transaction."
 
-#: stock/stock_ledger.py:1955 stock/stock_ledger.py:2005
+#: stock/stock_ledger.py:1962 stock/stock_ledger.py:2012
 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1334
+#: stock/stock_ledger.py:1360
 msgid "{0} units of {1} needed in {2} to complete this transaction."
 msgstr "{0} unités de {1} nécessaires dans {2} pour compléter cette transaction."
 
-#: stock/utils.py:432
+#: stock/utils.py:427
 msgid "{0} valid serial nos for Item {1}"
 msgstr "{0} numéro de série valide pour l'objet {1}"
 
-#: stock/doctype/item/item.js:548
+#: stock/doctype/item/item.js:615
 msgid "{0} variants created."
 msgstr "{0} variantes créées."
 
-#: accounts/doctype/payment_term/payment_term.js:17
+#: accounts/doctype/payment_term/payment_term.js:19
 msgid "{0} will be given as discount."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:773
+#: manufacturing/doctype/job_card/job_card.py:780
 msgid "{0} {1}"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:203
+#: public/js/utils/serial_no_batch_selector.js:206
 msgid "{0} {1} Manually"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:433
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:432
 msgid "{0} {1} Partially Reconciled"
 msgstr ""
 
@@ -80948,9 +82511,9 @@
 msgid "{0} {1} created"
 msgstr "{0} {1} créé"
 
-#: accounts/doctype/payment_entry/payment_entry.py:506
-#: accounts/doctype/payment_entry/payment_entry.py:562
-#: accounts/doctype/payment_entry/payment_entry.py:2065
+#: accounts/doctype/payment_entry/payment_entry.py:515
+#: accounts/doctype/payment_entry/payment_entry.py:571
+#: accounts/doctype/payment_entry/payment_entry.py:2084
 msgid "{0} {1} does not exist"
 msgstr "{0} {1} n'existe pas"
 
@@ -80966,8 +82529,8 @@
 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:449
-#: selling/doctype/sales_order/sales_order.py:481
+#: buying/doctype/purchase_order/purchase_order.py:450
+#: selling/doctype/sales_order/sales_order.py:484
 #: stock/doctype/material_request/material_request.py:198
 msgid "{0} {1} has been modified. Please refresh."
 msgstr "{0} {1} a été modifié. Veuillez actualiser."
@@ -80980,12 +82543,12 @@
 msgid "{0} {1} is allocated twice in this Bank Transaction"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:591
+#: accounts/doctype/payment_entry/payment_entry.py:600
 msgid "{0} {1} is associated with {2}, but Party Account is {3}"
 msgstr "{0} {1} est associé à {2}, mais le compte tiers est {3}"
 
-#: controllers/buying_controller.py:624 controllers/selling_controller.py:421
-#: controllers/subcontracting_controller.py:806
+#: controllers/buying_controller.py:649 controllers/selling_controller.py:422
+#: controllers/subcontracting_controller.py:810
 msgid "{0} {1} is cancelled or closed"
 msgstr "{0} {1} est annulé ou fermé"
 
@@ -80997,7 +82560,7 @@
 msgid "{0} {1} is cancelled so the action cannot be completed"
 msgstr "{0} {1} est annulé, donc l'action ne peut pas être complétée"
 
-#: accounts/doctype/journal_entry/journal_entry.py:725
+#: accounts/doctype/journal_entry/journal_entry.py:752
 msgid "{0} {1} is closed"
 msgstr "{0} {1} est fermé"
 
@@ -81009,7 +82572,7 @@
 msgid "{0} {1} is frozen"
 msgstr "{0} {1} est gelée"
 
-#: accounts/doctype/journal_entry/journal_entry.py:722
+#: accounts/doctype/journal_entry/journal_entry.py:749
 msgid "{0} {1} is fully billed"
 msgstr "{0} {1} est entièrement facturé"
 
@@ -81017,7 +82580,7 @@
 msgid "{0} {1} is not active"
 msgstr "{0} {1} n'est pas actif"
 
-#: accounts/doctype/payment_entry/payment_entry.py:569
+#: accounts/doctype/payment_entry/payment_entry.py:578
 msgid "{0} {1} is not associated with {2} {3}"
 msgstr "{0} {1} n'est pas associé à {2} {3}"
 
@@ -81025,12 +82588,12 @@
 msgid "{0} {1} is not in any active Fiscal Year"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:719
-#: accounts/doctype/journal_entry/journal_entry.py:760
+#: accounts/doctype/journal_entry/journal_entry.py:746
+#: accounts/doctype/journal_entry/journal_entry.py:787
 msgid "{0} {1} is not submitted"
 msgstr "{0} {1} n'a pas été soumis"
 
-#: accounts/doctype/payment_entry/payment_entry.py:598
+#: accounts/doctype/payment_entry/payment_entry.py:607
 msgid "{0} {1} is on hold"
 msgstr ""
 
@@ -81038,11 +82601,11 @@
 msgid "{0} {1} is {2}"
 msgstr "{0} {1} est {2}"
 
-#: accounts/doctype/payment_entry/payment_entry.py:603
+#: accounts/doctype/payment_entry/payment_entry.py:612
 msgid "{0} {1} must be submitted"
 msgstr "{0} {1} doit être soumis"
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:213
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:215
 msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
 msgstr ""
 
@@ -81050,58 +82613,58 @@
 msgid "{0} {1} status is {2}"
 msgstr "Le Statut de {0} {1} est {2}"
 
-#: public/js/utils/serial_no_batch_selector.js:189
+#: public/js/utils/serial_no_batch_selector.js:191
 msgid "{0} {1} via CSV File"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:254
+#: accounts/doctype/gl_entry/gl_entry.py:208
 msgid "{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry"
 msgstr "{0} {1}: Compte {2} de type ‘Pertes et Profits’ non admis en Écriture d’Ouverture"
 
-#: accounts/doctype/gl_entry/gl_entry.py:283
+#: accounts/doctype/gl_entry/gl_entry.py:237
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:87
 msgid "{0} {1}: Account {2} does not belong to Company {3}"
 msgstr "{0} {1} : Compte {2} ne fait pas partie de la Société {3}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:271
+#: accounts/doctype/gl_entry/gl_entry.py:225
 #: 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:278
+#: accounts/doctype/gl_entry/gl_entry.py:232
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:82
 msgid "{0} {1}: Account {2} is inactive"
 msgstr "{0} {1} : Compte {2} inactif"
 
-#: accounts/doctype/gl_entry/gl_entry.py:322
+#: accounts/doctype/gl_entry/gl_entry.py:276
 msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
 msgstr "{0} {1} : L’Écriture Comptable pour {2} peut seulement être faite en devise: {3}"
 
-#: controllers/stock_controller.py:365
+#: controllers/stock_controller.py:547
 msgid "{0} {1}: Cost Center is mandatory for Item {2}"
 msgstr "{0} {1}: Centre de Coûts est obligatoire pour l’Article {2}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:171
+#: accounts/doctype/gl_entry/gl_entry.py:161
 msgid "{0} {1}: Cost Center is required for 'Profit and Loss' account {2}."
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:298
+#: accounts/doctype/gl_entry/gl_entry.py:252
 msgid "{0} {1}: Cost Center {2} does not belong to Company {3}"
 msgstr "{0} {1} : Le Centre de Coûts {2} ne fait pas partie de la Société {3}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:305
+#: accounts/doctype/gl_entry/gl_entry.py:259
 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:137
+#: accounts/doctype/gl_entry/gl_entry.py:127
 msgid "{0} {1}: Customer is required against Receivable account {2}"
 msgstr "{0} {1} : Un Client est requis pour le Compte Débiteur {2}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:159
+#: accounts/doctype/gl_entry/gl_entry.py:149
 msgid "{0} {1}: Either debit or credit amount is required for {2}"
 msgstr "{0} {1} : Un montant est requis au débit ou au crédit pour {2}"
 
-#: accounts/doctype/gl_entry/gl_entry.py:143
+#: accounts/doctype/gl_entry/gl_entry.py:133
 msgid "{0} {1}: Supplier is required against Payable account {2}"
 msgstr "{0} {1} : Un Fournisseur est requis pour le Compte Créditeur {2}"
 
@@ -81126,7 +82689,7 @@
 msgid "{0}'s {1} cannot be after {2}'s Expected End Date."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:1009
+#: manufacturing/doctype/job_card/job_card.py:1024
 msgid "{0}, complete the operation {1} before the operation {2}."
 msgstr "{0}, terminez l'opération {1} avant l'opération {2}."
 
@@ -81134,7 +82697,7 @@
 msgid "{0}: {1} does not exists"
 msgstr "{0} : {1} n’existe pas"
 
-#: accounts/doctype/payment_entry/payment_entry.js:724
+#: accounts/doctype/payment_entry/payment_entry.js:889
 msgid "{0}: {1} must be less than {2}"
 msgstr "{0}: {1} doit être inférieur à {2}"
 
@@ -81142,11 +82705,11 @@
 msgid "{0}{1} Did you rename the item? Please contact Administrator / Tech support"
 msgstr "{0} {1} Avez-vous renommé l'élément? Veuillez contacter l'administrateur / le support technique"
 
-#: controllers/stock_controller.py:1160
+#: controllers/stock_controller.py:1346
 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:1148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1156
 msgid "{range4}-Above"
 msgstr ""
 
@@ -81154,11 +82717,11 @@
 msgid "{}"
 msgstr ""
 
-#: controllers/buying_controller.py:712
+#: controllers/buying_controller.py:737
 msgid "{} Assets created for {}"
 msgstr "{} Éléments créés pour {}"
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1775
+#: accounts/doctype/sales_invoice/sales_invoice.py:1744
 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
 msgstr "{} ne peut pas être annulé car les points de fidélité gagnés ont été utilisés. Annulez d'abord le {} Non {}"
 
diff --git a/erpnext/locale/main.pot b/erpnext/locale/main.pot
index 3409014..61208a6 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-01-29 18:13+0053\n"
-"PO-Revision-Date: 2024-01-29 18:13+0053\n"
+"POT-Creation-Date: 2024-03-24 09:35+0000\n"
+"PO-Revision-Date: 2024-03-24 09:35+0000\n"
 "Last-Translator: info@erpnext.com\n"
 "Language-Team: info@erpnext.com\n"
 "MIME-Version: 1.0\n"
@@ -16,21 +16,17 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.13.1\n"
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:85
-msgid " "
-msgstr ""
-
 #. Label of a Column Break field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
 msgid "  "
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:76
+#: selling/doctype/quotation/quotation.js:77
 msgid " Address"
 msgstr ""
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:612
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:618
 msgid " Amount"
 msgstr ""
 
@@ -40,29 +36,16 @@
 msgid " Is Child Table"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:186
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:184
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:107
 #: selling/report/sales_analytics/sales_analytics.py:66
 msgid " Name"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:108
-msgid " Qty"
-msgstr ""
-
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:603
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:609
 msgid " Rate"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:116
-msgid " Raw Material"
-msgstr ""
-
-#: public/js/bom_configurator/bom_configurator.bundle.js:127
-#: public/js/bom_configurator/bom_configurator.bundle.js:157
-msgid " Sub Assembly"
-msgstr ""
-
 #: projects/doctype/project_update/project_update.py:110
 msgid " Summary"
 msgstr ""
@@ -79,6 +62,10 @@
 msgid "\"Is Fixed Asset\" cannot be unchecked, as Asset record exists against the item"
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "#"
+msgstr ""
+
 #. Description of the Onboarding Step 'Accounts Settings'
 #: accounts/onboarding_step/accounts_settings/accounts_settings.json
 msgid ""
@@ -624,7 +611,7 @@
 msgid "% Completed"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:755
+#: manufacturing/doctype/bom/bom.js:788
 #, python-format
 msgid "% Finished Item Quantity"
 msgstr ""
@@ -636,6 +623,7 @@
 msgstr ""
 
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:70
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:16
 msgid "% Occupied"
 msgstr ""
 
@@ -725,11 +713,11 @@
 msgid "% of materials delivered against this Sales Order"
 msgstr ""
 
-#: controllers/accounts_controller.py:1899
+#: controllers/accounts_controller.py:1991
 msgid "'Account' in the Accounting section of Customer {0}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:263
+#: selling/doctype/sales_order/sales_order.py:266
 msgid "'Allow Multiple Sales Orders Against a Customer's Purchase Order'"
 msgstr ""
 
@@ -737,7 +725,7 @@
 msgid "'Based On' and 'Group By' can not be same"
 msgstr ""
 
-#: stock/report/product_bundle_balance/product_bundle_balance.py:232
+#: stock/report/product_bundle_balance/product_bundle_balance.py:230
 msgid "'Date' is required"
 msgstr ""
 
@@ -745,11 +733,11 @@
 msgid "'Days Since Last Order' must be greater than or equal to zero"
 msgstr ""
 
-#: controllers/accounts_controller.py:1904
+#: controllers/accounts_controller.py:1996
 msgid "'Default {0} Account' in Company {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1048
+#: accounts/doctype/journal_entry/journal_entry.py:1075
 msgid "'Entries' cannot be empty"
 msgstr ""
 
@@ -767,10 +755,26 @@
 msgid "'Has Serial No' can not be 'Yes' for non-stock item"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:436
+#: stock/report/stock_ledger/stock_ledger.py:538
 msgid "'Opening'"
 msgstr ""
 
+#: stock/doctype/delivery_note/delivery_note.py:388
+msgid "'Sales Invoice Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:381
+msgid "'Sales Invoice' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:364
+msgid "'Sales Order Item' reference ({1}) is missing in row {0}"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:357
+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
@@ -785,10 +789,18 @@
 msgid "'Update Stock' can not be checked because items are not delivered via {0}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:369
+#: accounts/doctype/sales_invoice/sales_invoice.py:380
 msgid "'Update Stock' cannot be checked for fixed asset sale"
 msgstr ""
 
+#: accounts/doctype/bank_account/bank_account.py:64
+msgid "'{0}' account is already used by {1}. Use another account."
+msgstr ""
+
+#: controllers/accounts_controller.py:392
+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/stock_ledger_invariant_check/stock_ledger_invariant_check.py:180
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:104
@@ -880,7 +892,7 @@
 msgid "* Will be calculated in the transaction."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:130
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:140
 msgid ", with the inventory {0}: {1}"
 msgstr ""
 
@@ -1113,7 +1125,7 @@
 msgid "<div class=\"text-muted text-center\">No Matching Bank Transactions Found</div>"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:258
+#: public/js/bank_reconciliation_tool/dialog_manager.js:262
 msgid "<div class=\"text-muted text-center\">{0}</div>"
 msgstr ""
 
@@ -1351,11 +1363,11 @@
 msgid "A BOM with name {0} already exists for item {1}."
 msgstr ""
 
-#: selling/doctype/customer/customer.py:297
+#: selling/doctype/customer/customer.py:309
 msgid "A Customer Group exists with same name please change the Customer name or rename the Customer Group"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.js:47
+#: manufacturing/doctype/workstation/workstation.js:73
 msgid "A Holiday List can be added to exclude counting these days for the Workstation."
 msgstr ""
 
@@ -1367,7 +1379,17 @@
 msgid "A Packing Slip can only be created for Draft Delivery Note."
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:530
+#. Description of a DocType
+#: stock/doctype/price_list/price_list.json
+msgid "A Price List is a collection of Item Prices either Selling, Buying, or both"
+msgstr ""
+
+#. Description of a DocType
+#: stock/doctype/item/item.json
+msgid "A Product or a Service that is bought, sold or kept in stock."
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:535
 msgid "A Reconciliation Job {0} is running for the same filters. Cannot reconcile now"
 msgstr ""
 
@@ -1379,12 +1401,13 @@
 "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:937
-msgid "A Transaction Deletion Job is triggered for {0}"
+#: setup/doctype/company/company.py:916
+msgid "A Transaction Deletion Document: {0} is triggered for {0}"
 msgstr ""
 
-#: setup/doctype/company/company.py:914
-msgid "A Transaction Deletion Job: {0} is already running for {1}"
+#. Description of a DocType
+#: accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+msgid "A condition for a Shipping Rule"
 msgstr ""
 
 #. Description of the 'Send To Primary Contact' (Check) field in DocType
@@ -1402,6 +1425,11 @@
 msgid "A driver must be set to submit."
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/warehouse/warehouse.json
+msgid "A logical Warehouse against which stock entries are made."
+msgstr ""
+
 #: templates/emails/confirm_appointment.html:2
 msgid "A new appointment has been created for you with {0}"
 msgstr ""
@@ -1410,6 +1438,11 @@
 msgid "A template with tax category {0} already exists. Only one template is allowed with each tax category"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/sales_partner/sales_partner.json
+msgid "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission."
+msgstr ""
+
 #. Option for the 'Blood Group' (Select) field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -1608,11 +1641,11 @@
 msgid "Abbreviation"
 msgstr ""
 
-#: setup/doctype/company/company.py:164
+#: setup/doctype/company/company.py:163
 msgid "Abbreviation already used for another company"
 msgstr ""
 
-#: setup/doctype/company/company.py:159
+#: setup/doctype/company/company.py:158
 msgid "Abbreviation is mandatory"
 msgstr ""
 
@@ -1626,15 +1659,15 @@
 msgid "About Us Settings"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:39
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
 msgid "About {0} minute remaining"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:40
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:38
 msgid "About {0} minutes remaining"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:37
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:35
 msgid "About {0} seconds remaining"
 msgstr ""
 
@@ -1702,7 +1735,7 @@
 msgid "Accepted Qty in Stock UOM"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2124
+#: public/js/controllers/transaction.js:2167
 msgid "Accepted Quantity"
 msgstr ""
 
@@ -1754,7 +1787,7 @@
 msgid "Access Key"
 msgstr ""
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:48
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:49
 msgid "Access Key is required for Service Provider: {0}"
 msgstr ""
 
@@ -1776,13 +1809,13 @@
 #: 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_ledger/general_ledger.js:38
-#: accounts/report/general_ledger/general_ledger.py:565
-#: accounts/report/payment_ledger/payment_ledger.js:31
+#: accounts/report/general_ledger/general_ledger.py:578
+#: 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_for_party/trial_balance_for_party.js:70
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:16
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:16
+#: 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
 msgid "Account"
 msgstr ""
 
@@ -1935,12 +1968,6 @@
 msgid "Account Balance"
 msgstr ""
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Account Balance"
-msgstr ""
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -2084,8 +2111,8 @@
 msgid "Account Manager"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
-#: controllers/accounts_controller.py:1908
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
+#: controllers/accounts_controller.py:2000
 msgid "Account Missing"
 msgstr ""
 
@@ -2113,11 +2140,11 @@
 msgid "Account Name"
 msgstr ""
 
-#: accounts/doctype/account/account.py:306
+#: accounts/doctype/account/account.py:325
 msgid "Account Not Found"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:108
+#: accounts/doctype/account/account_tree.js:131
 msgid "Account Number"
 msgstr ""
 
@@ -2127,7 +2154,7 @@
 msgid "Account Number"
 msgstr ""
 
-#: accounts/doctype/account/account.py:458
+#: accounts/doctype/account/account.py:477
 msgid "Account Number {0} already used in account {1}"
 msgstr ""
 
@@ -2165,8 +2192,8 @@
 msgid "Account Subtype"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:115
-#: accounts/report/account_balance/account_balance.js:35
+#: accounts/doctype/account/account_tree.js:152
+#: accounts/report/account_balance/account_balance.js:34
 msgid "Account Type"
 msgstr ""
 
@@ -2210,11 +2237,11 @@
 msgid "Account Value"
 msgstr ""
 
-#: accounts/doctype/account/account.py:279
+#: accounts/doctype/account/account.py:298
 msgid "Account balance already in Credit, you are not allowed to set 'Balance Must Be' as 'Debit'"
 msgstr ""
 
-#: accounts/doctype/account/account.py:273
+#: accounts/doctype/account/account.py:292
 msgid "Account balance already in Debit, you are not allowed to set 'Balance Must Be' as 'Credit'"
 msgstr ""
 
@@ -2236,7 +2263,7 @@
 msgid "Account for Change Amount"
 msgstr ""
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:44
+#: accounts/doctype/bank_clearance/bank_clearance.py:46
 msgid "Account is mandatory to get payment entries"
 msgstr ""
 
@@ -2244,28 +2271,28 @@
 msgid "Account is not set for the dashboard chart {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:677
+#: assets/doctype/asset/asset.py:679
 msgid "Account not Found"
 msgstr ""
 
-#: accounts/doctype/account/account.py:360
+#: accounts/doctype/account/account.py:379
 msgid "Account with child nodes cannot be converted to ledger"
 msgstr ""
 
-#: accounts/doctype/account/account.py:252
+#: accounts/doctype/account/account.py:271
 msgid "Account with child nodes cannot be set as ledger"
 msgstr ""
 
-#: accounts/doctype/account/account.py:371
+#: accounts/doctype/account/account.py:390
 msgid "Account with existing transaction can not be converted to group."
 msgstr ""
 
-#: accounts/doctype/account/account.py:400
+#: accounts/doctype/account/account.py:419
 msgid "Account with existing transaction can not be deleted"
 msgstr ""
 
-#: accounts/doctype/account/account.py:247
-#: accounts/doctype/account/account.py:362
+#: accounts/doctype/account/account.py:266
+#: accounts/doctype/account/account.py:381
 msgid "Account with existing transaction cannot be converted to ledger"
 msgstr ""
 
@@ -2273,7 +2300,7 @@
 msgid "Account {0} added multiple times"
 msgstr ""
 
-#: setup/doctype/company/company.py:187
+#: setup/doctype/company/company.py:186
 msgid "Account {0} does not belong to company: {1}"
 msgstr ""
 
@@ -2281,7 +2308,7 @@
 msgid "Account {0} does not belongs to company {1}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:532
+#: accounts/doctype/account/account.py:551
 msgid "Account {0} does not exist"
 msgstr ""
 
@@ -2297,7 +2324,7 @@
 msgid "Account {0} does not match with Company {1} in Mode of Account: {2}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:490
+#: accounts/doctype/account/account.py:509
 msgid "Account {0} exists in parent company {1}."
 msgstr ""
 
@@ -2305,51 +2332,51 @@
 msgid "Account {0} has been entered multiple times"
 msgstr ""
 
-#: accounts/doctype/account/account.py:344
+#: accounts/doctype/account/account.py:363
 msgid "Account {0} is added in the child company {1}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:443
+#: accounts/doctype/gl_entry/gl_entry.py:397
 msgid "Account {0} is frozen"
 msgstr ""
 
-#: controllers/accounts_controller.py:1032
+#: controllers/accounts_controller.py:1096
 msgid "Account {0} is invalid. Account Currency must be {1}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:150
+#: accounts/doctype/account/account.py:151
 msgid "Account {0}: Parent account {1} can not be a ledger"
 msgstr ""
 
-#: accounts/doctype/account/account.py:156
+#: accounts/doctype/account/account.py:157
 msgid "Account {0}: Parent account {1} does not belong to company: {2}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:144
+#: accounts/doctype/account/account.py:145
 msgid "Account {0}: Parent account {1} does not exist"
 msgstr ""
 
-#: accounts/doctype/account/account.py:147
+#: accounts/doctype/account/account.py:148
 msgid "Account {0}: You can not assign itself as parent account"
 msgstr ""
 
-#: accounts/general_ledger.py:403
+#: accounts/general_ledger.py:412
 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:243
+#: accounts/doctype/journal_entry/journal_entry.py:259
 msgid "Account: {0} can only be updated via Stock Transactions"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:325
+#: accounts/report/general_ledger/general_ledger.py:338
 msgid "Account: {0} does not exist"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:2098
+#: accounts/doctype/payment_entry/payment_entry.py:2117
 msgid "Account: {0} is not permitted under Payment Entry"
 msgstr ""
 
-#: controllers/accounts_controller.py:2591
+#: controllers/accounts_controller.py:2676
 msgid "Account: {0} with currency: {1} can not be selected"
 msgstr ""
 
@@ -2509,12 +2536,12 @@
 msgid "Accounting Dimension"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:206
+#: accounts/doctype/gl_entry/gl_entry.py:196
 #: 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:193
+#: accounts/doctype/gl_entry/gl_entry.py:183
 #: 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 ""
@@ -2830,53 +2857,54 @@
 msgid "Accounting Entries"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:82
+#: accounts/doctype/sales_invoice/sales_invoice.js:86
 msgid "Accounting Entries are reposted"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:42
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
 msgid "Accounting Entries are reposted."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:709 assets/doctype/asset/asset.py:724
-#: assets/doctype/asset_capitalization/asset_capitalization.py:572
+#: assets/doctype/asset/asset.py:713 assets/doctype/asset/asset.py:728
+#: assets/doctype/asset_capitalization/asset_capitalization.py:578
 msgid "Accounting Entry for Asset"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:738
+#: stock/doctype/purchase_receipt/purchase_receipt.py:737
 msgid "Accounting Entry for Service"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:906
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:926
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:942
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:959
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:978
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:999
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1126
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1266
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1284
-#: controllers/stock_controller.py:168 controllers/stock_controller.py:183
-#: stock/doctype/purchase_receipt/purchase_receipt.py:839
-#: stock/doctype/stock_entry/stock_entry.py:1464
-#: stock/doctype/stock_entry/stock_entry.py:1478
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:519
+#: 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
 msgid "Accounting Entry for Stock"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:658
+#: stock/doctype/purchase_receipt/purchase_receipt.py:659
 msgid "Accounting Entry for {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:1950
+#: controllers/accounts_controller.py:2042
 msgid "Accounting Entry for {0}: {1} can only be made in currency: {2}"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:192
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:193
 #: buying/doctype/supplier/supplier.js:85
-#: public/js/controllers/stock_controller.js:72
-#: public/js/utils/ledger_preview.js:7 selling/doctype/customer/customer.js:159
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:43
+#: public/js/controllers/stock_controller.js:84
+#: public/js/utils/ledger_preview.js:8 selling/doctype/customer/customer.js:164
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:48
 msgid "Accounting Ledger"
 msgstr ""
 
@@ -2907,15 +2935,19 @@
 msgid "Accounting entries are frozen up to this date. Nobody can create or modify entries except users with the role specified below"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:69
+#: accounts/doctype/journal_entry/journal_entry.js:30
+msgid "Accounting entries for this Journal Entry need to be reposted. Please click on 'Repost' button to update."
+msgstr ""
+
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:82
 msgid "Accounting entries for this invoice need to be reposted. Please click on 'Repost' button to update."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:72
+#: accounts/doctype/sales_invoice/sales_invoice.js:73
 msgid "Accounting entries for this invoice needs to be reposted. Please click on 'Repost' button to update."
 msgstr ""
 
-#: setup/doctype/company/company.py:317
+#: setup/doctype/company/company.py:316
 msgid "Accounts"
 msgstr ""
 
@@ -3090,7 +3122,7 @@
 msgid "Accounts Manager"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:343
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:341
 msgid "Accounts Missing Error"
 msgstr ""
 
@@ -3100,9 +3132,9 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:85
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:117
 #: accounts/report/accounts_payable/accounts_payable.json
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:122
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:125
 #: accounts/workspace/payables/payables.json
-#: buying/doctype/supplier/supplier.js:90
+#: buying/doctype/supplier/supplier.js:97
 msgid "Accounts Payable"
 msgstr ""
 
@@ -3115,7 +3147,7 @@
 
 #. Name of a report
 #. Label of a Link in the Payables Workspace
-#: accounts/report/accounts_payable/accounts_payable.js:175
+#: accounts/report/accounts_payable/accounts_payable.js:176
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.json
 #: accounts/workspace/payables/payables.json
 msgid "Accounts Payable Summary"
@@ -3128,10 +3160,10 @@
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:12
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:12
 #: accounts/report/accounts_receivable/accounts_receivable.json
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:150
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:153
 #: accounts/workspace/accounting/accounting.json
 #: accounts/workspace/receivables/receivables.json
-#: selling/doctype/customer/customer.js:155
+#: selling/doctype/customer/customer.js:153
 msgid "Accounts Receivable"
 msgstr ""
 
@@ -3290,7 +3322,7 @@
 msgid "Accounts User"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1153
+#: accounts/doctype/journal_entry/journal_entry.py:1180
 msgid "Accounts table cannot be blank."
 msgstr ""
 
@@ -3307,7 +3339,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:33
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:46
-#: accounts/report/account_balance/account_balance.js:38
+#: accounts/report/account_balance/account_balance.js:37
 msgid "Accumulated Depreciation"
 msgstr ""
 
@@ -3330,7 +3362,7 @@
 msgstr ""
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:155
-#: assets/doctype/asset/asset.js:242
+#: assets/doctype/asset/asset.js:277
 msgid "Accumulated Depreciation Amount"
 msgstr ""
 
@@ -3345,17 +3377,17 @@
 msgid "Accumulated Depreciation as on"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:243
+#: accounts/doctype/budget/budget.py:250
 msgid "Accumulated Monthly"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:27
-#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:13
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:28
+#: accounts/report/balance_sheet/balance_sheet.js:22
+#: accounts/report/gross_and_net_profit_report/gross_and_net_profit_report.js:8
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:23
 msgid "Accumulated Values"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:101
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:125
 msgid "Accumulated Values in Group Company"
 msgstr ""
 
@@ -3370,7 +3402,7 @@
 msgstr ""
 
 #: crm/doctype/lead/lead.js:42
-#: public/js/bank_reconciliation_tool/dialog_manager.js:171
+#: public/js/bank_reconciliation_tool/dialog_manager.js:175
 msgid "Action"
 msgstr ""
 
@@ -3392,7 +3424,7 @@
 msgid "Action If Same Rate is Not Maintained"
 msgstr ""
 
-#: quality_management/doctype/quality_review/quality_review_list.js:9
+#: quality_management/doctype/quality_review/quality_review_list.js:7
 msgid "Action Initialised"
 msgstr ""
 
@@ -3438,23 +3470,24 @@
 msgid "Action if Same Rate is Not Maintained Throughout Sales Cycle"
 msgstr ""
 
-#: accounts/doctype/account/account.js:55
-#: accounts/doctype/account/account.js:62
-#: accounts/doctype/account/account.js:91
-#: accounts/doctype/account/account.js:116
-#: accounts/doctype/journal_entry/journal_entry.js:35
-#: accounts/doctype/payment_entry/payment_entry.js:160
+#: accounts/doctype/account/account.js:50
+#: accounts/doctype/account/account.js:57
+#: accounts/doctype/account/account.js:89
+#: accounts/doctype/account/account.js:117
+#: accounts/doctype/journal_entry/journal_entry.js:77
+#: accounts/doctype/payment_entry/payment_entry.js:190
 #: accounts/doctype/subscription/subscription.js:38
 #: accounts/doctype/subscription/subscription.js:44
 #: accounts/doctype/subscription/subscription.js:50
-#: buying/doctype/supplier/supplier.js:104
-#: buying/doctype/supplier/supplier.js:109
-#: projects/doctype/project/project.js:69
-#: projects/doctype/project/project.js:73
-#: projects/doctype/project/project.js:134
-#: public/js/bank_reconciliation_tool/data_table_manager.js:93
-#: public/js/utils/unreconcile.js:22 selling/doctype/customer/customer.js:170
-#: selling/doctype/customer/customer.js:175 stock/doctype/item/item.js:419
+#: buying/doctype/supplier/supplier.js:128
+#: buying/doctype/supplier/supplier.js:137
+#: projects/doctype/project/project.js:78
+#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:160
+#: public/js/bank_reconciliation_tool/data_table_manager.js:88
+#: public/js/bank_reconciliation_tool/data_table_manager.js:121
+#: public/js/utils/unreconcile.js:28 selling/doctype/customer/customer.js:184
+#: selling/doctype/customer/customer.js:193 stock/doctype/item/item.js:486
 #: templates/pages/order.html:20
 msgid "Actions"
 msgstr ""
@@ -3491,7 +3524,7 @@
 msgstr ""
 
 #: accounts/doctype/subscription/subscription_list.js:6
-#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:11
+#: manufacturing/doctype/bom/bom_list.js:9 stock/doctype/batch/batch_list.js:18
 #: stock/doctype/putaway_rule/putaway_rule_list.js:7
 msgid "Active"
 msgstr ""
@@ -3537,6 +3570,12 @@
 msgid "Active Leads"
 msgstr ""
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Active Status"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -3581,14 +3620,14 @@
 msgid "Activity Cost exists for Employee {0} against Activity Type - {1}"
 msgstr ""
 
-#: projects/doctype/activity_type/activity_type.js:7
+#: projects/doctype/activity_type/activity_type.js:10
 msgid "Activity Cost per Employee"
 msgstr ""
 
 #. Name of a DocType
 #: projects/doctype/activity_type/activity_type.json
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:32
-#: public/js/projects/timer.js:8
+#: public/js/projects/timer.js:9 templates/pages/timelog_info.html:25
 msgid "Activity Type"
 msgstr ""
 
@@ -3728,6 +3767,7 @@
 msgid "Actual Posting"
 msgstr ""
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:21
 #: stock/report/product_bundle_balance/product_bundle_balance.py:96
 #: stock/report/stock_projected_qty/stock_projected_qty.py:136
 msgid "Actual Qty"
@@ -3781,10 +3821,19 @@
 msgid "Actual Qty in Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:185
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:196
 msgid "Actual Qty is mandatory"
 msgstr ""
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:37
+#: stock/dashboard/item_dashboard_list.html:28
+msgid "Actual Qty {0} / Waiting Qty {1}"
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Actual Qty: Quantity available in the warehouse."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:95
 msgid "Actual Quantity"
 msgstr ""
@@ -3851,18 +3900,20 @@
 msgid "Actual qty in stock"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1223
+#: accounts/doctype/payment_entry/payment_entry.js:1470
 #: public/js/controllers/accounts.js:176
 msgid "Actual type tax cannot be included in Item rate in row {0}"
 msgstr ""
 
-#: crm/doctype/lead/lead.js:82
-#: public/js/bom_configurator/bom_configurator.bundle.js:225
-#: public/js/bom_configurator/bom_configurator.bundle.js:237
-#: public/js/bom_configurator/bom_configurator.bundle.js:291
-#: public/js/utils/crm_activities.js:168
+#: crm/doctype/lead/lead.js:85
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:55
+#: public/js/bom_configurator/bom_configurator.bundle.js:231
+#: public/js/bom_configurator/bom_configurator.bundle.js:244
+#: public/js/bom_configurator/bom_configurator.bundle.js:329
+#: public/js/utils/crm_activities.js:170
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/dashboard/item_dashboard_list.html:59
 msgid "Add"
 msgstr ""
 
@@ -3880,11 +3931,11 @@
 msgid "Add"
 msgstr ""
 
-#: stock/doctype/item/item.js:417 stock/doctype/price_list/price_list.js:7
+#: stock/doctype/item/item.js:482 stock/doctype/price_list/price_list.js:8
 msgid "Add / Edit Prices"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:176
+#: accounts/doctype/account/account_tree.js:256
 msgid "Add Child"
 msgstr ""
 
@@ -3892,27 +3943,36 @@
 msgid "Add Columns in Transaction Currency"
 msgstr ""
 
+#: templates/pages/task_info.html:94 templates/pages/task_info.html:96
+msgid "Add Comment"
+msgstr ""
+
 #. Label of a Check field in DocType 'Manufacturing Settings'
 #: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
 msgctxt "Manufacturing Settings"
 msgid "Add Corrective Operation Cost in Finished Good Valuation"
 msgstr ""
 
-#: public/js/event.js:19
+#: public/js/event.js:24
 msgid "Add Customers"
 msgstr ""
 
-#: public/js/event.js:27
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:411
+msgid "Add Discount"
+msgstr ""
+
+#: public/js/event.js:40
 msgid "Add Employees"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:224
-#: selling/doctype/sales_order/sales_order.js:207
-#: stock/dashboard/item_dashboard.js:205
+#: public/js/bom_configurator/bom_configurator.bundle.js:230
+#: selling/doctype/sales_order/sales_order.js:228
+#: stock/dashboard/item_dashboard.js:212
 msgid "Add Item"
 msgstr ""
 
-#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:33
+#: public/js/utils/item_selector.js:20 public/js/utils/item_selector.js:35
 msgid "Add Items"
 msgstr ""
 
@@ -3920,11 +3980,11 @@
 msgid "Add Items in the Purpose Table"
 msgstr ""
 
-#: crm/doctype/lead/lead.js:82
+#: crm/doctype/lead/lead.js:84
 msgid "Add Lead to Prospect"
 msgstr ""
 
-#: public/js/event.js:15
+#: public/js/event.js:16
 msgid "Add Leads"
 msgstr ""
 
@@ -3954,12 +4014,12 @@
 msgid "Add Or Deduct"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:269
+#: selling/page/point_of_sale/pos_item_cart.js:267
 msgid "Add Order Discount"
 msgstr ""
 
-#: public/js/event.js:17 public/js/event.js:21 public/js/event.js:25
-#: public/js/event.js:29 public/js/event.js:33
+#: public/js/event.js:20 public/js/event.js:28 public/js/event.js:36
+#: public/js/event.js:44 public/js/event.js:52
 msgid "Add Participants"
 msgstr ""
 
@@ -3969,7 +4029,7 @@
 msgid "Add Quote"
 msgstr ""
 
-#: public/js/event.js:31
+#: public/js/event.js:48
 msgid "Add Sales Partners"
 msgstr ""
 
@@ -4003,17 +4063,21 @@
 msgid "Add Serial / Batch No (Rejected Qty)"
 msgstr ""
 
-#: public/js/utils.js:61
+#: public/js/utils.js:71
 msgid "Add Serial No"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:231
-#: public/js/bom_configurator/bom_configurator.bundle.js:280
+#: manufacturing/doctype/plant_floor/plant_floor.js:172
+msgid "Add Stock"
+msgstr ""
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:238
+#: public/js/bom_configurator/bom_configurator.bundle.js:318
 msgid "Add Sub Assembly"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:433
-#: public/js/event.js:23
+#: buying/doctype/request_for_quotation/request_for_quotation.js:472
+#: public/js/event.js:32
 msgid "Add Suppliers"
 msgstr ""
 
@@ -4033,7 +4097,7 @@
 msgid "Add Weekly Holidays"
 msgstr ""
 
-#: public/js/utils/crm_activities.js:140
+#: public/js/utils/crm_activities.js:142
 msgid "Add a Note"
 msgstr ""
 
@@ -4052,7 +4116,7 @@
 msgstr ""
 
 #: stock/doctype/pick_list/pick_list.js:71
-#: stock/doctype/pick_list/pick_list.py:614
+#: stock/doctype/pick_list/pick_list.py:654
 msgid "Add items in the Item Locations table"
 msgstr ""
 
@@ -4088,10 +4152,14 @@
 msgid "Add to Transit"
 msgstr ""
 
-#: accounts/doctype/coupon_code/coupon_code.js:39
+#: accounts/doctype/coupon_code/coupon_code.js:36
 msgid "Add/Edit Coupon Conditions"
 msgstr ""
 
+#: templates/includes/footer/footer_extension.html:26
+msgid "Added"
+msgstr ""
+
 #. Label of a Link field in DocType 'CRM Note'
 #: crm/doctype/crm_note/crm_note.json
 msgctxt "CRM Note"
@@ -4108,7 +4176,7 @@
 msgid "Added Supplier Role to User {0}."
 msgstr ""
 
-#: public/js/utils/item_selector.js:66 public/js/utils/item_selector.js:80
+#: public/js/utils/item_selector.js:70 public/js/utils/item_selector.js:86
 msgid "Added {0} ({1})"
 msgstr ""
 
@@ -4116,10 +4184,14 @@
 msgid "Added {1} Role to User {0}."
 msgstr ""
 
-#: crm/doctype/lead/lead.js:80
+#: crm/doctype/lead/lead.js:81
 msgid "Adding Lead to Prospect..."
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "Additional"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Asset'
 #: assets/doctype/asset/asset.json
 msgctxt "Asset"
@@ -4447,6 +4519,10 @@
 msgid "Additional Info"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Additional Information"
+msgstr ""
+
 #. Label of a Section Break field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -4771,7 +4847,7 @@
 msgid "Address HTML"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:58
+#: public/js/utils/contact_address_quick_entry.js:61
 msgid "Address Line 1"
 msgstr ""
 
@@ -4781,7 +4857,7 @@
 msgid "Address Line 1"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:63
+#: public/js/utils/contact_address_quick_entry.js:66
 msgid "Address Line 2"
 msgstr ""
 
@@ -4880,15 +4956,15 @@
 msgid "Addresses"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:116
+#: assets/doctype/asset/asset.js:144
 msgid "Adjust Asset Value"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:996
+#: accounts/doctype/sales_invoice/sales_invoice.js:1072
 msgid "Adjustment Against"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:581
+#: stock/doctype/purchase_receipt/purchase_receipt.py:582
 msgid "Adjustment based on Purchase Invoice rate"
 msgstr ""
 
@@ -4905,7 +4981,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:303
+#: stock/reorder_item.py:388
 msgid "Administrator"
 msgstr ""
 
@@ -4937,8 +5013,8 @@
 msgid "Advance Paid"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order_list.js:47
-#: selling/doctype/sales_order/sales_order_list.js:61
+#: buying/doctype/purchase_order/purchase_order_list.js:65
+#: selling/doctype/sales_order/sales_order_list.js:105
 msgid "Advance Payment"
 msgstr ""
 
@@ -4954,7 +5030,7 @@
 msgid "Advance Payment Status"
 msgstr ""
 
-#: controllers/accounts_controller.py:214
+#: controllers/accounts_controller.py:224
 msgid "Advance Payments"
 msgstr ""
 
@@ -5010,11 +5086,11 @@
 msgid "Advance amount"
 msgstr ""
 
-#: controllers/taxes_and_totals.py:743
+#: controllers/taxes_and_totals.py:744
 msgid "Advance amount cannot be greater than {0} {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:741
+#: accounts/doctype/journal_entry/journal_entry.py:768
 msgid "Advance paid against {0} {1} cannot be greater than Grand Total {2}"
 msgstr ""
 
@@ -5062,6 +5138,10 @@
 msgid "Affected Transactions"
 msgstr ""
 
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:23
+msgid "Against"
+msgstr ""
+
 #. Label of a Text field in DocType 'GL Entry'
 #: accounts/doctype/gl_entry/gl_entry.json
 msgctxt "GL Entry"
@@ -5070,7 +5150,7 @@
 
 #: 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:631
+#: accounts/report/general_ledger/general_ledger.py:644
 msgid "Against Account"
 msgstr ""
 
@@ -5104,11 +5184,11 @@
 msgid "Against Blanket Order"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:945
+#: accounts/doctype/sales_invoice/sales_invoice.py:962
 msgid "Against Customer Order {0} dated {1}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:967
+#: selling/doctype/sales_order/sales_order.js:1127
 msgid "Against Default Supplier"
 msgstr ""
 
@@ -5166,12 +5246,12 @@
 msgid "Against Income Account"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:609
-#: accounts/doctype/payment_entry/payment_entry.py:669
+#: accounts/doctype/journal_entry/journal_entry.py:636
+#: accounts/doctype/payment_entry/payment_entry.py:678
 msgid "Against Journal Entry {0} does not have any unmatched {1} entry"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:410
+#: accounts/doctype/gl_entry/gl_entry.py:364
 msgid "Against Journal Entry {0} is already adjusted against some other voucher"
 msgstr ""
 
@@ -5205,11 +5285,11 @@
 msgid "Against Stock Entry"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:329
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
 msgid "Against Supplier Invoice {0} dated {1}"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:650
+#: accounts/report/general_ledger/general_ledger.py:663
 msgid "Against Voucher"
 msgstr ""
 
@@ -5220,7 +5300,7 @@
 msgstr ""
 
 #: accounts/report/general_ledger/general_ledger.js:57
-#: accounts/report/payment_ledger/payment_ledger.js:71
+#: accounts/report/payment_ledger/payment_ledger.js:70
 #: accounts/report/payment_ledger/payment_ledger.py:185
 msgid "Against Voucher No"
 msgstr ""
@@ -5231,7 +5311,7 @@
 msgid "Against Voucher No"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:648
+#: accounts/report/general_ledger/general_ledger.py:661
 #: accounts/report/payment_ledger/payment_ledger.py:176
 msgid "Against Voucher Type"
 msgstr ""
@@ -5249,14 +5329,15 @@
 msgstr ""
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:117
-#: manufacturing/report/work_order_summary/work_order_summary.js:59
+#: manufacturing/report/work_order_summary/work_order_summary.js:58
 #: manufacturing/report/work_order_summary/work_order_summary.py:259
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:96
 msgid "Age"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:151
-#: accounts/report/accounts_receivable/accounts_receivable.py:1134
+#: accounts/report/accounts_receivable/accounts_receivable.html:133
+#: accounts/report/accounts_receivable/accounts_receivable.py:1142
 msgid "Age (Days)"
 msgstr ""
 
@@ -5266,7 +5347,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:58
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:21
-#: accounts/report/accounts_receivable/accounts_receivable.js:83
+#: accounts/report/accounts_receivable/accounts_receivable.js:86
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:21
 msgid "Ageing Based On"
 msgstr ""
@@ -5279,7 +5360,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:65
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:28
-#: accounts/report/accounts_receivable/accounts_receivable.js:90
+#: accounts/report/accounts_receivable/accounts_receivable.js:93
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:28
 #: stock/report/stock_ageing/stock_ageing.js:49
 msgid "Ageing Range 1"
@@ -5287,7 +5368,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:72
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:35
-#: accounts/report/accounts_receivable/accounts_receivable.js:97
+#: accounts/report/accounts_receivable/accounts_receivable.js:100
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:35
 #: stock/report/stock_ageing/stock_ageing.js:56
 msgid "Ageing Range 2"
@@ -5295,7 +5376,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:79
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:42
-#: accounts/report/accounts_receivable/accounts_receivable.js:104
+#: accounts/report/accounts_receivable/accounts_receivable.js:107
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:42
 #: stock/report/stock_ageing/stock_ageing.js:63
 msgid "Ageing Range 3"
@@ -5303,7 +5384,7 @@
 
 #: accounts/report/accounts_payable/accounts_payable.js:86
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:49
-#: accounts/report/accounts_receivable/accounts_receivable.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:49
 msgid "Ageing Range 4"
 msgstr ""
@@ -5367,6 +5448,11 @@
 msgid "Agents"
 msgstr ""
 
+#. Description of a DocType
+#: selling/doctype/product_bundle/product_bundle.json
+msgid "Aggregate a group of Items into another Item. This is useful if you are maintaining the stock of the packed items and not the bundled item"
+msgstr ""
+
 #. Name of a role
 #: assets/doctype/location/location.json
 msgid "Agriculture Manager"
@@ -5398,10 +5484,10 @@
 msgid "All"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:148
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:168
+#: 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:1324 public/js/setup_wizard.js:163
+#: accounts/utils.py:1293 public/js/setup_wizard.js:174
 msgid "All Accounts"
 msgstr ""
 
@@ -5475,14 +5561,14 @@
 #: 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:310 setup/doctype/company/company.py:313
-#: setup/doctype/company/company.py:318 setup/doctype/company/company.py:324
-#: setup/doctype/company/company.py:330 setup/doctype/company/company.py:336
-#: setup/doctype/company/company.py:342 setup/doctype/company/company.py:348
-#: setup/doctype/company/company.py:354 setup/doctype/company/company.py:360
-#: setup/doctype/company/company.py:366 setup/doctype/company/company.py:372
-#: setup/doctype/company/company.py:378 setup/doctype/company/company.py:384
-#: setup/doctype/company/company.py:390
+#: 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
 msgid "All Departments"
 msgstr ""
 
@@ -5503,6 +5589,10 @@
 msgid "All Item Groups"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_selector.js:25
+msgid "All Items"
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5521,6 +5611,11 @@
 msgid "All Sales Person"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/sales_person/sales_person.json
+msgid "All Sales Transactions can be tagged against multiple Sales Persons so that you can set and monitor targets."
+msgstr ""
+
 #. Option for the 'Send To' (Select) field in DocType 'SMS Center'
 #: selling/doctype/sms_center/sms_center.json
 msgctxt "SMS Center"
@@ -5550,7 +5645,7 @@
 msgid "All Territories"
 msgstr ""
 
-#: setup/doctype/company/company.py:259 setup/doctype/company/company.py:275
+#: setup/doctype/company/company.py:258 setup/doctype/company/company.py:274
 msgid "All Warehouses"
 msgstr ""
 
@@ -5561,19 +5656,19 @@
 msgid "All allocations have been successfully reconciled"
 msgstr ""
 
-#: support/doctype/issue/issue.js:97
+#: support/doctype/issue/issue.js:107
 msgid "All communications including and above this shall be moved into the new Issue"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:1170
+#: stock/doctype/purchase_receipt/purchase_receipt.py:1172
 msgid "All items have already been Invoiced/Returned"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2191
+#: stock/doctype/stock_entry/stock_entry.py:2222
 msgid "All items have already been transferred for this Work Order."
 msgstr ""
 
-#: public/js/controllers/transaction.js:2210
+#: public/js/controllers/transaction.js:2253
 msgid "All items in this document already have a linked Quality Inspection."
 msgstr ""
 
@@ -5584,17 +5679,17 @@
 msgid "All the Comments and Emails will be copied from one document to another newly created document(Lead -> Opportunity -> Quotation) throughout the CRM documents."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:847
+#: manufacturing/doctype/work_order/work_order.js:916
 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:899
+#: stock/doctype/delivery_note/delivery_note.py:960
 msgid "All these items have already been Invoiced/Returned"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:83
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:95
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:84
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:85
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:92
 msgid "Allocate"
 msgstr ""
 
@@ -5610,7 +5705,7 @@
 msgid "Allocate Advances Automatically (FIFO)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:679
+#: accounts/doctype/payment_entry/payment_entry.js:831
 msgid "Allocate Payment Amount"
 msgstr ""
 
@@ -5633,7 +5728,7 @@
 msgstr ""
 
 #: accounts/report/gross_profit/gross_profit.py:314
-#: public/js/utils/unreconcile.js:62
+#: public/js/utils/unreconcile.js:86
 msgid "Allocated Amount"
 msgstr ""
 
@@ -5692,21 +5787,25 @@
 msgid "Allocated Entries"
 msgstr ""
 
+#: public/js/templates/crm_activities.html:49
+msgid "Allocated To:"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Invoice Advance'
 #: accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
 msgctxt "Sales Invoice Advance"
 msgid "Allocated amount"
 msgstr ""
 
-#: accounts/utils.py:614
+#: accounts/utils.py:623
 msgid "Allocated amount cannot be greater than unadjusted amount"
 msgstr ""
 
-#: accounts/utils.py:612
+#: accounts/utils.py:621
 msgid "Allocated amount cannot be negative"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:258
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:262
 msgid "Allocation"
 msgstr ""
 
@@ -5716,7 +5815,7 @@
 msgid "Allocation"
 msgstr ""
 
-#: public/js/utils/unreconcile.js:67
+#: public/js/utils/unreconcile.js:97
 msgid "Allocations"
 msgstr ""
 
@@ -5745,7 +5844,7 @@
 msgid "Allow"
 msgstr ""
 
-#: accounts/doctype/account/account.py:488
+#: accounts/doctype/account/account.py:507
 #: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py:68
 msgid "Allow Account Creation Against Child Company"
 msgstr ""
@@ -5850,7 +5949,7 @@
 msgid "Allow Material Transfer from Purchase Receipt to Purchase Invoice"
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:9
 msgid "Allow Multiple Material Consumption"
 msgstr ""
 
@@ -6127,7 +6226,7 @@
 msgid "Allows to keep aside a specific quantity of inventory for a particular order."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:721
+#: stock/doctype/pick_list/pick_list.py:792
 msgid "Already Picked"
 msgstr ""
 
@@ -6139,9 +6238,9 @@
 msgid "Already set default in pos profile {0} for user {1}, kindly disabled default"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:141
-#: manufacturing/doctype/work_order/work_order.js:162 public/js/utils.js:466
-#: stock/doctype/stock_entry/stock_entry.js:224
+#: manufacturing/doctype/bom/bom.js:152
+#: manufacturing/doctype/work_order/work_order.js:169 public/js/utils.js:519
+#: stock/doctype/stock_entry/stock_entry.js:245
 msgid "Alternate Item"
 msgstr ""
 
@@ -6157,6 +6256,10 @@
 msgid "Alternative Item Name"
 msgstr ""
 
+#: selling/doctype/quotation/quotation.js:360
+msgid "Alternative Items"
+msgstr ""
+
 #: stock/doctype/item_alternative/item_alternative.py:37
 msgid "Alternative item must not be same as item code"
 msgstr ""
@@ -6627,7 +6730,7 @@
 msgid "Amended From"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:529
+#: accounts/doctype/journal_entry/journal_entry.js:579
 #: 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
@@ -6641,16 +6744,20 @@
 #: 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
-#: selling/doctype/quotation/quotation.js:286
+#: 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
 #: selling/report/sales_order_analysis/sales_order_analysis.py:290
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:46
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:69
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:67
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:108
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:109
 #: stock/report/delayed_item_report/delayed_item_report.py:152
 #: stock/report/delayed_order_report/delayed_order_report.py:71
-#: templates/pages/order.html:92 templates/pages/rfq.html:46
+#: templates/form_grid/bank_reconciliation_grid.html:4
+#: templates/form_grid/item_grid.html:9
+#: templates/form_grid/stock_entry_grid.html:11 templates/pages/order.html:104
+#: templates/pages/rfq.html:46
 msgid "Amount"
 msgstr ""
 
@@ -7168,19 +7275,19 @@
 msgid "Amount in customer's currency"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1119
+#: accounts/doctype/payment_entry/payment_entry.py:1128
 msgid "Amount {0} {1} against {2} {3}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1127
+#: accounts/doctype/payment_entry/payment_entry.py:1136
 msgid "Amount {0} {1} deducted against {2}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1095
+#: accounts/doctype/payment_entry/payment_entry.py:1104
 msgid "Amount {0} {1} transferred from {2} to {3}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1102
+#: accounts/doctype/payment_entry/payment_entry.py:1111
 msgid "Amount {0} {1} {2} {3}"
 msgstr ""
 
@@ -7189,7 +7296,12 @@
 msgid "Amt"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:393
+#. Description of a DocType
+#: setup/doctype/item_group/item_group.json
+msgid "An Item Group is a way to classify items based on types."
+msgstr ""
+
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:408
 msgid "An error has been appeared while reposting item valuation via {0}"
 msgstr ""
 
@@ -7198,19 +7310,19 @@
 msgid "An error has occurred during {0}. Check {1} for more details"
 msgstr ""
 
-#: public/js/controllers/buying.js:297 public/js/utils/sales_common.js:364
+#: public/js/controllers/buying.js:292 public/js/utils/sales_common.js:408
 msgid "An error occurred during the update process"
 msgstr ""
 
-#: stock/reorder_item.py:287
+#: stock/reorder_item.py:372
 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:232
+#: accounts/doctype/budget/budget.py:239
 msgid "Annual"
 msgstr ""
 
-#: public/js/utils.js:103
+#: public/js/utils.js:120
 msgid "Annual Billing: {0}"
 msgstr ""
 
@@ -7282,6 +7394,10 @@
 msgid "Applicable Dimension"
 msgstr ""
 
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:221
+msgid "Applicable For"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Inventory Dimension'
 #: stock/doctype/inventory_dimension/inventory_dimension.json
 msgctxt "Inventory Dimension"
@@ -7562,6 +7678,12 @@
 msgid "Apply Recursion Over (As Per Transaction UOM)"
 msgstr ""
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Apply Recursion Over (As Per Transaction UOM)"
+msgstr ""
+
 #. Label of a Table field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -7677,7 +7799,7 @@
 msgid "Appointment Confirmation"
 msgstr ""
 
-#: www/book_appointment/index.js:229
+#: www/book_appointment/index.js:237
 msgid "Appointment Created Successfully"
 msgstr ""
 
@@ -7742,11 +7864,11 @@
 msgid "Are you sure you want to clear all demo data?"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:325
+#: public/js/bom_configurator/bom_configurator.bundle.js:363
 msgid "Are you sure you want to delete this Item?"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.js:70
+#: accounts/doctype/subscription/subscription.js:69
 msgid "Are you sure you want to restart this subscription?"
 msgstr ""
 
@@ -7766,13 +7888,13 @@
 msgid "Arrival Quantity"
 msgstr ""
 
-#: stock/report/serial_no_ledger/serial_no_ledger.js:58
+#: 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:31
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:30
 msgid "As On Date"
 msgstr ""
 
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:16
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:15
 msgid "As on Date"
 msgstr ""
 
@@ -7795,20 +7917,24 @@
 msgid "As there are existing submitted transactions against item {0}, you can not change the value of {1}."
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:195
+#: stock/doctype/stock_settings/stock_settings.py:198
 msgid "As there are negative stock, you can not enable {0}."
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:209
+#: stock/doctype/stock_settings/stock_settings.py:212
 msgid "As there are reserved stock, you cannot disable {0}."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1600
+#: manufacturing/doctype/production_plan/production_plan.py:915
+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
 msgid "As there are sufficient raw materials, Material Request is not required for Warehouse {0}."
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:164
-#: stock/doctype/stock_settings/stock_settings.py:178
+#: stock/doctype/stock_settings/stock_settings.py:167
+#: stock/doctype/stock_settings/stock_settings.py:181
 msgid "As {0} is enabled, you can not enable {1}."
 msgstr ""
 
@@ -7819,13 +7945,13 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/account_balance/account_balance.js:26
+#: accounts/report/account_balance/account_balance.js:25
 #: 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
 #: assets/doctype/asset/asset.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:177
+#: stock/doctype/purchase_receipt/purchase_receipt.js:200
 msgid "Asset"
 msgstr ""
 
@@ -7975,7 +8101,7 @@
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:37
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.py:355
 #: assets/doctype/asset_category/asset_category.json
-#: assets/report/fixed_asset_register/fixed_asset_register.js:24
+#: assets/report/fixed_asset_register/fixed_asset_register.js:23
 #: assets/report/fixed_asset_register/fixed_asset_register.py:418
 msgid "Asset Category"
 msgstr ""
@@ -8072,8 +8198,8 @@
 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:898
-#: assets/doctype/asset_depreciation_schedule/asset_depreciation_schedule.py:944
+#: 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
 msgid "Asset Depreciation Schedule not found for Asset {0} and Finance Book {1}"
 msgstr ""
@@ -8086,7 +8212,7 @@
 msgid "Asset Depreciation Schedule {0} for Asset {1} and Finance Book {2} already exists."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:181
+#: assets/doctype/asset/asset.py:144 assets/doctype/asset/asset.py:183
 msgid "Asset Depreciation Schedules created:<br>{0}<br><br>Please check, edit if needed, and submit the Asset."
 msgstr ""
 
@@ -8181,7 +8307,7 @@
 
 #. Name of a DocType
 #: assets/doctype/asset_movement/asset_movement.json
-#: stock/doctype/purchase_receipt/purchase_receipt.js:184
+#: stock/doctype/purchase_receipt/purchase_receipt.js:211
 msgid "Asset Movement"
 msgstr ""
 
@@ -8196,7 +8322,7 @@
 msgid "Asset Movement Item"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:901
+#: assets/doctype/asset/asset.py:905
 msgid "Asset Movement record {0} created"
 msgstr ""
 
@@ -8272,7 +8398,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:91
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:127
-#: accounts/report/account_balance/account_balance.js:39
+#: accounts/report/account_balance/account_balance.js:38
 msgid "Asset Received But Not Billed"
 msgstr ""
 
@@ -8382,35 +8508,35 @@
 msgid "Asset Value Analytics"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:172
+#: assets/doctype/asset/asset.py:174
 msgid "Asset cancelled"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:506
+#: assets/doctype/asset/asset.py:508
 msgid "Asset cannot be cancelled, as it is already {0}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:687
+#: assets/doctype/asset_capitalization/asset_capitalization.py:693
 msgid "Asset capitalized after Asset Capitalization {0} was submitted"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:194
+#: assets/doctype/asset/asset.py:196
 msgid "Asset created"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:633
+#: assets/doctype/asset_capitalization/asset_capitalization.py:639
 msgid "Asset created after Asset Capitalization {0} was submitted"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1156
+#: assets/doctype/asset/asset.py:1160
 msgid "Asset created after being split from Asset {0}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:695
+#: assets/doctype/asset_capitalization/asset_capitalization.py:701
 msgid "Asset decapitalized after Asset Capitalization {0} was submitted"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:197
+#: assets/doctype/asset/asset.py:199
 msgid "Asset deleted"
 msgstr ""
 
@@ -8426,31 +8552,31 @@
 msgid "Asset received at Location {0} and issued to Employee {1}"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:509
+#: assets/doctype/asset/depreciation.py:507
 msgid "Asset restored"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:703
+#: assets/doctype/asset_capitalization/asset_capitalization.py:709
 msgid "Asset restored after Asset Capitalization {0} was cancelled"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1320
+#: accounts/doctype/sales_invoice/sales_invoice.py:1331
 msgid "Asset returned"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:483
+#: assets/doctype/asset/depreciation.py:481
 msgid "Asset scrapped"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:485
+#: assets/doctype/asset/depreciation.py:483
 msgid "Asset scrapped via Journal Entry {0}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1365
 msgid "Asset sold"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:160
+#: assets/doctype/asset/asset.py:161
 msgid "Asset submitted"
 msgstr ""
 
@@ -8458,7 +8584,7 @@
 msgid "Asset transferred to Location {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1080
+#: assets/doctype/asset/asset.py:1084
 msgid "Asset updated after being split into Asset {0}"
 msgstr ""
 
@@ -8474,11 +8600,11 @@
 msgid "Asset {0} cannot be received at a location and given to an employee in a single movement"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:449
+#: assets/doctype/asset/depreciation.py:447
 msgid "Asset {0} cannot be scrapped, as it is already {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:237
+#: assets/doctype/asset_capitalization/asset_capitalization.py:243
 msgid "Asset {0} does not belong to Item {1}"
 msgstr ""
 
@@ -8494,20 +8620,20 @@
 msgid "Asset {0} does not belongs to the location {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:759
-#: assets/doctype/asset_capitalization/asset_capitalization.py:859
+#: assets/doctype/asset_capitalization/asset_capitalization.py:765
+#: assets/doctype/asset_capitalization/asset_capitalization.py:865
 msgid "Asset {0} does not exist"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:639
+#: assets/doctype/asset_capitalization/asset_capitalization.py:645
 msgid "Asset {0} has been created. Please set the depreciation details if any and submit it."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:661
+#: assets/doctype/asset_capitalization/asset_capitalization.py:667
 msgid "Asset {0} has been updated. Please set the depreciation details if any and submit it."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:446
+#: assets/doctype/asset/depreciation.py:444
 msgid "Asset {0} must be submitted"
 msgstr ""
 
@@ -8549,7 +8675,7 @@
 msgid "Assets"
 msgstr ""
 
-#: controllers/buying_controller.py:732
+#: controllers/buying_controller.py:757
 msgid "Assets not created for {0}. You will have to create asset manually."
 msgstr ""
 
@@ -8558,11 +8684,11 @@
 msgid "Assets, Depreciations, Repairs, and more."
 msgstr ""
 
-#: controllers/buying_controller.py:720
+#: controllers/buying_controller.py:745
 msgid "Asset{} {assets_link} created for {}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:249
+#: manufacturing/doctype/job_card/job_card.js:281
 msgid "Assign Job to Employee"
 msgstr ""
 
@@ -8584,9 +8710,9 @@
 msgid "Assign to Name"
 msgstr ""
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:33
-#: support/report/issue_analytics/issue_analytics.js:82
-#: support/report/issue_summary/issue_summary.js:70
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:32
+#: support/report/issue_analytics/issue_analytics.js:81
+#: support/report/issue_summary/issue_summary.js:69
 msgid "Assigned To"
 msgstr ""
 
@@ -8600,7 +8726,7 @@
 msgid "Assignment Conditions"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1011
+#: assets/doctype/asset/asset.py:1015
 msgid "At least one asset has to be selected."
 msgstr ""
 
@@ -8613,7 +8739,7 @@
 msgstr ""
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:405
-#: accounts/doctype/sales_invoice/sales_invoice.py:509
+#: accounts/doctype/sales_invoice/sales_invoice.py:522
 msgid "At least one mode of payment is required for POS invoice."
 msgstr ""
 
@@ -8625,7 +8751,7 @@
 msgid "At least one of the Selling or Buying must be selected"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:643
+#: stock/doctype/stock_entry/stock_entry.py:598
 msgid "At least one warehouse is mandatory"
 msgstr ""
 
@@ -8633,22 +8759,26 @@
 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:582
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
 msgid "At row {0}: Batch No is mandatory for Item {1}"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:574
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:569
 msgid "At row {0}: Serial No is mandatory for Item {1}"
 msgstr ""
 
+#: controllers/stock_controller.py:301
+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 ""
+
 #. Description of the 'File to Rename' (Attach) field in DocType 'Rename Tool'
 #: utilities/doctype/rename_tool/rename_tool.json
 msgctxt "Rename Tool"
 msgid "Attach .csv file with two columns, one for the old name and one for the new name"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:246
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:66
+#: public/js/utils/serial_no_batch_selector.js:250
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:69
 msgid "Attach CSV File"
 msgstr ""
 
@@ -8664,7 +8794,7 @@
 msgid "Attachment"
 msgstr ""
 
-#: templates/pages/order.html:125 templates/pages/projects.html:83
+#: templates/pages/order.html:137 templates/pages/projects.html:83
 msgid "Attachments"
 msgstr ""
 
@@ -8844,7 +8974,7 @@
 msgid "Auto Email Report"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:316
+#: public/js/utils/serial_no_batch_selector.js:322
 msgid "Auto Fetch"
 msgstr ""
 
@@ -8860,7 +8990,7 @@
 msgid "Auto Material Request"
 msgstr ""
 
-#: stock/reorder_item.py:242
+#: stock/reorder_item.py:327
 msgid "Auto Material Requests Generated"
 msgstr ""
 
@@ -8884,7 +9014,7 @@
 msgid "Auto Opt In (For all customers)"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:67
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:61
 msgid "Auto Reconcile"
 msgstr ""
 
@@ -8894,7 +9024,7 @@
 msgid "Auto Reconcile Payments"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:414
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:413
 msgid "Auto Reconciliation"
 msgstr ""
 
@@ -9018,7 +9148,7 @@
 msgid "Auto re-order"
 msgstr ""
 
-#: public/js/controllers/buying.js:295 public/js/utils/sales_common.js:362
+#: public/js/controllers/buying.js:290 public/js/utils/sales_common.js:403
 msgid "Auto repeat document updated"
 msgstr ""
 
@@ -9103,7 +9233,7 @@
 msgstr ""
 
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:82
-#: public/js/utils.js:522 stock/report/stock_ageing/stock_ageing.py:156
+#: public/js/utils.js:579 stock/report/stock_ageing/stock_ageing.py:156
 msgid "Available Qty"
 msgstr ""
 
@@ -9194,15 +9324,15 @@
 msgid "Available Stock for Packing Items"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:270
+#: assets/doctype/asset/asset.py:272
 msgid "Available for use date is required"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:772
+#: stock/doctype/stock_entry/stock_entry.py:727
 msgid "Available quantity is {0}, you need {1}"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:239
+#: stock/dashboard/item_dashboard.js:247
 msgid "Available {0}"
 msgstr ""
 
@@ -9212,13 +9342,13 @@
 msgid "Available-for-use Date"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:355
+#: assets/doctype/asset/asset.py:357
 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:477
+#: stock/report/stock_balance/stock_balance.py:485
 msgid "Average Age"
 msgstr ""
 
@@ -9258,7 +9388,7 @@
 msgid "Avg Rate"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:197
+#: stock/report/stock_ledger/stock_ledger.py:270
 msgid "Avg Rate (Balance Stock)"
 msgstr ""
 
@@ -9301,14 +9431,14 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/bom/bom.json manufacturing/doctype/bom/bom_tree.js:8
-#: manufacturing/report/bom_explorer/bom_explorer.js:9
+#: manufacturing/report/bom_explorer/bom_explorer.js:8
 #: manufacturing/report/bom_explorer/bom_explorer.py:56
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:9
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:8
 #: manufacturing/report/bom_stock_report/bom_stock_report.js:5
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:109
-#: selling/doctype/sales_order/sales_order.js:810
-#: stock/doctype/material_request/material_request.js:243
-#: stock/doctype/stock_entry/stock_entry.js:545
+#: 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/report/bom_search/bom_search.py:38
 msgid "BOM"
 msgstr ""
@@ -9379,7 +9509,7 @@
 msgid "BOM 1"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1348
+#: manufacturing/doctype/bom/bom.py:1347
 msgid "BOM 1 {0} and BOM 2 {1} should not be same"
 msgstr ""
 
@@ -9461,7 +9591,7 @@
 msgid "BOM Explosion Item"
 msgstr ""
 
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:21
+#: manufacturing/report/bom_operations_time/bom_operations_time.js:20
 #: manufacturing/report/bom_operations_time/bom_operations_time.py:101
 msgid "BOM ID"
 msgstr ""
@@ -9482,7 +9612,7 @@
 msgid "BOM Level"
 msgstr ""
 
-#: manufacturing/report/bom_variance_report/bom_variance_report.js:9
+#: manufacturing/report/bom_variance_report/bom_variance_report.js:8
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:31
 msgid "BOM No"
 msgstr ""
@@ -9593,6 +9723,7 @@
 #. Name of a report
 #. Label of a Link in the Manufacturing Workspace
 #. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:1
 #: manufacturing/report/bom_stock_report/bom_stock_report.json
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "BOM Stock Report"
@@ -9613,7 +9744,7 @@
 msgid "BOM Update Batch"
 msgstr ""
 
-#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:82
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.js:84
 msgid "BOM Update Initiated"
 msgstr ""
 
@@ -9633,6 +9764,11 @@
 msgid "BOM Update Tool"
 msgstr ""
 
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_log/bom_update_log.json
+msgid "BOM Update Tool Log with job status maintained"
+msgstr ""
+
 #: manufacturing/doctype/bom_update_log/bom_update_log.py:99
 msgid "BOM Updation already in progress. Please wait until {0} is complete."
 msgstr ""
@@ -9656,12 +9792,12 @@
 msgid "BOM Website Operation"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:1000
+#: stock/doctype/stock_entry/stock_entry.js:1145
 msgid "BOM and Manufacturing Quantity are required"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:264
-#: stock/doctype/stock_entry/stock_entry.js:581
+#: stock/doctype/material_request/material_request.js:332
+#: stock/doctype/stock_entry/stock_entry.js:669
 msgid "BOM does not contain any stock item"
 msgstr ""
 
@@ -9673,15 +9809,15 @@
 msgid "BOM recursion: {1} cannot be parent or child of {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1223
+#: manufacturing/doctype/bom/bom.py:1222
 msgid "BOM {0} does not belong to Item {1}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1205
+#: manufacturing/doctype/bom/bom.py:1204
 msgid "BOM {0} must be active"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1208
+#: manufacturing/doctype/bom/bom.py:1207
 msgid "BOM {0} must be submitted"
 msgstr ""
 
@@ -9703,11 +9839,11 @@
 msgid "BOMs creation has been enqueued, kindly check the status after some time"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:323
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:334
 msgid "Backdated Stock Entry"
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:15
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
 msgid "Backflush Raw Materials"
 msgstr ""
 
@@ -9737,10 +9873,11 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:41
+#: accounts/report/general_ledger/general_ledger.html:32
 msgid "Balance (Dr - Cr)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:584
+#: accounts/report/general_ledger/general_ledger.py:597
 msgid "Balance ({0})"
 msgstr ""
 
@@ -9757,8 +9894,8 @@
 msgstr ""
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:82
-#: stock/report/stock_balance/stock_balance.py:405
-#: stock/report/stock_ledger/stock_ledger.py:153
+#: stock/report/stock_balance/stock_balance.py:413
+#: stock/report/stock_ledger/stock_ledger.py:226
 msgid "Balance Qty"
 msgstr ""
 
@@ -9766,10 +9903,6 @@
 msgid "Balance Qty (Stock)"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:259
-msgid "Balance Serial No"
-msgstr ""
-
 #. Name of a report
 #. Label of a Link in the Financial Reports Workspace
 #: accounts/report/balance_sheet/balance_sheet.json
@@ -9802,18 +9935,22 @@
 msgid "Balance Sheet Summary"
 msgstr ""
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:13
+msgid "Balance Stock Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "Balance Stock Value"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:412
-#: stock/report/stock_ledger/stock_ledger.py:217
+#: stock/report/stock_balance/stock_balance.py:420
+#: stock/report/stock_ledger/stock_ledger.py:290
 msgid "Balance Value"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:355
+#: accounts/doctype/gl_entry/gl_entry.py:309
 msgid "Balance for Account {0} must always be {1}"
 msgstr ""
 
@@ -9825,7 +9962,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/bank/bank.json
-#: accounts/report/account_balance/account_balance.js:40
+#: accounts/report/account_balance/account_balance.js:39
 msgid "Bank"
 msgstr ""
 
@@ -9905,7 +10042,7 @@
 #: accounts/doctype/bank_account/bank_account.json
 #: 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:94
+#: buying/doctype/supplier/supplier.js:108
 #: setup/setup_wizard/operations/install_fixtures.py:492
 msgid "Bank Account"
 msgstr ""
@@ -10147,6 +10284,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:4
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Bank Reconciliation Statement"
@@ -10205,23 +10343,23 @@
 msgid "Bank Transaction Payments"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:496
+#: public/js/bank_reconciliation_tool/dialog_manager.js:485
 msgid "Bank Transaction {0} Matched"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:544
+#: public/js/bank_reconciliation_tool/dialog_manager.js:533
 msgid "Bank Transaction {0} added as Journal Entry"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:520
+#: public/js/bank_reconciliation_tool/dialog_manager.js:508
 msgid "Bank Transaction {0} added as Payment Entry"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:124
+#: accounts/doctype/bank_transaction/bank_transaction.py:127
 msgid "Bank Transaction {0} is already fully reconciled"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:563
+#: public/js/bank_reconciliation_tool/dialog_manager.js:553
 msgid "Bank Transaction {0} updated"
 msgstr ""
 
@@ -10229,15 +10367,15 @@
 msgid "Bank account cannot be named as {0}"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:130
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:146
 msgid "Bank account {0} already exists and could not be created again"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:134
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:153
 msgid "Bank accounts added"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:297
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:313
 msgid "Bank transaction creation error"
 msgstr ""
 
@@ -10262,7 +10400,7 @@
 msgid "Banking"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:273
+#: public/js/utils/barcode_scanner.js:282
 msgid "Barcode"
 msgstr ""
 
@@ -10389,7 +10527,7 @@
 msgid "Base Tax Withholding Net Total"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:241
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:239
 msgid "Base Total"
 msgstr ""
 
@@ -10417,18 +10555,18 @@
 msgid "Base URL"
 msgstr ""
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:28
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:27
 #: accounts/report/profitability_analysis/profitability_analysis.js:16
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:9
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:45
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:39
-#: manufacturing/report/production_planning_report/production_planning_report.js:17
-#: manufacturing/report/work_order_summary/work_order_summary.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:8
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:44
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:38
+#: manufacturing/report/production_planning_report/production_planning_report.js:16
+#: manufacturing/report/work_order_summary/work_order_summary.js:15
 #: public/js/purchase_trends_filters.js:45 public/js/sales_trends_filters.js:20
-#: stock/report/delayed_item_report/delayed_item_report.js:55
-#: stock/report/delayed_order_report/delayed_order_report.js:55
-#: support/report/issue_analytics/issue_analytics.js:17
-#: support/report/issue_summary/issue_summary.js:17
+#: stock/report/delayed_item_report/delayed_item_report.js:54
+#: stock/report/delayed_order_report/delayed_order_report.js:54
+#: support/report/issue_analytics/issue_analytics.js:16
+#: support/report/issue_summary/issue_summary.js:16
 msgid "Based On"
 msgstr ""
 
@@ -10444,18 +10582,18 @@
 msgid "Based On"
 msgstr ""
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:47
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:46
 msgid "Based On Data ( in years )"
 msgstr ""
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:31
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:30
 msgid "Based On Document"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:134
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:111
-#: accounts/report/accounts_receivable/accounts_receivable.js:156
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:137
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:114
+#: accounts/report/accounts_receivable/accounts_receivable.js:159
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:132
 msgid "Based On Payment Terms"
 msgstr ""
 
@@ -10527,7 +10665,7 @@
 #: 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/stock_ledger/stock_ledger.py:239
+#: 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
 msgid "Batch"
@@ -10568,11 +10706,11 @@
 msgid "Batch Item Expiry Status"
 msgstr ""
 
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:88
+#: 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:2150
-#: public/js/utils/barcode_scanner.js:251
-#: public/js/utils/serial_no_batch_selector.js:367
+#: public/js/controllers/transaction.js:2193
+#: 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
@@ -10700,15 +10838,15 @@
 msgid "Batch No"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:585
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:580
 msgid "Batch No is mandatory"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2118
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2137
 msgid "Batch No {0} does not exists"
 msgstr ""
 
-#: stock/utils.py:643
+#: stock/utils.py:638
 msgid "Batch No {0} is linked with Item {1} which has serial no. Please scan serial no instead."
 msgstr ""
 
@@ -10718,13 +10856,13 @@
 msgid "Batch No."
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Batch Nos"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1113
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1120
 msgid "Batch Nos are created successfully"
 msgstr ""
 
@@ -10744,7 +10882,7 @@
 msgid "Batch Quantity"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:256
+#: manufacturing/doctype/work_order/work_order.js:271
 msgid "Batch Size"
 msgstr ""
 
@@ -10784,7 +10922,7 @@
 msgid "Batch and Serial No"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:485
+#: manufacturing/doctype/work_order/work_order.py:496
 msgid "Batch not created for item {} since it does not have a batch series."
 msgstr ""
 
@@ -10792,12 +10930,12 @@
 msgid "Batch {0} and Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2345
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:272
+#: stock/doctype/stock_entry/stock_entry.py:2379
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:283
 msgid "Batch {0} of Item {1} has expired."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2347
+#: stock/doctype/stock_entry/stock_entry.py:2381
 msgid "Batch {0} of Item {1} is disabled."
 msgstr ""
 
@@ -10837,7 +10975,7 @@
 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:1061
+#: accounts/report/accounts_receivable/accounts_receivable.py:1069
 #: accounts/report/purchase_register/purchase_register.py:214
 msgid "Bill Date"
 msgstr ""
@@ -10854,7 +10992,7 @@
 msgid "Bill Date"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1060
+#: accounts/report/accounts_receivable/accounts_receivable.py:1068
 #: accounts/report/purchase_register/purchase_register.py:213
 msgid "Bill No"
 msgstr ""
@@ -10879,11 +11017,11 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Manufacturing Workspace
-#: manufacturing/doctype/bom/bom.py:1089
+#: manufacturing/doctype/bom/bom.py:1088
 #: 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:533
+#: stock/doctype/stock_entry/stock_entry.js:599
 msgid "Bill of Materials"
 msgstr ""
 
@@ -11287,8 +11425,8 @@
 msgid "Blanket Order Rate"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:101
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:228
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:123
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:265
 msgid "Block Invoice"
 msgstr ""
 
@@ -11427,7 +11565,7 @@
 msgid "Booking stock value across multiple accounts will make it harder to track stock and account value."
 msgstr ""
 
-#: accounts/general_ledger.py:685
+#: accounts/general_ledger.py:694
 msgid "Books have been closed till the period ending on {0}"
 msgstr ""
 
@@ -11493,11 +11631,11 @@
 #: accounts/report/gross_profit/gross_profit.py:243
 #: 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:41 public/js/stock_analytics.js:62
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:48
+#: public/js/stock_analytics.js:58 public/js/stock_analytics.js:93
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:47
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:61
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:100
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:101
 #: setup/doctype/brand/brand.json
 #: stock/report/item_price_stock/item_price_stock.py:25
 #: stock/report/item_prices/item_prices.py:53
@@ -11507,10 +11645,10 @@
 #: 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_analytics/stock_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:34
 #: stock/report/stock_analytics/stock_analytics.py:45
-#: stock/report/stock_ledger/stock_ledger.js:65
-#: stock/report/stock_ledger/stock_ledger.py:181
+#: 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
 #: stock/report/stock_projected_qty/stock_projected_qty.py:115
 msgid "Brand"
@@ -11669,16 +11807,16 @@
 msgid "Breakdown"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:103
+#: manufacturing/doctype/bom/bom.js:102
 msgid "Browse BOM"
 msgstr ""
 
 #. Name of a DocType
 #: accounts/doctype/budget/budget.json
-#: accounts/doctype/cost_center/cost_center.js:44
-#: accounts/doctype/cost_center/cost_center_tree.js:42
-#: accounts/doctype/cost_center/cost_center_tree.js:46
-#: accounts/doctype/cost_center/cost_center_tree.js:50
+#: accounts/doctype/cost_center/cost_center.js:45
+#: accounts/doctype/cost_center/cost_center_tree.js:65
+#: accounts/doctype/cost_center/cost_center_tree.js:73
+#: 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
@@ -11702,7 +11840,7 @@
 msgid "Budget Accounts"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:82
+#: accounts/report/budget_variance_report/budget_variance_report.js:80
 msgid "Budget Against"
 msgstr ""
 
@@ -11724,17 +11862,17 @@
 msgid "Budget Detail"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:278 accounts/doctype/budget/budget.py:280
+#: accounts/doctype/budget/budget.py:285 accounts/doctype/budget/budget.py:287
 msgid "Budget Exceeded"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center_tree.js:40
+#: accounts/doctype/cost_center/cost_center_tree.js:61
 msgid "Budget List"
 msgstr ""
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/cost_center/cost_center_tree.js:48
+#: accounts/doctype/cost_center/cost_center_tree.js:77
 #: accounts/report/budget_variance_report/budget_variance_report.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Budget Variance Report"
@@ -11807,6 +11945,11 @@
 msgid "Buy"
 msgstr ""
 
+#. Description of a DocType
+#: selling/doctype/customer/customer.json
+msgid "Buyer of Goods and Services."
+msgstr ""
+
 #. Name of a Workspace
 #. Label of a Card Break in the Buying Workspace
 #: buying/workspace/buying/buying.json
@@ -11905,7 +12048,7 @@
 msgid "Buying must be checked, if Applicable For is selected as {0}"
 msgstr ""
 
-#: buying/doctype/buying_settings/buying_settings.js:14
+#: buying/doctype/buying_settings/buying_settings.js:13
 msgid "By default, the Supplier Name is set as per the Supplier Name entered. If you want Suppliers to be named by a <a href='https://docs.erpnext.com/docs/user/manual/en/setting-up/settings/naming-series' target='_blank'>Naming Series</a> choose the 'Naming Series' option."
 msgstr ""
 
@@ -12099,12 +12242,12 @@
 msgid "Call Routing"
 msgstr ""
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:57
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:58
 #: telephony/doctype/incoming_call_settings/incoming_call_settings.py:49
 msgid "Call Schedule Row {0}: To time slot should always be ahead of From time slot."
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:153
+#: public/js/call_popup/call_popup.js:164
 #: telephony/doctype/call_log/call_log.py:135
 msgid "Call Summary"
 msgstr ""
@@ -12115,6 +12258,10 @@
 msgid "Call Summary"
 msgstr ""
 
+#: public/js/call_popup/call_popup.js:186
+msgid "Call Summary Saved"
+msgstr ""
+
 #. Label of a Data field in DocType 'Telephony Call Type'
 #: telephony/doctype/telephony_call_type/telephony_call_type.json
 msgctxt "Telephony Call Type"
@@ -12261,7 +12408,7 @@
 msgid "Can be approved by {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1451
+#: manufacturing/doctype/work_order/work_order.py:1465
 msgid "Can not close Work Order. Since {0} Job Cards are in Work In Progress state."
 msgstr ""
 
@@ -12289,20 +12436,24 @@
 msgid "Can not filter based on Voucher No, if grouped by Voucher"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1226
-#: accounts/doctype/payment_entry/payment_entry.py:2229
+#: accounts/doctype/journal_entry/journal_entry.py:1240
+#: accounts/doctype/payment_entry/payment_entry.py:2254
 msgid "Can only make payment against unbilled {0}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1199
-#: controllers/accounts_controller.py:2500 public/js/controllers/accounts.js:90
+#: accounts/doctype/payment_entry/payment_entry.js:1438
+#: controllers/accounts_controller.py:2585 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 ""
 
-#: stock/doctype/stock_settings/stock_settings.py:133
+#: stock/doctype/stock_settings/stock_settings.py:136
 msgid "Can't change the valuation method, as there are transactions against some items which do not have its own valuation method"
 msgstr ""
 
+#: templates/pages/task_info.html:24
+msgid "Cancel"
+msgstr ""
+
 #. Label of a Check field in DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
 msgctxt "Subscription"
@@ -12333,8 +12484,8 @@
 msgid "Cancelation Date"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:18
-#: stock/doctype/stock_entry/stock_entry_list.js:19
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:13
+#: stock/doctype/stock_entry/stock_entry_list.js:25
 msgid "Canceled"
 msgstr ""
 
@@ -12351,11 +12502,12 @@
 msgstr ""
 
 #: accounts/doctype/bank_transaction/bank_transaction_list.js:8
-#: accounts/doctype/payment_request/payment_request_list.js:20
+#: accounts/doctype/payment_request/payment_request_list.js:18
 #: accounts/doctype/subscription/subscription_list.js:14
 #: assets/doctype/asset_repair/asset_repair_list.js:9
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:11
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle_list.js:8
+#: templates/pages/task_info.html:77
 msgid "Cancelled"
 msgstr ""
 
@@ -12610,6 +12762,13 @@
 msgid "Cancelled"
 msgstr ""
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Cancelled"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Warranty Claim'
 #: support/doctype/warranty_claim/warranty_claim.json
 msgctxt "Warranty Claim"
@@ -12622,7 +12781,7 @@
 msgid "Cancelled"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:76
+#: stock/doctype/delivery_trip/delivery_trip.js:89
 #: stock/doctype/delivery_trip/delivery_trip.py:189
 msgid "Cannot Calculate Arrival Time as Driver Address is Missing."
 msgstr ""
@@ -12632,7 +12791,7 @@
 msgid "Cannot Merge"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:105
+#: stock/doctype/delivery_trip/delivery_trip.js:122
 msgid "Cannot Optimize Route as Driver Address is Missing."
 msgstr ""
 
@@ -12648,7 +12807,7 @@
 msgid "Cannot amend {0} {1}, please create a new one instead."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:257
+#: accounts/doctype/journal_entry/journal_entry.py:273
 msgid "Cannot apply TDS against multiple parties in one entry"
 msgstr ""
 
@@ -12656,23 +12815,23 @@
 msgid "Cannot be a fixed asset item as Stock Ledger is created."
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:222
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:217
 msgid "Cannot cancel as processing of cancelled documents is pending."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:641
+#: manufacturing/doctype/work_order/work_order.py:655
 msgid "Cannot cancel because submitted Stock Entry {0} exists"
 msgstr ""
 
-#: stock/stock_ledger.py:196
+#: stock/stock_ledger.py:198
 msgid "Cannot cancel the transaction. Reposting of item valuation on submission is not completed yet."
 msgstr ""
 
-#: controllers/buying_controller.py:811
+#: controllers/buying_controller.py:836
 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:365
+#: stock/doctype/stock_entry/stock_entry.py:320
 msgid "Cannot cancel transaction for Completed Work Order."
 msgstr ""
 
@@ -12684,7 +12843,7 @@
 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:66
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:70
 msgid "Cannot change Reference Document Type."
 msgstr ""
 
@@ -12696,7 +12855,7 @@
 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:209
+#: setup/doctype/company/company.py:208
 msgid "Cannot change company's default currency, because there are existing transactions. Transactions must be cancelled to change the default currency."
 msgstr ""
 
@@ -12708,32 +12867,32 @@
 msgid "Cannot convert Cost Center to ledger as it has child nodes"
 msgstr ""
 
-#: projects/doctype/task/task.js:48
+#: projects/doctype/task/task.js:50
 msgid "Cannot convert Task to non-group because the following child Tasks exist: {0}."
 msgstr ""
 
-#: accounts/doctype/account/account.py:373
+#: accounts/doctype/account/account.py:392
 msgid "Cannot convert to Group because Account Type is selected."
 msgstr ""
 
-#: accounts/doctype/account/account.py:250
+#: accounts/doctype/account/account.py:269
 msgid "Cannot covert to Group because Account Type is selected."
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:914
+#: stock/doctype/purchase_receipt/purchase_receipt.py:916
 msgid "Cannot create Stock Reservation Entries for future dated Purchase Receipts."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note_list.js:25
+#: stock/doctype/delivery_note/delivery_note_list.js:35
 msgid "Cannot create a Delivery Trip from Draft documents."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:1576
-#: stock/doctype/pick_list/pick_list.py:104
+#: selling/doctype/sales_order/sales_order.py:1599
+#: stock/doctype/pick_list/pick_list.py:108
 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 ""
 
-#: accounts/general_ledger.py:127
+#: accounts/general_ledger.py:131
 msgid "Cannot create accounting entries against disabled accounts: {0}"
 msgstr ""
 
@@ -12754,32 +12913,40 @@
 msgid "Cannot delete Serial No {0}, as it is used in stock transactions"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:638
-#: selling/doctype/sales_order/sales_order.py:661
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:101
+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
 msgid "Cannot ensure delivery by Serial No as Item {0} is added with and without Ensure Delivery by Serial No."
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:51
+#: public/js/utils/barcode_scanner.js:54
 msgid "Cannot find Item with this Barcode"
 msgstr ""
 
-#: controllers/accounts_controller.py:3023
+#: controllers/accounts_controller.py:3114
 msgid "Cannot find {} for item {}. Please set the same in Item Master or Stock Settings."
 msgstr ""
 
-#: controllers/accounts_controller.py:1774
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:506
+msgid "Cannot make any transactions until the deletion job is completed"
+msgstr ""
+
+#: controllers/accounts_controller.py:1863
 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:292
+#: manufacturing/doctype/work_order/work_order.py:296
 msgid "Cannot produce more Item {0} than Sales Order quantity {1}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:962
+#: manufacturing/doctype/work_order/work_order.py:976
 msgid "Cannot produce more item for {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:966
+#: manufacturing/doctype/work_order/work_order.py:980
 msgid "Cannot produce more than {0} items for {1}"
 msgstr ""
 
@@ -12787,8 +12954,8 @@
 msgid "Cannot receive from customer against negative outstanding"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1209
-#: controllers/accounts_controller.py:2515
+#: accounts/doctype/payment_entry/payment_entry.js:1455
+#: controllers/accounts_controller.py:2600
 #: public/js/controllers/accounts.js:100
 msgid "Cannot refer row number greater than or equal to current row number for this Charge type"
 msgstr ""
@@ -12797,14 +12964,14 @@
 msgid "Cannot retrieve link token for update. Check Error Log for more information"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:60
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:63
 msgid "Cannot retrieve link token. Check Error Log for more information"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1203
-#: accounts/doctype/payment_entry/payment_entry.js:1374
-#: accounts/doctype/payment_entry/payment_entry.py:1579
-#: controllers/accounts_controller.py:2505 public/js/controllers/accounts.js:94
+#: 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
 #: 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 ""
@@ -12821,11 +12988,11 @@
 msgid "Cannot set multiple Item Defaults for a company."
 msgstr ""
 
-#: controllers/accounts_controller.py:3173
+#: controllers/accounts_controller.py:3264
 msgid "Cannot set quantity less than delivered quantity"
 msgstr ""
 
-#: controllers/accounts_controller.py:3178
+#: controllers/accounts_controller.py:3269
 msgid "Cannot set quantity less than received quantity"
 msgstr ""
 
@@ -12833,7 +13000,7 @@
 msgid "Cannot set the field <b>{0}</b> for copying in variants"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:876
+#: accounts/doctype/payment_entry/payment_entry.js:1050
 msgid "Cannot {0} {1} {2} without any negative outstanding invoice"
 msgstr ""
 
@@ -12853,7 +13020,7 @@
 msgid "Capacity Planning"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:627
+#: manufacturing/doctype/work_order/work_order.py:641
 msgid "Capacity Planning Error, planned start time can not be same as end time"
 msgstr ""
 
@@ -12895,7 +13062,7 @@
 msgid "Capital Work In Progress Account"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:43
+#: accounts/report/account_balance/account_balance.js:42
 msgid "Capital Work in Progress"
 msgstr ""
 
@@ -12917,7 +13084,7 @@
 msgid "Capitalization Method"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:155
+#: assets/doctype/asset/asset.js:194
 msgid "Capitalize Asset"
 msgstr ""
 
@@ -12959,7 +13126,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:14
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:18
-#: accounts/report/account_balance/account_balance.js:41
+#: accounts/report/account_balance/account_balance.js:40
 #: setup/setup_wizard/operations/install_fixtures.py:208
 msgid "Cash"
 msgstr ""
@@ -13023,7 +13190,7 @@
 msgid "Cash In Hand"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:322
 msgid "Cash or Bank Account is mandatory for making payment entry"
 msgstr ""
 
@@ -13045,7 +13212,7 @@
 msgid "Cash/Bank Account"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.js:39
+#: accounts/report/pos_register/pos_register.js:38
 #: accounts/report/pos_register/pos_register.py:126
 #: accounts/report/pos_register/pos_register.py:200
 msgid "Cashier"
@@ -13107,7 +13274,7 @@
 msgid "Category-wise Asset Value"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:313
+#: buying/doctype/purchase_order/purchase_order.py:314
 #: buying/doctype/request_for_quotation/request_for_quotation.py:99
 msgid "Caution"
 msgstr ""
@@ -13152,7 +13319,7 @@
 msgid "Certificate Required"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "Change"
 msgstr ""
 
@@ -13168,7 +13335,7 @@
 msgid "Change Amount"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:90
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:108
 msgid "Change Release Date"
 msgstr ""
 
@@ -13188,7 +13355,7 @@
 msgid "Change in Stock Value"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:885
+#: accounts/doctype/sales_invoice/sales_invoice.py:902
 msgid "Change the account type to Receivable or select a different account."
 msgstr ""
 
@@ -13209,7 +13376,11 @@
 msgid "Changes"
 msgstr ""
 
-#: stock/doctype/item/item.js:235
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Changes in {0}"
+msgstr ""
+
+#: stock/doctype/item/item.js:277
 msgid "Changing Customer Group for the selected Customer is not allowed."
 msgstr ""
 
@@ -13219,12 +13390,12 @@
 msgid "Channel Partner"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1634
-#: controllers/accounts_controller.py:2568
+#: accounts/doctype/payment_entry/payment_entry.py:1653
+#: controllers/accounts_controller.py:2653
 msgid "Charge of type 'Actual' in row {0} cannot be included in Item Rate or Paid Amount"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:42
+#: accounts/report/account_balance/account_balance.js:41
 msgid "Chargeable"
 msgstr ""
 
@@ -13240,7 +13411,15 @@
 msgid "Charges Incurred"
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges are updated in Purchase Receipt against each item"
+msgstr ""
+
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Charges will be distributed proportionately based on item qty or amount, as per your selection"
+msgstr ""
+
+#: selling/page/sales_funnel/sales_funnel.js:45
 msgid "Chart"
 msgstr ""
 
@@ -13268,10 +13447,10 @@
 msgid "Chart Tree"
 msgstr ""
 
-#: accounts/doctype/account/account.js:75
+#: accounts/doctype/account/account.js:70
 #: accounts/doctype/account/account_tree.js:5
-#: accounts/doctype/cost_center/cost_center_tree.js:35
-#: public/js/setup_wizard.js:36 setup/doctype/company/company.js:92
+#: accounts/doctype/cost_center/cost_center_tree.js:52
+#: public/js/setup_wizard.js:37 setup/doctype/company/company.js:96
 msgid "Chart of Accounts"
 msgstr ""
 
@@ -13307,7 +13486,7 @@
 msgid "Chart of Accounts Importer"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:133
+#: accounts/doctype/account/account_tree.js:181
 #: accounts/doctype/cost_center/cost_center.js:41
 msgid "Chart of Cost Centers"
 msgstr ""
@@ -13318,7 +13497,7 @@
 msgid "Chart of Cost Centers"
 msgstr ""
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:65
+#: manufacturing/report/work_order_summary/work_order_summary.js:64
 msgid "Charts Based On"
 msgstr ""
 
@@ -13396,7 +13575,12 @@
 msgid "Checking this will round off the tax amount to the nearest integer"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:252
+#: selling/page/point_of_sale/pos_item_cart.js:92
+#: selling/page/point_of_sale/pos_item_cart.js:148
+msgid "Checkout"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:250
 msgid "Checkout Order / Submit Order / New Order"
 msgstr ""
 
@@ -13445,7 +13629,7 @@
 msgid "Cheque Width"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2061
+#: public/js/controllers/transaction.js:2104
 msgid "Cheque/Reference Date"
 msgstr ""
 
@@ -13466,6 +13650,7 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:131
+#: accounts/report/accounts_receivable/accounts_receivable.html:113
 msgid "Cheques Required"
 msgstr ""
 
@@ -13483,7 +13668,7 @@
 msgid "Child Task exists for this Task. You can not delete this Task."
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse_tree.js:17
+#: stock/doctype/warehouse/warehouse_tree.js:21
 msgid "Child nodes can be only created under 'Group' type nodes"
 msgstr ""
 
@@ -13502,7 +13687,7 @@
 msgid "Circular Reference Error"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:76
+#: public/js/utils/contact_address_quick_entry.js:79
 msgid "City"
 msgstr ""
 
@@ -13530,12 +13715,27 @@
 msgid "Class / Percentage"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/territory/territory.json
+msgid "Classification of Customers by region"
+msgstr ""
+
 #. Label of a Text Editor field in DocType 'Bank Guarantee'
 #: accounts/doctype/bank_guarantee/bank_guarantee.json
 msgctxt "Bank Guarantee"
 msgid "Clauses and Conditions"
 msgstr ""
 
+#: public/js/utils/demo.js:11
+msgid "Clear Demo Data"
+msgstr ""
+
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Clear Notifications"
+msgstr ""
+
 #. Label of a Button field in DocType 'Holiday List'
 #: setup/doctype/holiday_list/holiday_list.json
 msgctxt "Holiday List"
@@ -13543,7 +13743,9 @@
 msgstr ""
 
 #: 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
+#: templates/form_grid/bank_reconciliation_grid.html:7
 msgid "Clearance Date"
 msgstr ""
 
@@ -13583,11 +13785,11 @@
 msgid "Clearance Date"
 msgstr ""
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:115
+#: accounts/doctype/bank_clearance/bank_clearance.py:117
 msgid "Clearance Date not mentioned"
 msgstr ""
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:113
+#: accounts/doctype/bank_clearance/bank_clearance.py:115
 msgid "Clearance Date updated"
 msgstr ""
 
@@ -13595,7 +13797,7 @@
 msgid "Clearing Demo Data..."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:535
+#: manufacturing/doctype/production_plan/production_plan.js:577
 msgid "Click on 'Get Finished Goods for Manufacture' to fetch the items from the above Sales Orders. Items only for which a BOM is present will be fetched."
 msgstr ""
 
@@ -13603,7 +13805,7 @@
 msgid "Click on Add to Holidays. This will populate the holidays table with all the dates that fall on the selected weekly off. Repeat the process for populating the dates for all your weekly holidays"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:530
+#: manufacturing/doctype/production_plan/production_plan.js:572
 msgid "Click on Get Sales Orders to fetch sales orders based on the above filters."
 msgstr ""
 
@@ -13618,6 +13820,10 @@
 msgid "Click on the link below to verify your email and confirm the appointment"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:468
+msgid "Click to add email / phone"
+msgstr ""
+
 #. Option for the 'Lead Type' (Select) field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -13636,19 +13842,19 @@
 msgid "Client Secret"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order_list.js:30
-#: crm/doctype/opportunity/opportunity.js:108
-#: manufacturing/doctype/production_plan/production_plan.js:101
-#: manufacturing/doctype/work_order/work_order.js:559
-#: quality_management/doctype/quality_meeting/quality_meeting_list.js:8
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/doctype/sales_order/sales_order_list.js:45
-#: stock/doctype/delivery_note/delivery_note.js:209
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/doctype/issue/issue.js:17
+#: buying/doctype/purchase_order/purchase_order.js:327
+#: buying/doctype/purchase_order/purchase_order_list.js:49
+#: crm/doctype/opportunity/opportunity.js:118
+#: manufacturing/doctype/production_plan/production_plan.js:111
+#: manufacturing/doctype/work_order/work_order.js:589
+#: quality_management/doctype/quality_meeting/quality_meeting_list.js:7
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:588
+#: selling/doctype/sales_order/sales_order_list.js:58
+#: stock/doctype/delivery_note/delivery_note.js:248
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:112
+#: support/doctype/issue/issue.js:21
 msgid "Close"
 msgstr ""
 
@@ -13658,7 +13864,7 @@
 msgid "Close Issue After Days"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:67
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:69
 msgid "Close Loan"
 msgstr ""
 
@@ -13668,17 +13874,18 @@
 msgid "Close Replied Opportunity After Days"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:178
+#: selling/page/point_of_sale/pos_controller.js:200
 msgid "Close the POS"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order_list.js:6
-#: selling/doctype/sales_order/sales_order_list.js:7
-#: stock/doctype/delivery_note/delivery_note_list.js:8
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:8
-#: support/report/issue_analytics/issue_analytics.js:59
-#: support/report/issue_summary/issue_summary.js:47
+#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: selling/doctype/sales_order/sales_order_list.js:18
+#: stock/doctype/delivery_note/delivery_note_list.js:18
+#: 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
+#: templates/pages/task_info.html:76
 msgid "Closed"
 msgstr ""
 
@@ -13785,11 +13992,11 @@
 msgid "Closed Documents"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1395
+#: manufacturing/doctype/work_order/work_order.py:1409
 msgid "Closed Work Order can not be stopped or Re-opened"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:420
+#: selling/doctype/sales_order/sales_order.py:423
 msgid "Closed order cannot be cancelled. Unclose to cancel."
 msgstr ""
 
@@ -13894,7 +14101,7 @@
 msgid "Code"
 msgstr ""
 
-#: public/js/setup_wizard.js:174
+#: public/js/setup_wizard.js:190
 msgid "Collapse All"
 msgstr ""
 
@@ -13962,10 +14169,15 @@
 msgid "Column in Bank File"
 msgstr ""
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:389
+msgid "Column {0}"
+msgstr ""
+
 #: accounts/doctype/payment_terms_template/payment_terms_template.py:40
 msgid "Combined invoice portion must equal 100%"
 msgstr ""
 
+#: templates/pages/task_info.html:86
 #: utilities/report/youtube_interactions/youtube_interactions.py:28
 msgid "Comments"
 msgstr ""
@@ -14117,7 +14329,7 @@
 msgid "Communication Medium Type"
 msgstr ""
 
-#: setup/install.py:111
+#: setup/install.py:92
 msgid "Compact Item Print"
 msgstr ""
 
@@ -14130,10 +14342,10 @@
 #. Name of a DocType
 #: accounts/dashboard_chart_source/account_balance_timeline/account_balance_timeline.js:8
 #: accounts/doctype/account/account_tree.js:12
-#: accounts/doctype/account/account_tree.js:149
-#: accounts/doctype/cost_center/cost_center_tree.js:8
-#: accounts/doctype/journal_entry/journal_entry.js:72
-#: accounts/report/account_balance/account_balance.js:9
+#: accounts/doctype/account/account_tree.js:212
+#: accounts/doctype/cost_center/cost_center_tree.js:9
+#: accounts/doctype/journal_entry/journal_entry.js:128
+#: accounts/report/account_balance/account_balance.js:8
 #: accounts/report/accounts_payable/accounts_payable.js:8
 #: accounts/report/accounts_payable_summary/accounts_payable_summary.js:8
 #: accounts/report/accounts_receivable/accounts_receivable.js:10
@@ -14141,13 +14353,13 @@
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:8
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:8
 #: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:8
-#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:8
-#: accounts/report/budget_variance_report/budget_variance_report.js:74
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:9
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:9
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:9
+#: accounts/report/billed_items_to_be_received/billed_items_to_be_received.js:7
+#: accounts/report/budget_variance_report/budget_variance_report.js:72
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:8
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:8
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:8
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:80
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:9
+#: 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
@@ -14158,9 +14370,9 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:227
 #: 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/payment_ledger/payment_ledger.js:9
+#: 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:9
+#: accounts/report/pos_register/pos_register.js:8
 #: accounts/report/pos_register/pos_register.py:110
 #: accounts/report/profitability_analysis/profitability_analysis.js:8
 #: accounts/report/purchase_register/purchase_register.js:33
@@ -14168,78 +14380,79 @@
 #: accounts/report/sales_payment_summary/sales_payment_summary.js:22
 #: accounts/report/sales_register/sales_register.js:33
 #: accounts/report/share_ledger/share_ledger.py:58
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:9
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:9
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:9
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:8
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:8
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:8
 #: accounts/report/trial_balance/trial_balance.js:8
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:8
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:9
-#: assets/report/fixed_asset_register/fixed_asset_register.js:9
-#: buying/report/procurement_tracker/procurement_tracker.js:9
-#: buying/report/purchase_analytics/purchase_analytics.js:50
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:9
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:8
+#: assets/report/fixed_asset_register/fixed_asset_register.js:8
+#: 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/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:9
+#: 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/subcontract_order_summary/subcontract_order_summary.js:8
+#: 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:9
+#: crm/report/lead_details/lead_details.js:8
 #: crm/report/lead_details/lead_details.py:52
-#: crm/report/lost_opportunity/lost_opportunity.js:9
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:59
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:52
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:119
-#: manufacturing/doctype/bom_creator/bom_creator.js:52
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:9
-#: manufacturing/report/job_card_summary/job_card_summary.js:8
-#: manufacturing/report/process_loss_report/process_loss_report.js:8
-#: manufacturing/report/production_analytics/production_analytics.js:9
-#: manufacturing/report/production_planning_report/production_planning_report.js:9
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:8
-#: manufacturing/report/work_order_summary/work_order_summary.js:8
-#: projects/report/project_summary/project_summary.js:9
+#: crm/report/lost_opportunity/lost_opportunity.js:8
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:51
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:128
+#: manufacturing/doctype/bom_creator/bom_creator.js:51
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:2
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:8
+#: manufacturing/report/job_card_summary/job_card_summary.js:7
+#: manufacturing/report/process_loss_report/process_loss_report.js:7
+#: manufacturing/report/production_analytics/production_analytics.js:8
+#: manufacturing/report/production_planning_report/production_planning_report.js:8
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:7
+#: manufacturing/report/work_order_summary/work_order_summary.js:7
+#: projects/report/project_summary/project_summary.js:8
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:44
 #: public/js/financial_statements.js:153 public/js/purchase_trends_filters.js:8
-#: public/js/sales_trends_filters.js:55
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:28
+#: public/js/sales_trends_filters.js:51
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:27
 #: regional/report/irs_1099/irs_1099.js:8
-#: regional/report/uae_vat_201/uae_vat_201.js:9
-#: regional/report/vat_audit_report/vat_audit_report.js:9
-#: selling/page/point_of_sale/pos_controller.js:64
-#: selling/page/sales_funnel/sales_funnel.js:30
+#: regional/report/uae_vat_201/uae_vat_201.js:8
+#: regional/report/vat_audit_report/vat_audit_report.js:8
+#: selling/page/point_of_sale/pos_controller.js:72
+#: selling/page/sales_funnel/sales_funnel.js:33
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:16
 #: selling/report/customer_credit_balance/customer_credit_balance.js:8
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:9
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:8
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:114
 #: selling/report/lost_quotations/lost_quotations.js:8
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:9
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:8
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:46
-#: selling/report/sales_analytics/sales_analytics.js:50
-#: selling/report/sales_order_analysis/sales_order_analysis.js:9
+#: selling/report/sales_analytics/sales_analytics.js:57
+#: selling/report/sales_order_analysis/sales_order_analysis.js:8
 #: selling/report/sales_order_analysis/sales_order_analysis.py:343
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:35
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:9
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:34
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:9
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:33
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:8
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:33
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:8
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:9
-#: selling/report/territory_wise_sales/territory_wise_sales.js:17
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:8
+#: selling/report/territory_wise_sales/territory_wise_sales.js:18
 #: setup/doctype/company/company.json setup/doctype/company/company_tree.js:10
 #: setup/doctype/department/department_tree.js:10
 #: setup/doctype/employee/employee_tree.js:8
 #: stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.js:8
-#: stock/doctype/warehouse/warehouse_tree.js:10
+#: stock/doctype/warehouse/warehouse_tree.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:12
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:8
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:9
-#: stock/report/delayed_item_report/delayed_item_report.js:9
-#: stock/report/delayed_order_report/delayed_order_report.js:9
-#: stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:8
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js: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_stock_value_report/incorrect_stock_value_report.js:8
-#: stock/report/item_shortage_report/item_shortage_report.js:9
+#: 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
 #: stock/report/product_bundle_balance/product_bundle_balance.py:115
 #: stock/report/reserved_stock/reserved_stock.js:8
@@ -14248,20 +14461,20 @@
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:73
 #: stock/report/serial_no_ledger/serial_no_ledger.py:37
 #: stock/report/stock_ageing/stock_ageing.js:8
-#: stock/report/stock_analytics/stock_analytics.js:42
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:8
+#: 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:466
+#: stock/report/stock_balance/stock_balance.py:474
 #: stock/report/stock_ledger/stock_ledger.js:8
-#: stock/report/stock_ledger/stock_ledger.py:268
+#: 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:9
-#: stock/report/total_stock_summary/total_stock_summary.js:18
+#: 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/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:9
-#: support/report/issue_analytics/issue_analytics.js:9
-#: support/report/issue_summary/issue_summary.js:9
+#: 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
 msgid "Company"
 msgstr ""
 
@@ -14719,6 +14932,12 @@
 msgid "Company"
 msgstr ""
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Company"
+msgstr ""
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -15013,7 +15232,7 @@
 msgid "Company Abbreviation"
 msgstr ""
 
-#: public/js/setup_wizard.js:155
+#: public/js/setup_wizard.js:164
 msgid "Company Abbreviation cannot have more than 5 characters"
 msgstr ""
 
@@ -15197,7 +15416,7 @@
 msgid "Company Name as per Imported Tally Data"
 msgstr ""
 
-#: public/js/setup_wizard.js:63
+#: public/js/setup_wizard.js:67
 msgid "Company Name cannot be Company"
 msgstr ""
 
@@ -15239,28 +15458,28 @@
 msgid "Company and Posting Date is mandatory"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2203
+#: accounts/doctype/sales_invoice/sales_invoice.py:2172
 msgid "Company currencies of both the companies should match for Inter Company Transactions."
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:258
-#: stock/doctype/stock_entry/stock_entry.js:575
+#: stock/doctype/material_request/material_request.js:326
+#: stock/doctype/stock_entry/stock_entry.js:663
 msgid "Company field is required"
 msgstr ""
 
-#: accounts/doctype/bank_account/bank_account.py:58
+#: accounts/doctype/bank_account/bank_account.py:72
 msgid "Company is mandatory for company account"
 msgstr ""
 
-#: accounts/doctype/subscription/subscription.py:413
-msgid "Company is mandatory was generating invoice. Please set default company in Global Defaults."
+#: accounts/doctype/subscription/subscription.py:412
+msgid "Company is mandatory for generating an invoice. Please set a default company in Global Defaults."
 msgstr ""
 
-#: setup/doctype/company/company.js:161
+#: setup/doctype/company/company.js:191
 msgid "Company name not same"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:206
+#: assets/doctype/asset/asset.py:208
 msgid "Company of asset {0} and purchase document {1} doesn't matches."
 msgstr ""
 
@@ -15291,15 +15510,15 @@
 msgid "Company which internal supplier represents"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:80
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:85
 msgid "Company {0} already exists. Continuing will overwrite the Company and Chart of Accounts"
 msgstr ""
 
-#: accounts/doctype/account/account.py:443
+#: accounts/doctype/account/account.py:462
 msgid "Company {0} does not exist"
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:76
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:80
 msgid "Company {0} is added more than once"
 msgstr ""
 
@@ -15340,7 +15559,7 @@
 msgid "Competitor Name"
 msgstr ""
 
-#: public/js/utils/sales_common.js:417
+#: public/js/utils/sales_common.js:476
 msgid "Competitors"
 msgstr ""
 
@@ -15356,7 +15575,9 @@
 msgid "Competitors"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:61
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:67
+#: manufacturing/doctype/workstation/workstation_job_card.html:68
+#: public/js/projects/timer.js:32
 msgid "Complete"
 msgstr ""
 
@@ -15372,23 +15593,26 @@
 msgid "Complete"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:263
+#: manufacturing/doctype/job_card/job_card.js:296
 msgid "Complete Job"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_payment.js:19
+msgid "Complete Order"
+msgstr ""
+
 #: accounts/doctype/subscription/subscription_list.js:8
 #: assets/doctype/asset_repair/asset_repair_list.js:7
-#: buying/doctype/purchase_order/purchase_order_list.js:24
+#: buying/doctype/purchase_order/purchase_order_list.js:43
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:9
 #: manufacturing/report/job_card_summary/job_card_summary.py:93
 #: manufacturing/report/work_order_summary/work_order_summary.py:151
 #: projects/doctype/timesheet/timesheet_list.js:13
 #: projects/report/project_summary/project_summary.py:95
-#: selling/doctype/sales_order/sales_order_list.js:12
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:9
-#: stock/doctype/delivery_note/delivery_note_list.js:14
+#: selling/doctype/sales_order/sales_order_list.js:23
+#: stock/doctype/delivery_note/delivery_note_list.js:24
 #: stock/doctype/material_request/material_request_list.js:13
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:25
 msgid "Completed"
 msgstr ""
 
@@ -15647,11 +15871,12 @@
 msgid "Completed Qty"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:885
+#: manufacturing/doctype/work_order/work_order.py:899
 msgid "Completed Qty cannot be greater than 'Qty to Manufacture'"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:277
+#: manufacturing/doctype/job_card/job_card.js:313
+#: manufacturing/doctype/workstation/workstation.js:199
 msgid "Completed Quantity"
 msgstr ""
 
@@ -15786,7 +16011,7 @@
 msgid "Configure the action to stop the transaction or just warn if the same rate is not maintained."
 msgstr ""
 
-#: buying/doctype/buying_settings/buying_settings.js:19
+#: buying/doctype/buying_settings/buying_settings.js:20
 msgid "Configure the default Price List when creating a new Purchase transaction. Item prices will be fetched from this Price List."
 msgstr ""
 
@@ -15796,12 +16021,12 @@
 msgid "Confirmation Date"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:37
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:45
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:43
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:51
 msgid "Connect to Quickbooks"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:59
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:65
 msgid "Connected to QuickBooks"
 msgstr ""
 
@@ -15811,7 +16036,7 @@
 msgid "Connected to QuickBooks"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:58
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:64
 msgid "Connecting to QuickBooks"
 msgstr ""
 
@@ -15917,6 +16142,12 @@
 msgid "Connections"
 msgstr ""
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Connections"
+msgstr ""
+
 #: accounts/report/general_ledger/general_ledger.js:172
 msgid "Consider Accounting Dimensions"
 msgstr ""
@@ -15933,6 +16164,12 @@
 msgid "Consider Minimum Order Qty"
 msgstr ""
 
+#. Label of a Check field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Consider Rejected Warehouses"
+msgstr ""
+
 #. Label of a Select field in DocType 'Purchase Taxes and Charges'
 #: accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
 msgctxt "Purchase Taxes and Charges"
@@ -16030,7 +16267,7 @@
 msgid "Consumed Amount"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:318
+#: assets/doctype/asset_capitalization/asset_capitalization.py:324
 msgid "Consumed Asset Items is mandatory for Decapitalization"
 msgstr ""
 
@@ -16101,7 +16338,7 @@
 msgid "Consumed Stock Items"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:321
+#: assets/doctype/asset_capitalization/asset_capitalization.py:327
 msgid "Consumed Stock Items or Consumed Asset Items is mandatory for Capitalization"
 msgstr ""
 
@@ -16636,9 +16873,9 @@
 msgid "Content Type"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
-#: public/js/controllers/transaction.js:2074
-#: selling/doctype/quotation/quotation.js:344
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:157
+#: public/js/controllers/transaction.js:2117
+#: selling/doctype/quotation/quotation.js:356
 msgid "Continue"
 msgstr ""
 
@@ -16724,7 +16961,7 @@
 msgstr ""
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:76
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:121
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:122
 msgid "Contribution %"
 msgstr ""
 
@@ -16735,10 +16972,14 @@
 msgstr ""
 
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:88
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:123
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
 msgid "Contribution Amount"
 msgstr ""
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:124
+msgid "Contribution Qty"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Sales Team'
 #: selling/doctype/sales_team/sales_team.json
 msgctxt "Sales Team"
@@ -16757,7 +16998,7 @@
 msgid "Control Historical Stock Transactions"
 msgstr ""
 
-#: public/js/utils.js:684
+#: public/js/utils.js:749
 msgid "Conversion Factor"
 msgstr ""
 
@@ -16857,7 +17098,7 @@
 msgid "Conversion Factor"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:86
+#: manufacturing/doctype/bom_creator/bom_creator.js:85
 msgid "Conversion Rate"
 msgstr ""
 
@@ -16883,7 +17124,7 @@
 msgid "Conversion factor for default Unit of Measure must be 1 in row {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2384
+#: controllers/accounts_controller.py:2476
 msgid "Conversion rate cannot be 0 or 1"
 msgstr ""
 
@@ -16893,12 +17134,12 @@
 msgid "Convert Item Description to Clean HTML in Transactions"
 msgstr ""
 
-#: accounts/doctype/account/account.js:106
-#: accounts/doctype/cost_center/cost_center.js:119
+#: accounts/doctype/account/account.js:107
+#: accounts/doctype/cost_center/cost_center.js:123
 msgid "Convert to Group"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.js:61
+#: stock/doctype/warehouse/warehouse.js:58
 msgctxt "Warehouse"
 msgid "Convert to Group"
 msgstr ""
@@ -16907,17 +17148,17 @@
 msgid "Convert to Item Based Reposting"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.js:60
+#: stock/doctype/warehouse/warehouse.js:57
 msgctxt "Warehouse"
 msgid "Convert to Ledger"
 msgstr ""
 
-#: accounts/doctype/account/account.js:83
-#: accounts/doctype/cost_center/cost_center.js:116
+#: accounts/doctype/account/account.js:79
+#: accounts/doctype/cost_center/cost_center.js:121
 msgid "Convert to Non-Group"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:41
+#: crm/report/lead_details/lead_details.js:40
 #: selling/page/sales_funnel/sales_funnel.py:58
 msgid "Converted"
 msgstr ""
@@ -16964,11 +17205,11 @@
 msgid "Corrective Action"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:146
+#: manufacturing/doctype/job_card/job_card.js:155
 msgid "Corrective Job Card"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:151
+#: manufacturing/doctype/job_card/job_card.js:162
 msgid "Corrective Operation"
 msgstr ""
 
@@ -17001,23 +17242,23 @@
 #: 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:1047
+#: accounts/report/accounts_receivable/accounts_receivable.py:1055
 #: 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:643
+#: accounts/report/general_ledger/general_ledger.py:656
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:300
 #: 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/trial_balance/trial_balance.js:49
-#: assets/report/fixed_asset_register/fixed_asset_register.js:30
+#: assets/report/fixed_asset_register/fixed_asset_register.js:29
 #: assets/report/fixed_asset_register/fixed_asset_register.py:461
-#: buying/report/procurement_tracker/procurement_tracker.js:16
+#: buying/report/procurement_tracker/procurement_tracker.js:15
 #: buying/report/procurement_tracker/procurement_tracker.py:32
-#: public/js/financial_statements.js:237
+#: public/js/financial_statements.js:246
 msgid "Cost Center"
 msgstr ""
 
@@ -17393,7 +17634,7 @@
 msgid "Cost Center Allocation Percentages"
 msgstr ""
 
-#: public/js/utils/sales_common.js:383
+#: public/js/utils/sales_common.js:435
 msgid "Cost Center For Item with Item Code {0} has been Changed to {1}"
 msgstr ""
 
@@ -17403,7 +17644,7 @@
 msgid "Cost Center Name"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center_tree.js:25
+#: accounts/doctype/cost_center/cost_center_tree.js:38
 msgid "Cost Center Number"
 msgstr ""
 
@@ -17422,8 +17663,8 @@
 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:1235
-#: stock/doctype/purchase_receipt/purchase_receipt.py:788
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1287
+#: stock/doctype/purchase_receipt/purchase_receipt.py:790
 msgid "Cost Center is required in row {0} in Taxes table for type {1}"
 msgstr ""
 
@@ -17443,11 +17684,11 @@
 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:246
+#: assets/doctype/asset/asset.py:248
 msgid "Cost Center {} doesn't belong to Company {}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:253
+#: assets/doctype/asset/asset.py:255
 msgid "Cost Center {} is a group cost center and group cost centers cannot be used in transactions"
 msgstr ""
 
@@ -17487,7 +17728,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:45
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:64
-#: accounts/report/account_balance/account_balance.js:44
+#: accounts/report/account_balance/account_balance.js:43
 msgid "Cost of Goods Sold"
 msgstr ""
 
@@ -17599,11 +17840,11 @@
 msgid "Could not auto update shifts. Shift with shift factor {0} needed."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:737
+#: stock/doctype/delivery_note/delivery_note.py:798
 msgid "Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:339
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:355
 msgid "Could not detect the Company for updating Bank Accounts"
 msgstr ""
 
@@ -17625,10 +17866,6 @@
 msgid "Could not solve weighted score function. Make sure the formula is valid."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1030
-msgid "Could not update stock, invoice contains drop shipping item."
-msgstr ""
-
 #. Label of a Int field in DocType 'Shipment Parcel'
 #: stock/doctype/shipment_parcel/shipment_parcel.json
 msgctxt "Shipment Parcel"
@@ -17636,7 +17873,7 @@
 msgstr ""
 
 #: crm/report/lead_details/lead_details.py:63
-#: public/js/utils/contact_address_quick_entry.js:86
+#: public/js/utils/contact_address_quick_entry.js:89
 msgid "Country"
 msgstr ""
 
@@ -17735,6 +17972,12 @@
 msgid "Coupon Code"
 msgstr ""
 
+#. Label of a Link field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Coupon Code"
+msgstr ""
+
 #. Label of a Link field in DocType 'Sales Order'
 #: selling/doctype/sales_order/sales_order.json
 msgctxt "Sales Order"
@@ -17765,147 +18008,149 @@
 msgid "Coupon Type"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Cr"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:148
-#: accounts/doctype/account/account_tree.js:151
-#: accounts/doctype/dunning/dunning.js:54
-#: accounts/doctype/dunning/dunning.js:56
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:31
-#: accounts/doctype/journal_entry/journal_entry.js:85
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/pos_invoice/pos_invoice.js:51
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:97
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:103
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:114
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:120
+#: accounts/doctype/account/account_tree.js:209
+#: accounts/doctype/account/account_tree.js:216
+#: accounts/doctype/dunning/dunning.js:55
+#: accounts/doctype/dunning/dunning.js:57
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:34
+#: accounts/doctype/journal_entry/journal_entry.js:139
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/pos_invoice/pos_invoice.js:55
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
 #: accounts/doctype/purchase_invoice/purchase_invoice.js:127
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:189
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:609
-#: accounts/doctype/sales_invoice/sales_invoice.js:106
-#: accounts/doctype/sales_invoice/sales_invoice.js:108
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:134
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:225
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:654
+#: accounts/doctype/sales_invoice/sales_invoice.js:109
+#: accounts/doctype/sales_invoice/sales_invoice.js:110
 #: accounts/doctype/sales_invoice/sales_invoice.js:121
 #: accounts/doctype/sales_invoice/sales_invoice.js:122
-#: accounts/doctype/sales_invoice/sales_invoice.js:135
-#: accounts/doctype/sales_invoice/sales_invoice.js:142
-#: accounts/doctype/sales_invoice/sales_invoice.js:146
-#: accounts/doctype/sales_invoice/sales_invoice.js:157
-#: accounts/doctype/sales_invoice/sales_invoice.js:164
-#: accounts/doctype/sales_invoice/sales_invoice.js:184
-#: buying/doctype/purchase_order/purchase_order.js:94
-#: buying/doctype/purchase_order/purchase_order.js:310
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: buying/doctype/purchase_order/purchase_order.js:324
-#: buying/doctype/purchase_order/purchase_order.js:330
-#: buying/doctype/purchase_order/purchase_order.js:336
-#: buying/doctype/purchase_order/purchase_order.js:348
+#: accounts/doctype/sales_invoice/sales_invoice.js:136
+#: accounts/doctype/sales_invoice/sales_invoice.js:147
+#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:168
+#: 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/request_for_quotation/request_for_quotation.js:43
-#: buying/doctype/request_for_quotation/request_for_quotation.js:146
-#: buying/doctype/request_for_quotation/request_for_quotation.js:169
-#: buying/doctype/supplier/supplier.js:96
-#: buying/doctype/supplier/supplier.js:100
-#: buying/doctype/supplier_quotation/supplier_quotation.js:24
+#: 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:421
+#: 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
+#: buying/doctype/supplier/supplier.js:112
+#: buying/doctype/supplier/supplier.js:120
 #: buying/doctype/supplier_quotation/supplier_quotation.js:25
+#: buying/doctype/supplier_quotation/supplier_quotation.js:26
 #: buying/doctype/supplier_quotation/supplier_quotation.js:27
-#: crm/doctype/lead/lead.js:35 crm/doctype/lead/lead.js:38
+#: crm/doctype/lead/lead.js:31 crm/doctype/lead/lead.js:37
 #: crm/doctype/lead/lead.js:39 crm/doctype/lead/lead.js:41
-#: crm/doctype/lead/lead.js:220 crm/doctype/opportunity/opportunity.js:85
-#: crm/doctype/opportunity/opportunity.js:90
-#: crm/doctype/opportunity/opportunity.js:97
+#: crm/doctype/lead/lead.js:230 crm/doctype/opportunity/opportunity.js:85
+#: crm/doctype/opportunity/opportunity.js:93
 #: crm/doctype/opportunity/opportunity.js:103
-#: crm/doctype/prospect/prospect.js:12 crm/doctype/prospect/prospect.js:20
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:151
-#: manufacturing/doctype/blanket_order/blanket_order.js:31
-#: manufacturing/doctype/blanket_order/blanket_order.js:41
-#: manufacturing/doctype/blanket_order/blanket_order.js:53
-#: manufacturing/doctype/bom/bom.js:121 manufacturing/doctype/bom/bom.js:126
-#: manufacturing/doctype/bom/bom.js:132 manufacturing/doctype/bom/bom.js:135
-#: manufacturing/doctype/bom/bom.js:344
-#: manufacturing/doctype/bom_creator/bom_creator.js:93
-#: manufacturing/doctype/production_plan/production_plan.js:109
-#: manufacturing/doctype/production_plan/production_plan.js:115
-#: manufacturing/doctype/production_plan/production_plan.js:121
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/doctype/work_order/work_order.js:726
-#: projects/doctype/task/task_tree.js:77 public/js/communication.js:16
-#: public/js/communication.js:24 public/js/communication.js:30
-#: public/js/controllers/transaction.js:300
-#: public/js/controllers/transaction.js:301
-#: public/js/controllers/transaction.js:2188
-#: selling/doctype/customer/customer.js:165
-#: selling/doctype/quotation/quotation.js:119
-#: selling/doctype/quotation/quotation.js:129
-#: selling/doctype/sales_order/sales_order.js:548
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order.js:560
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order.js:570
-#: selling/doctype/sales_order/sales_order.js:571
-#: selling/doctype/sales_order/sales_order.js:576
-#: selling/doctype/sales_order/sales_order.js:581
-#: selling/doctype/sales_order/sales_order.js:582
-#: selling/doctype/sales_order/sales_order.js:587
-#: selling/doctype/sales_order/sales_order.js:599
-#: selling/doctype/sales_order/sales_order.js:605
-#: selling/doctype/sales_order/sales_order.js:606
-#: selling/doctype/sales_order/sales_order.js:608
-#: selling/doctype/sales_order/sales_order.js:739
-#: selling/doctype/sales_order/sales_order.js:847
-#: stock/doctype/delivery_note/delivery_note.js:89
-#: stock/doctype/delivery_note/delivery_note.js:90
-#: stock/doctype/delivery_note/delivery_note.js:104
-#: stock/doctype/delivery_note/delivery_note.js:167
-#: stock/doctype/delivery_note/delivery_note.js:172
-#: stock/doctype/delivery_note/delivery_note.js:176
-#: stock/doctype/delivery_note/delivery_note.js:181
-#: stock/doctype/delivery_note/delivery_note.js:190
-#: stock/doctype/delivery_note/delivery_note.js:196
-#: stock/doctype/delivery_note/delivery_note.js:223
-#: stock/doctype/item/item.js:105 stock/doctype/item/item.js:108
-#: stock/doctype/item/item.js:112 stock/doctype/item/item.js:449
-#: stock/doctype/item/item.js:651
-#: stock/doctype/material_request/material_request.js:114
-#: stock/doctype/material_request/material_request.js:120
-#: stock/doctype/material_request/material_request.js:123
-#: stock/doctype/material_request/material_request.js:128
-#: stock/doctype/material_request/material_request.js:133
-#: stock/doctype/material_request/material_request.js:138
-#: stock/doctype/material_request/material_request.js:143
+#: crm/doctype/opportunity/opportunity.js:112
+#: crm/doctype/prospect/prospect.js:15 crm/doctype/prospect/prospect.js:27
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:159
+#: manufacturing/doctype/blanket_order/blanket_order.js:34
+#: manufacturing/doctype/blanket_order/blanket_order.js:48
+#: manufacturing/doctype/blanket_order/blanket_order.js:64
+#: manufacturing/doctype/bom/bom.js:123 manufacturing/doctype/bom/bom.js:132
+#: manufacturing/doctype/bom/bom.js:142 manufacturing/doctype/bom/bom.js:146
+#: manufacturing/doctype/bom/bom.js:360
+#: manufacturing/doctype/bom_creator/bom_creator.js:92
+#: manufacturing/doctype/plant_floor/plant_floor.js:240
+#: manufacturing/doctype/production_plan/production_plan.js:125
+#: manufacturing/doctype/production_plan/production_plan.js:139
+#: manufacturing/doctype/production_plan/production_plan.js:146
+#: manufacturing/doctype/work_order/work_order.js:301
+#: manufacturing/doctype/work_order/work_order.js:782
+#: projects/doctype/task/task_tree.js:81 public/js/communication.js:19
+#: 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
+#: selling/doctype/customer/customer.js:176
+#: selling/doctype/quotation/quotation.js:125
+#: selling/doctype/quotation/quotation.js:134
+#: selling/doctype/sales_order/sales_order.js:601
+#: selling/doctype/sales_order/sales_order.js:621
+#: selling/doctype/sales_order/sales_order.js:626
+#: selling/doctype/sales_order/sales_order.js:635
+#: selling/doctype/sales_order/sales_order.js:647
+#: selling/doctype/sales_order/sales_order.js:652
+#: selling/doctype/sales_order/sales_order.js:661
+#: selling/doctype/sales_order/sales_order.js:670
+#: selling/doctype/sales_order/sales_order.js:675
+#: selling/doctype/sales_order/sales_order.js:681
+#: selling/doctype/sales_order/sales_order.js:698
+#: selling/doctype/sales_order/sales_order.js:711
+#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:715
+#: selling/doctype/sales_order/sales_order.js:853
+#: selling/doctype/sales_order/sales_order.js:992
+#: stock/doctype/delivery_note/delivery_note.js:91
+#: stock/doctype/delivery_note/delivery_note.js:93
+#: stock/doctype/delivery_note/delivery_note.js:112
+#: stock/doctype/delivery_note/delivery_note.js:185
+#: stock/doctype/delivery_note/delivery_note.js:195
+#: stock/doctype/delivery_note/delivery_note.js:204
+#: stock/doctype/delivery_note/delivery_note.js:214
+#: stock/doctype/delivery_note/delivery_note.js:228
+#: stock/doctype/delivery_note/delivery_note.js:234
+#: stock/doctype/delivery_note/delivery_note.js:270
+#: stock/doctype/item/item.js:135 stock/doctype/item/item.js:142
+#: stock/doctype/item/item.js:150 stock/doctype/item/item.js:517
+#: stock/doctype/item/item.js:725
+#: stock/doctype/material_request/material_request.js:117
+#: stock/doctype/material_request/material_request.js:126
+#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:140
 #: stock/doctype/material_request/material_request.js:148
-#: stock/doctype/material_request/material_request.js:153
 #: stock/doctype/material_request/material_request.js:156
-#: stock/doctype/material_request/material_request.js:314
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/pick_list/pick_list.js:104
-#: stock/doctype/purchase_receipt/purchase_receipt.js:78
-#: stock/doctype/purchase_receipt/purchase_receipt.js:79
-#: stock/doctype/purchase_receipt/purchase_receipt.js:88
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
-#: stock/doctype/purchase_receipt/purchase_receipt.js:234
-#: stock/doctype/stock_entry/stock_entry.js:146
-#: stock/doctype/stock_entry/stock_entry.js:147
-#: stock/doctype/stock_entry/stock_entry.js:217
-#: stock/doctype/stock_entry/stock_entry.js:1065
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:159
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:193
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:63
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:73
+#: stock/doctype/material_request/material_request.js:164
+#: stock/doctype/material_request/material_request.js:172
+#: stock/doctype/material_request/material_request.js:180
+#: stock/doctype/material_request/material_request.js:184
+#: stock/doctype/material_request/material_request.js:384
+#: stock/doctype/pick_list/pick_list.js:112
+#: stock/doctype/pick_list/pick_list.js:118
+#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/purchase_receipt/purchase_receipt.js:85
+#: stock/doctype/purchase_receipt/purchase_receipt.js:97
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
+#: stock/doctype/purchase_receipt/purchase_receipt.js:263
+#: stock/doctype/purchase_receipt/purchase_receipt.js:270
+#: stock/doctype/purchase_receipt/purchase_receipt.js:276
+#: stock/doctype/purchase_receipt/purchase_receipt.js:279
+#: 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
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:169
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:202
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:212
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:74
-#: support/doctype/issue/issue.js:27
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:88
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:90
+#: support/doctype/issue/issue.js:34
 msgid "Create"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:179
+#: manufacturing/doctype/work_order/work_order.js:190
 msgid "Create BOM"
 msgstr ""
 
@@ -17915,14 +18160,18 @@
 msgid "Create Chart Of Accounts Based On"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note_list.js:59
+#: stock/doctype/delivery_note/delivery_note_list.js:68
 msgid "Create Delivery Trip"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:122
+#: assets/doctype/asset/asset.js:154
 msgid "Create Depreciation Entry"
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:316
+msgid "Create Document"
+msgstr ""
+
 #: utilities/activation.py:138
 msgid "Create Employee"
 msgstr ""
@@ -17941,15 +18190,15 @@
 msgid "Create Grouped Asset"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:48
+#: accounts/doctype/journal_entry/journal_entry.js:96
 msgid "Create Inter Company Journal Entry"
 msgstr ""
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:45
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:49
 msgid "Create Invoices"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:152
+#: manufacturing/doctype/work_order/work_order.js:159
 msgid "Create Job Card"
 msgstr ""
 
@@ -17959,7 +18208,7 @@
 msgid "Create Job Card based on Batch Size"
 msgstr ""
 
-#: accounts/doctype/share_transfer/share_transfer.js:20
+#: accounts/doctype/share_transfer/share_transfer.js:18
 msgid "Create Journal Entry"
 msgstr ""
 
@@ -17978,8 +18227,8 @@
 msgid "Create Ledger Entries for Change Amount"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:191
-#: selling/doctype/customer/customer.js:236
+#: buying/doctype/supplier/supplier.js:224
+#: selling/doctype/customer/customer.js:257
 msgid "Create Link"
 msgstr ""
 
@@ -17989,45 +18238,45 @@
 msgid "Create Missing Party"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:150
+#: manufacturing/doctype/bom_creator/bom_creator.js:146
 msgid "Create Multi-level BOM"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:119
+#: public/js/call_popup/call_popup.js:122
 msgid "Create New Contact"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:124
+#: public/js/call_popup/call_popup.js:128
 msgid "Create New Customer"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:129
+#: public/js/call_popup/call_popup.js:134
 msgid "Create New Lead"
 msgstr ""
 
 #. Title of an Onboarding Step
-#: crm/doctype/lead/lead.js:198
+#: crm/doctype/lead/lead.js:208
 #: crm/onboarding_step/create_opportunity/create_opportunity.json
 msgid "Create Opportunity"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:60
+#: selling/page/point_of_sale/pos_controller.js:67
 msgid "Create POS Opening Entry"
 msgstr ""
 
-#: accounts/doctype/payment_order/payment_order.js:31
+#: accounts/doctype/payment_order/payment_order.js:39
 msgid "Create Payment Entries"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.js:46
+#: accounts/doctype/payment_request/payment_request.js:58
 msgid "Create Payment Entry"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:588
+#: manufacturing/doctype/work_order/work_order.js:627
 msgid "Create Pick List"
 msgstr ""
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Create Print Format"
 msgstr ""
 
@@ -18058,18 +18307,18 @@
 msgid "Create Receiver List"
 msgstr ""
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:45
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:81
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:44
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:76
 msgid "Create Reposting Entries"
 msgstr ""
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:53
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:52
 msgid "Create Reposting Entry"
 msgstr ""
 
 #: projects/doctype/timesheet/timesheet.js:54
-#: projects/doctype/timesheet/timesheet.js:203
-#: projects/doctype/timesheet/timesheet.js:207
+#: projects/doctype/timesheet/timesheet.js:230
+#: projects/doctype/timesheet/timesheet.js:234
 msgid "Create Sales Invoice"
 msgstr ""
 
@@ -18083,24 +18332,24 @@
 msgid "Create Sales Orders to help you plan your work and deliver on-time"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:346
+#: stock/doctype/stock_entry/stock_entry.js:399
 msgid "Create Sample Retention Stock Entry"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:220
+#: public/js/utils/serial_no_batch_selector.js:223
 msgid "Create Serial Nos"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:271
-#: stock/doctype/material_request/material_request.js:376
+#: stock/dashboard/item_dashboard.js:279
+#: stock/doctype/material_request/material_request.js:446
 msgid "Create Stock Entry"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:153
+#: buying/doctype/request_for_quotation/request_for_quotation.js:163
 msgid "Create Supplier Quotation"
 msgstr ""
 
-#: setup/doctype/company/company.js:110
+#: setup/doctype/company/company.js:130
 msgid "Create Tax Template"
 msgstr ""
 
@@ -18128,11 +18377,11 @@
 msgid "Create Users"
 msgstr ""
 
-#: stock/doctype/item/item.js:647
+#: stock/doctype/item/item.js:721
 msgid "Create Variant"
 msgstr ""
 
-#: stock/doctype/item/item.js:495 stock/doctype/item/item.js:530
+#: stock/doctype/item/item.js:563 stock/doctype/item/item.js:597
 msgid "Create Variants"
 msgstr ""
 
@@ -18239,7 +18488,7 @@
 msgid "Create an Item"
 msgstr ""
 
-#: stock/stock_ledger.py:1684
+#: stock/stock_ledger.py:1704
 msgid "Create an incoming stock transaction for the Item."
 msgstr ""
 
@@ -18296,7 +18545,7 @@
 msgid "Created {0} scorecards for {1} between:"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:126
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:140
 msgid "Creating Accounts..."
 msgstr ""
 
@@ -18304,11 +18553,11 @@
 msgid "Creating Company and Importing Chart of Accounts"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:912
+#: selling/doctype/sales_order/sales_order.js:1069
 msgid "Creating Delivery Note ..."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:137
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:143
 msgid "Creating Dimensions..."
 msgstr ""
 
@@ -18316,34 +18565,34 @@
 msgid "Creating Packing Slip ..."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:1026
+#: selling/doctype/sales_order/sales_order.js:1194
 msgid "Creating Purchase Order ..."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:659
-#: buying/doctype/purchase_order/purchase_order.js:414
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:709
+#: buying/doctype/purchase_order/purchase_order.js:482
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:71
 msgid "Creating Purchase Receipt ..."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:81
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:146
+#: buying/doctype/purchase_order/purchase_order.js:85
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:155
 msgid "Creating Stock Entry"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:429
+#: buying/doctype/purchase_order/purchase_order.js:497
 msgid "Creating Subcontracting Order ..."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:226
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:247
 msgid "Creating Subcontracting Receipt ..."
 msgstr ""
 
-#: setup/doctype/employee/employee.js:85
+#: setup/doctype/employee/employee.js:87
 msgid "Creating User..."
 msgstr ""
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:52
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:56
 msgid "Creating {0} Invoice"
 msgstr ""
 
@@ -18363,24 +18612,26 @@
 msgid "Creation Document No"
 msgstr ""
 
-#: utilities/bulk_transaction.py:173
+#: utilities/bulk_transaction.py:185
 msgid "Creation of <b><a href='/app/{0}'>{1}(s)</a></b> successful"
 msgstr ""
 
-#: utilities/bulk_transaction.py:190
+#: utilities/bulk_transaction.py:202
 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:181
+#: utilities/bulk_transaction.py:193
 msgid ""
 "Creation of {0} partially successful.\n"
 "\t\t\t\tCheck <b><a href=\"/app/bulk-transaction-log\">Bulk Transaction Log</a></b>"
 msgstr ""
 
 #: 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/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
@@ -18402,15 +18653,15 @@
 msgid "Credit"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:601
+#: accounts/report/general_ledger/general_ledger.py:614
 msgid "Credit (Transaction)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:578
+#: accounts/report/general_ledger/general_ledger.py:591
 msgid "Credit ({0})"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:536
+#: accounts/doctype/journal_entry/journal_entry.js:593
 msgid "Credit Account"
 msgstr ""
 
@@ -18478,6 +18729,7 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:49
+#: accounts/report/accounts_receivable/accounts_receivable.html:36
 #: selling/report/customer_credit_balance/customer_credit_balance.py:65
 msgid "Credit Limit"
 msgstr ""
@@ -18512,7 +18764,7 @@
 msgid "Credit Limit"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:546
+#: selling/doctype/customer/customer.py:558
 msgid "Credit Limit Crossed"
 msgstr ""
 
@@ -18553,7 +18805,8 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:173
-#: accounts/report/accounts_receivable/accounts_receivable.py:1070
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1078
 #: controllers/sales_and_purchase_return.py:328
 #: setup/setup_wizard/operations/install_fixtures.py:256
 #: stock/doctype/delivery_note/delivery_note.js:84
@@ -18580,10 +18833,11 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:200
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Credit Note Amount"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:254
+#: accounts/doctype/sales_invoice/sales_invoice.py:259
 msgid "Credit Note Issued"
 msgstr ""
 
@@ -18599,7 +18853,14 @@
 msgid "Credit Note Issued"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:734
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+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
 msgid "Credit Note {0} has been created automatically"
 msgstr ""
 
@@ -18615,16 +18876,16 @@
 msgid "Credit in Company Currency"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:512
-#: selling/doctype/customer/customer.py:566
+#: selling/doctype/customer/customer.py:524
+#: selling/doctype/customer/customer.py:579
 msgid "Credit limit has been crossed for customer {0} ({1}/{2})"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:328
+#: selling/doctype/customer/customer.py:340
 msgid "Credit limit is already defined for the Company {0}"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:565
+#: selling/doctype/customer/customer.py:578
 msgid "Credit limit reached for customer {0}"
 msgstr ""
 
@@ -18693,25 +18954,31 @@
 msgid "Criteria weights must add up to 100%"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/website_item_group/website_item_group.json
+msgid "Cross Listing of Item in multiple groups"
+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 ""
 
-#: accounts/doctype/account/account_tree.js:121
+#: accounts/doctype/account/account_tree.js:166
 #: accounts/report/account_balance/account_balance.py:28
-#: accounts/report/accounts_receivable/accounts_receivable.py:1079
+#: 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/consolidated_financial_statement/consolidated_financial_statement.js:94
+#: 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/financial_statements.html:29
 #: accounts/report/financial_statements.py:631
 #: 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:644
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:650
 #: accounts/report/payment_ledger/payment_ledger.py:213
 #: accounts/report/profitability_analysis/profitability_analysis.py:175
 #: accounts/report/purchase_register/purchase_register.py:229
@@ -18720,12 +18987,12 @@
 #: 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
-#: manufacturing/doctype/bom_creator/bom_creator.js:77
-#: public/js/financial_statements.js:231 public/js/utils/unreconcile.js:63
+#: 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
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:72
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:85
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:130
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:137
 msgid "Currency"
 msgstr ""
 
@@ -19013,12 +19280,12 @@
 msgid "Currency and Price List"
 msgstr ""
 
-#: accounts/doctype/account/account.py:295
+#: accounts/doctype/account/account.py:314
 msgid "Currency can not be changed after making entries using some other currency"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1360
-#: accounts/doctype/payment_entry/payment_entry.py:1422 accounts/utils.py:2091
+#: accounts/doctype/payment_entry/payment_entry.py:1379
+#: accounts/doctype/payment_entry/payment_entry.py:1441 accounts/utils.py:2059
 msgid "Currency for {0} must be {1}"
 msgstr ""
 
@@ -19231,57 +19498,57 @@
 
 #. Name of a DocType
 #. Name of a role
-#: accounts/doctype/sales_invoice/sales_invoice.js:265
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:38
+#: 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/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:45
+#: 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/sales_register/sales_register.js:21
 #: accounts/report/sales_register/sales_register.py:185
-#: buying/doctype/supplier/supplier.js:162 crm/doctype/lead/lead.js:35
-#: crm/doctype/opportunity/opportunity.js:94 crm/doctype/prospect/prospect.js:7
+#: 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
-#: projects/doctype/timesheet/timesheet.js:195
+#: projects/doctype/timesheet/timesheet.js:222
 #: projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py:45
-#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:42
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:22
+#: public/js/sales_trends_filters.js:25 public/js/sales_trends_filters.js:39
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:21
 #: selling/doctype/customer/customer.json
 #: selling/doctype/sales_order/sales_order_calendar.js:18
-#: selling/page/point_of_sale/pos_item_cart.js:309
+#: selling/page/point_of_sale/pos_item_cart.js:307
 #: 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:8
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:7
 #: selling/report/inactive_customers/inactive_customers.py:78
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:48
+#: 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:38
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:37
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:19
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:41
 #: selling/report/sales_order_analysis/sales_order_analysis.py:230
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:42
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:40
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:32
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:54
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:53
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:32
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:42
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:40
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:53
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:53
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:64
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:65
 #: setup/doctype/customer_group/customer_group.json
 #: setup/doctype/territory/territory.json
-#: stock/doctype/delivery_note/delivery_note.js:359
-#: stock/doctype/stock_entry/stock_entry.js:300
-#: stock/report/delayed_item_report/delayed_item_report.js:37
+#: stock/doctype/delivery_note/delivery_note.js:405
+#: stock/doctype/stock_entry/stock_entry.js:342
+#: stock/report/delayed_item_report/delayed_item_report.js:36
 #: stock/report/delayed_item_report/delayed_item_report.py:117
-#: stock/report/delayed_order_report/delayed_order_report.js:37
+#: stock/report/delayed_order_report/delayed_order_report.js:36
 #: stock/report/delayed_order_report/delayed_order_report.py:46
-#: support/report/issue_analytics/issue_analytics.js:70
+#: support/report/issue_analytics/issue_analytics.js:69
 #: support/report/issue_analytics/issue_analytics.py:37
-#: support/report/issue_summary/issue_summary.js:58
+#: support/report/issue_summary/issue_summary.js:57
 #: support/report/issue_summary/issue_summary.py:34
 msgid "Customer"
 msgstr ""
@@ -19650,7 +19917,7 @@
 msgid "Customer Code"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1027
+#: accounts/report/accounts_receivable/accounts_receivable.py:1035
 msgid "Customer Contact"
 msgstr ""
 
@@ -19730,11 +19997,11 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:118
-#: accounts/report/accounts_receivable/accounts_receivable.py:1097
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:99
+#: accounts/report/accounts_receivable/accounts_receivable.js:121
+#: accounts/report/accounts_receivable/accounts_receivable.py:1105
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:102
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:188
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:56
+#: 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/item_wise_sales_register/item_wise_sales_register.py:208
@@ -19743,10 +20010,10 @@
 #: public/js/sales_trends_filters.js:26
 #: selling/report/inactive_customers/inactive_customers.py:81
 #: 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:31
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:30
 #: setup/doctype/customer_group/customer_group.json
-#: stock/report/delayed_item_report/delayed_item_report.js:43
-#: stock/report/delayed_order_report/delayed_order_report.js:43
+#: stock/report/delayed_item_report/delayed_item_report.js:42
+#: stock/report/delayed_order_report/delayed_order_report.js:42
 msgid "Customer Group"
 msgstr ""
 
@@ -19909,7 +20176,7 @@
 msgid "Customer Group Name"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1197
+#: accounts/report/accounts_receivable/accounts_receivable.py:1205
 msgid "Customer Group: {0} does not exist"
 msgstr ""
 
@@ -19930,11 +20197,12 @@
 msgid "Customer Items"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1088
+#: accounts/report/accounts_receivable/accounts_receivable.py:1096
 msgid "Customer LPO"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:182
+#: accounts/report/accounts_receivable/accounts_receivable.html:152
 msgid "Customer LPO No."
 msgstr ""
 
@@ -19951,9 +20219,9 @@
 msgid "Customer Mobile No"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1034
+#: accounts/report/accounts_receivable/accounts_receivable.py:1042
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:92
+#: 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
@@ -20105,7 +20373,7 @@
 msgid "Customer PO Details"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:92
+#: public/js/utils/contact_address_quick_entry.js:95
 msgid "Customer POS Id"
 msgstr ""
 
@@ -20152,7 +20420,7 @@
 msgid "Customer Provided"
 msgstr ""
 
-#: setup/doctype/company/company.py:359
+#: setup/doctype/company/company.py:358
 msgid "Customer Service"
 msgstr ""
 
@@ -20180,7 +20448,7 @@
 msgid "Customer Warehouse (Optional)"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:924
+#: selling/page/point_of_sale/pos_item_cart.js:956
 msgid "Customer contact updated successfully."
 msgstr ""
 
@@ -20203,9 +20471,9 @@
 msgid "Customer required for 'Customerwise Discount'"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:986
-#: selling/doctype/sales_order/sales_order.py:335
-#: stock/doctype/delivery_note/delivery_note.py:354
+#: accounts/doctype/sales_invoice/sales_invoice.py:1003
+#: selling/doctype/sales_order/sales_order.py:338
+#: stock/doctype/delivery_note/delivery_note.py:408
 msgid "Customer {0} does not belong to project {1}"
 msgstr ""
 
@@ -20367,7 +20635,7 @@
 msgid "DUNN-.MM.-.YY.-"
 msgstr ""
 
-#: public/js/stock_analytics.js:51
+#: public/js/stock_analytics.js:81
 msgid "Daily"
 msgstr ""
 
@@ -20476,7 +20744,7 @@
 msgid "Dashboard"
 msgstr ""
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:15
 msgid "Data Based On"
 msgstr ""
 
@@ -20497,17 +20765,19 @@
 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:542
+#: accounts/doctype/journal_entry/journal_entry.js:603
 #: 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:16
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:37
+#: accounts/report/account_balance/account_balance.js:15
+#: accounts/report/accounts_receivable/accounts_receivable.html:132
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:38
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:26
+#: accounts/report/general_ledger/general_ledger.html:27
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:26
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:22
 #: accounts/report/sales_payment_summary/sales_payment_summary.py:38
-#: accounts/report/share_balance/share_balance.js:10
-#: accounts/report/share_ledger/share_ledger.js:10
+#: 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
@@ -20515,12 +20785,12 @@
 #: 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
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:19
-#: public/js/bank_reconciliation_tool/data_table_manager.js:40
+#: public/js/bank_reconciliation_tool/data_table_manager.js:39
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:34
 #: selling/report/sales_order_analysis/sales_order_analysis.py:220
 #: stock/report/product_bundle_balance/product_bundle_balance.js:8
 #: stock/report/reserved_stock/reserved_stock.py:89
-#: stock/report/stock_ledger/stock_ledger.py:107
+#: stock/report/stock_ledger/stock_ledger.py:180
 #: support/report/first_response_time_for_issues/first_response_time_for_issues.py:11
 #: support/report/support_hour_distribution/support_hour_distribution.py:68
 msgid "Date"
@@ -20700,7 +20970,7 @@
 msgid "Date "
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:98
+#: assets/report/fixed_asset_register/fixed_asset_register.js:97
 msgid "Date Based On"
 msgstr ""
 
@@ -20737,7 +21007,7 @@
 msgid "Date of Commencement"
 msgstr ""
 
-#: setup/doctype/company/company.js:70
+#: setup/doctype/company/company.js:69
 msgid "Date of Commencement should be greater than Date of Incorporation"
 msgstr ""
 
@@ -20765,7 +21035,7 @@
 msgid "Date of Joining"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:267
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:265
 msgid "Date of Transaction"
 msgstr ""
 
@@ -20870,7 +21140,7 @@
 msgid "Days Since Last Order"
 msgstr ""
 
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:35
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:34
 msgid "Days Since Last order"
 msgstr ""
 
@@ -20903,12 +21173,14 @@
 msgid "Dear"
 msgstr ""
 
-#: stock/reorder_item.py:285
+#: stock/reorder_item.py:370
 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/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
@@ -20930,15 +21202,15 @@
 msgid "Debit"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:594
+#: accounts/report/general_ledger/general_ledger.py:607
 msgid "Debit (Transaction)"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:572
+#: accounts/report/general_ledger/general_ledger.py:585
 msgid "Debit ({0})"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:530
+#: accounts/doctype/journal_entry/journal_entry.js:583
 msgid "Debit Account"
 msgstr ""
 
@@ -20973,10 +21245,11 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:175
-#: accounts/report/accounts_receivable/accounts_receivable.py:1073
+#: accounts/report/accounts_receivable/accounts_receivable.html:147
+#: accounts/report/accounts_receivable/accounts_receivable.py:1081
 #: controllers/sales_and_purchase_return.py:332
 #: setup/setup_wizard/operations/install_fixtures.py:257
-#: stock/doctype/purchase_receipt/purchase_receipt.js:73
+#: stock/doctype/purchase_receipt/purchase_receipt.js:76
 msgid "Debit Note"
 msgstr ""
 
@@ -20994,6 +21267,7 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:202
+#: accounts/report/accounts_receivable/accounts_receivable.html:162
 msgid "Debit Note Amount"
 msgstr ""
 
@@ -21003,6 +21277,13 @@
 msgid "Debit Note Issued"
 msgstr ""
 
+#. Description of the 'Update Outstanding for Self' (Check) field in DocType
+#. 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Debit Note will update it's own outstanding amount, even if \"Return Against\" is specified."
+msgstr ""
+
 #. Label of a Link field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -21015,11 +21296,11 @@
 msgid "Debit To"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:867
+#: accounts/doctype/sales_invoice/sales_invoice.py:884
 msgid "Debit To is required"
 msgstr ""
 
-#: accounts/general_ledger.py:465
+#: accounts/general_ledger.py:474
 msgid "Debit and Credit not equal for {0} #{1}. Difference is {2}."
 msgstr ""
 
@@ -21059,7 +21340,7 @@
 msgid "Decapitalized"
 msgstr ""
 
-#: public/js/utils/sales_common.js:444
+#: public/js/utils/sales_common.js:503
 msgid "Declare Lost"
 msgstr ""
 
@@ -21191,15 +21472,15 @@
 msgid "Default BOM ({0}) must be active for this item or its template"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1234
+#: manufacturing/doctype/work_order/work_order.py:1248
 msgid "Default BOM for {0} not found"
 msgstr ""
 
-#: controllers/accounts_controller.py:3216
+#: controllers/accounts_controller.py:3307
 msgid "Default BOM not found for FG Item {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1231
+#: manufacturing/doctype/work_order/work_order.py:1245
 msgid "Default BOM not found for Item {0} and Project {1}"
 msgstr ""
 
@@ -21657,11 +21938,11 @@
 msgid "Default Unit of Measure"
 msgstr ""
 
-#: stock/doctype/item/item.py:1233
+#: stock/doctype/item/item.py:1234
 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:1216
+#: stock/doctype/item/item.py:1217
 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 ""
 
@@ -21748,7 +22029,12 @@
 msgid "Default account will be automatically updated in POS Invoice when this mode is selected."
 msgstr ""
 
-#: setup/doctype/company/company.js:133
+#. Description of a DocType
+#: stock/doctype/stock_settings/stock_settings.json
+msgid "Default settings for your stock-related transactions"
+msgstr ""
+
+#: setup/doctype/company/company.js:160
 msgid "Default tax templates for sales, purchase and items are created."
 msgstr ""
 
@@ -21929,7 +22215,7 @@
 msgid "Delayed Tasks Summary"
 msgstr ""
 
-#: setup/doctype/company/company.js:176
+#: setup/doctype/company/company.js:207
 msgid "Delete"
 msgstr ""
 
@@ -21939,21 +22225,39 @@
 msgid "Delete Accounting and Stock Ledger Entries on deletion of Transaction"
 msgstr ""
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Bins"
+msgstr ""
+
 #. Label of a Check field in DocType 'Repost Accounting Ledger'
 #: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.json
 msgctxt "Repost Accounting Ledger"
 msgid "Delete Cancelled Ledger Entries"
 msgstr ""
 
-#: stock/doctype/inventory_dimension/inventory_dimension.js:50
+#: stock/doctype/inventory_dimension/inventory_dimension.js:66
 msgid "Delete Dimension"
 msgstr ""
 
-#: setup/doctype/company/company.js:117
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Leads and Addresses"
+msgstr ""
+
+#: setup/doctype/company/company.js:141
 msgid "Delete Transactions"
 msgstr ""
 
-#: setup/doctype/company/company.js:176
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Delete Transactions"
+msgstr ""
+
+#: setup/doctype/company/company.js:206
 msgid "Delete all the Transactions for this Company"
 msgstr ""
 
@@ -21963,12 +22267,16 @@
 msgid "Deleted Documents"
 msgstr ""
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:489
+msgid "Deletion in Progress!"
+msgstr ""
+
 #: regional/__init__.py:14
 msgid "Deletion is not permitted for country {0}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:297
-#: buying/doctype/purchase_order/purchase_order_list.js:10
+#: 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
 msgid "Delivered"
@@ -22081,7 +22389,7 @@
 msgid "Delivery"
 msgstr ""
 
-#: public/js/utils.js:678
+#: public/js/utils.js:742 selling/doctype/sales_order/sales_order.js:1012
 #: selling/report/sales_order_analysis/sales_order_analysis.py:321
 msgid "Delivery Date"
 msgstr ""
@@ -22114,17 +22422,17 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:281
-#: accounts/doctype/sales_invoice/sales_invoice_list.js:27
+#: 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
-#: selling/doctype/sales_order/sales_order.js:559
-#: selling/doctype/sales_order/sales_order_list.js:57
+#: selling/doctype/sales_order/sales_order.js:619
+#: selling/doctype/sales_order/sales_order_list.js:70
 #: stock/doctype/delivery_note/delivery_note.json
-#: stock/doctype/delivery_trip/delivery_trip.js:51
-#: stock/doctype/pick_list/pick_list.js:102
-#: stock/doctype/purchase_receipt/purchase_receipt.js:83
+#: stock/doctype/delivery_trip/delivery_trip.js:52
+#: stock/doctype/pick_list/pick_list.js:110
+#: stock/doctype/purchase_receipt/purchase_receipt.js:90
 msgid "Delivery Note"
 msgstr ""
 
@@ -22240,16 +22548,16 @@
 msgid "Delivery Note Trends"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1148
+#: accounts/doctype/sales_invoice/sales_invoice.py:1155
 msgid "Delivery Note {0} is not submitted"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:885
+#: stock/doctype/pick_list/pick_list.py:1005
 msgid "Delivery Note(s) created for the Pick List"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1092
-#: stock/doctype/delivery_trip/delivery_trip.js:67
+#: accounts/report/accounts_receivable/accounts_receivable.py:1100
+#: stock/doctype/delivery_trip/delivery_trip.js:72
 msgid "Delivery Notes"
 msgstr ""
 
@@ -22296,7 +22604,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:180
+#: stock/doctype/delivery_note/delivery_note.js:210
 #: stock/doctype/delivery_trip/delivery_trip.json
 msgid "Delivery Trip"
 msgstr ""
@@ -22328,7 +22636,7 @@
 msgid "Delivery to"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:351
+#: selling/doctype/sales_order/sales_order.py:354
 msgid "Delivery warehouse required for stock item {0}"
 msgstr ""
 
@@ -22447,7 +22755,7 @@
 msgid "Depends on Tasks"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:61
+#: public/js/bank_reconciliation_tool/data_table_manager.js:60
 msgid "Deposit"
 msgstr ""
 
@@ -22489,7 +22797,7 @@
 
 #: 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:45
+#: accounts/report/account_balance/account_balance.js:44
 #: accounts/report/cash_flow/cash_flow.py:129
 msgid "Depreciation"
 msgstr ""
@@ -22508,7 +22816,7 @@
 msgstr ""
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.py:149
-#: assets/doctype/asset/asset.js:241
+#: assets/doctype/asset/asset.js:276
 msgid "Depreciation Amount"
 msgstr ""
 
@@ -22571,7 +22879,7 @@
 msgid "Depreciation Expense Account"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:390
+#: assets/doctype/asset/depreciation.py:388
 msgid "Depreciation Expense Account should be an Income or Expense Account."
 msgstr ""
 
@@ -22605,19 +22913,19 @@
 msgid "Depreciation Posting Date"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:661
+#: assets/doctype/asset/asset.js:780
 msgid "Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:491
+#: assets/doctype/asset/asset.py:493
 msgid "Depreciation Row {0}: Expected value after useful life must be greater than or equal to {1}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:460
+#: assets/doctype/asset/asset.py:462
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Available-for-use Date"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:451
+#: assets/doctype/asset/asset.py:453
 msgid "Depreciation Row {0}: Next Depreciation Date cannot be before Purchase Date"
 msgstr ""
 
@@ -22652,7 +22960,7 @@
 msgid "Depreciation Schedule View"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:347
+#: assets/doctype/asset/asset.py:349
 msgid "Depreciation cannot be calculated for fully depreciated assets"
 msgstr ""
 
@@ -22662,12 +22970,15 @@
 #: 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
+#: manufacturing/doctype/bom/bom_item_preview.html:12
 #: manufacturing/report/bom_stock_calculated/bom_stock_calculated.py:58
+#: 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:56
-#: public/js/controllers/transaction.js:2138
-#: selling/doctype/quotation/quotation.js:279
+#: public/js/bank_reconciliation_tool/data_table_manager.js:55
+#: public/js/controllers/transaction.js:2181
+#: 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
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:26
@@ -22678,7 +22989,7 @@
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:59
 #: stock/report/product_bundle_balance/product_bundle_balance.py:112
 #: stock/report/stock_ageing/stock_ageing.py:126
-#: stock/report/stock_ledger/stock_ledger.py:187
+#: 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
@@ -23244,7 +23555,7 @@
 msgid "Desk User"
 msgstr ""
 
-#: public/js/utils/sales_common.js:423
+#: public/js/utils/sales_common.js:482
 msgid "Detailed Reason"
 msgstr ""
 
@@ -23260,6 +23571,10 @@
 msgid "Detailed Reason"
 msgstr ""
 
+#: templates/pages/task_info.html:49
+msgid "Details"
+msgstr ""
+
 #. Label of a Long Text field in DocType 'Appointment'
 #: crm/doctype/appointment/appointment.json
 msgctxt "Appointment"
@@ -23320,6 +23635,12 @@
 msgid "Details"
 msgstr ""
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Details"
+msgstr ""
+
 #. Label of a Select field in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
 msgctxt "Accounts Settings"
@@ -23333,7 +23654,7 @@
 msgstr ""
 
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:175
-#: public/js/bank_reconciliation_tool/number_card.js:31
+#: 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
 msgid "Difference"
@@ -23363,7 +23684,7 @@
 msgid "Difference (Dr - Cr)"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:287
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:294
 msgid "Difference Account"
 msgstr ""
 
@@ -23392,15 +23713,15 @@
 msgid "Difference Account"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:573
+#: stock/doctype/stock_entry/stock_entry.py:528
 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:714
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:768
 msgid "Difference Account must be a Asset/Liability type account, since this Stock Reconciliation is an Opening Entry"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:301
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:309
 msgid "Difference Amount"
 msgstr ""
 
@@ -23464,7 +23785,7 @@
 msgid "Difference Value"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.js:366
+#: stock/doctype/delivery_note/delivery_note.js:414
 msgid "Different 'Source Warehouse' and 'Target Warehouse' can be set for each row."
 msgstr ""
 
@@ -23484,7 +23805,7 @@
 msgid "Dimension Details"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:94
+#: accounts/report/budget_variance_report/budget_variance_report.js:92
 msgid "Dimension Filter"
 msgstr ""
 
@@ -23654,7 +23975,7 @@
 msgstr ""
 
 #: selling/report/customer_credit_balance/customer_credit_balance.py:70
-#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:8
+#: stock/doctype/batch/batch_list.js:5 stock/doctype/item/item_list.js:16
 #: stock/doctype/putaway_rule/putaway_rule_list.js:5
 msgid "Disabled"
 msgstr ""
@@ -23803,19 +24124,19 @@
 msgid "Disabled"
 msgstr ""
 
-#: accounts/general_ledger.py:128
+#: accounts/general_ledger.py:132
 msgid "Disabled Account Selected"
 msgstr ""
 
-#: stock/utils.py:454
+#: stock/utils.py:449
 msgid "Disabled Warehouse {0} cannot be used for this transaction."
 msgstr ""
 
-#: controllers/accounts_controller.py:550
+#: controllers/accounts_controller.py:594
 msgid "Disabled pricing rules since this {} is an internal transfer"
 msgstr ""
 
-#: controllers/accounts_controller.py:564
+#: controllers/accounts_controller.py:608
 msgid "Disabled tax included prices since this {} is an internal transfer"
 msgstr ""
 
@@ -23830,11 +24151,11 @@
 msgid "Disables auto-fetching of existing quantity"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:62
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:64
 msgid "Disburse Loan"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:12
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
 msgid "Disbursed"
 msgstr ""
 
@@ -23844,7 +24165,8 @@
 msgid "Disbursed"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:380
+#: selling/page/point_of_sale/pos_item_cart.js:387
+#: templates/form_grid/item_grid.html:71
 msgid "Discount"
 msgstr ""
 
@@ -24110,7 +24432,7 @@
 msgid "Discount and Margin"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:761
+#: selling/page/point_of_sale/pos_item_cart.js:791
 msgid "Discount cannot be greater than 100%"
 msgstr ""
 
@@ -24118,7 +24440,7 @@
 msgid "Discount must be less than 100"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:2532
+#: accounts/doctype/payment_entry/payment_entry.py:2561
 msgid "Discount of {} applied as per Payment Term"
 msgstr ""
 
@@ -24204,7 +24526,7 @@
 msgid "Dislikes"
 msgstr ""
 
-#: setup/doctype/company/company.py:353
+#: setup/doctype/company/company.py:352
 msgid "Dispatch"
 msgstr ""
 
@@ -24312,6 +24634,11 @@
 msgid "Distinct Item and Warehouse"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/serial_no/serial_no.json
+msgid "Distinct unit of an Item"
+msgstr ""
+
 #. Label of a Select field in DocType 'Subcontracting Order'
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgctxt "Subcontracting Order"
@@ -24358,7 +24685,7 @@
 msgid "Divorced"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:42
+#: crm/report/lead_details/lead_details.js:41
 msgid "Do Not Contact"
 msgstr ""
 
@@ -24380,6 +24707,12 @@
 msgid "Do Not Explode"
 msgstr ""
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Do Not Update Serial / Batch on Creation of Auto Bundle"
+msgstr ""
+
 #. Description of the 'Hide Currency Symbol' (Select) field in DocType 'Global
 #. Defaults'
 #: setup/doctype/global_defaults/global_defaults.json
@@ -24393,29 +24726,49 @@
 msgid "Do not update variants on save"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:683
+#: assets/doctype/asset/asset.js:800
 msgid "Do you really want to restore this scrapped asset?"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:669
+#: assets/doctype/asset/asset.js:788
 msgid "Do you really want to scrap this asset?"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:134
+#: public/js/controllers/transaction.js:978
+msgid "Do you want to clear the selected {0}?"
+msgstr ""
+
+#: stock/doctype/delivery_trip/delivery_trip.js:155
 msgid "Do you want to notify all the customers by email?"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:196
+#: manufacturing/doctype/production_plan/production_plan.js:221
 msgid "Do you want to submit the material request"
 msgstr ""
 
+#. Label of a Data field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocField"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:132
+msgid "DocType"
+msgstr ""
+
+#. Label of a Link field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "DocType"
+msgstr ""
+
 #. Label of a Link field in DocType 'Transaction Deletion Record Item'
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgctxt "Transaction Deletion Record Item"
 msgid "DocType"
 msgstr ""
 
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:45
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:69
 msgid "DocTypes should not be added manually to the 'Excluded DocTypes' table. You are only allowed to remove entries from it."
 msgstr ""
 
@@ -24434,9 +24787,9 @@
 msgstr ""
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:141
-#: manufacturing/report/production_planning_report/production_planning_report.js:43
+#: manufacturing/report/production_planning_report/production_planning_report.js:42
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:102
-#: public/js/bank_reconciliation_tool/dialog_manager.js:104
+#: public/js/bank_reconciliation_tool/dialog_manager.js:111
 msgid "Document Name"
 msgstr ""
 
@@ -24454,15 +24807,15 @@
 
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:134
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:100
-#: public/js/bank_reconciliation_tool/dialog_manager.js:99
-#: public/js/bank_reconciliation_tool/dialog_manager.js:182
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:16
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:15
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:23
+#: public/js/bank_reconciliation_tool/dialog_manager.js:106
+#: public/js/bank_reconciliation_tool/dialog_manager.js:186
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:14
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:22
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:14
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:14
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:22
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:14
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:23
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:22
 msgid "Document Type"
 msgstr ""
 
@@ -24508,11 +24861,11 @@
 msgid "Document Type "
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:56
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:60
 msgid "Document Type already used as a dimension"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.js:64
+#: accounts/doctype/bank_transaction/bank_transaction.js:59
 msgid "Document {0} successfully uncleared"
 msgstr ""
 
@@ -24522,7 +24875,7 @@
 msgid "Documents"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:200
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:202
 msgid "Documents: {0} have deferred revenue/expense enabled for them. Cannot repost."
 msgstr ""
 
@@ -24559,7 +24912,13 @@
 #: 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
-#: public/js/utils/crm_activities.js:211
+#: public/js/utils/crm_activities.js:212
+msgid "Done"
+msgstr ""
+
+#. Label of a Check field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
 msgid "Done"
 msgstr ""
 
@@ -24595,8 +24954,8 @@
 msgid "Double Declining Balance"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:84
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:93
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:27
 msgid "Download"
 msgstr ""
 
@@ -24605,7 +24964,7 @@
 msgid "Download Backups"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:237
+#: public/js/utils/serial_no_batch_selector.js:241
 msgid "Download CSV Template"
 msgstr ""
 
@@ -24621,11 +24980,11 @@
 msgid "Download Materials Request Plan Section"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:60
+#: buying/doctype/request_for_quotation/request_for_quotation.js:70
 msgid "Download PDF"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:28
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:31
 msgid "Download Template"
 msgstr ""
 
@@ -24681,18 +25040,17 @@
 msgid "Downtime Reason"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:80
-#: accounts/doctype/bank_clearance/bank_clearance.py:79
-#: accounts/doctype/journal_entry/journal_entry.js:298
+#: accounts/doctype/account/account_tree.js:84
+#: accounts/doctype/bank_clearance/bank_clearance.py:81
+#: templates/form_grid/bank_reconciliation_grid.html:16
 msgid "Dr"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:6
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:5
 #: accounts/doctype/payment_request/payment_request_list.js:5
-#: assets/doctype/asset/asset_list.js:35
+#: assets/doctype/asset/asset_list.js:25
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:5
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record_list.js:7
-#: stock/doctype/stock_entry/stock_entry_list.js:10
+#: stock/doctype/stock_entry/stock_entry_list.js:18
 msgid "Draft"
 msgstr ""
 
@@ -24889,13 +25247,6 @@
 msgid "Draft"
 msgstr ""
 
-#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
-#. Record'
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
-msgctxt "Transaction Deletion Record"
-msgid "Draft"
-msgstr ""
-
 #. Option for the 'Status' (Select) field in DocType 'Work Order'
 #: manufacturing/doctype/work_order/work_order.json
 msgctxt "Work Order"
@@ -24994,7 +25345,7 @@
 msgid "Due / Reference Date cannot be after {0}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:649
+#: accounts/doctype/payment_entry/payment_entry.js:795
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:40
 msgid "Due Date"
 msgstr ""
@@ -25076,14 +25427,14 @@
 msgid "Due Date cannot be before Posting / Supplier Invoice Date"
 msgstr ""
 
-#: controllers/accounts_controller.py:576
+#: controllers/accounts_controller.py:628
 msgid "Due Date is mandatory"
 msgstr ""
 
 #. Name of a DocType
 #. Label of a Card Break in the Receivables Workspace
 #: accounts/doctype/dunning/dunning.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:155
+#: accounts/doctype/sales_invoice/sales_invoice.js:164
 #: accounts/workspace/receivables/receivables.json
 msgid "Dunning"
 msgstr ""
@@ -25160,7 +25511,7 @@
 msgid "Dunning Type"
 msgstr ""
 
-#: stock/doctype/item/item.js:135 stock/doctype/putaway_rule/putaway_rule.py:55
+#: stock/doctype/item/item.js:178 stock/doctype/putaway_rule/putaway_rule.py:55
 msgid "Duplicate"
 msgstr ""
 
@@ -25176,7 +25527,7 @@
 msgid "Duplicate Entry. Please check Authorization Rule {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:301
+#: assets/doctype/asset/asset.py:303
 msgid "Duplicate Finance Book"
 msgstr ""
 
@@ -25189,7 +25540,7 @@
 msgid "Duplicate POS Invoices found"
 msgstr ""
 
-#: projects/doctype/project/project.js:67
+#: projects/doctype/project/project.js:74
 msgid "Duplicate Project with Tasks"
 msgstr ""
 
@@ -25205,7 +25556,7 @@
 msgid "Duplicate item group found in the item group table"
 msgstr ""
 
-#: projects/doctype/project/project.js:146
+#: projects/doctype/project/project.js:174
 msgid "Duplicate project has been created"
 msgstr ""
 
@@ -25306,7 +25657,7 @@
 msgid "Earliest"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:478
+#: stock/report/stock_balance/stock_balance.py:486
 msgid "Earliest Age"
 msgstr ""
 
@@ -25320,6 +25671,14 @@
 msgid "Edit"
 msgstr ""
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.html:37
+msgid "Edit Capacity"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Edit Cart"
+msgstr ""
+
 #: public/js/utils/serial_no_batch_selector.js:30
 msgid "Edit Full Form"
 msgstr ""
@@ -25328,11 +25687,11 @@
 msgid "Edit Not Allowed"
 msgstr ""
 
-#: public/js/utils/crm_activities.js:182
+#: public/js/utils/crm_activities.js:184
 msgid "Edit Note"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.js:370
+#: stock/doctype/delivery_note/delivery_note.js:418
 msgid "Edit Posting Date and Time"
 msgstr ""
 
@@ -25390,15 +25749,15 @@
 msgid "Edit Posting Date and Time"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:366
+#: public/js/bom_configurator/bom_configurator.bundle.js:405
 msgid "Edit Qty"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:238
+#: selling/page/point_of_sale/pos_past_order_summary.js:247
 msgid "Edit Receipt"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:717
+#: selling/page/point_of_sale/pos_item_cart.js:745
 msgid "Editing {0} is not allowed as per POS Profile settings"
 msgstr ""
 
@@ -25414,7 +25773,7 @@
 msgid "Educational Qualification"
 msgstr ""
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
 msgid "Either 'Selling' or 'Buying' must be selected"
 msgstr ""
 
@@ -25468,9 +25827,9 @@
 msgid "Electronic Invoice Register"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:231
+#: 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:874
+#: selling/page/point_of_sale/pos_item_cart.js:904
 msgid "Email"
 msgstr ""
 
@@ -25624,7 +25983,7 @@
 msgid "Email Group"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:39
+#: public/js/utils/contact_address_quick_entry.js:42
 msgid "Email Id"
 msgstr ""
 
@@ -25652,7 +26011,7 @@
 msgid "Email Sent"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:289
+#: buying/doctype/request_for_quotation/request_for_quotation.py:313
 msgid "Email Sent to Supplier {0}"
 msgstr ""
 
@@ -25680,15 +26039,15 @@
 msgid "Email Template"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:269
+#: selling/page/point_of_sale/pos_past_order_summary.js:278
 msgid "Email not sent to {0} (unsubscribed / disabled)"
 msgstr ""
 
-#: stock/doctype/shipment/shipment.js:153
+#: stock/doctype/shipment/shipment.js:174
 msgid "Email or Phone/Mobile of the Contact are mandatory to continue."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:273
+#: selling/page/point_of_sale/pos_past_order_summary.js:283
 msgid "Email sent successfully."
 msgstr ""
 
@@ -25738,7 +26097,7 @@
 #: projects/doctype/timesheet/timesheet_calendar.js:28
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:27
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:10
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:50
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:45
 #: quality_management/doctype/non_conformance/non_conformance.json
 #: setup/doctype/company/company.json setup/doctype/employee/employee.json
 #: setup/doctype/sales_person/sales_person_tree.js:7
@@ -25941,7 +26300,7 @@
 msgid "Empty"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1042
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1044
 msgid "Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
 msgstr ""
 
@@ -25979,6 +26338,12 @@
 msgid "Enable Common Party Accounting"
 msgstr ""
 
+#. Label of a Check field in DocType 'Selling Settings'
+#: selling/doctype/selling_settings/selling_settings.json
+msgctxt "Selling Settings"
+msgid "Enable Cut-Off Date on Bulk Delivery Note Creation"
+msgstr ""
+
 #. Label of a Check field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
@@ -26051,6 +26416,13 @@
 msgid "Enable YouTube Tracking"
 msgstr ""
 
+#. Description of the 'Consider Rejected Warehouses' (Check) field in DocType
+#. 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Enable it if users want to consider rejected materials to dispatch."
+msgstr ""
+
 #: support/doctype/service_level_agreement/service_level_agreement.js:34
 msgid "Enable to apply SLA on every {0}"
 msgstr ""
@@ -26130,14 +26502,14 @@
 msgid "Encashment Date"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:41
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:41
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:49
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:49
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:23
-#: accounts/report/payment_ledger/payment_ledger.js:24
-#: assets/report/fixed_asset_register/fixed_asset_register.js:75
+#: accounts/report/payment_ledger/payment_ledger.js:23
+#: assets/report/fixed_asset_register/fixed_asset_register.js:74
 #: projects/report/project_summary/project_summary.py:74
-#: public/js/financial_statements.js:191 public/js/setup_wizard.js:42
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:24
+#: public/js/financial_statements.js:200 public/js/setup_wizard.js:44
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:23
 #: templates/pages/projects.html:47
 msgid "End Date"
 msgstr ""
@@ -26206,6 +26578,10 @@
 msgid "End Date cannot be before Start Date."
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation.js:206
+msgid "End Time"
+msgstr ""
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -26230,15 +26606,15 @@
 msgid "End Time"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:241
+#: stock/doctype/stock_entry/stock_entry.js:268
 msgid "End Transit"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
 #: accounts/report/financial_ratios/financial_ratios.js:25
-#: assets/report/fixed_asset_register/fixed_asset_register.js:90
-#: public/js/financial_statements.js:206
+#: assets/report/fixed_asset_register/fixed_asset_register.js:89
+#: public/js/financial_statements.js:215
 msgid "End Year"
 msgstr ""
 
@@ -26246,7 +26622,7 @@
 msgid "End Year cannot be before Start Year"
 msgstr ""
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:43
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:48
 #: accounts/doctype/process_deferred_accounting/process_deferred_accounting.py:37
 msgid "End date cannot be before start date"
 msgstr ""
@@ -26270,6 +26646,8 @@
 msgid "End of the current subscription period"
 msgstr ""
 
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:13
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:23
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:31
 msgid "Enough Parts to Build"
 msgstr ""
@@ -26284,27 +26662,29 @@
 msgid "Enter API key in Google Settings."
 msgstr ""
 
-#: setup/doctype/employee/employee.js:102
+#: setup/doctype/employee/employee.js:103
 msgid "Enter First and Last name of Employee, based on Which Full Name will be updated. IN transactions, it will be Full Name which will be fetched."
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:208
+#: public/js/utils/serial_no_batch_selector.js:211
 msgid "Enter Serial Nos"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:313
+#: stock/doctype/material_request/material_request.js:383
 msgid "Enter Supplier"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:280
+#: manufacturing/doctype/job_card/job_card.js:320
+#: manufacturing/doctype/workstation/workstation.js:189
+#: manufacturing/doctype/workstation/workstation.js:236
 msgid "Enter Value"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:91
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:96
 msgid "Enter Visit Details"
 msgstr ""
 
-#: manufacturing/doctype/routing/routing.js:77
+#: manufacturing/doctype/routing/routing.js:78
 msgid "Enter a name for Routing."
 msgstr ""
 
@@ -26316,31 +26696,31 @@
 msgid "Enter a name for this Holiday List."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:499
+#: selling/page/point_of_sale/pos_payment.js:527
 msgid "Enter amount to be redeemed."
 msgstr ""
 
-#: stock/doctype/item/item.js:804
+#: stock/doctype/item/item.js:882
 msgid "Enter an Item Code, the name will be auto-filled the same as Item Code on clicking inside the Item Name field."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:877
+#: selling/page/point_of_sale/pos_item_cart.js:907
 msgid "Enter customer's email"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:882
+#: selling/page/point_of_sale/pos_item_cart.js:913
 msgid "Enter customer's phone number"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:345
+#: assets/doctype/asset/asset.py:347
 msgid "Enter depreciation details"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:382
+#: selling/page/point_of_sale/pos_item_cart.js:389
 msgid "Enter discount percentage."
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:211
+#: public/js/utils/serial_no_batch_selector.js:214
 msgid "Enter each serial no in a new line"
 msgstr ""
 
@@ -26354,7 +26734,7 @@
 msgid "Enter the Bank Guarantee Number before submitting."
 msgstr ""
 
-#: manufacturing/doctype/routing/routing.js:82
+#: manufacturing/doctype/routing/routing.js:83
 msgid ""
 "Enter the Operation, the table will fetch the Operation details like Hourly Rate, Workstation automatically.\n"
 "\n"
@@ -26369,19 +26749,19 @@
 msgid "Enter the name of the bank or lending institution before submitting."
 msgstr ""
 
-#: stock/doctype/item/item.js:824
+#: stock/doctype/item/item.js:908
 msgid "Enter the opening stock units."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:730
+#: manufacturing/doctype/bom/bom.js:761
 msgid "Enter the quantity of the Item that will be manufactured from this Bill of Materials."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:817
+#: manufacturing/doctype/work_order/work_order.js:878
 msgid "Enter the quantity to manufacture. Raw material Items will be fetched only when this is set."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:392
+#: selling/page/point_of_sale/pos_payment.js:411
 msgid "Enter {0} amount."
 msgstr ""
 
@@ -26396,7 +26776,7 @@
 msgid "Entity"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:205
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:203
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:123
 msgid "Entity Type"
 msgstr ""
@@ -26421,8 +26801,8 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:102
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:150
-#: accounts/report/account_balance/account_balance.js:30
-#: accounts/report/account_balance/account_balance.js:46
+#: accounts/report/account_balance/account_balance.js:29
+#: accounts/report/account_balance/account_balance.js:45
 #: accounts/report/balance_sheet/balance_sheet.py:242
 #: setup/setup_wizard/operations/install_fixtures.py:259
 msgid "Equity"
@@ -26447,8 +26827,8 @@
 msgid "Equity/Liability Account"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:410
-#: manufacturing/doctype/job_card/job_card.py:773
+#: 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
 msgid "Error"
 msgstr ""
@@ -26513,6 +26893,16 @@
 msgid "Error Log"
 msgstr ""
 
+#. Label of a Long Text field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Error Log"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:127
+msgid "Error Message"
+msgstr ""
+
 #. Label of a Text field in DocType 'Period Closing Voucher'
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgctxt "Period Closing Voucher"
@@ -26535,7 +26925,7 @@
 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:406
+#: assets/doctype/asset/depreciation.py:404
 msgid "Error while posting depreciation entries"
 msgstr ""
 
@@ -26543,11 +26933,15 @@
 msgid "Error while processing deferred accounting for {0}"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:389
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:404
 msgid "Error while reposting item valuation"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:720
+#: templates/includes/footer/footer_extension.html:29
+msgid "Error: Not a valid id?"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.js:883
 msgid "Error: {0} is mandatory field"
 msgstr ""
 
@@ -26616,7 +27010,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:1976
+#: stock/stock_ledger.py:1983
 msgid "Example: Serial No {0} reserved in {1}."
 msgstr ""
 
@@ -26626,11 +27020,11 @@
 msgid "Exception Budget Approver Role"
 msgstr ""
 
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:56
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:55
 msgid "Excess Materials Consumed"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:869
+#: manufacturing/doctype/job_card/job_card.py:876
 msgid "Excess Transfer"
 msgstr ""
 
@@ -26654,7 +27048,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:517
+#: setup/doctype/company/company.py:516
 msgid "Exchange Gain/Loss"
 msgstr ""
 
@@ -26676,8 +27070,8 @@
 msgid "Exchange Gain/Loss"
 msgstr ""
 
-#: controllers/accounts_controller.py:1313
-#: controllers/accounts_controller.py:1394
+#: controllers/accounts_controller.py:1382
+#: controllers/accounts_controller.py:1463
 msgid "Exchange Gain/Loss amount has been booked through {0}"
 msgstr ""
 
@@ -26861,7 +27255,7 @@
 msgid "Excise Entry"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:1060
+#: stock/doctype/stock_entry/stock_entry.js:1213
 msgid "Excise Invoice"
 msgstr ""
 
@@ -26910,9 +27304,9 @@
 msgid "Exit Interview Held On"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:138
-#: public/js/bom_configurator/bom_configurator.bundle.js:179
-#: public/js/setup_wizard.js:168
+#: public/js/bom_configurator/bom_configurator.bundle.js:140
+#: public/js/bom_configurator/bom_configurator.bundle.js:183
+#: public/js/setup_wizard.js:181
 msgid "Expand All"
 msgstr ""
 
@@ -26970,11 +27364,13 @@
 msgid "Expected Delivery Date"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:316
+#: selling/doctype/sales_order/sales_order.py:319
 msgid "Expected Delivery Date should be after Sales Order Date"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:44
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:104
+#: templates/pages/task_info.html:64
 msgid "Expected End Date"
 msgstr ""
 
@@ -27000,7 +27396,7 @@
 msgid "Expected End Date should be less than or equal to parent task's Expected End Date {0}."
 msgstr ""
 
-#: public/js/projects/timer.js:12
+#: public/js/projects/timer.js:16
 msgid "Expected Hrs"
 msgstr ""
 
@@ -27010,7 +27406,9 @@
 msgid "Expected Hrs"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:40
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:98
+#: templates/pages/task_info.html:59
 msgid "Expected Start Date"
 msgstr ""
 
@@ -27060,8 +27458,8 @@
 msgid "Expected Value After Useful Life"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:29
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:81
+#: 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/profitability_analysis/profitability_analysis.py:189
 msgid "Expense"
@@ -27092,11 +27490,11 @@
 msgid "Expense"
 msgstr ""
 
-#: controllers/stock_controller.py:359
+#: controllers/stock_controller.py:541
 msgid "Expense / Difference account ({0}) must be a 'Profit or Loss' account"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:47
+#: accounts/report/account_balance/account_balance.js:46
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:248
 msgid "Expense Account"
 msgstr ""
@@ -27179,7 +27577,7 @@
 msgid "Expense Account"
 msgstr ""
 
-#: controllers/stock_controller.py:339
+#: controllers/stock_controller.py:521
 msgid "Expense Account Missing"
 msgstr ""
 
@@ -27196,13 +27594,13 @@
 msgid "Expense Head"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:490
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:510
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:528
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:514
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:532
 msgid "Expense Head Changed"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:552
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:556
 msgid "Expense account is mandatory for item {0}"
 msgstr ""
 
@@ -27213,7 +27611,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:46
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:65
-#: accounts/report/account_balance/account_balance.js:48
+#: accounts/report/account_balance/account_balance.js:49
 msgid "Expenses Included In Asset Valuation"
 msgstr ""
 
@@ -27225,7 +27623,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:49
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:69
-#: accounts/report/account_balance/account_balance.js:49
+#: accounts/report/account_balance/account_balance.js:51
 msgid "Expenses Included In Valuation"
 msgstr ""
 
@@ -27236,8 +27634,8 @@
 msgstr ""
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:9
-#: selling/doctype/quotation/quotation_list.js:35
-#: stock/doctype/batch/batch_list.js:9 stock/doctype/item/item_list.js:10
+#: selling/doctype/quotation/quotation_list.js:34
+#: stock/doctype/batch/batch_list.js:13 stock/doctype/item/item_list.js:18
 msgid "Expired"
 msgstr ""
 
@@ -27259,7 +27657,7 @@
 msgid "Expired"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:316
+#: stock/doctype/stock_entry/stock_entry.js:362
 msgid "Expired Batches"
 msgstr ""
 
@@ -27329,11 +27727,11 @@
 msgid "Export Data"
 msgstr ""
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:35
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:34
 msgid "Export E-Invoices"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:106
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:93
 msgid "Export Errored Rows"
 msgstr ""
 
@@ -27425,7 +27823,7 @@
 msgid "FIFO Stock Queue (qty, rate)"
 msgstr ""
 
-#. Label of a Text field in DocType 'Stock Ledger Entry'
+#. Label of a Long Text field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
 msgid "FIFO Stock Queue (qty, rate)"
@@ -27437,7 +27835,8 @@
 msgid "FIFO/LIFO Queue"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:62
+#: 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
 msgid "Failed"
 msgstr ""
@@ -27550,7 +27949,14 @@
 msgid "Failed"
 msgstr ""
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:9
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Failed"
+msgstr ""
+
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:17
 msgid "Failed Entries"
 msgstr ""
 
@@ -27585,11 +27991,11 @@
 msgid "Failed to setup defaults"
 msgstr ""
 
-#: setup/doctype/company/company.py:699
+#: setup/doctype/company/company.py:698
 msgid "Failed to setup defaults for country {0}. Please contact support."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Failure"
 msgstr ""
 
@@ -27605,6 +28011,10 @@
 msgid "Failure Description"
 msgstr ""
 
+#: accounts/doctype/payment_request/payment_request.js:29
+msgid "Failure: {0}"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -27666,7 +28076,7 @@
 msgid "Fees"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:332
+#: public/js/utils/serial_no_batch_selector.js:338
 msgid "Fetch Based On"
 msgstr ""
 
@@ -27676,7 +28086,7 @@
 msgid "Fetch Customers"
 msgstr ""
 
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:50
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:56
 msgid "Fetch Data"
 msgstr ""
 
@@ -27684,7 +28094,7 @@
 msgid "Fetch Items from Warehouse"
 msgstr ""
 
-#: accounts/doctype/dunning/dunning.js:60
+#: accounts/doctype/dunning/dunning.js:61
 msgid "Fetch Overdue Payments"
 msgstr ""
 
@@ -27692,8 +28102,8 @@
 msgid "Fetch Subscription Updates"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:952
-#: accounts/doctype/sales_invoice/sales_invoice.js:954
+#: accounts/doctype/sales_invoice/sales_invoice.js:1028
+#: accounts/doctype/sales_invoice/sales_invoice.js:1030
 msgid "Fetch Timesheet"
 msgstr ""
 
@@ -27703,8 +28113,8 @@
 msgid "Fetch Value From"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:252
-#: stock/doctype/stock_entry/stock_entry.js:554
+#: stock/doctype/material_request/material_request.js:318
+#: stock/doctype/stock_entry/stock_entry.js:640
 msgid "Fetch exploded BOM (including sub-assemblies)"
 msgstr ""
 
@@ -27715,11 +28125,20 @@
 msgid "Fetch items based on Default Supplier."
 msgstr ""
 
-#: accounts/doctype/dunning/dunning.js:131
-#: public/js/controllers/transaction.js:1083
+#: accounts/doctype/dunning/dunning.js:135
+#: public/js/controllers/transaction.js:1138
 msgid "Fetching exchange rates ..."
 msgstr ""
 
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:72
+msgid "Fetching..."
+msgstr ""
+
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:106
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:155
+msgid "Field"
+msgstr ""
+
 #. Label of a Select field in DocType 'POS Search Fields'
 #: accounts/doctype/pos_search_fields/pos_search_fields.json
 msgctxt "POS Search Fields"
@@ -27793,8 +28212,8 @@
 msgid "File to Rename"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:17
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:17
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:16
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:16
 #: public/js/financial_statements.js:167
 msgid "Filter Based On"
 msgstr ""
@@ -27805,7 +28224,7 @@
 msgid "Filter Duration (Months)"
 msgstr ""
 
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:46
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:45
 msgid "Filter Total Zero Qty"
 msgstr ""
 
@@ -27831,8 +28250,8 @@
 msgid "Filter on Payment"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:696
-#: public/js/bank_reconciliation_tool/dialog_manager.js:192
+#: accounts/doctype/payment_entry/payment_entry.js:858
+#: public/js/bank_reconciliation_tool/dialog_manager.js:196
 msgid "Filters"
 msgstr ""
 
@@ -27891,13 +28310,13 @@
 #: accounts/report/accounts_receivable/accounts_receivable.js:24
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:56
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:48
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:80
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:32
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:52
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:104
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:31
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:51
 #: accounts/report/general_ledger/general_ledger.js:16
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:32
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:31
 #: accounts/report/trial_balance/trial_balance.js:70
-#: assets/report/fixed_asset_register/fixed_asset_register.js:49
+#: assets/report/fixed_asset_register/fixed_asset_register.js:48
 #: public/js/financial_statements.js:161
 msgid "Finance Book"
 msgstr ""
@@ -28023,14 +28442,14 @@
 
 #. Title of an Onboarding Step
 #. Label of a Card Break in the Financial Reports Workspace
-#: accounts/doctype/account/account_tree.js:158
+#: accounts/doctype/account/account_tree.js:234
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/workspace/financial_reports/financial_reports.json
 #: public/js/financial_statements.js:129
 msgid "Financial Statements"
 msgstr ""
 
-#: public/js/setup_wizard.js:40
+#: public/js/setup_wizard.js:42
 msgid "Financial Year Begins On"
 msgstr ""
 
@@ -28041,13 +28460,13 @@
 msgid "Financial reports will be generated using GL Entry doctypes (should be enabled if Period Closing Voucher is not posted for all years sequentially or missing) "
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:627
-#: manufacturing/doctype/work_order/work_order.js:642
-#: manufacturing/doctype/work_order/work_order.js:651
+#: manufacturing/doctype/work_order/work_order.js:675
+#: manufacturing/doctype/work_order/work_order.js:690
+#: manufacturing/doctype/work_order/work_order.js:699
 msgid "Finish"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:176
+#: buying/doctype/purchase_order/purchase_order.js:182
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:43
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:119
 msgid "Finished Good"
@@ -28083,7 +28502,7 @@
 msgid "Finished Good BOM"
 msgstr ""
 
-#: public/js/utils.js:698
+#: public/js/utils.js:768
 msgid "Finished Good Item"
 msgstr ""
 
@@ -28097,7 +28516,7 @@
 msgid "Finished Good Item Code"
 msgstr ""
 
-#: public/js/utils.js:715
+#: public/js/utils.js:786
 msgid "Finished Good Item Qty"
 msgstr ""
 
@@ -28107,15 +28526,15 @@
 msgid "Finished Good Item Quantity"
 msgstr ""
 
-#: controllers/accounts_controller.py:3204
+#: controllers/accounts_controller.py:3295
 msgid "Finished Good Item is not specified for service item {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:3219
+#: controllers/accounts_controller.py:3310
 msgid "Finished Good Item {0} Qty can not be zero"
 msgstr ""
 
-#: controllers/accounts_controller.py:3213
+#: controllers/accounts_controller.py:3304
 msgid "Finished Good Item {0} must be a sub-contracted item"
 msgstr ""
 
@@ -28159,15 +28578,15 @@
 msgid "Finished Good {0} must be a sub-contracted item."
 msgstr ""
 
-#: setup/doctype/company/company.py:262
+#: setup/doctype/company/company.py:261
 msgid "Finished Goods"
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:25
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
 msgid "Finished Goods Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1264
+#: stock/doctype/stock_entry/stock_entry.py:1273
 msgid "Finished Item {0} does not match with Work Order {1}"
 msgstr ""
 
@@ -28254,16 +28673,17 @@
 
 #. Name of a DocType
 #: accounts/doctype/fiscal_year/fiscal_year.json
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:17
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:1
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:16
 #: accounts/report/profitability_analysis/profitability_analysis.js:38
 #: accounts/report/trial_balance/trial_balance.js:16
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:16
-#: manufacturing/report/job_card_summary/job_card_summary.js:17
-#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:48
+#: manufacturing/report/job_card_summary/job_card_summary.js:16
+#: public/js/purchase_trends_filters.js:28 public/js/sales_trends_filters.js:44
 #: regional/report/irs_1099/irs_1099.js:17
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:16
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:16
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:16
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:15
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:15
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:15
 msgid "Fiscal Year"
 msgstr ""
 
@@ -28341,7 +28761,7 @@
 msgid "Fixed"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:50
+#: accounts/report/account_balance/account_balance.js:52
 msgid "Fixed Asset"
 msgstr ""
 
@@ -28415,11 +28835,23 @@
 msgid "Fleet Manager"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_selector.js:303
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor"
+msgstr ""
+
+#. Label of a Data field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Floor Name"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_item_selector.js:300
 msgid "Focus on Item Group filter"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_selector.js:294
+#: selling/page/point_of_sale/pos_item_selector.js:291
 msgid "Focus on search input"
 msgstr ""
 
@@ -28439,15 +28871,15 @@
 msgid "Following Material Requests have been raised automatically based on Item's re-order level"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:740
+#: selling/doctype/customer/customer.py:751
 msgid "Following fields are mandatory to create address:"
 msgstr ""
 
-#: controllers/buying_controller.py:906
+#: controllers/buying_controller.py:932
 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:902
+#: controllers/buying_controller.py:928
 msgid "Following items {0} are not marked as {1} item. You can enable them as {1} item from its Item master"
 msgstr ""
 
@@ -28455,7 +28887,7 @@
 msgid "For"
 msgstr ""
 
-#: public/js/utils/sales_common.js:274
+#: public/js/utils/sales_common.js:309
 msgid "For 'Product Bundle' items, Warehouse, Serial No and Batch No will be considered from the 'Packing List' table. If Warehouse and Batch No are same for all packing items for any 'Product Bundle' item, those values can be entered in the main Item table, values will be copied to 'Packing List' table."
 msgstr ""
 
@@ -28471,11 +28903,16 @@
 msgid "For Company"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:293
+#: stock/doctype/material_request/material_request.js:361
 msgid "For Default Supplier (Optional)"
 msgstr ""
 
-#: controllers/stock_controller.py:770
+#: manufacturing/doctype/plant_floor/plant_floor.js:159
+#: manufacturing/doctype/plant_floor/plant_floor.js:183
+msgid "For Item"
+msgstr ""
+
+#: controllers/stock_controller.py:953
 msgid "For Item {0} cannot be received more than {1} qty against the {2} {3}"
 msgstr ""
 
@@ -28485,7 +28922,7 @@
 msgid "For Job Card"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:160
+#: manufacturing/doctype/job_card/job_card.js:175
 msgid "For Operation"
 msgstr ""
 
@@ -28510,23 +28947,28 @@
 msgid "For Production"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:657
+#: stock/doctype/stock_entry/stock_entry.py:612
 msgid "For Quantity (Manufactured Qty) is mandatory"
 msgstr ""
 
+#: controllers/accounts_controller.py:1070
+msgid "For Return Invoices with Stock effect, '0' qty Items are not allowed. Following rows are affected: {0}"
+msgstr ""
+
 #. Label of a Check field in DocType 'Currency Exchange'
 #: setup/doctype/currency_exchange/currency_exchange.json
 msgctxt "Currency Exchange"
 msgid "For Selling"
 msgstr ""
 
-#: accounts/doctype/payment_order/payment_order.js:98
+#: accounts/doctype/payment_order/payment_order.js:106
 msgid "For Supplier"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:331
-#: selling/doctype/sales_order/sales_order.js:808
-#: stock/doctype/material_request/material_request.js:247
+#: manufacturing/doctype/production_plan/production_plan.js:358
+#: selling/doctype/sales_order/sales_order.js:933
+#: stock/doctype/material_request/material_request.js:310
+#: templates/form_grid/material_request_grid.html:36
 msgid "For Warehouse"
 msgstr ""
 
@@ -28536,11 +28978,11 @@
 msgid "For Warehouse"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:427
+#: manufacturing/doctype/work_order/work_order.py:438
 msgid "For Warehouse is required before Submit"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:116
+#: public/js/utils/serial_no_batch_selector.js:119
 msgid "For Work Order"
 msgstr ""
 
@@ -28582,15 +29024,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:384
+#: stock/doctype/stock_entry/stock_entry.py:339
 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:1523
+#: manufacturing/doctype/work_order/work_order.py:1537
 msgid "For operation {0}: Quantity ({1}) can not be greater than pending quantity({2})"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1302
+#: stock/doctype/stock_entry/stock_entry.py:1311
 msgid "For quantity {0} should not be greater than allowed quantity {1}"
 msgstr ""
 
@@ -28600,12 +29042,12 @@
 msgid "For reference"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1229
+#: accounts/doctype/payment_entry/payment_entry.js:1477
 #: public/js/controllers/accounts.js:182
 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:1498
+#: manufacturing/doctype/production_plan/production_plan.py:1520
 msgid "For row {0}: Enter Planned Qty"
 msgstr ""
 
@@ -28613,6 +29055,11 @@
 msgid "For the 'Apply Rule On Other' condition the field {0} is mandatory"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/item_customer_detail/item_customer_detail.json
+msgid "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes"
+msgstr ""
+
 #. Label of a shortcut in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 msgid "Forecasting"
@@ -28795,7 +29242,7 @@
 msgid "Friday"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:957
+#: accounts/doctype/sales_invoice/sales_invoice.js:1033
 #: templates/pages/projects.html:67
 msgid "From"
 msgstr ""
@@ -28847,13 +29294,13 @@
 msgid "From Customer"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:645
-#: accounts/doctype/payment_entry/payment_entry.js:650
+#: accounts/doctype/payment_entry/payment_entry.js:789
+#: accounts/doctype/payment_entry/payment_entry.js:796
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:16
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:16
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:8
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:16
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:38
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:15
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:37
 #: accounts/report/financial_ratios/financial_ratios.js:41
 #: accounts/report/general_ledger/general_ledger.js:22
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -28861,77 +29308,77 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:8
 #: 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:17
+#: accounts/report/pos_register/pos_register.js:16
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:8
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:16
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:47
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:47
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:15
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:46
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:46
 #: accounts/report/trial_balance/trial_balance.js:37
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:37
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:15
-#: buying/report/procurement_tracker/procurement_tracker.js:28
-#: buying/report/purchase_analytics/purchase_analytics.js:36
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:18
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:18
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:16
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:23
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:23
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:14
+#: buying/report/procurement_tracker/procurement_tracker.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:35
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:17
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:17
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:15
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:22
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:22
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:16
 #: crm/report/campaign_efficiency/campaign_efficiency.js:7
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:9
-#: crm/report/lead_conversion_time/lead_conversion_time.js:9
-#: crm/report/lead_details/lead_details.js:17
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:8
+#: crm/report/lead_conversion_time/lead_conversion_time.js:8
+#: crm/report/lead_details/lead_details.js:16
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:7
-#: crm/report/lost_opportunity/lost_opportunity.js:17
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:23
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:16
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:16
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:8
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:17
-#: manufacturing/report/process_loss_report/process_loss_report.js:30
-#: manufacturing/report/production_analytics/production_analytics.js:17
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:8
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:16
+#: crm/report/lost_opportunity/lost_opportunity.js:16
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:22
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:15
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:15
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:7
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:16
+#: manufacturing/report/process_loss_report/process_loss_report.js:29
+#: manufacturing/report/production_analytics/production_analytics.js:16
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:7
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:15
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:8
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:9
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:8
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:28
-#: public/js/stock_analytics.js:47
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:9
-#: regional/report/uae_vat_201/uae_vat_201.js:17
-#: regional/report/vat_audit_report/vat_audit_report.js:17
-#: selling/page/sales_funnel/sales_funnel.js:39
+#: public/js/stock_analytics.js:74
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:8
+#: regional/report/uae_vat_201/uae_vat_201.js:16
+#: regional/report/vat_audit_report/vat_audit_report.js:16
+#: selling/page/sales_funnel/sales_funnel.js:43
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:24
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:18
-#: selling/report/sales_analytics/sales_analytics.js:36
-#: selling/report/sales_order_analysis/sales_order_analysis.js:18
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:23
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:22
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:23
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:17
+#: selling/report/sales_analytics/sales_analytics.js:43
+#: selling/report/sales_order_analysis/sales_order_analysis.js:17
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:21
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:21
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:21
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:21
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:8
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:16
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:17
-#: stock/report/delayed_item_report/delayed_item_report.js:17
-#: stock/report/delayed_order_report/delayed_order_report.js:17
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:21
-#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:31
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:15
+#: stock/report/delayed_item_report/delayed_item_report.js:16
+#: stock/report/delayed_order_report/delayed_order_report.js:16
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:20
+#: stock/report/incorrect_stock_value_report/incorrect_stock_value_report.js:30
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:8
 #: stock/report/reserved_stock/reserved_stock.js:16
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:16
-#: stock/report/stock_analytics/stock_analytics.js:63
+#: stock/report/stock_analytics/stock_analytics.js:62
 #: stock/report/stock_balance/stock_balance.js:16
 #: stock/report/stock_ledger/stock_ledger.js:16
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:15
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:9
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:9
-#: support/report/issue_analytics/issue_analytics.js:25
-#: support/report/issue_summary/issue_summary.js:25
-#: support/report/support_hour_distribution/support_hour_distribution.js:8
-#: utilities/report/youtube_interactions/youtube_interactions.js:9
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:8
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:8
+#: support/report/issue_analytics/issue_analytics.js:24
+#: support/report/issue_summary/issue_summary.js:24
+#: support/report/support_hour_distribution/support_hour_distribution.js:7
+#: utilities/report/youtube_interactions/youtube_interactions.js:8
 msgid "From Date"
 msgstr ""
 
@@ -29037,7 +29484,7 @@
 msgid "From Date"
 msgstr ""
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:41
+#: accounts/doctype/bank_clearance/bank_clearance.py:43
 msgid "From Date and To Date are Mandatory"
 msgstr ""
 
@@ -29083,7 +29530,7 @@
 msgid "From Delivery Date"
 msgstr ""
 
-#: selling/doctype/installation_note/installation_note.js:58
+#: selling/doctype/installation_note/installation_note.js:59
 msgid "From Delivery Note"
 msgstr ""
 
@@ -29093,7 +29540,7 @@
 msgid "From Doctype"
 msgstr ""
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:80
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:78
 msgid "From Due Date"
 msgstr ""
 
@@ -29103,7 +29550,7 @@
 msgid "From Employee"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:45
+#: accounts/report/budget_variance_report/budget_variance_report.js:43
 msgid "From Fiscal Year"
 msgstr ""
 
@@ -29167,8 +29614,8 @@
 msgid "From Payment Date"
 msgstr ""
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:37
-#: manufacturing/report/work_order_summary/work_order_summary.js:23
+#: manufacturing/report/job_card_summary/job_card_summary.js:36
+#: manufacturing/report/work_order_summary/work_order_summary.js:22
 msgid "From Posting Date"
 msgstr ""
 
@@ -29214,6 +29661,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:91
 #: manufacturing/report/job_card_summary/job_card_summary.py:179
+#: templates/pages/timelog_info.html:31
 msgid "From Time"
 msgstr ""
 
@@ -29299,7 +29747,7 @@
 msgid "From Voucher Detail No"
 msgstr ""
 
-#: stock/report/reserved_stock/reserved_stock.js:106
+#: stock/report/reserved_stock/reserved_stock.js:103
 #: stock/report/reserved_stock/reserved_stock.py:164
 msgid "From Voucher No"
 msgstr ""
@@ -29310,7 +29758,7 @@
 msgid "From Voucher No"
 msgstr ""
 
-#: stock/report/reserved_stock/reserved_stock.js:95
+#: stock/report/reserved_stock/reserved_stock.js:92
 #: stock/report/reserved_stock/reserved_stock.py:158
 msgid "From Voucher Type"
 msgstr ""
@@ -29361,7 +29809,7 @@
 msgid "From and To dates are required"
 msgstr ""
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:47
+#: manufacturing/doctype/blanket_order/blanket_order.py:48
 msgid "From date cannot be greater than To date"
 msgstr ""
 
@@ -29549,30 +29997,33 @@
 msgid "Furniture and Fixtures"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/account/account_tree.js:138
 msgid "Further accounts can be made under Groups, but entries can be made against non-Groups"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center_tree.js:24
+#: accounts/doctype/cost_center/cost_center_tree.js:31
 msgid "Further cost centers can be made under Groups but entries can be made against non-Groups"
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person_tree.js:10
+#: setup/doctype/sales_person/sales_person_tree.js:15
 msgid "Further nodes can be only created under 'Group' type nodes"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:185
-#: accounts/report/accounts_receivable/accounts_receivable.py:1084
+#: 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
 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.py:1083
+#: accounts/report/accounts_receivable/accounts_receivable.html:154
+#: accounts/report/accounts_receivable/accounts_receivable.py:1091
 msgid "Future Payment Ref"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:120
+#: accounts/report/accounts_receivable/accounts_receivable.html:102
 msgid "Future Payments"
 msgstr ""
 
@@ -29588,7 +30039,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/gl_entry/gl_entry.json
-#: accounts/report/general_ledger/general_ledger.py:557
+#: accounts/report/general_ledger/general_ledger.py:570
 msgid "GL Entry"
 msgstr ""
 
@@ -29649,11 +30100,11 @@
 
 #: 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:525
+#: setup/doctype/company/company.py:524
 msgid "Gain/Loss on Asset Disposal"
 msgstr ""
 
-#: projects/doctype/project/project.js:79
+#: projects/doctype/project/project.js:93
 msgid "Gantt Chart"
 msgstr ""
 
@@ -29689,7 +30140,7 @@
 #. Name of a report
 #. Label of a shortcut in the Accounting Workspace
 #. Label of a Link in the Financial Reports Workspace
-#: accounts/doctype/account/account.js:95
+#: accounts/doctype/account/account.js:93
 #: accounts/onboarding_step/financial_statements/financial_statements.json
 #: accounts/report/general_ledger/general_ledger.json
 #: accounts/workspace/accounting/accounting.json
@@ -29710,7 +30161,7 @@
 msgid "General Ledger"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse.js:74
+#: stock/doctype/warehouse/warehouse.js:68
 msgctxt "Warehouse"
 msgid "General Ledger"
 msgstr ""
@@ -29730,7 +30181,7 @@
 msgid "Generate Closing Stock Balance"
 msgstr ""
 
-#: public/js/setup_wizard.js:46
+#: public/js/setup_wizard.js:48
 msgid "Generate Demo Data for Exploration"
 msgstr ""
 
@@ -29756,6 +30207,11 @@
 msgid "Generate Schedule"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/packing_slip/packing_slip.json
+msgid "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight."
+msgstr ""
+
 #. Label of a Check field in DocType 'Bisect Nodes'
 #: accounts/doctype/bisect_nodes/bisect_nodes.json
 msgctxt "Bisect Nodes"
@@ -29802,7 +30258,7 @@
 msgid "Get Current Stock"
 msgstr ""
 
-#: selling/doctype/customer/customer.js:168
+#: selling/doctype/customer/customer.js:180
 msgid "Get Customer Group Details"
 msgstr ""
 
@@ -29818,12 +30274,12 @@
 msgid "Get Finished Goods for Manufacture"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:55
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:157
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:57
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:159
 msgid "Get Invoices"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:102
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:104
 msgid "Get Invoices based on Filters"
 msgstr ""
 
@@ -29833,11 +30289,11 @@
 msgid "Get Item Locations"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:351
-#: manufacturing/doctype/production_plan/production_plan.js:342
-#: stock/doctype/pick_list/pick_list.js:161
-#: stock/doctype/pick_list/pick_list.js:202
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: buying/doctype/request_for_quotation/request_for_quotation.js:377
+#: manufacturing/doctype/production_plan/production_plan.js:369
+#: stock/doctype/pick_list/pick_list.js:193
+#: stock/doctype/pick_list/pick_list.js:236
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:163
 msgid "Get Items"
 msgstr ""
 
@@ -29847,37 +30303,37 @@
 msgid "Get Items"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:147
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:165
-#: accounts/doctype/sales_invoice/sales_invoice.js:252
-#: accounts/doctype/sales_invoice/sales_invoice.js:276
-#: accounts/doctype/sales_invoice/sales_invoice.js:304
-#: buying/doctype/purchase_order/purchase_order.js:456
-#: buying/doctype/purchase_order/purchase_order.js:473
-#: buying/doctype/request_for_quotation/request_for_quotation.js:315
-#: buying/doctype/request_for_quotation/request_for_quotation.js:334
-#: buying/doctype/request_for_quotation/request_for_quotation.js:375
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:173
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:195
+#: 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/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
 #: buying/doctype/supplier_quotation/supplier_quotation.js:49
-#: buying/doctype/supplier_quotation/supplier_quotation.js:76
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:78
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:96
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:112
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:132
-#: public/js/controllers/buying.js:267
-#: selling/doctype/quotation/quotation.js:160
-#: selling/doctype/sales_order/sales_order.js:132
-#: selling/doctype/sales_order/sales_order.js:643
-#: stock/doctype/delivery_note/delivery_note.js:160
-#: stock/doctype/material_request/material_request.js:100
-#: stock/doctype/material_request/material_request.js:162
-#: stock/doctype/purchase_receipt/purchase_receipt.js:130
-#: stock/doctype/purchase_receipt/purchase_receipt.js:217
-#: stock/doctype/stock_entry/stock_entry.js:275
-#: stock/doctype/stock_entry/stock_entry.js:312
-#: stock/doctype/stock_entry/stock_entry.js:336
-#: stock/doctype/stock_entry/stock_entry.js:387
-#: stock/doctype/stock_entry/stock_entry.js:535
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
+#: buying/doctype/supplier_quotation/supplier_quotation.js:82
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:80
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:100
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:119
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:142
+#: public/js/controllers/buying.js:262
+#: selling/doctype/quotation/quotation.js:167
+#: selling/doctype/sales_order/sales_order.js:158
+#: selling/doctype/sales_order/sales_order.js:743
+#: stock/doctype/delivery_note/delivery_note.js:173
+#: stock/doctype/material_request/material_request.js:101
+#: stock/doctype/material_request/material_request.js:192
+#: stock/doctype/purchase_receipt/purchase_receipt.js:145
+#: stock/doctype/purchase_receipt/purchase_receipt.js:249
+#: 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:119
 msgid "Get Items From"
 msgstr ""
 
@@ -29893,13 +30349,13 @@
 msgid "Get Items From Purchase Receipts"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:241
-#: stock/doctype/stock_entry/stock_entry.js:555
-#: stock/doctype/stock_entry/stock_entry.js:568
+#: stock/doctype/material_request/material_request.js:295
+#: stock/doctype/stock_entry/stock_entry.js:643
+#: stock/doctype/stock_entry/stock_entry.js:656
 msgid "Get Items from BOM"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:348
+#: buying/doctype/request_for_quotation/request_for_quotation.js:374
 msgid "Get Items from Material Requests against this Supplier"
 msgstr ""
 
@@ -29909,7 +30365,7 @@
 msgid "Get Items from Open Material Requests"
 msgstr ""
 
-#: public/js/controllers/buying.js:507
+#: public/js/controllers/buying.js:504
 msgid "Get Items from Product Bundle"
 msgstr ""
 
@@ -29943,18 +30399,24 @@
 msgid "Get Outstanding Orders"
 msgstr ""
 
+#: accounts/doctype/bank_clearance/bank_clearance.js:38
 #: accounts/doctype/bank_clearance/bank_clearance.js:40
-#: accounts/doctype/bank_clearance/bank_clearance.js:44
-#: accounts/doctype/bank_clearance/bank_clearance.js:56
-#: accounts/doctype/bank_clearance/bank_clearance.js:75
+#: accounts/doctype/bank_clearance/bank_clearance.js:52
+#: accounts/doctype/bank_clearance/bank_clearance.js:71
 msgid "Get Payment Entries"
 msgstr ""
 
-#: accounts/doctype/payment_order/payment_order.js:20
-#: accounts/doctype/payment_order/payment_order.js:24
+#: accounts/doctype/payment_order/payment_order.js:23
+#: accounts/doctype/payment_order/payment_order.js:31
 msgid "Get Payments from"
 msgstr ""
 
+#. Label of a Check field in DocType 'Manufacturing Settings'
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+msgctxt "Manufacturing Settings"
+msgid "Get Raw Materials Cost from Consumption Entry"
+msgstr ""
+
 #. Label of a Button field in DocType 'Production Plan'
 #: manufacturing/doctype/production_plan/production_plan.json
 msgctxt "Production Plan"
@@ -29985,7 +30447,7 @@
 msgid "Get Started Sections"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:432
 msgid "Get Stock"
 msgstr ""
 
@@ -29995,29 +30457,29 @@
 msgid "Get Sub Assembly Items"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:102
+#: buying/doctype/supplier/supplier.js:124
 msgid "Get Supplier Group Details"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:384
-#: buying/doctype/request_for_quotation/request_for_quotation.js:402
+#: buying/doctype/request_for_quotation/request_for_quotation.js:416
+#: buying/doctype/request_for_quotation/request_for_quotation.js:436
 msgid "Get Suppliers"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:405
+#: buying/doctype/request_for_quotation/request_for_quotation.js:440
 msgid "Get Suppliers By"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:989
+#: accounts/doctype/sales_invoice/sales_invoice.js:1065
 msgid "Get Timesheets"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:81
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:84
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:77
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:80
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:87
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:94
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:75
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:78
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:81
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:86
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:91
 msgid "Get Unreconciled Entries"
 msgstr ""
 
@@ -30025,11 +30487,11 @@
 msgid "Get Updates"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:65
+#: stock/doctype/delivery_trip/delivery_trip.js:68
 msgid "Get stops from"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:125
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:149
 msgid "Getting Scrap Items"
 msgstr ""
 
@@ -30046,6 +30508,13 @@
 msgid "Give free item for every N quantity"
 msgstr ""
 
+#. Description of the 'Recurse Every (As Per Transaction UOM)' (Float) field in
+#. DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Give free item for every N quantity"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/global_defaults/global_defaults.json
 msgid "Global Defaults"
@@ -30062,7 +30531,7 @@
 msgid "Go back"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:113
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:97
 msgid "Go to {0} List"
 msgstr ""
 
@@ -30101,16 +30570,16 @@
 msgid "Goods"
 msgstr ""
 
-#: setup/doctype/company/company.py:263
-#: stock/doctype/stock_entry/stock_entry_list.js:14
+#: setup/doctype/company/company.py:262
+#: stock/doctype/stock_entry/stock_entry_list.js:21
 msgid "Goods In Transit"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry_list.js:17
+#: stock/doctype/stock_entry/stock_entry_list.js:23
 msgid "Goods Transferred"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1618
+#: stock/doctype/stock_entry/stock_entry.py:1627
 msgid "Goods are already received against the outward entry {0}"
 msgstr ""
 
@@ -30134,7 +30603,12 @@
 #: accounts/report/pos_register/pos_register.py:207
 #: 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:253
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:251
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:154
+#: selling/page/point_of_sale/pos_payment.js:590
 #: templates/includes/order/order_taxes.html:105 templates/pages/rfq.html:58
 msgid "Grand Total"
 msgstr ""
@@ -30356,7 +30830,7 @@
 msgid "Grant Commission"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:654
+#: accounts/doctype/payment_entry/payment_entry.js:802
 msgid "Greater Than Amount"
 msgstr ""
 
@@ -30465,11 +30939,11 @@
 msgid "Gross Purchase Amount"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:317
+#: assets/doctype/asset/asset.py:319
 msgid "Gross Purchase Amount is mandatory"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:362
+#: assets/doctype/asset/asset.py:364
 msgid "Gross Purchase Amount should be <b>equal</b> to purchase amount of one single Asset."
 msgstr ""
 
@@ -30498,11 +30972,11 @@
 #: accounts/report/gross_profit/gross_profit.js:36
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:52
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:58
-#: assets/report/fixed_asset_register/fixed_asset_register.js:36
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
+#: assets/report/fixed_asset_register/fixed_asset_register.js:35
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:41
 #: public/js/purchase_trends_filters.js:61 public/js/sales_trends_filters.js:37
 #: selling/report/lost_quotations/lost_quotations.js:33
-#: stock/report/total_stock_summary/total_stock_summary.js:9
+#: stock/report/total_stock_summary/total_stock_summary.js:8
 msgid "Group By"
 msgstr ""
 
@@ -30512,15 +30986,15 @@
 msgid "Group By"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:151
+#: accounts/report/accounts_receivable/accounts_receivable.js:154
 msgid "Group By Customer"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:129
+#: accounts/report/accounts_payable/accounts_payable.js:132
 msgid "Group By Supplier"
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person_tree.js:9
+#: setup/doctype/sales_person/sales_person_tree.js:14
 msgid "Group Node"
 msgstr ""
 
@@ -30530,12 +31004,12 @@
 msgid "Group Same Items"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:112
+#: stock/doctype/stock_settings/stock_settings.py:115
 msgid "Group Warehouses cannot be used in transactions. Please change the value of {0}"
 msgstr ""
 
 #: accounts/report/general_ledger/general_ledger.js:115
-#: accounts/report/pos_register/pos_register.js:57
+#: accounts/report/pos_register/pos_register.js:56
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:78
 msgid "Group by"
 msgstr ""
@@ -30544,34 +31018,34 @@
 msgid "Group by Account"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:82
 msgid "Group by Item"
 msgstr ""
 
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:62
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:61
 msgid "Group by Material Request"
 msgstr ""
 
 #: accounts/report/general_ledger/general_ledger.js:132
-#: accounts/report/payment_ledger/payment_ledger.js:83
+#: accounts/report/payment_ledger/payment_ledger.js:82
 msgid "Group by Party"
 msgstr ""
 
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:71
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:70
 msgid "Group by Purchase Order"
 msgstr ""
 
-#: selling/report/sales_order_analysis/sales_order_analysis.js:73
+#: selling/report/sales_order_analysis/sales_order_analysis.js:72
 msgid "Group by Sales Order"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:80
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:81
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:84
 msgid "Group by Supplier"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:159
-#: accounts/report/accounts_receivable/accounts_receivable.js:191
+#: accounts/report/accounts_payable/accounts_payable.js:162
+#: accounts/report/accounts_receivable/accounts_receivable.js:194
 #: accounts/report/general_ledger/general_ledger.js:120
 msgid "Group by Voucher"
 msgstr ""
@@ -30594,7 +31068,7 @@
 msgid "Group by Voucher (Consolidated)"
 msgstr ""
 
-#: stock/utils.py:448
+#: stock/utils.py:443
 msgid "Group node warehouse is not allowed to select for transactions"
 msgstr ""
 
@@ -30656,8 +31130,8 @@
 msgid "Groups"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:18
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:18
+#: accounts/report/balance_sheet/balance_sheet.js:14
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
 msgid "Growth View"
 msgstr ""
 
@@ -30703,14 +31177,14 @@
 msgid "Half Yearly"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:66
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:69
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
-#: public/js/financial_statements.js:219
+#: accounts/report/budget_variance_report/budget_variance_report.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
+#: public/js/financial_statements.js:228
 #: public/js/purchase_trends_filters.js:21 public/js/sales_trends_filters.js:13
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
 msgid "Half-Yearly"
 msgstr ""
 
@@ -30869,6 +31343,11 @@
 msgid "Have Default Naming Series for Batch ID?"
 msgstr ""
 
+#. Description of a DocType
+#: accounts/doctype/account/account.json
+msgid "Heads (or groups) against which Accounting Entries are made and balances are maintained."
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -30893,7 +31372,7 @@
 msgid "Height (cm)"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:412
+#: assets/doctype/asset/depreciation.py:410
 msgid "Hello,"
 msgstr ""
 
@@ -30927,11 +31406,16 @@
 msgid "Help Text"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:419
+#. Description of a DocType
+#: accounts/doctype/monthly_distribution/monthly_distribution.json
+msgid "Helps you distribute the Budget/Target across months if you have seasonality in your business."
+msgstr ""
+
+#: assets/doctype/asset/depreciation.py:417
 msgid "Here are the error logs for the aforementioned failed depreciation entries: {0}"
 msgstr ""
 
-#: stock/stock_ledger.py:1669
+#: stock/stock_ledger.py:1689
 msgid "Here are the options to proceed:"
 msgstr ""
 
@@ -30948,15 +31432,15 @@
 msgid "Here you can maintain height, weight, allergies, medical concerns etc"
 msgstr ""
 
-#: setup/doctype/employee/employee.js:122
+#: setup/doctype/employee/employee.js:129
 msgid "Here, you can select a senior of this Employee. Based on this, Organization Chart will be populated."
 msgstr ""
 
-#: setup/doctype/holiday_list/holiday_list.js:75
+#: setup/doctype/holiday_list/holiday_list.js:77
 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:391
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:406
 msgid "Hi,"
 msgstr ""
 
@@ -31018,12 +31502,12 @@
 msgid "History In Company"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: selling/doctype/sales_order/sales_order.js:539
+#: buying/doctype/purchase_order/purchase_order.js:315
+#: selling/doctype/sales_order/sales_order.js:582
 msgid "Hold"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:112
 msgid "Hold Invoice"
 msgstr ""
 
@@ -31129,6 +31613,13 @@
 msgstr ""
 
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:31
+#: templates/pages/timelog_info.html:37
+msgid "Hours"
+msgstr ""
+
+#. Label of a Float field in DocType 'Workstation Working Hour'
+#: manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
+msgctxt "Workstation Working Hour"
 msgid "Hours"
 msgstr ""
 
@@ -31167,7 +31658,7 @@
 msgid "Hrs"
 msgstr ""
 
-#: setup/doctype/company/company.py:365
+#: setup/doctype/company/company.py:364
 msgid "Human Resources"
 msgstr ""
 
@@ -31205,8 +31696,8 @@
 msgid "IBAN"
 msgstr ""
 
-#: accounts/doctype/bank_account/bank_account.py:84
-#: accounts/doctype/bank_account/bank_account.py:87
+#: accounts/doctype/bank_account/bank_account.py:98
+#: accounts/doctype/bank_account/bank_account.py:101
 msgid "IBAN is not valid"
 msgstr ""
 
@@ -31281,6 +31772,12 @@
 msgid "Identifying Decision Makers"
 msgstr ""
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Idle"
+msgstr ""
+
 #. Description of the 'Book Deferred Entries Based On' (Select) field in
 #. DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31288,6 +31785,10 @@
 msgid "If \"Months\" is selected, a fixed amount will be booked as deferred revenue or expense for each month irrespective of the number of days in a month. It will be prorated if deferred revenue or expense is not booked for an entire month"
 msgstr ""
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If Auto Opt In is checked, then the customers will be automatically linked with the concerned Loyalty Program (on save)"
+msgstr ""
+
 #. Description of the 'Cost Center' (Link) field in DocType 'Journal Entry
 #. Account'
 #: accounts/doctype/journal_entry_account/journal_entry_account.json
@@ -31295,7 +31796,7 @@
 msgid "If Income or Expense"
 msgstr ""
 
-#: manufacturing/doctype/operation/operation.js:30
+#: manufacturing/doctype/operation/operation.js:32
 msgid "If an operation is divided into sub operations, they can be added here."
 msgstr ""
 
@@ -31352,7 +31853,7 @@
 msgid "If checked, the tax amount will be considered as already included in the Print Rate / Print Amount"
 msgstr ""
 
-#: public/js/setup_wizard.js:48
+#: public/js/setup_wizard.js:50
 msgid "If checked, we will create demo data for you to explore the system. This demo data can be erased later."
 msgstr ""
 
@@ -31398,6 +31899,15 @@
 msgid "If enabled, all files attached to this document will be attached to each email"
 msgstr ""
 
+#. Description of the 'Do Not Update Serial / Batch on Creation of Auto Bundle'
+#. (Check) field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid ""
+"If enabled, do not update serial / batch values in the stock transactions on creation of auto Serial \n"
+" / Batch Bundle. "
+msgstr ""
+
 #. Description of the 'Create Ledger Entries for Change Amount' (Check) field
 #. in DocType 'Accounts Settings'
 #: accounts/doctype/accounts_settings/accounts_settings.json
@@ -31438,7 +31948,7 @@
 msgid "If more than one package of the same type (for print)"
 msgstr ""
 
-#: stock/stock_ledger.py:1679
+#: stock/stock_ledger.py:1699
 msgid "If not, you can Cancel / Submit this entry"
 msgstr ""
 
@@ -31456,7 +31966,7 @@
 msgid "If subcontracted to a vendor"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:842
+#: manufacturing/doctype/work_order/work_order.js:911
 msgid "If the BOM results in Scrap material, the Scrap Warehouse needs to be selected."
 msgstr ""
 
@@ -31466,11 +31976,11 @@
 msgid "If the account is frozen, entries are allowed to restricted users."
 msgstr ""
 
-#: stock/stock_ledger.py:1672
+#: stock/stock_ledger.py:1692
 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 ""
 
-#: manufacturing/doctype/work_order/work_order.js:857
+#: manufacturing/doctype/work_order/work_order.js:930
 msgid "If the selected BOM has Operations mentioned in it, the system will fetch all Operations from BOM, these values can be changed."
 msgstr ""
 
@@ -31516,7 +32026,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:638
+#: accounts/doctype/payment_entry/payment_entry.py:647
 msgid "If this is undesirable please cancel the corresponding Payment Entry."
 msgstr ""
 
@@ -31526,23 +32036,34 @@
 msgid "If this item has variants, then it cannot be selected in sales orders etc."
 msgstr ""
 
-#: buying/doctype/buying_settings/buying_settings.js:24
+#: buying/doctype/buying_settings/buying_settings.js:27
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice or Receipt without creating a Purchase Order first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Order' checkbox in the Supplier master."
 msgstr ""
 
-#: buying/doctype/buying_settings/buying_settings.js:29
+#: buying/doctype/buying_settings/buying_settings.js:34
 msgid "If this option is configured 'Yes', ERPNext will prevent you from creating a Purchase Invoice without creating a Purchase Receipt first. This configuration can be overridden for a particular supplier by enabling the 'Allow Purchase Invoice Creation Without Purchase Receipt' checkbox in the Supplier master."
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:11
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:10
 msgid "If ticked, multiple materials can be used for a single Work Order. This is useful if one or more time consuming products are being manufactured."
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:36
 msgid "If ticked, the BOM cost will be automatically updated based on Valuation Rate / Price List Rate / last purchase rate of raw materials."
 msgstr ""
 
-#: stock/doctype/item/item.js:814
+#: accounts/doctype/loyalty_program/loyalty_program.js:14
+msgid "If unlimited expiry for the Loyalty Points, keep the Expiry Duration empty or 0."
+msgstr ""
+
+#. Description of the 'Is Rejected Warehouse' (Check) field in DocType
+#. 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "If yes, then this warehouse will be used to store rejected materials"
+msgstr ""
+
+#: stock/doctype/item/item.js:894
 msgid "If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item."
 msgstr ""
 
@@ -31553,7 +32074,11 @@
 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:1605
+#: manufacturing/doctype/production_plan/production_plan.py:920
+msgid "If you still want to proceed, please disable 'Skip Available Sub Assembly Items' checkbox."
+msgstr ""
+
+#: manufacturing/doctype/production_plan/production_plan.py:1625
 msgid "If you still want to proceed, please enable {0}."
 msgstr ""
 
@@ -31620,17 +32145,21 @@
 msgid "Ignore Empty Stock"
 msgstr ""
 
+#: accounts/report/general_ledger/general_ledger.js:209
+msgid "Ignore Exchange Rate Revaluation Journals"
+msgstr ""
+
 #. Label of a Check field in DocType 'Process Statement Of Accounts'
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.json
 msgctxt "Process Statement Of Accounts"
 msgid "Ignore Exchange Rate Revaluation Journals"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:800
+#: selling/doctype/sales_order/sales_order.js:916
 msgid "Ignore Existing Ordered Qty"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1597
+#: manufacturing/doctype/production_plan/production_plan.py:1617
 msgid "Ignore Existing Projected Quantity"
 msgstr ""
 
@@ -31694,7 +32223,7 @@
 msgid "Ignore Pricing Rule"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:187
+#: selling/page/point_of_sale/pos_payment.js:188
 msgid "Ignore Pricing Rule is enabled. Cannot apply coupon code."
 msgstr ""
 
@@ -32017,10 +32546,15 @@
 msgid "Image View"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:118
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:132
 msgid "Import"
 msgstr ""
 
+#. Description of a DocType
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.json
+msgid "Import Chart of Accounts from a csv file"
+msgstr ""
+
 #. Label of a Link in the Home Workspace
 #. Label of a Link in the Settings Workspace
 #: setup/workspace/home/home.json setup/workspace/settings/settings.json
@@ -32033,7 +32567,7 @@
 msgid "Import Data from Spreadsheet"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:66
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:71
 msgid "Import Day Book Data"
 msgstr ""
 
@@ -32073,7 +32607,7 @@
 msgid "Import Log Preview"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:54
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:59
 msgid "Import Master Data"
 msgstr ""
 
@@ -32083,11 +32617,11 @@
 msgid "Import Preview"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:61
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
 msgid "Import Progress"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:130
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:144
 msgid "Import Successful"
 msgstr ""
 
@@ -32108,8 +32642,8 @@
 msgid "Import Type"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:197
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:77
+#: public/js/utils/serial_no_batch_selector.js:200
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:80
 msgid "Import Using CSV file"
 msgstr ""
 
@@ -32125,7 +32659,7 @@
 msgid "Import from Google Sheets"
 msgstr ""
 
-#: stock/doctype/item_price/item_price.js:27
+#: stock/doctype/item_price/item_price.js:29
 msgid "Import in Bulk"
 msgstr ""
 
@@ -32137,7 +32671,7 @@
 msgid "Importing Parties and Addresses"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:47
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:45
 msgid "Importing {0} of {1}, {2}"
 msgstr ""
 
@@ -32148,7 +32682,7 @@
 msgid "In House"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:20
+#: assets/doctype/asset/asset_list.js:15
 msgid "In Maintenance"
 msgstr ""
 
@@ -32176,8 +32710,8 @@
 msgid "In Minutes"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:149
-#: accounts/report/accounts_receivable/accounts_receivable.js:181
+#: accounts/report/accounts_payable/accounts_payable.js:152
+#: accounts/report/accounts_receivable/accounts_receivable.js:184
 msgid "In Party Currency"
 msgstr ""
 
@@ -32224,10 +32758,10 @@
 msgid "In Production"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:65
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:52
 #: accounts/doctype/ledger_merge/ledger_merge.js:19
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:36
-#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:60
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:40
+#: erpnext_integrations/doctype/quickbooks_migrator/quickbooks_migrator.js:66
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:7
 msgid "In Progress"
 msgstr ""
@@ -32288,11 +32822,17 @@
 msgstr ""
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:80
-#: stock/report/stock_balance/stock_balance.py:433
-#: stock/report/stock_ledger/stock_ledger.py:139
+#: stock/report/stock_balance/stock_balance.py:441
+#: stock/report/stock_ledger/stock_ledger.py:212
 msgid "In Qty"
 msgstr ""
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "In Stock"
+msgstr ""
+
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:12
+#: manufacturing/report/bom_stock_report/bom_stock_report.html:22
 #: manufacturing/report/bom_stock_report/bom_stock_report.py:30
 msgid "In Stock Qty"
 msgstr ""
@@ -32314,15 +32854,15 @@
 msgid "In Transit"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:375
+#: stock/doctype/material_request/material_request.js:445
 msgid "In Transit Transfer"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:344
+#: stock/doctype/material_request/material_request.js:414
 msgid "In Transit Warehouse"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:439
+#: stock/report/stock_balance/stock_balance.py:447
 msgid "In Value"
 msgstr ""
 
@@ -32507,7 +33047,7 @@
 msgid "In minutes"
 msgstr ""
 
-#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:7
+#: crm/doctype/appointment_booking_settings/appointment_booking_settings.js:8
 msgid "In row {0} of Appointment Booking Slots: \"To Time\" must be later than \"From Time\"."
 msgstr ""
 
@@ -32522,7 +33062,11 @@
 msgid "In the case of 'Use Multi-Level BOM' in a work order, if the user wishes to add sub-assembly costs to Finished Goods items without using a job card as well the scrap items, then this option needs to be enable."
 msgstr ""
 
-#: stock/doctype/item/item.js:839
+#: accounts/doctype/loyalty_program/loyalty_program.js:12
+msgid "In the case of multi-tier program, Customers will be auto assigned to the concerned tier as per their spent"
+msgstr ""
+
+#: stock/doctype/item/item.js:927
 msgid "In this section, you can define Company-wide transaction-related defaults for this Item. Eg. Default Warehouse, Default Price List, Supplier, etc."
 msgstr ""
 
@@ -32558,6 +33102,12 @@
 msgid "Inactive Sales Items"
 msgstr ""
 
+#. Label of a Attach Image field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Inactive Status"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:93
 msgid "Incentives"
 msgstr ""
@@ -32568,7 +33118,7 @@
 msgid "Incentives"
 msgstr ""
 
-#: accounts/report/payment_ledger/payment_ledger.js:77
+#: accounts/report/payment_ledger/payment_ledger.js:76
 msgid "Include Account Currency"
 msgstr ""
 
@@ -32579,27 +33129,27 @@
 msgstr ""
 
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:54
-#: assets/report/fixed_asset_register/fixed_asset_register.js:55
+#: assets/report/fixed_asset_register/fixed_asset_register.js:54
 msgid "Include Default FB Assets"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:34
-#: accounts/report/cash_flow/cash_flow.js:20
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:107
+#: accounts/report/balance_sheet/balance_sheet.js:29
+#: 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/trial_balance/trial_balance.js:98
+#: accounts/report/trial_balance/trial_balance.js:104
 msgid "Include Default FB Entries"
 msgstr ""
 
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:60
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:55
 msgid "Include Disabled"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:85
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:88
 msgid "Include Expired"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:798
+#: selling/doctype/sales_order/sales_order.js:912
 msgid "Include Exploded Items"
 msgstr ""
 
@@ -32669,7 +33219,7 @@
 msgid "Include Non Stock Items"
 msgstr ""
 
-#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:44
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.js:45
 msgid "Include POS Transactions"
 msgstr ""
 
@@ -32703,7 +33253,7 @@
 msgid "Include Safety Stock in Required Qty Calculation"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:88
+#: manufacturing/report/production_planning_report/production_planning_report.js:87
 msgid "Include Sub-assembly Raw Materials"
 msgstr ""
 
@@ -32713,12 +33263,12 @@
 msgid "Include Subcontracted Items"
 msgstr ""
 
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:57
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
 msgid "Include Timesheets in Draft Status"
 msgstr ""
 
 #: stock/report/stock_balance/stock_balance.js:84
-#: stock/report/stock_ledger/stock_ledger.js:82
+#: stock/report/stock_ledger/stock_ledger.js:90
 #: stock/report/stock_projected_qty/stock_projected_qty.js:51
 msgid "Include UOM"
 msgstr ""
@@ -32749,10 +33299,10 @@
 
 #: 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:28
+#: accounts/report/account_balance/account_balance.js:27
 #: accounts/report/profit_and_loss_statement/profit_and_loss_statement.py:172
 #: accounts/report/profitability_analysis/profitability_analysis.py:182
-#: public/js/financial_statements.js:35
+#: public/js/financial_statements.js:36
 msgid "Income"
 msgstr ""
 
@@ -32775,7 +33325,7 @@
 msgid "Income"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:51
+#: 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
 msgid "Income Account"
@@ -32848,7 +33398,7 @@
 msgstr ""
 
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:163
-#: stock/report/stock_ledger/stock_ledger.py:189
+#: 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
 msgid "Incoming Rate"
@@ -32872,12 +33422,6 @@
 msgid "Incoming Rate"
 msgstr ""
 
-#. Label of a Float field in DocType 'Serial and Batch Entry'
-#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
-msgctxt "Serial and Batch Entry"
-msgid "Incoming Rate"
-msgstr ""
-
 #. Label of a Currency field in DocType 'Stock Ledger Entry'
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
 msgctxt "Stock Ledger Entry"
@@ -32899,16 +33443,16 @@
 msgid "Incorrect Balance Qty After Transaction"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:710
+#: controllers/subcontracting_controller.py:714
 msgid "Incorrect Batch Consumed"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:278
+#: assets/doctype/asset/asset.py:280
 #: assets/doctype/asset_value_adjustment/asset_value_adjustment.py:74
 msgid "Incorrect Date"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:99
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:120
 msgid "Incorrect Invoice"
 msgstr ""
 
@@ -32921,12 +33465,16 @@
 msgid "Incorrect Payment Type"
 msgstr ""
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+msgid "Incorrect Reference Document (Purchase Receipt Item)"
+msgstr ""
+
 #. Name of a report
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.json
 msgid "Incorrect Serial No Valuation"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:723
+#: controllers/subcontracting_controller.py:727
 msgid "Incorrect Serial Number Consumed"
 msgstr ""
 
@@ -32935,15 +33483,15 @@
 msgid "Incorrect Stock Value Report"
 msgstr ""
 
-#: stock/serial_batch_bundle.py:95
+#: stock/serial_batch_bundle.py:96
 msgid "Incorrect Type of Transaction"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:115
+#: stock/doctype/stock_settings/stock_settings.py:118
 msgid "Incorrect Warehouse"
 msgstr ""
 
-#: accounts/general_ledger.py:47
+#: accounts/general_ledger.py:51
 msgid "Incorrect number of General Ledger Entries found. You might have selected a wrong Account in the transaction."
 msgstr ""
 
@@ -33094,11 +33642,11 @@
 msgid "Individual"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:336
+#: accounts/doctype/gl_entry/gl_entry.py:290
 msgid "Individual GL Entry cannot be cancelled."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:326
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:337
 msgid "Individual Stock Ledger Entry cannot be cancelled."
 msgstr ""
 
@@ -33143,7 +33691,13 @@
 msgid "Initial Email Notification Sent"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request_list.js:11
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Initialize Summary Table"
+msgstr ""
+
+#: accounts/doctype/payment_request/payment_request_list.js:10
 msgid "Initiated"
 msgstr ""
 
@@ -33174,7 +33728,7 @@
 msgid "Insert New Records"
 msgstr ""
 
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:34
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:33
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:109
 msgid "Inspected By"
 msgstr ""
@@ -33185,11 +33739,11 @@
 msgid "Inspected By"
 msgstr ""
 
-#: controllers/stock_controller.py:666
+#: controllers/stock_controller.py:849
 msgid "Inspection Rejected"
 msgstr ""
 
-#: controllers/stock_controller.py:636 controllers/stock_controller.py:638
+#: controllers/stock_controller.py:819 controllers/stock_controller.py:821
 msgid "Inspection Required"
 msgstr ""
 
@@ -33211,7 +33765,7 @@
 msgid "Inspection Required before Purchase"
 msgstr ""
 
-#: controllers/stock_controller.py:653
+#: controllers/stock_controller.py:836
 msgid "Inspection Submission"
 msgstr ""
 
@@ -33233,7 +33787,7 @@
 
 #. Name of a DocType
 #: selling/doctype/installation_note/installation_note.json
-#: stock/doctype/delivery_note/delivery_note.js:171
+#: stock/doctype/delivery_note/delivery_note.js:191
 msgid "Installation Note"
 msgstr ""
 
@@ -33250,7 +33804,7 @@
 msgid "Installation Note Item"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:688
+#: stock/doctype/delivery_note/delivery_note.py:749
 msgid "Installation Note {0} has already been submitted"
 msgstr ""
 
@@ -33315,19 +33869,19 @@
 msgid "Insufficient Capacity"
 msgstr ""
 
-#: controllers/accounts_controller.py:3130
-#: controllers/accounts_controller.py:3154
+#: controllers/accounts_controller.py:3221
+#: controllers/accounts_controller.py:3245
 msgid "Insufficient Permissions"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:705
-#: stock/doctype/stock_entry/stock_entry.py:776
-#: stock/serial_batch_bundle.py:880 stock/stock_ledger.py:1369
-#: stock/stock_ledger.py:1840
+#: stock/doctype/pick_list/pick_list.py:776
+#: stock/doctype/stock_entry/stock_entry.py:731
+#: stock/serial_batch_bundle.py:899 stock/stock_ledger.py:1395
+#: stock/stock_ledger.py:1847
 msgid "Insufficient Stock"
 msgstr ""
 
-#: stock/stock_ledger.py:1855
+#: stock/stock_ledger.py:1862
 msgid "Insufficient Stock for Batch"
 msgstr ""
 
@@ -33468,11 +34022,11 @@
 msgid "Interest"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:2339
+#: accounts/doctype/payment_entry/payment_entry.py:2364
 msgid "Interest and/or dunning fee"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:40
+#: crm/report/lead_details/lead_details.js:39
 msgid "Interested"
 msgstr ""
 
@@ -33496,11 +34050,11 @@
 msgid "Internal Customer for company {0} already exists"
 msgstr ""
 
-#: controllers/accounts_controller.py:533
+#: controllers/accounts_controller.py:577
 msgid "Internal Sale or Delivery Reference missing."
 msgstr ""
 
-#: controllers/accounts_controller.py:535
+#: controllers/accounts_controller.py:579
 msgid "Internal Sales Reference Missing"
 msgstr ""
 
@@ -33549,7 +34103,7 @@
 msgid "Internal Transfer"
 msgstr ""
 
-#: controllers/accounts_controller.py:544
+#: controllers/accounts_controller.py:588
 msgid "Internal Transfer Reference Missing"
 msgstr ""
 
@@ -33563,7 +34117,7 @@
 msgid "Internal Work History"
 msgstr ""
 
-#: controllers/stock_controller.py:735
+#: controllers/stock_controller.py:918
 msgid "Internal transfers can only be done in company's default currency"
 msgstr ""
 
@@ -33598,14 +34152,14 @@
 msgid "Invalid"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:369
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:377
-#: accounts/doctype/sales_invoice/sales_invoice.py:876
-#: accounts/doctype/sales_invoice/sales_invoice.py:886
+#: 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:2531
-#: controllers/accounts_controller.py:2537
+#: controllers/accounts_controller.py:2616
+#: controllers/accounts_controller.py:2622
 msgid "Invalid Account"
 msgstr ""
 
@@ -33613,7 +34167,7 @@
 msgid "Invalid Attribute"
 msgstr ""
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 msgid "Invalid Auto Repeat Date"
 msgstr ""
 
@@ -33621,7 +34175,7 @@
 msgid "Invalid Barcode. There is no Item attached to this barcode."
 msgstr ""
 
-#: public/js/controllers/transaction.js:2360
+#: public/js/controllers/transaction.js:2413
 msgid "Invalid Blanket Order for the selected Customer and Item"
 msgstr ""
 
@@ -33629,12 +34183,12 @@
 msgid "Invalid Child Procedure"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1977
+#: accounts/doctype/sales_invoice/sales_invoice.py:1946
 msgid "Invalid Company for Inter Company Transaction."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:249 assets/doctype/asset/asset.py:256
-#: controllers/accounts_controller.py:2552
+#: assets/doctype/asset/asset.py:251 assets/doctype/asset/asset.py:258
+#: controllers/accounts_controller.py:2637
 msgid "Invalid Cost Center"
 msgstr ""
 
@@ -33642,11 +34196,11 @@
 msgid "Invalid Credentials"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:318
+#: selling/doctype/sales_order/sales_order.py:321
 msgid "Invalid Delivery Date"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:88
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
 msgid "Invalid Document"
 msgstr ""
 
@@ -33659,7 +34213,7 @@
 msgid "Invalid Formula"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:367
+#: assets/doctype/asset/asset.py:369
 msgid "Invalid Gross Purchase Amount"
 msgstr ""
 
@@ -33671,12 +34225,12 @@
 msgid "Invalid Item"
 msgstr ""
 
-#: stock/doctype/item/item.py:1371
+#: stock/doctype/item/item.py:1372
 msgid "Invalid Item Defaults"
 msgstr ""
 
 #: accounts/doctype/pos_closing_entry/pos_closing_entry.py:59
-#: accounts/general_ledger.py:677
+#: accounts/general_ledger.py:686
 msgid "Invalid Opening Entry"
 msgstr ""
 
@@ -33684,11 +34238,11 @@
 msgid "Invalid POS Invoices"
 msgstr ""
 
-#: accounts/doctype/account/account.py:320
+#: accounts/doctype/account/account.py:339
 msgid "Invalid Parent Account"
 msgstr ""
 
-#: public/js/controllers/buying.js:338
+#: public/js/controllers/buying.js:333
 msgid "Invalid Part Number"
 msgstr ""
 
@@ -33708,24 +34262,24 @@
 msgid "Invalid Process Loss Configuration"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:599
+#: accounts/doctype/payment_entry/payment_entry.py:608
 msgid "Invalid Purchase Invoice"
 msgstr ""
 
-#: controllers/accounts_controller.py:3169
+#: controllers/accounts_controller.py:3260
 msgid "Invalid Qty"
 msgstr ""
 
-#: controllers/accounts_controller.py:1021
+#: controllers/accounts_controller.py:1085
 msgid "Invalid Quantity"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:411 assets/doctype/asset/asset.py:417
-#: assets/doctype/asset/asset.py:444
+#: assets/doctype/asset/asset.py:413 assets/doctype/asset/asset.py:419
+#: assets/doctype/asset/asset.py:446
 msgid "Invalid Schedule"
 msgstr ""
 
-#: controllers/selling_controller.py:225
+#: controllers/selling_controller.py:226
 msgid "Invalid Selling Price"
 msgstr ""
 
@@ -33758,22 +34312,21 @@
 msgid "Invalid reference {0} {1}"
 msgstr ""
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:101
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:102
 msgid "Invalid result key. Response:"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:229
-#: accounts/doctype/gl_entry/gl_entry.py:239
 #: 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
 msgid "Invalid value {0} for {1} against account {2}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:569
+#: accounts/doctype/pricing_rule/utils.py:202 assets/doctype/asset/asset.js:642
 msgid "Invalid {0}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1975
+#: accounts/doctype/sales_invoice/sales_invoice.py:1944
 msgid "Invalid {0} for Inter Company Transaction."
 msgstr ""
 
@@ -33793,7 +34346,7 @@
 msgid "Inventory Dimension"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:147
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:157
 msgid "Inventory Dimension Negative Stock"
 msgstr ""
 
@@ -33851,7 +34404,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/invoice_discounting/invoice_discounting.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:144
+#: accounts/doctype/sales_invoice/sales_invoice.js:151
 msgid "Invoice Discounting"
 msgstr ""
 
@@ -33862,7 +34415,7 @@
 msgid "Invoice Discounting"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1065
+#: accounts/report/accounts_receivable/accounts_receivable.py:1073
 msgid "Invoice Grand Total"
 msgstr ""
 
@@ -33939,7 +34492,8 @@
 msgid "Invoice Status"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:77
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:7
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:85
 msgid "Invoice Type"
 msgstr ""
 
@@ -33974,7 +34528,7 @@
 msgid "Invoice Type"
 msgstr ""
 
-#: projects/doctype/timesheet/timesheet.py:376
+#: projects/doctype/timesheet/timesheet.py:386
 msgid "Invoice already created for all billing hours"
 msgstr ""
 
@@ -33984,12 +34538,13 @@
 msgid "Invoice and Billing"
 msgstr ""
 
-#: projects/doctype/timesheet/timesheet.py:373
+#: projects/doctype/timesheet/timesheet.py:383
 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.py:1067
+#: 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
 msgid "Invoiced Amount"
@@ -33999,7 +34554,7 @@
 msgid "Invoiced Qty"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2028
+#: accounts/doctype/sales_invoice/sales_invoice.py:1997
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:62
 msgid "Invoices"
 msgstr ""
@@ -34081,7 +34636,7 @@
 msgid "Is Account Payable"
 msgstr ""
 
-#: projects/report/project_summary/project_summary.js:17
+#: projects/report/project_summary/project_summary.js:16
 msgid "Is Active"
 msgstr ""
 
@@ -34140,7 +34695,7 @@
 msgid "Is Advance"
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:294
+#: selling/doctype/quotation/quotation.js:306
 msgid "Is Alternative"
 msgstr ""
 
@@ -34448,9 +35003,9 @@
 msgid "Is Fully Depreciated"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:110
-#: accounts/doctype/cost_center/cost_center_tree.js:23
-#: stock/doctype/warehouse/warehouse_tree.js:16
+#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/cost_center/cost_center_tree.js:30
+#: stock/doctype/warehouse/warehouse_tree.js:20
 msgid "Is Group"
 msgstr ""
 
@@ -34724,7 +35279,13 @@
 msgid "Is Rejected"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.js:64
+#. Label of a Check field in DocType 'Warehouse'
+#: stock/doctype/warehouse/warehouse.json
+msgctxt "Warehouse"
+msgid "Is Rejected Warehouse"
+msgstr ""
+
+#: accounts/report/pos_register/pos_register.js:63
 #: accounts/report/pos_register/pos_register.py:226
 msgid "Is Return"
 msgstr ""
@@ -34874,7 +35435,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: assets/doctype/asset/asset_list.js:26 public/js/communication.js:12
+#: assets/doctype/asset/asset_list.js:19 public/js/communication.js:13
 #: support/doctype/issue/issue.json
 msgid "Issue"
 msgstr ""
@@ -34939,15 +35500,15 @@
 msgid "Issue Date"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:127
+#: stock/doctype/material_request/material_request.js:138
 msgid "Issue Material"
 msgstr ""
 
 #. Name of a DocType
 #: support/doctype/issue_priority/issue_priority.json
-#: support/report/issue_analytics/issue_analytics.js:64
+#: support/report/issue_analytics/issue_analytics.js:63
 #: support/report/issue_analytics/issue_analytics.py:64
-#: support/report/issue_summary/issue_summary.js:52
+#: support/report/issue_summary/issue_summary.js:51
 #: support/report/issue_summary/issue_summary.py:61
 msgid "Issue Priority"
 msgstr ""
@@ -34995,7 +35556,7 @@
 msgid "Issue a debit note with 0 qty against an existing Sales Invoice"
 msgstr ""
 
-#: stock/doctype/material_request/material_request_list.js:29
+#: stock/doctype/material_request/material_request_list.js:33
 msgid "Issued"
 msgstr ""
 
@@ -35047,70 +35608,79 @@
 msgid "It can take upto few hours for accurate stock values to be visible after merging items."
 msgstr ""
 
-#: public/js/controllers/transaction.js:1839
+#: public/js/controllers/transaction.js:1882
 msgid "It is needed to fetch Item Details."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:135
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:156
 msgid "It's not possible to distribute charges equally when total amount is zero, please set 'Distribute Charges Based On' as 'Quantity'"
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:16
+#: accounts/report/inactive_sales_items/inactive_sales_items.js:15
 #: accounts/report/inactive_sales_items/inactive_sales_items.py:32
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:22
 #: buying/report/procurement_tracker/procurement_tracker.py:60
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:50
+#: 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:1018
+#: controllers/taxes_and_totals.py:1019
+#: 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_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:67
-#: manufacturing/report/process_loss_report/process_loss_report.js:16
+#: 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
-#: public/js/bom_configurator/bom_configurator.bundle.js:202
-#: public/js/bom_configurator/bom_configurator.bundle.js:270
+#: 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
 #: public/js/purchase_trends_filters.js:48
-#: public/js/purchase_trends_filters.js:65 public/js/sales_trends_filters.js:23
-#: public/js/sales_trends_filters.js:41 public/js/stock_analytics.js:61
-#: selling/doctype/sales_order/sales_order.js:977
-#: selling/report/customer_wise_item_price/customer_wise_item_price.js:15
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:37
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:63
-#: stock/dashboard/item_dashboard.js:208 stock/doctype/item/item.json
+#: public/js/purchase_trends_filters.js:63 public/js/sales_trends_filters.js:23
+#: public/js/sales_trends_filters.js:39 public/js/stock_analytics.js:92
+#: selling/doctype/sales_order/sales_order.js:1139
+#: selling/page/point_of_sale/pos_item_cart.js:46
+#: selling/report/customer_wise_item_price/customer_wise_item_price.js:14
+#: 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/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
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:24
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.py:32
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:74
-#: stock/report/item_price_stock/item_price_stock.js:9
+#: stock/report/item_price_stock/item_price_stock.js:8
 #: 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:11
+#: stock/report/item_variant_details/item_variant_details.js:10
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py:55
 #: 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:33
+#: stock/report/reserved_stock/reserved_stock.js:30
 #: stock/report/reserved_stock/reserved_stock.py:103
 #: 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:16
+#: stock/report/stock_analytics/stock_analytics.js:15
 #: stock/report/stock_analytics/stock_analytics.py:30
 #: stock/report/stock_balance/stock_balance.js:39
-#: stock/report/stock_balance/stock_balance.py:361
+#: stock/report/stock_balance/stock_balance.py:369
 #: stock/report/stock_ledger/stock_ledger.js:42
-#: stock/report/stock_ledger/stock_ledger.py:109
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:32
+#: 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 templates/generators/bom.html:19
-#: templates/pages/material_request_info.html:42 templates/pages/order.html:83
+#: templates/emails/reorder_item.html:8
+#: templates/form_grid/material_request_grid.html:6
+#: templates/form_grid/stock_entry_grid.html:8 templates/generators/bom.html:19
+#: templates/pages/material_request_info.html:42 templates/pages/order.html:95
 msgid "Item"
 msgstr ""
 
@@ -35304,6 +35874,10 @@
 msgid "Item Barcode"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:46
+msgid "Item Cart"
+msgstr ""
+
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:69
 #: accounts/report/delivered_items_to_be_billed/delivered_items_to_be_billed.py:36
 #: accounts/report/gross_profit/gross_profit.py:224
@@ -35313,40 +35887,41 @@
 #: 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/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:9
+#: 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/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:76
+#: 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/quality_inspection_summary/quality_inspection_summary.js:28
+#: 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:187
-#: public/js/controllers/transaction.js:2112 public/js/utils.js:459
-#: public/js/utils.js:606 selling/doctype/quotation/quotation.js:268
-#: selling/doctype/sales_order/sales_order.js:291
-#: selling/doctype/sales_order/sales_order.js:392
-#: selling/doctype/sales_order/sales_order.js:682
-#: selling/doctype/sales_order/sales_order.js:806
+#: 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
+#: selling/doctype/sales_order/sales_order.js:318
+#: selling/doctype/sales_order/sales_order.js:422
+#: selling/doctype/sales_order/sales_order.js:784
+#: selling/doctype/sales_order/sales_order.js:926
 #: selling/report/customer_wise_item_price/customer_wise_item_price.py:29
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:27
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:19
 #: selling/report/sales_order_analysis/sales_order_analysis.py:241
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:47
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:86
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:16
+#: 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:8
+#: 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/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:8
+#: stock/report/serial_no_ledger/serial_no_ledger.js:7
 #: stock/report/stock_ageing/stock_ageing.py:119
 #: 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
@@ -35738,7 +36313,7 @@
 msgid "Item Code"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:61
+#: manufacturing/doctype/bom_creator/bom_creator.js:60
 msgid "Item Code (Final Product)"
 msgstr ""
 
@@ -35746,12 +36321,12 @@
 msgid "Item Code cannot be changed for Serial No."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:444
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:448
 msgid "Item Code required at Row No {0}"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:672
-#: selling/page/point_of_sale/pos_item_details.js:251
+#: selling/page/point_of_sale/pos_controller.js:704
+#: selling/page/point_of_sale/pos_item_details.js:262
 msgid "Item Code: {0} is not available under warehouse {1}."
 msgstr ""
 
@@ -35819,6 +36394,10 @@
 msgid "Item Description"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_details.js:28
+msgid "Item Details"
+msgstr ""
+
 #. Label of a Section Break field in DocType 'Production Plan Sub Assembly
 #. Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -35827,9 +36406,9 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:43
+#: accounts/report/gross_profit/gross_profit.js:44
 #: accounts/report/gross_profit/gross_profit.py:237
-#: accounts/report/inactive_sales_items/inactive_sales_items.js:22
+#: 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
@@ -35837,36 +36416,38 @@
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.py:181
 #: accounts/report/purchase_register/purchase_register.js:58
 #: accounts/report/sales_register/sales_register.js:70
+#: manufacturing/doctype/plant_floor/plant_floor.js:100
+#: manufacturing/doctype/workstation/workstation_job_card.html:94
 #: public/js/purchase_trends_filters.js:49 public/js/sales_trends_filters.js:24
-#: selling/page/point_of_sale/pos_item_selector.js:159
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:31
+#: selling/page/point_of_sale/pos_item_selector.js:156
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:30
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:35
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:55
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:54
 #: selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py:89
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:42
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:41
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:54
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:41
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:93
+#: 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/delayed_item_report/delayed_item_report.js:49
-#: stock/report/delayed_order_report/delayed_order_report.js:49
+#: 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/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_analytics/stock_analytics.js:9
+#: stock/report/stock_analytics/stock_analytics.js:8
 #: stock/report/stock_analytics/stock_analytics.py:39
 #: stock/report/stock_balance/stock_balance.js:32
-#: stock/report/stock_balance/stock_balance.py:369
+#: stock/report/stock_balance/stock_balance.py:377
 #: stock/report/stock_ledger/stock_ledger.js:53
-#: stock/report/stock_ledger/stock_ledger.py:174
+#: stock/report/stock_ledger/stock_ledger.py:247
 #: stock/report/stock_projected_qty/stock_projected_qty.js:39
 #: stock/report/stock_projected_qty/stock_projected_qty.py:108
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:25
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:24
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:94
 msgid "Item Group"
 msgstr ""
@@ -36086,7 +36667,7 @@
 msgid "Item Group Name"
 msgstr ""
 
-#: setup/doctype/item_group/item_group.js:65
+#: setup/doctype/item_group/item_group.js:82
 msgid "Item Group Tree"
 msgstr ""
 
@@ -36152,7 +36733,8 @@
 #: 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
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:95
+#: 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
@@ -36161,7 +36743,7 @@
 #: manufacturing/report/production_planning_report/production_planning_report.py:356
 #: 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:2118
+#: public/js/controllers/transaction.js:2161
 #: 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
@@ -36175,8 +36757,8 @@
 #: 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:367
-#: stock/report/stock_ledger/stock_ledger.py:115
+#: stock/report/stock_balance/stock_balance.py:375
+#: 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
@@ -36559,15 +37141,15 @@
 msgid "Item Price Stock"
 msgstr ""
 
-#: stock/get_item_details.py:878
+#: stock/get_item_details.py:889
 msgid "Item Price added for {0} in Price List {1}"
 msgstr ""
 
-#: stock/doctype/item_price/item_price.py:142
+#: stock/doctype/item_price/item_price.py:136
 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:862
+#: stock/get_item_details.py:873
 msgid "Item Price updated for {0} in Price List {1}"
 msgstr ""
 
@@ -36611,7 +37193,7 @@
 msgid "Item Reorder"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:109
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:130
 msgid "Item Row {0}: {1} {2} does not exist in above '{1}' table"
 msgstr ""
 
@@ -36825,7 +37407,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/item/item.js:94
+#: stock/doctype/item/item.js:114
 #: stock/doctype/item_variant_settings/item_variant_settings.json
 msgid "Item Variant Settings"
 msgstr ""
@@ -36836,7 +37418,7 @@
 msgid "Item Variant Settings"
 msgstr ""
 
-#: stock/doctype/item/item.js:667
+#: stock/doctype/item/item.js:744
 msgid "Item Variant {0} already exists with same attributes"
 msgstr ""
 
@@ -36931,7 +37513,7 @@
 msgid "Item and Warranty Details"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2325
+#: stock/doctype/stock_entry/stock_entry.py:2359
 msgid "Item for row {0} does not match Material Request"
 msgstr ""
 
@@ -36939,16 +37521,16 @@
 msgid "Item has variants."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_details.js:110
+#: selling/page/point_of_sale/pos_item_details.js:108
 msgid "Item is removed since no serial / batch no selected."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:105
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:126
 msgid "Item must be added using 'Get Items from Purchase Receipts' button"
 msgstr ""
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:42
-#: selling/doctype/sales_order/sales_order.js:984
+#: selling/doctype/sales_order/sales_order.js:1146
 msgid "Item name"
 msgstr ""
 
@@ -36958,11 +37540,11 @@
 msgid "Item operation"
 msgstr ""
 
-#: controllers/accounts_controller.py:3196
+#: controllers/accounts_controller.py:3287
 msgid "Item qty can not be updated as raw materials are already processed."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:857
+#: stock/doctype/stock_entry/stock_entry.py:813
 msgid "Item rate has been updated to zero as Allow Zero Valuation Rate is checked for item {0}"
 msgstr ""
 
@@ -36972,7 +37554,11 @@
 msgid "Item to be manufactured or repacked"
 msgstr ""
 
-#: stock/utils.py:564
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Item valuation rate is recalculated considering landed cost voucher amount"
+msgstr ""
+
+#: stock/utils.py:559
 msgid "Item valuation reposting in progress. Report might show incorrect item valuation."
 msgstr ""
 
@@ -36984,11 +37570,11 @@
 msgid "Item {0} cannot be added as a sub-assembly of itself"
 msgstr ""
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:146
+#: manufacturing/doctype/blanket_order/blanket_order.py:189
 msgid "Item {0} cannot be ordered more than {1} against Blanket Order {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:231 stock/doctype/item/item.py:603
+#: assets/doctype/asset/asset.py:233 stock/doctype/item/item.py:603
 msgid "Item {0} does not exist"
 msgstr ""
 
@@ -36996,7 +37582,7 @@
 msgid "Item {0} does not exist in the system or has expired"
 msgstr ""
 
-#: controllers/selling_controller.py:655
+#: controllers/selling_controller.py:679
 msgid "Item {0} entered multiple times."
 msgstr ""
 
@@ -37004,11 +37590,11 @@
 msgid "Item {0} has already been returned"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:233
+#: assets/doctype/asset/asset.py:235
 msgid "Item {0} has been disabled"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:645
+#: selling/doctype/sales_order/sales_order.py:651
 msgid "Item {0} has no Serial No. Only serialized items can have delivery based on Serial No"
 msgstr ""
 
@@ -37016,7 +37602,7 @@
 msgid "Item {0} has reached its end of life on {1}"
 msgstr ""
 
-#: stock/stock_ledger.py:111
+#: stock/stock_ledger.py:113
 msgid "Item {0} ignored since it is not a stock item"
 msgstr ""
 
@@ -37040,43 +37626,43 @@
 msgid "Item {0} is not a stock Item"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1538
+#: stock/doctype/stock_entry/stock_entry.py:1547
 msgid "Item {0} is not active or end of life has been reached"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:235
+#: assets/doctype/asset/asset.py:237
 msgid "Item {0} must be a Fixed Asset Item"
 msgstr ""
 
-#: stock/get_item_details.py:228
+#: stock/get_item_details.py:233
 msgid "Item {0} must be a Non-Stock Item"
 msgstr ""
 
-#: stock/get_item_details.py:225
+#: stock/get_item_details.py:230
 msgid "Item {0} must be a Sub-contracted Item"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:237
+#: assets/doctype/asset/asset.py:239
 msgid "Item {0} must be a non-stock item"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1086
+#: stock/doctype/stock_entry/stock_entry.py:1095
 msgid "Item {0} not found in 'Raw Materials Supplied' table in {1} {2}"
 msgstr ""
 
-#: stock/doctype/item_price/item_price.py:57
+#: stock/doctype/item_price/item_price.py:56
 msgid "Item {0} not found."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:342
+#: buying/doctype/purchase_order/purchase_order.py:343
 msgid "Item {0}: Ordered qty {1} cannot be less than minimum order qty {2} (defined in Item)."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:418
+#: manufacturing/doctype/production_plan/production_plan.js:453
 msgid "Item {0}: {1} qty produced. "
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1131
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1190
 msgid "Item {} does not exist."
 msgstr ""
 
@@ -37122,9 +37708,12 @@
 msgid "Item: {0} does not exist in the system"
 msgstr ""
 
-#: public/js/utils.js:442 setup/doctype/item_group/item_group.js:70
-#: stock/doctype/delivery_note/delivery_note.js:364
-#: templates/generators/bom.html:38 templates/pages/rfq.html:37
+#: public/js/utils.js:489
+#: 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
+#: templates/form_grid/item_grid.html:6 templates/generators/bom.html:38
+#: templates/pages/rfq.html:37
 msgid "Items"
 msgstr ""
 
@@ -37295,8 +37884,8 @@
 msgid "Items Filter"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1462
-#: selling/doctype/sales_order/sales_order.js:1018
+#: manufacturing/doctype/production_plan/production_plan.py:1484
+#: selling/doctype/sales_order/sales_order.js:1182
 msgid "Items Required"
 msgstr ""
 
@@ -37312,15 +37901,15 @@
 msgid "Items and Pricing"
 msgstr ""
 
-#: controllers/accounts_controller.py:3416
+#: controllers/accounts_controller.py:3507
 msgid "Items cannot be updated as Subcontracting Order is created against the Purchase Order {0}."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:824
+#: selling/doctype/sales_order/sales_order.js:962
 msgid "Items for Raw Material Request"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:853
+#: stock/doctype/stock_entry/stock_entry.py:809
 msgid "Items rate has been updated to zero as Allow Zero Valuation Rate is checked for the following items: {0}"
 msgstr ""
 
@@ -37330,7 +37919,7 @@
 msgid "Items to Be Repost"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1461
+#: manufacturing/doctype/production_plan/production_plan.py:1483
 msgid "Items to Manufacture are required to pull the Raw Materials associated with it."
 msgstr ""
 
@@ -37339,11 +37928,11 @@
 msgid "Items to Order and Receive"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:252
+#: selling/doctype/sales_order/sales_order.js:278
 msgid "Items to Reserve"
 msgstr ""
 
-#. Description of the 'Parent Warehouse' (Link) field in DocType 'Pick List'
+#. Description of the 'Warehouse' (Link) field in DocType 'Pick List'
 #: stock/doctype/pick_list/pick_list.json
 msgctxt "Pick List"
 msgid "Items under this warehouse will be suggested"
@@ -37368,11 +37957,18 @@
 msgid "JAN"
 msgstr ""
 
+#. Label of a Int field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Capacity"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/job_card/job_card.json
-#: manufacturing/doctype/job_card/job_card.py:765
-#: manufacturing/doctype/work_order/work_order.js:283
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:28
+#: manufacturing/doctype/job_card/job_card.py:772
+#: 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
 msgid "Job Card"
 msgstr ""
@@ -37476,11 +38072,17 @@
 msgid "Job Card Time Log"
 msgstr ""
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:94
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Job Cards"
+msgstr ""
+
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:95
 msgid "Job Paused"
 msgstr ""
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:54
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:53
 msgid "Job Started"
 msgstr ""
 
@@ -37502,11 +38104,11 @@
 msgid "Job Title"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1562
+#: manufacturing/doctype/work_order/work_order.py:1576
 msgid "Job card {0} created"
 msgstr ""
 
-#: utilities/bulk_transaction.py:48
+#: utilities/bulk_transaction.py:52
 msgid "Job: {0} has been triggered for processing failed transactions"
 msgstr ""
 
@@ -37520,19 +38122,20 @@
 msgid "Joining"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:29
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:30
 msgid "Journal Entries"
 msgstr ""
 
-#: accounts/utils.py:866
+#: accounts/utils.py:875
 msgid "Journal Entries {0} are un-linked"
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:146
+#: accounts/doctype/account/account_tree.js:205
 #: accounts/doctype/journal_entry/journal_entry.json
 #: accounts/print_format/journal_auditing_voucher/journal_auditing_voucher.html:10
-#: assets/doctype/asset/asset.js:246 assets/doctype/asset/asset.js:249
+#: assets/doctype/asset/asset.js:282 assets/doctype/asset/asset.js:291
+#: templates/form_grid/bank_reconciliation_grid.html:3
 msgid "Journal Entry"
 msgstr ""
 
@@ -37617,7 +38220,7 @@
 msgid "Journal Entry Type"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:471
+#: accounts/doctype/journal_entry/journal_entry.py:487
 msgid "Journal Entry for Asset scrapping cannot be cancelled. Please restore the Asset."
 msgstr ""
 
@@ -37627,11 +38230,11 @@
 msgid "Journal Entry for Scrap"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:232
+#: accounts/doctype/journal_entry/journal_entry.py:248
 msgid "Journal Entry type should be set as Depreciation Entry for asset depreciation"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:597
+#: accounts/doctype/journal_entry/journal_entry.py:624
 msgid "Journal Entry {0} does not have account {1} or already matched against other voucher"
 msgstr ""
 
@@ -37641,14 +38244,19 @@
 msgid "Journals"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:95
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:99
 msgid "Journals have been created"
 msgstr ""
 
-#: projects/doctype/project/project.js:86
+#: projects/doctype/project/project.js:104
 msgid "Kanban Board"
 msgstr ""
 
+#. Description of a DocType
+#: crm/doctype/campaign/campaign.json
+msgid "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. "
+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"
@@ -37669,11 +38277,11 @@
 msgid "Key Reports"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:768
+#: manufacturing/doctype/job_card/job_card.py:775
 msgid "Kindly cancel the Manufacturing Entries first against the work order {0}."
 msgstr ""
 
-#: public/js/utils/party.js:221
+#: public/js/utils/party.js:264
 msgid "Kindly select the company first"
 msgstr ""
 
@@ -37813,7 +38421,7 @@
 msgid "Last Name"
 msgstr ""
 
-#: stock/doctype/shipment/shipment.js:247
+#: stock/doctype/shipment/shipment.js:275
 msgid "Last Name, Email or Phone/Mobile of the user are mandatory to continue."
 msgstr ""
 
@@ -37856,7 +38464,7 @@
 msgid "Last Purchase Rate"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:313
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:324
 msgid "Last Stock Transaction for item {0} under warehouse {1} was on {2}."
 msgstr ""
 
@@ -37868,7 +38476,7 @@
 msgid "Latest"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:479
+#: stock/report/stock_balance/stock_balance.py:487
 msgid "Latest Age"
 msgstr ""
 
@@ -37885,11 +38493,11 @@
 msgstr ""
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:34
+#: crm/doctype/lead/lead.json crm/report/lead_details/lead_details.js:33
 #: crm/report/lead_details/lead_details.py:18
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:8
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:28
-#: public/js/communication.js:20
+#: public/js/communication.js:25
 msgid "Lead"
 msgstr ""
 
@@ -38155,9 +38763,9 @@
 msgid "Leave blank to use the standard Delivery Note format"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:18
-#: accounts/doctype/payment_entry/payment_entry.js:265
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:24
+#: accounts/doctype/journal_entry/journal_entry.js:54
+#: accounts/doctype/payment_entry/payment_entry.js:343
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.js:25
 msgid "Ledger"
 msgstr ""
 
@@ -38200,10 +38808,15 @@
 msgid "Left Index"
 msgstr ""
 
-#: setup/doctype/company/company.py:389
+#: setup/doctype/company/company.py:388
 msgid "Legal"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/company/company.json
+msgid "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization."
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:59
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:84
 msgid "Legal Expenses"
@@ -38229,7 +38842,7 @@
 msgid "Length (cm)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:657
+#: accounts/doctype/payment_entry/payment_entry.js:807
 msgid "Less Than Amount"
 msgstr ""
 
@@ -38550,7 +39163,7 @@
 msgid "Liabilities"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:27
+#: accounts/report/account_balance/account_balance.js:26
 msgid "Liability"
 msgstr ""
 
@@ -38647,20 +39260,20 @@
 msgid "Link existing Quality Procedure."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:487
+#: buying/doctype/purchase_order/purchase_order.js:564
 msgid "Link to Material Request"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:378
-#: buying/doctype/supplier_quotation/supplier_quotation.js:52
+#: buying/doctype/request_for_quotation/request_for_quotation.js:407
+#: buying/doctype/supplier_quotation/supplier_quotation.js:54
 msgid "Link to Material Requests"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:107
+#: buying/doctype/supplier/supplier.js:133
 msgid "Link with Customer"
 msgstr ""
 
-#: selling/doctype/customer/customer.js:173
+#: selling/doctype/customer/customer.js:189
 msgid "Link with Supplier"
 msgstr ""
 
@@ -38685,16 +39298,16 @@
 msgid "Linked with submitted documents"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:185
-#: selling/doctype/customer/customer.js:230
+#: buying/doctype/supplier/supplier.js:218
+#: selling/doctype/customer/customer.js:251
 msgid "Linking Failed"
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:184
+#: buying/doctype/supplier/supplier.js:217
 msgid "Linking to Customer Failed. Please try again."
 msgstr ""
 
-#: selling/doctype/customer/customer.js:229
+#: selling/doctype/customer/customer.js:250
 msgid "Linking to Supplier Failed. Please try again."
 msgstr ""
 
@@ -38716,7 +39329,7 @@
 msgid "Load All Criteria"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:298
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:276
 msgid "Loading import file..."
 msgstr ""
 
@@ -38825,6 +39438,11 @@
 msgid "Log Entries"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/item_price/item_price.json
+msgid "Log the selling and buying rate of an Item"
+msgstr ""
+
 #. Label of a Attach Image field in DocType 'Manufacturer'
 #: stock/doctype/manufacturer/manufacturer.json
 msgctxt "Manufacturer"
@@ -38850,7 +39468,7 @@
 msgstr ""
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:7
-#: selling/doctype/quotation/quotation_list.js:33
+#: selling/doctype/quotation/quotation_list.js:32
 msgid "Lost"
 msgstr ""
 
@@ -38877,7 +39495,7 @@
 msgid "Lost Opportunity"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:39
+#: crm/report/lead_details/lead_details.js:38
 msgid "Lost Quotation"
 msgstr ""
 
@@ -38897,7 +39515,7 @@
 msgid "Lost Quotations %"
 msgstr ""
 
-#: crm/report/lost_opportunity/lost_opportunity.js:31
+#: crm/report/lost_opportunity/lost_opportunity.js:30
 #: selling/report/lost_quotations/lost_quotations.py:24
 msgid "Lost Reason"
 msgstr ""
@@ -38914,7 +39532,7 @@
 msgstr ""
 
 #: crm/report/lost_opportunity/lost_opportunity.py:49
-#: public/js/utils/sales_common.js:410
+#: public/js/utils/sales_common.js:466
 msgid "Lost Reasons"
 msgstr ""
 
@@ -38932,7 +39550,7 @@
 msgid "Lost Reasons"
 msgstr ""
 
-#: crm/doctype/opportunity/opportunity.js:29
+#: crm/doctype/opportunity/opportunity.js:28
 msgid "Lost Reasons are required in case opportunity is Lost."
 msgstr ""
 
@@ -39010,7 +39628,7 @@
 msgid "Loyalty Point Entry Redemption"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:891
+#: selling/page/point_of_sale/pos_item_cart.js:924
 msgid "Loyalty Points"
 msgstr ""
 
@@ -39057,14 +39675,18 @@
 msgid "Loyalty Points Redemption"
 msgstr ""
 
-#: public/js/utils.js:109
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+msgid "Loyalty Points will be calculated from the spent done (via the Sales Invoice), based on collection factor mentioned."
+msgstr ""
+
+#: public/js/utils.js:136
 msgid "Loyalty Points: {0}"
 msgstr ""
 
 #. Name of a DocType
 #: accounts/doctype/loyalty_program/loyalty_program.json
-#: accounts/doctype/sales_invoice/sales_invoice.js:1041
-#: selling/page/point_of_sale/pos_item_cart.js:885
+#: accounts/doctype/sales_invoice/sales_invoice.js:1117
+#: selling/page/point_of_sale/pos_item_cart.js:917
 msgid "Loyalty Program"
 msgstr ""
 
@@ -39247,11 +39869,16 @@
 msgid "MFG-WO-.YYYY.-"
 msgstr ""
 
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:22
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:23
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:78
+#: public/js/plant_floor_visual/visual_plant.js:86
 msgid "Machine"
 msgstr ""
 
+#: public/js/plant_floor_visual/visual_plant.js:70
+msgid "Machine Type"
+msgstr ""
+
 #. Option for the 'Stop Reason' (Select) field in DocType 'Downtime Entry'
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 msgctxt "Downtime Entry"
@@ -39264,8 +39891,8 @@
 msgid "Machine operator errors"
 msgstr ""
 
-#: setup/doctype/company/company.py:563 setup/doctype/company/company.py:578
-#: setup/doctype/company/company.py:579 setup/doctype/company/company.py:580
+#: setup/doctype/company/company.py:562 setup/doctype/company/company.py:577
+#: setup/doctype/company/company.py:578 setup/doctype/company/company.py:579
 msgid "Main"
 msgstr ""
 
@@ -39279,7 +39906,7 @@
 msgid "Main Cost Center {0} cannot be entered in the child table"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:102
+#: assets/doctype/asset/asset.js:118
 msgid "Maintain Asset"
 msgstr ""
 
@@ -39336,6 +39963,12 @@
 msgid "Maintenance"
 msgstr ""
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Maintenance"
+msgstr ""
+
 #. Label of a Date field in DocType 'Maintenance Visit'
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
 msgctxt "Maintenance Visit"
@@ -39348,7 +39981,7 @@
 msgid "Maintenance Details"
 msgstr ""
 
-#: assets/doctype/asset_maintenance/asset_maintenance.js:43
+#: assets/doctype/asset_maintenance/asset_maintenance.js:41
 msgid "Maintenance Log"
 msgstr ""
 
@@ -39395,10 +40028,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:162
+#: accounts/doctype/sales_invoice/sales_invoice.js:175
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.json
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:78
-#: selling/doctype/sales_order/sales_order.js:582
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
+#: selling/doctype/sales_order/sales_order.js:673
 msgid "Maintenance Schedule"
 msgstr ""
 
@@ -39541,10 +40174,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:83
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:87
 #: maintenance/doctype/maintenance_visit/maintenance_visit.json
-#: selling/doctype/sales_order/sales_order.js:581
-#: support/doctype/warranty_claim/warranty_claim.js:50
+#: selling/doctype/sales_order/sales_order.js:668
+#: support/doctype/warranty_claim/warranty_claim.js:47
 msgid "Maintenance Visit"
 msgstr ""
 
@@ -39577,16 +40210,16 @@
 msgid "Major/Optional Subjects"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:51
-#: manufacturing/doctype/job_card/job_card.js:174
+#: accounts/doctype/journal_entry/journal_entry.js:100
+#: manufacturing/doctype/job_card/job_card.js:196
 msgid "Make"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:56
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:54
 msgid "Make "
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:39
+#: assets/doctype/asset/asset_list.js:29
 msgid "Make Asset Movement"
 msgstr ""
 
@@ -39616,7 +40249,7 @@
 msgid "Make Quotation"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:335
 msgid "Make Return Entry"
 msgstr ""
 
@@ -39632,7 +40265,7 @@
 msgid "Make Serial No / Batch from Work Order"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:227
+#: stock/doctype/purchase_receipt/purchase_receipt.js:261
 msgid "Make Stock Entry"
 msgstr ""
 
@@ -39640,20 +40273,20 @@
 msgid "Make project from a template."
 msgstr ""
 
-#: stock/doctype/item/item.js:502
+#: stock/doctype/item/item.js:569
 msgid "Make {0} Variant"
 msgstr ""
 
-#: stock/doctype/item/item.js:504
+#: stock/doctype/item/item.js:571
 msgid "Make {0} Variants"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:85 assets/doctype/asset/asset.js:89
-#: assets/doctype/asset/asset.js:93 assets/doctype/asset/asset.js:98
-#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:109
-#: assets/doctype/asset/asset.js:113 assets/doctype/asset/asset.js:118
-#: assets/doctype/asset/asset.js:124 assets/doctype/asset/asset.js:136
-#: setup/doctype/company/company.js:112 setup/doctype/company/company.js:119
+#: assets/doctype/asset/asset.js:88 assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:104 assets/doctype/asset/asset.js:112
+#: assets/doctype/asset/asset.js:122 assets/doctype/asset/asset.js:131
+#: assets/doctype/asset/asset.js:139 assets/doctype/asset/asset.js:148
+#: assets/doctype/asset/asset.js:158 assets/doctype/asset/asset.js:174
+#: setup/doctype/company/company.js:134 setup/doctype/company/company.js:145
 msgid "Manage"
 msgstr ""
 
@@ -39677,22 +40310,22 @@
 msgid "Manage your orders"
 msgstr ""
 
-#: setup/doctype/company/company.py:371
+#: setup/doctype/company/company.py:370
 msgid "Management"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:141
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
-#: manufacturing/doctype/bom/bom.js:71 manufacturing/doctype/bom/bom.js:482
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: 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
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484 public/js/utils/party.js:273
-#: stock/doctype/delivery_note/delivery_note.js:138
-#: stock/doctype/purchase_receipt/purchase_receipt.js:113
-#: stock/doctype/purchase_receipt/purchase_receipt.js:198
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
+#: public/js/controllers/transaction.js:2537 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
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:99
 msgid "Mandatory"
 msgstr ""
 
@@ -39718,7 +40351,7 @@
 msgid "Mandatory Depends On"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
 msgid "Mandatory Field"
 msgstr ""
 
@@ -39738,11 +40371,11 @@
 msgid "Mandatory Missing"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:587
 msgid "Mandatory Purchase Order"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
 msgid "Mandatory Purchase Receipt"
 msgstr ""
 
@@ -39810,7 +40443,7 @@
 msgid "Manual Inspection"
 msgstr ""
 
-#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:34
+#: accounts/doctype/process_deferred_accounting/process_deferred_accounting.js:36
 msgid "Manual entry cannot be created! Disable automatic entry for deferred accounting in accounts settings and try again"
 msgstr ""
 
@@ -39906,7 +40539,7 @@
 msgid "Manufacture against Material Request"
 msgstr ""
 
-#: stock/doctype/material_request/material_request_list.js:33
+#: stock/doctype/material_request/material_request_list.js:37
 msgid "Manufactured"
 msgstr ""
 
@@ -40038,10 +40671,15 @@
 msgid "Manufacturer Part Number"
 msgstr ""
 
-#: public/js/controllers/buying.js:337
+#: public/js/controllers/buying.js:332
 msgid "Manufacturer Part Number <b>{0}</b> is invalid"
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/manufacturer/manufacturer.json
+msgid "Manufacturers used in Items"
+msgstr ""
+
 #. Name of a Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: selling/doctype/sales_order/sales_order_dashboard.py:26
@@ -40088,7 +40726,7 @@
 msgid "Manufacturing Manager"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1689
+#: stock/doctype/stock_entry/stock_entry.py:1698
 msgid "Manufacturing Quantity is mandatory"
 msgstr ""
 
@@ -40152,15 +40790,15 @@
 msgid "Manufacturing module is all set up!"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:148
+#: stock/doctype/purchase_receipt/purchase_receipt.js:168
 msgid "Mapping Purchase Receipt ..."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:98
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:97
 msgid "Mapping Subcontracting Order ..."
 msgstr ""
 
-#: public/js/utils.js:843
+#: public/js/utils.js:913
 msgid "Mapping {0} ..."
 msgstr ""
 
@@ -40296,7 +40934,7 @@
 msgid "Margin Type"
 msgstr ""
 
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:19
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:15
 msgid "Margin View"
 msgstr ""
 
@@ -40306,6 +40944,15 @@
 msgid "Marital Status"
 msgstr ""
 
+#: public/js/templates/crm_activities.html:39
+#: public/js/templates/crm_activities.html:82
+msgid "Mark As Closed"
+msgstr ""
+
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:323
+msgid "Mark as unresolved"
+msgstr ""
+
 #. Name of a DocType
 #: crm/doctype/market_segment/market_segment.json
 msgid "Market Segment"
@@ -40341,7 +40988,7 @@
 msgid "Market Segment"
 msgstr ""
 
-#: setup/doctype/company/company.py:323
+#: setup/doctype/company/company.py:322
 msgid "Marketing"
 msgstr ""
 
@@ -40381,7 +41028,7 @@
 msgid "Material"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:613
+#: manufacturing/doctype/work_order/work_order.js:655
 msgid "Material Consumption"
 msgstr ""
 
@@ -40397,7 +41044,7 @@
 msgid "Material Consumption for Manufacture"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:420
+#: stock/doctype/stock_entry/stock_entry.js:480
 msgid "Material Consumption is not set in Manufacturing Settings."
 msgstr ""
 
@@ -40439,7 +41086,7 @@
 msgid "Material Issue"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:132
+#: stock/doctype/material_request/material_request.js:146
 msgid "Material Receipt"
 msgstr ""
 
@@ -40456,20 +41103,21 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:435
-#: buying/doctype/request_for_quotation/request_for_quotation.js:297
-#: buying/doctype/supplier_quotation/supplier_quotation.js:31
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:34
+#: buying/doctype/purchase_order/purchase_order.js:504
+#: 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
-#: manufacturing/doctype/job_card/job_card.js:57
-#: manufacturing/doctype/production_plan/production_plan.js:113
-#: selling/doctype/sales_order/sales_order.js:570
+#: 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/stock_entry/stock_entry.js:192
-#: stock/doctype/stock_entry/stock_entry.js:277
+#: stock/doctype/stock_entry/stock_entry.js:210
+#: stock/doctype/stock_entry/stock_entry.js:313
 msgid "Material Request"
 msgstr ""
 
@@ -40687,13 +41335,17 @@
 msgid "Material Request Planning"
 msgstr ""
 
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:1
+msgid "Material Request Type"
+msgstr ""
+
 #. Label of a Select field in DocType 'Item Reorder'
 #: stock/doctype/item_reorder/item_reorder.json
 msgctxt "Item Reorder"
 msgid "Material Request Type"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:1521
+#: selling/doctype/sales_order/sales_order.py:1544
 msgid "Material Request not created, as quantity for Raw Materials already available."
 msgstr ""
 
@@ -40708,11 +41360,11 @@
 msgid "Material Request used to make this Stock Entry"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:974
+#: controllers/subcontracting_controller.py:979
 msgid "Material Request {0} is cancelled or stopped"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:839
+#: selling/doctype/sales_order/sales_order.js:978
 msgid "Material Request {0} submitted."
 msgstr ""
 
@@ -40728,7 +41380,7 @@
 msgid "Material Requests"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Material Requests Required"
 msgstr ""
 
@@ -40739,12 +41391,12 @@
 msgid "Material Requests for which Supplier Quotations are not created"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry_list.js:7
+#: stock/doctype/stock_entry/stock_entry_list.js:13
 msgid "Material Returned from WIP"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:67
-#: stock/doctype/material_request/material_request.js:119
+#: manufacturing/doctype/job_card/job_card.js:64
+#: stock/doctype/material_request/material_request.js:124
 msgid "Material Transfer"
 msgstr ""
 
@@ -40785,7 +41437,7 @@
 msgid "Material Transfer"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:122
+#: stock/doctype/material_request/material_request.js:130
 msgid "Material Transfer (In Transit)"
 msgstr ""
 
@@ -40839,8 +41491,8 @@
 msgid "Material Transferred for Subcontract"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:360
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:206
 msgid "Material to Supplier"
 msgstr ""
 
@@ -40850,11 +41502,11 @@
 msgid "Materials Required (Exploded)"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:1164
+#: controllers/subcontracting_controller.py:1169
 msgid "Materials are already received against the {0} {1}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:636
+#: manufacturing/doctype/job_card/job_card.py:643
 msgid "Materials needs to be transferred to the work in progress warehouse for the job card {0}"
 msgstr ""
 
@@ -40934,8 +41586,8 @@
 msgid "Max discount allowed for item: {0} is {1}%"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:715
-#: stock/doctype/pick_list/pick_list.js:147
+#: manufacturing/doctype/work_order/work_order.js:768
+#: stock/doctype/pick_list/pick_list.js:176
 msgid "Max: {0}"
 msgstr ""
 
@@ -40957,11 +41609,11 @@
 msgid "Maximum Payment Amount"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2842
+#: stock/doctype/stock_entry/stock_entry.py:2878
 msgid "Maximum Samples - {0} can be retained for Batch {1} and Item {2}."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2833
+#: stock/doctype/stock_entry/stock_entry.py:2869
 msgid "Maximum Samples - {0} have already been retained for Batch {1} and Item {2} in Batch {3}."
 msgstr ""
 
@@ -40983,11 +41635,11 @@
 msgid "Maximum Value"
 msgstr ""
 
-#: controllers/selling_controller.py:194
+#: controllers/selling_controller.py:195
 msgid "Maximum discount for Item {0} is {1}%"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:94
+#: public/js/utils/barcode_scanner.js:99
 msgid "Maximum quantity scanned for item {0}."
 msgstr ""
 
@@ -41025,7 +41677,7 @@
 msgid "Meeting"
 msgstr ""
 
-#: stock/stock_ledger.py:1685
+#: stock/stock_ledger.py:1705
 msgid "Mention Valuation Rate in the Item master."
 msgstr ""
 
@@ -41053,11 +41705,11 @@
 msgid "Mention if non-standard receivable account applicable"
 msgstr ""
 
-#: accounts/doctype/account/account.js:151
+#: accounts/doctype/account/account.js:152
 msgid "Merge"
 msgstr ""
 
-#: accounts/doctype/account/account.js:51
+#: accounts/doctype/account/account.js:46
 msgid "Merge Account"
 msgstr ""
 
@@ -41077,15 +41729,15 @@
 msgid "Merge Similar Account Heads"
 msgstr ""
 
-#: public/js/utils.js:873
+#: public/js/utils.js:943
 msgid "Merge taxes from multiple documents"
 msgstr ""
 
-#: accounts/doctype/account/account.js:123
+#: accounts/doctype/account/account.js:124
 msgid "Merge with Existing Account"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.js:66
+#: accounts/doctype/cost_center/cost_center.js:68
 msgid "Merge with existing"
 msgstr ""
 
@@ -41095,7 +41747,7 @@
 msgid "Merged"
 msgstr ""
 
-#: accounts/doctype/account/account.py:546
+#: accounts/doctype/account/account.py:565
 msgid "Merging is only possible if following properties are same in both records. Is Group, Root Type, Company and Account Currency"
 msgstr ""
 
@@ -41103,6 +41755,10 @@
 msgid "Merging {0} of {1}"
 msgstr ""
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Message"
+msgstr ""
+
 #. Label of a Text field in DocType 'Payment Request'
 #: accounts/doctype/payment_request/payment_request.json
 msgctxt "Payment Request"
@@ -41133,7 +41789,7 @@
 msgid "Message Examples"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.js:38
+#: accounts/doctype/payment_request/payment_request.js:47
 #: setup/doctype/email_digest/email_digest.js:26
 msgid "Message Sent"
 msgstr ""
@@ -41162,6 +41818,10 @@
 msgid "Messages greater than 160 characters will be split into multiple messages"
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Meta Data"
+msgstr ""
+
 #: setup/setup_wizard/operations/install_fixtures.py:263
 #: setup/setup_wizard/operations/install_fixtures.py:379
 msgid "Middle Income"
@@ -41328,32 +41988,32 @@
 msgid "Mismatch"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1132
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:1191
 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:548
-#: accounts/doctype/sales_invoice/sales_invoice.py:2044
-#: accounts/doctype/sales_invoice/sales_invoice.py:2602
+#: 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
 msgid "Missing Account"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1403
+#: accounts/doctype/sales_invoice/sales_invoice.py:1414
 msgid "Missing Asset"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:179 assets/doctype/asset/asset.py:265
+#: accounts/doctype/gl_entry/gl_entry.py:169 assets/doctype/asset/asset.py:267
 msgid "Missing Cost Center"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:309
+#: assets/doctype/asset/asset.py:311
 msgid "Missing Finance Book"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1280
+#: stock/doctype/stock_entry/stock_entry.py:1289
 msgid "Missing Finished Good"
 msgstr ""
 
@@ -41373,7 +42033,7 @@
 msgid "Missing Serial No Bundle"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:743
+#: selling/doctype/customer/customer.py:754
 msgid "Missing Values Required"
 msgstr ""
 
@@ -41381,12 +42041,12 @@
 msgid "Missing Warehouse"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:132
+#: stock/doctype/delivery_trip/delivery_trip.js:153
 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:979
+#: manufacturing/doctype/work_order/work_order.py:993
 msgid "Missing value"
 msgstr ""
 
@@ -41526,7 +42186,7 @@
 msgid "Mobile No"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:48
+#: public/js/utils/contact_address_quick_entry.js:51
 msgid "Mobile Number"
 msgstr ""
 
@@ -41539,7 +42199,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/mode_of_payment/mode_of_payment.json
-#: accounts/doctype/payment_order/payment_order.js:109
+#: accounts/doctype/payment_order/payment_order.js:124
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:40
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:47
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:35
@@ -41779,21 +42439,21 @@
 msgid "Month(s) after the end of the invoice month"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:64
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:67
+#: 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
-#: buying/report/purchase_analytics/purchase_analytics.js:62
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
-#: manufacturing/report/production_analytics/production_analytics.js:35
-#: public/js/financial_statements.js:217
+#: 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
+#: public/js/financial_statements.js:226
 #: public/js/purchase_trends_filters.js:19 public/js/sales_trends_filters.js:11
-#: public/js/stock_analytics.js:53
-#: selling/report/sales_analytics/sales_analytics.js:62
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
-#: stock/report/stock_analytics/stock_analytics.js:81
-#: support/report/issue_analytics/issue_analytics.js:43
+#: public/js/stock_analytics.js:83
+#: selling/report/sales_analytics/sales_analytics.js:69
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:32
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:32
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:32
+#: stock/report/stock_analytics/stock_analytics.js:80
+#: support/report/issue_analytics/issue_analytics.js:42
 msgid "Monthly"
 msgstr ""
 
@@ -41843,7 +42503,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/cost_center/cost_center_tree.js:44
+#: accounts/doctype/cost_center/cost_center_tree.js:69
 #: accounts/doctype/monthly_distribution/monthly_distribution.json
 msgid "Monthly Distribution"
 msgstr ""
@@ -42089,14 +42749,20 @@
 msgid "More columns found than expected. Please compare the uploaded file with standard template"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:111 stock/doctype/batch/batch_dashboard.py:10
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:58
+#: stock/dashboard/item_dashboard_list.html:52 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:128 stock/doctype/batch/batch_dashboard.py:10
 msgid "Move"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:205
+#: stock/dashboard/item_dashboard.js:212
 msgid "Move Item"
 msgstr ""
 
+#: manufacturing/doctype/plant_floor/plant_floor.js:211
+msgid "Move Stock"
+msgstr ""
+
 #: templates/includes/macros.html:169
 msgid "Move to Cart"
 msgstr ""
@@ -42139,11 +42805,11 @@
 msgid "Multi Currency"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:42
+#: manufacturing/doctype/bom_creator/bom_creator.js:41
 msgid "Multi-level BOM Creator"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:369
+#: selling/doctype/customer/customer.py:381
 msgid "Multiple Loyalty Programs found for Customer {}. Please select manually."
 msgstr ""
 
@@ -42158,7 +42824,7 @@
 msgid "Multiple Tier Program"
 msgstr ""
 
-#: stock/doctype/item/item.js:106
+#: stock/doctype/item/item.js:138
 msgid "Multiple Variants"
 msgstr ""
 
@@ -42166,11 +42832,11 @@
 msgid "Multiple Warehouse Accounts"
 msgstr ""
 
-#: controllers/accounts_controller.py:899
+#: controllers/accounts_controller.py:951
 msgid "Multiple fiscal years exist for the date {0}. Please set company in Fiscal Year"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1287
+#: stock/doctype/stock_entry/stock_entry.py:1296
 msgid "Multiple items cannot be marked as finished item"
 msgstr ""
 
@@ -42207,9 +42873,9 @@
 #: accounts/report/customer_ledger_summary/customer_ledger_summary.py:86
 #: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.py:357
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.py:29
-#: manufacturing/doctype/bom_creator/bom_creator.js:45
-#: public/js/utils/serial_no_batch_selector.js:404
-#: selling/doctype/quotation/quotation.js:261
+#: manufacturing/doctype/bom_creator/bom_creator.js:44
+#: public/js/utils/serial_no_batch_selector.js:413
+#: selling/doctype/quotation/quotation.js:273
 msgid "Name"
 msgstr ""
 
@@ -42267,7 +42933,7 @@
 msgid "Name of Beneficiary"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:107
+#: accounts/doctype/account/account_tree.js:124
 msgid "Name of new Account. Note: Please don't create accounts for Customers and Suppliers"
 msgstr ""
 
@@ -42446,11 +43112,11 @@
 msgid "Needs Analysis"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:431
 msgid "Negative Quantity is not allowed"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:381
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:435
 msgid "Negative Valuation Rate is not allowed"
 msgstr ""
 
@@ -42747,6 +43413,10 @@
 #: 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
+#: 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
+#: selling/page/point_of_sale/pos_past_order_summary.js:124
 #: templates/includes/order/order_taxes.html:5
 msgid "Net Total"
 msgstr ""
@@ -42934,15 +43604,15 @@
 msgid "Net Weight UOM"
 msgstr ""
 
-#: controllers/accounts_controller.py:1210
+#: controllers/accounts_controller.py:1277
 msgid "Net total calculation precision loss"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:164
+#: accounts/doctype/account/account_tree.js:241
 msgid "New"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:106
+#: accounts/doctype/account/account_tree.js:122
 msgid "New Account Name"
 msgstr ""
 
@@ -42956,7 +43626,7 @@
 msgid "New Assets (This Year)"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom_tree.js:56
+#: manufacturing/doctype/bom/bom_tree.js:55
 msgid "New BOM"
 msgstr ""
 
@@ -42984,21 +43654,21 @@
 msgid "New Balance In Base Currency"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:127
+#: stock/doctype/batch/batch.js:146
 msgid "New Batch ID (Optional)"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:121
+#: stock/doctype/batch/batch.js:140
 msgid "New Batch Qty"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:100
-#: accounts/doctype/cost_center/cost_center_tree.js:16
+#: accounts/doctype/account/account_tree.js:111
+#: accounts/doctype/cost_center/cost_center_tree.js:18
 #: setup/doctype/company/company_tree.js:23
 msgid "New Company"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center_tree.js:22
+#: accounts/doctype/cost_center/cost_center_tree.js:26
 msgid "New Cost Center Name"
 msgstr ""
 
@@ -43018,7 +43688,8 @@
 msgid "New Employee"
 msgstr ""
 
-#: public/js/utils/crm_activities.js:81
+#: public/js/templates/crm_activities.html:14
+#: public/js/utils/crm_activities.js:85
 msgid "New Event"
 msgstr ""
 
@@ -43044,6 +43715,10 @@
 msgid "New Location"
 msgstr ""
 
+#: public/js/templates/crm_notes.html:7
+msgid "New Note"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
@@ -43078,7 +43753,7 @@
 msgid "New Sales Orders"
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person_tree.js:5
+#: setup/doctype/sales_person/sales_person_tree.js:3
 msgid "New Sales Person Name"
 msgstr ""
 
@@ -43086,15 +43761,16 @@
 msgid "New Serial No cannot have Warehouse. Warehouse must be set by Stock Entry or Purchase Receipt"
 msgstr ""
 
-#: public/js/utils/crm_activities.js:63
+#: public/js/templates/crm_activities.html:8
+#: public/js/utils/crm_activities.js:67
 msgid "New Task"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:112
+#: manufacturing/doctype/bom/bom.js:111
 msgid "New Version"
 msgstr ""
 
-#: stock/doctype/warehouse/warehouse_tree.js:15
+#: stock/doctype/warehouse/warehouse_tree.js:16
 msgid "New Warehouse Name"
 msgstr ""
 
@@ -43104,10 +43780,14 @@
 msgid "New Workplace"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:338
+#: selling/doctype/customer/customer.py:350
 msgid "New credit limit is less than current outstanding amount for the customer. Credit limit has to be atleast {0}"
 msgstr ""
 
+#: accounts/notification/notification_for_new_fiscal_year/notification_for_new_fiscal_year.html:3
+msgid "New fiscal year created :- "
+msgstr ""
+
 #. Description of the 'Generate New Invoices Past Due Date' (Check) field in
 #. DocType 'Subscription'
 #: accounts/doctype/subscription/subscription.json
@@ -43115,7 +43795,7 @@
 msgid "New invoices will be generated as per schedule even if current invoices are unpaid or past due date"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:218
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:255
 msgid "New release date should be in the future"
 msgstr ""
 
@@ -43123,7 +43803,7 @@
 msgid "New task"
 msgstr ""
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:211
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:213
 msgid "New {0} pricing rules are created"
 msgstr ""
 
@@ -43265,7 +43945,7 @@
 msgid "No Account matched these filters: {}"
 msgstr ""
 
-#: quality_management/doctype/quality_review/quality_review_list.js:6
+#: quality_management/doctype/quality_review/quality_review_list.js:5
 msgid "No Action"
 msgstr ""
 
@@ -43275,44 +43955,52 @@
 msgid "No Answer"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2146
+#: accounts/doctype/sales_invoice/sales_invoice.py:2115
 msgid "No Customer found for Inter Company Transactions which represents company {0}"
 msgstr ""
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:118
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:362
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:115
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:350
 msgid "No Customers found with selected options."
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:48
+#: selling/page/sales_funnel/sales_funnel.js:59
 msgid "No Data"
 msgstr ""
 
-#: stock/doctype/delivery_trip/delivery_trip.js:122
+#: stock/doctype/delivery_trip/delivery_trip.js:143
 msgid "No Delivery Note selected for Customer {}"
 msgstr ""
 
-#: stock/get_item_details.py:199
+#: stock/get_item_details.py:204
 msgid "No Item with Barcode {0}"
 msgstr ""
 
-#: stock/get_item_details.py:203
+#: stock/get_item_details.py:208
 msgid "No Item with Serial No {0}"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:1084
+#: controllers/subcontracting_controller.py:1089
 msgid "No Items selected for transfer."
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:668
+#: selling/doctype/sales_order/sales_order.js:769
 msgid "No Items with Bill of Materials to Manufacture"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:782
+#: selling/doctype/sales_order/sales_order.js:898
 msgid "No Items with Bill of Materials."
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:213
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:15
+msgid "No Matching Bank Transactions Found"
+msgstr ""
+
+#: public/js/templates/crm_notes.html:44
+msgid "No Notes"
+msgstr ""
+
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:219
 msgid "No Outstanding Invoices found for this party"
 msgstr ""
 
@@ -43320,28 +44008,32 @@
 msgid "No POS Profile found. Please create a New POS Profile first"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1420
-#: accounts/doctype/journal_entry/journal_entry.py:1486
-#: accounts/doctype/journal_entry/journal_entry.py:1509
-#: stock/doctype/item/item.py:1332
+#: 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
 msgid "No Permission"
 msgstr ""
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:23
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:38
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:22
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:39
 msgid "No Records for these settings."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:333
-#: accounts/doctype/sales_invoice/sales_invoice.py:949
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:337
+#: accounts/doctype/sales_invoice/sales_invoice.py:966
 msgid "No Remarks"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:147
+#: stock/dashboard/item_dashboard.js:150
 msgid "No Stock Available Currently"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2130
+#: public/js/templates/call_link.html:30
+msgid "No Summary"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.py:2099
 msgid "No Supplier found for Inter Company Transactions which represents company {0}"
 msgstr ""
 
@@ -43353,32 +44045,32 @@
 msgid "No Terms"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:211
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:216
 msgid "No Unreconciled Invoices and Payments found for this party and account"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:215
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:221
 msgid "No Unreconciled Payments found for this party"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:682
+#: manufacturing/doctype/production_plan/production_plan.py:691
 msgid "No Work Orders were created"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:727
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:606
+#: stock/doctype/purchase_receipt/purchase_receipt.py:726
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:607
 msgid "No accounting entries for the following warehouses"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:651
+#: selling/doctype/sales_order/sales_order.py:657
 msgid "No active BOM found for item {0}. Delivery by Serial No cannot be ensured"
 msgstr ""
 
-#: stock/doctype/item_variant_settings/item_variant_settings.js:31
+#: stock/doctype/item_variant_settings/item_variant_settings.js:46
 msgid "No additional fields available"
 msgstr ""
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:429
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:417
 msgid "No billing email found for customer: {0}"
 msgstr ""
 
@@ -43386,7 +44078,7 @@
 msgid "No contacts with email IDs found."
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:115
+#: selling/page/sales_funnel/sales_funnel.js:130
 msgid "No data for this period"
 msgstr ""
 
@@ -43394,7 +44086,7 @@
 msgid "No data found. Seems like you uploaded a blank file"
 msgstr ""
 
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:38
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:37
 msgid "No data to export"
 msgstr ""
 
@@ -43406,11 +44098,15 @@
 msgid "No employee was scheduled for call popup"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1064
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:486
+msgid "No failed logs"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.js:1289
 msgid "No gain or loss in the exchange rate"
 msgstr ""
 
-#: controllers/subcontracting_controller.py:1005
+#: controllers/subcontracting_controller.py:1010
 msgid "No item available for transfer."
 msgstr ""
 
@@ -43423,30 +44119,40 @@
 msgid "No items are available in the sales order {0} for production"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_selector.js:320
+#: selling/page/point_of_sale/pos_item_selector.js:317
 msgid "No items found. Scan barcode again."
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:76
+msgid "No items in cart"
+msgstr ""
+
 #: setup/doctype/email_digest/email_digest.py:168
 msgid "No items to be received are overdue"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:424
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:423
 msgid "No matches occurred via auto reconciliation"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:879
+#: manufacturing/doctype/production_plan/production_plan.py:888
 msgid "No material request created"
 msgstr ""
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:198
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:199
 msgid "No more children on Left"
 msgstr ""
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:212
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:213
 msgid "No more children on Right"
 msgstr ""
 
+#. Label of a Int field in DocType 'Transaction Deletion Record Details'
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgctxt "Transaction Deletion Record Details"
+msgid "No of Docs"
+msgstr ""
+
 #. Label of a Select field in DocType 'Lead'
 #: crm/doctype/lead/lead.json
 msgctxt "Lead"
@@ -43498,6 +44204,14 @@
 msgid "No of Visits"
 msgstr ""
 
+#: public/js/templates/crm_activities.html:104
+msgid "No open event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:57
+msgid "No open task"
+msgstr ""
+
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:315
 msgid "No outstanding invoices found"
 msgstr ""
@@ -43506,15 +44220,15 @@
 msgid "No outstanding invoices require exchange rate revaluation"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1801
+#: accounts/doctype/payment_entry/payment_entry.py:1820
 msgid "No outstanding {0} found for the {1} {2} which qualify the filters you have specified."
 msgstr ""
 
-#: public/js/controllers/buying.js:439
+#: public/js/controllers/buying.js:436
 msgid "No pending Material Requests found to link for the given items."
 msgstr ""
 
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:436
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.py:424
 msgid "No primary email found for customer: {0}"
 msgstr ""
 
@@ -43528,15 +44242,15 @@
 msgid "No record found"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:677
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:687
 msgid "No records found in Allocation table"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:579
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:584
 msgid "No records found in the Invoices table"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:582
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:587
 msgid "No records found in the Payments table"
 msgstr ""
 
@@ -43547,7 +44261,7 @@
 msgid "No stock transactions can be created or modified before this date."
 msgstr ""
 
-#: controllers/accounts_controller.py:2435
+#: controllers/accounts_controller.py:2520
 msgid "No updates pending for reposting"
 msgstr ""
 
@@ -43555,15 +44269,15 @@
 msgid "No values"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:342
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:340
 msgid "No {0} Accounts found for this company."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2197
+#: accounts/doctype/sales_invoice/sales_invoice.py:2166
 msgid "No {0} found for Inter Company Transactions."
 msgstr ""
 
-#: assets/doctype/asset/asset.js:239
+#: assets/doctype/asset/asset.js:274
 msgid "No."
 msgstr ""
 
@@ -43573,7 +44287,7 @@
 msgid "No. of Employees"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.js:42
+#: manufacturing/doctype/workstation/workstation.js:66
 msgid "No. of parallel job cards which can be allowed on this workstation. Example: 2 would mean this workstation can process production for two Work Orders at a time."
 msgstr ""
 
@@ -43599,7 +44313,7 @@
 msgid "Non Profit"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1305
+#: manufacturing/doctype/bom/bom.py:1304
 msgid "Non stock items"
 msgstr ""
 
@@ -43610,7 +44324,7 @@
 msgid "None"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:315
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:369
 msgid "None of the items have any change in quantity or value."
 msgstr ""
 
@@ -43623,11 +44337,11 @@
 
 #: 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:525
-#: assets/doctype/asset/asset.js:530 assets/doctype/asset/asset.js:547
+#: accounts/doctype/sales_invoice/sales_invoice.py:538
+#: assets/doctype/asset/asset.js:603 assets/doctype/asset/asset.js:620
 #: controllers/buying_controller.py:206
 #: selling/doctype/product_bundle/product_bundle.py:71
-#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:48
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:72
 msgid "Not Allowed"
 msgstr ""
 
@@ -43643,8 +44357,8 @@
 msgid "Not Applicable"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:671
-#: selling/page/point_of_sale/pos_controller.js:694
+#: selling/page/point_of_sale/pos_controller.js:703
+#: selling/page/point_of_sale/pos_controller.js:732
 msgid "Not Available"
 msgstr ""
 
@@ -43667,8 +44381,8 @@
 msgid "Not Initiated"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:744
-#: templates/pages/material_request_info.py:21 templates/pages/order.py:32
+#: buying/doctype/purchase_order/purchase_order.py:747
+#: templates/pages/material_request_info.py:21 templates/pages/order.py:34
 #: templates/pages/rfq.py:48
 msgid "Not Permitted"
 msgstr ""
@@ -43688,7 +44402,7 @@
 msgstr ""
 
 #: manufacturing/doctype/production_plan/production_plan_list.js:7
-#: manufacturing/doctype/work_order/work_order_list.js:7
+#: manufacturing/doctype/work_order/work_order_list.js:15
 #: stock/doctype/material_request/material_request_list.js:9
 msgid "Not Started"
 msgstr ""
@@ -43720,11 +44434,11 @@
 msgid "Not allow to set alternative item for the item {0}"
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:48
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:52
 msgid "Not allowed to create accounting dimension for {0}"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:254
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:265
 msgid "Not allowed to update stock transactions older than {0}"
 msgstr ""
 
@@ -43732,31 +44446,37 @@
 msgid "Not authorized since {0} exceeds limits"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:445
+#: accounts/doctype/gl_entry/gl_entry.py:399
 msgid "Not authorized to edit frozen Account {0}"
 msgstr ""
 
+#: templates/form_grid/stock_entry_grid.html:26
+msgid "Not in Stock"
+msgstr ""
+
 #: templates/includes/products_as_grid.html:20
 msgid "Not in stock"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:667
-#: manufacturing/doctype/work_order/work_order.py:1256
-#: manufacturing/doctype/work_order/work_order.py:1390
-#: manufacturing/doctype/work_order/work_order.py:1440
-#: selling/doctype/sales_order/sales_order.py:755
-#: selling/doctype/sales_order/sales_order.py:1504
+#: 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
 msgid "Not permitted"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:240
+#: 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:1607
-#: public/js/controllers/buying.js:440 selling/doctype/customer/customer.py:125
-#: selling/doctype/sales_order/sales_order.js:957
-#: stock/doctype/item/item.js:426 stock/doctype/item/item.py:539
-#: stock/doctype/stock_entry/stock_entry.py:1288
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:732
+#: 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
+#: 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
+#: templates/pages/timelog_info.html:43
 msgid "Note"
 msgstr ""
 
@@ -43793,15 +44513,15 @@
 msgid "Note: Email will not be sent to disabled users"
 msgstr ""
 
-#: manufacturing/doctype/blanket_order/blanket_order.py:53
+#: manufacturing/doctype/blanket_order/blanket_order.py:91
 msgid "Note: Item {0} added multiple times"
 msgstr ""
 
-#: controllers/accounts_controller.py:450
+#: controllers/accounts_controller.py:494
 msgid "Note: Payment Entry will not be created since 'Cash or Bank Account' was not specified"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.js:32
+#: accounts/doctype/cost_center/cost_center.js:30
 msgid "Note: This Cost Center is a Group. Cannot make accounting entries against groups."
 msgstr ""
 
@@ -43809,10 +44529,12 @@
 msgid "Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:895
+#: accounts/doctype/journal_entry/journal_entry.py:922
 msgid "Note: {0}"
 msgstr ""
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:8
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
 #: www/book_appointment/index.html:55
 msgid "Notes"
 msgstr ""
@@ -44004,12 +44726,6 @@
 msgid "Number of Depreciations Booked"
 msgstr ""
 
-#. Label of a Data field in DocType 'Transaction Deletion Record Item'
-#: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
-msgctxt "Transaction Deletion Record Item"
-msgid "Number of Docs"
-msgstr ""
-
 #: crm/report/prospects_engaged_but_not_converted/prospects_engaged_but_not_converted.js:14
 msgid "Number of Interaction"
 msgstr ""
@@ -44044,11 +44760,11 @@
 msgid "Number of intervals for the interval field e.g if Interval is 'Days' and Billing Interval Count is 3, invoices will be generated every 3 days"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:109
+#: accounts/doctype/account/account_tree.js:132
 msgid "Number of new Account, it will be included in the account name as a prefix"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center_tree.js:26
+#: accounts/doctype/cost_center/cost_center_tree.js:39
 msgid "Number of new Cost Center, it will be included in the cost center name as a prefix"
 msgstr ""
 
@@ -44123,6 +44839,12 @@
 msgid "Odometer Value (Last)"
 msgstr ""
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Off"
+msgstr ""
+
 #. Label of a Date field in DocType 'Employee'
 #: setup/doctype/employee/employee.json
 msgctxt "Employee"
@@ -44150,7 +44872,7 @@
 msgid "Offsetting Account"
 msgstr ""
 
-#: accounts/general_ledger.py:77
+#: accounts/general_ledger.py:81
 msgid "Offsetting for Accounting Dimension"
 msgstr ""
 
@@ -44200,11 +44922,11 @@
 msgid "On Converting Opportunity"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:31
-#: buying/doctype/purchase_order/purchase_order_list.js:8
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:27
+#: buying/doctype/purchase_order/purchase_order_list.js:17
 #: buying/doctype/supplier/supplier_list.js:5
-#: selling/doctype/sales_order/sales_order_list.js:10
-#: support/report/issue_summary/issue_summary.js:45
+#: 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
 msgid "On Hold"
 msgstr ""
@@ -44321,10 +45043,17 @@
 msgid "On Track"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:540
+#: manufacturing/doctype/production_plan/production_plan.js:584
 msgid "On expanding a row in the Items to Manufacture table, you'll see an option to 'Include Exploded Items'. Ticking this includes raw materials of the sub-assembly items in the production process."
 msgstr ""
 
+#. Description of the 'Use Serial / Batch Fields' (Check) field in DocType
+#. 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "On submission of the stock transaction, system will auto create the Serial and Batch Bundle based on the Serial No / Batch fields."
+msgstr ""
+
 #: setup/default_energy_point_rules.py:43
 msgid "On {0} Creation"
 msgstr ""
@@ -44341,10 +45070,14 @@
 msgid "Once set, this invoice will be on hold till the set date"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:560
+#: manufacturing/doctype/work_order/work_order.js:591
 msgid "Once the Work Order is Closed. It can't be resumed."
 msgstr ""
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:16
+msgid "One customer can be part of only single Loyalty Program."
+msgstr ""
+
 #: manufacturing/dashboard_fixtures.py:228
 msgid "Ongoing Job Cards"
 msgstr ""
@@ -44371,11 +45104,11 @@
 msgid "Only Include Allocated Payments"
 msgstr ""
 
-#: accounts/doctype/account/account.py:134
+#: accounts/doctype/account/account.py:135
 msgid "Only Parent can be of type {0}"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:44
+#: assets/report/fixed_asset_register/fixed_asset_register.js:43
 msgid "Only existing assets"
 msgstr ""
 
@@ -44395,6 +45128,10 @@
 msgid "Only one Subcontracting Order can be created against a Purchase Order, cancel the existing Subcontracting Order to create a new one."
 msgstr ""
 
+#: stock/doctype/stock_entry/stock_entry.py:898
+msgid "Only one {0} entry can be created against the Work Order {1}"
+msgstr ""
+
 #. Description of the 'Customer Groups' (Table) field in DocType 'POS Profile'
 #: accounts/doctype/pos_profile/pos_profile.json
 msgctxt "POS Profile"
@@ -44420,13 +45157,14 @@
 msgid "Only {0} are supported"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:35
+#: crm/report/lead_details/lead_details.js:34
 #: manufacturing/report/job_card_summary/job_card_summary.py:92
 #: quality_management/doctype/quality_meeting/quality_meeting_list.js:5
-#: selling/doctype/quotation/quotation_list.js:27
-#: support/report/issue_analytics/issue_analytics.js:56
-#: support/report/issue_summary/issue_summary.js:43
+#: 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
+#: templates/pages/task_info.html:72
 msgid "Open"
 msgstr ""
 
@@ -44557,11 +45295,27 @@
 msgid "Open Activities HTML"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:114
+#: manufacturing/doctype/bom/bom_item_preview.html:21
+msgid "Open BOM {0}"
+msgstr ""
+
+#: public/js/templates/call_link.html:11
+msgid "Open Call Log"
+msgstr ""
+
+#: public/js/call_popup/call_popup.js:116
 msgid "Open Contact"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:172
+#: public/js/templates/crm_activities.html:76
+msgid "Open Event"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:63
+msgid "Open Events"
+msgstr ""
+
+#: selling/page/point_of_sale/pos_controller.js:189
 msgid "Open Form View"
 msgstr ""
 
@@ -44575,6 +45329,11 @@
 msgid "Open Issues "
 msgstr ""
 
+#: manufacturing/doctype/bom/bom_item_preview.html:25
+#: manufacturing/doctype/work_order/work_order_preview.html:28
+msgid "Open Item {0}"
+msgstr ""
+
 #: setup/doctype/email_digest/templates/default.html:154
 msgid "Open Notifications"
 msgstr ""
@@ -44610,6 +45369,14 @@
 msgid "Open Sales Orders"
 msgstr ""
 
+#: public/js/templates/crm_activities.html:33
+msgid "Open Task"
+msgstr ""
+
+#: public/js/templates/crm_activities.html:21
+msgid "Open Tasks"
+msgstr ""
+
 #. Label of a Check field in DocType 'Email Digest'
 #: setup/doctype/email_digest/email_digest.json
 msgctxt "Email Digest"
@@ -44620,6 +45387,10 @@
 msgid "Open To Do "
 msgstr ""
 
+#: manufacturing/doctype/work_order/work_order_preview.html:24
+msgid "Open Work Order {0}"
+msgstr ""
+
 #. Name of a report
 #: manufacturing/report/open_work_orders/open_work_orders.json
 msgid "Open Work Orders"
@@ -44630,7 +45401,7 @@
 msgstr ""
 
 #: accounts/report/general_ledger/general_ledger.py:56
-#: public/js/stock_analytics.js:64
+#: public/js/stock_analytics.js:97
 msgid "Opening"
 msgstr ""
 
@@ -44668,7 +45439,7 @@
 msgid "Opening Accumulated Depreciation"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:428
+#: assets/doctype/asset/asset.py:430
 msgid "Opening Accumulated Depreciation must be less than or equal to {0}"
 msgstr ""
 
@@ -44718,7 +45489,7 @@
 msgid "Opening Entry"
 msgstr ""
 
-#: accounts/general_ledger.py:676
+#: accounts/general_ledger.py:685
 msgid "Opening Entry can not be created after Period Closing Voucher is created."
 msgstr ""
 
@@ -44727,7 +45498,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:137
+#: accounts/doctype/account/account_tree.js:189
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.json
 msgid "Opening Invoice Creation Tool"
 msgstr ""
@@ -44748,12 +45519,16 @@
 msgid "Opening Invoice Item"
 msgstr ""
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:125
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:8
+msgid "Opening Invoices"
+msgstr ""
+
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:128
 msgid "Opening Invoices Summary"
 msgstr ""
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:79
-#: stock/report/stock_balance/stock_balance.py:419
+#: stock/report/stock_balance/stock_balance.py:427
 msgid "Opening Qty"
 msgstr ""
 
@@ -44779,7 +45554,7 @@
 msgid "Opening Time"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:426
+#: stock/report/stock_balance/stock_balance.py:434
 msgid "Opening Value"
 msgstr ""
 
@@ -44788,7 +45563,7 @@
 msgid "Opening and Closing"
 msgstr ""
 
-#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:30
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.js:31
 msgid "Opening {0} Invoices created"
 msgstr ""
 
@@ -44820,7 +45595,7 @@
 msgid "Operating Cost Per BOM Quantity"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1321
+#: manufacturing/doctype/bom/bom.py:1320
 msgid "Operating Cost as per Work Order / BOM"
 msgstr ""
 
@@ -44844,14 +45619,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/bom/bom.js:319
+#: manufacturing/doctype/bom/bom.js:332
 #: manufacturing/doctype/operation/operation.json
-#: manufacturing/doctype/work_order/work_order.js:225
+#: manufacturing/doctype/work_order/work_order.js:240
 #: 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:48
+#: 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/job_card_summary/job_card_summary.js:79
+#: manufacturing/report/job_card_summary/job_card_summary.js:78
 #: manufacturing/report/job_card_summary/job_card_summary.py:167
 msgid "Operation"
 msgstr ""
@@ -44946,7 +45721,7 @@
 msgid "Operation ID"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:239
+#: manufacturing/doctype/work_order/work_order.js:254
 msgid "Operation Id"
 msgstr ""
 
@@ -44974,7 +45749,7 @@
 msgid "Operation Time "
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:985
+#: manufacturing/doctype/work_order/work_order.py:999
 msgid "Operation Time must be greater than 0 for Operation {0}"
 msgstr ""
 
@@ -44991,20 +45766,20 @@
 msgid "Operation time does not depend on quantity to produce"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:215
+#: manufacturing/doctype/job_card/job_card.js:238
 msgid "Operation {0} added multiple times in the work order {1}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:975
+#: manufacturing/doctype/job_card/job_card.py:990
 msgid "Operation {0} does not belong to the work order {1}"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.py:179
+#: manufacturing/doctype/workstation/workstation.py:335
 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:220
-#: setup/doctype/company/company.py:341 templates/generators/bom.html:61
+#: manufacturing/doctype/work_order/work_order.js:235
+#: setup/doctype/company/company.py:340 templates/generators/bom.html:61
 msgid "Operations"
 msgstr ""
 
@@ -45034,6 +45809,7 @@
 msgid "Operations cannot be left blank"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation.js:165
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:85
 msgid "Operator"
 msgstr ""
@@ -45065,17 +45841,17 @@
 msgid "Opportunities"
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:43
+#: selling/page/sales_funnel/sales_funnel.js:48
 msgid "Opportunities by lead source"
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/request_for_quotation/request_for_quotation.js:318
-#: crm/doctype/lead/lead.js:36 crm/doctype/opportunity/opportunity.json
-#: crm/doctype/prospect/prospect.js:15
-#: crm/report/lead_details/lead_details.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: crm/doctype/lead/lead.js:33 crm/doctype/opportunity/opportunity.json
+#: crm/doctype/prospect/prospect.js:20
+#: crm/report/lead_details/lead_details.js:36
 #: crm/report/lost_opportunity/lost_opportunity.py:17
-#: public/js/communication.js:26 selling/doctype/quotation/quotation.js:133
+#: public/js/communication.js:35 selling/doctype/quotation/quotation.js:139
 msgid "Opportunity"
 msgstr ""
 
@@ -45144,7 +45920,7 @@
 msgid "Opportunity Date"
 msgstr ""
 
-#: crm/report/lost_opportunity/lost_opportunity.js:43
+#: crm/report/lost_opportunity/lost_opportunity.js:42
 #: crm/report/lost_opportunity/lost_opportunity.py:24
 msgid "Opportunity From"
 msgstr ""
@@ -45189,7 +45965,7 @@
 msgstr ""
 
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:32
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:55
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:57
 msgid "Opportunity Owner"
 msgstr ""
 
@@ -45199,8 +45975,8 @@
 msgid "Opportunity Owner"
 msgstr ""
 
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:47
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:59
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:45
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:58
 msgid "Opportunity Source"
 msgstr ""
 
@@ -45217,9 +45993,9 @@
 #. Name of a DocType
 #: crm/doctype/opportunity_type/opportunity_type.json
 #: crm/report/lost_opportunity/lost_opportunity.py:44
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:53
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:51
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:48
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:65
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:64
 msgid "Opportunity Type"
 msgstr ""
 
@@ -45235,7 +46011,7 @@
 msgid "Opportunity Value"
 msgstr ""
 
-#: public/js/communication.js:86
+#: public/js/communication.js:102
 msgid "Opportunity {0} created"
 msgstr ""
 
@@ -45245,11 +46021,11 @@
 msgid "Optimize Route"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:122
+#: accounts/doctype/account/account_tree.js:168
 msgid "Optional. Sets company's default currency, if not specified."
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:117
+#: accounts/doctype/account/account_tree.js:155
 msgid "Optional. This setting will be used to filter in various transactions."
 msgstr ""
 
@@ -45277,7 +46053,7 @@
 msgid "Order Amount"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:81
+#: manufacturing/report/production_planning_report/production_planning_report.js:80
 msgid "Order By"
 msgstr ""
 
@@ -45322,9 +46098,13 @@
 msgid "Order Status"
 msgstr ""
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:30
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:8
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:8
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:4
+msgid "Order Summary"
+msgstr ""
+
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:29
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:7
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:7
 msgid "Order Type"
 msgstr ""
 
@@ -45357,8 +46137,8 @@
 msgstr ""
 
 #: buying/doctype/supplier_quotation/supplier_quotation_list.js:5
-#: selling/doctype/quotation/quotation_list.js:31
-#: stock/doctype/material_request/material_request_list.js:25
+#: selling/doctype/quotation/quotation_list.js:30
+#: stock/doctype/material_request/material_request_list.js:29
 msgid "Ordered"
 msgstr ""
 
@@ -45411,6 +46191,10 @@
 msgid "Ordered Qty"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Ordered Qty: Quantity ordered for purchase, but not received."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:102
 msgid "Ordered Quantity"
 msgstr ""
@@ -45423,7 +46207,7 @@
 
 #: buying/doctype/supplier/supplier_dashboard.py:14
 #: selling/doctype/customer/customer_dashboard.py:21
-#: selling/doctype/sales_order/sales_order.py:745
+#: selling/doctype/sales_order/sales_order.py:751
 #: setup/doctype/company/company_dashboard.py:23
 msgid "Orders"
 msgstr ""
@@ -45555,12 +46339,12 @@
 msgstr ""
 
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.py:81
-#: stock/report/stock_balance/stock_balance.py:441
-#: stock/report/stock_ledger/stock_ledger.py:146
+#: stock/report/stock_balance/stock_balance.py:449
+#: stock/report/stock_ledger/stock_ledger.py:219
 msgid "Out Qty"
 msgstr ""
 
-#: stock/report/stock_balance/stock_balance.py:447
+#: stock/report/stock_balance/stock_balance.py:455
 msgid "Out Value"
 msgstr ""
 
@@ -45577,7 +46361,7 @@
 msgid "Out of AMC"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:23
+#: assets/doctype/asset/asset_list.js:17
 msgid "Out of Order"
 msgstr ""
 
@@ -45587,7 +46371,7 @@
 msgid "Out of Order"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:386
+#: stock/doctype/pick_list/pick_list.py:426
 msgid "Out of Stock"
 msgstr ""
 
@@ -45658,9 +46442,10 @@
 msgid "Outstanding"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:653
+#: 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.py:1074
+#: 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/purchase_register/purchase_register.py:289
 #: accounts/report/sales_register/sales_register.py:317
@@ -45717,7 +46502,7 @@
 msgid "Outstanding Cheques and Deposits to clear"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:422
+#: accounts/doctype/gl_entry/gl_entry.py:376
 msgid "Outstanding for {0} cannot be less than zero ({1})"
 msgstr ""
 
@@ -45766,7 +46551,7 @@
 msgid "Over Delivery/Receipt Allowance (%)"
 msgstr ""
 
-#: controllers/stock_controller.py:896
+#: controllers/stock_controller.py:1082
 msgid "Over Receipt"
 msgstr ""
 
@@ -45790,13 +46575,14 @@
 msgid "Overbilling of {0} {1} ignored for item {2} because you have {3} role."
 msgstr ""
 
-#: controllers/accounts_controller.py:1713
+#: controllers/accounts_controller.py:1802
 msgid "Overbilling of {} ignored because you have {} role."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:261
+#: accounts/doctype/sales_invoice/sales_invoice.py:266
 #: projects/report/project_summary/project_summary.py:94
-#: selling/doctype/sales_order/sales_order_list.js:18
+#: selling/doctype/sales_order/sales_order_list.js:29
+#: templates/pages/task_info.html:75
 msgid "Overdue"
 msgstr ""
 
@@ -46006,11 +46792,11 @@
 msgid "POS Closing Entry Taxes"
 msgstr ""
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:30
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:31
 msgid "POS Closing Failed"
 msgstr ""
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:54
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:55
 msgid "POS Closing failed while running in a background process. You can resolve the {0} and retry the process again."
 msgstr ""
 
@@ -46157,10 +46943,10 @@
 
 #. Name of a DocType
 #: accounts/doctype/pos_profile/pos_profile.json
-#: accounts/report/pos_register/pos_register.js:33
+#: accounts/report/pos_register/pos_register.js:32
 #: accounts/report/pos_register/pos_register.py:120
 #: accounts/report/pos_register/pos_register.py:193
-#: selling/page/point_of_sale/pos_controller.js:68
+#: selling/page/point_of_sale/pos_controller.js:80
 msgid "POS Profile"
 msgstr ""
 
@@ -46197,7 +46983,7 @@
 msgid "POS Profile doesn't matches {}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1119
+#: accounts/doctype/sales_invoice/sales_invoice.py:1135
 msgid "POS Profile required to make POS Entry"
 msgstr ""
 
@@ -46248,7 +47034,7 @@
 msgid "POS Transactions"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:363
+#: selling/page/point_of_sale/pos_controller.js:392
 msgid "POS invoice {0} created successfully"
 msgstr ""
 
@@ -46321,7 +47107,7 @@
 msgid "Package Weight Details"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note_list.js:65
+#: stock/doctype/delivery_note/delivery_note_list.js:74
 msgid "Packaging Slip From Delivery Note"
 msgstr ""
 
@@ -46354,7 +47140,7 @@
 msgid "Packed Items"
 msgstr ""
 
-#: controllers/stock_controller.py:739
+#: controllers/stock_controller.py:922
 msgid "Packed Items cannot be transferred internally"
 msgstr ""
 
@@ -46395,7 +47181,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:186
+#: stock/doctype/delivery_note/delivery_note.js:221
 #: stock/doctype/packing_slip/packing_slip.json
 msgid "Packing Slip"
 msgstr ""
@@ -46411,7 +47197,7 @@
 msgid "Packing Slip Item"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:704
+#: stock/doctype/delivery_note/delivery_note.py:765
 msgid "Packing Slip(s) cancelled"
 msgstr ""
 
@@ -46521,8 +47307,8 @@
 msgid "Page {0} of {1}"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request_list.js:17
-#: accounts/doctype/sales_invoice/sales_invoice.py:267
+#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/sales_invoice/sales_invoice.py:272
 msgid "Paid"
 msgstr ""
 
@@ -46551,10 +47337,12 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:170
-#: accounts/report/accounts_receivable/accounts_receivable.py:1068
+#: 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
+#: 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"
 msgstr ""
@@ -46631,7 +47419,7 @@
 msgid "Paid Amount After Tax (Company Currency)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:881
+#: accounts/doctype/payment_entry/payment_entry.js:1059
 msgid "Paid Amount cannot be greater than total negative outstanding amount {0}"
 msgstr ""
 
@@ -46653,8 +47441,8 @@
 msgid "Paid To Account Type"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:324
-#: accounts/doctype/sales_invoice/sales_invoice.py:994
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:328
+#: accounts/doctype/sales_invoice/sales_invoice.py:1011
 msgid "Paid amount + Write Off Amount can not be greater than Grand Total"
 msgstr ""
 
@@ -46798,7 +47586,7 @@
 msgid "Parent Company"
 msgstr ""
 
-#: setup/doctype/company/company.py:460
+#: setup/doctype/company/company.py:459
 msgid "Parent Company must be a group company"
 msgstr ""
 
@@ -46908,12 +47696,6 @@
 msgid "Parent Warehouse"
 msgstr ""
 
-#. Label of a Link field in DocType 'Pick List'
-#: stock/doctype/pick_list/pick_list.json
-msgctxt "Pick List"
-msgid "Parent Warehouse"
-msgstr ""
-
 #. Label of a Link field in DocType 'Warehouse'
 #: stock/doctype/warehouse/warehouse.json
 msgctxt "Warehouse"
@@ -46926,7 +47708,7 @@
 msgid "Partial Material Transferred"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1043
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1045
 msgid "Partial Stock Reservation"
 msgstr ""
 
@@ -46969,7 +47751,7 @@
 msgid "Partially Delivered"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:8
+#: assets/doctype/asset/asset_list.js:7
 msgid "Partially Depreciated"
 msgstr ""
 
@@ -46985,7 +47767,7 @@
 msgid "Partially Fulfilled"
 msgstr ""
 
-#: selling/doctype/quotation/quotation_list.js:29
+#: selling/doctype/quotation/quotation_list.js:28
 msgid "Partially Ordered"
 msgstr ""
 
@@ -47001,7 +47783,7 @@
 msgid "Partially Ordered"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request_list.js:14
+#: accounts/doctype/payment_request/payment_request_list.js:12
 msgid "Partially Paid"
 msgstr ""
 
@@ -47025,7 +47807,7 @@
 msgid "Partially Paid"
 msgstr ""
 
-#: stock/doctype/material_request/material_request_list.js:21
+#: stock/doctype/material_request/material_request_list.js:25
 msgid "Partially Received"
 msgstr ""
 
@@ -47071,7 +47853,7 @@
 msgid "Parties"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:14
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:23
 msgid "Partly Billed"
 msgstr ""
 
@@ -47129,30 +47911,38 @@
 msgid "Partnership"
 msgstr ""
 
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Parts Per Hour"
+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
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:193
 #: accounts/doctype/tax_category/tax_category_dashboard.py:11
-#: accounts/report/accounts_payable/accounts_payable.js:109
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:86
-#: accounts/report/accounts_receivable/accounts_receivable.js:54
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:86
+#: accounts/report/accounts_payable/accounts_payable.js:112
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:89
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.js:74
-#: accounts/report/general_ledger/general_ledger.py:633
-#: accounts/report/payment_ledger/payment_ledger.js:52
+#: accounts/report/general_ledger/general_ledger.py:646
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:92
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:27
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:27
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:26
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:26
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:57
-#: crm/report/lost_opportunity/lost_opportunity.js:56
+#: crm/report/lost_opportunity/lost_opportunity.js:55
 #: crm/report/lost_opportunity/lost_opportunity.py:31
-#: public/js/bank_reconciliation_tool/data_table_manager.js:51
-#: public/js/bank_reconciliation_tool/dialog_manager.js:128
+#: public/js/bank_reconciliation_tool/data_table_manager.js:50
+#: public/js/bank_reconciliation_tool/dialog_manager.js:135
 msgid "Party"
 msgstr ""
 
@@ -47294,16 +48084,10 @@
 msgid "Party Account No. (Bank Statement)"
 msgstr ""
 
-#: controllers/accounts_controller.py:1983
+#: controllers/accounts_controller.py:2075
 msgid "Party Account {0} currency ({1}) and document currency ({2}) should be same"
 msgstr ""
 
-#. Label of a Currency field in DocType 'Journal Entry Account'
-#: accounts/doctype/journal_entry_account/journal_entry_account.json
-msgctxt "Journal Entry Account"
-msgid "Party Balance"
-msgstr ""
-
 #. Label of a Currency field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47346,13 +48130,19 @@
 msgid "Party Information"
 msgstr ""
 
+#. Label of a Data field in DocType 'Blanket Order Item'
+#: manufacturing/doctype/blanket_order_item/blanket_order_item.json
+msgctxt "Blanket Order Item"
+msgid "Party Item Code"
+msgstr ""
+
 #. Name of a DocType
 #: accounts/doctype/party_link/party_link.json
 msgid "Party Link"
 msgstr ""
 
 #: accounts/report/general_ledger/general_ledger.js:109
-#: selling/report/address_and_contacts/address_and_contacts.js:23
+#: selling/report/address_and_contacts/address_and_contacts.js:22
 msgid "Party Name"
 msgstr ""
 
@@ -47405,16 +48195,16 @@
 #: 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/general_ledger/general_ledger.js:65
-#: accounts/report/general_ledger/general_ledger.py:632
-#: accounts/report/payment_ledger/payment_ledger.js:42
+#: accounts/report/general_ledger/general_ledger.py:645
+#: 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
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.py:89
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:16
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:16
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:15
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:15
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:49
-#: public/js/bank_reconciliation_tool/data_table_manager.js:46
-#: selling/report/address_and_contacts/address_and_contacts.js:10
+#: public/js/bank_reconciliation_tool/data_table_manager.js:45
+#: selling/report/address_and_contacts/address_and_contacts.js:9
 #: setup/doctype/party_type/party_type.json
 msgid "Party Type"
 msgstr ""
@@ -47519,7 +48309,7 @@
 msgid "Party Type and Party is mandatory for {0} account"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:162
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:161
 msgid "Party Type and Party is required for Receivable / Payable account {0}"
 msgstr ""
 
@@ -47533,7 +48323,7 @@
 msgid "Party User"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:308
+#: accounts/doctype/payment_entry/payment_entry.js:390
 msgid "Party can only be one of {0}"
 msgstr ""
 
@@ -47587,7 +48377,7 @@
 msgid "Path"
 msgstr ""
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:84
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:85
 msgid "Pause"
 msgstr ""
 
@@ -47597,7 +48387,7 @@
 msgid "Pause"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:259
+#: manufacturing/doctype/job_card/job_card.js:292
 msgid "Pause Job"
 msgstr ""
 
@@ -47620,6 +48410,10 @@
 msgid "Paused"
 msgstr ""
 
+#: templates/pages/order.html:43
+msgid "Pay"
+msgstr ""
+
 #. Option for the 'Payment Type' (Select) field in DocType 'Payment Entry'
 #: accounts/doctype/payment_entry/payment_entry.json
 msgctxt "Payment Entry"
@@ -47632,7 +48426,7 @@
 msgid "Pay To / Recd From"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:52
+#: accounts/report/account_balance/account_balance.js:54
 msgid "Payable"
 msgstr ""
 
@@ -47681,15 +48475,15 @@
 
 #: accounts/doctype/dunning/dunning.js:51
 #: accounts/doctype/invoice_discounting/invoice_discounting_dashboard.py:10
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:110
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:133
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:20
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:65
-#: accounts/doctype/sales_invoice/sales_invoice.js:104
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:52
+#: 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:31
-#: buying/doctype/purchase_order/purchase_order.js:328
+#: accounts/doctype/sales_invoice/sales_invoice_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:385
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:20
-#: selling/doctype/sales_order/sales_order.js:606
+#: selling/doctype/sales_order/sales_order.js:713
 #: selling/doctype/sales_order/sales_order_dashboard.py:28
 msgid "Payment"
 msgstr ""
@@ -47797,15 +48591,16 @@
 msgid "Payment Entries"
 msgstr ""
 
-#: accounts/utils.py:937
+#: accounts/utils.py:946
 msgid "Payment Entries {0} are un-linked"
 msgstr ""
 
 #. Name of a DocType
 #: accounts/doctype/payment_entry/payment_entry.json
-#: accounts/doctype/payment_order/payment_order.js:22
+#: accounts/doctype/payment_order/payment_order.js:27
 #: accounts/print_format/bank_and_cash_payment_voucher/bank_and_cash_payment_voucher.html:12
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.py:29
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:11
 msgid "Payment Entry"
 msgstr ""
 
@@ -47858,23 +48653,24 @@
 msgid "Payment Entry Reference"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:410
+#: accounts/doctype/payment_request/payment_request.py:413
 msgid "Payment Entry already exists"
 msgstr ""
 
-#: accounts/utils.py:604
+#: accounts/utils.py:613
 msgid "Payment Entry has been modified after you pulled it. Please pull it again."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:568
+#: accounts/doctype/payment_request/payment_request.py:111
+#: accounts/doctype/payment_request/payment_request.py:460
 msgid "Payment Entry is already created"
 msgstr ""
 
-#: controllers/accounts_controller.py:1164
+#: controllers/accounts_controller.py:1231
 msgid "Payment Entry {0} is linked against Order {1}, check if it should be pulled as advance in this invoice."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:261
+#: selling/page/point_of_sale/pos_payment.js:271
 msgid "Payment Failed"
 msgstr ""
 
@@ -47925,7 +48721,7 @@
 msgid "Payment Gateway Account"
 msgstr ""
 
-#: accounts/utils.py:1227
+#: accounts/utils.py:1196
 msgid "Payment Gateway Account not created, please create one manually."
 msgstr ""
 
@@ -47955,9 +48751,10 @@
 msgid "Payment Limit"
 msgstr ""
 
-#: accounts/report/pos_register/pos_register.js:51
+#: accounts/report/pos_register/pos_register.js:50
 #: accounts/report/pos_register/pos_register.py:129
 #: accounts/report/pos_register/pos_register.py:221
+#: selling/page/point_of_sale/pos_payment.js:19
 msgid "Payment Method"
 msgstr ""
 
@@ -48049,7 +48846,7 @@
 msgid "Payment Receipt Note"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:248
+#: selling/page/point_of_sale/pos_payment.js:252
 msgid "Payment Received"
 msgstr ""
 
@@ -48082,7 +48879,7 @@
 msgid "Payment Reconciliation Invoice"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:120
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:123
 msgid "Payment Reconciliation Job: {0} is running for this party. Can't reconcile now."
 msgstr ""
 
@@ -48110,12 +48907,12 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/payment_order/payment_order.js:18
+#: accounts/doctype/payment_order/payment_order.js:19
 #: accounts/doctype/payment_request/payment_request.json
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:125
-#: accounts/doctype/sales_invoice/sales_invoice.js:140
-#: buying/doctype/purchase_order/purchase_order.js:335
-#: selling/doctype/sales_order/sales_order.js:605
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:145
+#: accounts/doctype/sales_invoice/sales_invoice.js:143
+#: buying/doctype/purchase_order/purchase_order.js:393
+#: selling/doctype/sales_order/sales_order.js:709
 msgid "Payment Request"
 msgstr ""
 
@@ -48144,15 +48941,15 @@
 msgid "Payment Request Type"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:502
+#: accounts/doctype/payment_request/payment_request.py:507
 msgid "Payment Request for {0}"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:268
+#: accounts/doctype/pos_invoice/pos_invoice.js:289
 msgid "Payment Request took too long to respond. Please try requesting for payment again."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:450
+#: accounts/doctype/payment_request/payment_request.py:453
 msgid "Payment Requests cannot be created against: {0}"
 msgstr ""
 
@@ -48203,13 +49000,9 @@
 msgid "Payment Schedule"
 msgstr ""
 
-#: public/js/controllers/transaction.js:925
-msgid "Payment Schedule Table"
-msgstr ""
-
 #. Name of a DocType
 #: accounts/doctype/payment_term/payment_term.json
-#: accounts/report/accounts_receivable/accounts_receivable.py:1064
+#: accounts/report/accounts_receivable/accounts_receivable.py:1072
 #: accounts/report/gross_profit/gross_profit.py:348
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:30
 msgid "Payment Term"
@@ -48252,6 +49045,7 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:44
+#: accounts/report/accounts_receivable/accounts_receivable.html:31
 msgid "Payment Terms"
 msgstr ""
 
@@ -48305,11 +49099,11 @@
 #. Name of a DocType
 #: accounts/doctype/payment_terms_template/payment_terms_template.json
 #: accounts/report/accounts_payable/accounts_payable.js:93
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:99
-#: accounts/report/accounts_receivable/accounts_receivable.js:127
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:105
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:62
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:62
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:102
+#: accounts/report/accounts_receivable/accounts_receivable.js:130
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:108
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:61
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:61
 msgid "Payment Terms Template"
 msgstr ""
 
@@ -48377,15 +49171,15 @@
 msgid "Payment Type"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:501
+#: accounts/doctype/payment_entry/payment_entry.py:510
 msgid "Payment Type must be one of Receive, Pay and Internal Transfer"
 msgstr ""
 
-#: accounts/utils.py:927
+#: accounts/utils.py:936
 msgid "Payment Unlink Error"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:764
+#: accounts/doctype/journal_entry/journal_entry.py:791
 msgid "Payment against {0} {1} cannot be greater than Outstanding Amount {2}"
 msgstr ""
 
@@ -48397,12 +49191,12 @@
 msgid "Payment methods are mandatory. Please add at least one payment method."
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:277
-#: selling/page/point_of_sale/pos_payment.js:252
+#: accounts/doctype/pos_invoice/pos_invoice.js:301
+#: selling/page/point_of_sale/pos_payment.js:259
 msgid "Payment of {0} received successfully."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:257
+#: selling/page/point_of_sale/pos_payment.js:266
 msgid "Payment of {0} received successfully. Waiting for other requests to complete..."
 msgstr ""
 
@@ -48410,11 +49204,11 @@
 msgid "Payment related to {0} is not completed"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:259
+#: accounts/doctype/pos_invoice/pos_invoice.js:278
 msgid "Payment request failed"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:713
+#: accounts/doctype/payment_entry/payment_entry.py:722
 msgid "Payment term {0} not used in {1}"
 msgstr ""
 
@@ -48429,6 +49223,7 @@
 #: accounts/workspace/receivables/receivables.json
 #: buying/doctype/supplier/supplier_dashboard.py:15
 #: selling/doctype/customer/customer_dashboard.py:22
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Payments"
 msgstr ""
 
@@ -48493,11 +49288,11 @@
 msgstr ""
 
 #: assets/doctype/asset_repair/asset_repair_list.js:5
-#: buying/doctype/request_for_quotation/request_for_quotation.py:314
+#: buying/doctype/request_for_quotation/request_for_quotation.py:338
 #: 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
-#: templates/pages/order.html:56
+#: templates/pages/order.html:68
 msgid "Pending"
 msgstr ""
 
@@ -48575,9 +49370,9 @@
 msgstr ""
 
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:218
-#: manufacturing/doctype/work_order/work_order.js:244
+#: 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:991
+#: selling/doctype/sales_order/sales_order.js:1153
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:45
 msgid "Pending Qty"
 msgstr ""
@@ -48593,6 +49388,10 @@
 msgid "Pending Quantity"
 msgstr ""
 
+#: templates/pages/task_info.html:74
+msgid "Pending Review"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -48614,7 +49413,7 @@
 msgid "Pending activities for today"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:224
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:219
 msgid "Pending processing"
 msgstr ""
 
@@ -48767,24 +49566,24 @@
 msgid "Perception Analysis"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:61
+#: accounts/report/budget_variance_report/budget_variance_report.js:59
 #: public/js/purchase_trends_filters.js:16 public/js/sales_trends_filters.js:8
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:30
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:30
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:30
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:29
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:29
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:29
 msgid "Period"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:61
+#: assets/report/fixed_asset_register/fixed_asset_register.js:60
 msgid "Period Based On"
 msgstr ""
 
-#: accounts/general_ledger.py:690
+#: accounts/general_ledger.py:699
 msgid "Period Closed"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.js:82
-msgid "Period Closing Entry"
+#: accounts/report/trial_balance/trial_balance.js:88
+msgid "Period Closing Entry For Current Period"
 msgstr ""
 
 #. Label of a Section Break field in DocType 'Accounts Settings'
@@ -48794,7 +49593,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/account/account_tree.js:141
+#: accounts/doctype/account/account_tree.js:197
 #: accounts/doctype/period_closing_voucher/period_closing_voucher.json
 msgid "Period Closing Voucher"
 msgstr ""
@@ -48881,10 +49680,10 @@
 msgid "Period_from_date"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:64
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:72
 #: accounts/report/financial_ratios/financial_ratios.js:33
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:55
-#: public/js/financial_statements.js:214
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:54
+#: public/js/financial_statements.js:223
 msgid "Periodicity"
 msgstr ""
 
@@ -49019,7 +49818,7 @@
 msgid "Phone No"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:880
+#: selling/page/point_of_sale/pos_item_cart.js:911
 msgid "Phone Number"
 msgstr ""
 
@@ -49029,13 +49828,13 @@
 msgid "Phone Number"
 msgstr ""
 
-#: public/js/utils.js:64
+#: public/js/utils.js:78
 msgid "Pick Batch No"
 msgstr ""
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:548
-#: stock/doctype/material_request/material_request.js:113
+#: selling/doctype/sales_order/sales_order.js:599
+#: stock/doctype/material_request/material_request.js:115
 #: stock/doctype/pick_list/pick_list.json
 msgid "Pick List"
 msgstr ""
@@ -49065,7 +49864,7 @@
 msgid "Pick List"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:116
+#: stock/doctype/pick_list/pick_list.py:120
 msgid "Pick List Incomplete"
 msgstr ""
 
@@ -49146,7 +49945,7 @@
 msgid "Pickup Date"
 msgstr ""
 
-#: stock/doctype/shipment/shipment.js:364
+#: stock/doctype/shipment/shipment.js:398
 msgid "Pickup Date cannot be before this day"
 msgstr ""
 
@@ -49180,7 +49979,7 @@
 msgid "Pickup to"
 msgstr ""
 
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:9
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:8
 msgid "Pipeline By"
 msgstr ""
 
@@ -49208,16 +50007,16 @@
 msgid "Plaid Environment"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:136
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:160
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:152
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:176
 msgid "Plaid Link Failed"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:238
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:254
 msgid "Plaid Link Refresh Required"
 msgstr ""
 
-#: accounts/doctype/bank/bank.js:121
+#: accounts/doctype/bank/bank.js:131
 msgid "Plaid Link Updated"
 msgstr ""
 
@@ -49238,7 +50037,7 @@
 msgid "Plaid Settings"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:211
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:227
 msgid "Plaid transactions sync error"
 msgstr ""
 
@@ -49339,6 +50138,10 @@
 msgid "Planned Qty"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Planned Qty: Quantity, for which, Work Order has been raised, but is pending to be manufactured."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:109
 msgid "Planned Quantity"
 msgstr ""
@@ -49394,12 +50197,36 @@
 msgid "Plans"
 msgstr ""
 
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Plant Dashboard"
+msgstr ""
+
+#. Name of a DocType
+#: manufacturing/doctype/plant_floor/plant_floor.json
+#: public/js/plant_floor_visual/visual_plant.js:53
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a shortcut in the Manufacturing Workspace
+#: manufacturing/workspace/manufacturing/manufacturing.json
+msgctxt "Plant Floor"
+msgid "Plant Floor"
+msgstr ""
+
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Plant Floor"
+msgstr ""
+
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:30
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:43
 msgid "Plants and Machineries"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:383
+#: stock/doctype/pick_list/pick_list.py:423
 msgid "Please Restock Items and Update the Pick List to continue. To discontinue, cancel the Pick List."
 msgstr ""
 
@@ -49407,17 +50234,17 @@
 msgid "Please Select a Company"
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:94
+#: selling/page/sales_funnel/sales_funnel.js:109
 msgid "Please Select a Company."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.js:139
+#: stock/doctype/delivery_note/delivery_note.js:151
 msgid "Please Select a Customer"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:114
-#: stock/doctype/purchase_receipt/purchase_receipt.js:199
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:82
+#: stock/doctype/purchase_receipt/purchase_receipt.js:128
+#: stock/doctype/purchase_receipt/purchase_receipt.js:230
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:100
 msgid "Please Select a Supplier"
 msgstr ""
 
@@ -49425,7 +50252,7 @@
 msgid "Please Set Supplier Group in Buying Settings."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1071
+#: accounts/doctype/payment_entry/payment_entry.js:1297
 msgid "Please Specify Account"
 msgstr ""
 
@@ -49433,7 +50260,7 @@
 msgid "Please add 'Supplier' role to user {0}."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:87
+#: selling/page/point_of_sale/pos_controller.js:101
 msgid "Please add Mode of payments and opening balance details."
 msgstr ""
 
@@ -49449,7 +50276,7 @@
 msgid "Please add a Temporary Opening account in Chart of Accounts"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:535
+#: public/js/utils/serial_no_batch_selector.js:542
 msgid "Please add atleast one Serial No / Batch No"
 msgstr ""
 
@@ -49457,11 +50284,11 @@
 msgid "Please add the Bank Account column"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:168
+#: accounts/doctype/account/account_tree.js:246
 msgid "Please add the account to root level Company - {0}"
 msgstr ""
 
-#: accounts/doctype/account/account.py:215
+#: accounts/doctype/account/account.py:234
 msgid "Please add the account to root level Company - {}"
 msgstr ""
 
@@ -49469,28 +50296,28 @@
 msgid "Please add {1} role to user {0}."
 msgstr ""
 
-#: controllers/stock_controller.py:909
+#: controllers/stock_controller.py:1095
 msgid "Please adjust the qty or edit {0} to proceed."
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:121
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:124
 msgid "Please attach CSV file"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2735
+#: accounts/doctype/sales_invoice/sales_invoice.py:2704
 msgid "Please cancel and amend the Payment Entry"
 msgstr ""
 
-#: accounts/utils.py:926
+#: accounts/utils.py:935
 msgid "Please cancel payment entry manually first"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:337
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:327
+#: accounts/doctype/gl_entry/gl_entry.py:291
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:338
 msgid "Please cancel related transaction."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:836
+#: accounts/doctype/journal_entry/journal_entry.py:863
 msgid "Please check Multi Currency option to allow accounts with other currency"
 msgstr ""
 
@@ -49498,11 +50325,11 @@
 msgid "Please check Process Deferred Accounting {0} and submit manually after resolving errors."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:71
+#: manufacturing/doctype/bom/bom.js:70
 msgid "Please check either with operations or FG Based Operating Cost."
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:397
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:412
 msgid "Please check the error message and take necessary actions to fix the error and then restart the reposting again."
 msgstr ""
 
@@ -49510,14 +50337,10 @@
 msgid "Please check your Plaid client ID and secret values"
 msgstr ""
 
-#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:227
+#: crm/doctype/appointment/appointment.py:98 www/book_appointment/index.js:235
 msgid "Please check your email to confirm the appointment"
 msgstr ""
 
-#: public/js/controllers/transaction.js:917
-msgid "Please clear the"
-msgstr ""
-
 #: maintenance/doctype/maintenance_schedule/maintenance_schedule.py:377
 msgid "Please click on 'Generate Schedule'"
 msgstr ""
@@ -49530,19 +50353,19 @@
 msgid "Please click on 'Generate Schedule' to get schedule"
 msgstr ""
 
-#: selling/doctype/customer/customer.py:538
+#: selling/doctype/customer/customer.py:550
 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:321
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:332
 msgid "Please contact any of the following users to {} this transaction."
 msgstr ""
 
-#: selling/doctype/customer/customer.py:531
+#: selling/doctype/customer/customer.py:543
 msgid "Please contact your administrator to extend the credit limits for {0}."
 msgstr ""
 
-#: accounts/doctype/account/account.py:317
+#: accounts/doctype/account/account.py:336
 msgid "Please convert the parent account in corresponding child company to a group account."
 msgstr ""
 
@@ -49550,19 +50373,19 @@
 msgid "Please create Customer from Lead {0}."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:96
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:117
 msgid "Please create Landed Cost Vouchers against Invoices that have 'Update Stock' enabled."
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.py:67
+#: accounts/doctype/accounting_dimension/accounting_dimension.py:71
 msgid "Please create a new Accounting Dimension if required."
 msgstr ""
 
-#: controllers/accounts_controller.py:534
+#: controllers/accounts_controller.py:578
 msgid "Please create purchase from internal sale or delivery document itself"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:327
+#: assets/doctype/asset/asset.py:329
 msgid "Please create purchase receipt or purchase invoice for the item {0}"
 msgstr ""
 
@@ -49570,7 +50393,7 @@
 msgid "Please delete Product Bundle {0}, before merging {1} into {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:366
+#: assets/doctype/asset/asset.py:368
 msgid "Please do not book expense of multiple assets against one single Asset."
 msgstr ""
 
@@ -49586,8 +50409,12 @@
 msgid "Please enable Applicable on Purchase Order and Applicable on Booking Actual Expenses"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:135
-#: public/js/utils/serial_no_batch_selector.js:289
+#: stock/doctype/pick_list/pick_list.py:143
+msgid "Please enable Use Old Serial / Batch Fields to make_bundle"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:145
+#: public/js/utils/serial_no_batch_selector.js:295
 #: regional/report/electronic_invoice_register/electronic_invoice_register.js:49
 msgid "Please enable pop-ups"
 msgstr ""
@@ -49596,32 +50423,32 @@
 msgid "Please enable {0} in the {1}."
 msgstr ""
 
-#: controllers/selling_controller.py:657
+#: controllers/selling_controller.py:681
 msgid "Please enable {} in {} to allow same item in multiple rows"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:871
+#: accounts/doctype/sales_invoice/sales_invoice.py:888
 msgid "Please ensure {} account is a Balance Sheet account."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:366
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:370
 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:374
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:378
 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:880
+#: accounts/doctype/sales_invoice/sales_invoice.py:897
 msgid "Please ensure {} account {} is a Receivable account."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:563
+#: stock/doctype/stock_entry/stock_entry.py:518
 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:1024
+#: accounts/doctype/sales_invoice/sales_invoice.py:1046
 msgid "Please enter Account for Change Amount"
 msgstr ""
 
@@ -49629,32 +50456,32 @@
 msgid "Please enter Approving Role or Approving User"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:697
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:751
 msgid "Please enter Cost Center"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:322
+#: selling/doctype/sales_order/sales_order.py:325
 msgid "Please enter Delivery Date"
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person_tree.js:8
+#: setup/doctype/sales_person/sales_person_tree.js:9
 msgid "Please enter Employee Id of this sales person"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:708
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:762
 msgid "Please enter Expense Account"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.js:87
-#: stock/doctype/stock_entry/stock_entry.js:82
+#: assets/doctype/asset_capitalization/asset_capitalization.js:89
+#: stock/doctype/stock_entry/stock_entry.js:87
 msgid "Please enter Item Code to get Batch Number"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2236
+#: public/js/controllers/transaction.js:2289
 msgid "Please enter Item Code to get batch no"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:67
+#: manufacturing/doctype/production_plan/production_plan.js:66
 msgid "Please enter Item first"
 msgstr ""
 
@@ -49666,27 +50493,27 @@
 msgid "Please enter Planned Qty for Item {0} at row {1}"
 msgstr ""
 
-#: setup/doctype/employee/employee.js:76
+#: setup/doctype/employee/employee.js:78
 msgid "Please enter Preferred Contact Email"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:71
+#: manufacturing/doctype/work_order/work_order.js:73
 msgid "Please enter Production Item first"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:74
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:76
 msgid "Please enter Purchase Receipt first"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:77
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:98
 msgid "Please enter Receipt Document"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:901
+#: accounts/doctype/journal_entry/journal_entry.py:928
 msgid "Please enter Reference date"
 msgstr ""
 
-#: controllers/buying_controller.py:851
+#: controllers/buying_controller.py:877
 msgid "Please enter Reqd by Date"
 msgstr ""
 
@@ -49694,7 +50521,7 @@
 msgid "Please enter Root Type for account- {0}"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:258
+#: public/js/utils/serial_no_batch_selector.js:262
 msgid "Please enter Serial Nos"
 msgstr ""
 
@@ -49706,7 +50533,7 @@
 msgid "Please enter Stock Items consumed during the Repair."
 msgstr ""
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:29
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:30
 msgid "Please enter Warehouse and Date"
 msgstr ""
 
@@ -49714,20 +50541,20 @@
 msgid "Please enter Warehouse from which Stock Items consumed during the Repair were taken."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:609
-#: accounts/doctype/sales_invoice/sales_invoice.py:1020
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:613
+#: accounts/doctype/sales_invoice/sales_invoice.py:1042
 msgid "Please enter Write Off Account"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:23
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:26
 msgid "Please enter company first"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.js:109
+#: accounts/doctype/cost_center/cost_center.js:114
 msgid "Please enter company name first"
 msgstr ""
 
-#: controllers/accounts_controller.py:2378
+#: controllers/accounts_controller.py:2470
 msgid "Please enter default currency in Company Master"
 msgstr ""
 
@@ -49735,7 +50562,7 @@
 msgid "Please enter message before sending"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:247
+#: accounts/doctype/pos_invoice/pos_invoice.js:266
 msgid "Please enter mobile number first."
 msgstr ""
 
@@ -49743,7 +50570,7 @@
 msgid "Please enter parent cost center"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:160
+#: public/js/utils/barcode_scanner.js:165
 msgid "Please enter quantity for item {0}"
 msgstr ""
 
@@ -49751,11 +50578,11 @@
 msgid "Please enter relieving date."
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:125
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:128
 msgid "Please enter serial nos"
 msgstr ""
 
-#: setup/doctype/company/company.js:155
+#: setup/doctype/company/company.js:183
 msgid "Please enter the company name to confirm"
 msgstr ""
 
@@ -49763,19 +50590,23 @@
 msgid "Please enter the phone number first"
 msgstr ""
 
-#: public/js/setup_wizard.js:83
+#: public/js/setup_wizard.js:87
 msgid "Please enter valid Financial Year Start and End Dates"
 msgstr ""
 
+#: templates/includes/footer/footer_extension.html:37
+msgid "Please enter valid email address"
+msgstr ""
+
 #: setup/doctype/employee/employee.py:225
 msgid "Please enter {0}"
 msgstr ""
 
-#: public/js/utils/party.js:273
+#: public/js/utils/party.js:317
 msgid "Please enter {0} first"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:385
+#: manufacturing/doctype/production_plan/production_plan.py:391
 msgid "Please fill the Material Requests table"
 msgstr ""
 
@@ -49783,11 +50614,11 @@
 msgid "Please fill the Sales Orders table"
 msgstr ""
 
-#: stock/doctype/shipment/shipment.js:248
+#: stock/doctype/shipment/shipment.js:277
 msgid "Please first set Last Name, Email and Phone for the user"
 msgstr ""
 
-#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:92
+#: telephony/doctype/incoming_call_settings/incoming_call_settings.js:94
 msgid "Please fix overlapping time slots for {0}"
 msgstr ""
 
@@ -49799,6 +50630,10 @@
 msgid "Please import accounts against parent company or enable {} in company master."
 msgstr ""
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:175
+msgid "Please keep one Applicable Charges, when 'Distribute Charges Based On' is 'Distribute Manually'. For more charges, please create another Landed Cost Voucher."
+msgstr ""
+
 #: setup/doctype/employee/employee.py:184
 msgid "Please make sure the employees above report to another Active employee."
 msgstr ""
@@ -49807,19 +50642,19 @@
 msgid "Please make sure the file you are using has 'Parent Account' column present in the header."
 msgstr ""
 
-#: setup/doctype/company/company.js:157
+#: setup/doctype/company/company.js:185
 msgid "Please make sure you really want to delete all the transactions for this company. Your master data will remain as it is. This action cannot be undone."
 msgstr ""
 
-#: stock/doctype/item/item.js:425
+#: stock/doctype/item/item.js:493
 msgid "Please mention 'Weight UOM' along with Weight."
 msgstr ""
 
-#: accounts/general_ledger.py:555
+#: accounts/general_ledger.py:564
 msgid "Please mention Round Off Account in Company"
 msgstr ""
 
-#: accounts/general_ledger.py:558
+#: accounts/general_ledger.py:567
 msgid "Please mention Round Off Cost Center in Company"
 msgstr ""
 
@@ -49835,16 +50670,16 @@
 msgid "Please pull items from Delivery Note"
 msgstr ""
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:444
 msgid "Please rectify and try again."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:237
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:253
 msgid "Please refresh or reset the Plaid linking of the Bank {}."
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:12
-#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:29
+#: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.js:28
 msgid "Please save before proceeding."
 msgstr ""
 
@@ -49852,16 +50687,16 @@
 msgid "Please save first"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:70
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:79
 msgid "Please select <b>Template Type</b> to download template"
 msgstr ""
 
-#: controllers/taxes_and_totals.py:651
+#: controllers/taxes_and_totals.py:652
 #: public/js/controllers/taxes_and_totals.js:688
 msgid "Please select Apply Discount On"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:1469
+#: selling/doctype/sales_order/sales_order.py:1492
 msgid "Please select BOM against item {0}"
 msgstr ""
 
@@ -49873,25 +50708,26 @@
 msgid "Please select BOM in BOM field for Item {0}"
 msgstr ""
 
-#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:12
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.js:13
 msgid "Please select Category first"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1195
+#: accounts/doctype/payment_entry/payment_entry.js:1429
 #: public/js/controllers/accounts.js:86 public/js/controllers/accounts.js:124
 msgid "Please select Charge Type first"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:401
+#: accounts/doctype/journal_entry/journal_entry.js:443
 msgid "Please select Company"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:135
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:141
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:75
 msgid "Please select Company and Posting Date to getting entries"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:606
+#: accounts/doctype/journal_entry/journal_entry.js:688
+#: manufacturing/doctype/plant_floor/plant_floor.js:12
 msgid "Please select Company first"
 msgstr ""
 
@@ -49899,12 +50735,12 @@
 msgid "Please select Completion Date for Completed Asset Maintenance Log"
 msgstr ""
 
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:81
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:116
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:84
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:125
 msgid "Please select Customer first"
 msgstr ""
 
-#: setup/doctype/company/company.py:407
+#: setup/doctype/company/company.py:406
 msgid "Please select Existing Company for creating Chart of Accounts"
 msgstr ""
 
@@ -49912,7 +50748,7 @@
 msgid "Please select Finished Good Item for Service Item {0}"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:531 assets/doctype/asset/asset.js:548
+#: assets/doctype/asset/asset.js:604 assets/doctype/asset/asset.js:621
 msgid "Please select Item Code first"
 msgstr ""
 
@@ -49921,18 +50757,18 @@
 msgstr ""
 
 #: accounts/report/payment_period_based_on_invoice_date/payment_period_based_on_invoice_date.js:52
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:33
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:33
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:32
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:32
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:63
-#: selling/report/address_and_contacts/address_and_contacts.js:28
+#: selling/report/address_and_contacts/address_and_contacts.js:27
 msgid "Please select Party Type first"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:342
+#: accounts/doctype/payment_entry/payment_entry.js:429
 msgid "Please select Posting Date before selecting Party"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:607
+#: accounts/doctype/journal_entry/journal_entry.js:689
 msgid "Please select Posting Date first"
 msgstr ""
 
@@ -49940,7 +50776,7 @@
 msgid "Please select Price List"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:1471
+#: selling/doctype/sales_order/sales_order.py:1494
 msgid "Please select Qty against item {0}"
 msgstr ""
 
@@ -49956,15 +50792,15 @@
 msgid "Please select Start Date and End Date for Item {0}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1202
+#: stock/doctype/stock_entry/stock_entry.py:1211
 msgid "Please select Subcontracting Order instead of Purchase Order {0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2288
+#: controllers/accounts_controller.py:2380
 msgid "Please select Unrealized Profit / Loss account or add default Unrealized Profit / Loss account account for company {0}"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.py:1229
+#: manufacturing/doctype/bom/bom.py:1228
 msgid "Please select a BOM"
 msgstr ""
 
@@ -49972,10 +50808,10 @@
 msgid "Please select a Company"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:168
-#: manufacturing/doctype/bom/bom.js:482 manufacturing/doctype/bom/bom.py:245
+#: accounts/doctype/payment_entry/payment_entry.js:198
+#: manufacturing/doctype/bom/bom.js:499 manufacturing/doctype/bom/bom.py:245
 #: public/js/controllers/accounts.js:249
-#: public/js/controllers/transaction.js:2484
+#: public/js/controllers/transaction.js:2537
 msgid "Please select a Company first."
 msgstr ""
 
@@ -49991,11 +50827,15 @@
 msgid "Please select a Subcontracting Purchase Order."
 msgstr ""
 
-#: buying/doctype/supplier_quotation/supplier_quotation.js:60
+#: buying/doctype/supplier_quotation/supplier_quotation.js:65
 msgid "Please select a Supplier"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:1063
+#: public/js/utils/serial_no_batch_selector.js:546
+msgid "Please select a Warehouse"
+msgstr ""
+
+#: manufacturing/doctype/job_card/job_card.py:1084
 msgid "Please select a Work Order first."
 msgstr ""
 
@@ -50007,11 +50847,11 @@
 msgid "Please select a customer for fetching payments."
 msgstr ""
 
-#: www/book_appointment/index.js:63
+#: www/book_appointment/index.js:67
 msgid "Please select a date"
 msgstr ""
 
-#: www/book_appointment/index.js:48
+#: www/book_appointment/index.js:52
 msgid "Please select a date and time"
 msgstr ""
 
@@ -50019,11 +50859,11 @@
 msgid "Please select a default mode of payment"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:753
+#: selling/page/point_of_sale/pos_item_cart.js:783
 msgid "Please select a field to edit from numpad"
 msgstr ""
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:68
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:67
 msgid "Please select a row to create a Reposting Entry"
 msgstr ""
 
@@ -50039,11 +50879,11 @@
 msgid "Please select a valid Purchase Order that is configured for Subcontracting."
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:220
+#: selling/doctype/quotation/quotation.js:229
 msgid "Please select a value for {0} quotation_to {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1570
+#: accounts/doctype/journal_entry/journal_entry.py:1574
 msgid "Please select correct account"
 msgstr ""
 
@@ -50060,12 +50900,12 @@
 msgid "Please select item code"
 msgstr ""
 
-#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:71
+#: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.js:69
 msgid "Please select only one row to create a Reposting Entry"
 msgstr ""
 
-#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:60
-#: stock/report/stock_ledger_variance/stock_ledger_variance.js:96
+#: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.js:59
+#: stock/report/stock_ledger_variance/stock_ledger_variance.js:91
 msgid "Please select rows to create Reposting Entries"
 msgstr ""
 
@@ -50073,7 +50913,7 @@
 msgid "Please select the Company"
 msgstr ""
 
-#: accounts/doctype/loyalty_program/loyalty_program.js:57
+#: accounts/doctype/loyalty_program/loyalty_program.js:65
 msgid "Please select the Multiple Tier Program type for more than one collection rules."
 msgstr ""
 
@@ -50084,7 +50924,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:21
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:21
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:42
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:53
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:54
 msgid "Please select the document type first"
 msgstr ""
 
@@ -50100,25 +50940,25 @@
 msgid "Please select weekly off day"
 msgstr ""
 
-#: public/js/utils.js:891
+#: public/js/utils.js:961
 msgid "Please select {0}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:991
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:575
+#: 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
 msgid "Please select {0} first"
 msgstr ""
 
-#: public/js/controllers/transaction.js:76
+#: public/js/controllers/transaction.js:77
 msgid "Please set 'Apply Additional Discount On'"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:790
+#: assets/doctype/asset/depreciation.py:788
 msgid "Please set 'Asset Depreciation Cost Center' in Company {0}"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:787
+#: assets/doctype/asset/depreciation.py:785
 msgid "Please set 'Gain/Loss Account on Asset Disposal' in Company {0}"
 msgstr ""
 
@@ -50126,6 +50966,10 @@
 msgid "Please set Account"
 msgstr ""
 
+#: accounts/doctype/sales_invoice/sales_invoice.py:1525
+msgid "Please set Account for Change Amount"
+msgstr ""
+
 #: stock/__init__.py:88
 msgid "Please set Account in Warehouse {0} or Default Inventory Account in Company {1}"
 msgstr ""
@@ -50136,23 +50980,23 @@
 
 #: accounts/doctype/ledger_merge/ledger_merge.js:23
 #: accounts/doctype/ledger_merge/ledger_merge.js:34
-#: accounts/doctype/pos_profile/pos_profile.js:27
-#: accounts/doctype/pos_profile/pos_profile.js:50
-#: accounts/doctype/pos_profile/pos_profile.js:64
-#: accounts/doctype/pos_profile/pos_profile.js:78
-#: accounts/doctype/pos_profile/pos_profile.js:91
-#: accounts/doctype/sales_invoice/sales_invoice.js:707
-#: accounts/doctype/sales_invoice/sales_invoice.js:721
-#: selling/doctype/quotation/quotation.js:28
-#: selling/doctype/sales_order/sales_order.js:28
+#: accounts/doctype/pos_profile/pos_profile.js:25
+#: accounts/doctype/pos_profile/pos_profile.js:48
+#: accounts/doctype/pos_profile/pos_profile.js:62
+#: accounts/doctype/pos_profile/pos_profile.js:76
+#: accounts/doctype/pos_profile/pos_profile.js:89
+#: accounts/doctype/sales_invoice/sales_invoice.js:763
+#: accounts/doctype/sales_invoice/sales_invoice.js:777
+#: selling/doctype/quotation/quotation.js:29
+#: selling/doctype/sales_order/sales_order.js:31
 msgid "Please set Company"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:372
+#: assets/doctype/asset/depreciation.py:370
 msgid "Please set Depreciation related Accounts in Asset Category {0} or Company {1}"
 msgstr ""
 
-#: stock/doctype/shipment/shipment.js:154
+#: stock/doctype/shipment/shipment.js:176
 msgid "Please set Email/Phone for the contact"
 msgstr ""
 
@@ -50166,11 +51010,11 @@
 msgid "Please set Fiscal Code for the public administration '%s'"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:547
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:551
 msgid "Please set Fixed Asset Account in {} against {}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:435
+#: assets/doctype/asset/asset.py:437
 msgid "Please set Number of Depreciations Booked"
 msgstr ""
 
@@ -50200,11 +51044,11 @@
 msgid "Please set a Company"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:262
+#: assets/doctype/asset/asset.py:264
 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:1260
+#: selling/doctype/sales_order/sales_order.py:1283
 msgid "Please set a Supplier against the Items to be considered in the Purchase Order."
 msgstr ""
 
@@ -50216,7 +51060,7 @@
 msgid "Please set a default Holiday List for Employee {0} or Company {1}"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:991
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1019
 msgid "Please set account in Warehouse {0}"
 msgstr ""
 
@@ -50225,7 +51069,7 @@
 msgid "Please set an Address on the Company '%s'"
 msgstr ""
 
-#: controllers/stock_controller.py:334
+#: controllers/stock_controller.py:516
 msgid "Please set an Expense Account in the Items table"
 msgstr ""
 
@@ -50237,23 +51081,23 @@
 msgid "Please set at least one row in the Taxes and Charges Table"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2041
+#: accounts/doctype/sales_invoice/sales_invoice.py:2010
 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:2599
+#: accounts/doctype/sales_invoice/sales_invoice.py:2568
 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:2601
+#: accounts/doctype/sales_invoice/sales_invoice.py:2570
 msgid "Please set default Cash or Bank account in Mode of Payments {}"
 msgstr ""
 
-#: accounts/utils.py:2086
+#: accounts/utils.py:2054
 msgid "Please set default Exchange Gain/Loss Account in Company {}"
 msgstr ""
 
@@ -50265,11 +51109,11 @@
 msgid "Please set default UOM in Stock Settings"
 msgstr ""
 
-#: controllers/stock_controller.py:204
+#: controllers/stock_controller.py:386
 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:946
+#: accounts/utils.py:955
 msgid "Please set default {0} in Company {1}"
 msgstr ""
 
@@ -50286,11 +51130,11 @@
 msgid "Please set filters"
 msgstr ""
 
-#: controllers/accounts_controller.py:1896
+#: controllers/accounts_controller.py:1988
 msgid "Please set one of the following:"
 msgstr ""
 
-#: public/js/controllers/transaction.js:1967
+#: public/js/controllers/transaction.js:2010
 msgid "Please set recurring after saving"
 msgstr ""
 
@@ -50302,7 +51146,7 @@
 msgid "Please set the Default Cost Center in {0} company."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:487
+#: manufacturing/doctype/work_order/work_order.js:512
 msgid "Please set the Item Code first"
 msgstr ""
 
@@ -50310,7 +51154,7 @@
 msgid "Please set the Payment Schedule"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:175
+#: accounts/doctype/gl_entry/gl_entry.py:165
 msgid "Please set the cost center field in {0} or setup a default Cost Center for the Company."
 msgstr ""
 
@@ -50318,8 +51162,8 @@
 msgid "Please set up the Campaign Schedule in the Campaign {0}"
 msgstr ""
 
-#: public/js/queries.js:39 public/js/queries.js:49 public/js/queries.js:66
-#: public/js/queries.js:95 stock/report/reserved_stock/reserved_stock.py:26
+#: public/js/queries.js:32 public/js/queries.js:44 public/js/queries.js:64
+#: public/js/queries.js:96 stock/report/reserved_stock/reserved_stock.py:26
 msgid "Please set {0}"
 msgstr ""
 
@@ -50335,34 +51179,34 @@
 msgid "Please set {0} in BOM Creator {1}"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:95
-msgid "Please setup a default bank account for company {0}"
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:97
+msgid "Please setup and enable a group account with the Account Type - {0} for the company {1}"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:424
+#: assets/doctype/asset/depreciation.py:422
 msgid "Please share this email with your support team so that they can find and fix the issue."
 msgstr ""
 
-#: public/js/controllers/transaction.js:1837
+#: public/js/controllers/transaction.js:1880
 msgid "Please specify"
 msgstr ""
 
-#: stock/get_item_details.py:210
+#: stock/get_item_details.py:215
 msgid "Please specify Company"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:81
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:380
-#: accounts/doctype/sales_invoice/sales_invoice.js:452
+#: accounts/doctype/pos_invoice/pos_invoice.js:88
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:420
+#: accounts/doctype/sales_invoice/sales_invoice.js:501
 msgid "Please specify Company to proceed"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1206
-#: controllers/accounts_controller.py:2511 public/js/controllers/accounts.js:97
+#: accounts/doctype/payment_entry/payment_entry.js:1452
+#: controllers/accounts_controller.py:2596 public/js/controllers/accounts.js:97
 msgid "Please specify a valid Row ID for row {0} in table {1}"
 msgstr ""
 
-#: public/js/queries.js:104
+#: public/js/queries.js:106
 msgid "Please specify a {0}"
 msgstr ""
 
@@ -50370,7 +51214,7 @@
 msgid "Please specify at least one attribute in the Attributes table"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:372
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:426
 msgid "Please specify either Quantity or Valuation Rate or both"
 msgstr ""
 
@@ -50378,11 +51222,11 @@
 msgid "Please specify from/to range"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:35
+#: buying/doctype/request_for_quotation/request_for_quotation.js:37
 msgid "Please supply the specified items at the best possible rates"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.py:223
+#: stock/doctype/repost_item_valuation/repost_item_valuation.py:218
 msgid "Please try again in an hour."
 msgstr ""
 
@@ -50439,7 +51283,7 @@
 msgid "Portrait"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:337
+#: buying/doctype/request_for_quotation/request_for_quotation.js:362
 msgid "Possible Supplier"
 msgstr ""
 
@@ -50506,17 +51350,18 @@
 msgid "Postal Expenses"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:644
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: 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/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:563
+#: 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/item_wise_sales_register/item_wise_sales_register.py:200
@@ -50531,7 +51376,7 @@
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:45
 #: 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:84
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py:89
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:129
@@ -50541,6 +51386,7 @@
 #: stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py:114
 #: 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
 msgid "Posting Date"
 msgstr ""
 
@@ -50725,11 +51571,17 @@
 msgid "Posting Date cannot be future date"
 msgstr ""
 
+#. Label of a Datetime field in DocType 'Stock Ledger Entry'
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+msgctxt "Stock Ledger Entry"
+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
-#: stock/report/serial_no_ledger/serial_no_ledger.js:64
+#: 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_ledger_invariant_check/stock_ledger_invariant_check.py:126
@@ -50827,7 +51679,7 @@
 msgid "Posting Time"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1641
+#: stock/doctype/stock_entry/stock_entry.py:1650
 msgid "Posting date and posting time is mandatory"
 msgstr ""
 
@@ -50835,6 +51687,11 @@
 msgid "Posting timestamp must be after {0}"
 msgstr ""
 
+#. Description of a DocType
+#: crm/doctype/opportunity/opportunity.json
+msgid "Potential Sales Deal"
+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
@@ -50933,7 +51790,7 @@
 msgid "Preventive Maintenance"
 msgstr ""
 
-#: public/js/utils/ledger_preview.js:20 public/js/utils/ledger_preview.js:40
+#: public/js/utils/ledger_preview.js:28 public/js/utils/ledger_preview.js:57
 msgid "Preview"
 msgstr ""
 
@@ -50949,7 +51806,7 @@
 msgid "Preview"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:205
+#: buying/doctype/request_for_quotation/request_for_quotation.js:223
 msgid "Preview Email"
 msgstr ""
 
@@ -50970,7 +51827,7 @@
 msgid "Previous Work Experience"
 msgstr ""
 
-#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:152
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:153
 msgid "Previous Year is not closed, please close it first"
 msgstr ""
 
@@ -51181,7 +52038,7 @@
 msgid "Price List Currency"
 msgstr ""
 
-#: stock/get_item_details.py:1029
+#: stock/get_item_details.py:1040
 msgid "Price List Currency not selected"
 msgstr ""
 
@@ -51269,6 +52126,12 @@
 msgid "Price List Rate"
 msgstr ""
 
+#. Label of a Currency field in DocType 'Material Request Item'
+#: stock/doctype/material_request_item/material_request_item.json
+msgctxt "Material Request Item"
+msgid "Price List Rate"
+msgstr ""
+
 #. Label of a Currency field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
@@ -51389,7 +52252,7 @@
 msgid "Price Per Unit ({0})"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:553
+#: selling/page/point_of_sale/pos_controller.js:581
 msgid "Price is not set for the item."
 msgstr ""
 
@@ -51403,7 +52266,7 @@
 msgid "Price or Product Discount"
 msgstr ""
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:143
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:145
 msgid "Price or product discount slabs are required"
 msgstr ""
 
@@ -51419,7 +52282,7 @@
 
 #. Name of a DocType
 #: accounts/doctype/pricing_rule/pricing_rule.json
-#: buying/doctype/supplier/supplier.js:98
+#: buying/doctype/supplier/supplier.js:116
 msgid "Pricing Rule"
 msgstr ""
 
@@ -51536,7 +52399,7 @@
 msgid "Pricing Rule Item Group"
 msgstr ""
 
-#: accounts/doctype/promotional_scheme/promotional_scheme.py:208
+#: accounts/doctype/promotional_scheme/promotional_scheme.py:210
 msgid "Pricing Rule {0} is updated"
 msgstr ""
 
@@ -51660,7 +52523,7 @@
 msgid "Primary Address"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:54
+#: public/js/utils/contact_address_quick_entry.js:57
 msgid "Primary Address Details"
 msgstr ""
 
@@ -51682,7 +52545,7 @@
 msgid "Primary Contact"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:35
+#: public/js/utils/contact_address_quick_entry.js:38
 msgid "Primary Contact Details"
 msgstr ""
 
@@ -51711,7 +52574,7 @@
 msgid "Primary Settings"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:69
+#: selling/page/point_of_sale/pos_past_order_summary.js:67
 #: templates/pages/material_request_info.html:15 templates/pages/order.html:33
 msgid "Print"
 msgstr ""
@@ -51952,7 +52815,7 @@
 msgid "Print Preferences"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:223
+#: selling/page/point_of_sale/pos_past_order_summary.js:231
 msgid "Print Receipt"
 msgstr ""
 
@@ -52017,7 +52880,7 @@
 msgid "Print Style"
 msgstr ""
 
-#: setup/install.py:118
+#: setup/install.py:99
 msgid "Print UOM after Quantity"
 msgstr ""
 
@@ -52032,15 +52895,16 @@
 msgid "Print and Stationery"
 msgstr ""
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:73
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:75
 msgid "Print settings updated in respective print format"
 msgstr ""
 
-#: setup/install.py:125
+#: setup/install.py:106
 msgid "Print taxes with zero amount"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:364
+#: accounts/report/accounts_receivable/accounts_receivable.html:285
 msgid "Printed On "
 msgstr ""
 
@@ -52121,9 +52985,10 @@
 msgid "Priorities"
 msgstr ""
 
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:19
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:18
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:93
-#: projects/report/project_summary/project_summary.js:37
+#: projects/report/project_summary/project_summary.js:36
+#: templates/pages/task_info.html:54
 msgid "Priority"
 msgstr ""
 
@@ -52211,6 +53076,12 @@
 msgid "Problem"
 msgstr ""
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Problem"
+msgstr ""
+
 #. Label of a Link field in DocType 'Non Conformance'
 #: quality_management/doctype/non_conformance/non_conformance.json
 msgctxt "Non Conformance"
@@ -52235,7 +53106,7 @@
 msgid "Procedure"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:70
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:75
 msgid "Process Day Book Data"
 msgstr ""
 
@@ -52321,7 +53192,7 @@
 msgid "Process Loss Value"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:58
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:63
 msgid "Process Master Data"
 msgstr ""
 
@@ -52373,6 +53244,12 @@
 msgid "Process Subscription"
 msgstr ""
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Process in Single Transaction"
+msgstr ""
+
 #. Label of a Long Text field in DocType 'BOM Update Log'
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 msgctxt "BOM Update Log"
@@ -52403,7 +53280,7 @@
 msgid "Processing Party Addresses"
 msgstr ""
 
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:115
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:122
 msgid "Processing Sales! Please Wait..."
 msgstr ""
 
@@ -52476,7 +53353,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: public/js/controllers/buying.js:265 public/js/controllers/buying.js:511
+#: public/js/controllers/buying.js:260 public/js/controllers/buying.js:508
 #: selling/doctype/product_bundle/product_bundle.json
 msgid "Product Bundle"
 msgstr ""
@@ -52580,7 +53457,13 @@
 
 #. Label of a Card Break in the Manufacturing Workspace
 #: manufacturing/workspace/manufacturing/manufacturing.json
-#: setup/doctype/company/company.py:347
+#: setup/doctype/company/company.py:346
+msgid "Production"
+msgstr ""
+
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
 msgid "Production"
 msgstr ""
 
@@ -52591,18 +53474,18 @@
 msgid "Production Analytics"
 msgstr ""
 
-#. Label of a Int field in DocType 'Workstation'
+#. Label of a Section Break field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Production Capacity"
 msgstr ""
 
 #: manufacturing/doctype/work_order/work_order_calendar.js:38
-#: manufacturing/report/job_card_summary/job_card_summary.js:65
+#: manufacturing/report/job_card_summary/job_card_summary.js:64
 #: manufacturing/report/job_card_summary/job_card_summary.py:152
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:43
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:42
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:113
-#: manufacturing/report/work_order_summary/work_order_summary.js:51
+#: manufacturing/report/work_order_summary/work_order_summary.js:50
 #: manufacturing/report/work_order_summary/work_order_summary.py:208
 msgid "Production Item"
 msgstr ""
@@ -52627,7 +53510,7 @@
 
 #. Name of a DocType
 #: manufacturing/doctype/production_plan/production_plan.json
-#: manufacturing/report/production_plan_summary/production_plan_summary.js:9
+#: manufacturing/report/production_plan_summary/production_plan_summary.js:8
 msgid "Production Plan"
 msgstr ""
 
@@ -52834,7 +53717,7 @@
 msgid "Profitability Analysis"
 msgstr ""
 
-#: templates/pages/projects.html:25
+#: projects/doctype/task/task_list.js:52 templates/pages/projects.html:25
 msgid "Progress"
 msgstr ""
 
@@ -52854,10 +53737,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:973
+#: 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:634
+#: 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
@@ -52865,30 +53748,31 @@
 #: accounts/report/received_items_to_be_billed/received_items_to_be_billed.py:73
 #: accounts/report/sales_register/sales_register.py:228
 #: accounts/report/trial_balance/trial_balance.js:64
-#: buying/report/procurement_tracker/procurement_tracker.js:22
+#: 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:34
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:33
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:182
 #: projects/doctype/project/project.json
 #: projects/doctype/project/project_dashboard.py:11
 #: projects/doctype/task/task_calendar.js:19
-#: projects/doctype/task/task_tree.js:11
+#: projects/doctype/task/task_list.js:45 projects/doctype/task/task_tree.js:11
 #: projects/doctype/timesheet/timesheet_calendar.js:22
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:34
 #: projects/report/project_summary/project_summary.py:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:19
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:51
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:46
 #: projects/report/timesheet_billing_summary/timesheet_billing_summary.py:25
-#: public/js/financial_statements.js:247 public/js/projects/timer.js:10
+#: public/js/financial_statements.js:256 public/js/projects/timer.js:14
 #: public/js/purchase_trends_filters.js:52 public/js/sales_trends_filters.js:28
-#: selling/doctype/sales_order/sales_order.js:587
+#: selling/doctype/sales_order/sales_order.js:681
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:94
-#: stock/report/reserved_stock/reserved_stock.js:139
+#: stock/report/reserved_stock/reserved_stock.js:130
 #: stock/report/reserved_stock/reserved_stock.py:184
-#: stock/report/stock_ledger/stock_ledger.js:76
-#: stock/report/stock_ledger/stock_ledger.py:261
-#: support/report/issue_analytics/issue_analytics.js:76
-#: support/report/issue_summary/issue_summary.js:64
+#: stock/report/stock_ledger/stock_ledger.js:84
+#: stock/report/stock_ledger/stock_ledger.py:333
+#: support/report/issue_analytics/issue_analytics.js:75
+#: support/report/issue_summary/issue_summary.js:63
+#: templates/pages/task_info.html:39 templates/pages/timelog_info.html:22
 msgid "Project"
 msgstr ""
 
@@ -52953,6 +53837,12 @@
 msgid "Project"
 msgstr ""
 
+#. Label of a Link field in DocType 'Installation Note'
+#: selling/doctype/installation_note/installation_note.json
+msgctxt "Installation Note"
+msgid "Project"
+msgstr ""
+
 #. Label of a Link field in DocType 'Issue'
 #: support/doctype/issue/issue.json
 msgctxt "Issue"
@@ -53258,7 +54148,7 @@
 
 #. Name of a DocType
 #: projects/doctype/project_type/project_type.json
-#: projects/report/project_summary/project_summary.js:31
+#: projects/report/project_summary/project_summary.js:30
 msgid "Project Type"
 msgstr ""
 
@@ -53334,6 +54224,8 @@
 msgid "Project-wise data is not available for Quotation"
 msgstr ""
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:46
+#: stock/dashboard/item_dashboard_list.html:37
 #: stock/report/item_shortage_report/item_shortage_report.py:73
 #: stock/report/stock_projected_qty/stock_projected_qty.py:199
 #: templates/emails/reorder_item.html:12
@@ -53386,6 +54278,10 @@
 msgid "Projected Quantity"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Projected Quantity Formula"
+msgstr ""
+
 #: stock/page/stock_balance/stock_balance.js:51
 msgid "Projected qty"
 msgstr ""
@@ -53516,7 +54412,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:61
+#: crm/doctype/lead/lead.js:41 crm/doctype/lead/lead.js:62
 #: crm/doctype/prospect/prospect.json
 msgid "Prospect"
 msgstr ""
@@ -53611,7 +54507,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:335
+#: setup/doctype/company/company.py:334
 msgid "Purchase"
 msgstr ""
 
@@ -53704,15 +54600,15 @@
 #. Name of a DocType
 #: 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:23
+#: 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:323
-#: buying/doctype/purchase_order/purchase_order_list.js:39
+#: buying/doctype/purchase_order/purchase_order.js:378
+#: 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:110
-#: stock/doctype/purchase_receipt/purchase_receipt.js:230
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:22
-#: stock/doctype/stock_entry/stock_entry.js:262
+#: stock/doctype/purchase_receipt/purchase_receipt.js:123
+#: stock/doctype/purchase_receipt/purchase_receipt.js:268
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:30
+#: stock/doctype/stock_entry/stock_entry.js:294
 msgid "Purchase Invoice"
 msgstr ""
 
@@ -53835,16 +54731,16 @@
 msgid "Purchase Invoice Trends"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:213
+#: assets/doctype/asset/asset.py:215
 msgid "Purchase Invoice cannot be made against an existing asset {0}"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:389
-#: stock/doctype/purchase_receipt/purchase_receipt.py:403
+#: stock/doctype/purchase_receipt/purchase_receipt.py:390
+#: stock/doctype/purchase_receipt/purchase_receipt.py:404
 msgid "Purchase Invoice {0} is already submitted"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1769
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1828
 msgid "Purchase Invoices"
 msgstr ""
 
@@ -53862,6 +54758,7 @@
 #: setup/doctype/supplier_group/supplier_group.json stock/doctype/bin/bin.json
 #: stock/doctype/material_request/material_request.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
 msgid "Purchase Manager"
 msgstr ""
@@ -53876,21 +54773,21 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:131
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:155
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.py:234
 #: accounts/report/purchase_register/purchase_register.py:216
 #: buying/doctype/purchase_order/purchase_order.json
-#: buying/doctype/supplier_quotation/supplier_quotation.js:23
+#: 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:41
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:40
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:167
-#: controllers/buying_controller.py:624
-#: manufacturing/doctype/blanket_order/blanket_order.js:45
-#: selling/doctype/sales_order/sales_order.js:112
-#: selling/doctype/sales_order/sales_order.js:576
-#: stock/doctype/material_request/material_request.js:137
-#: stock/doctype/purchase_receipt/purchase_receipt.js:194
+#: controllers/buying_controller.py:649
+#: manufacturing/doctype/blanket_order/blanket_order.js:54
+#: selling/doctype/sales_order/sales_order.js:136
+#: selling/doctype/sales_order/sales_order.js:659
+#: stock/doctype/material_request/material_request.js:154
+#: stock/doctype/purchase_receipt/purchase_receipt.js:225
 msgid "Purchase Order"
 msgstr ""
 
@@ -54061,7 +54958,7 @@
 msgid "Purchase Order Item Supplied"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:684
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:685
 msgid "Purchase Order Item reference is missing in Subcontracting Receipt {0}"
 msgstr ""
 
@@ -54075,11 +54972,11 @@
 msgid "Purchase Order Pricing Rule"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:579
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:583
 msgid "Purchase Order Required"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:576
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:580
 msgid "Purchase Order Required for item {}"
 msgstr ""
 
@@ -54091,7 +54988,7 @@
 msgid "Purchase Order Trends"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:957
+#: selling/doctype/sales_order/sales_order.js:1115
 msgid "Purchase Order already created for all Sales Order items"
 msgstr ""
 
@@ -54099,11 +54996,11 @@
 msgid "Purchase Order number required for Item {0}"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:618
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:622
 msgid "Purchase Order {0} is not submitted"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:824
+#: buying/doctype/purchase_order/purchase_order.py:827
 msgid "Purchase Orders"
 msgstr ""
 
@@ -54113,7 +55010,7 @@
 msgid "Purchase Orders Items Overdue"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:301
+#: buying/doctype/purchase_order/purchase_order.py:302
 msgid "Purchase Orders are not allowed for {0} due to a scorecard standing of {1}."
 msgstr ""
 
@@ -54129,7 +55026,7 @@
 msgid "Purchase Orders to Receive"
 msgstr ""
 
-#: controllers/accounts_controller.py:1517
+#: controllers/accounts_controller.py:1606
 msgid "Purchase Orders {0} are un-linked"
 msgstr ""
 
@@ -54138,17 +55035,17 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:149
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:607
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:613
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:61
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:177
+#: 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/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:310
-#: buying/doctype/purchase_order/purchase_order_list.js:43
+#: buying/doctype/purchase_order/purchase_order.js:352
+#: buying/doctype/purchase_order/purchase_order_list.js:61
 #: stock/doctype/purchase_receipt/purchase_receipt.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:56
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:65
 msgid "Purchase Receipt"
 msgstr ""
 
@@ -54265,11 +55162,11 @@
 msgid "Purchase Receipt No"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:601
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:605
 msgid "Purchase Receipt Required"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:596
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:600
 msgid "Purchase Receipt Required for item {}"
 msgstr ""
 
@@ -54282,15 +55179,15 @@
 msgid "Purchase Receipt Trends"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:314
+#: stock/doctype/purchase_receipt/purchase_receipt.js:363
 msgid "Purchase Receipt doesn't have any Item for which Retain Sample is enabled."
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:702
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:703
 msgid "Purchase Receipt {0} created."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:624
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:628
 msgid "Purchase Receipt {0} is not submitted"
 msgstr ""
 
@@ -54307,11 +55204,11 @@
 msgid "Purchase Register"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:225
+#: stock/doctype/purchase_receipt/purchase_receipt.js:258
 msgid "Purchase Return"
 msgstr ""
 
-#: setup/doctype/company/company.js:104
+#: setup/doctype/company/company.js:118
 msgid "Purchase Tax Template"
 msgstr ""
 
@@ -54428,6 +55325,7 @@
 #: stock/doctype/price_list/price_list.json
 #: stock/doctype/purchase_receipt/purchase_receipt.json
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -54493,7 +55391,7 @@
 msgid "Purple"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:287
+#: stock/doctype/stock_entry/stock_entry.js:329
 msgid "Purpose"
 msgstr ""
 
@@ -54533,7 +55431,7 @@
 msgid "Purpose"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:380
+#: stock/doctype/stock_entry/stock_entry.py:335
 msgid "Purpose must be one of {0}"
 msgstr ""
 
@@ -54574,18 +55472,21 @@
 #: controllers/trends.py:240 controllers/trends.py:252
 #: controllers/trends.py:257
 #: manufacturing/report/bom_explorer/bom_explorer.py:57
-#: public/js/bom_configurator/bom_configurator.bundle.js:203
-#: public/js/bom_configurator/bom_configurator.bundle.js:266
-#: public/js/bom_configurator/bom_configurator.bundle.js:271
-#: public/js/bom_configurator/bom_configurator.bundle.js:344
-#: public/js/utils.js:660 selling/doctype/sales_order/sales_order.js:315
-#: selling/doctype/sales_order/sales_order.js:410
-#: selling/doctype/sales_order/sales_order.js:698
-#: selling/doctype/sales_order/sales_order.js:815
+#: 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
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:106
 #: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py:166
 #: 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
+#: templates/form_grid/stock_entry_grid.html:10
 #: templates/generators/bom.html:50 templates/pages/rfq.html:40
 msgid "Qty"
 msgstr ""
@@ -54732,7 +55633,7 @@
 msgid "Qty"
 msgstr ""
 
-#: templates/pages/order.html:167
+#: templates/pages/order.html:179
 msgid "Qty "
 msgstr ""
 
@@ -54782,7 +55683,7 @@
 msgid "Qty Per Unit"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:237
+#: manufacturing/doctype/bom/bom.js:256
 #: manufacturing/report/process_loss_report/process_loss_report.py:83
 msgid "Qty To Manufacture"
 msgstr ""
@@ -54873,7 +55774,14 @@
 msgid "Qty for which recursion isn't applicable."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:713
+#. Description of the 'Apply Recursion Over (As Per Transaction UOM)' (Float)
+#. field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Qty for which recursion isn't applicable."
+msgstr ""
+
+#: manufacturing/doctype/work_order/work_order.js:766
 msgid "Qty for {0}"
 msgstr ""
 
@@ -54893,7 +55801,7 @@
 msgid "Qty in Stock UOM"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.js:145
+#: stock/doctype/pick_list/pick_list.js:174
 msgid "Qty of Finished Goods Item"
 msgstr ""
 
@@ -54903,7 +55811,7 @@
 msgid "Qty of Finished Goods Item"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:430
+#: stock/doctype/pick_list/pick_list.py:470
 msgid "Qty of Finished Goods Item should be greater than 0."
 msgstr ""
 
@@ -54933,11 +55841,12 @@
 msgid "Qty to Deliver"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:321
+#: public/js/utils/serial_no_batch_selector.js:327
 msgid "Qty to Fetch"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:668
+#: manufacturing/doctype/job_card/job_card.py:675
+#: manufacturing/doctype/workstation/workstation_job_card.html:56
 msgid "Qty to Manufacture"
 msgstr ""
 
@@ -55118,7 +56027,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: manufacturing/doctype/bom/bom.js:130
+#: manufacturing/doctype/bom/bom.js:138
 #: stock/doctype/quality_inspection/quality_inspection.json
 msgid "Quality Inspection"
 msgstr ""
@@ -55278,12 +56187,12 @@
 msgid "Quality Inspection Template Name"
 msgstr ""
 
-#: public/js/controllers/transaction.js:298
-#: stock/doctype/stock_entry/stock_entry.js:143
+#: public/js/controllers/transaction.js:324
+#: stock/doctype/stock_entry/stock_entry.js:157
 msgid "Quality Inspection(s)"
 msgstr ""
 
-#: setup/doctype/company/company.py:377
+#: setup/doctype/company/company.py:376
 msgid "Quality Management"
 msgstr ""
 
@@ -55382,23 +56291,26 @@
 
 #: 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:29
+#: buying/report/purchase_analytics/purchase_analytics.js:28
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:215
-#: manufacturing/doctype/bom/bom.js:306
-#: manufacturing/doctype/bom_creator/bom_creator.js:69
-#: public/js/controllers/buying.js:518 public/js/stock_analytics.js:37
-#: public/js/utils/serial_no_batch_selector.js:393
+#: 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/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
-#: selling/report/sales_analytics/sales_analytics.js:29
+#: selling/report/sales_analytics/sales_analytics.js:36
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:67
-#: stock/dashboard/item_dashboard.js:236
-#: stock/doctype/material_request/material_request.js:249
-#: stock/doctype/stock_entry/stock_entry.js:551
+#: stock/dashboard/item_dashboard.js:244
+#: stock/doctype/material_request/material_request.js:314
+#: stock/doctype/stock_entry/stock_entry.js:636
 #: 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:28
+#: stock/report/stock_analytics/stock_analytics.js:27
 #: templates/emails/reorder_item.html:10 templates/generators/bom.html:30
-#: templates/pages/material_request_info.html:48 templates/pages/order.html:86
+#: templates/pages/material_request_info.html:48 templates/pages/order.html:98
 msgid "Quantity"
 msgstr ""
 
@@ -55637,16 +56549,20 @@
 msgid "Quantity and Warehouse"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1270
+#: stock/doctype/stock_entry/stock_entry.py:1279
 msgid "Quantity in row {0} ({1}) must be same as manufactured quantity {2}"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:273
+#: manufacturing/doctype/plant_floor/plant_floor.js:246
+msgid "Quantity is required"
+msgstr ""
+
+#: stock/dashboard/item_dashboard.js:281
 msgid "Quantity must be greater than zero, and less or equal to {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:721
-#: stock/doctype/pick_list/pick_list.js:152
+#: manufacturing/doctype/work_order/work_order.js:775
+#: stock/doctype/pick_list/pick_list.js:182
 msgid "Quantity must not be more than {0}"
 msgstr ""
 
@@ -55661,26 +56577,27 @@
 msgstr ""
 
 #: manufacturing/doctype/bom/bom.py:568
+#: manufacturing/doctype/workstation/workstation.js:216
 msgid "Quantity should be greater than 0"
 msgstr ""
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:22
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:21
 msgid "Quantity to Make"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:249
+#: manufacturing/doctype/work_order/work_order.js:264
 msgid "Quantity to Manufacture"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1516
+#: manufacturing/doctype/work_order/work_order.py:1530
 msgid "Quantity to Manufacture can not be zero for the operation {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:934
+#: manufacturing/doctype/work_order/work_order.py:948
 msgid "Quantity to Manufacture must be greater than 0."
 msgstr ""
 
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:21
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:24
 msgid "Quantity to Produce"
 msgstr ""
 
@@ -55688,7 +56605,7 @@
 msgid "Quantity to Produce should be greater than zero."
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:227
+#: public/js/utils/barcode_scanner.js:236
 msgid "Quantity to Scan"
 msgstr ""
 
@@ -55697,20 +56614,20 @@
 msgid "Quarter {0} {1}"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:65
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:68
-#: buying/report/purchase_analytics/purchase_analytics.js:63
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:59
-#: manufacturing/report/production_analytics/production_analytics.js:36
-#: public/js/financial_statements.js:218
+#: accounts/report/budget_variance_report/budget_variance_report.js:63
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:76
+#: buying/report/purchase_analytics/purchase_analytics.js:62
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:58
+#: manufacturing/report/production_analytics/production_analytics.js:35
+#: public/js/financial_statements.js:227
 #: public/js/purchase_trends_filters.js:20 public/js/sales_trends_filters.js:12
-#: public/js/stock_analytics.js:54
-#: selling/report/sales_analytics/sales_analytics.js:63
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:34
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:34
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:34
-#: stock/report/stock_analytics/stock_analytics.js:82
-#: support/report/issue_analytics/issue_analytics.js:44
+#: public/js/stock_analytics.js:84
+#: selling/report/sales_analytics/sales_analytics.js:70
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:33
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:33
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:33
+#: stock/report/stock_analytics/stock_analytics.js:81
+#: support/report/issue_analytics/issue_analytics.js:43
 msgid "Quarterly"
 msgstr ""
 
@@ -55798,11 +56715,18 @@
 msgid "Queued"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:39
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Queued"
+msgstr ""
+
+#: accounts/doctype/journal_entry/journal_entry.js:82
 msgid "Quick Entry"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:527
+#: accounts/doctype/journal_entry/journal_entry.js:577
 msgid "Quick Journal Entry"
 msgstr ""
 
@@ -55839,13 +56763,14 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/doctype/sales_invoice/sales_invoice.js:257
-#: buying/doctype/supplier_quotation/supplier_quotation.js:26
-#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:100
-#: crm/report/lead_details/lead_details.js:38
-#: manufacturing/doctype/blanket_order/blanket_order.js:33
+#: accounts/doctype/sales_invoice/sales_invoice.js:287
+#: buying/doctype/supplier_quotation/supplier_quotation.js:27
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.html:20
+#: crm/doctype/lead/lead.js:39 crm/doctype/opportunity/opportunity.js:108
+#: crm/report/lead_details/lead_details.js:37
+#: manufacturing/doctype/blanket_order/blanket_order.js:38
 #: selling/doctype/quotation/quotation.json
-#: selling/doctype/sales_order/sales_order.js:613
+#: selling/doctype/sales_order/sales_order.js:721
 msgid "Quotation"
 msgstr ""
 
@@ -55953,11 +56878,11 @@
 msgid "Quotation Trends"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:383
+#: selling/doctype/sales_order/sales_order.py:386
 msgid "Quotation {0} is cancelled"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:300
+#: selling/doctype/sales_order/sales_order.py:303
 msgid "Quotation {0} not of type {1}"
 msgstr ""
 
@@ -56013,13 +56938,13 @@
 msgid "Random"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:58
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:26
-#: manufacturing/report/production_analytics/production_analytics.js:31
-#: public/js/stock_analytics.js:49
-#: selling/report/sales_analytics/sales_analytics.js:58
-#: stock/report/stock_analytics/stock_analytics.js:77
-#: support/report/issue_analytics/issue_analytics.js:39
+#: buying/report/purchase_analytics/purchase_analytics.js:57
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:25
+#: manufacturing/report/production_analytics/production_analytics.js:30
+#: public/js/stock_analytics.js:78
+#: selling/report/sales_analytics/sales_analytics.js:65
+#: stock/report/stock_analytics/stock_analytics.js:76
+#: support/report/issue_analytics/issue_analytics.js:38
 msgid "Range"
 msgstr ""
 
@@ -56039,12 +56964,13 @@
 #: 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:669
+#: accounts/report/share_ledger/share_ledger.py:56 public/js/utils.js:732
 #: 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:243
+#: stock/dashboard/item_dashboard.js:251
 #: stock/report/delayed_item_report/delayed_item_report.py:151
-#: templates/pages/order.html:89 templates/pages/rfq.html:43
+#: templates/form_grid/item_grid.html:8 templates/pages/order.html:101
+#: templates/pages/rfq.html:43
 msgid "Rate"
 msgstr ""
 
@@ -56654,6 +57580,7 @@
 msgstr ""
 
 #: manufacturing/report/bom_variance_report/bom_variance_report.py:52
+#: public/js/bom_configurator/bom_configurator.bundle.js:118
 #: setup/setup_wizard/operations/install_fixtures.py:46
 #: setup/setup_wizard/operations/install_fixtures.py:167
 msgid "Raw Material"
@@ -56723,12 +57650,13 @@
 msgid "Raw Material Value"
 msgstr ""
 
-#: manufacturing/report/production_planning_report/production_planning_report.js:66
+#: manufacturing/report/production_planning_report/production_planning_report.js:65
 msgid "Raw Material Warehouse"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:274
-#: public/js/bom_configurator/bom_configurator.bundle.js:268
+#: manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/workstation/workstation_job_card.html:76
+#: public/js/bom_configurator/bom_configurator.bundle.js:289
 msgid "Raw Materials"
 msgstr ""
 
@@ -56814,12 +57742,12 @@
 msgid "Raw Materials cannot be blank."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:304
-#: manufacturing/doctype/production_plan/production_plan.js:97
-#: manufacturing/doctype/work_order/work_order.js:574
-#: selling/doctype/sales_order/sales_order.js:526
-#: selling/doctype/sales_order/sales_order_list.js:49
-#: stock/doctype/material_request/material_request.js:166
+#: buying/doctype/purchase_order/purchase_order.js:342
+#: manufacturing/doctype/production_plan/production_plan.js:103
+#: manufacturing/doctype/work_order/work_order.js:610
+#: selling/doctype/sales_order/sales_order.js:563
+#: selling/doctype/sales_order/sales_order_list.js:62
+#: stock/doctype/material_request/material_request.js:197
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 msgid "Re-open"
 msgstr ""
@@ -56836,7 +57764,7 @@
 msgid "Re-order Qty"
 msgstr ""
 
-#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:226
+#: accounts/doctype/bisect_accounting_statements/bisect_accounting_statements.py:227
 msgid "Reached Root"
 msgstr ""
 
@@ -56923,11 +57851,11 @@
 msgid "Readings"
 msgstr ""
 
-#: support/doctype/issue/issue.js:44
+#: support/doctype/issue/issue.js:51
 msgid "Reason"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:242
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:279
 msgid "Reason For Putting On Hold"
 msgstr ""
 
@@ -56937,8 +57865,14 @@
 msgid "Reason For Putting On Hold"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:565
-#: selling/doctype/sales_order/sales_order.js:1112
+#. Label of a Data field in DocType 'Payment Request'
+#: accounts/doctype/payment_request/payment_request.json
+msgctxt "Payment Request"
+msgid "Reason for Failure"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:661
+#: selling/doctype/sales_order/sales_order.js:1274
 msgid "Reason for Hold"
 msgstr ""
 
@@ -56948,11 +57882,11 @@
 msgid "Reason for Leaving"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:1127
+#: selling/doctype/sales_order/sales_order.js:1289
 msgid "Reason for hold:"
 msgstr ""
 
-#: manufacturing/doctype/bom_creator/bom_creator.js:144
+#: manufacturing/doctype/bom_creator/bom_creator.js:140
 msgid "Rebuild Tree"
 msgstr ""
 
@@ -56966,11 +57900,11 @@
 msgid "Recalculate Incoming/Outgoing Rate"
 msgstr ""
 
-#: projects/doctype/project/project.js:104
+#: projects/doctype/project/project.js:128
 msgid "Recalculating Purchase Cost against this Project..."
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:29
+#: assets/doctype/asset/asset_list.js:21
 msgid "Receipt"
 msgstr ""
 
@@ -57016,7 +57950,7 @@
 msgid "Receipt Document Type"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:53
+#: accounts/report/account_balance/account_balance.js:55
 msgid "Receivable"
 msgstr ""
 
@@ -57045,7 +57979,7 @@
 msgid "Receivable / Payable Account"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:67
+#: 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
@@ -57079,10 +58013,10 @@
 msgid "Receive"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:297
+#: buying/doctype/request_for_quotation/request_for_quotation.py:321
 #: buying/doctype/supplier_quotation/supplier_quotation.py:175
-#: stock/doctype/material_request/material_request_list.js:23
-#: stock/doctype/material_request/material_request_list.js:31
+#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:35
 msgid "Received"
 msgstr ""
 
@@ -57123,7 +58057,7 @@
 msgid "Received Amount After Tax (Company Currency)"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:891
+#: accounts/doctype/payment_entry/payment_entry.py:900
 msgid "Received Amount cannot be greater than Paid Amount"
 msgstr ""
 
@@ -57197,6 +58131,7 @@
 msgstr ""
 
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:50
+#: manufacturing/notification/material_request_receipt_notification/material_request_receipt_notification.html:9
 msgid "Received Quantity"
 msgstr ""
 
@@ -57212,7 +58147,7 @@
 msgid "Received Quantity"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:250
+#: stock/doctype/stock_entry/stock_entry.js:278
 msgid "Received Stock Entries"
 msgstr ""
 
@@ -57245,6 +58180,10 @@
 msgid "Receiving"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_past_order_list.js:17
+msgid "Recent Orders"
+msgstr ""
+
 #. Label of a Dynamic Link field in DocType 'Email Campaign'
 #: crm/doctype/email_campaign/email_campaign.json
 msgctxt "Email Campaign"
@@ -57275,8 +58214,8 @@
 msgid "Recipients"
 msgstr ""
 
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:89
 #: accounts/doctype/payment_reconciliation/payment_reconciliation.js:90
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:93
 msgid "Reconcile"
 msgstr ""
 
@@ -57286,11 +58225,11 @@
 msgid "Reconcile"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:325
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:341
 msgid "Reconcile Entries"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:217
+#: public/js/bank_reconciliation_tool/dialog_manager.js:221
 msgid "Reconcile the Bank Transaction"
 msgstr ""
 
@@ -57367,6 +58306,12 @@
 msgid "Recurse Every (As Per Transaction UOM)"
 msgstr ""
 
+#. Label of a Float field in DocType 'Promotional Scheme Product Discount'
+#: accounts/doctype/promotional_scheme_product_discount/promotional_scheme_product_discount.json
+msgctxt "Promotional Scheme Product Discount"
+msgid "Recurse Every (As Per Transaction UOM)"
+msgstr ""
+
 #: accounts/doctype/pricing_rule/pricing_rule.py:232
 msgid "Recurse Over Qty cannot be less than 0"
 msgstr ""
@@ -57395,7 +58340,7 @@
 msgid "Redeem Against"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:497
+#: selling/page/point_of_sale/pos_payment.js:525
 msgid "Redeem Loyalty Points"
 msgstr ""
 
@@ -57476,7 +58421,12 @@
 #: accounts/doctype/promotional_scheme/promotional_scheme_dashboard.py:7
 #: accounts/doctype/purchase_invoice/purchase_invoice_dashboard.py:22
 #: accounts/doctype/sales_invoice/sales_invoice_dashboard.py:34
+#: accounts/report/accounts_receivable/accounts_receivable.html:136
+#: 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/general_ledger/general_ledger.html:28
 #: buying/doctype/purchase_order/purchase_order_dashboard.py:22
 #: buying/doctype/supplier_quotation/supplier_quotation_dashboard.py:15
 #: manufacturing/doctype/job_card/job_card_dashboard.py:10
@@ -57630,11 +58580,12 @@
 msgid "Reference"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:899
+#: accounts/doctype/journal_entry/journal_entry.py:926
 msgid "Reference #{0} dated {1}"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:112
+#: accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.html:27
+#: public/js/bank_reconciliation_tool/dialog_manager.js:119
 msgid "Reference Date"
 msgstr ""
 
@@ -57644,7 +58595,7 @@
 msgid "Reference Date"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2073
+#: public/js/controllers/transaction.js:2116
 msgid "Reference Date for Early Payment Discount"
 msgstr ""
 
@@ -57666,7 +58617,7 @@
 msgid "Reference Doctype"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:555
+#: accounts/doctype/payment_entry/payment_entry.py:564
 msgid "Reference Doctype must be one of {0}"
 msgstr ""
 
@@ -57835,24 +58786,30 @@
 msgid "Reference Name"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:532
+#. Label of a Data field in DocType 'Sales Invoice Payment'
+#: accounts/doctype/sales_invoice_payment/sales_invoice_payment.json
+msgctxt "Sales Invoice Payment"
+msgid "Reference No"
+msgstr ""
+
+#: accounts/doctype/journal_entry/journal_entry.py:548
 msgid "Reference No & Reference Date is required for {0}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1087
+#: accounts/doctype/payment_entry/payment_entry.py:1096
 msgid "Reference No and Reference Date is mandatory for Bank transaction"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:537
+#: accounts/doctype/journal_entry/journal_entry.py:553
 msgid "Reference No is mandatory if you entered Reference Date"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:260
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
 msgid "Reference No."
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:88
-#: public/js/bank_reconciliation_tool/dialog_manager.js:123
+#: public/js/bank_reconciliation_tool/data_table_manager.js:83
+#: public/js/bank_reconciliation_tool/dialog_manager.js:130
 msgid "Reference Number"
 msgstr ""
 
@@ -58028,7 +58985,15 @@
 msgid "References"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:631
+#: stock/doctype/delivery_note/delivery_note.py:395
+msgid "References to Sales Invoices are Incomplete"
+msgstr ""
+
+#: stock/doctype/delivery_note/delivery_note.py:371
+msgid "References to Sales Orders are Incomplete"
+msgstr ""
+
+#: accounts/doctype/payment_entry/payment_entry.py:640
 msgid "References {0} of type {1} had no outstanding amount left before submitting the Payment Entry. Now they have a negative outstanding amount."
 msgstr ""
 
@@ -58044,7 +59009,8 @@
 msgid "Referral Sales Partner"
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:44
+#: public/js/plant_floor_visual/visual_plant.js:151
+#: selling/page/sales_funnel/sales_funnel.js:51
 msgid "Refresh"
 msgstr ""
 
@@ -58054,7 +59020,7 @@
 msgid "Refresh Google Sheet"
 msgstr ""
 
-#: accounts/doctype/bank/bank.js:22
+#: accounts/doctype/bank/bank.js:21
 msgid "Refresh Plaid Link"
 msgstr ""
 
@@ -58064,7 +59030,7 @@
 msgid "Refresh Token"
 msgstr ""
 
-#: stock/reorder_item.py:303
+#: stock/reorder_item.py:388
 msgid "Regards,"
 msgstr ""
 
@@ -58206,8 +59172,8 @@
 msgid "Relation"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:234
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:278
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:271
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:315
 msgid "Release Date"
 msgstr ""
 
@@ -58223,7 +59189,7 @@
 msgid "Release Date"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:314
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:318
 msgid "Release date must be in the future"
 msgstr ""
 
@@ -58233,17 +59199,18 @@
 msgid "Relieving Date"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:118
+#: public/js/bank_reconciliation_tool/dialog_manager.js:125
 msgid "Remaining"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:186
-#: accounts/report/accounts_receivable/accounts_receivable.py:1085
+#: 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
 msgid "Remaining Balance"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:350
+#: selling/page/point_of_sale/pos_payment.js:367
 msgid "Remark"
 msgstr ""
 
@@ -58266,8 +59233,14 @@
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:240
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:311
 #: accounts/print_format/payment_receipt_voucher/payment_receipt_voucher.html:11
-#: accounts/report/accounts_receivable/accounts_receivable.py:1117
-#: accounts/report/general_ledger/general_ledger.py:661
+#: accounts/report/accounts_receivable/accounts_receivable.html:142
+#: 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/general_ledger/general_ledger.html:29
+#: accounts/report/general_ledger/general_ledger.html:51
+#: accounts/report/general_ledger/general_ledger.py:674
 #: 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
@@ -58390,11 +59363,15 @@
 msgid "Remarks Column Length"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:323
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Remove item if charges is not applicable to that item"
+msgstr ""
+
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:377
 msgid "Removed items with no change in quantity or value."
 msgstr ""
 
-#: utilities/doctype/rename_tool/rename_tool.js:25
+#: utilities/doctype/rename_tool/rename_tool.js:24
 msgid "Rename"
 msgstr ""
 
@@ -58411,7 +59388,7 @@
 msgid "Rename Log"
 msgstr ""
 
-#: accounts/doctype/account/account.py:502
+#: accounts/doctype/account/account.py:521
 msgid "Rename Not Allowed"
 msgstr ""
 
@@ -58420,7 +59397,7 @@
 msgid "Rename Tool"
 msgstr ""
 
-#: accounts/doctype/account/account.py:494
+#: accounts/doctype/account/account.py:513
 msgid "Renaming it is only allowed via parent company {0}, to avoid mismatch."
 msgstr ""
 
@@ -58443,11 +59420,11 @@
 msgid "Rented"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order_list.js:34
-#: crm/doctype/opportunity/opportunity.js:113
-#: stock/doctype/delivery_note/delivery_note.js:228
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: support/doctype/issue/issue.js:30
+#: buying/doctype/purchase_order/purchase_order_list.js:53
+#: crm/doctype/opportunity/opportunity.js:123
+#: stock/doctype/delivery_note/delivery_note.js:277
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: support/doctype/issue/issue.js:37
 msgid "Reopen"
 msgstr ""
 
@@ -58484,7 +59461,7 @@
 msgid "Repair"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:107
+#: assets/doctype/asset/asset.js:127
 msgid "Repair Asset"
 msgstr ""
 
@@ -58532,9 +59509,16 @@
 msgid "Replace BOM"
 msgstr ""
 
-#: crm/report/lead_details/lead_details.js:36
-#: support/report/issue_analytics/issue_analytics.js:57
-#: support/report/issue_summary/issue_summary.js:44
+#. Description of a DocType
+#: manufacturing/doctype/bom_update_tool/bom_update_tool.json
+msgid ""
+"Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM.\n"
+"It also updates latest price in all the BOMs."
+msgstr ""
+
+#: 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
 msgid "Replied"
 msgstr ""
@@ -58563,7 +59547,7 @@
 msgid "Replied"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:86
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:110
 msgid "Report"
 msgstr ""
 
@@ -58583,7 +59567,7 @@
 msgid "Report Date"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:213
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:192
 msgid "Report Error"
 msgstr ""
 
@@ -58599,12 +59583,12 @@
 msgid "Report Type"
 msgstr ""
 
-#: accounts/doctype/account/account.py:395
+#: accounts/doctype/account/account.py:414
 msgid "Report Type is mandatory"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:17
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:17
+#: accounts/report/balance_sheet/balance_sheet.js:13
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:13
 msgid "Report View"
 msgstr ""
 
@@ -58638,8 +59622,9 @@
 msgid "Reports to"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:70
-#: accounts/doctype/sales_invoice/sales_invoice.js:73
+#: accounts/doctype/journal_entry/journal_entry.js:34
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:87
+#: accounts/doctype/sales_invoice/sales_invoice.js:78
 msgid "Repost Accounting Entries"
 msgstr ""
 
@@ -58684,6 +59669,12 @@
 msgid "Repost Payment Ledger Items"
 msgstr ""
 
+#. Label of a Check field in DocType 'Journal Entry'
+#: accounts/doctype/journal_entry/journal_entry.json
+msgctxt "Journal Entry"
+msgid "Repost Required"
+msgstr ""
+
 #. Label of a Check field in DocType 'Purchase Invoice'
 #: accounts/doctype/purchase_invoice/purchase_invoice.json
 msgctxt "Purchase Invoice"
@@ -58702,11 +59693,11 @@
 msgid "Repost Status"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:137
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:138
 msgid "Repost has started in the background"
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:38
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:40
 msgid "Repost in background"
 msgstr ""
 
@@ -58714,7 +59705,7 @@
 msgid "Repost started in the background"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:105
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:115
 msgid "Reposting Completed {0}%"
 msgstr ""
 
@@ -58730,7 +59721,7 @@
 msgid "Reposting Info"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:113
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:123
 msgid "Reposting Progress"
 msgstr ""
 
@@ -58739,16 +59730,17 @@
 msgid "Reposting entries created: {0}"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:89
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:99
 msgid "Reposting has been started in the background."
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:47
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:49
 msgid "Reposting in the background."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:76
-#: accounts/doctype/sales_invoice/sales_invoice.js:79
+#: accounts/doctype/journal_entry/journal_entry.js:39
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:92
+#: accounts/doctype/sales_invoice/sales_invoice.js:83
 msgid "Reposting..."
 msgstr ""
 
@@ -58806,11 +59798,20 @@
 msgid "Represents Company"
 msgstr ""
 
-#: public/js/utils.js:678
+#. Description of a DocType
+#: accounts/doctype/fiscal_year/fiscal_year.json
+msgid "Represents a Financial Year. All accounting entries and other major transactions are tracked against the Fiscal Year."
+msgstr ""
+
+#: templates/form_grid/material_request_grid.html:25
+msgid "Reqd By Date"
+msgstr ""
+
+#: public/js/utils.js:742
 msgid "Reqd by date"
 msgstr ""
 
-#: crm/doctype/opportunity/opportunity.js:87
+#: crm/doctype/opportunity/opportunity.js:89
 msgid "Request For Quotation"
 msgstr ""
 
@@ -58820,7 +59821,7 @@
 msgid "Request Parameters"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:269
+#: accounts/doctype/pos_invoice/pos_invoice.js:292
 msgid "Request Timeout"
 msgstr ""
 
@@ -58844,11 +59845,11 @@
 
 #. Name of a DocType
 #: buying/doctype/request_for_quotation/request_for_quotation.json
-#: buying/doctype/request_for_quotation/request_for_quotation.py:346
-#: buying/doctype/supplier_quotation/supplier_quotation.js:57
+#: buying/doctype/request_for_quotation/request_for_quotation.py:370
+#: 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
-#: stock/doctype/material_request/material_request.js:142
+#: stock/doctype/material_request/material_request.js:162
 msgid "Request for Quotation"
 msgstr ""
 
@@ -58886,7 +59887,7 @@
 msgid "Request for Quotation Supplier"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:571
+#: selling/doctype/sales_order/sales_order.js:650
 msgid "Request for Raw Materials"
 msgstr ""
 
@@ -58942,6 +59943,10 @@
 msgid "Requested Qty"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Requested Qty: Quantity requested for purchase, but not ordered."
+msgstr ""
+
 #: buying/report/procurement_tracker/procurement_tracker.py:46
 msgid "Requesting Site"
 msgstr ""
@@ -59028,8 +60033,15 @@
 msgid "Required Items"
 msgstr ""
 
+#: templates/form_grid/material_request_grid.html:7
+msgid "Required On"
+msgstr ""
+
 #: 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_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
@@ -59106,7 +60118,7 @@
 msgid "Research"
 msgstr ""
 
-#: setup/doctype/company/company.py:383
+#: setup/doctype/company/company.py:382
 msgid "Research & Development"
 msgstr ""
 
@@ -59138,11 +60150,11 @@
 msgid "Reselect, if the chosen contact is edited after save"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.js:30
+#: accounts/doctype/payment_request/payment_request.js:39
 msgid "Resend Payment Email"
 msgstr ""
 
-#: stock/report/reserved_stock/reserved_stock.js:121
+#: stock/report/reserved_stock/reserved_stock.js:118
 msgid "Reservation Based On"
 msgstr ""
 
@@ -59152,12 +60164,12 @@
 msgid "Reservation Based On"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: stock/doctype/pick_list/pick_list.js:110
+#: selling/doctype/sales_order/sales_order.js:80
+#: stock/doctype/pick_list/pick_list.js:126
 msgid "Reserve"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:322
+#: selling/doctype/sales_order/sales_order.js:347
 msgid "Reserve Stock"
 msgstr ""
 
@@ -59191,6 +60203,8 @@
 msgid "Reserved"
 msgstr ""
 
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:29
+#: stock/dashboard/item_dashboard_list.html:20
 #: stock/report/reserved_stock/reserved_stock.py:124
 #: stock/report/stock_projected_qty/stock_projected_qty.py:164
 msgid "Reserved Qty"
@@ -59230,16 +60244,28 @@
 msgid "Reserved Qty for Production Plan"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Production: Raw materials quantity to make manufacturing items."
+msgstr ""
+
 #. Label of a Float field in DocType 'Bin'
 #: stock/doctype/bin/bin.json
 msgctxt "Bin"
 msgid "Reserved Qty for Subcontract"
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty for Subcontract: Raw materials quantity to make subcontracted items."
+msgstr ""
+
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:497
 msgid "Reserved Qty should be greater than Delivered Qty."
 msgstr ""
 
+#: manufacturing/doctype/production_plan/production_plan.js:150
+msgid "Reserved Qty: Quantity ordered for sale, but not delivered."
+msgstr ""
+
 #: stock/report/item_shortage_report/item_shortage_report.py:116
 msgid "Reserved Quantity"
 msgstr ""
@@ -59248,16 +60274,18 @@
 msgid "Reserved Quantity for Production"
 msgstr ""
 
-#: stock/stock_ledger.py:1982
+#: stock/stock_ledger.py:1989
 msgid "Reserved Serial No."
 msgstr ""
 
 #. Name of a report
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:374
-#: stock/doctype/pick_list/pick_list.js:120
+#: manufacturing/doctype/plant_floor/stock_summary_template.html:24
+#: selling/doctype/sales_order/sales_order.js:99
+#: selling/doctype/sales_order/sales_order.js:404
+#: 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:459 stock/stock_ledger.py:1962
+#: stock/report/stock_balance/stock_balance.py:467 stock/stock_ledger.py:1969
 msgid "Reserved Stock"
 msgstr ""
 
@@ -59267,7 +60295,7 @@
 msgid "Reserved Stock"
 msgstr ""
 
-#: stock/stock_ledger.py:2012
+#: stock/stock_ledger.py:2019
 msgid "Reserved Stock for Batch"
 msgstr ""
 
@@ -59299,21 +60327,27 @@
 msgid "Reserved for sub contracting"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:335
-#: stock/doctype/pick_list/pick_list.js:237
+#: selling/doctype/sales_order/sales_order.js:360
+#: stock/doctype/pick_list/pick_list.js:271
 msgid "Reserving Stock..."
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:139
-#: support/doctype/issue/issue.js:48
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:155
+#: support/doctype/issue/issue.js:55
 msgid "Reset"
 msgstr ""
 
+#. Label of a Check field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Reset Company Default Values"
+msgstr ""
+
 #: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:19
 msgid "Reset Plaid Link"
 msgstr ""
 
-#: support/doctype/issue/issue.js:39
+#: support/doctype/issue/issue.js:46
 msgid "Reset Service Level Agreement"
 msgstr ""
 
@@ -59323,7 +60357,7 @@
 msgid "Reset Service Level Agreement"
 msgstr ""
 
-#: support/doctype/issue/issue.js:56
+#: support/doctype/issue/issue.js:63
 msgid "Resetting Service Level Agreement."
 msgstr ""
 
@@ -59412,8 +60446,8 @@
 msgstr ""
 
 #: accounts/doctype/dunning/dunning_list.js:4
-#: support/report/issue_analytics/issue_analytics.js:58
-#: support/report/issue_summary/issue_summary.js:46
+#: support/report/issue_analytics/issue_analytics.js:57
+#: support/report/issue_summary/issue_summary.js:45
 #: support/report/issue_summary/issue_summary.py:366
 msgid "Resolved"
 msgstr ""
@@ -59493,7 +60527,7 @@
 msgid "Rest Of The World"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:72
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:82
 msgid "Restart"
 msgstr ""
 
@@ -59501,7 +60535,7 @@
 msgid "Restart Subscription"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:96
+#: assets/doctype/asset/asset.js:108
 msgid "Restore Asset"
 msgstr ""
 
@@ -59548,12 +60582,12 @@
 msgid "Result Title Field"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: selling/doctype/sales_order/sales_order.js:515
+#: buying/doctype/purchase_order/purchase_order.js:321
+#: selling/doctype/sales_order/sales_order.js:549
 msgid "Resume"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:255
+#: manufacturing/doctype/job_card/job_card.js:288
 msgid "Resume Job"
 msgstr ""
 
@@ -59580,11 +60614,11 @@
 msgid "Retained Earnings"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:232
+#: stock/doctype/purchase_receipt/purchase_receipt.js:274
 msgid "Retention Stock Entry"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:450
+#: stock/doctype/stock_entry/stock_entry.js:510
 msgid "Retention Stock Entry already created or Sample Quantity not provided"
 msgstr ""
 
@@ -59594,20 +60628,21 @@
 msgid "Retried"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:134
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 #: accounts/doctype/ledger_merge/ledger_merge.js:72
-#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:65
+#: accounts/doctype/pos_closing_entry/pos_closing_entry.js:66
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
 msgid "Retry"
 msgstr ""
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:13
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:27
 msgid "Retry Failed Transactions"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:50
-#: accounts/doctype/sales_invoice/sales_invoice.py:263
-#: stock/doctype/delivery_note/delivery_note_list.js:6
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:6
+#: accounts/doctype/pos_invoice/pos_invoice.js:54
+#: accounts/doctype/sales_invoice/sales_invoice.py:268
+#: stock/doctype/delivery_note/delivery_note_list.js:16
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:15
 msgid "Return"
 msgstr ""
 
@@ -59635,11 +60670,11 @@
 msgid "Return"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:120
+#: accounts/doctype/sales_invoice/sales_invoice.js:121
 msgid "Return / Credit Note"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:119
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:139
 msgid "Return / Debit Note"
 msgstr ""
 
@@ -59685,12 +60720,12 @@
 msgid "Return Against Subcontracting Receipt"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:194
+#: manufacturing/doctype/work_order/work_order.js:205
 msgid "Return Components"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note_list.js:10
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:10
+#: stock/doctype/delivery_note/delivery_note_list.js:20
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:19
 msgid "Return Issued"
 msgstr ""
 
@@ -59712,16 +60747,16 @@
 msgid "Return Issued"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:287
+#: stock/doctype/purchase_receipt/purchase_receipt.js:334
 msgid "Return Qty"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.js:265
+#: stock/doctype/purchase_receipt/purchase_receipt.js:310
 msgid "Return Qty from Rejected Warehouse"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:77
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:142
+#: buying/doctype/purchase_order/purchase_order.js:80
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:150
 msgid "Return of Components"
 msgstr ""
 
@@ -59801,7 +60836,7 @@
 msgid "Returned Qty in Stock UOM"
 msgstr ""
 
-#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:103
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.py:104
 msgid "Returned exchange rate is neither integer not float."
 msgstr ""
 
@@ -59819,14 +60854,14 @@
 msgid "Returns"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:154
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:116
-#: accounts/report/accounts_receivable/accounts_receivable.js:186
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:144
+#: accounts/report/accounts_payable/accounts_payable.js:157
+#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:119
+#: accounts/report/accounts_receivable/accounts_receivable.js:189
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:147
 msgid "Revaluation Journals"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:80
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
 msgid "Revenue"
 msgstr ""
 
@@ -59836,7 +60871,7 @@
 msgid "Reversal Of"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:33
+#: accounts/doctype/journal_entry/journal_entry.js:73
 msgid "Reverse Journal Entry"
 msgstr ""
 
@@ -59993,12 +61028,12 @@
 msgid "Root"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:41
+#: accounts/doctype/account/account_tree.js:47
 msgid "Root Company"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:112
-#: accounts/report/account_balance/account_balance.js:23
+#: accounts/doctype/account/account_tree.js:145
+#: accounts/report/account_balance/account_balance.js:22
 msgid "Root Type"
 msgstr ""
 
@@ -60018,11 +61053,11 @@
 msgid "Root Type for {0} must be one of the Asset, Liability, Income, Expense and Equity"
 msgstr ""
 
-#: accounts/doctype/account/account.py:392
+#: accounts/doctype/account/account.py:411
 msgid "Root Type is mandatory"
 msgstr ""
 
-#: accounts/doctype/account/account.py:195
+#: accounts/doctype/account/account.py:214
 msgid "Root cannot be edited."
 msgstr ""
 
@@ -60038,7 +61073,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:66
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:90
-#: accounts/report/account_balance/account_balance.js:54
+#: accounts/report/account_balance/account_balance.js:56
 msgid "Round Off"
 msgstr ""
 
@@ -60299,12 +61334,12 @@
 msgid "Rounding Loss Allowance"
 msgstr ""
 
-#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:41
+#: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.js:45
 #: accounts/doctype/exchange_rate_revaluation/exchange_rate_revaluation.py:48
 msgid "Rounding Loss Allowance should be between 0 and 1"
 msgstr ""
 
-#: controllers/stock_controller.py:216 controllers/stock_controller.py:231
+#: controllers/stock_controller.py:398 controllers/stock_controller.py:413
 msgid "Rounding gain/loss Entry for Stock Transfer"
 msgstr ""
 
@@ -60345,11 +61380,11 @@
 msgid "Routing Name"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:428
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:482
 msgid "Row #"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:334
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:388
 msgid "Row # {0}:"
 msgstr ""
 
@@ -60366,12 +61401,12 @@
 msgstr ""
 
 #: accounts/doctype/pos_invoice/pos_invoice.py:439
-#: accounts/doctype/sales_invoice/sales_invoice.py:1715
+#: accounts/doctype/sales_invoice/sales_invoice.py:1684
 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:1710
+#: accounts/doctype/sales_invoice/sales_invoice.py:1679
 msgid "Row #{0} (Payment Table): Amount must be positive"
 msgstr ""
 
@@ -60388,7 +61423,7 @@
 msgstr ""
 
 #: controllers/subcontracting_controller.py:72
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:413
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:414
 msgid "Row #{0}: Accepted Warehouse and Rejected Warehouse cannot be same"
 msgstr ""
 
@@ -60396,11 +61431,11 @@
 msgid "Row #{0}: Accepted Warehouse and Supplier Warehouse cannot be same"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:406
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:407
 msgid "Row #{0}: Accepted Warehouse is mandatory for the accepted Item {1}"
 msgstr ""
 
-#: controllers/accounts_controller.py:887
+#: controllers/accounts_controller.py:939
 msgid "Row #{0}: Account {1} does not belong to company {2}"
 msgstr ""
 
@@ -60413,15 +61448,15 @@
 msgid "Row #{0}: Allocated amount:{1} is greater than outstanding amount:{2} for Payment Term {3}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:309
+#: assets/doctype/asset_capitalization/asset_capitalization.py:315
 msgid "Row #{0}: Amount must be a positive number"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:375
+#: accounts/doctype/sales_invoice/sales_invoice.py:386
 msgid "Row #{0}: Asset {1} cannot be submitted, it is already {2}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:351
+#: buying/doctype/purchase_order/purchase_order.py:352
 msgid "Row #{0}: BOM is not specified for subcontracting item {0}"
 msgstr ""
 
@@ -60429,27 +61464,27 @@
 msgid "Row #{0}: Batch No {1} is already selected."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:736
+#: accounts/doctype/payment_entry/payment_entry.py:745
 msgid "Row #{0}: Cannot allocate more than {1} against payment term {2}"
 msgstr ""
 
-#: controllers/accounts_controller.py:3064
+#: controllers/accounts_controller.py:3155
 msgid "Row #{0}: Cannot delete item {1} which has already been billed."
 msgstr ""
 
-#: controllers/accounts_controller.py:3038
+#: controllers/accounts_controller.py:3129
 msgid "Row #{0}: Cannot delete item {1} which has already been delivered"
 msgstr ""
 
-#: controllers/accounts_controller.py:3057
+#: controllers/accounts_controller.py:3148
 msgid "Row #{0}: Cannot delete item {1} which has already been received"
 msgstr ""
 
-#: controllers/accounts_controller.py:3044
+#: controllers/accounts_controller.py:3135
 msgid "Row #{0}: Cannot delete item {1} which has work order assigned to it."
 msgstr ""
 
-#: controllers/accounts_controller.py:3050
+#: controllers/accounts_controller.py:3141
 msgid "Row #{0}: Cannot delete item {1} which is assigned to customer's purchase order."
 msgstr ""
 
@@ -60457,11 +61492,11 @@
 msgid "Row #{0}: Cannot select Supplier Warehouse while suppling raw materials to subcontractor"
 msgstr ""
 
-#: controllers/accounts_controller.py:3309
+#: controllers/accounts_controller.py:3400
 msgid "Row #{0}: Cannot set Rate if amount is greater than billed amount for Item {1}."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:864
+#: manufacturing/doctype/job_card/job_card.py:871
 msgid "Row #{0}: Cannot transfer more than Required Qty {1} for Item {2} against Job Card {3}"
 msgstr ""
 
@@ -60469,31 +61504,31 @@
 msgid "Row #{0}: Child Item should not be a Product Bundle. Please remove Item {1} and Save"
 msgstr ""
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:97
+#: accounts/doctype/bank_clearance/bank_clearance.py:99
 msgid "Row #{0}: Clearance date {1} cannot be before Cheque Date {2}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:286
+#: assets/doctype/asset_capitalization/asset_capitalization.py:292
 msgid "Row #{0}: Consumed Asset {1} cannot be Draft"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:288
+#: assets/doctype/asset_capitalization/asset_capitalization.py:294
 msgid "Row #{0}: Consumed Asset {1} cannot be cancelled"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:273
+#: assets/doctype/asset_capitalization/asset_capitalization.py:279
 msgid "Row #{0}: Consumed Asset {1} cannot be the same as the Target Asset"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:282
+#: assets/doctype/asset_capitalization/asset_capitalization.py:288
 msgid "Row #{0}: Consumed Asset {1} cannot be {2}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:292
+#: assets/doctype/asset_capitalization/asset_capitalization.py:298
 msgid "Row #{0}: Consumed Asset {1} does not belong to company {2}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:385
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:105
 msgid "Row #{0}: Cost Center {1} does not belong to company {2}"
 msgstr ""
 
@@ -60505,7 +61540,7 @@
 msgid "Row #{0}: Dates overlapping with other row"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:375
+#: buying/doctype/purchase_order/purchase_order.py:376
 msgid "Row #{0}: Default BOM not found for FG Item {1}"
 msgstr ""
 
@@ -60513,35 +61548,35 @@
 msgid "Row #{0}: Duplicate entry in References {1} {2}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:237
+#: selling/doctype/sales_order/sales_order.py:239
 msgid "Row #{0}: Expected Delivery Date cannot be before Purchase Order Date"
 msgstr ""
 
-#: controllers/stock_controller.py:336
+#: controllers/stock_controller.py:518
 msgid "Row #{0}: Expense Account not set for the Item {1}. {2}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:378
+#: buying/doctype/purchase_order/purchase_order.py:379
 msgid "Row #{0}: Finished Good Item Qty can not be zero"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:362
+#: buying/doctype/purchase_order/purchase_order.py:363
 msgid "Row #{0}: Finished Good Item is not specified for service item {1}"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:369
+#: buying/doctype/purchase_order/purchase_order.py:370
 msgid "Row #{0}: Finished Good Item {1} must be a sub-contracted item"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:394
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:395
 msgid "Row #{0}: Finished Good reference is mandatory for Scrap Item {1}."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:571
+#: accounts/doctype/journal_entry/journal_entry.py:594
 msgid "Row #{0}: For {1}, you can select reference document only if account gets credited"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:577
+#: accounts/doctype/journal_entry/journal_entry.py:604
 msgid "Row #{0}: For {1}, you can select reference document only if account gets debited"
 msgstr ""
 
@@ -60549,7 +61584,7 @@
 msgid "Row #{0}: From Date cannot be before To Date"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:489
+#: public/js/utils/barcode_scanner.js:394
 msgid "Row #{0}: Item added"
 msgstr ""
 
@@ -60557,23 +61592,23 @@
 msgid "Row #{0}: Item {1} does not exist"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:949
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:951
 msgid "Row #{0}: Item {1} has been picked, please reserve stock from the Pick List."
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:491
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:545
 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:303
+#: assets/doctype/asset_capitalization/asset_capitalization.py:309
 msgid "Row #{0}: Item {1} is not a service item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:261
+#: assets/doctype/asset_capitalization/asset_capitalization.py:267
 msgid "Row #{0}: Item {1} is not a stock item"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:657
+#: accounts/doctype/payment_entry/payment_entry.py:666
 msgid "Row #{0}: Journal Entry {1} does not have account {2} or already matched against another voucher"
 msgstr ""
 
@@ -60581,48 +61616,48 @@
 msgid "Row #{0}: Maximum Net Rate cannot be greater than Minimum Net Rate"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:535
+#: selling/doctype/sales_order/sales_order.py:541
 msgid "Row #{0}: Not allowed to change Supplier as Purchase Order already exists"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1032
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1034
 msgid "Row #{0}: Only {1} available to reserve for the Item {2}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:687
+#: stock/doctype/stock_entry/stock_entry.py:642
 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 ""
 
-#: accounts/doctype/bank_clearance/bank_clearance.py:93
+#: accounts/doctype/bank_clearance/bank_clearance.py:95
 msgid "Row #{0}: Payment document is required to complete the transaction"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:892
+#: manufacturing/doctype/production_plan/production_plan.py:901
 msgid "Row #{0}: Please select Item Code in Assembly Items"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:895
+#: manufacturing/doctype/production_plan/production_plan.py:904
 msgid "Row #{0}: Please select the BOM No in Assembly Items"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:889
-msgid "Row #{0}: Please select the FG Warehouse in Assembly Items"
+#: manufacturing/doctype/production_plan/production_plan.py:898
+msgid "Row #{0}: Please select the Sub Assembly Warehouse"
 msgstr ""
 
 #: stock/doctype/item/item.py:487
 msgid "Row #{0}: Please set reorder quantity"
 msgstr ""
 
-#: controllers/accounts_controller.py:367
+#: controllers/accounts_controller.py:411
 msgid "Row #{0}: Please update deferred revenue/expense account in item row or default account in company master"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:487
+#: public/js/utils/barcode_scanner.js:392
 msgid "Row #{0}: Qty increased by {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:264
-#: assets/doctype/asset_capitalization/asset_capitalization.py:306
+#: assets/doctype/asset_capitalization/asset_capitalization.py:270
+#: assets/doctype/asset_capitalization/asset_capitalization.py:312
 msgid "Row #{0}: Qty must be a positive number"
 msgstr ""
 
@@ -60630,12 +61665,12 @@
 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:1018
-#: controllers/accounts_controller.py:3166
+#: controllers/accounts_controller.py:1082
+#: controllers/accounts_controller.py:3257
 msgid "Row #{0}: Quantity for Item {1} cannot be zero."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1017
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1019
 msgid "Row #{0}: Quantity to reserve for the Item {1} should be greater than 0."
 msgstr ""
 
@@ -60647,11 +61682,11 @@
 msgid "Row #{0}: Received Qty must be equal to Accepted + Rejected Qty for Item {1}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1016
+#: accounts/doctype/payment_entry/payment_entry.js:1234
 msgid "Row #{0}: Reference Document Type must be one of Purchase Order, Purchase Invoice or Journal Entry"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:1008
+#: accounts/doctype/payment_entry/payment_entry.js:1220
 msgid "Row #{0}: Reference Document Type must be one of Sales Order, Sales Invoice, Journal Entry or Dunning"
 msgstr ""
 
@@ -60659,7 +61694,7 @@
 msgid "Row #{0}: Rejected Qty can not be entered in Purchase Return"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:387
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:388
 msgid "Row #{0}: Rejected Qty cannot be set for Scrap Item {1}."
 msgstr ""
 
@@ -60667,15 +61702,15 @@
 msgid "Row #{0}: Rejected Warehouse is mandatory for the rejected Item {1}"
 msgstr ""
 
-#: controllers/buying_controller.py:849
+#: controllers/buying_controller.py:875
 msgid "Row #{0}: Reqd by Date cannot be before Transaction Date"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:382
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:383
 msgid "Row #{0}: Scrap Item Qty cannot be zero"
 msgstr ""
 
-#: controllers/selling_controller.py:212
+#: controllers/selling_controller.py:213
 msgid ""
 "Row #{0}: Selling rate for item {1} is lower than its {2}.\n"
 "\t\t\t\t\tSelling {3} should be atleast {4}.<br><br>Alternatively,\n"
@@ -60683,7 +61718,7 @@
 "\t\t\t\t\tthis validation."
 msgstr ""
 
-#: controllers/stock_controller.py:97
+#: controllers/stock_controller.py:129
 msgid "Row #{0}: Serial No {1} does not belong to Batch {2}"
 msgstr ""
 
@@ -60695,27 +61730,35 @@
 msgid "Row #{0}: Serial No {1} is already selected."
 msgstr ""
 
-#: controllers/accounts_controller.py:395
+#: controllers/accounts_controller.py:439
 msgid "Row #{0}: Service End Date cannot be before Invoice Posting Date"
 msgstr ""
 
-#: controllers/accounts_controller.py:391
+#: controllers/accounts_controller.py:435
 msgid "Row #{0}: Service Start Date cannot be greater than Service End Date"
 msgstr ""
 
-#: controllers/accounts_controller.py:387
+#: controllers/accounts_controller.py:431
 msgid "Row #{0}: Service Start and End Date is required for deferred accounting"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:391
+#: selling/doctype/sales_order/sales_order.py:394
 msgid "Row #{0}: Set Supplier for item {1}"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation.py:80
+msgid "Row #{0}: Start Time and End Time are required"
+msgstr ""
+
+#: manufacturing/doctype/workstation/workstation.py:83
+msgid "Row #{0}: Start Time must be before End Time"
+msgstr ""
+
 #: stock/doctype/quality_inspection/quality_inspection.py:120
 msgid "Row #{0}: Status is mandatory"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:381
+#: accounts/doctype/journal_entry/journal_entry.py:397
 msgid "Row #{0}: Status must be {1} for Invoice Discounting {2}"
 msgstr ""
 
@@ -60723,19 +61766,19 @@
 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:962
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:964
 msgid "Row #{0}: Stock cannot be reserved for a non-stock Item {1}"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:975
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:977
 msgid "Row #{0}: Stock cannot be reserved in group warehouse {1}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:989
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:991
 msgid "Row #{0}: Stock is already reserved for the Item {1}."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:605
+#: stock/doctype/delivery_note/delivery_note.py:666
 msgid "Row #{0}: Stock is reserved for item {1} in warehouse {2}."
 msgstr ""
 
@@ -60743,19 +61786,19 @@
 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:1003
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1005
 msgid "Row #{0}: Stock not available to reserve for the Item {1} in Warehouse {2}."
 msgstr ""
 
-#: controllers/stock_controller.py:110
+#: controllers/stock_controller.py:142
 msgid "Row #{0}: The batch {1} has already expired."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1687
-msgid "Row #{0}: The following Serial Nos are not present in Delivery Note {1}:"
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:150
+msgid "Row #{0}: The following serial numbers are not present in Delivery Note {1}:"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.py:116
+#: manufacturing/doctype/workstation/workstation.py:137
 msgid "Row #{0}: Timings conflicts with row {1}"
 msgstr ""
 
@@ -60763,15 +61806,11 @@
 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:1402
+#: accounts/doctype/sales_invoice/sales_invoice.py:1413
 msgid "Row #{0}: You must select an Asset for Item {1}."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1696
-msgid "Row #{0}: {1} Serial numbers required for Item {2}. You have provided {3}."
-msgstr ""
-
-#: controllers/buying_controller.py:483 public/js/controllers/buying.js:208
+#: controllers/buying_controller.py:483 public/js/controllers/buying.js:203
 msgid "Row #{0}: {1} can not be negative for item {2}"
 msgstr ""
 
@@ -60787,6 +61826,10 @@
 msgid "Row #{0}: {1} of {2} should be {3}. Please update the {1} or select a different account."
 msgstr ""
 
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:161
+msgid "Row #{0}: {1} serial numbers are required for Item {2}. You have provided {3} serial numbers."
+msgstr ""
+
 #: buying/utils.py:106
 msgid "Row #{1}: Warehouse is mandatory for stock Item {0}"
 msgstr ""
@@ -60795,11 +61838,11 @@
 msgid "Row #{}: Currency of {} - {} doesn't matches company currency."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:275
+#: assets/doctype/asset/asset.py:277
 msgid "Row #{}: Depreciation Posting Date should not be equal to Available for Use Date."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:308
+#: assets/doctype/asset/asset.py:310
 msgid "Row #{}: Finance Book should not be empty since you're using multiple."
 msgstr ""
 
@@ -60827,7 +61870,7 @@
 msgid "Row #{}: Please assign task to a member."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:300
+#: assets/doctype/asset/asset.py:302
 msgid "Row #{}: Please use a different Finance Book."
 msgstr ""
 
@@ -60843,7 +61886,7 @@
 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:83
+#: stock/doctype/pick_list/pick_list.py:87
 msgid "Row #{}: item {} has been picked already."
 msgstr ""
 
@@ -60855,39 +61898,47 @@
 msgid "Row #{}: {} {} does not exist."
 msgstr ""
 
-#: stock/doctype/item/item.py:1364
+#: stock/doctype/item/item.py:1365
 msgid "Row #{}: {} {} doesn't belong to Company {}. Please select valid {}."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:433
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:437
 msgid "Row No {0}: Warehouse is required. Please set a Default Warehouse for Item {1} and Company {2}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:599
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:491
+msgid "Row Number"
+msgstr ""
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:376
+msgid "Row {0}"
+msgstr ""
+
+#: manufacturing/doctype/job_card/job_card.py:606
 msgid "Row {0} : Operation is required against the raw material item {1}"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:113
+#: stock/doctype/pick_list/pick_list.py:117
 msgid "Row {0} picked quantity is less than the required quantity, additional {1} {2} required."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1135
+#: stock/doctype/stock_entry/stock_entry.py:1144
 msgid "Row {0}# Item {1} cannot be transferred more than {2} against {3} {4}"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1159
+#: stock/doctype/stock_entry/stock_entry.py:1168
 msgid "Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:190
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:191
 msgid "Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:509
+#: accounts/doctype/journal_entry/journal_entry.py:525
 msgid "Row {0}: Account {1} and Party Type {2} have different account types"
 msgstr ""
 
-#: controllers/accounts_controller.py:2536
+#: controllers/accounts_controller.py:2621
 msgid "Row {0}: Account {1} is a Group Account"
 msgstr ""
 
@@ -60895,43 +61946,47 @@
 msgid "Row {0}: Activity Type is mandatory."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:561
+#: accounts/doctype/journal_entry/journal_entry.py:577
 msgid "Row {0}: Advance against Customer must be credit"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:563
+#: accounts/doctype/journal_entry/journal_entry.py:579
 msgid "Row {0}: Advance against Supplier must be debit"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:671
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:681
 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:663
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:673
 msgid "Row {0}: Allocated amount {1} must be less than or equal to remaining payment amount {2}"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:763
+#: stock/doctype/stock_entry/stock_entry.py:884
+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
 msgid "Row {0}: Bill of Materials not found for the Item {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:796
+#: accounts/doctype/journal_entry/journal_entry.py:823
 msgid "Row {0}: Both Debit and Credit values cannot be zero"
 msgstr ""
 
-#: controllers/buying_controller.py:438 controllers/selling_controller.py:204
+#: controllers/buying_controller.py:438 controllers/selling_controller.py:205
 msgid "Row {0}: Conversion Factor is mandatory"
 msgstr ""
 
-#: controllers/accounts_controller.py:2549
+#: controllers/accounts_controller.py:2634
 msgid "Row {0}: Cost Center {1} does not belong to Company {2}"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:116
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:137
 msgid "Row {0}: Cost center is required for an item {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:647
+#: accounts/doctype/journal_entry/journal_entry.py:674
 msgid "Row {0}: Credit entry can not be linked with a {1}"
 msgstr ""
 
@@ -60939,19 +61994,19 @@
 msgid "Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:642
+#: accounts/doctype/journal_entry/journal_entry.py:669
 msgid "Row {0}: Debit entry can not be linked with a {1}"
 msgstr ""
 
-#: controllers/selling_controller.py:679
+#: controllers/selling_controller.py:703
 msgid "Row {0}: Delivery Warehouse ({1}) and Customer Warehouse ({2}) can not be same"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:417
+#: assets/doctype/asset/asset.py:419
 msgid "Row {0}: Depreciation Start Date is required"
 msgstr ""
 
-#: controllers/accounts_controller.py:2209
+#: controllers/accounts_controller.py:2301
 msgid "Row {0}: Due Date in the Payment Terms table cannot be before Posting Date"
 msgstr ""
 
@@ -60959,28 +62014,28 @@
 msgid "Row {0}: Either Delivery Note Item or Packed Item reference is mandatory."
 msgstr ""
 
-#: controllers/buying_controller.py:742
+#: controllers/buying_controller.py:767
 msgid "Row {0}: Enter location for the asset item {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:886
-#: controllers/taxes_and_totals.py:1115
+#: accounts/doctype/journal_entry/journal_entry.py:913
+#: controllers/taxes_and_totals.py:1116
 msgid "Row {0}: Exchange Rate is mandatory"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:408
+#: assets/doctype/asset/asset.py:410
 msgid "Row {0}: Expected Value After Useful Life must be less than Gross Purchase Amount"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:523
 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:482
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:486
 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 ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:505
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:509
 msgid "Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}"
 msgstr ""
 
@@ -60997,7 +62052,7 @@
 msgid "Row {0}: From Time and To Time of {1} is overlapping with {2}"
 msgstr ""
 
-#: controllers/stock_controller.py:730
+#: controllers/stock_controller.py:913
 msgid "Row {0}: From Warehouse is mandatory for internal transfers"
 msgstr ""
 
@@ -61009,15 +62064,15 @@
 msgid "Row {0}: Hours value must be greater than zero."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:665
+#: accounts/doctype/journal_entry/journal_entry.py:692
 msgid "Row {0}: Invalid reference {1}"
 msgstr ""
 
-#: controllers/taxes_and_totals.py:128
+#: controllers/taxes_and_totals.py:129
 msgid "Row {0}: Item Tax template updated as per validity and rate applied"
 msgstr ""
 
-#: controllers/buying_controller.py:400 controllers/selling_controller.py:479
+#: controllers/buying_controller.py:400 controllers/selling_controller.py:484
 msgid "Row {0}: Item rate has been updated as per valuation rate since its an internal stock transfer"
 msgstr ""
 
@@ -61029,7 +62084,7 @@
 msgid "Row {0}: Item {1} must be a subcontracted item."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:661
+#: stock/doctype/delivery_note/delivery_note.py:722
 msgid "Row {0}: Packed Qty must be equal to {1} Qty."
 msgstr ""
 
@@ -61037,11 +62092,11 @@
 msgid "Row {0}: Packing Slip is already created for Item {1}."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:687
+#: accounts/doctype/journal_entry/journal_entry.py:714
 msgid "Row {0}: Party / Account does not match with {1} / {2} in {3} {4}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:500
+#: accounts/doctype/journal_entry/journal_entry.py:516
 msgid "Row {0}: Party Type and Party is required for Receivable / Payable account {1}"
 msgstr ""
 
@@ -61049,11 +62104,11 @@
 msgid "Row {0}: Payment Term is mandatory"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:554
+#: accounts/doctype/journal_entry/journal_entry.py:570
 msgid "Row {0}: Payment against Sales/Purchase Order should always be marked as advance"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:547
+#: accounts/doctype/journal_entry/journal_entry.py:563
 msgid "Row {0}: Please check 'Is Advance' against Account {1} if this is an advance entry."
 msgstr ""
 
@@ -61089,7 +62144,7 @@
 msgid "Row {0}: Project must be same as the one set in the Timesheet: {1}."
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:93
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:114
 msgid "Row {0}: Purchase Invoice {1} has no stock impact."
 msgstr ""
 
@@ -61097,7 +62152,7 @@
 msgid "Row {0}: Qty cannot be greater than {1} for the Item {2}."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Row {0}: Qty in Stock UOM can not be zero."
 msgstr ""
 
@@ -61105,7 +62160,7 @@
 msgid "Row {0}: Qty must be greater than 0."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:762
+#: stock/doctype/stock_entry/stock_entry.py:717
 msgid "Row {0}: Quantity not available for {4} in warehouse {1} at posting time of the entry ({2} {3})"
 msgstr ""
 
@@ -61113,15 +62168,15 @@
 msgid "Row {0}: Shift cannot be changed since the depreciation has already been processed"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1170
+#: stock/doctype/stock_entry/stock_entry.py:1179
 msgid "Row {0}: Subcontracted Item is mandatory for the raw material {1}"
 msgstr ""
 
-#: controllers/stock_controller.py:721
+#: controllers/stock_controller.py:904
 msgid "Row {0}: Target Warehouse is mandatory for internal transfers"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:450
+#: stock/doctype/stock_entry/stock_entry.py:405
 msgid "Row {0}: The item {1}, quantity must be positive number"
 msgstr ""
 
@@ -61129,15 +62184,15 @@
 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:441
+#: assets/doctype/asset/asset.py:443
 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:401
+#: stock/doctype/stock_entry/stock_entry.py:356
 msgid "Row {0}: UOM Conversion Factor is mandatory"
 msgstr ""
 
-#: controllers/accounts_controller.py:786
+#: controllers/accounts_controller.py:838
 msgid "Row {0}: user has not applied the rule {1} on the item {2}"
 msgstr ""
 
@@ -61149,15 +62204,19 @@
 msgid "Row {0}: {1} must be greater than 0"
 msgstr ""
 
-#: controllers/accounts_controller.py:511
+#: controllers/accounts_controller.py:555
 msgid "Row {0}: {1} {2} cannot be same as {3} (Party Account) {4}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:701
+#: accounts/doctype/journal_entry/journal_entry.py:728
 msgid "Row {0}: {1} {2} does not match with {3}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2528
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:87
+msgid "Row {0}: {2} Item {1} does not exist in {2} {3}"
+msgstr ""
+
+#: controllers/accounts_controller.py:2613
 msgid "Row {0}: {3} Account {1} does not belong to Company {2}"
 msgstr ""
 
@@ -61165,7 +62224,7 @@
 msgid "Row {1}: Quantity ({0}) cannot be a fraction. To allow this, disable '{2}' in UOM {3}."
 msgstr ""
 
-#: controllers/buying_controller.py:726
+#: controllers/buying_controller.py:751
 msgid "Row {}: Asset Naming Series is mandatory for the auto creation for item {}"
 msgstr ""
 
@@ -61177,11 +62236,11 @@
 msgid "Row({0}): {1} is already discounted in {2}"
 msgstr ""
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:193
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:200
 msgid "Rows Added in {0}"
 msgstr ""
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:194
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:201
 msgid "Rows Removed in {0}"
 msgstr ""
 
@@ -61192,15 +62251,15 @@
 msgid "Rows with Same Account heads will be merged on Ledger"
 msgstr ""
 
-#: controllers/accounts_controller.py:2218
+#: controllers/accounts_controller.py:2310
 msgid "Rows with duplicate due dates in other rows were found: {0}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:61
+#: accounts/doctype/journal_entry/journal_entry.js:115
 msgid "Rows: {0} have 'Payment Entry' as reference_type. This should not be set manually."
 msgstr ""
 
-#: controllers/accounts_controller.py:211
+#: controllers/accounts_controller.py:221
 msgid "Rows: {0} in {1} section are Invalid. Reference Name should point to a valid Payment Entry or Journal Entry."
 msgstr ""
 
@@ -61228,6 +62287,12 @@
 msgid "Rule Description"
 msgstr ""
 
+#. Description of the 'Job Capacity' (Int) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Run parallel job cards in a workstation"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Process Payment
 #. Reconciliation'
 #: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.json
@@ -61242,6 +62307,13 @@
 msgid "Running"
 msgstr ""
 
+#. Option for the 'Status' (Select) field in DocType 'Transaction Deletion
+#. Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Running"
+msgstr ""
+
 #: selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py:28
 msgid "S.O. No."
 msgstr ""
@@ -61306,7 +62378,7 @@
 msgid "SLA Paused On"
 msgstr ""
 
-#: public/js/utils.js:1015
+#: public/js/utils.js:1098
 msgid "SLA is on hold since {0}"
 msgstr ""
 
@@ -61345,6 +62417,10 @@
 msgid "SO Qty"
 msgstr ""
 
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:107
+msgid "SO Total Qty"
+msgstr ""
+
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts.html:16
 msgid "STATEMENTS OF ACCOUNTS"
 msgstr ""
@@ -61439,7 +62515,7 @@
 #: 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:329 setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:328 setup/doctype/company/company.py:491
 #: setup/doctype/company/company_dashboard.py:9
 #: setup/doctype/sales_person/sales_person_dashboard.py:12
 #: setup/setup_wizard/operations/install_fixtures.py:250
@@ -61477,7 +62553,7 @@
 msgid "Sales"
 msgstr ""
 
-#: setup/doctype/company/company.py:492
+#: setup/doctype/company/company.py:491
 msgid "Sales Account"
 msgstr ""
 
@@ -61511,7 +62587,7 @@
 #. Label of a Link in the CRM Workspace
 #. Label of a Link in the Selling Workspace
 #: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:7
-#: selling/page/sales_funnel/sales_funnel.js:41
+#: selling/page/sales_funnel/sales_funnel.js:46
 #: selling/workspace/selling/selling.json
 msgid "Sales Funnel"
 msgstr ""
@@ -61522,11 +62598,11 @@
 #: accounts/report/gross_profit/gross_profit.js:30
 #: accounts/report/gross_profit/gross_profit.py:199
 #: accounts/report/gross_profit/gross_profit.py:206
-#: selling/doctype/quotation/quotation_list.js:20
-#: selling/doctype/sales_order/sales_order.js:565
-#: selling/doctype/sales_order/sales_order_list.js:53
-#: stock/doctype/delivery_note/delivery_note.js:222
-#: stock/doctype/delivery_note/delivery_note_list.js:61
+#: selling/doctype/quotation/quotation_list.js:19
+#: selling/doctype/sales_order/sales_order.js:633
+#: selling/doctype/sales_order/sales_order_list.js:66
+#: stock/doctype/delivery_note/delivery_note.js:266
+#: stock/doctype/delivery_note/delivery_note_list.js:70
 msgid "Sales Invoice"
 msgstr ""
 
@@ -61676,11 +62752,11 @@
 msgid "Sales Invoice Trends"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:679
+#: stock/doctype/delivery_note/delivery_note.py:740
 msgid "Sales Invoice {0} has already been submitted"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:472
+#: selling/doctype/sales_order/sales_order.py:475
 msgid "Sales Invoice {0} must be deleted before cancelling this Sales Order"
 msgstr ""
 
@@ -61714,6 +62790,7 @@
 #: setup/doctype/sales_person/sales_person.json
 #: setup/doctype/territory/territory.json stock/doctype/bin/bin.json
 #: stock/doctype/packing_slip/packing_slip.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 msgid "Sales Manager"
 msgstr ""
 
@@ -61743,36 +62820,36 @@
 msgid "Sales Monthly History"
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:129
+#: selling/page/sales_funnel/sales_funnel.js:144
 msgid "Sales Opportunities by Source"
 msgstr ""
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: accounts/doctype/sales_invoice/sales_invoice.js:236
+#: 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:421
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:64
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:113
-#: manufacturing/doctype/blanket_order/blanket_order.js:23
+#: controllers/selling_controller.py:422
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:65
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:122
+#: manufacturing/doctype/blanket_order/blanket_order.js:24
 #: manufacturing/doctype/work_order/work_order_calendar.js:32
 #: manufacturing/report/production_plan_summary/production_plan_summary.py:127
 #: manufacturing/report/work_order_summary/work_order_summary.py:217
-#: selling/doctype/quotation/quotation.js:117
+#: selling/doctype/quotation/quotation.js:125
 #: selling/doctype/quotation/quotation_dashboard.py:11
-#: selling/doctype/quotation/quotation_list.js:16
+#: selling/doctype/quotation/quotation_list.js:15
 #: selling/doctype/sales_order/sales_order.json
 #: selling/onboarding_step/sales_order/sales_order.json
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:59
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:13
-#: selling/report/sales_order_analysis/sales_order_analysis.js:34
+#: selling/report/sales_order_analysis/sales_order_analysis.js:33
 #: selling/report/sales_order_analysis/sales_order_analysis.py:222
-#: stock/doctype/delivery_note/delivery_note.js:134
-#: stock/doctype/material_request/material_request.js:161
-#: stock/report/delayed_item_report/delayed_item_report.js:31
+#: stock/doctype/delivery_note/delivery_note.js:146
+#: stock/doctype/material_request/material_request.js:190
+#: stock/report/delayed_item_report/delayed_item_report.js:30
 #: stock/report/delayed_item_report/delayed_item_report.py:155
-#: stock/report/delayed_order_report/delayed_order_report.js:31
+#: stock/report/delayed_order_report/delayed_order_report.js:30
 #: stock/report/delayed_order_report/delayed_order_report.py:74
 msgid "Sales Order"
 msgstr ""
@@ -61923,8 +63000,8 @@
 msgstr ""
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:260
-#: selling/doctype/sales_order/sales_order.js:704
+#: selling/doctype/sales_order/sales_order.js:286
+#: selling/doctype/sales_order/sales_order.js:809
 #: selling/doctype/sales_order_item/sales_order_item.json
 msgid "Sales Order Item"
 msgstr ""
@@ -62013,11 +63090,11 @@
 msgid "Sales Order required for Item {0}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:258
+#: selling/doctype/sales_order/sales_order.py:261
 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:1142
+#: accounts/doctype/sales_invoice/sales_invoice.py:1149
 msgid "Sales Order {0} is not submitted"
 msgstr ""
 
@@ -62025,12 +63102,12 @@
 msgid "Sales Order {0} is not valid"
 msgstr ""
 
-#: controllers/selling_controller.py:402
+#: controllers/selling_controller.py:403
 #: manufacturing/doctype/work_order/work_order.py:223
 msgid "Sales Order {0} is {1}"
 msgstr ""
 
-#: manufacturing/report/work_order_summary/work_order_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:42
 msgid "Sales Orders"
 msgstr ""
 
@@ -62058,14 +63135,14 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:133
-#: accounts/report/accounts_receivable/accounts_receivable.py:1106
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:117
+#: accounts/report/accounts_receivable/accounts_receivable.js:136
+#: accounts/report/accounts_receivable/accounts_receivable.py:1114
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:120
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:197
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:74
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:10
+#: 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
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:9
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:8
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:71
 #: setup/doctype/sales_partner/sales_partner.json
 msgid "Sales Partner"
@@ -62208,17 +63285,18 @@
 
 #. Name of a DocType
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:155
-#: accounts/report/accounts_receivable/accounts_receivable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.py:1103
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:123
+#: 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_summary/accounts_receivable_summary.js:126
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:194
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:80
-#: accounts/report/gross_profit/gross_profit.js:49
+#: 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
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:10
+#: 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
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:115
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:116
 #: setup/doctype/sales_person/sales_person.json
 msgid "Sales Person"
 msgstr ""
@@ -62294,7 +63372,7 @@
 msgstr ""
 
 #. Label of a Card Break in the CRM Workspace
-#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:42
+#: crm/workspace/crm/crm.json selling/page/sales_funnel/sales_funnel.js:47
 msgid "Sales Pipeline"
 msgstr ""
 
@@ -62305,7 +63383,7 @@
 msgid "Sales Pipeline Analytics"
 msgstr ""
 
-#: selling/page/sales_funnel/sales_funnel.js:131
+#: selling/page/sales_funnel/sales_funnel.js:146
 msgid "Sales Pipeline by Stage"
 msgstr ""
 
@@ -62321,14 +63399,14 @@
 msgstr ""
 
 #: accounts/report/gross_profit/gross_profit.py:777
-#: stock/doctype/delivery_note/delivery_note.js:175
+#: stock/doctype/delivery_note/delivery_note.js:200
 msgid "Sales Return"
 msgstr ""
 
 #. Name of a DocType
 #: crm/doctype/sales_stage/sales_stage.json
 #: crm/report/lost_opportunity/lost_opportunity.py:51
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:59
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:61
 msgid "Sales Stage"
 msgstr ""
 
@@ -62348,7 +63426,7 @@
 msgid "Sales Summary"
 msgstr ""
 
-#: setup/doctype/company/company.js:98
+#: setup/doctype/company/company.js:106
 msgid "Sales Tax Template"
 msgstr ""
 
@@ -62535,6 +63613,7 @@
 #: stock/doctype/delivery_note/delivery_note.json stock/doctype/item/item.json
 #: stock/doctype/packing_slip/packing_slip.json
 #: stock/doctype/price_list/price_list.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
@@ -62594,7 +63673,7 @@
 msgid "Same Item"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:350
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:404
 msgid "Same item and warehouse combination already entered."
 msgstr ""
 
@@ -62625,7 +63704,7 @@
 msgstr ""
 
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:93
-#: public/js/controllers/transaction.js:2131
+#: public/js/controllers/transaction.js:2174
 msgid "Sample Size"
 msgstr ""
 
@@ -62635,11 +63714,11 @@
 msgid "Sample Size"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2824
+#: stock/doctype/stock_entry/stock_entry.py:2860
 msgid "Sample quantity {0} cannot be more than received quantity {1}"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:9
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:7
 msgid "Sanctioned"
 msgstr ""
 
@@ -62708,16 +63787,16 @@
 msgid "Saturday"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:139
-#: accounts/doctype/journal_entry/journal_entry.js:550
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:118
+#: accounts/doctype/journal_entry/journal_entry.js:619
 #: accounts/doctype/ledger_merge/ledger_merge.js:75
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:252
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:288
-#: public/js/call_popup/call_popup.js:157
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:289
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:325
+#: public/js/call_popup/call_popup.js:169
 msgid "Save"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:176
+#: selling/page/point_of_sale/pos_controller.js:198
 msgid "Save as Draft"
 msgstr ""
 
@@ -62730,7 +63809,7 @@
 msgid "Savings"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:206
+#: public/js/utils/barcode_scanner.js:215
 msgid "Scan Barcode"
 msgstr ""
 
@@ -62806,7 +63885,7 @@
 msgid "Scan Barcode"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:151
+#: public/js/utils/serial_no_batch_selector.js:154
 msgid "Scan Batch No"
 msgstr ""
 
@@ -62822,11 +63901,11 @@
 msgid "Scan Mode"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:136
+#: public/js/utils/serial_no_batch_selector.js:139
 msgid "Scan Serial No"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:172
+#: public/js/utils/barcode_scanner.js:179
 msgid "Scan barcode for item {0}"
 msgstr ""
 
@@ -62840,7 +63919,7 @@
 msgid "Scanned Cheque"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:238
+#: public/js/utils/barcode_scanner.js:247
 msgid "Scanned Quantity"
 msgstr ""
 
@@ -62850,7 +63929,7 @@
 msgid "Schedule"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:240
+#: assets/doctype/asset/asset.js:275
 msgid "Schedule Date"
 msgstr ""
 
@@ -62885,7 +63964,7 @@
 msgid "Scheduled"
 msgstr ""
 
-#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:111
+#: maintenance/doctype/maintenance_schedule/maintenance_schedule.js:118
 msgid "Scheduled Date"
 msgstr ""
 
@@ -62913,7 +63992,7 @@
 msgid "Scheduled Time Logs"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: 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
@@ -62932,7 +64011,7 @@
 msgid "Scheduler is inactive. Cannot enqueue job."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.py:84
+#: accounts/doctype/bank_statement_import/bank_statement_import.py:85
 #: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool.py:232
 msgid "Scheduler is inactive. Cannot import data."
 msgstr ""
@@ -63015,7 +64094,7 @@
 msgid "Scrap & Process Loss"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:87
+#: assets/doctype/asset/asset.js:92
 msgid "Scrap Asset"
 msgstr ""
 
@@ -63069,7 +64148,7 @@
 msgid "Scrap Warehouse"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:17
+#: assets/doctype/asset/asset_list.js:13
 msgid "Scrapped"
 msgstr ""
 
@@ -63079,7 +64158,7 @@
 msgid "Scrapped"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_selector.js:150
+#: selling/page/point_of_sale/pos_item_selector.js:147
 #: selling/page/point_of_sale/pos_past_order_list.js:51
 #: templates/pages/help.html:14
 msgid "Search"
@@ -63102,7 +64181,7 @@
 msgid "Search Term Param Name"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_cart.js:312
+#: selling/page/point_of_sale/pos_item_cart.js:310
 msgid "Search by customer name, phone, email."
 msgstr ""
 
@@ -63110,7 +64189,7 @@
 msgid "Search by invoice id or customer name"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_selector.js:152
+#: selling/page/point_of_sale/pos_item_selector.js:149
 msgid "Search by item code, serial number or barcode"
 msgstr ""
 
@@ -63132,7 +64211,7 @@
 msgid "Secondary Role"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:174
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:172
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:117
 msgid "Section Code"
 msgstr ""
@@ -63155,8 +64234,13 @@
 msgid "See all open tickets"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:180
-#: selling/doctype/sales_order/sales_order.js:888
+#: stock/report/stock_ledger/stock_ledger.js:104
+msgid "Segregate Serial / Batch Bundle"
+msgstr ""
+
+#: buying/doctype/purchase_order/purchase_order.js:186
+#: selling/doctype/sales_order/sales_order.js:1043
+#: selling/doctype/sales_order/sales_order_list.js:85
 msgid "Select"
 msgstr ""
 
@@ -63164,33 +64248,33 @@
 msgid "Select Accounting Dimension."
 msgstr ""
 
-#: public/js/utils.js:440
+#: public/js/utils.js:487
 msgid "Select Alternate Item"
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:312
+#: selling/doctype/quotation/quotation.js:324
 msgid "Select Alternative Items for Sales Order"
 msgstr ""
 
-#: stock/doctype/item/item.js:518
+#: stock/doctype/item/item.js:585
 msgid "Select Attribute Values"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:689
+#: selling/doctype/sales_order/sales_order.js:792
 msgid "Select BOM"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:678
+#: selling/doctype/sales_order/sales_order.js:779
 msgid "Select BOM and Qty for Production"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:803
+#: selling/doctype/sales_order/sales_order.js:921
 msgid "Select BOM, Qty and For Warehouse"
 msgstr ""
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: selling/page/point_of_sale/pos_item_details.js:212
+#: stock/doctype/pick_list/pick_list.js:352
 msgid "Select Batch No"
 msgstr ""
 
@@ -63206,15 +64290,15 @@
 msgid "Select Billing Address"
 msgstr ""
 
-#: public/js/stock_analytics.js:42
+#: public/js/stock_analytics.js:61
 msgid "Select Brand..."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/journal_entry/journal_entry.js:123
 msgid "Select Company"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:173
+#: manufacturing/doctype/job_card/job_card.js:193
 msgid "Select Corrective Operation"
 msgstr ""
 
@@ -63224,24 +64308,24 @@
 msgid "Select Customers By"
 msgstr ""
 
-#: setup/doctype/employee/employee.js:112
+#: setup/doctype/employee/employee.js:115
 msgid "Select Date of Birth. This will validate Employees age and prevent hiring of under-age staff."
 msgstr ""
 
-#: setup/doctype/employee/employee.js:117
+#: setup/doctype/employee/employee.js:122
 msgid "Select Date of joining. It will have impact on the first salary calculation, Leave allocation on pro-rata bases."
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:111
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:131
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:114
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:138
 msgid "Select Default Supplier"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:252
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:256
 msgid "Select Difference Account"
 msgstr ""
 
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:58
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:57
 msgid "Select Dimension"
 msgstr ""
 
@@ -63251,27 +64335,27 @@
 msgid "Select DocType"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:246
+#: manufacturing/doctype/job_card/job_card.js:274
 msgid "Select Employees"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:170
+#: buying/doctype/purchase_order/purchase_order.js:176
 msgid "Select Finished Good"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:962
+#: selling/doctype/sales_order/sales_order.js:1122
 msgid "Select Items"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:861
+#: selling/doctype/sales_order/sales_order.js:1008
 msgid "Select Items based on Delivery Date"
 msgstr ""
 
-#: public/js/controllers/transaction.js:2159
+#: public/js/controllers/transaction.js:2202
 msgid "Select Items for Quality Inspection"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:713
+#: selling/doctype/sales_order/sales_order.js:820
 msgid "Select Items to Manufacture"
 msgstr ""
 
@@ -63281,27 +64365,31 @@
 msgid "Select Items to Manufacture"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1038
-#: selling/page/point_of_sale/pos_item_cart.js:888
+#: selling/doctype/sales_order/sales_order_list.js:76
+msgid "Select Items up to Delivery Date"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.js:1114
+#: selling/page/point_of_sale/pos_item_cart.js:920
 msgid "Select Loyalty Program"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:340
+#: buying/doctype/request_for_quotation/request_for_quotation.js:366
 msgid "Select Possible Supplier"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:726
-#: stock/doctype/pick_list/pick_list.js:161
+#: manufacturing/doctype/work_order/work_order.js:781
+#: stock/doctype/pick_list/pick_list.js:192
 msgid "Select Quantity"
 msgstr ""
 
-#: public/js/utils/sales_common.js:325
-#: selling/page/point_of_sale/pos_item_details.js:203
-#: stock/doctype/pick_list/pick_list.js:318
+#: public/js/utils/sales_common.js:361
+#: 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:328 stock/doctype/pick_list/pick_list.js:321
+#: public/js/utils/sales_common.js:364 stock/doctype/pick_list/pick_list.js:355
 msgid "Select Serial and Batch"
 msgstr ""
 
@@ -63329,40 +64417,40 @@
 msgid "Select Supplier Address"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:110
+#: stock/doctype/batch/batch.js:127
 msgid "Select Target Warehouse"
 msgstr ""
 
-#: www/book_appointment/index.js:69
+#: www/book_appointment/index.js:73
 msgid "Select Time"
 msgstr ""
 
-#: accounts/report/balance_sheet/balance_sheet.js:14
-#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:14
+#: accounts/report/balance_sheet/balance_sheet.js:10
+#: accounts/report/profit_and_loss_statement/profit_and_loss_statement.js:10
 msgid "Select View"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/dialog_manager.js:248
+#: public/js/bank_reconciliation_tool/dialog_manager.js:251
 msgid "Select Vouchers to Match"
 msgstr ""
 
-#: public/js/stock_analytics.js:46
+#: public/js/stock_analytics.js:72
 msgid "Select Warehouse..."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:398
+#: manufacturing/doctype/production_plan/production_plan.js:431
 msgid "Select Warehouses to get Stock for Materials Planning"
 msgstr ""
 
-#: public/js/communication.js:67
+#: public/js/communication.js:80
 msgid "Select a Company"
 msgstr ""
 
-#: setup/doctype/employee/employee.js:107
+#: setup/doctype/employee/employee.js:110
 msgid "Select a Company this Employee belongs to."
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:160
+#: buying/doctype/supplier/supplier.js:188
 msgid "Select a Customer"
 msgstr ""
 
@@ -63370,19 +64458,19 @@
 msgid "Select a Default Priority."
 msgstr ""
 
-#: selling/doctype/customer/customer.js:205
+#: selling/doctype/customer/customer.js:221
 msgid "Select a Supplier"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:297
+#: stock/doctype/material_request/material_request.js:365
 msgid "Select a Supplier from the Default Suppliers of the items below. On selection, a Purchase Order will be made against items belonging to the selected Supplier only."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:136
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:156
 msgid "Select a company"
 msgstr ""
 
-#: stock/doctype/item/item.js:809
+#: stock/doctype/item/item.js:889
 msgid "Select an Item Group."
 msgstr ""
 
@@ -63390,15 +64478,19 @@
 msgid "Select an account to print in account currency"
 msgstr ""
 
-#: selling/doctype/quotation/quotation.js:327
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
+msgid "Select an invoice to load summary data"
+msgstr ""
+
+#: selling/doctype/quotation/quotation.js:339
 msgid "Select an item from each set to be used in the Sales Order."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1549
-msgid "Select change amount account"
+#: stock/doctype/item/item.js:590
+msgid "Select at least one value from each of the attributes."
 msgstr ""
 
-#: public/js/utils/party.js:305
+#: public/js/utils/party.js:352
 msgid "Select company first"
 msgstr ""
 
@@ -63409,15 +64501,15 @@
 msgid "Select company name first."
 msgstr ""
 
-#: controllers/accounts_controller.py:2394
+#: controllers/accounts_controller.py:2486
 msgid "Select finance book for the item {0} at row {1}"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_item_selector.js:162
+#: selling/page/point_of_sale/pos_item_selector.js:159
 msgid "Select item group"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:293
+#: manufacturing/doctype/bom/bom.js:306
 msgid "Select template item"
 msgstr ""
 
@@ -63431,16 +64523,16 @@
 msgid "Select the Default Workstation where the Operation will be performed. This will be fetched in BOMs and Work Orders."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:807
+#: manufacturing/doctype/work_order/work_order.js:866
 msgid "Select the Item to be manufactured."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:725
+#: manufacturing/doctype/bom/bom.js:754
 msgid "Select the Item to be manufactured. The Item name, UoM, Company, and Currency will be fetched automatically."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:294
-#: manufacturing/doctype/production_plan/production_plan.js:305
+#: manufacturing/doctype/production_plan/production_plan.js:319
+#: manufacturing/doctype/production_plan/production_plan.js:332
 msgid "Select the Warehouse"
 msgstr ""
 
@@ -63452,15 +64544,15 @@
 msgid "Select the date and your timezone"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:740
+#: manufacturing/doctype/bom/bom.js:773
 msgid "Select the raw materials (Items) required to manufacture the Item"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:338
+#: manufacturing/doctype/bom/bom.js:353
 msgid "Select variant item code for the template item {0}"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:525
+#: manufacturing/doctype/production_plan/production_plan.js:565
 msgid ""
 "Select whether to get items from a Sales Order or a Material Request. For now select <b>Sales Order</b>.\n"
 " A Production Plan can also be created manually where you can select the Items to manufacture."
@@ -63481,7 +64573,7 @@
 msgid "Selected POS Opening Entry should be open."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:2192
+#: accounts/doctype/sales_invoice/sales_invoice.py:2161
 msgid "Selected Price List should have buying and selling fields checked."
 msgstr ""
 
@@ -63495,7 +64587,7 @@
 msgid "Selected date is"
 msgstr ""
 
-#: public/js/bulk_transaction_processing.js:26
+#: public/js/bulk_transaction_processing.js:34
 msgid "Selected document must be in submitted state"
 msgstr ""
 
@@ -63510,7 +64602,7 @@
 msgid "Sell"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:91
+#: assets/doctype/asset/asset.js:100
 msgid "Sell Asset"
 msgstr ""
 
@@ -63640,7 +64732,7 @@
 msgid "Send Emails"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:46
+#: buying/doctype/request_for_quotation/request_for_quotation.js:53
 msgid "Send Emails to Suppliers"
 msgstr ""
 
@@ -63648,7 +64740,7 @@
 msgid "Send Now"
 msgstr ""
 
-#: public/js/controllers/transaction.js:440
+#: public/js/controllers/transaction.js:479
 msgid "Send SMS"
 msgstr ""
 
@@ -63670,6 +64762,11 @@
 msgid "Send To Primary Contact"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/email_digest/email_digest.json
+msgid "Send regular summary reports via Email."
+msgstr ""
+
 #. Option for the 'Purpose' (Select) field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
@@ -63700,7 +64797,7 @@
 msgid "Sender"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.js:35
+#: accounts/doctype/payment_request/payment_request.js:44
 msgid "Sending"
 msgstr ""
 
@@ -63722,7 +64819,7 @@
 msgid "Sequence ID"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:262
+#: manufacturing/doctype/work_order/work_order.js:277
 msgid "Sequence Id"
 msgstr ""
 
@@ -63773,26 +64870,26 @@
 msgid "Serial / Batch No"
 msgstr ""
 
-#: public/js/utils.js:124
+#: public/js/utils.js:153
 msgid "Serial / Batch Nos"
 msgstr ""
 
 #. Name of a DocType
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:73
+#: 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:2144
-#: public/js/utils/serial_no_batch_selector.js:350
+#: public/js/controllers/transaction.js:2187
+#: 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/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_no_ledger/serial_no_ledger.js:39
+#: 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:246
+#: stock/report/stock_ledger/stock_ledger.py:319
 msgid "Serial No"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Asset Capitalization Stock Item'
+#. Label of a Text field in DocType 'Asset Capitalization Stock Item'
 #: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
 msgctxt "Asset Capitalization Stock Item"
 msgid "Serial No"
@@ -63840,7 +64937,7 @@
 msgid "Serial No"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'POS Invoice Item'
+#. Label of a Text field in DocType 'POS Invoice Item'
 #: accounts/doctype/pos_invoice_item/pos_invoice_item.json
 msgctxt "POS Invoice Item"
 msgid "Serial No"
@@ -63876,7 +64973,7 @@
 msgid "Serial No"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Sales Invoice Item'
+#. Label of a Text field in DocType 'Sales Invoice Item'
 #: accounts/doctype/sales_invoice_item/sales_invoice_item.json
 msgctxt "Sales Invoice Item"
 msgid "Serial No"
@@ -63897,7 +64994,7 @@
 msgid "Serial No"
 msgstr ""
 
-#. Label of a Small Text field in DocType 'Stock Entry Detail'
+#. Label of a Text field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
 msgid "Serial No"
@@ -63992,7 +65089,7 @@
 msgid "Serial No and Batch for Finished Good"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:577
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:572
 msgid "Serial No is mandatory"
 msgstr ""
 
@@ -64000,11 +65097,11 @@
 msgid "Serial No is mandatory for Item {0}"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:480
+#: public/js/utils/serial_no_batch_selector.js:488
 msgid "Serial No {0} already exists"
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:311
+#: public/js/utils/barcode_scanner.js:321
 msgid "Serial No {0} already scanned"
 msgstr ""
 
@@ -64021,16 +65118,11 @@
 msgid "Serial No {0} does not exist"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2112
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:2131
 msgid "Serial No {0} does not exists"
 msgstr ""
 
 #: public/js/utils/barcode_scanner.js:402
-msgid "Serial No {0} has already scanned."
-msgstr ""
-
-#: public/js/utils/barcode_scanner.js:499
-#: public/js/utils/barcode_scanner.js:506
 msgid "Serial No {0} is already added"
 msgstr ""
 
@@ -64046,23 +65138,23 @@
 msgid "Serial No {0} not found"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:695
+#: selling/page/point_of_sale/pos_controller.js:734
 msgid "Serial No: {0} has already been transacted into another POS Invoice."
 msgstr ""
 
-#: public/js/utils/barcode_scanner.js:262
-#: public/js/utils/serial_no_batch_selector.js:15
-#: public/js/utils/serial_no_batch_selector.js:178
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:48
+#: public/js/utils/barcode_scanner.js:271
+#: public/js/utils/serial_no_batch_selector.js:16
+#: public/js/utils/serial_no_batch_selector.js:181
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:46
 msgid "Serial Nos"
 msgstr ""
 
 #: public/js/utils/serial_no_batch_selector.js:20
-#: public/js/utils/serial_no_batch_selector.js:183
+#: public/js/utils/serial_no_batch_selector.js:185
 msgid "Serial Nos / Batch Nos"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1692
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.py:157
 msgid "Serial Nos Mismatch"
 msgstr ""
 
@@ -64072,11 +65164,11 @@
 msgid "Serial Nos and Batches"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1074
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1081
 msgid "Serial Nos are created successfully"
 msgstr ""
 
-#: stock/stock_ledger.py:1972
+#: stock/stock_ledger.py:1979
 msgid "Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
 msgstr ""
 
@@ -64102,7 +65194,7 @@
 #. Name of a DocType
 #: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:80
-#: stock/report/stock_ledger/stock_ledger.py:253
+#: stock/report/stock_ledger/stock_ledger.py:326
 #: stock/report/stock_ledger_invariant_check/stock_ledger_invariant_check.py:154
 msgid "Serial and Batch Bundle"
 msgstr ""
@@ -64197,14 +65289,18 @@
 msgid "Serial and Batch Bundle"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1253
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1260
 msgid "Serial and Batch Bundle created"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1295
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py:1309
 msgid "Serial and Batch Bundle updated"
 msgstr ""
 
+#: controllers/stock_controller.py:82
+msgid "Serial and Batch Bundle {0} is already used in {1} {2}."
+msgstr ""
+
 #. Label of a Section Break field in DocType 'Subcontracting Receipt Item'
 #: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
 msgctxt "Subcontracting Receipt Item"
@@ -64228,7 +65324,7 @@
 msgid "Serial and Batch No"
 msgstr ""
 
-#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:51
+#: stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.js:49
 msgid "Serial and Batch Nos"
 msgstr ""
 
@@ -64256,11 +65352,11 @@
 msgid "Serial and Batch Summary"
 msgstr ""
 
-#: stock/utils.py:427
+#: stock/utils.py:422
 msgid "Serial number {0} entered more than once"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:545
+#: accounts/doctype/journal_entry/journal_entry.js:611
 msgid "Series"
 msgstr ""
 
@@ -64718,7 +65814,7 @@
 msgid "Service Level Agreement has been changed to {0}."
 msgstr ""
 
-#: support/doctype/issue/issue.js:67
+#: support/doctype/issue/issue.js:77
 msgid "Service Level Agreement was reset."
 msgstr ""
 
@@ -64799,11 +65895,11 @@
 msgid "Service Stop Date"
 msgstr ""
 
-#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1239
+#: accounts/deferred_revenue.py:48 public/js/controllers/transaction.js:1298
 msgid "Service Stop Date cannot be after Service End Date"
 msgstr ""
 
-#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1236
+#: accounts/deferred_revenue.py:45 public/js/controllers/transaction.js:1295
 msgid "Service Stop Date cannot be before Service Start Date"
 msgstr ""
 
@@ -64836,7 +65932,7 @@
 msgid "Set Basic Rate Manually"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:150
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:157
 msgid "Set Default Supplier"
 msgstr ""
 
@@ -64877,11 +65973,11 @@
 msgid "Set Landed Cost Based on Purchase Invoice Rate"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:1050
+#: accounts/doctype/sales_invoice/sales_invoice.js:1126
 msgid "Set Loyalty Program"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:272
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:309
 msgid "Set New Release Date"
 msgstr ""
 
@@ -64897,27 +65993,31 @@
 msgid "Set Operating Cost Based On BOM Quantity"
 msgstr ""
 
+#: buying/doctype/request_for_quotation/request_for_quotation.py:264
+msgid "Set Password"
+msgstr ""
+
 #. Label of a Check field in DocType 'POS Opening Entry'
 #: accounts/doctype/pos_opening_entry/pos_opening_entry.json
 msgctxt "POS Opening Entry"
 msgid "Set Posting Date"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:767
+#: manufacturing/doctype/bom/bom.js:800
 msgid "Set Process Loss Item Quantity"
 msgstr ""
 
-#: projects/doctype/project/project.js:116
-#: projects/doctype/project/project.js:118
-#: projects/doctype/project/project.js:132
+#: projects/doctype/project/project.js:140
+#: projects/doctype/project/project.js:143
+#: projects/doctype/project/project.js:157
 msgid "Set Project Status"
 msgstr ""
 
-#: projects/doctype/project/project.js:154
+#: projects/doctype/project/project.js:182
 msgid "Set Project and all Tasks to status {0}?"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:768
+#: manufacturing/doctype/bom/bom.js:801
 msgid "Set Quantity"
 msgstr ""
 
@@ -64997,7 +66097,7 @@
 msgid "Set Valuation Rate Based on Source Warehouse"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:184
+#: selling/doctype/sales_order/sales_order.js:207
 msgid "Set Warehouse"
 msgstr ""
 
@@ -65006,25 +66106,25 @@
 msgid "Set as Closed"
 msgstr ""
 
-#: projects/doctype/task/task_list.js:12
+#: projects/doctype/task/task_list.js:20
 msgid "Set as Completed"
 msgstr ""
 
-#: public/js/utils/sales_common.js:406
-#: selling/doctype/quotation/quotation.js:124
+#: public/js/utils/sales_common.js:462
+#: selling/doctype/quotation/quotation.js:129
 msgid "Set as Lost"
 msgstr ""
 
 #: crm/doctype/opportunity/opportunity_list.js:13
-#: projects/doctype/task/task_list.js:8 support/doctype/issue/issue_list.js:8
+#: projects/doctype/task/task_list.js:16 support/doctype/issue/issue_list.js:8
 msgid "Set as Open"
 msgstr ""
 
-#: setup/doctype/company/company.py:419
+#: setup/doctype/company/company.py:418
 msgid "Set default inventory account for perpetual inventory"
 msgstr ""
 
-#: setup/doctype/company/company.py:429
+#: setup/doctype/company/company.py:428
 msgid "Set default {0} account for non stock items"
 msgstr ""
 
@@ -65035,7 +66135,7 @@
 msgid "Set fieldname from which you want to fetch the data from the parent form."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:757
+#: manufacturing/doctype/bom/bom.js:790
 msgid "Set quantity of process loss item:"
 msgstr ""
 
@@ -65052,7 +66152,7 @@
 msgid "Set targets Item Group-wise for this Sales Person."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:852
+#: manufacturing/doctype/work_order/work_order.js:923
 msgid "Set the Planned Start Date (an Estimated Date at which you want the Production to begin)"
 msgstr ""
 
@@ -65074,15 +66174,15 @@
 msgid "Set up your Warehouse"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:672
+#: assets/doctype/asset/asset.py:674
 msgid "Set {0} in asset category {1} for company {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:953
+#: assets/doctype/asset/asset.py:957
 msgid "Set {0} in asset category {1} or company {2}"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:949
+#: assets/doctype/asset/asset.py:953
 msgid "Set {0} in company {1}"
 msgstr ""
 
@@ -65163,7 +66263,7 @@
 msgstr ""
 
 #: manufacturing/doctype/bom/bom.py:956
-#: manufacturing/doctype/work_order/work_order.py:978
+#: manufacturing/doctype/work_order/work_order.py:992
 msgid "Setting {} is required"
 msgstr ""
 
@@ -65196,7 +66296,13 @@
 msgid "Settings"
 msgstr ""
 
-#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:15
+#. Description of a DocType
+#: crm/doctype/crm_settings/crm_settings.json
+#: selling/doctype/selling_settings/selling_settings.json
+msgid "Settings for Selling Module"
+msgstr ""
+
+#: accounts/doctype/invoice_discounting/invoice_discounting_list.js:11
 msgid "Settled"
 msgstr ""
 
@@ -65212,6 +66318,12 @@
 msgid "Settled"
 msgstr ""
 
+#. Option for the 'Status' (Select) field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Setup"
+msgstr ""
+
 #. Title of an Onboarding Step
 #: setup/onboarding_step/letterhead/letterhead.json
 msgid "Setup Your Letterhead"
@@ -65230,7 +66342,7 @@
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
 #: accounts/doctype/share_balance/share_balance.json
-#: accounts/doctype/shareholder/shareholder.js:22
+#: accounts/doctype/shareholder/shareholder.js:21
 #: accounts/report/share_balance/share_balance.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Balance"
@@ -65245,7 +66357,7 @@
 
 #. Name of a report
 #. Label of a Link in the Accounting Workspace
-#: accounts/doctype/shareholder/shareholder.js:28
+#: accounts/doctype/shareholder/shareholder.js:27
 #: accounts/report/share_ledger/share_ledger.json
 #: accounts/workspace/accounting/accounting.json
 msgid "Share Ledger"
@@ -65289,9 +66401,9 @@
 
 #. Name of a DocType
 #: accounts/doctype/shareholder/shareholder.json
-#: accounts/report/share_balance/share_balance.js:17
+#: accounts/report/share_balance/share_balance.js:16
 #: accounts/report/share_balance/share_balance.py:57
-#: accounts/report/share_ledger/share_ledger.js:17
+#: accounts/report/share_ledger/share_ledger.js:16
 #: accounts/report/share_ledger/share_ledger.py:51
 msgid "Shareholder"
 msgstr ""
@@ -65308,7 +66420,7 @@
 msgid "Shelf Life In Days"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:247
+#: assets/doctype/asset/asset.js:288
 msgid "Shift"
 msgstr ""
 
@@ -65331,7 +66443,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/delivery_note/delivery_note.js:166
+#: stock/doctype/delivery_note/delivery_note.js:181
 #: stock/doctype/shipment/shipment.json
 msgid "Shipment"
 msgstr ""
@@ -65399,7 +66511,7 @@
 msgid "Shipment details"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:846
+#: stock/doctype/delivery_note/delivery_note.py:907
 msgid "Shipments"
 msgstr ""
 
@@ -65747,31 +66859,35 @@
 msgid "Show Cancelled Entries"
 msgstr ""
 
-#: templates/pages/projects.js:64
+#: templates/pages/projects.js:61
 msgid "Show Completed"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:107
+#: accounts/report/budget_variance_report/budget_variance_report.js:105
 msgid "Show Cumulative Amount"
 msgstr ""
 
-#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:17
+#: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.js:16
 msgid "Show Disabled Warehouses"
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:306
+msgid "Show Document"
+msgstr ""
+
 #. Label of a Check field in DocType 'Bank Statement Import'
 #: accounts/doctype/bank_statement_import/bank_statement_import.json
 msgctxt "Bank Statement Import"
 msgid "Show Failed Logs"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:144
-#: accounts/report/accounts_receivable/accounts_receivable.js:161
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:134
+#: accounts/report/accounts_payable/accounts_payable.js:147
+#: accounts/report/accounts_receivable/accounts_receivable.js:164
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:137
 msgid "Show Future Payments"
 msgstr ""
 
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:139
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:142
 msgid "Show GL Balance"
 msgstr ""
 
@@ -65804,7 +66920,7 @@
 msgid "Show Ledger View"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:166
+#: accounts/report/accounts_receivable/accounts_receivable.js:169
 msgid "Show Linked Delivery Notes"
 msgstr ""
 
@@ -65818,7 +66934,7 @@
 msgid "Show Net Values in Party Account"
 msgstr ""
 
-#: templates/pages/projects.js:66
+#: templates/pages/projects.js:63
 msgid "Show Open"
 msgstr ""
 
@@ -65852,18 +66968,18 @@
 msgid "Show Preview"
 msgstr ""
 
-#: accounts/report/accounts_payable/accounts_payable.js:139
-#: accounts/report/accounts_receivable/accounts_receivable.js:176
+#: accounts/report/accounts_payable/accounts_payable.js:142
+#: accounts/report/accounts_receivable/accounts_receivable.js:179
 #: accounts/report/general_ledger/general_ledger.js:204
 msgid "Show Remarks"
 msgstr ""
 
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:66
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:65
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:65
 msgid "Show Return Entries"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.js:171
+#: accounts/report/accounts_receivable/accounts_receivable.js:174
 msgid "Show Sales Person"
 msgstr ""
 
@@ -65877,11 +66993,16 @@
 msgid "Show Taxes as Table in Print"
 msgstr ""
 
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:456
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:296
+msgid "Show Traceback"
+msgstr ""
+
 #: stock/report/stock_balance/stock_balance.js:90
 msgid "Show Variant Attributes"
 msgstr ""
 
-#: stock/doctype/item/item.js:90
+#: stock/doctype/item/item.js:106
 msgid "Show Variants"
 msgstr ""
 
@@ -65889,8 +67010,8 @@
 msgid "Show Warehouse-wise Stock"
 msgstr ""
 
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:29
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:17
+#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:28
+#: manufacturing/report/bom_stock_report/bom_stock_report.js:19
 msgid "Show exploded view"
 msgstr ""
 
@@ -65900,7 +67021,7 @@
 msgid "Show in Website"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.js:104
+#: accounts/report/trial_balance/trial_balance.js:110
 msgid "Show net values in opening and closing columns"
 msgstr ""
 
@@ -65908,30 +67029,30 @@
 msgid "Show only POS"
 msgstr ""
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:108
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:106
 msgid "Show only the Immediate Upcoming Term"
 msgstr ""
 
-#: stock/utils.py:588
+#: stock/utils.py:583
 msgid "Show pending entries"
 msgstr ""
 
-#: accounts/report/trial_balance/trial_balance.js:93
+#: accounts/report/trial_balance/trial_balance.js:99
 msgid "Show unclosed fiscal year's P&L balances"
 msgstr ""
 
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:88
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:96
 msgid "Show with upcoming revenue/expense"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:113
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:137
 #: accounts/report/profitability_analysis/profitability_analysis.js:71
-#: accounts/report/trial_balance/trial_balance.js:88
+#: accounts/report/trial_balance/trial_balance.js:94
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:85
 msgid "Show zero values"
 msgstr ""
 
-#: accounts/doctype/accounting_dimension/accounting_dimension.js:30
+#: accounts/doctype/accounting_dimension/accounting_dimension.js:35
 msgid "Show {0}"
 msgstr ""
 
@@ -66017,7 +67138,7 @@
 msgid "Simultaneous"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:551
+#: stock/doctype/stock_entry/stock_entry.py:506
 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 ""
 
@@ -66040,7 +67161,7 @@
 msgid "Single Transaction Threshold"
 msgstr ""
 
-#: stock/doctype/item/item.js:103
+#: stock/doctype/item/item.js:131
 msgid "Single Variant"
 msgstr ""
 
@@ -66076,7 +67197,7 @@
 msgid "Skipping Tax Withholding Category {0} as there is no associated account set for Company {1} in it."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:51
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:49
 msgid "Skipping {0} of {1}, {2}"
 msgstr ""
 
@@ -66090,7 +67211,7 @@
 msgid "Small"
 msgstr ""
 
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:68
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:67
 msgid "Smoothing Constant"
 msgstr ""
 
@@ -66099,7 +67220,7 @@
 msgid "Software"
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:11
+#: assets/doctype/asset/asset_list.js:9
 msgid "Sold"
 msgstr ""
 
@@ -66109,24 +67230,29 @@
 msgid "Sold"
 msgstr ""
 
-#: www/book_appointment/index.js:239
+#: selling/page/point_of_sale/pos_past_order_summary.js:80
+msgid "Sold by"
+msgstr ""
+
+#: www/book_appointment/index.js:248
 msgid "Something went wrong please try again"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:747
+#: accounts/doctype/pricing_rule/utils.py:746
 msgid "Sorry, this coupon code is no longer valid"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:745
+#: accounts/doctype/pricing_rule/utils.py:744
 msgid "Sorry, this coupon code's validity has expired"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:742
+#: accounts/doctype/pricing_rule/utils.py:741
 msgid "Sorry, this coupon code's validity has not started"
 msgstr ""
 
 #: crm/report/lead_details/lead_details.py:40
 #: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.py:38
+#: templates/form_grid/stock_entry_grid.html:29
 msgid "Source"
 msgstr ""
 
@@ -66232,10 +67358,10 @@
 msgid "Source Type"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:313
+#: manufacturing/doctype/bom/bom.js:326
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:126
-#: stock/dashboard/item_dashboard.js:215
-#: stock/doctype/stock_entry/stock_entry.js:547
+#: stock/dashboard/item_dashboard.js:223
+#: stock/doctype/stock_entry/stock_entry.js:627
 msgid "Source Warehouse"
 msgstr ""
 
@@ -66310,11 +67436,11 @@
 msgid "Source and Target Location cannot be same"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:640
+#: stock/doctype/stock_entry/stock_entry.py:595
 msgid "Source and target warehouse cannot be same for row {0}"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:278
+#: stock/dashboard/item_dashboard.js:286
 msgid "Source and target warehouse must be different"
 msgstr ""
 
@@ -66323,8 +67449,8 @@
 msgid "Source of Funds (Liabilities)"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:617
-#: stock/doctype/stock_entry/stock_entry.py:634
+#: stock/doctype/stock_entry/stock_entry.py:572
+#: stock/doctype/stock_entry/stock_entry.py:589
 msgid "Source warehouse is mandatory for row {0}"
 msgstr ""
 
@@ -66362,16 +67488,26 @@
 msgid "Spacer"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:467 stock/doctype/batch/batch.js:143
-#: support/doctype/issue/issue.js:100
+#. Description of a DocType
+#: setup/doctype/currency_exchange/currency_exchange.json
+msgid "Specify Exchange Rate to convert one currency into another"
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/shipping_rule/shipping_rule.json
+msgid "Specify conditions to calculate shipping amount"
+msgstr ""
+
+#: assets/doctype/asset/asset.js:540 stock/doctype/batch/batch.js:70
+#: stock/doctype/batch/batch.js:162 support/doctype/issue/issue.js:112
 msgid "Split"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:111 assets/doctype/asset/asset.js:451
+#: assets/doctype/asset/asset.js:135 assets/doctype/asset/asset.js:524
 msgid "Split Asset"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:142
+#: stock/doctype/batch/batch.js:161
 msgid "Split Batch"
 msgstr ""
 
@@ -66388,19 +67524,19 @@
 msgid "Split From"
 msgstr ""
 
-#: support/doctype/issue/issue.js:90
+#: support/doctype/issue/issue.js:100
 msgid "Split Issue"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:457
+#: assets/doctype/asset/asset.js:530
 msgid "Split Qty"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1050
+#: assets/doctype/asset/asset.py:1054
 msgid "Split qty cannot be grater than or equal to asset qty"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1827
+#: accounts/doctype/payment_entry/payment_entry.py:1846
 msgid "Splitting {0} {1} into {2} rows as per Payment Terms"
 msgstr ""
 
@@ -66463,11 +67599,26 @@
 msgid "Standard Template"
 msgstr ""
 
+#. Description of a DocType
+#: setup/doctype/terms_and_conditions/terms_and_conditions.json
+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
 msgid "Standard rated supplies in {0}"
 msgstr ""
 
+#. Description of a DocType
+#: accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Purchase Transactions. This template can contain a list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\", etc."
+msgstr ""
+
+#. Description of a DocType
+#: accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+msgid "Standard tax template that can be applied to all Sales Transactions. This template can contain a list of tax heads and also other expense/income heads like \"Shipping\", \"Insurance\", \"Handling\" etc."
+msgstr ""
+
 #. Label of a Link field in DocType 'Supplier Scorecard Scoring Standing'
 #: buying/doctype/supplier_scorecard_scoring_standing/supplier_scorecard_scoring_standing.json
 msgctxt "Supplier Scorecard Scoring Standing"
@@ -66480,23 +67631,25 @@
 msgid "Standing Name"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:591
+#: manufacturing/doctype/work_order/work_order.js:630
+#: manufacturing/doctype/workstation/workstation_job_card.html:67
+#: public/js/projects/timer.js:32
 msgid "Start"
 msgstr ""
 
-#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:44
+#: accounts/doctype/process_payment_reconciliation/process_payment_reconciliation.js:43
 msgid "Start / Resume"
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:34
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:34
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:42
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:42
 #: accounts/report/general_and_payment_ledger_comparison/general_and_payment_ledger_comparison.js:16
-#: accounts/report/payment_ledger/payment_ledger.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:68
+#: accounts/report/payment_ledger/payment_ledger.js:16
+#: assets/report/fixed_asset_register/fixed_asset_register.js:67
 #: projects/report/project_summary/project_summary.py:70
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:52
-#: public/js/financial_statements.js:184
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:17
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:47
+#: public/js/financial_statements.js:193
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:16
 msgid "Start Date"
 msgstr ""
 
@@ -66570,11 +67723,16 @@
 msgid "Start Date cannot be before the current date"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:133
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.js:21
+msgid "Start Deletion"
+msgstr ""
+
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:115
 msgid "Start Import"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.js:244
+#: manufacturing/doctype/job_card/job_card.js:269
+#: manufacturing/doctype/workstation/workstation.js:190
 msgid "Start Job"
 msgstr ""
 
@@ -66582,10 +67740,14 @@
 msgid "Start Merge"
 msgstr ""
 
-#: stock/doctype/repost_item_valuation/repost_item_valuation.js:85
+#: stock/doctype/repost_item_valuation/repost_item_valuation.js:95
 msgid "Start Reposting"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation.js:159
+msgid "Start Time"
+msgstr ""
+
 #. Label of a Datetime field in DocType 'Call Log'
 #: telephony/doctype/call_log/call_log.json
 msgctxt "Call Log"
@@ -66614,11 +67776,11 @@
 msgid "Start Time can't be greater than or equal to End Time for {0}."
 msgstr ""
 
-#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:48
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:48
+#: accounts/report/consolidated_financial_statement/consolidated_financial_statement.js:56
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:56
 #: accounts/report/financial_ratios/financial_ratios.js:17
-#: assets/report/fixed_asset_register/fixed_asset_register.js:82
-#: public/js/financial_statements.js:198
+#: assets/report/fixed_asset_register/fixed_asset_register.js:81
+#: public/js/financial_statements.js:207
 msgid "Start Year"
 msgstr ""
 
@@ -66652,7 +67814,7 @@
 msgid "Started Time"
 msgstr ""
 
-#: utilities/bulk_transaction.py:19
+#: utilities/bulk_transaction.py:22
 msgid "Started a background job to create {1} {0}"
 msgstr ""
 
@@ -66669,7 +67831,7 @@
 msgstr ""
 
 #: crm/report/lead_details/lead_details.py:59
-#: public/js/utils/contact_address_quick_entry.js:81
+#: public/js/utils/contact_address_quick_entry.js:84
 msgid "State"
 msgstr ""
 
@@ -66697,68 +67859,76 @@
 msgid "Statement Import Log"
 msgstr ""
 
-#: assets/report/fixed_asset_register/fixed_asset_register.js:17
+#: accounts/report/general_ledger/general_ledger.html:1
+msgid "Statement of Account"
+msgstr ""
+
+#: 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
-#: buying/doctype/purchase_order/purchase_order.js:288
-#: buying/doctype/purchase_order/purchase_order.js:290
-#: buying/doctype/purchase_order/purchase_order.js:292
-#: buying/doctype/purchase_order/purchase_order.js:298
-#: buying/doctype/purchase_order/purchase_order.js:300
-#: buying/doctype/purchase_order/purchase_order.js:304
+#: buying/doctype/purchase_order/purchase_order.js:317
+#: buying/doctype/purchase_order/purchase_order.js:323
+#: buying/doctype/purchase_order/purchase_order.js:329
+#: buying/doctype/purchase_order/purchase_order.js:335
+#: buying/doctype/purchase_order/purchase_order.js:337
+#: 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:53
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:52
 #: buying/report/purchase_order_analysis/purchase_order_analysis.py:173
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:134
-#: crm/report/lead_details/lead_details.js:31
+#: crm/report/lead_details/lead_details.js:30
 #: crm/report/lead_details/lead_details.py:25
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:34
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:39
-#: manufacturing/doctype/production_plan/production_plan.js:99
-#: manufacturing/doctype/production_plan/production_plan.js:103
-#: manufacturing/doctype/production_plan/production_plan.js:431
-#: manufacturing/doctype/work_order/work_order.js:352
-#: manufacturing/doctype/work_order/work_order.js:389
-#: manufacturing/doctype/work_order/work_order.js:565
-#: manufacturing/doctype/work_order/work_order.js:572
-#: manufacturing/doctype/work_order/work_order.js:576
-#: manufacturing/report/job_card_summary/job_card_summary.js:51
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:32
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:38
+#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:115
+#: manufacturing/doctype/production_plan/production_plan.js:466
+#: manufacturing/doctype/work_order/work_order.js:371
+#: manufacturing/doctype/work_order/work_order.js:407
+#: manufacturing/doctype/work_order/work_order.js:595
+#: manufacturing/doctype/work_order/work_order.js:606
+#: manufacturing/doctype/work_order/work_order.js:614
+#: 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/production_analytics/production_analytics.py:19
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:22
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:21
 #: manufacturing/report/quality_inspection_summary/quality_inspection_summary.py:80
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:50
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:49
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:111
 #: manufacturing/report/work_order_stock_report/work_order_stock_report.py:138
-#: manufacturing/report/work_order_summary/work_order_summary.js:37
+#: manufacturing/report/work_order_summary/work_order_summary.js:36
 #: manufacturing/report/work_order_summary/work_order_summary.py:202
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:35
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:25
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:24
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:92
-#: projects/report/project_summary/project_summary.js:24
+#: projects/report/project_summary/project_summary.js:23
 #: projects/report/project_summary/project_summary.py:58
-#: selling/doctype/sales_order/sales_order.js:517
-#: selling/doctype/sales_order/sales_order.js:521
-#: selling/doctype/sales_order/sales_order.js:528
-#: selling/doctype/sales_order/sales_order.js:539
-#: selling/doctype/sales_order/sales_order.js:541
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:90
+#: public/js/plant_floor_visual/visual_plant.js:111
+#: selling/doctype/sales_order/sales_order.js:553
+#: selling/doctype/sales_order/sales_order.js:558
+#: selling/doctype/sales_order/sales_order.js:567
+#: selling/doctype/sales_order/sales_order.js:584
+#: selling/doctype/sales_order/sales_order.js:590
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:88
 #: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py:68
-#: selling/report/sales_order_analysis/sales_order_analysis.js:55
+#: selling/report/sales_order_analysis/sales_order_analysis.js:54
 #: selling/report/sales_order_analysis/sales_order_analysis.py:228
-#: stock/doctype/delivery_note/delivery_note.js:210
-#: stock/doctype/delivery_note/delivery_note.js:229
-#: stock/doctype/purchase_receipt/purchase_receipt.js:222
-#: stock/doctype/purchase_receipt/purchase_receipt.js:240
-#: stock/report/reserved_stock/reserved_stock.js:127
+#: stock/doctype/delivery_note/delivery_note.js:252
+#: stock/doctype/delivery_note/delivery_note.js:281
+#: stock/doctype/purchase_receipt/purchase_receipt.js:255
+#: stock/doctype/purchase_receipt/purchase_receipt.js:284
+#: stock/report/reserved_stock/reserved_stock.js:124
 #: stock/report/reserved_stock/reserved_stock.py:178
 #: stock/report/serial_no_ledger/serial_no_ledger.py:51
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:106
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.js:108
-#: support/report/issue_analytics/issue_analytics.js:52
-#: support/report/issue_summary/issue_summary.js:39
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:114
+#: support/report/issue_analytics/issue_analytics.js:51
+#: support/report/issue_summary/issue_summary.js:38
 #: templates/pages/projects.html:24 templates/pages/projects.html:46
-#: templates/pages/projects.html:66
+#: templates/pages/projects.html:66 templates/pages/task_info.html:69
+#: templates/pages/timelog_info.html:40
 msgid "Status"
 msgstr ""
 
@@ -67226,12 +68396,24 @@
 msgid "Status"
 msgstr ""
 
+#. Label of a Select field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status"
+msgstr ""
+
 #. Label of a Section Break field in DocType 'Service Level Agreement'
 #: support/doctype/service_level_agreement/service_level_agreement.json
 msgctxt "Service Level Agreement"
 msgid "Status Details"
 msgstr ""
 
+#. Label of a Section Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Status Illustration"
+msgstr ""
+
 #: projects/doctype/project/project.py:719
 msgid "Status must be Cancelled or Completed"
 msgstr ""
@@ -67253,7 +68435,7 @@
 #. Label of a Card Break in the Home Workspace
 #. Name of a Workspace
 #: accounts/doctype/item_tax_template/item_tax_template_dashboard.py:11
-#: accounts/report/account_balance/account_balance.js:55
+#: accounts/report/account_balance/account_balance.js:57
 #: manufacturing/doctype/bom/bom_dashboard.py:14 setup/workspace/home/home.json
 #: stock/doctype/material_request/material_request_dashboard.py:17
 #: stock/workspace/stock/stock.json
@@ -67280,8 +68462,8 @@
 
 #: 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:1187
-#: accounts/report/account_balance/account_balance.js:56
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1239
+#: accounts/report/account_balance/account_balance.js:58
 msgid "Stock Adjustment"
 msgstr ""
 
@@ -67305,7 +68487,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: public/js/stock_analytics.js:8
+#: public/js/stock_analytics.js:7
 #: stock/report/stock_analytics/stock_analytics.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Analytics"
@@ -67323,7 +68505,7 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:52
+#: stock/doctype/item/item.js:58 stock/doctype/warehouse/warehouse.js:49
 #: stock/report/stock_balance/stock_balance.json
 #: stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py:107
 #: stock/workspace/stock/stock.json
@@ -67336,10 +68518,14 @@
 msgid "Stock Balance"
 msgstr ""
 
-#: stock/doctype/quick_stock_balance/quick_stock_balance.js:16
+#: stock/doctype/quick_stock_balance/quick_stock_balance.js:15
 msgid "Stock Balance Report"
 msgstr ""
 
+#: stock/page/warehouse_capacity_summary/warehouse_capacity_summary_header.html:10
+msgid "Stock Capacity"
+msgstr ""
+
 #. Label of a Tab Break field in DocType 'Stock Settings'
 #: stock/doctype/stock_settings/stock_settings.json
 msgctxt "Stock Settings"
@@ -67370,12 +68556,12 @@
 msgid "Stock Details"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:730
+#: stock/doctype/stock_entry/stock_entry.py:685
 msgid "Stock Entries already created for Work Order {0}: {1}"
 msgstr ""
 
 #. Name of a DocType
-#: stock/doctype/pick_list/pick_list.js:104
+#: stock/doctype/pick_list/pick_list.js:116
 #: stock/doctype/stock_entry/stock_entry.json
 msgid "Stock Entry"
 msgstr ""
@@ -67436,15 +68622,15 @@
 msgid "Stock Entry Type"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:1020
+#: stock/doctype/pick_list/pick_list.py:1140
 msgid "Stock Entry has been already created against this Pick List"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:104
+#: stock/doctype/batch/batch.js:115
 msgid "Stock Entry {0} created"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1140
+#: accounts/doctype/journal_entry/journal_entry.py:1167
 msgid "Stock Entry {0} is not submitted"
 msgstr ""
 
@@ -67479,14 +68665,18 @@
 #. Name of a report
 #. Label of a Link in the Stock Workspace
 #. Label of a shortcut in the Stock Workspace
-#: public/js/controllers/stock_controller.js:54
-#: public/js/utils/ledger_preview.js:27 stock/doctype/item/item.js:64
+#: public/js/controllers/stock_controller.js:66
+#: public/js/utils/ledger_preview.js:37 stock/doctype/item/item.js:68
 #: stock/doctype/item/item_dashboard.py:8
 #: stock/report/stock_ledger/stock_ledger.json stock/workspace/stock/stock.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:32
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:33
 msgid "Stock Ledger"
 msgstr ""
 
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.js:38
+msgid "Stock Ledger Entries and GL Entries are reposted for the selected Purchase Receipts"
+msgstr ""
+
 #. 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
@@ -67515,7 +68705,7 @@
 msgid "Stock Ledger report contains every submitted stock transaction. You can use filter to narrow down ledger entries."
 msgstr ""
 
-#: stock/doctype/batch/batch.js:50 stock/doctype/item/item.js:403
+#: stock/doctype/batch/batch.js:58 stock/doctype/item/item.js:467
 msgid "Stock Levels"
 msgstr ""
 
@@ -67554,6 +68744,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_reconciliation/stock_reconciliation.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/stock_settings/stock_settings.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
@@ -67572,7 +68763,7 @@
 
 #. Name of a report
 #. Label of a Link in the Stock Workspace
-#: stock/doctype/item/item.js:70
+#: stock/doctype/item/item.js:78
 #: stock/report/stock_projected_qty/stock_projected_qty.json
 #: stock/workspace/stock/stock.json
 msgid "Stock Projected Qty"
@@ -67621,7 +68812,7 @@
 
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts.py:90
 #: accounts/doctype/account/chart_of_accounts/verified/standard_chart_of_accounts_with_account_number.py:123
-#: accounts/report/account_balance/account_balance.js:57
+#: accounts/report/account_balance/account_balance.js:59
 msgid "Stock Received But Not Billed"
 msgstr ""
 
@@ -67672,20 +68863,20 @@
 msgid "Stock Reposting Settings"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:68
-#: selling/doctype/sales_order/sales_order.js:74
-#: selling/doctype/sales_order/sales_order.js:79
-#: selling/doctype/sales_order/sales_order.js:178
-#: stock/doctype/pick_list/pick_list.js:110
-#: stock/doctype/pick_list/pick_list.js:119
-#: stock/doctype/pick_list/pick_list.js:120
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:467
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:965
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:978
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:992
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1006
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1020
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1037
+#: selling/doctype/sales_order/sales_order.js:82
+#: selling/doctype/sales_order/sales_order.js:92
+#: selling/doctype/sales_order/sales_order.js:101
+#: selling/doctype/sales_order/sales_order.js:201
+#: 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_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
 msgid "Stock Reservation"
 msgstr ""
 
@@ -67695,18 +68886,18 @@
 msgid "Stock Reservation"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1144
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1146
 msgid "Stock Reservation Entries Cancelled"
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1096
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:1098
 msgid "Stock Reservation Entries Created"
 msgstr ""
 
 #. Name of a DocType
-#: selling/doctype/sales_order/sales_order.js:383
+#: selling/doctype/sales_order/sales_order.js:413
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
-#: stock/report/reserved_stock/reserved_stock.js:56
+#: stock/report/reserved_stock/reserved_stock.js:53
 #: stock/report/reserved_stock/reserved_stock.py:171
 msgid "Stock Reservation Entry"
 msgstr ""
@@ -67719,7 +68910,7 @@
 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:614
+#: stock/doctype/delivery_note/delivery_note.py:675
 msgid "Stock Reservation Warehouse Mismatch"
 msgstr ""
 
@@ -67739,7 +68930,7 @@
 msgid "Stock Reserved Qty (in Stock UOM)"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1498
+#: stock/doctype/stock_entry/stock_entry.py:1507
 msgid "Stock Return"
 msgstr ""
 
@@ -67767,6 +68958,13 @@
 msgid "Stock Summary"
 msgstr ""
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#. Label of a HTML field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Stock Summary"
+msgstr ""
+
 #. Label of a Card Break in the Stock Workspace
 #: stock/workspace/stock/stock.json
 msgid "Stock Transactions"
@@ -67784,8 +68982,8 @@
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:232
 #: 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:398
-#: stock/report/stock_ledger/stock_ledger.py:117
+#: stock/report/stock_balance/stock_balance.py:406
+#: stock/report/stock_ledger/stock_ledger.py:190
 msgid "Stock UOM"
 msgstr ""
 
@@ -67963,7 +69161,7 @@
 msgid "Stock UOM Quantity"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:368
+#: selling/doctype/sales_order/sales_order.js:398
 msgid "Stock Unreservation"
 msgstr ""
 
@@ -68030,6 +69228,7 @@
 #: stock/doctype/stock_entry/stock_entry.json
 #: stock/doctype/stock_entry_type/stock_entry_type.json
 #: stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.json
 #: stock/doctype/warehouse/warehouse.json
 #: stock/doctype/warehouse_type/warehouse_type.json
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -68070,27 +69269,31 @@
 msgid "Stock cannot be reserved in group warehouse {0}."
 msgstr ""
 
-#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:908
+#: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:910
 msgid "Stock cannot be reserved in the group warehouse {0}."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1011
-msgid "Stock cannot be updated against Delivery Note {0}"
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:673
+msgid "Stock cannot be updated against Purchase Receipt {0}"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:669
-msgid "Stock cannot be updated against Purchase Receipt {0}"
+#: accounts/doctype/sales_invoice/sales_invoice.py:1032
+msgid "Stock cannot be updated against the following Delivery Notes: {0}"
+msgstr ""
+
+#: accounts/doctype/sales_invoice/sales_invoice.py:1055
+msgid "Stock cannot be updated because the invoice contains a drop shipping item. Please disable 'Update Stock' or remove the drop shipping item."
 msgstr ""
 
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:229
 msgid "Stock not available for Item {0} in Warehouse {1}."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:679
+#: selling/page/point_of_sale/pos_controller.js:714
 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:241
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:252
 msgid "Stock transactions before {0} are frozen"
 msgstr ""
 
@@ -68108,12 +69311,12 @@
 msgid "Stock will be reserved on submission of <b>Purchase Receipt</b> created against Material Receipt for Sales Order."
 msgstr ""
 
-#: stock/utils.py:579
+#: stock/utils.py:574
 msgid "Stock/Accounts can not be frozen as processing of backdated entries is going on. Please try again later."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:570
-#: stock/doctype/material_request/material_request.js:107
+#: manufacturing/doctype/work_order/work_order.js:602
+#: stock/doctype/material_request/material_request.js:109
 msgid "Stop"
 msgstr ""
 
@@ -68189,11 +69392,11 @@
 msgid "Stopped"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:631
+#: manufacturing/doctype/work_order/work_order.py:645
 msgid "Stopped Work Order cannot be cancelled, Unstop it first to cancel"
 msgstr ""
 
-#: setup/doctype/company/company.py:260
+#: 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
@@ -68230,7 +69433,12 @@
 msgid "Sub Assemblies & Raw Materials"
 msgstr ""
 
-#: public/js/bom_configurator/bom_configurator.bundle.js:264
+#: public/js/bom_configurator/bom_configurator.bundle.js:129
+#: public/js/bom_configurator/bom_configurator.bundle.js:159
+msgid "Sub Assembly"
+msgstr ""
+
+#: public/js/bom_configurator/bom_configurator.bundle.js:271
 msgid "Sub Assembly Item"
 msgstr ""
 
@@ -68302,7 +69510,7 @@
 msgid "Subcontract BOM"
 msgstr ""
 
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:37
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:36
 #: buying/report/subcontract_order_summary/subcontract_order_summary.py:128
 #: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.py:22
 #: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.py:22
@@ -68314,7 +69522,7 @@
 msgid "Subcontract Order Summary"
 msgstr ""
 
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:68
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:81
 msgid "Subcontract Return"
 msgstr ""
 
@@ -68350,10 +69558,10 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:318
-#: controllers/subcontracting_controller.py:806
+#: buying/doctype/purchase_order/purchase_order.js:369
+#: controllers/subcontracting_controller.py:810
 #: subcontracting/doctype/subcontracting_order/subcontracting_order.json
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:78
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:95
 msgid "Subcontracting Order"
 msgstr ""
 
@@ -68403,7 +69611,7 @@
 msgid "Subcontracting Order Supplied Item"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:861
+#: buying/doctype/purchase_order/purchase_order.py:864
 msgid "Subcontracting Order {0} created."
 msgstr ""
 
@@ -68414,7 +69622,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:188
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:200
 #: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
 msgid "Subcontracting Receipt"
 msgstr ""
@@ -68466,10 +69674,10 @@
 msgid "Subdivision"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:219
-#: projects/doctype/task/task_tree.js:62
+#: buying/doctype/request_for_quotation/request_for_quotation.js:237
+#: projects/doctype/task/task_tree.js:65
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:91
-#: support/doctype/issue/issue.js:96
+#: support/doctype/issue/issue.js:106 templates/pages/task_info.html:44
 msgid "Subject"
 msgstr ""
 
@@ -68521,15 +69729,16 @@
 msgid "Subject"
 msgstr ""
 
-#: accounts/doctype/payment_order/payment_order.js:120
-#: public/js/payment/payments.js:28
-#: selling/page/point_of_sale/pos_controller.js:101
-#: www/book_appointment/index.html:59
+#: accounts/doctype/payment_order/payment_order.js:137
+#: manufacturing/doctype/workstation/workstation.js:237
+#: public/js/payment/payments.js:30
+#: selling/page/point_of_sale/pos_controller.js:119
+#: templates/pages/task_info.html:101 www/book_appointment/index.html:59
 msgid "Submit"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:857
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:698
+#: buying/doctype/purchase_order/purchase_order.py:860
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py:699
 msgid "Submit Action Failed"
 msgstr ""
 
@@ -68557,14 +69766,18 @@
 msgid "Submit Journal Entries"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:135
+#: manufacturing/doctype/work_order/work_order.js:139
 msgid "Submit this Work Order for further processing."
 msgstr ""
 
-#: assets/doctype/asset/asset_list.js:32
+#: buying/doctype/request_for_quotation/request_for_quotation.py:265
+msgid "Submit your Quotation"
+msgstr ""
+
+#: assets/doctype/asset/asset_list.js:23
 #: manufacturing/doctype/bom_creator/bom_creator_list.js:15
-#: stock/doctype/stock_entry/stock_entry_list.js:21
-#: templates/pages/material_request_info.html:24 templates/pages/order.html:58
+#: stock/doctype/stock_entry/stock_entry_list.js:27
+#: templates/pages/material_request_info.html:24 templates/pages/order.html:70
 msgid "Submitted"
 msgstr ""
 
@@ -68828,11 +70041,11 @@
 msgid "Succeeded"
 msgstr ""
 
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:6
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:7
 msgid "Succeeded Entries"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:513
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:467
 msgid "Success"
 msgstr ""
 
@@ -68867,11 +70080,11 @@
 msgid "Successful"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:538
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.py:543
 msgid "Successfully Reconciled"
 msgstr ""
 
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:164
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:171
 msgid "Successfully Set Supplier"
 msgstr ""
 
@@ -68879,31 +70092,31 @@
 msgid "Successfully changed Stock UOM, please redefine conversion factors for new UOM."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:468
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:430
 msgid "Successfully imported {0}"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:182
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:161
 msgid "Successfully imported {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:166
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:145
 msgid "Successfully imported {0} record."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:178
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:157
 msgid "Successfully imported {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:165
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:144
 msgid "Successfully imported {0} records."
 msgstr ""
 
-#: buying/doctype/supplier/supplier.js:177
+#: buying/doctype/supplier/supplier.js:210
 msgid "Successfully linked to Customer"
 msgstr ""
 
-#: selling/doctype/customer/customer.js:222
+#: selling/doctype/customer/customer.js:243
 msgid "Successfully linked to Supplier"
 msgstr ""
 
@@ -68911,23 +70124,23 @@
 msgid "Successfully merged {0} out of {1}."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:478
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:438
 msgid "Successfully updated {0}"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:193
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:172
 msgid "Successfully updated {0} record out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:171
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:150
 msgid "Successfully updated {0} record."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:189
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:168
 msgid "Successfully updated {0} records out of {1}. Click on Export Errored Rows, fix the errors and import again."
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:170
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:149
 msgid "Successfully updated {0} records."
 msgstr ""
 
@@ -69057,30 +70270,30 @@
 
 #. Name of a DocType
 #. Label of a Card Break in the Buying Workspace
-#: accounts/doctype/payment_order/payment_order.js:100
+#: accounts/doctype/payment_order/payment_order.js:110
 #: accounts/report/billed_items_to_be_received/billed_items_to_be_received.py:61
 #: 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/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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:38
-#: buying/doctype/request_for_quotation/request_for_quotation.js:156
-#: buying/doctype/request_for_quotation/request_for_quotation.js:208
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:37
+#: buying/doctype/request_for_quotation/request_for_quotation.js:167
+#: 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/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:16
+#: 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:16
+#: 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/workspace/buying/buying.json public/js/purchase_trends_filters.js:50
-#: public/js/purchase_trends_filters.js:66
+#: public/js/purchase_trends_filters.js:63
 #: regional/report/irs_1099/irs_1099.py:79
-#: selling/doctype/customer/customer.js:207
-#: selling/doctype/sales_order/sales_order.js:1005
+#: 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
 msgid "Supplier"
 msgstr ""
@@ -69386,15 +70599,15 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/accounts_payable/accounts_payable.js:122
-#: accounts/report/accounts_payable_summary/accounts_payable_summary.js:105
-#: accounts/report/accounts_receivable/accounts_receivable.py:1110
+#: 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/purchase_register/purchase_register.js:27
 #: accounts/report/purchase_register/purchase_register.py:186
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:56
-#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: 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
@@ -69476,7 +70689,7 @@
 msgid "Supplier Invoice"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:218
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:216
 msgid "Supplier Invoice Date"
 msgstr ""
 
@@ -69486,13 +70699,14 @@
 msgid "Supplier Invoice Date"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1494
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1550
 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.py:656
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:212
+#: 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
 msgid "Supplier Invoice No"
 msgstr ""
 
@@ -69508,7 +70722,7 @@
 msgid "Supplier Invoice No"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:1519
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:1575
 msgid "Supplier Invoice No exists in Purchase Invoice {0}"
 msgstr ""
 
@@ -69538,12 +70752,12 @@
 msgid "Supplier Ledger Summary"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1041
+#: accounts/report/accounts_receivable/accounts_receivable.py:1049
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:160
 #: 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
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:74
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:73
 msgid "Supplier Name"
 msgstr ""
 
@@ -69673,14 +70887,14 @@
 msgstr ""
 
 #. Name of a DocType
-#: buying/doctype/purchase_order/purchase_order.js:458
-#: buying/doctype/request_for_quotation/request_for_quotation.js:42
+#: buying/doctype/purchase_order/purchase_order.js:529
+#: 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
-#: crm/doctype/opportunity/opportunity.js:82
-#: stock/doctype/material_request/material_request.js:147
+#: crm/doctype/opportunity/opportunity.js:81
+#: stock/doctype/material_request/material_request.js:170
 msgid "Supplier Quotation"
 msgstr ""
 
@@ -69732,7 +70946,7 @@
 msgid "Supplier Quotation Item"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.py:409
+#: buying/doctype/request_for_quotation/request_for_quotation.py:433
 msgid "Supplier Quotation {0} Created"
 msgstr ""
 
@@ -69860,6 +71074,11 @@
 msgid "Supplier delivers to Customer"
 msgstr ""
 
+#. Description of a DocType
+#: buying/doctype/supplier/supplier.json
+msgid "Supplier of Goods or Services."
+msgstr ""
+
 #: buying/doctype/supplier_quotation/supplier_quotation.py:167
 msgid "Supplier {0} not found in {1}"
 msgstr ""
@@ -69950,7 +71169,7 @@
 msgid "Suspended"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:308
+#: selling/page/point_of_sale/pos_payment.js:325
 msgid "Switch Between Payment Modes"
 msgstr ""
 
@@ -70046,6 +71265,7 @@
 #: manufacturing/doctype/bom_update_log/bom_update_log.json
 #: manufacturing/doctype/downtime_entry/downtime_entry.json
 #: manufacturing/doctype/job_card/job_card.json
+#: manufacturing/doctype/plant_floor/plant_floor.json
 #: projects/doctype/activity_type/activity_type.json
 #: projects/doctype/project_template/project_template.json
 #: projects/doctype/project_type/project_type.json
@@ -70133,7 +71353,7 @@
 msgid "System will fetch all the entries if limit value is zero."
 msgstr ""
 
-#: controllers/accounts_controller.py:1673
+#: controllers/accounts_controller.py:1762
 msgid "System will not check over billing since amount for Item {0} in {1} is zero"
 msgstr ""
 
@@ -70144,11 +71364,19 @@
 msgid "System will notify to increase or decrease quantity or amount "
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TCS Amount"
+msgstr ""
+
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TCS Rate %"
 msgstr ""
 
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:245
+msgid "TDS Amount"
+msgstr ""
+
 #. Name of a report
 #: accounts/report/tds_computation_summary/tds_computation_summary.json
 msgid "TDS Computation Summary"
@@ -70158,7 +71386,7 @@
 msgid "TDS Payable"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:229
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:227
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:125
 msgid "TDS Rate %"
 msgstr ""
@@ -70169,7 +71397,12 @@
 msgid "TS-.YYYY.-"
 msgstr ""
 
-#: buying/doctype/request_for_quotation/request_for_quotation.js:427
+#. Description of a DocType
+#: stock/doctype/item_website_specification/item_website_specification.json
+msgid "Table for Item that will be shown in Web Site"
+msgstr ""
+
+#: buying/doctype/request_for_quotation/request_for_quotation.js:466
 msgid "Tag"
 msgstr ""
 
@@ -70211,10 +71444,14 @@
 msgid "Tally Migration"
 msgstr ""
 
-#: erpnext_integrations/doctype/tally_migration/tally_migration.js:32
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:34
 msgid "Tally Migration Error"
 msgstr ""
 
+#: templates/form_grid/stock_entry_grid.html:36
+msgid "Target"
+msgstr ""
+
 #. Label of a Data field in DocType 'Quality Goal Objective'
 #: quality_management/doctype/quality_goal_objective/quality_goal_objective.json
 msgctxt "Quality Goal Objective"
@@ -70249,23 +71486,23 @@
 msgid "Target Asset Location"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:248
+#: assets/doctype/asset_capitalization/asset_capitalization.py:254
 msgid "Target Asset {0} cannot be cancelled"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:246
+#: assets/doctype/asset_capitalization/asset_capitalization.py:252
 msgid "Target Asset {0} cannot be submitted"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:242
+#: assets/doctype/asset_capitalization/asset_capitalization.py:248
 msgid "Target Asset {0} cannot be {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:252
+#: assets/doctype/asset_capitalization/asset_capitalization.py:258
 msgid "Target Asset {0} does not belong to company {1}"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:233
+#: assets/doctype/asset_capitalization/asset_capitalization.py:239
 msgid "Target Asset {0} needs to be composite asset"
 msgstr ""
 
@@ -70345,15 +71582,15 @@
 msgid "Target Item Name"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:203
+#: assets/doctype/asset_capitalization/asset_capitalization.py:209
 msgid "Target Item {0} is neither a Fixed Asset nor a Stock Item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:207
+#: assets/doctype/asset_capitalization/asset_capitalization.py:213
 msgid "Target Item {0} must be a Fixed Asset item"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:209
+#: assets/doctype/asset_capitalization/asset_capitalization.py:215
 msgid "Target Item {0} must be a Stock Item"
 msgstr ""
 
@@ -70375,9 +71612,9 @@
 msgid "Target Location or To Employee is required while receiving Asset {0}"
 msgstr ""
 
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:42
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:42
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:42
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:41
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:41
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:41
 msgid "Target On"
 msgstr ""
 
@@ -70393,7 +71630,7 @@
 msgid "Target Qty"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:214
+#: assets/doctype/asset_capitalization/asset_capitalization.py:220
 msgid "Target Qty must be a positive number"
 msgstr ""
 
@@ -70403,8 +71640,8 @@
 msgid "Target Serial No"
 msgstr ""
 
-#: stock/dashboard/item_dashboard.js:222
-#: stock/doctype/stock_entry/stock_entry.js:549
+#: stock/dashboard/item_dashboard.js:230
+#: stock/doctype/stock_entry/stock_entry.js:633
 msgid "Target Warehouse"
 msgstr ""
 
@@ -70463,16 +71700,16 @@
 msgid "Target Warehouse Address"
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:224
+#: assets/doctype/asset_capitalization/asset_capitalization.py:230
 msgid "Target Warehouse is mandatory for Decapitalization"
 msgstr ""
 
-#: controllers/selling_controller.py:685
+#: controllers/selling_controller.py:709
 msgid "Target Warehouse is set for some items but the customer is not an internal customer."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:623
-#: stock/doctype/stock_entry/stock_entry.py:630
+#: stock/doctype/stock_entry/stock_entry.py:578
+#: stock/doctype/stock_entry/stock_entry.py:585
 msgid "Target warehouse is mandatory for row {0}"
 msgstr ""
 
@@ -70504,8 +71741,8 @@
 #: projects/doctype/task/task.json projects/doctype/task/task_tree.js:17
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.py:33
 #: projects/report/delayed_tasks_summary/delayed_tasks_summary.py:90
-#: public/js/projects/timer.js:11 support/doctype/issue/issue.js:22
-#: templates/pages/projects.html:56
+#: public/js/projects/timer.js:15 support/doctype/issue/issue.js:27
+#: templates/pages/projects.html:56 templates/pages/timelog_info.html:28
 msgid "Task"
 msgstr ""
 
@@ -70613,6 +71850,12 @@
 msgid "Tasks"
 msgstr ""
 
+#. Label of a Section Break field in DocType 'Transaction Deletion Record'
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+msgctxt "Transaction Deletion Record"
+msgid "Tasks"
+msgstr ""
+
 #: projects/report/project_summary/project_summary.py:62
 msgid "Tasks Completed"
 msgstr ""
@@ -70621,7 +71864,7 @@
 msgid "Tasks Overdue"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:58
+#: accounts/report/account_balance/account_balance.js:60
 msgid "Tax"
 msgstr ""
 
@@ -70661,7 +71904,6 @@
 msgid "Tax Account"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:247
 #: accounts/report/tds_computation_summary/tds_computation_summary.py:137
 msgid "Tax Amount"
 msgstr ""
@@ -70884,11 +72126,11 @@
 msgid "Tax ID"
 msgstr ""
 
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:86
+#: 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/supplier_ledger_summary/supplier_ledger_summary.js:68
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:67
 msgid "Tax Id"
 msgstr ""
 
@@ -70923,6 +72165,8 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:32
+#: accounts/report/accounts_receivable/accounts_receivable.html:19
+#: accounts/report/general_ledger/general_ledger.html:14
 msgid "Tax Id: "
 msgstr ""
 
@@ -70931,7 +72175,7 @@
 msgid "Tax Masters"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:119
+#: accounts/doctype/account/account_tree.js:160
 msgid "Tax Rate"
 msgstr ""
 
@@ -71149,7 +72393,7 @@
 msgid "Tax will be withheld only for amount exceeding the cumulative threshold"
 msgstr ""
 
-#: controllers/taxes_and_totals.py:1018
+#: controllers/taxes_and_totals.py:1019
 msgid "Taxable Amount"
 msgstr ""
 
@@ -71304,55 +72548,55 @@
 msgid "Taxes and Charges Added (Company Currency)"
 msgstr ""
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr ""
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr ""
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr ""
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr ""
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr ""
 
-#. Label of a Long Text field in DocType 'Quotation'
+#. Label of a Text Editor field in DocType 'Quotation'
 #: selling/doctype/quotation/quotation.json
 msgctxt "Quotation"
 msgid "Taxes and Charges Calculation"
 msgstr ""
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr ""
 
-#. Label of a Long 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 "Taxes and Charges Calculation"
 msgstr ""
 
-#. Label of a Long Text field in DocType 'Supplier Quotation'
+#. Label of a Markdown Editor field in DocType 'Supplier Quotation'
 #: buying/doctype/supplier_quotation/supplier_quotation.json
 msgctxt "Supplier Quotation"
 msgid "Taxes and Charges Calculation"
@@ -71428,7 +72672,7 @@
 msgid "Telephony Call Type"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:12
+#: manufacturing/doctype/bom/bom_list.js:5 stock/doctype/item/item_list.js:20
 msgid "Template"
 msgstr ""
 
@@ -71444,11 +72688,11 @@
 msgid "Template"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:279
+#: manufacturing/doctype/bom/bom.js:292
 msgid "Template Item"
 msgstr ""
 
-#: stock/get_item_details.py:219
+#: stock/get_item_details.py:224
 msgid "Template Item Selected"
 msgstr ""
 
@@ -71488,11 +72732,11 @@
 msgid "Template Warnings"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:38
+#: accounts/doctype/purchase_invoice/purchase_invoice_list.js:29
 msgid "Temporarily on Hold"
 msgstr ""
 
-#: accounts/report/account_balance/account_balance.js:59
+#: accounts/report/account_balance/account_balance.js:61
 msgid "Temporary"
 msgstr ""
 
@@ -71759,34 +73003,34 @@
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/accounts_receivable/accounts_receivable.js:145
-#: accounts/report/accounts_receivable/accounts_receivable.py:1094
-#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:111
+#: accounts/report/accounts_receivable/accounts_receivable.js:148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1102
+#: accounts/report/accounts_receivable_summary/accounts_receivable_summary.js:114
 #: accounts/report/accounts_receivable_summary/accounts_receivable_summary.py:185
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:68
+#: 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/inactive_sales_items/inactive_sales_items.js:9
+#: 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
-#: crm/report/lead_details/lead_details.js:47
+#: crm/report/lead_details/lead_details.js:46
 #: crm/report/lead_details/lead_details.py:34
-#: crm/report/lost_opportunity/lost_opportunity.js:37
+#: 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/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:48
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:46
 #: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py:39
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:60
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:59
 #: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py:39
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:48
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:46
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:60
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:59
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:71
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:72
 #: selling/report/territory_wise_sales/territory_wise_sales.py:22
 #: setup/doctype/territory/territory.json
 msgid "Territory"
@@ -71965,7 +73209,7 @@
 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:331
+#: buying/doctype/request_for_quotation/request_for_quotation.py:355
 msgid "The Access to Request for Quotation From Portal is Disabled. To Allow Access, Enable it in Portal Settings."
 msgstr ""
 
@@ -72011,7 +73255,7 @@
 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:176
+#: accounts/doctype/period_closing_voucher/period_closing_voucher.py:177
 msgid "The GL Entries will be processed in the background, it can take a few minutes."
 msgstr ""
 
@@ -72019,7 +73263,7 @@
 msgid "The Loyalty Program isn't valid for the selected company"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:747
+#: accounts/doctype/payment_request/payment_request.py:750
 msgid "The Payment Request {0} is already paid, cannot process payment twice"
 msgstr ""
 
@@ -72027,11 +73271,11 @@
 msgid "The Payment Term at row {0} is possibly a duplicate."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:132
+#: stock/doctype/pick_list/pick_list.py:167
 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:1761
+#: stock/doctype/stock_entry/stock_entry.py:1770
 msgid "The Process Loss Qty has reset as per job cards Process Loss Qty"
 msgstr ""
 
@@ -72040,7 +73284,7 @@
 msgid "The Selling Module is all set up!"
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:16
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:17
 msgid "The Stock Entry of type 'Manufacture' is known as backflush. Raw materials being consumed to manufacture finished goods is known as backflushing. <br><br> When creating Manufacture Entry, raw-material items are backflushed based on BOM of production item. If you want raw-material items to be backflushed based on Material Transfer entry made against that Work Order instead, then you can set it under this field."
 msgstr ""
 
@@ -72063,7 +73307,7 @@
 msgid "The accounts are set by the system automatically but do confirm these defaults"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:144
+#: accounts/doctype/payment_request/payment_request.py:147
 msgid "The amount of {0} set in this payment request is different from the calculated amount of all payment plans: {1}. Make sure this is correct before submitting the document."
 msgstr ""
 
@@ -72071,7 +73315,7 @@
 msgid "The currency of invoice {} ({}) is different from the currency of this dunning ({})."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:812
+#: manufacturing/doctype/work_order/work_order.js:871
 msgid "The default BOM for that item will be fetched by the system. You can also change the BOM."
 msgstr ""
 
@@ -72108,7 +73352,7 @@
 msgid "The following Items, having Putaway Rules, could not be accomodated:"
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:414
+#: assets/doctype/asset/depreciation.py:412
 msgid "The following assets have failed to automatically post depreciation entries: {0}"
 msgstr ""
 
@@ -72120,7 +73364,7 @@
 msgid "The following employees are currently still reporting to {0}:"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:773
+#: stock/doctype/material_request/material_request.py:785
 msgid "The following {0} were created: {1}"
 msgstr ""
 
@@ -72166,7 +73410,7 @@
 msgid "The parent account {0} does not exists in the uploaded template"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:133
+#: accounts/doctype/payment_request/payment_request.py:136
 msgid "The payment gateway account in plan {0} is different from the payment gateway account in this payment request"
 msgstr ""
 
@@ -72191,15 +73435,15 @@
 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:742
+#: public/js/utils.js:814
 msgid "The reserved stock will be released when you update items. Are you certain you wish to proceed?"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.js:116
+#: stock/doctype/pick_list/pick_list.js:137
 msgid "The reserved stock will be released. Are you certain you wish to proceed?"
 msgstr ""
 
-#: accounts/doctype/account/account.py:198
+#: accounts/doctype/account/account.py:217
 msgid "The root account {0} must be a group"
 msgstr ""
 
@@ -72215,7 +73459,7 @@
 msgid "The selected item cannot have Batch"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:570
+#: assets/doctype/asset/asset.js:643
 msgid "The selected {0} does not contain the selected Asset Item."
 msgstr ""
 
@@ -72239,7 +73483,7 @@
 msgid "The shares don't exist with the {0}"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:461
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:515
 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 ""
 
@@ -72247,24 +73491,16 @@
 msgid "The sync has started in the background, please check the {0} list for new records."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:155
 #: accounts/doctype/journal_entry/journal_entry.py:162
+#: accounts/doctype/journal_entry/journal_entry.py:169
 msgid "The task has been enqueued as a background job."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:244
-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 Entry and revert to the Draft stage"
-msgstr ""
-
-#: stock/doctype/stock_entry/stock_entry.py:255
-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 Entry and revert to the Submitted stage"
-msgstr ""
-
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:754
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:808
 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:765
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:819
 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 ""
 
@@ -72291,31 +73527,31 @@
 msgid "The value {0} is already assigned to an existing Item {1}."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:832
+#: manufacturing/doctype/work_order/work_order.js:899
 msgid "The warehouse where you store finished Items before they are shipped."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:827
+#: manufacturing/doctype/work_order/work_order.js:892
 msgid "The warehouse where you store your raw materials. Each required item can have a separate source warehouse. Group warehouse also can be selected as source warehouse. On submission of the Work Order, the raw materials will be reserved in these warehouses for production usage."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:837
+#: manufacturing/doctype/work_order/work_order.js:904
 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:671
+#: manufacturing/doctype/job_card/job_card.py:678
 msgid "The {0} ({1}) must be equal to {2} ({3})"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:779
+#: stock/doctype/material_request/material_request.py:791
 msgid "The {0} {1} created successfully"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:762
+#: manufacturing/doctype/job_card/job_card.py:769
 msgid "The {0} {1} is used to calculate the valuation cost for the finished good {2}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:501
+#: assets/doctype/asset/asset.py:503
 msgid "There are active maintenance or repairs against the asset. You must complete all of them before cancelling the asset."
 msgstr ""
 
@@ -72323,19 +73559,27 @@
 msgid "There are inconsistencies between the rate, no of shares and the amount calculated"
 msgstr ""
 
-#: utilities/bulk_transaction.py:41
+#: accounts/doctype/account/account.py:202
+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
 msgid "There are no Failed transactions"
 msgstr ""
 
-#: www/book_appointment/index.js:89
+#: setup/demo.py:108
+msgid "There are no active Fiscal Years for which Demo Data can be generated."
+msgstr ""
+
+#: www/book_appointment/index.js:95
 msgid "There are no slots available on this date"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:245
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:273
 msgid "There are only {0} asset created or linked to {1}. Please create or link {2} Assets with respective document."
 msgstr ""
 
-#: stock/doctype/item/item.js:829
+#: stock/doctype/item/item.js:913
 msgid "There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit <a href='https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/item-valuation-fifo-and-moving-average' target='_blank'>Item Valuation, FIFO and Moving Average.</a>"
 msgstr ""
 
@@ -72343,6 +73587,10 @@
 msgid "There aren't any item variants for the selected item"
 msgstr ""
 
+#: accounts/doctype/loyalty_program/loyalty_program.js:10
+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
 msgid "There can only be 1 Account per Company in {0} {1}"
 msgstr ""
@@ -72367,36 +73615,36 @@
 msgid "There is nothing to edit."
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:1279
+#: stock/doctype/stock_entry/stock_entry.py:1288
 msgid "There must be atleast 1 Finished Good in this Stock Entry"
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:135
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:151
 msgid "There was an error creating Bank Account while linking with Plaid."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:205
+#: selling/page/point_of_sale/pos_controller.js:228
 msgid "There was an error saving the document."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:236
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:252
 msgid "There was an error syncing transactions."
 msgstr ""
 
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:157
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.py:173
 msgid "There was an error updating Bank Account {} while linking with Plaid."
 msgstr ""
 
-#: accounts/doctype/bank/bank.js:113
-#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:109
+#: accounts/doctype/bank/bank.js:115
+#: erpnext_integrations/doctype/plaid_settings/plaid_settings.js:114
 msgid "There was an issue connecting to Plaid's authentication server. Check browser console for more information"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_past_order_summary.js:279
+#: selling/page/point_of_sale/pos_past_order_summary.js:289
 msgid "There were errors while sending email. Please try again."
 msgstr ""
 
-#: accounts/utils.py:924
+#: accounts/utils.py:933
 msgid "There were issues unlinking payment entry {0}."
 msgstr ""
 
@@ -72407,11 +73655,11 @@
 msgid "This Account has '0' balance in either Base Currency or Account Currency"
 msgstr ""
 
-#: stock/doctype/item/item.js:88
+#: stock/doctype/item/item.js:99
 msgid "This Item is a Template and cannot be used in transactions. Item attributes will be copied over into the variants unless 'No Copy' is set"
 msgstr ""
 
-#: stock/doctype/item/item.js:118
+#: stock/doctype/item/item.js:158
 msgid "This Item is a Variant of {0} (Template)."
 msgstr ""
 
@@ -72419,11 +73667,11 @@
 msgid "This Month's Summary"
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:26
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:31
 msgid "This Warehouse will be auto-updated in the Target Warehouse field of Work Order."
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:21
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:24
 msgid "This Warehouse will be auto-updated in the Work In Progress Warehouse field of Work Orders."
 msgstr ""
 
@@ -72447,7 +73695,7 @@
 msgid "This document is over limit by {0} {1} for item {4}. Are you making another {3} against the same {2}?"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.js:360
+#: stock/doctype/delivery_note/delivery_note.js:406
 msgid "This field is used to set the 'Customer'."
 msgstr ""
 
@@ -72458,7 +73706,7 @@
 msgid "This filter will be applied to Journal Entry."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:158
+#: manufacturing/doctype/bom/bom.js:171
 msgid "This is a Template BOM and will be used to make the work order for {0} of the item {1}"
 msgstr ""
 
@@ -72487,7 +73735,7 @@
 msgid "This is a location where scraped materials are stored."
 msgstr ""
 
-#: accounts/doctype/account/account.js:40
+#: accounts/doctype/account/account.js:36
 msgid "This is a root account and cannot be edited."
 msgstr ""
 
@@ -72499,11 +73747,11 @@
 msgid "This is a root department and cannot be edited."
 msgstr ""
 
-#: setup/doctype/item_group/item_group.js:81
+#: setup/doctype/item_group/item_group.js:98
 msgid "This is a root item group and cannot be edited."
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person.js:36
+#: setup/doctype/sales_person/sales_person.js:46
 msgid "This is a root sales person and cannot be edited."
 msgstr ""
 
@@ -72535,19 +73783,19 @@
 msgid "This is based on transactions against this Supplier. See timeline below for details"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.js:24
+#: stock/doctype/stock_settings/stock_settings.js:26
 msgid "This is considered dangerous from accounting point of view."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:525
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:529
 msgid "This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:822
+#: manufacturing/doctype/work_order/work_order.js:885
 msgid "This is enabled by default. If you want to plan materials for sub-assemblies of the Item you're manufacturing leave this enabled. If you plan and manufacture the sub-assemblies separately, you can disable this checkbox."
 msgstr ""
 
-#: stock/doctype/item/item.js:819
+#: stock/doctype/item/item.js:901
 msgid "This is for raw material Items that'll be used to create finished goods. If the Item is an additional service like 'washing' that'll be used in the BOM, keep this unchecked."
 msgstr ""
 
@@ -72555,7 +73803,7 @@
 msgid "This item filter has already been applied for the {0}"
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.js:371
+#: stock/doctype/delivery_note/delivery_note.js:419
 msgid "This option can be checked to edit the 'Posting Date' and 'Posting Time' fields."
 msgstr ""
 
@@ -72563,7 +73811,7 @@
 msgid "This schedule was created when Asset {0} was adjusted through Asset Value Adjustment {1}."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:516
+#: assets/doctype/asset_capitalization/asset_capitalization.py:522
 msgid "This schedule was created when Asset {0} was consumed through Asset Capitalization {1}."
 msgstr ""
 
@@ -72571,27 +73819,27 @@
 msgid "This schedule was created when Asset {0} was repaired through Asset Repair {1}."
 msgstr ""
 
-#: assets/doctype/asset_capitalization/asset_capitalization.py:674
+#: assets/doctype/asset_capitalization/asset_capitalization.py:680
 msgid "This schedule was created when Asset {0} was restored on Asset Capitalization {1}'s cancellation."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:496
+#: assets/doctype/asset/depreciation.py:494
 msgid "This schedule was created when Asset {0} was restored."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1325
+#: accounts/doctype/sales_invoice/sales_invoice.py:1336
 msgid "This schedule was created when Asset {0} was returned through Sales Invoice {1}."
 msgstr ""
 
-#: assets/doctype/asset/depreciation.py:454
+#: assets/doctype/asset/depreciation.py:452
 msgid "This schedule was created when Asset {0} was scrapped."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1336
+#: accounts/doctype/sales_invoice/sales_invoice.py:1347
 msgid "This schedule was created when Asset {0} was sold through Sales Invoice {1}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1117
+#: assets/doctype/asset/asset.py:1121
 msgid "This schedule was created when Asset {0} was updated after being split into new Asset {1}."
 msgstr ""
 
@@ -72607,7 +73855,7 @@
 msgid "This schedule was created when Asset {0}'s shifts were adjusted through Asset Shift Allocation {1}."
 msgstr ""
 
-#: assets/doctype/asset/asset.py:1180
+#: assets/doctype/asset/asset.py:1184
 msgid "This schedule was created when new Asset {0} was split from Asset {1}."
 msgstr ""
 
@@ -72618,10 +73866,15 @@
 msgid "This section allows the user to set the Body and Closing text of the Dunning Letter for the Dunning Type based on language, which can be used in Print."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.js:365
+#: stock/doctype/delivery_note/delivery_note.js:412
 msgid "This table is used to set details about the 'Item', 'Qty', 'Basic Rate', etc."
 msgstr ""
 
+#. Description of a DocType
+#: stock/doctype/stock_reconciliation/stock_reconciliation.json
+msgid "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses."
+msgstr ""
+
 #. Description of the 'Abbreviation' (Data) field in DocType 'Item Attribute
 #. Value'
 #: stock/doctype/item_attribute_value/item_attribute_value.json
@@ -72636,7 +73889,7 @@
 msgid "This will restrict user access to other employee records"
 msgstr ""
 
-#: controllers/selling_controller.py:686
+#: controllers/selling_controller.py:710
 msgid "This {} will be treated as material transfer."
 msgstr ""
 
@@ -72862,7 +74115,7 @@
 msgid "Time in mins."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:654
+#: manufacturing/doctype/job_card/job_card.py:661
 msgid "Time logs are required for {0} {1}"
 msgstr ""
 
@@ -72880,11 +74133,12 @@
 msgid "Timeline"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:31
 #: public/js/projects/timer.js:5
 msgid "Timer"
 msgstr ""
 
-#: public/js/projects/timer.js:142
+#: public/js/projects/timer.js:149
 msgid "Timer exceeded the given hours."
 msgstr ""
 
@@ -72926,11 +74180,11 @@
 msgid "Timesheet for tasks."
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:756
+#: accounts/doctype/sales_invoice/sales_invoice.py:773
 msgid "Timesheet {0} is already completed or cancelled"
 msgstr ""
 
-#: projects/doctype/timesheet/timesheet.py:520 templates/pages/projects.html:59
+#: projects/doctype/timesheet/timesheet.py:530 templates/pages/projects.html:59
 msgid "Timesheets"
 msgstr ""
 
@@ -73129,7 +74383,7 @@
 msgid "Title"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.js:967
+#: accounts/doctype/sales_invoice/sales_invoice.js:1043
 #: templates/pages/projects.html:68
 msgid "To"
 msgstr ""
@@ -73152,15 +74406,15 @@
 msgid "To"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:545
+#: selling/page/point_of_sale/pos_payment.js:587
 msgid "To Be Paid"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:36
-#: selling/doctype/sales_order/sales_order_list.js:39
-#: stock/doctype/delivery_note/delivery_note_list.js:12
-#: stock/doctype/purchase_receipt/purchase_receipt_list.js:12
+#: buying/doctype/purchase_order/purchase_order_list.js:37
+#: selling/doctype/sales_order/sales_order_list.js:50
+#: selling/doctype/sales_order/sales_order_list.js:52
+#: stock/doctype/delivery_note/delivery_note_list.js:22
+#: stock/doctype/purchase_receipt/purchase_receipt_list.js:21
 msgid "To Bill"
 msgstr ""
 
@@ -73201,13 +74455,13 @@
 msgid "To Currency"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:648
-#: accounts/doctype/payment_entry/payment_entry.js:652
+#: accounts/doctype/payment_entry/payment_entry.js:794
+#: accounts/doctype/payment_entry/payment_entry.js:798
 #: accounts/report/asset_depreciation_ledger/asset_depreciation_ledger.js:23
 #: accounts/report/asset_depreciations_and_balances/asset_depreciations_and_balances.js:23
 #: accounts/report/bank_clearance_summary/bank_clearance_summary.js:15
-#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:24
-#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:45
+#: accounts/report/customer_ledger_summary/customer_ledger_summary.js:23
+#: accounts/report/dimension_wise_accounts_balance_report/dimension_wise_accounts_balance_report.js:44
 #: accounts/report/financial_ratios/financial_ratios.js:48
 #: accounts/report/general_ledger/general_ledger.js:30
 #: accounts/report/general_ledger/general_ledger.py:66
@@ -73215,76 +74469,76 @@
 #: accounts/report/item_wise_purchase_register/item_wise_purchase_register.js:15
 #: 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:25
+#: accounts/report/pos_register/pos_register.js:24
 #: accounts/report/pos_register/pos_register.py:114
 #: 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
 #: accounts/report/sales_register/sales_register.js:15
-#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:24
-#: accounts/report/tax_withholding_details/tax_withholding_details.js:55
-#: accounts/report/tds_computation_summary/tds_computation_summary.js:55
+#: accounts/report/supplier_ledger_summary/supplier_ledger_summary.js:23
+#: accounts/report/tax_withholding_details/tax_withholding_details.js:54
+#: accounts/report/tds_computation_summary/tds_computation_summary.js:54
 #: accounts/report/trial_balance/trial_balance.js:43
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.js:43
-#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:22
-#: buying/report/procurement_tracker/procurement_tracker.js:34
-#: buying/report/purchase_analytics/purchase_analytics.js:43
-#: buying/report/purchase_order_analysis/purchase_order_analysis.js:26
-#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:26
-#: buying/report/subcontract_order_summary/subcontract_order_summary.js:23
-#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:30
-#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:30
+#: accounts/report/voucher_wise_balance/voucher_wise_balance.js:21
+#: buying/report/procurement_tracker/procurement_tracker.js:33
+#: buying/report/purchase_analytics/purchase_analytics.js:42
+#: buying/report/purchase_order_analysis/purchase_order_analysis.js:25
+#: buying/report/requested_items_to_order_and_receive/requested_items_to_order_and_receive.js:25
+#: buying/report/subcontract_order_summary/subcontract_order_summary.js:22
+#: buying/report/subcontracted_item_to_be_received/subcontracted_item_to_be_received.js:29
+#: buying/report/subcontracted_raw_materials_to_be_transferred/subcontracted_raw_materials_to_be_transferred.js:29
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:24
 #: crm/report/campaign_efficiency/campaign_efficiency.js:13
-#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:16
-#: crm/report/lead_conversion_time/lead_conversion_time.js:16
-#: crm/report/lead_details/lead_details.js:24
+#: crm/report/first_response_time_for_opportunity/first_response_time_for_opportunity.js:15
+#: crm/report/lead_conversion_time/lead_conversion_time.js:15
+#: crm/report/lead_details/lead_details.js:23
 #: crm/report/lead_owner_efficiency/lead_owner_efficiency.js:13
-#: crm/report/lost_opportunity/lost_opportunity.js:24
-#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:29
-#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:21
-#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:22
-#: manufacturing/report/downtime_analysis/downtime_analysis.js:15
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:24
-#: manufacturing/report/process_loss_report/process_loss_report.js:37
-#: manufacturing/report/production_analytics/production_analytics.js:24
-#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:15
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:24
+#: crm/report/lost_opportunity/lost_opportunity.js:23
+#: crm/report/opportunity_summary_by_sales_stage/opportunity_summary_by_sales_stage.js:27
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.js:20
+#: manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.js:23
+#: manufacturing/report/downtime_analysis/downtime_analysis.js:16
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:36
+#: manufacturing/report/production_analytics/production_analytics.js:23
+#: manufacturing/report/quality_inspection_summary/quality_inspection_summary.js:14
+#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:23
 #: projects/report/daily_timesheet_summary/daily_timesheet_summary.js:14
-#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:14
-#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:37
-#: public/js/stock_analytics.js:48
-#: regional/report/electronic_invoice_register/electronic_invoice_register.js:16
-#: regional/report/uae_vat_201/uae_vat_201.js:24
-#: regional/report/vat_audit_report/vat_audit_report.js:25
-#: selling/page/sales_funnel/sales_funnel.js:40
+#: projects/report/delayed_tasks_summary/delayed_tasks_summary.js:13
+#: projects/report/timesheet_billing_summary/timesheet_billing_summary.js:34
+#: public/js/stock_analytics.js:75
+#: regional/report/electronic_invoice_register/electronic_invoice_register.js:15
+#: regional/report/uae_vat_201/uae_vat_201.js:23
+#: regional/report/vat_audit_report/vat_audit_report.js:24
+#: selling/page/sales_funnel/sales_funnel.js:44
 #: selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.js:31
-#: selling/report/item_wise_sales_history/item_wise_sales_history.js:26
-#: selling/report/sales_analytics/sales_analytics.js:43
-#: selling/report/sales_order_analysis/sales_order_analysis.js:26
-#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:29
-#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:28
-#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:29
+#: selling/report/item_wise_sales_history/item_wise_sales_history.js:25
+#: selling/report/sales_analytics/sales_analytics.js:50
+#: selling/report/sales_order_analysis/sales_order_analysis.js:25
+#: selling/report/sales_partner_commission_summary/sales_partner_commission_summary.js:27
+#: selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.js:27
+#: selling/report/sales_person_commission_summary/sales_person_commission_summary.js:27
 #: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js:27
 #: stock/report/batch_item_expiry_status/batch_item_expiry_status.js:16
 #: stock/report/batch_wise_balance_history/batch_wise_balance_history.js:24
-#: stock/report/cogs_by_item_group/cogs_by_item_group.js:24
-#: stock/report/delayed_item_report/delayed_item_report.js:24
-#: stock/report/delayed_order_report/delayed_order_report.js:24
-#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:28
+#: stock/report/cogs_by_item_group/cogs_by_item_group.js:22
+#: stock/report/delayed_item_report/delayed_item_report.js:23
+#: stock/report/delayed_order_report/delayed_order_report.js:23
+#: stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.js:27
 #: stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.js:14
-#: stock/report/reserved_stock/reserved_stock.js:26
+#: stock/report/reserved_stock/reserved_stock.js:23
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:22
-#: stock/report/stock_analytics/stock_analytics.js:70
+#: stock/report/stock_analytics/stock_analytics.js:69
 #: stock/report/stock_balance/stock_balance.js:24
 #: stock/report/stock_ledger/stock_ledger.js:23
 #: stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.js:22
-#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:17
-#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:16
-#: support/report/issue_analytics/issue_analytics.js:32
-#: support/report/issue_summary/issue_summary.js:32
-#: support/report/support_hour_distribution/support_hour_distribution.js:15
-#: utilities/report/youtube_interactions/youtube_interactions.js:15
+#: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:16
+#: support/report/first_response_time_for_issues/first_response_time_for_issues.js:15
+#: support/report/issue_analytics/issue_analytics.js:31
+#: support/report/issue_summary/issue_summary.js:31
+#: support/report/support_hour_distribution/support_hour_distribution.js:14
+#: utilities/report/youtube_interactions/youtube_interactions.js:14
 msgid "To Date"
 msgstr ""
 
@@ -73390,7 +74644,7 @@
 msgid "To Date"
 msgstr ""
 
-#: controllers/accounts_controller.py:380
+#: controllers/accounts_controller.py:424
 #: setup/doctype/holiday_list/holiday_list.py:115
 msgid "To Date cannot be before From Date"
 msgstr ""
@@ -73419,8 +74673,8 @@
 msgid "To Datetime"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order_list.js:22
-#: selling/doctype/sales_order/sales_order_list.js:30
+#: selling/doctype/sales_order/sales_order_list.js:32
+#: selling/doctype/sales_order/sales_order_list.js:42
 msgid "To Deliver"
 msgstr ""
 
@@ -73437,7 +74691,7 @@
 msgid "To Deliver"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order_list.js:26
+#: selling/doctype/sales_order/sales_order_list.js:36
 msgid "To Deliver and Bill"
 msgstr ""
 
@@ -73466,7 +74720,7 @@
 msgid "To Doctype"
 msgstr ""
 
-#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:85
+#: selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.js:83
 msgid "To Due Date"
 msgstr ""
 
@@ -73476,7 +74730,7 @@
 msgid "To Employee"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:53
+#: accounts/report/budget_variance_report/budget_variance_report.js:51
 msgid "To Fiscal Year"
 msgstr ""
 
@@ -73516,8 +74770,8 @@
 msgid "To Package No."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order_list.js:12
-#: selling/doctype/sales_order/sales_order_list.js:14
+#: buying/doctype/purchase_order/purchase_order_list.js:21
+#: selling/doctype/sales_order/sales_order_list.js:25
 msgid "To Pay"
 msgstr ""
 
@@ -73539,8 +74793,8 @@
 msgid "To Payment Date"
 msgstr ""
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:44
-#: manufacturing/report/work_order_summary/work_order_summary.js:30
+#: manufacturing/report/job_card_summary/job_card_summary.js:43
+#: manufacturing/report/work_order_summary/work_order_summary.js:29
 msgid "To Posting Date"
 msgstr ""
 
@@ -73556,7 +74810,7 @@
 msgid "To Range"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order_list.js:18
+#: buying/doctype/purchase_order/purchase_order_list.js:30
 msgid "To Receive"
 msgstr ""
 
@@ -73566,7 +74820,7 @@
 msgid "To Receive"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order_list.js:15
+#: buying/doctype/purchase_order/purchase_order_list.js:25
 msgid "To Receive and Bill"
 msgstr ""
 
@@ -73602,6 +74856,7 @@
 
 #: manufacturing/report/downtime_analysis/downtime_analysis.py:92
 #: manufacturing/report/job_card_summary/job_card_summary.py:180
+#: templates/pages/timelog_info.html:34
 msgid "To Time"
 msgstr ""
 
@@ -73683,7 +74938,8 @@
 msgid "To Value"
 msgstr ""
 
-#: stock/doctype/batch/batch.js:83
+#: manufacturing/doctype/plant_floor/plant_floor.js:196
+#: stock/doctype/batch/batch.js:93
 msgid "To Warehouse"
 msgstr ""
 
@@ -73693,11 +74949,11 @@
 msgid "To Warehouse (Optional)"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:735
+#: manufacturing/doctype/bom/bom.js:768
 msgid "To add Operations tick the 'With Operations' checkbox."
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:550
+#: manufacturing/doctype/production_plan/production_plan.js:598
 msgid "To add subcontracted Item's raw materials if include exploded items is disabled."
 msgstr ""
 
@@ -73722,11 +74978,11 @@
 msgid "To be Delivered to Customer"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:521
+#: accounts/doctype/sales_invoice/sales_invoice.py:534
 msgid "To cancel a {} you need to cancel the POS Closing Entry {}."
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:99
+#: accounts/doctype/payment_request/payment_request.py:100
 msgid "To create a Payment Request reference document is required"
 msgstr ""
 
@@ -73738,12 +74994,12 @@
 msgid "To enable Capital Work in Progress Accounting,"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:545
+#: manufacturing/doctype/production_plan/production_plan.js:591
 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:1625
-#: controllers/accounts_controller.py:2559
+#: accounts/doctype/payment_entry/payment_entry.py:1644
+#: controllers/accounts_controller.py:2644
 msgid "To include tax in row {0} in Item rate, taxes in rows {1} must also be included"
 msgstr ""
 
@@ -73751,7 +75007,7 @@
 msgid "To merge, following properties must be same for both items"
 msgstr ""
 
-#: accounts/doctype/account/account.py:498
+#: accounts/doctype/account/account.py:517
 msgid "To overrule this, enable '{0}' in company {1}"
 msgstr ""
 
@@ -73759,11 +75015,11 @@
 msgid "To still proceed with editing this Attribute Value, enable {0} in Item Variant Settings."
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:578
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:582
 msgid "To submit the invoice without purchase order please set {0} as {1} in {2}"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.py:598
+#: accounts/doctype/purchase_invoice/purchase_invoice.py:602
 msgid "To submit the invoice without purchase receipt please set {0} as {1} in {2}"
 msgstr ""
 
@@ -73773,12 +75029,12 @@
 msgstr ""
 
 #: accounts/report/financial_statements.py:576
-#: accounts/report/general_ledger/general_ledger.py:273
+#: accounts/report/general_ledger/general_ledger.py:286
 #: accounts/report/trial_balance/trial_balance.py:278
 msgid "To use a different finance book, please uncheck 'Include Default FB Entries'"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:174
+#: selling/page/point_of_sale/pos_controller.js:192
 msgid "Toggle Recent Orders"
 msgstr ""
 
@@ -73788,16 +75044,20 @@
 msgid "Token Endpoint"
 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:485
-#: buying/doctype/purchase_order/purchase_order.js:541
-#: buying/doctype/request_for_quotation/request_for_quotation.js:57
-#: buying/doctype/request_for_quotation/request_for_quotation.js:143
-#: buying/doctype/request_for_quotation/request_for_quotation.js:381
-#: buying/doctype/request_for_quotation/request_for_quotation.js:387
-#: buying/doctype/supplier_quotation/supplier_quotation.js:55
-#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:116
+#: buying/doctype/purchase_order/purchase_order.js:560
+#: buying/doctype/purchase_order/purchase_order.js:636
+#: 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
+#: buying/doctype/request_for_quotation/request_for_quotation.js:420
+#: buying/doctype/supplier_quotation/supplier_quotation.js:58
+#: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.js:121
 #: manufacturing/workspace/manufacturing/manufacturing.json
 #: stock/workspace/stock/stock.json
 msgid "Tools"
@@ -73812,10 +75072,13 @@
 #: 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/general_ledger/general_ledger.py:56
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:636
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:642
 #: accounts/report/profitability_analysis/profitability_analysis.py:93
 #: accounts/report/profitability_analysis/profitability_analysis.py:98
 #: accounts/report/trial_balance/trial_balance.py:344
@@ -74011,6 +75274,11 @@
 msgid "Total Achieved"
 msgstr ""
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Active Items"
+msgstr ""
+
 #: accounts/report/budget_variance_report/budget_variance_report.py:125
 msgid "Total Actual"
 msgstr ""
@@ -74069,7 +75337,7 @@
 msgid "Total Allocations"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:235
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:233
 #: 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
@@ -74113,7 +75381,7 @@
 msgid "Total Amount in Words"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:181
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:209
 msgid "Total Applicable Charges in Purchase Receipt Items table must be same as Total Taxes and Charges"
 msgstr ""
 
@@ -74229,7 +75497,7 @@
 msgid "Total Commission"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:667
+#: manufacturing/doctype/job_card/job_card.py:674
 #: manufacturing/report/job_card_summary/job_card_summary.py:174
 msgid "Total Completed Qty"
 msgstr ""
@@ -74246,11 +75514,11 @@
 msgid "Total Consumed Material Cost (via Stock Entry)"
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person.js:12
+#: setup/doctype/sales_person/sales_person.js:17
 msgid "Total Contribution Amount Against Invoices: {0}"
 msgstr ""
 
-#: setup/doctype/sales_person/sales_person.js:9
+#: setup/doctype/sales_person/sales_person.js:10
 msgid "Total Contribution Amount Against Orders: {0}"
 msgstr ""
 
@@ -74296,7 +75564,7 @@
 msgid "Total Credit"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:225
+#: accounts/doctype/journal_entry/journal_entry.py:241
 msgid "Total Credit/ Debit Amount should be same as linked Journal Entry"
 msgstr ""
 
@@ -74306,7 +75574,7 @@
 msgid "Total Debit"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:802
+#: accounts/doctype/journal_entry/journal_entry.py:829
 msgid "Total Debit must be equal to Total Credit. The difference is {0}"
 msgstr ""
 
@@ -74376,6 +75644,16 @@
 msgid "Total Income This Year"
 msgstr ""
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Incoming Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
@@ -74389,6 +75667,7 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:196
+#: accounts/report/accounts_receivable/accounts_receivable.html:160
 msgid "Total Invoiced Amount"
 msgstr ""
 
@@ -74396,6 +75675,10 @@
 msgid "Total Issues"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:92
+msgid "Total Items"
+msgstr ""
+
 #: accounts/report/balance_sheet/balance_sheet.py:208
 msgid "Total Liability"
 msgstr ""
@@ -74504,7 +75787,7 @@
 msgid "Total Order Value"
 msgstr ""
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:629
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:635
 msgid "Total Other Charges"
 msgstr ""
 
@@ -74512,13 +75795,25 @@
 msgid "Total Outgoing"
 msgstr ""
 
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Bills"
+msgstr ""
+
+#. Label of a number card in the Accounting Workspace
+#: accounts/workspace/accounting/accounting.json
+msgid "Total Outgoing Payment"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry'
 #: stock/doctype/stock_entry/stock_entry.json
 msgctxt "Stock Entry"
 msgid "Total Outgoing Value (Consumption)"
 msgstr ""
 
+#: accounts/doctype/opening_invoice_creation_tool/opening_invoice_creation_tool_dashboard.html:9
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:97
+#: accounts/report/accounts_receivable/accounts_receivable.html:79
 msgid "Total Outstanding"
 msgstr ""
 
@@ -74529,18 +75824,20 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:205
+#: accounts/report/accounts_receivable/accounts_receivable.html:163
 msgid "Total Outstanding Amount"
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:197
+#: accounts/report/accounts_receivable/accounts_receivable.html:161
 msgid "Total Paid Amount"
 msgstr ""
 
-#: controllers/accounts_controller.py:2266
+#: controllers/accounts_controller.py:2358
 msgid "Total Payment Amount in Payment Schedule must be equal to Grand / Rounded Total"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:112
+#: accounts/doctype/payment_request/payment_request.py:115
 msgid "Total Payment Request amount cannot be greater than {0} amount"
 msgstr ""
 
@@ -74572,7 +75869,7 @@
 msgid "Total Purchase Cost (via Purchase Invoice)"
 msgstr ""
 
-#: projects/doctype/project/project.js:107
+#: projects/doctype/project/project.js:131
 msgid "Total Purchase Cost has been updated"
 msgstr ""
 
@@ -74588,6 +75885,8 @@
 msgstr ""
 
 #: accounts/doctype/pos_closing_entry/closing_voucher_details.html:23
+#: selling/page/point_of_sale/pos_item_cart.js:520
+#: selling/page/point_of_sale/pos_item_cart.js:524
 msgid "Total Quantity"
 msgstr ""
 
@@ -74698,6 +75997,11 @@
 msgid "Total Stock Summary"
 msgstr ""
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Stock Value"
+msgstr ""
+
 #. Label of a Float field in DocType 'Purchase Order Item Supplied'
 #: buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
 msgctxt "Purchase Order Item Supplied"
@@ -74720,7 +76024,7 @@
 msgid "Total Tasks"
 msgstr ""
 
-#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:622
+#: accounts/report/item_wise_sales_register/item_wise_sales_register.py:628
 #: accounts/report/purchase_register/purchase_register.py:263
 msgid "Total Tax"
 msgstr ""
@@ -74861,7 +76165,7 @@
 msgid "Total Time in Mins"
 msgstr ""
 
-#: public/js/utils.js:105
+#: public/js/utils.js:129
 msgid "Total Unpaid: {0}"
 msgstr ""
 
@@ -74892,6 +76196,11 @@
 msgid "Total Views"
 msgstr ""
 
+#. Label of a number card in the Stock Workspace
+#: stock/workspace/stock/stock.json
+msgid "Total Warehouses"
+msgstr ""
+
 #. Label of a Float field in DocType 'Delivery Note Item'
 #: stock/doctype/delivery_note_item/delivery_note_item.json
 msgctxt "Delivery Note Item"
@@ -74952,20 +76261,34 @@
 msgid "Total Working Hours"
 msgstr ""
 
-#: controllers/accounts_controller.py:1838
+#. Label of a Float field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Total Working Hours"
+msgstr ""
+
+#: controllers/accounts_controller.py:1930
 msgid "Total advance ({0}) against Order {1} cannot be greater than the Grand Total ({2})"
 msgstr ""
 
-#: controllers/selling_controller.py:186
+#: controllers/selling_controller.py:187
 msgid "Total allocated percentage for sales team should be 100"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation.py:229
+msgid "Total completed quantity: {0}"
+msgstr ""
+
 #: selling/doctype/customer/customer.py:157
 msgid "Total contribution percentage should be equal to 100"
 msgstr ""
 
+#: projects/doctype/project/project_dashboard.html:2
+msgid "Total hours: {0}"
+msgstr ""
+
 #: accounts/doctype/pos_invoice/pos_invoice.py:444
-#: accounts/doctype/sales_invoice/sales_invoice.py:505
+#: accounts/doctype/sales_invoice/sales_invoice.py:518
 msgid "Total payments amount can't be greater than {}"
 msgstr ""
 
@@ -74980,7 +76303,7 @@
 msgid "Total {0} ({1})"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:162
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:190
 msgid "Total {0} for all items is zero, may be you should change 'Distribute Charges Based On'"
 msgstr ""
 
@@ -74993,6 +76316,7 @@
 msgstr ""
 
 #: accounts/report/trial_balance_for_party/trial_balance_for_party.py:88
+#: selling/page/point_of_sale/pos_past_order_summary.js:18
 msgid "Totals"
 msgstr ""
 
@@ -75077,6 +76401,11 @@
 msgid "Track Service Level Agreement"
 msgstr ""
 
+#. Description of a DocType
+#: accounts/doctype/cost_center/cost_center.json
+msgid "Track separate Income and Expense for product verticals or divisions."
+msgstr ""
+
 #. Label of a Select field in DocType 'Shipment'
 #: stock/doctype/shipment/shipment.json
 msgctxt "Shipment"
@@ -75095,7 +76424,7 @@
 msgid "Tracking URL"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: manufacturing/doctype/workstation/workstation_dashboard.py:10
 msgid "Transaction"
 msgstr ""
@@ -75137,7 +76466,7 @@
 msgstr ""
 
 #: selling/report/item_wise_sales_history/item_wise_sales_history.py:66
-#: selling/report/territory_wise_sales/territory_wise_sales.js:11
+#: selling/report/territory_wise_sales/territory_wise_sales.js:9
 msgid "Transaction Date"
 msgstr ""
 
@@ -75177,12 +76506,21 @@
 msgid "Transaction Date"
 msgstr ""
 
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:490
+msgid "Transaction Deletion Document: {0} is running for this Company. {1}"
+msgstr ""
+
 #. Name of a DocType
 #: setup/doctype/transaction_deletion_record/transaction_deletion_record.json
 msgid "Transaction Deletion Record"
 msgstr ""
 
 #. Name of a DocType
+#: accounts/doctype/transaction_deletion_record_details/transaction_deletion_record_details.json
+msgid "Transaction Deletion Record Details"
+msgstr ""
+
+#. Name of a DocType
 #: setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
 msgid "Transaction Deletion Record Item"
 msgstr ""
@@ -75223,7 +76561,7 @@
 msgid "Transaction Settings"
 msgstr ""
 
-#: accounts/report/tax_withholding_details/tax_withholding_details.py:258
+#: accounts/report/tax_withholding_details/tax_withholding_details.py:256
 msgid "Transaction Type"
 msgstr ""
 
@@ -75233,7 +76571,7 @@
 msgid "Transaction Type"
 msgstr ""
 
-#: accounts/doctype/payment_request/payment_request.py:122
+#: accounts/doctype/payment_request/payment_request.py:125
 msgid "Transaction currency must be same as Payment Gateway currency"
 msgstr ""
 
@@ -75241,15 +76579,15 @@
 msgid "Transaction currency: {0} cannot be different from Bank Account({1}) currency: {2}"
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:647
+#: manufacturing/doctype/job_card/job_card.py:654
 msgid "Transaction not allowed against stopped Work Order {0}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1112
+#: accounts/doctype/payment_entry/payment_entry.py:1121
 msgid "Transaction reference no {0} dated {1}"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:435
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:434
 #: 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
@@ -75264,12 +76602,12 @@
 msgid "Transactions Annual History"
 msgstr ""
 
-#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:107
+#: accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js:117
 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:314
-#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:190
+#: buying/doctype/purchase_order/purchase_order.js:364
+#: subcontracting/doctype/subcontracting_order/subcontracting_order.js:208
 msgid "Transfer"
 msgstr ""
 
@@ -75298,11 +76636,11 @@
 msgid "Transfer"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:83
+#: assets/doctype/asset/asset.js:84
 msgid "Transfer Asset"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:318
+#: manufacturing/doctype/production_plan/production_plan.js:345
 msgid "Transfer From Warehouses"
 msgstr ""
 
@@ -75318,7 +76656,7 @@
 msgid "Transfer Material Against"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:313
+#: manufacturing/doctype/production_plan/production_plan.js:340
 msgid "Transfer Materials For Warehouse {0}"
 msgstr ""
 
@@ -75338,7 +76676,7 @@
 msgid "Transfer Type"
 msgstr ""
 
-#: stock/doctype/material_request/material_request_list.js:27
+#: stock/doctype/material_request/material_request_list.js:31
 msgid "Transferred"
 msgstr ""
 
@@ -75348,6 +76686,7 @@
 msgid "Transferred"
 msgstr ""
 
+#: manufacturing/doctype/workstation/workstation_job_card.html:96
 #: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py:131
 msgid "Transferred Qty"
 msgstr ""
@@ -75384,7 +76723,7 @@
 msgid "Transit"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.js:371
+#: stock/doctype/stock_entry/stock_entry.js:425
 msgid "Transit Entry"
 msgstr ""
 
@@ -75465,8 +76804,8 @@
 msgid "Tree Details"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:9
-#: selling/report/sales_analytics/sales_analytics.js:9
+#: buying/report/purchase_analytics/purchase_analytics.js:8
+#: selling/report/sales_analytics/sales_analytics.js:8
 msgid "Tree Type"
 msgstr ""
 
@@ -75746,10 +77085,11 @@
 #: 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
+#: 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:63 public/js/utils.js:632
-#: selling/doctype/sales_order/sales_order.js:999
+#: public/js/stock_analytics.js:94 public/js/utils.js:693
+#: 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
 #: setup/doctype/uom/uom.json
@@ -76080,7 +77420,7 @@
 msgid "UOM Conversion Factor"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.py:1248
+#: manufacturing/doctype/production_plan/production_plan.py:1270
 msgid "UOM Conversion factor ({0} -> {1}) not found for item: {2}"
 msgstr ""
 
@@ -76094,7 +77434,7 @@
 msgid "UOM Name"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:2773
+#: stock/doctype/stock_entry/stock_entry.py:2809
 msgid "UOM conversion factor required for UOM: {0} in Item: {1}"
 msgstr ""
 
@@ -76138,7 +77478,7 @@
 msgid "URL can only be a string"
 msgstr ""
 
-#: public/js/utils/unreconcile.js:20
+#: public/js/utils/unreconcile.js:24
 msgid "UnReconcile"
 msgstr ""
 
@@ -76150,15 +77490,15 @@
 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:603
-msgid "Unable to find the time slot in the next {0} days for the operation {1}."
+#: manufacturing/doctype/work_order/work_order.py:613
+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
 msgid "Unable to find variable:"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:79
+#: public/js/bank_reconciliation_tool/data_table_manager.js:74
 msgid "Unallocated Amount"
 msgstr ""
 
@@ -76178,7 +77518,7 @@
 msgid "Unassigned Qty"
 msgstr ""
 
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:95
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:115
 msgid "Unblock Invoice"
 msgstr ""
 
@@ -76227,7 +77567,7 @@
 msgid "Under Warranty"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.js:52
+#: manufacturing/doctype/workstation/workstation.js:78
 msgid "Under Working Hours table, you can add start and end times for a Workstation. For example, a Workstation may be active from 9 am to 1 pm, then 2 pm to 5 pm. You can also specify the working hours based on shifts. While scheduling a Work Order, the system will check for the availability of the Workstation based on the working hours specified."
 msgstr ""
 
@@ -76258,11 +77598,12 @@
 msgid "Units of Measure"
 msgstr ""
 
-#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:12
+#: buying/doctype/supplier_scorecard/supplier_scorecard_list.js:10
+#: projects/doctype/project/project_dashboard.html:7
 msgid "Unknown"
 msgstr ""
 
-#: public/js/call_popup/call_popup.js:109
+#: public/js/call_popup/call_popup.js:110
 msgid "Unknown Caller"
 msgstr ""
 
@@ -76278,7 +77619,7 @@
 msgid "Unlink Payment on Cancellation of Invoice"
 msgstr ""
 
-#: accounts/doctype/bank_account/bank_account.js:34
+#: accounts/doctype/bank_account/bank_account.js:33
 msgid "Unlink external integrations"
 msgstr ""
 
@@ -76288,7 +77629,7 @@
 msgid "Unlinked"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:258
+#: accounts/doctype/sales_invoice/sales_invoice.py:263
 #: accounts/doctype/subscription/subscription_list.js:12
 msgid "Unpaid"
 msgstr ""
@@ -76422,20 +77763,24 @@
 msgid "Unreconciled Entries"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:74
-#: stock/doctype/pick_list/pick_list.js:114
+#: selling/doctype/sales_order/sales_order.js:90
+#: stock/doctype/pick_list/pick_list.js:134
 msgid "Unreserve"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:418
+#: selling/doctype/sales_order/sales_order.js:448
 msgid "Unreserve Stock"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:430
-#: stock/doctype/pick_list/pick_list.js:252
+#: selling/doctype/sales_order/sales_order.js:460
+#: stock/doctype/pick_list/pick_list.js:286
 msgid "Unreserving Stock..."
 msgstr ""
 
+#: erpnext_integrations/doctype/tally_migration/tally_migration.js:123
+msgid "Unresolve"
+msgstr ""
+
 #: accounts/doctype/dunning/dunning_list.js:6
 msgid "Unresolved"
 msgstr ""
@@ -76487,6 +77832,7 @@
 msgstr ""
 
 #: accounts/doctype/process_statement_of_accounts/process_statement_of_accounts_accounts_receivable.html:37
+#: accounts/report/accounts_receivable/accounts_receivable.html:24
 msgid "Until"
 msgstr ""
 
@@ -76514,22 +77860,23 @@
 msgid "Upcoming Calendar Events "
 msgstr ""
 
-#: accounts/doctype/account/account.js:210
-#: accounts/doctype/cost_center/cost_center.js:102
-#: public/js/bom_configurator/bom_configurator.bundle.js:367
-#: public/js/utils.js:551 public/js/utils.js:767
-#: public/js/utils/barcode_scanner.js:176
+#: 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/barcode_scanner.js:183
 #: public/js/utils/serial_no_batch_selector.js:17
-#: public/js/utils/serial_no_batch_selector.js:180
-#: stock/doctype/stock_reconciliation/stock_reconciliation.js:160
+#: public/js/utils/serial_no_batch_selector.js:182
+#: stock/doctype/stock_reconciliation/stock_reconciliation.js:164
+#: templates/pages/task_info.html:22
 msgid "Update"
 msgstr ""
 
-#: accounts/doctype/account/account.js:58
+#: accounts/doctype/account/account.js:53
 msgid "Update Account Name / Number"
 msgstr ""
 
-#: accounts/doctype/account/account.js:158
+#: accounts/doctype/account/account.js:159
 msgid "Update Account Number / Name"
 msgstr ""
 
@@ -76575,7 +77922,7 @@
 msgid "Update Auto Repeat Reference"
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:30
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:35
 msgid "Update BOM Cost Automatically"
 msgstr ""
 
@@ -76604,6 +77951,18 @@
 msgid "Update Billed Amount in Delivery Note"
 msgstr ""
 
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Order"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Billed Amount in Purchase Receipt"
+msgstr ""
+
 #. Label of a Check field in DocType 'POS Invoice'
 #: accounts/doctype/pos_invoice/pos_invoice.json
 msgctxt "POS Invoice"
@@ -76616,9 +77975,9 @@
 msgid "Update Billed Amount in Sales Order"
 msgstr ""
 
-#: accounts/doctype/bank_clearance/bank_clearance.js:57
-#: accounts/doctype/bank_clearance/bank_clearance.js:71
-#: accounts/doctype/bank_clearance/bank_clearance.js:76
+#: accounts/doctype/bank_clearance/bank_clearance.js:53
+#: accounts/doctype/bank_clearance/bank_clearance.js:67
+#: accounts/doctype/bank_clearance/bank_clearance.js:72
 msgid "Update Clearance Date"
 msgstr ""
 
@@ -76628,7 +77987,7 @@
 msgid "Update Consumed Material Cost In Project"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:100
+#: manufacturing/doctype/bom/bom.js:99
 msgid "Update Cost"
 msgstr ""
 
@@ -76644,12 +78003,12 @@
 msgid "Update Cost"
 msgstr ""
 
-#: accounts/doctype/cost_center/cost_center.js:21
-#: accounts/doctype/cost_center/cost_center.js:50
+#: accounts/doctype/cost_center/cost_center.js:19
+#: accounts/doctype/cost_center/cost_center.js:52
 msgid "Update Cost Center Name / Number"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.js:99
+#: stock/doctype/pick_list/pick_list.js:104
 msgid "Update Current Stock"
 msgstr ""
 
@@ -76666,12 +78025,24 @@
 msgid "Update Existing Records"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:275 public/js/utils.js:721
-#: selling/doctype/sales_order/sales_order.js:56
+#: buying/doctype/purchase_order/purchase_order.js:301 public/js/utils.js:793
+#: selling/doctype/sales_order/sales_order.js:63
 msgid "Update Items"
 msgstr ""
 
-#: accounts/doctype/cheque_print_template/cheque_print_template.js:9
+#. Label of a Check field in DocType 'Purchase Invoice'
+#: accounts/doctype/purchase_invoice/purchase_invoice.json
+msgctxt "Purchase Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice'
+#: accounts/doctype/sales_invoice/sales_invoice.json
+msgctxt "Sales Invoice"
+msgid "Update Outstanding for Self"
+msgstr ""
+
+#: accounts/doctype/cheque_print_template/cheque_print_template.js:10
 msgid "Update Print Format"
 msgstr ""
 
@@ -76681,7 +78052,7 @@
 msgid "Update Rate and Availability"
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.js:475
+#: buying/doctype/purchase_order/purchase_order.js:549
 msgid "Update Rate as per Last Purchase"
 msgstr ""
 
@@ -76714,7 +78085,7 @@
 msgid "Update Stock Opening Balance"
 msgstr ""
 
-#: projects/doctype/project/project.js:71
+#: projects/doctype/project/project.js:82
 msgid "Update Total Purchase Cost"
 msgstr ""
 
@@ -76736,7 +78107,7 @@
 msgid "Update latest price in all BOMs"
 msgstr ""
 
-#: assets/doctype/asset/asset.py:338
+#: assets/doctype/asset/asset.py:340
 msgid "Update stock must be enabled for the purchase invoice {0}"
 msgstr ""
 
@@ -76756,19 +78127,19 @@
 msgid "Updating Opening Balances"
 msgstr ""
 
-#: stock/doctype/item/item.py:1348
+#: stock/doctype/item/item.py:1349
 msgid "Updating Variants..."
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:788
+#: manufacturing/doctype/work_order/work_order.js:847
 msgid "Updating Work Order status"
 msgstr ""
 
-#: accounts/doctype/bank_statement_import/bank_statement_import.js:48
+#: accounts/doctype/bank_statement_import/bank_statement_import.js:46
 msgid "Updating {0} of {1}, {2}"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:44
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.js:43
 msgid "Upload Bank Statement"
 msgstr ""
 
@@ -76789,7 +78160,7 @@
 msgid "Urgent"
 msgstr ""
 
-#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:37
+#: accounts/doctype/repost_payment_ledger/repost_payment_ledger.js:36
 msgid "Use 'Repost in background' button to trigger background job. Job can only be triggered when document is in Queued or Failed status."
 msgstr ""
 
@@ -76825,6 +78196,12 @@
 msgid "Use Google Maps Direction API to optimize route"
 msgstr ""
 
+#. Label of a Check field in DocType 'Currency Exchange Settings'
+#: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
+msgctxt "Currency Exchange Settings"
+msgid "Use HTTP Protocol"
+msgstr ""
+
 #. Label of a Check field in DocType 'Stock Reposting Settings'
 #: stock/doctype/stock_reposting_settings/stock_reposting_settings.json
 msgctxt "Stock Reposting Settings"
@@ -76843,6 +78220,84 @@
 msgid "Use Multi-Level BOM"
 msgstr ""
 
+#. Label of a Check field in DocType 'Stock Settings'
+#: stock/doctype/stock_settings/stock_settings.json
+msgctxt "Stock Settings"
+msgid "Use Serial / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Asset Capitalization Stock Item'
+#: assets/doctype/asset_capitalization_stock_item/asset_capitalization_stock_item.json
+msgctxt "Asset Capitalization Stock Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Delivery Note Item'
+#: stock/doctype/delivery_note_item/delivery_note_item.json
+msgctxt "Delivery Note Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'POS Invoice Item'
+#: accounts/doctype/pos_invoice_item/pos_invoice_item.json
+msgctxt "POS Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Packed Item'
+#: stock/doctype/packed_item/packed_item.json
+msgctxt "Packed Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Pick List Item'
+#: stock/doctype/pick_list_item/pick_list_item.json
+msgctxt "Pick List Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Invoice Item'
+#: accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+msgctxt "Purchase Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Purchase Receipt Item'
+#: stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+msgctxt "Purchase Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Sales Invoice Item'
+#: accounts/doctype/sales_invoice_item/sales_invoice_item.json
+msgctxt "Sales Invoice Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Entry Detail'
+#: stock/doctype/stock_entry_detail/stock_entry_detail.json
+msgctxt "Stock Entry Detail"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Stock Reconciliation Item'
+#: stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+msgctxt "Stock Reconciliation Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Item'
+#: subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+msgctxt "Subcontracting Receipt Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
+#. Label of a Check field in DocType 'Subcontracting Receipt Supplied Item'
+#: subcontracting/doctype/subcontracting_receipt_supplied_item/subcontracting_receipt_supplied_item.json
+msgctxt "Subcontracting Receipt Supplied Item"
+msgid "Use Serial No / Batch Fields"
+msgstr ""
+
 #. Label of a Check field in DocType 'Buying Settings'
 #: buying/doctype/buying_settings/buying_settings.json
 msgctxt "Buying Settings"
@@ -76955,7 +78410,7 @@
 msgid "User ID not set for Employee {0}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.js:544
+#: accounts/doctype/journal_entry/journal_entry.js:607
 msgid "User Remark"
 msgstr ""
 
@@ -77074,10 +78529,12 @@
 msgid "VAT Audit Report"
 msgstr ""
 
+#: regional/report/uae_vat_201/uae_vat_201.html:47
 #: regional/report/uae_vat_201/uae_vat_201.py:115
 msgid "VAT on Expenses and All Other Inputs"
 msgstr ""
 
+#: regional/report/uae_vat_201/uae_vat_201.html:15
 #: regional/report/uae_vat_201/uae_vat_201.py:45
 msgid "VAT on Sales and All Other Outputs"
 msgstr ""
@@ -77130,10 +78587,6 @@
 msgid "Valid From"
 msgstr ""
 
-#: stock/doctype/item_price/item_price.py:62
-msgid "Valid From Date must be lesser than Valid Up To Date."
-msgstr ""
-
 #: regional/doctype/lower_deduction_certificate/lower_deduction_certificate.py:45
 msgid "Valid From date not in Fiscal Year {0}"
 msgstr ""
@@ -77143,7 +78596,7 @@
 msgstr ""
 
 #: buying/report/supplier_quotation_comparison/supplier_quotation_comparison.py:265
-#: templates/pages/order.html:47
+#: templates/pages/order.html:59
 msgid "Valid Till"
 msgstr ""
 
@@ -77287,7 +78740,7 @@
 msgstr ""
 
 #: stock/report/stock_balance/stock_balance.js:76
-#: stock/report/stock_ledger/stock_ledger.js:88
+#: stock/report/stock_ledger/stock_ledger.js:96
 msgid "Valuation Field Type"
 msgstr ""
 
@@ -77304,8 +78757,8 @@
 #: accounts/report/gross_profit/gross_profit.py:266
 #: 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:449
-#: stock/report/stock_ledger/stock_ledger.py:207
+#: stock/report/stock_balance/stock_balance.py:457
+#: stock/report/stock_ledger/stock_ledger.py:280
 msgid "Valuation Rate"
 msgstr ""
 
@@ -77370,6 +78823,12 @@
 msgid "Valuation Rate"
 msgstr ""
 
+#. Label of a Float field in DocType 'Serial and Batch Entry'
+#: stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
+msgctxt "Serial and Batch Entry"
+msgid "Valuation Rate"
+msgstr ""
+
 #. Label of a Currency field in DocType 'Stock Entry Detail'
 #: stock/doctype/stock_entry_detail/stock_entry_detail.json
 msgctxt "Stock Entry Detail"
@@ -77392,11 +78851,11 @@
 msgid "Valuation Rate (In / Out)"
 msgstr ""
 
-#: stock/stock_ledger.py:1688
+#: stock/stock_ledger.py:1708
 msgid "Valuation Rate Missing"
 msgstr ""
 
-#: stock/stock_ledger.py:1666
+#: stock/stock_ledger.py:1686
 msgid "Valuation Rate for the Item {0}, is required to do accounting entries for {1} {2}."
 msgstr ""
 
@@ -77404,7 +78863,7 @@
 msgid "Valuation Rate is mandatory if Opening Stock entered"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:514
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:568
 msgid "Valuation Rate required for Item {0} at row {1}"
 msgstr ""
 
@@ -77415,12 +78874,12 @@
 msgid "Valuation and Total"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:731
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:785
 msgid "Valuation rate for customer provided items has been set to zero."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1649
-#: controllers/accounts_controller.py:2583
+#: accounts/doctype/payment_entry/payment_entry.py:1668
+#: controllers/accounts_controller.py:2668
 msgid "Valuation type charges can not be marked as Inclusive"
 msgstr ""
 
@@ -77428,10 +78887,10 @@
 msgid "Valuation type charges can not marked as Inclusive"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:28
-#: public/js/stock_analytics.js:37
-#: selling/report/sales_analytics/sales_analytics.js:28
-#: stock/report/stock_analytics/stock_analytics.js:27
+#: buying/report/purchase_analytics/purchase_analytics.js:27
+#: public/js/stock_analytics.js:49
+#: selling/report/sales_analytics/sales_analytics.js:35
+#: stock/report/stock_analytics/stock_analytics.js:26
 #: stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py:95
 msgid "Value"
 msgstr ""
@@ -77494,7 +78953,7 @@
 msgid "Value Based Inspection"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.py:224
+#: stock/report/stock_ledger/stock_ledger.py:297
 msgid "Value Change"
 msgstr ""
 
@@ -77504,9 +78963,9 @@
 msgid "Value Details"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:25
-#: selling/report/sales_analytics/sales_analytics.js:25
-#: stock/report/stock_analytics/stock_analytics.js:24
+#: buying/report/purchase_analytics/purchase_analytics.js:24
+#: selling/report/sales_analytics/sales_analytics.js:32
+#: stock/report/stock_analytics/stock_analytics.js:23
 msgid "Value Or Qty"
 msgstr ""
 
@@ -77528,11 +78987,11 @@
 msgid "Value of goods cannot be 0"
 msgstr ""
 
-#: public/js/stock_analytics.js:36
+#: public/js/stock_analytics.js:46
 msgid "Value or Qty"
 msgstr ""
 
-#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:120
+#: manufacturing/page/bom_comparison_tool/bom_comparison_tool.js:121
 msgid "Values Changed"
 msgstr ""
 
@@ -77563,7 +79022,7 @@
 msgid "Variance ({})"
 msgstr ""
 
-#: stock/doctype/item/item.js:110 stock/doctype/item/item_list.js:14
+#: stock/doctype/item/item.js:146 stock/doctype/item/item_list.js:22
 #: stock/report/item_variant_details/item_variant_details.py:74
 msgid "Variant"
 msgstr ""
@@ -77572,13 +79031,17 @@
 msgid "Variant Attribute Error"
 msgstr ""
 
+#: public/js/templates/item_quick_entry.html:1
+msgid "Variant Attributes"
+msgstr ""
+
 #. Label of a Table field in DocType 'Item'
 #: stock/doctype/item/item.json
 msgctxt "Item"
 msgid "Variant Attributes"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:124
+#: manufacturing/doctype/bom/bom.js:128
 msgid "Variant BOM"
 msgstr ""
 
@@ -77592,7 +79055,7 @@
 msgid "Variant Based On cannot be changed"
 msgstr ""
 
-#: stock/doctype/item/item.js:98
+#: stock/doctype/item/item.js:122
 msgid "Variant Details Report"
 msgstr ""
 
@@ -77601,7 +79064,7 @@
 msgid "Variant Field"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:219 manufacturing/doctype/bom/bom.js:287
+#: manufacturing/doctype/bom/bom.js:238 manufacturing/doctype/bom/bom.js:300
 msgid "Variant Item"
 msgstr ""
 
@@ -77621,7 +79084,7 @@
 msgid "Variant Of"
 msgstr ""
 
-#: stock/doctype/item/item.js:543
+#: stock/doctype/item/item.js:610
 msgid "Variant creation has been queued."
 msgstr ""
 
@@ -77720,37 +79183,37 @@
 msgid "Video Settings"
 msgstr ""
 
-#: accounts/doctype/account/account.js:79
+#: accounts/doctype/account/account.js:74
 #: accounts/doctype/account/account.js:103
-#: accounts/doctype/account/account_tree.js:135
-#: accounts/doctype/account/account_tree.js:139
-#: accounts/doctype/account/account_tree.js:143
-#: accounts/doctype/cost_center/cost_center_tree.js:37
-#: accounts/doctype/invoice_discounting/invoice_discounting.js:202
-#: accounts/doctype/journal_entry/journal_entry.js:29
-#: accounts/doctype/purchase_invoice/purchase_invoice.js:619
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:8
-#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:11
-#: buying/doctype/supplier/supplier.js:88
-#: buying/doctype/supplier/supplier.js:92
-#: manufacturing/doctype/production_plan/production_plan.js:94
-#: projects/doctype/project/project.js:84
-#: projects/doctype/project/project.js:92
-#: public/js/controllers/stock_controller.js:64
-#: public/js/controllers/stock_controller.js:83 public/js/utils.js:133
-#: selling/doctype/customer/customer.js:157
-#: selling/doctype/customer/customer.js:162 setup/doctype/company/company.js:88
-#: setup/doctype/company/company.js:94 setup/doctype/company/company.js:100
-#: setup/doctype/company/company.js:106
-#: stock/doctype/delivery_trip/delivery_trip.js:71
-#: stock/doctype/item/item.js:63 stock/doctype/item/item.js:69
-#: stock/doctype/item/item.js:75 stock/doctype/item/item.js:92
-#: stock/doctype/item/item.js:96 stock/doctype/item/item.js:100
-#: stock/doctype/purchase_receipt/purchase_receipt.js:182
-#: stock/doctype/purchase_receipt/purchase_receipt.js:189
-#: stock/doctype/stock_entry/stock_entry.js:257
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:41
-#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:53
+#: accounts/doctype/account/account_tree.js:185
+#: accounts/doctype/account/account_tree.js:193
+#: accounts/doctype/account/account_tree.js:201
+#: accounts/doctype/cost_center/cost_center_tree.js:56
+#: accounts/doctype/invoice_discounting/invoice_discounting.js:205
+#: accounts/doctype/journal_entry/journal_entry.js:67
+#: accounts/doctype/purchase_invoice/purchase_invoice.js:668
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:14
+#: bulk_transaction/doctype/bulk_transaction_log/bulk_transaction_log.js:24
+#: buying/doctype/supplier/supplier.js:93
+#: buying/doctype/supplier/supplier.js:104
+#: manufacturing/doctype/production_plan/production_plan.js:98
+#: projects/doctype/project/project.js:100
+#: projects/doctype/project/project.js:117
+#: public/js/controllers/stock_controller.js:76
+#: public/js/controllers/stock_controller.js:95 public/js/utils.js:164
+#: selling/doctype/customer/customer.js:160
+#: selling/doctype/customer/customer.js:172 setup/doctype/company/company.js:90
+#: setup/doctype/company/company.js:100 setup/doctype/company/company.js:112
+#: setup/doctype/company/company.js:124
+#: stock/doctype/delivery_trip/delivery_trip.js:83
+#: stock/doctype/item/item.js:65 stock/doctype/item/item.js:75
+#: stock/doctype/item/item.js:85 stock/doctype/item/item.js:110
+#: stock/doctype/item/item.js:118 stock/doctype/item/item.js:126
+#: stock/doctype/purchase_receipt/purchase_receipt.js:207
+#: stock/doctype/purchase_receipt/purchase_receipt.js:218
+#: stock/doctype/stock_entry/stock_entry.js:287
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:44
+#: subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.js:60
 msgid "View"
 msgstr ""
 
@@ -77758,7 +79221,7 @@
 msgid "View BOM Update Log"
 msgstr ""
 
-#: public/js/setup_wizard.js:39
+#: public/js/setup_wizard.js:41
 msgid "View Chart of Accounts"
 msgstr ""
 
@@ -77768,24 +79231,24 @@
 msgid "View Cost Center Tree"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:158
+#: accounts/doctype/payment_entry/payment_entry.js:183
 msgid "View Exchange Gain/Loss Journals"
 msgstr ""
 
-#: assets/doctype/asset/asset.js:128
+#: assets/doctype/asset/asset.js:164
 #: assets/doctype/asset_repair/asset_repair.js:47
 msgid "View General Ledger"
 msgstr ""
 
-#: crm/doctype/campaign/campaign.js:11
+#: crm/doctype/campaign/campaign.js:15
 msgid "View Leads"
 msgstr ""
 
-#: accounts/doctype/account/account_tree.js:193 stock/doctype/batch/batch.js:18
+#: accounts/doctype/account/account_tree.js:278 stock/doctype/batch/batch.js:18
 msgid "View Ledger"
 msgstr ""
 
-#: stock/doctype/serial_no/serial_no.js:29
+#: stock/doctype/serial_no/serial_no.js:28
 msgid "View Ledgers"
 msgstr ""
 
@@ -77808,6 +79271,10 @@
 msgid "View attachments"
 msgstr ""
 
+#: public/js/call_popup/call_popup.js:186
+msgid "View call log"
+msgstr ""
+
 #: utilities/report/youtube_interactions/youtube_interactions.py:25
 msgid "Views"
 msgstr ""
@@ -77857,9 +79324,9 @@
 msgid "Voucher"
 msgstr ""
 
-#: stock/report/stock_ledger/stock_ledger.js:71
-#: stock/report/stock_ledger/stock_ledger.py:160
-#: stock/report/stock_ledger/stock_ledger.py:232
+#: stock/report/stock_ledger/stock_ledger.js:79
+#: stock/report/stock_ledger/stock_ledger.py:233
+#: stock/report/stock_ledger/stock_ledger.py:305
 msgid "Voucher #"
 msgstr ""
 
@@ -77899,21 +79366,21 @@
 msgid "Voucher Name"
 msgstr ""
 
-#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:273
-#: accounts/report/accounts_receivable/accounts_receivable.py:1050
+#: accounts/doctype/payment_reconciliation/payment_reconciliation.js:279
+#: accounts/report/accounts_receivable/accounts_receivable.py:1058
 #: 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_ledger/general_ledger.js:49
-#: accounts/report/general_ledger/general_ledger.py:625
-#: accounts/report/payment_ledger/payment_ledger.js:65
+#: accounts/report/general_ledger/general_ledger.py:638
+#: 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:61
+#: 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/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/reserved_stock/reserved_stock.js:80
+#: 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
@@ -77988,7 +79455,7 @@
 msgid "Voucher Qty"
 msgstr ""
 
-#: accounts/report/general_ledger/general_ledger.py:619
+#: accounts/report/general_ledger/general_ledger.py:632
 msgid "Voucher Subtype"
 msgstr ""
 
@@ -77998,25 +79465,25 @@
 msgid "Voucher Subtype"
 msgstr ""
 
-#: accounts/report/accounts_receivable/accounts_receivable.py:1048
+#: 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:617
+#: accounts/report/general_ledger/general_ledger.py:630
 #: 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/voucher_wise_balance/voucher_wise_balance.py:17
-#: public/js/utils/unreconcile.js:60
+#: 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/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/reserved_stock/reserved_stock.js:68
+#: 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_ledger/stock_ledger.py:230
+#: 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
 msgid "Voucher Type"
@@ -78088,11 +79555,11 @@
 msgid "Voucher Type"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:177
+#: accounts/doctype/bank_transaction/bank_transaction.py:180
 msgid "Voucher {0} is over-allocated by {1}"
 msgstr ""
 
-#: accounts/doctype/bank_transaction/bank_transaction.py:249
+#: accounts/doctype/bank_transaction/bank_transaction.py:252
 msgid "Voucher {0} value is broken: {1}"
 msgstr ""
 
@@ -78181,12 +79648,12 @@
 msgid "Wages per hour"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:251
+#: accounts/doctype/pos_invoice/pos_invoice.js:270
 msgid "Waiting for payment..."
 msgstr ""
 
 #. Name of a DocType
-#: accounts/report/gross_profit/gross_profit.js:55
+#: accounts/report/gross_profit/gross_profit.js:56
 #: accounts/report/gross_profit/gross_profit.py:251
 #: accounts/report/item_wise_sales_register/item_wise_sales_register.js:41
 #: accounts/report/purchase_register/purchase_register.js:52
@@ -78194,58 +79661,62 @@
 #: 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
-#: manufacturing/report/bom_stock_calculated/bom_stock_calculated.js:16
-#: manufacturing/report/bom_stock_report/bom_stock_report.js:11
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:82
+#: 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/work_order_stock_report/work_order_stock_report.js:9
-#: public/js/stock_analytics.js:45 public/js/utils.js:498
-#: public/js/utils/serial_no_batch_selector.js:90
-#: selling/doctype/sales_order/sales_order.js:300
-#: selling/doctype/sales_order/sales_order.js:401
-#: selling/report/sales_order_analysis/sales_order_analysis.js:49
+#: 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/utils/serial_no_batch_selector.js:94
+#: selling/doctype/sales_order/sales_order.js:327
+#: selling/doctype/sales_order/sales_order.js:431
+#: selling/report/sales_order_analysis/sales_order_analysis.js:48
 #: selling/report/sales_order_analysis/sales_order_analysis.py:334
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:78
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:79
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:256
 #: stock/doctype/warehouse/warehouse.json
 #: stock/page/stock_balance/stock_balance.js:11
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:25
+#: 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/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.js:22
+#: 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/item_price_stock/item_price_stock.py:27
-#: stock/report/item_shortage_report/item_shortage_report.js:18
+#: stock/report/item_shortage_report/item_shortage_report.js:17
 #: stock/report/item_shortage_report/item_shortage_report.py:81
 #: stock/report/product_bundle_balance/product_bundle_balance.js:42
 #: stock/report/product_bundle_balance/product_bundle_balance.py:89
-#: stock/report/reserved_stock/reserved_stock.js:44
+#: stock/report/reserved_stock/reserved_stock.js:41
 #: stock/report/reserved_stock/reserved_stock.py:96
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.js:34
 #: stock/report/serial_and_batch_summary/serial_and_batch_summary.py:140
-#: stock/report/serial_no_ledger/serial_no_ledger.js:22
+#: 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_analytics/stock_analytics.js:50
+#: stock/report/stock_analytics/stock_analytics.js:49
 #: stock/report/stock_balance/stock_balance.js:51
-#: stock/report/stock_balance/stock_balance.py:376
+#: stock/report/stock_balance/stock_balance.py:384
 #: stock/report/stock_ledger/stock_ledger.js:30
-#: stock/report/stock_ledger/stock_ledger.py:167
+#: stock/report/stock_ledger/stock_ledger.py:240
 #: stock/report/stock_ledger_variance/stock_ledger_variance.js:38
 #: stock/report/stock_ledger_variance/stock_ledger_variance.py:55
 #: 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:17
+#: 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/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.js:39
+#: 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
+#: templates/form_grid/material_request_grid.html:8
+#: templates/form_grid/stock_entry_grid.html:9
 msgid "Warehouse"
 msgstr ""
 
@@ -78303,12 +79774,24 @@
 msgid "Warehouse"
 msgstr ""
 
+#. Label of a Link field in DocType 'Pick List'
+#: stock/doctype/pick_list/pick_list.json
+msgctxt "Pick List"
+msgid "Warehouse"
+msgstr ""
+
 #. Label of a Link field in DocType 'Pick List Item'
 #: stock/doctype/pick_list_item/pick_list_item.json
 msgctxt "Pick List Item"
 msgid "Warehouse"
 msgstr ""
 
+#. Label of a Link field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Warehouse"
+msgstr ""
+
 #. Label of a Link field in DocType 'Pricing Rule'
 #: accounts/doctype/pricing_rule/pricing_rule.json
 msgctxt "Pricing Rule"
@@ -78443,6 +79926,12 @@
 msgid "Warehouse"
 msgstr ""
 
+#. Label of a Link field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Warehouse"
+msgstr ""
+
 #: stock/page/warehouse_capacity_summary/warehouse_capacity_summary.js:4
 msgid "Warehouse Capacity Summary"
 msgstr ""
@@ -78568,12 +80057,12 @@
 msgid "Warehouse not found against the account {0}"
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:367
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:421
 msgid "Warehouse not found in the system"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1005
-#: stock/doctype/delivery_note/delivery_note.py:362
+#: accounts/doctype/sales_invoice/sales_invoice.py:1022
+#: stock/doctype/delivery_note/delivery_note.py:416
 msgid "Warehouse required for stock Item {0}"
 msgstr ""
 
@@ -78595,11 +80084,11 @@
 msgid "Warehouse {0} does not belong to Company {1}."
 msgstr ""
 
-#: stock/utils.py:441
+#: stock/utils.py:436
 msgid "Warehouse {0} does not belong to company {1}"
 msgstr ""
 
-#: controllers/stock_controller.py:244
+#: controllers/stock_controller.py:426
 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 ""
 
@@ -78611,7 +80100,7 @@
 msgid "Warehouse: {0} does not belong to {1}"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:379
+#: manufacturing/doctype/production_plan/production_plan.js:407
 msgid "Warehouses"
 msgstr ""
 
@@ -78721,9 +80210,9 @@
 msgid "Warn for new Request for Quotations"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:639
-#: controllers/accounts_controller.py:1676
-#: stock/doctype/delivery_trip/delivery_trip.js:123
+#: accounts/doctype/payment_entry/payment_entry.py:648
+#: controllers/accounts_controller.py:1765
+#: stock/doctype/delivery_trip/delivery_trip.js:144
 #: utilities/transaction_base.py:122
 msgid "Warning"
 msgstr ""
@@ -78736,15 +80225,15 @@
 msgid "Warning!"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:1146
+#: accounts/doctype/journal_entry/journal_entry.py:1173
 msgid "Warning: Another {0} # {1} exists against stock entry {2}"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.js:415
+#: stock/doctype/material_request/material_request.js:484
 msgid "Warning: Material Requested Qty is less than Minimum Order Qty"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.py:252
+#: selling/doctype/sales_order/sales_order.py:254
 msgid "Warning: Sales Order {0} already exists against Customer's Purchase Order {1}"
 msgstr ""
 
@@ -78766,7 +80255,7 @@
 msgstr ""
 
 #. Name of a DocType
-#: maintenance/doctype/maintenance_visit/maintenance_visit.js:97
+#: maintenance/doctype/maintenance_visit/maintenance_visit.js:103
 #: support/doctype/warranty_claim/warranty_claim.json
 msgid "Warranty Claim"
 msgstr ""
@@ -78806,6 +80295,10 @@
 msgid "Watch Video"
 msgstr ""
 
+#: controllers/accounts_controller.py:232
+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 ""
+
 #: www/support/index.html:7
 msgid "We're here to help!"
 msgstr ""
@@ -79015,12 +80508,12 @@
 msgid "Weekday"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:34
-#: public/js/stock_analytics.js:52
-#: selling/report/sales_analytics/sales_analytics.js:61
-#: stock/report/stock_analytics/stock_analytics.js:80
-#: support/report/issue_analytics/issue_analytics.js:42
+#: buying/report/purchase_analytics/purchase_analytics.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:33
+#: public/js/stock_analytics.js:82
+#: selling/report/sales_analytics/sales_analytics.js:68
+#: stock/report/stock_analytics/stock_analytics.js:79
+#: support/report/issue_analytics/issue_analytics.js:41
 msgid "Weekly"
 msgstr ""
 
@@ -79277,15 +80770,22 @@
 msgid "Wheels"
 msgstr ""
 
-#: stock/doctype/item/item.js:834
+#. Description of the 'Sub Assembly Warehouse' (Link) field in DocType
+#. 'Production Plan'
+#: manufacturing/doctype/production_plan/production_plan.json
+msgctxt "Production Plan"
+msgid "When a parent warehouse is chosen, the system conducts stock checks against the associated child warehouses"
+msgstr ""
+
+#: stock/doctype/item/item.js:920
 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:313
+#: accounts/doctype/account/account.py:332
 msgid "While creating account for Child Company {0}, parent account {1} found as a ledger account."
 msgstr ""
 
-#: accounts/doctype/account/account.py:303
+#: accounts/doctype/account/account.py:322
 msgid "While creating account for Child Company {0}, parent account {1} not found. Please create the parent account in corresponding COA"
 msgstr ""
 
@@ -79348,7 +80848,11 @@
 msgid "With Operations"
 msgstr ""
 
-#: public/js/bank_reconciliation_tool/data_table_manager.js:70
+#: accounts/report/trial_balance/trial_balance.js:82
+msgid "With Period Closing Entry For Opening Balances"
+msgstr ""
+
+#: public/js/bank_reconciliation_tool/data_table_manager.js:67
 msgid "Withdrawal"
 msgstr ""
 
@@ -79364,7 +80868,7 @@
 msgid "Work Done"
 msgstr ""
 
-#: setup/doctype/company/company.py:261
+#: setup/doctype/company/company.py:260
 msgid "Work In Progress"
 msgstr ""
 
@@ -79386,7 +80890,7 @@
 msgid "Work In Progress"
 msgstr ""
 
-#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:20
+#: manufacturing/doctype/manufacturing_settings/manufacturing_settings.js:23
 msgid "Work In Progress Warehouse"
 msgstr ""
 
@@ -79394,19 +80898,20 @@
 #. Title of an Onboarding Step
 #: manufacturing/doctype/bom/bom.js:119
 #: manufacturing/doctype/work_order/work_order.json
+#: manufacturing/doctype/workstation/workstation_job_card.html:26
 #: manufacturing/onboarding_step/work_order/work_order.json
-#: manufacturing/report/bom_variance_report/bom_variance_report.js: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:42
+#: 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/job_card_summary/job_card_summary.py:145
-#: manufacturing/report/process_loss_report/process_loss_report.js:23
+#: manufacturing/report/process_loss_report/process_loss_report.js:22
 #: manufacturing/report/process_loss_report/process_loss_report.py:68
-#: manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.js:30
+#: 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:560
-#: stock/doctype/material_request/material_request.js:152
-#: stock/doctype/material_request/material_request.py:779
+#: selling/doctype/sales_order/sales_order.js:624
+#: stock/doctype/material_request/material_request.js:178
+#: stock/doctype/material_request/material_request.py:791
 #: templates/pages/material_request_info.html:45
 msgid "Work Order"
 msgstr ""
@@ -79457,7 +80962,7 @@
 msgid "Work Order"
 msgstr ""
 
-#: manufacturing/doctype/production_plan/production_plan.js:107
+#: manufacturing/doctype/production_plan/production_plan.js:121
 msgid "Work Order / Subcontract PO"
 msgstr ""
 
@@ -79504,33 +81009,33 @@
 msgid "Work Order Summary"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:784
+#: stock/doctype/material_request/material_request.py:796
 msgid "Work Order cannot be created for following reason: <br> {0}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:927
+#: manufacturing/doctype/work_order/work_order.py:941
 msgid "Work Order cannot be raised against a Item Template"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:1399
-#: manufacturing/doctype/work_order/work_order.py:1458
+#: manufacturing/doctype/work_order/work_order.py:1413
+#: manufacturing/doctype/work_order/work_order.py:1472
 msgid "Work Order has been {0}"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:667
+#: selling/doctype/sales_order/sales_order.js:768
 msgid "Work Order not created"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:679
+#: stock/doctype/stock_entry/stock_entry.py:634
 msgid "Work Order {0}: Job Card not found for the operation {1}"
 msgstr ""
 
-#: manufacturing/report/job_card_summary/job_card_summary.js:57
-#: stock/doctype/material_request/material_request.py:774
+#: manufacturing/report/job_card_summary/job_card_summary.js:56
+#: stock/doctype/material_request/material_request.py:786
 msgid "Work Orders"
 msgstr ""
 
-#: selling/doctype/sales_order/sales_order.js:731
+#: selling/doctype/sales_order/sales_order.js:844
 msgid "Work Orders Created: {0}"
 msgstr ""
 
@@ -79557,7 +81062,7 @@
 msgid "Work-in-Progress Warehouse"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:425
+#: manufacturing/doctype/work_order/work_order.py:436
 msgid "Work-in-Progress Warehouse is required before Submit"
 msgstr ""
 
@@ -79594,6 +81099,10 @@
 msgid "Workflow State"
 msgstr ""
 
+#: templates/pages/task_info.html:73
+msgid "Working"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'Task'
 #: projects/doctype/task/task.json
 msgctxt "Task"
@@ -79620,14 +81129,14 @@
 
 #. Name of a DocType
 #. Title of an Onboarding Step
-#: manufacturing/doctype/work_order/work_order.js:232
+#: manufacturing/doctype/work_order/work_order.js:247
 #: manufacturing/doctype/workstation/workstation.json
 #: manufacturing/onboarding_step/workstation/workstation.json
-#: manufacturing/report/bom_operations_time/bom_operations_time.js:36
+#: 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:61
+#: 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/job_card_summary/job_card_summary.js:73
+#: 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
 msgid "Workstation"
@@ -79669,12 +81178,24 @@
 msgid "Workstation / Machine"
 msgstr ""
 
+#. Label of a HTML field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Dashboard"
+msgstr ""
+
 #. Label of a Data field in DocType 'Workstation'
 #: manufacturing/doctype/workstation/workstation.json
 msgctxt "Workstation"
 msgid "Workstation Name"
 msgstr ""
 
+#. Label of a Tab Break field in DocType 'Workstation'
+#: manufacturing/doctype/workstation/workstation.json
+msgctxt "Workstation"
+msgid "Workstation Status"
+msgstr ""
+
 #. Name of a DocType
 #: manufacturing/doctype/workstation_type/workstation_type.json
 msgid "Workstation Type"
@@ -79717,17 +81238,23 @@
 msgid "Workstation Working Hour"
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.py:199
+#: manufacturing/doctype/workstation/workstation.py:355
 msgid "Workstation is closed on the following dates as per Holiday List: {0}"
 msgstr ""
 
+#. Label of a Tab Break field in DocType 'Plant Floor'
+#: manufacturing/doctype/plant_floor/plant_floor.json
+msgctxt "Plant Floor"
+msgid "Workstations"
+msgstr ""
+
 #: setup/setup_wizard/setup_wizard.py:16 setup/setup_wizard/setup_wizard.py:41
 msgid "Wrapping up"
 msgstr ""
 
 #: 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:510
+#: setup/doctype/company/company.py:509
 msgid "Write Off"
 msgstr ""
 
@@ -79918,7 +81445,7 @@
 msgid "Wrong Company"
 msgstr ""
 
-#: setup/doctype/company/company.js:172
+#: setup/doctype/company/company.js:202
 msgid "Wrong Password"
 msgstr ""
 
@@ -79977,20 +81504,20 @@
 msgid "Year start date or end date is overlapping with {0}. To avoid please set company"
 msgstr ""
 
-#: accounts/report/budget_variance_report/budget_variance_report.js:67
-#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:70
-#: buying/report/purchase_analytics/purchase_analytics.js:64
-#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:61
-#: manufacturing/report/production_analytics/production_analytics.js:37
-#: public/js/financial_statements.js:220
+#: accounts/report/budget_variance_report/budget_variance_report.js:65
+#: accounts/report/deferred_revenue_and_expense/deferred_revenue_and_expense.js:78
+#: buying/report/purchase_analytics/purchase_analytics.js:63
+#: manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.js:60
+#: manufacturing/report/production_analytics/production_analytics.js:36
+#: public/js/financial_statements.js:229
 #: public/js/purchase_trends_filters.js:22 public/js/sales_trends_filters.js:14
-#: public/js/stock_analytics.js:55
-#: selling/report/sales_analytics/sales_analytics.js:64
-#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:36
-#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:36
-#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:36
-#: stock/report/stock_analytics/stock_analytics.js:83
-#: support/report/issue_analytics/issue_analytics.js:45
+#: public/js/stock_analytics.js:85
+#: selling/report/sales_analytics/sales_analytics.js:71
+#: selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js:35
+#: selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js:35
+#: selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js:35
+#: stock/report/stock_analytics/stock_analytics.js:82
+#: support/report/issue_analytics/issue_analytics.js:44
 msgid "Yearly"
 msgstr ""
 
@@ -80123,23 +81650,23 @@
 msgid "Yes"
 msgstr ""
 
-#: controllers/accounts_controller.py:3151
+#: controllers/accounts_controller.py:3242
 msgid "You are not allowed to update as per the conditions set in {} Workflow."
 msgstr ""
 
-#: accounts/general_ledger.py:665
+#: accounts/general_ledger.py:674
 msgid "You are not authorized to add or update entries before {0}"
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:317
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:328
 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:263
+#: accounts/doctype/account/account.py:282
 msgid "You are not authorized to set Frozen value"
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:307
+#: stock/doctype/pick_list/pick_list.py:347
 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 ""
 
@@ -80155,7 +81682,7 @@
 msgid "You can also set default CWIP account in Company {}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:873
+#: accounts/doctype/sales_invoice/sales_invoice.py:890
 msgid "You can change the parent account to a Balance Sheet account or select a different account."
 msgstr ""
 
@@ -80163,7 +81690,7 @@
 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:583
+#: accounts/doctype/journal_entry/journal_entry.py:610
 msgid "You can not enter current voucher in 'Against Journal Entry' column"
 msgstr ""
 
@@ -80171,8 +81698,8 @@
 msgid "You can only have Plans with the same billing cycle in a Subscription"
 msgstr ""
 
-#: accounts/doctype/pos_invoice/pos_invoice.js:239
-#: accounts/doctype/sales_invoice/sales_invoice.js:847
+#: accounts/doctype/pos_invoice/pos_invoice.js:258
+#: accounts/doctype/sales_invoice/sales_invoice.js:915
 msgid "You can only redeem max {0} points in this order."
 msgstr ""
 
@@ -80180,11 +81707,11 @@
 msgid "You can only select one mode of payment as default"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:478
+#: selling/page/point_of_sale/pos_payment.js:506
 msgid "You can redeem upto {0}."
 msgstr ""
 
-#: manufacturing/doctype/workstation/workstation.js:37
+#: manufacturing/doctype/workstation/workstation.js:59
 msgid "You can set it as a machine name or operation type. For example, stiching machine 12"
 msgstr ""
 
@@ -80193,7 +81720,7 @@
 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:1027
+#: manufacturing/doctype/job_card/job_card.py:1042
 msgid "You can't make any changes to Job Card since Work Order is closed."
 msgstr ""
 
@@ -80201,7 +81728,7 @@
 msgid "You can't redeem Loyalty Points having more value than the Rounded Total."
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:532
+#: manufacturing/doctype/bom/bom.js:549
 msgid "You cannot change the rate if BOM is mentioned against any Item."
 msgstr ""
 
@@ -80209,15 +81736,15 @@
 msgid "You cannot create a {0} within the closed Accounting Period {1}"
 msgstr ""
 
-#: accounts/general_ledger.py:155
+#: accounts/general_ledger.py:159
 msgid "You cannot create or cancel any accounting entries with in the closed Accounting Period {0}"
 msgstr ""
 
-#: accounts/general_ledger.py:689
+#: accounts/general_ledger.py:698
 msgid "You cannot create/amend any accounting entries till this date."
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:809
+#: accounts/doctype/journal_entry/journal_entry.py:836
 msgid "You cannot credit and debit same account at the same time"
 msgstr ""
 
@@ -80229,7 +81756,7 @@
 msgid "You cannot edit root node."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:507
+#: selling/page/point_of_sale/pos_payment.js:536
 msgid "You cannot redeem more than {0}."
 msgstr ""
 
@@ -80241,15 +81768,15 @@
 msgid "You cannot restart a Subscription that is not cancelled."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:210
 msgid "You cannot submit empty order."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:207
+#: selling/page/point_of_sale/pos_payment.js:209
 msgid "You cannot submit the order without payment."
 msgstr ""
 
-#: controllers/accounts_controller.py:3127
+#: controllers/accounts_controller.py:3218
 msgid "You do not have permissions to {} items in a {}."
 msgstr ""
 
@@ -80257,7 +81784,7 @@
 msgid "You don't have enough Loyalty Points to redeem"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_payment.js:474
+#: selling/page/point_of_sale/pos_payment.js:499
 msgid "You don't have enough points to redeem."
 msgstr ""
 
@@ -80265,7 +81792,7 @@
 msgid "You had {} errors while creating opening invoices. Check {} for more details"
 msgstr ""
 
-#: public/js/utils.js:822
+#: public/js/utils.js:893
 msgid "You have already selected items from {0} {1}"
 msgstr ""
 
@@ -80273,7 +81800,7 @@
 msgid "You have been invited to collaborate on the project: {0}"
 msgstr ""
 
-#: stock/doctype/shipment/shipment.js:394
+#: stock/doctype/shipment/shipment.js:442
 msgid "You have entered a duplicate Delivery Note on Row"
 msgstr ""
 
@@ -80285,11 +81812,11 @@
 msgid "You haven't created a {0} yet"
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:196
+#: selling/page/point_of_sale/pos_controller.js:218
 msgid "You must add atleast one item to save it as draft."
 msgstr ""
 
-#: selling/page/point_of_sale/pos_controller.js:598
+#: selling/page/point_of_sale/pos_controller.js:626
 msgid "You must select a customer before adding an item."
 msgstr ""
 
@@ -80354,7 +81881,7 @@
 msgid "Youtube Statistics"
 msgstr ""
 
-#: public/js/utils/contact_address_quick_entry.js:68
+#: public/js/utils/contact_address_quick_entry.js:71
 msgid "ZIP Code"
 msgstr ""
 
@@ -80368,7 +81895,7 @@
 msgid "Zero Rated"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:407
+#: stock/doctype/stock_entry/stock_entry.py:362
 msgid "Zero quantity"
 msgstr ""
 
@@ -80378,7 +81905,7 @@
 msgid "Zip File"
 msgstr ""
 
-#: stock/reorder_item.py:283
+#: stock/reorder_item.py:368
 msgid "[Important] [ERPNext] Auto Reorder Errors"
 msgstr ""
 
@@ -80386,16 +81913,20 @@
 msgid "`Allow Negative rates for Items`"
 msgstr ""
 
-#: stock/doctype/stock_settings/stock_settings.py:89
+#: stock/doctype/stock_settings/stock_settings.py:92
 #, python-format
 msgid "`Freeze Stocks Older Than` should be smaller than %d days."
 msgstr ""
 
+#: stock/stock_ledger.py:1700
+msgid "after"
+msgstr ""
+
 #: accounts/doctype/shipping_rule/shipping_rule.py:204
 msgid "and"
 msgstr ""
 
-#: manufacturing/doctype/bom/bom.js:759
+#: manufacturing/doctype/bom/bom.js:792
 msgid "as a percentage of finished item quantity"
 msgstr ""
 
@@ -80403,11 +81934,15 @@
 msgid "at"
 msgstr ""
 
-#: buying/report/purchase_analytics/purchase_analytics.js:17
-#: selling/report/sales_analytics/sales_analytics.js:17
+#: buying/report/purchase_analytics/purchase_analytics.js:16
+#: selling/report/sales_analytics/sales_analytics.js:24
 msgid "based_on"
 msgstr ""
 
+#: public/js/utils/sales_common.js:256
+msgid "cannot be greater than 100"
+msgstr ""
+
 #. Label of a Small Text field in DocType 'Production Plan Sub Assembly Item'
 #: manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
 msgctxt "Production Plan Sub Assembly Item"
@@ -80421,8 +81956,12 @@
 msgid "development"
 msgstr ""
 
+#: selling/page/point_of_sale/pos_item_cart.js:433
+msgid "discount applied"
+msgstr ""
+
 #: selling/report/sales_person_commission_summary/sales_person_commission_summary.py:46
-#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:57
+#: selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py:58
 msgid "doc_type"
 msgstr ""
 
@@ -80451,6 +81990,10 @@
 msgid "exchangerate.host"
 msgstr ""
 
+#: crm/report/sales_pipeline_analytics/sales_pipeline_analytics.py:161
+msgid "fieldname"
+msgstr ""
+
 #. Option for the 'Service Provider' (Select) field in DocType 'Currency
 #. Exchange Settings'
 #: accounts/doctype/currency_exchange_settings/currency_exchange_settings.json
@@ -80458,13 +82001,21 @@
 msgid "frankfurter.app"
 msgstr ""
 
+#: templates/form_grid/item_grid.html:66 templates/form_grid/item_grid.html:80
+msgid "hidden"
+msgstr ""
+
+#: projects/doctype/project/project_dashboard.html:13
+msgid "hours"
+msgstr ""
+
 #. Label of a Attach Image field in DocType 'Batch'
 #: stock/doctype/batch/batch.json
 msgctxt "Batch"
 msgid "image"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:253
+#: accounts/doctype/budget/budget.py:260
 msgid "is already"
 msgstr ""
 
@@ -80540,7 +82091,7 @@
 msgid "material_request_item"
 msgstr ""
 
-#: controllers/selling_controller.py:150
+#: controllers/selling_controller.py:151
 msgid "must be between 0 and 100"
 msgstr ""
 
@@ -80586,7 +82137,11 @@
 msgid "old_parent"
 msgstr ""
 
-#: controllers/accounts_controller.py:1033
+#: templates/pages/task_info.html:90
+msgid "on"
+msgstr ""
+
+#: controllers/accounts_controller.py:1097
 msgid "or"
 msgstr ""
 
@@ -80598,7 +82153,7 @@
 msgid "out of 5"
 msgstr ""
 
-#: public/js/utils.js:369
+#: public/js/utils.js:417
 msgid "payments app is not installed. Please install it from {0} or {1}"
 msgstr ""
 
@@ -80639,7 +82194,7 @@
 msgid "per hour"
 msgstr ""
 
-#: stock/stock_ledger.py:1681
+#: stock/stock_ledger.py:1701
 msgid "performing either one below:"
 msgstr ""
 
@@ -80667,7 +82222,7 @@
 msgid "ratings"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 msgid "received from"
 msgstr ""
 
@@ -80744,10 +82299,6 @@
 msgid "sandbox"
 msgstr ""
 
-#: public/js/controllers/transaction.js:920
-msgid "selected Payment Terms Template"
-msgstr ""
-
 #: accounts/doctype/subscription/subscription.py:711
 msgid "subscription is already cancelled."
 msgstr ""
@@ -80768,12 +82319,14 @@
 msgid "title"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:1105
+#: accounts/doctype/payment_entry/payment_entry.py:1114
 #: 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:2737
+#: accounts/doctype/sales_invoice/sales_invoice.py:2706
 msgid "to unallocate the amount of this Return Invoice before cancelling it."
 msgstr ""
 
@@ -80796,7 +82349,7 @@
 msgid "via BOM Update Tool"
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:256
+#: accounts/doctype/budget/budget.py:263
 msgid "will be"
 msgstr ""
 
@@ -80809,7 +82362,7 @@
 msgid "{0}"
 msgstr ""
 
-#: controllers/accounts_controller.py:878
+#: controllers/accounts_controller.py:930
 msgid "{0} '{1}' is disabled"
 msgstr ""
 
@@ -80817,7 +82370,7 @@
 msgid "{0} '{1}' not in Fiscal Year {2}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.py:355
+#: manufacturing/doctype/work_order/work_order.py:366
 msgid "{0} ({1}) cannot be greater than planned quantity ({2}) in Work Order {3}"
 msgstr ""
 
@@ -80825,19 +82378,19 @@
 msgid "{0} - Above"
 msgstr ""
 
-#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:253
+#: stock/doctype/landed_cost_voucher/landed_cost_voucher.py:281
 msgid "{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
 msgstr ""
 
-#: controllers/accounts_controller.py:1893
+#: controllers/accounts_controller.py:1985
 msgid "{0} Account not found against Customer {1}."
 msgstr ""
 
-#: accounts/doctype/budget/budget.py:261
+#: accounts/doctype/budget/budget.py:268
 msgid "{0} Budget for Account {1} against {2} {3} is {4}. It {5} exceed by {6}"
 msgstr ""
 
-#: accounts/doctype/pricing_rule/utils.py:759
+#: accounts/doctype/pricing_rule/utils.py:758
 msgid "{0} Coupon used are {1}. Allowed quantity is exhausted"
 msgstr ""
 
@@ -80845,11 +82398,11 @@
 msgid "{0} Digest"
 msgstr ""
 
-#: accounts/utils.py:1286
+#: accounts/utils.py:1255
 msgid "{0} Number {1} is already used in {2} {3}"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:379
+#: manufacturing/doctype/work_order/work_order.js:397
 msgid "{0} Operations: {1}"
 msgstr ""
 
@@ -80861,7 +82414,7 @@
 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:429
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:428
 msgid "{0} Transaction(s) Reconciled"
 msgstr ""
 
@@ -80869,23 +82422,23 @@
 msgid "{0} account is not of type {1}"
 msgstr ""
 
-#: stock/doctype/purchase_receipt/purchase_receipt.py:447
+#: stock/doctype/purchase_receipt/purchase_receipt.py:448
 msgid "{0} account not found while submitting purchase receipt"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:930
+#: accounts/doctype/journal_entry/journal_entry.py:957
 msgid "{0} against Bill {1} dated {2}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:939
+#: accounts/doctype/journal_entry/journal_entry.py:966
 msgid "{0} against Purchase Order {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:906
+#: accounts/doctype/journal_entry/journal_entry.py:933
 msgid "{0} against Sales Invoice {1}"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:913
+#: accounts/doctype/journal_entry/journal_entry.py:940
 msgid "{0} against Sales Order {1}"
 msgstr ""
 
@@ -80893,7 +82446,7 @@
 msgid "{0} already has a Parent Procedure {1}."
 msgstr ""
 
-#: stock/doctype/delivery_note/delivery_note.py:610
+#: stock/doctype/delivery_note/delivery_note.py:671
 msgid "{0} and {1}"
 msgstr ""
 
@@ -80914,16 +82467,16 @@
 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:783
-#: manufacturing/doctype/production_plan/production_plan.py:877
+#: manufacturing/doctype/production_plan/production_plan.py:792
+#: manufacturing/doctype/production_plan/production_plan.py:886
 msgid "{0} created"
 msgstr ""
 
-#: setup/doctype/company/company.py:191
+#: setup/doctype/company/company.py:190
 msgid "{0} currency must be same as company's default currency. Please select another account."
 msgstr ""
 
-#: buying/doctype/purchase_order/purchase_order.py:310
+#: buying/doctype/purchase_order/purchase_order.py:311
 msgid "{0} currently has a {1} Supplier Scorecard standing, and Purchase Orders to this supplier should be issued with caution."
 msgstr ""
 
@@ -80955,7 +82508,11 @@
 msgid "{0} has been submitted successfully"
 msgstr ""
 
-#: controllers/accounts_controller.py:2212
+#: projects/doctype/project/project_dashboard.html:15
+msgid "{0} hours"
+msgstr ""
+
+#: controllers/accounts_controller.py:2304
 msgid "{0} in row {1}"
 msgstr ""
 
@@ -80963,23 +82520,27 @@
 msgid "{0} is a mandatory Accounting Dimension. <br>Please set a value for {0} in Accounting Dimensions section."
 msgstr ""
 
-#: controllers/accounts_controller.py:162
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:189
+msgid "{0} is already running for {1}"
+msgstr ""
+
+#: controllers/accounts_controller.py:164
 msgid "{0} is blocked so this transaction cannot proceed"
 msgstr ""
 
 #: accounts/doctype/budget/budget.py:57
-#: accounts/doctype/payment_entry/payment_entry.py:542
+#: accounts/doctype/payment_entry/payment_entry.py:551
 #: accounts/report/general_ledger/general_ledger.py:62
 #: accounts/report/pos_register/pos_register.py:110 controllers/trends.py:50
 msgid "{0} is mandatory"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:975
+#: accounts/doctype/sales_invoice/sales_invoice.py:992
 msgid "{0} is mandatory for Item {1}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:220
 #: accounts/doctype/payment_ledger_entry/payment_ledger_entry.py:101
+#: accounts/general_ledger.py:722
 msgid "{0} is mandatory for account {1}"
 msgstr ""
 
@@ -80987,7 +82548,7 @@
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}"
 msgstr ""
 
-#: controllers/accounts_controller.py:2491
+#: controllers/accounts_controller.py:2576
 msgid "{0} is mandatory. Maybe Currency Exchange record is not created for {1} to {2}."
 msgstr ""
 
@@ -80999,7 +82560,7 @@
 msgid "{0} is not a group node. Please select a group node as parent cost center"
 msgstr ""
 
-#: stock/doctype/stock_entry/stock_entry.py:456
+#: stock/doctype/stock_entry/stock_entry.py:411
 msgid "{0} is not a stock Item"
 msgstr ""
 
@@ -81015,26 +82576,30 @@
 msgid "{0} is not enabled in {1}"
 msgstr ""
 
-#: stock/doctype/material_request/material_request.py:565
+#: setup/doctype/transaction_deletion_record/transaction_deletion_record.py:197
+msgid "{0} is not running. Cannot trigger events for this Document"
+msgstr ""
+
+#: stock/doctype/material_request/material_request.py:566
 msgid "{0} is not the default supplier for any items."
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:2300
+#: accounts/doctype/payment_entry/payment_entry.py:2325
 msgid "{0} is on hold till {1}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:131
+#: accounts/doctype/gl_entry/gl_entry.py:121
 #: accounts/doctype/pricing_rule/pricing_rule.py:165
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:182
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:193
 #: stock/doctype/stock_reservation_entry/stock_reservation_entry.py:118
 msgid "{0} is required"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:343
+#: manufacturing/doctype/work_order/work_order.js:362
 msgid "{0} items in progress"
 msgstr ""
 
-#: manufacturing/doctype/work_order/work_order.js:327
+#: manufacturing/doctype/work_order/work_order.js:346
 msgid "{0} items produced"
 msgstr ""
 
@@ -81042,7 +82607,7 @@
 msgid "{0} must be negative in return document"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1988
+#: accounts/doctype/sales_invoice/sales_invoice.py:1957
 msgid "{0} not allowed to transact with {1}. Please change the Company."
 msgstr ""
 
@@ -81058,60 +82623,60 @@
 msgid "{0} payment entries can not be filtered by {1}"
 msgstr ""
 
-#: controllers/stock_controller.py:899
+#: controllers/stock_controller.py:1085
 msgid "{0} qty of Item {1} is being received into Warehouse {2} with capacity {3}."
 msgstr ""
 
-#: stock/doctype/stock_reconciliation/stock_reconciliation.py:451
+#: stock/doctype/stock_reconciliation/stock_reconciliation.py:505
 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:702
+#: stock/doctype/pick_list/pick_list.py:773
 msgid "{0} units of Item {1} is not available."
 msgstr ""
 
-#: stock/doctype/pick_list/pick_list.py:718
+#: stock/doctype/pick_list/pick_list.py:789
 msgid "{0} units of Item {1} is picked in another Pick List."
 msgstr ""
 
-#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:135
+#: stock/doctype/stock_ledger_entry/stock_ledger_entry.py:145
 msgid "{0} units of {1} are required in {2}{3}, on {4} {5} for {6} to complete the transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1340 stock/stock_ledger.py:1829
-#: stock/stock_ledger.py:1845
+#: stock/stock_ledger.py:1366 stock/stock_ledger.py:1836
+#: stock/stock_ledger.py:1852
 msgid "{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1955 stock/stock_ledger.py:2005
+#: stock/stock_ledger.py:1962 stock/stock_ledger.py:2012
 msgid "{0} units of {1} needed in {2} on {3} {4} to complete this transaction."
 msgstr ""
 
-#: stock/stock_ledger.py:1334
+#: stock/stock_ledger.py:1360
 msgid "{0} units of {1} needed in {2} to complete this transaction."
 msgstr ""
 
-#: stock/utils.py:432
+#: stock/utils.py:427
 msgid "{0} valid serial nos for Item {1}"
 msgstr ""
 
-#: stock/doctype/item/item.js:548
+#: stock/doctype/item/item.js:615
 msgid "{0} variants created."
 msgstr ""
 
-#: accounts/doctype/payment_term/payment_term.js:17
+#: accounts/doctype/payment_term/payment_term.js:19
 msgid "{0} will be given as discount."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:773
+#: manufacturing/doctype/job_card/job_card.py:780
 msgid "{0} {1}"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:203
+#: public/js/utils/serial_no_batch_selector.js:206
 msgid "{0} {1} Manually"
 msgstr ""
 
-#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:433
+#: accounts/doctype/bank_reconciliation_tool/bank_reconciliation_tool.py:432
 msgid "{0} {1} Partially Reconciled"
 msgstr ""
 
@@ -81123,9 +82688,9 @@
 msgid "{0} {1} created"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:506
-#: accounts/doctype/payment_entry/payment_entry.py:562
-#: accounts/doctype/payment_entry/payment_entry.py:2065
+#: accounts/doctype/payment_entry/payment_entry.py:515
+#: accounts/doctype/payment_entry/payment_entry.py:571
+#: accounts/doctype/payment_entry/payment_entry.py:2084
 msgid "{0} {1} does not exist"
 msgstr ""
 
@@ -81141,8 +82706,8 @@
 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:449
-#: selling/doctype/sales_order/sales_order.py:481
+#: buying/doctype/purchase_order/purchase_order.py:450
+#: selling/doctype/sales_order/sales_order.py:484
 #: stock/doctype/material_request/material_request.py:198
 msgid "{0} {1} has been modified. Please refresh."
 msgstr ""
@@ -81155,12 +82720,12 @@
 msgid "{0} {1} is allocated twice in this Bank Transaction"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:591
+#: accounts/doctype/payment_entry/payment_entry.py:600
 msgid "{0} {1} is associated with {2}, but Party Account is {3}"
 msgstr ""
 
-#: controllers/buying_controller.py:624 controllers/selling_controller.py:421
-#: controllers/subcontracting_controller.py:806
+#: controllers/buying_controller.py:649 controllers/selling_controller.py:422
+#: controllers/subcontracting_controller.py:810
 msgid "{0} {1} is cancelled or closed"
 msgstr ""
 
@@ -81172,7 +82737,7 @@
 msgid "{0} {1} is cancelled so the action cannot be completed"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:725
+#: accounts/doctype/journal_entry/journal_entry.py:752
 msgid "{0} {1} is closed"
 msgstr ""
 
@@ -81184,7 +82749,7 @@
 msgid "{0} {1} is frozen"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:722
+#: accounts/doctype/journal_entry/journal_entry.py:749
 msgid "{0} {1} is fully billed"
 msgstr ""
 
@@ -81192,7 +82757,7 @@
 msgid "{0} {1} is not active"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:569
+#: accounts/doctype/payment_entry/payment_entry.py:578
 msgid "{0} {1} is not associated with {2} {3}"
 msgstr ""
 
@@ -81200,12 +82765,12 @@
 msgid "{0} {1} is not in any active Fiscal Year"
 msgstr ""
 
-#: accounts/doctype/journal_entry/journal_entry.py:719
-#: accounts/doctype/journal_entry/journal_entry.py:760
+#: accounts/doctype/journal_entry/journal_entry.py:746
+#: accounts/doctype/journal_entry/journal_entry.py:787
 msgid "{0} {1} is not submitted"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:598
+#: accounts/doctype/payment_entry/payment_entry.py:607
 msgid "{0} {1} is on hold"
 msgstr ""
 
@@ -81213,11 +82778,11 @@
 msgid "{0} {1} is {2}"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.py:603
+#: accounts/doctype/payment_entry/payment_entry.py:612
 msgid "{0} {1} must be submitted"
 msgstr ""
 
-#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:213
+#: accounts/doctype/repost_accounting_ledger/repost_accounting_ledger.py:215
 msgid "{0} {1} not allowed to be reposted. Modify {2} to enable reposting."
 msgstr ""
 
@@ -81225,58 +82790,58 @@
 msgid "{0} {1} status is {2}"
 msgstr ""
 
-#: public/js/utils/serial_no_batch_selector.js:189
+#: public/js/utils/serial_no_batch_selector.js:191
 msgid "{0} {1} via CSV File"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:254
+#: accounts/doctype/gl_entry/gl_entry.py:208
 msgid "{0} {1}: 'Profit and Loss' type account {2} not allowed in Opening Entry"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:283
+#: accounts/doctype/gl_entry/gl_entry.py:237
 #: 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:271
+#: accounts/doctype/gl_entry/gl_entry.py:225
 #: 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:278
+#: accounts/doctype/gl_entry/gl_entry.py:232
 #: 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:322
+#: accounts/doctype/gl_entry/gl_entry.py:276
 msgid "{0} {1}: Accounting Entry for {2} can only be made in currency: {3}"
 msgstr ""
 
-#: controllers/stock_controller.py:365
+#: controllers/stock_controller.py:547
 msgid "{0} {1}: Cost Center is mandatory for Item {2}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:171
+#: accounts/doctype/gl_entry/gl_entry.py:161
 msgid "{0} {1}: Cost Center is required for 'Profit and Loss' account {2}."
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:298
+#: accounts/doctype/gl_entry/gl_entry.py:252
 msgid "{0} {1}: Cost Center {2} does not belong to Company {3}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:305
+#: accounts/doctype/gl_entry/gl_entry.py:259
 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:137
+#: accounts/doctype/gl_entry/gl_entry.py:127
 msgid "{0} {1}: Customer is required against Receivable account {2}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:159
+#: accounts/doctype/gl_entry/gl_entry.py:149
 msgid "{0} {1}: Either debit or credit amount is required for {2}"
 msgstr ""
 
-#: accounts/doctype/gl_entry/gl_entry.py:143
+#: accounts/doctype/gl_entry/gl_entry.py:133
 msgid "{0} {1}: Supplier is required against Payable account {2}"
 msgstr ""
 
@@ -81301,7 +82866,7 @@
 msgid "{0}'s {1} cannot be after {2}'s Expected End Date."
 msgstr ""
 
-#: manufacturing/doctype/job_card/job_card.py:1009
+#: manufacturing/doctype/job_card/job_card.py:1024
 msgid "{0}, complete the operation {1} before the operation {2}."
 msgstr ""
 
@@ -81309,7 +82874,7 @@
 msgid "{0}: {1} does not exists"
 msgstr ""
 
-#: accounts/doctype/payment_entry/payment_entry.js:724
+#: accounts/doctype/payment_entry/payment_entry.js:889
 msgid "{0}: {1} must be less than {2}"
 msgstr ""
 
@@ -81317,11 +82882,11 @@
 msgid "{0}{1} Did you rename the item? Please contact Administrator / Tech support"
 msgstr ""
 
-#: controllers/stock_controller.py:1160
+#: controllers/stock_controller.py:1346
 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:1148
+#: accounts/report/accounts_receivable/accounts_receivable.py:1156
 msgid "{range4}-Above"
 msgstr ""
 
@@ -81329,11 +82894,11 @@
 msgid "{}"
 msgstr ""
 
-#: controllers/buying_controller.py:712
+#: controllers/buying_controller.py:737
 msgid "{} Assets created for {}"
 msgstr ""
 
-#: accounts/doctype/sales_invoice/sales_invoice.py:1775
+#: accounts/doctype/sales_invoice/sales_invoice.py:1744
 msgid "{} can't be cancelled since the Loyalty Points earned has been redeemed. First cancel the {} No {}"
 msgstr ""
 
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
index 08026d0..9b8eab2 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
@@ -187,7 +187,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "hidden": 1,
    "label": "Address",
    "read_only": 1
@@ -238,7 +238,7 @@
    "link_fieldname": "maintenance_schedule"
   }
  ],
- "modified": "2023-06-03 16:15:43.958072",
+ "modified": "2024-03-27 13:10:03.659952",
  "modified_by": "Administrator",
  "module": "Maintenance",
  "name": "Maintenance Schedule",
@@ -261,7 +261,7 @@
   }
  ],
  "search_fields": "status,customer,customer_name",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "customer"
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index 75d890c..1bc0f19 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -26,7 +26,7 @@
 			MaintenanceScheduleItem,
 		)
 
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		company: DF.Link
 		contact_display: DF.SmallText | None
@@ -163,7 +163,7 @@
 		date_diff = (getdate(end_date) - getdate(start_date)).days
 		add_by = date_diff / no_of_visit
 
-		for visit in range(cint(no_of_visit)):
+		for _visit in range(cint(no_of_visit)):
 			if getdate(start_date_copy) < getdate(end_date):
 				start_date_copy = add_days(start_date_copy, add_by)
 				if len(schedule_list) < no_of_visit:
@@ -190,9 +190,8 @@
 		)
 
 		if not validated and holidays:
-
 			# max iterations = len(holidays)
-			for i in range(len(holidays)):
+			for _i in range(len(holidays)):
 				if schedule_date in holidays:
 					schedule_date = add_days(schedule_date, -1)
 				else:
@@ -251,7 +250,7 @@
 		doc_before_save = self.get_doc_before_save()
 		if not doc_before_save:
 			return
-		for prev_item, item in zip(doc_before_save.items, self.items):
+		for prev_item, item in zip(doc_before_save.items, self.items, strict=False):
 			fields = [
 				"item_code",
 				"start_date",
@@ -334,9 +333,7 @@
 					)
 				)
 
-			if sr_details.amc_expiry_date and getdate(sr_details.amc_expiry_date) >= getdate(
-				amc_start_date
-			):
+			if sr_details.amc_expiry_date and getdate(sr_details.amc_expiry_date) >= getdate(amc_start_date):
 				throw(
 					_("Serial No {0} is under maintenance contract upto {1}").format(
 						serial_no, sr_details.amc_expiry_date
diff --git a/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
index afe273f..c625bc3 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule_detail/maintenance_schedule_detail.json
@@ -126,14 +126,15 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-09-16 21:25:22.506485",
+ "modified": "2024-03-27 13:10:03.867515",
  "modified_by": "Administrator",
  "module": "Maintenance",
  "name": "Maintenance Schedule Detail",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
index d8e02cf..6a5da5e 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule_item/maintenance_schedule_item.json
@@ -164,14 +164,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-03-22 18:44:36.816037",
+ "modified": "2024-03-27 13:10:03.992727",
  "modified_by": "Administrator",
  "module": "Maintenance",
  "name": "Maintenance Schedule Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
index b0d5cb8..1bdf79a 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
@@ -83,7 +83,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "hidden": 1,
    "label": "Address",
    "read_only": 1
@@ -295,7 +295,7 @@
  "idx": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-03 16:19:07.902723",
+ "modified": "2024-03-27 13:10:04.257508",
  "modified_by": "Administrator",
  "module": "Maintenance",
  "name": "Maintenance Visit",
@@ -319,7 +319,7 @@
  ],
  "search_fields": "status,maintenance_type,customer,customer_name,mntc_date,company",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "customer",
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
index d2511b8..990cda6 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.py
@@ -22,7 +22,7 @@
 			MaintenanceVisitPurpose,
 		)
 
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		company: DF.Link
 		completion_status: DF.Literal["", "Partially Completed", "Fully Completed"]
@@ -69,13 +69,17 @@
 						self.mntc_date
 					) > get_datetime(end_date):
 						frappe.throw(
-							_("Date must be between {0} and {1}").format(format_date(start_date), format_date(end_date))
+							_("Date must be between {0} and {1}").format(
+								format_date(start_date), format_date(end_date)
+							)
 						)
 			else:
 				for purpose in self.purposes:
 					if purpose.maintenance_schedule_detail:
 						item_ref = frappe.db.get_value(
-							"Maintenance Schedule Detail", purpose.maintenance_schedule_detail, "item_reference"
+							"Maintenance Schedule Detail",
+							purpose.maintenance_schedule_detail,
+							"item_reference",
 						)
 						if item_ref:
 							start_date, end_date = frappe.db.get_value(
diff --git a/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
index a5a63c4..70f69be 100644
--- a/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
+++ b/erpnext/maintenance/doctype/maintenance_visit_purpose/maintenance_visit_purpose.json
@@ -117,14 +117,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-01-05 21:46:53.239830",
+ "modified": "2024-03-27 13:10:04.435746",
  "modified_by": "Administrator",
  "module": "Maintenance",
  "name": "Maintenance Visit Purpose",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
index a63fc4d..b43c969 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
+++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.json
@@ -134,7 +134,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2021-06-29 00:30:30.621636",
+ "modified": "2024-03-27 13:06:39.907810",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Blanket Order",
@@ -157,7 +157,8 @@
  ],
  "quick_entry": 1,
  "search_fields": "blanket_order_type, to_date",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py b/erpnext/manufacturing/doctype/blanket_order/blanket_order.py
index e44d484..feb1147 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.py
+++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.py
@@ -186,7 +186,7 @@
 						allowed_qty = remaining_qty + (remaining_qty * (allowance / 100))
 						if allowed_qty < item_data[item.item_code]:
 							frappe.throw(
-								_("Item {0} cannot be ordered more than {1} against Blanket Order {2}.").format(
-									item.item_code, allowed_qty, bo_name
-								)
+								_(
+									"Item {0} cannot be ordered more than {1} against Blanket Order {2}."
+								).format(item.item_code, allowed_qty, bo_name)
 							)
diff --git a/erpnext/manufacturing/doctype/blanket_order/test_blanket_order.py b/erpnext/manufacturing/doctype/blanket_order/test_blanket_order.py
index 3f3b6f0..a6eb18f 100644
--- a/erpnext/manufacturing/doctype/blanket_order/test_blanket_order.py
+++ b/erpnext/manufacturing/doctype/blanket_order/test_blanket_order.py
@@ -98,9 +98,7 @@
 		customer = "_Test Customer"
 		supplier = "_Test Supplier"
 
-		if not frappe.db.exists(
-			"Item Customer Detail", {"customer_name": customer, "parent": item_code}
-		):
+		if not frappe.db.exists("Item Customer Detail", {"customer_name": customer, "parent": item_code}):
 			item_doc.append("customer_items", {"customer_name": customer, "ref_code": "CUST-REF-1"})
 			item_doc.save()
 
diff --git a/erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json b/erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
index aa7831f..919ec13 100644
--- a/erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
+++ b/erpnext/manufacturing/doctype/blanket_order_item/blanket_order_item.json
@@ -74,14 +74,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-02-14 18:25:26.479672",
+ "modified": "2024-03-27 13:06:40.083042",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Blanket Order Item",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index 5083873..11ce46f 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -637,7 +637,7 @@
  "image_field": "image",
  "is_submittable": 1,
  "links": [],
- "modified": "2023-12-26 19:34:08.159312",
+ "modified": "2024-03-27 13:06:40.214929",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM",
@@ -672,7 +672,7 @@
  ],
  "search_fields": "item, item_name",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index 27c8493..cb56172 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -5,7 +5,6 @@
 import re
 from collections import deque
 from operator import itemgetter
-from typing import Dict, List
 
 import frappe
 from frappe import _
@@ -33,11 +32,9 @@
 	# ref: https://docs.python.org/3/reference/datamodel.html#slots
 	__slots__ = ["name", "child_items", "is_bom", "item_code", "qty", "exploded_qty", "bom_qty"]
 
-	def __init__(
-		self, name: str, is_bom: bool = True, exploded_qty: float = 1.0, qty: float = 1
-	) -> None:
+	def __init__(self, name: str, is_bom: bool = True, exploded_qty: float = 1.0, qty: float = 1) -> None:
 		self.name = name  # name of node, BOM number if is_bom else item_code
-		self.child_items: List["BOMTree"] = []  # list of child items
+		self.child_items: list["BOMTree"] = []  # list of child items
 		self.is_bom = is_bom  # true if the node is a BOM and not a leaf item
 		self.item_code: str = None  # item_code associated with node
 		self.qty = qty  # required unit quantity to make one unit of parent item.
@@ -63,7 +60,7 @@
 					BOMTree(item.item_code, is_bom=False, exploded_qty=exploded_qty, qty=qty)
 				)
 
-	def level_order_traversal(self) -> List["BOMTree"]:
+	def level_order_traversal(self) -> list["BOMTree"]:
 		"""Get level order traversal of tree.
 		E.g. for following tree the traversal will return list of nodes in order from top to bottom.
 		BOM:
@@ -219,7 +216,7 @@
 		self.name = name
 
 	@staticmethod
-	def get_next_version_index(existing_boms: List[str]) -> int:
+	def get_next_version_index(existing_boms: list[str]) -> int:
 		# split by "/" and "-"
 		delimiters = ["/", "-"]
 		pattern = "|".join(map(re.escape, delimiters))
@@ -426,10 +423,7 @@
 		return ret_item
 
 	def validate_bom_currency(self, item):
-		if (
-			item.get("bom_no")
-			and frappe.db.get_value("BOM", item.get("bom_no"), "currency") != self.currency
-		):
+		if item.get("bom_no") and frappe.db.get_value("BOM", item.get("bom_no"), "currency") != self.currency:
 			frappe.throw(
 				_("Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}").format(
 					item.idx, item.bom_no, self.currency
@@ -446,9 +440,9 @@
 			rate = get_valuation_rate(arg)
 		elif arg:
 			# Customer Provided parts and Supplier sourced parts will have zero rate
-			if not frappe.db.get_value(
-				"Item", arg["item_code"], "is_customer_provided_item"
-			) and not arg.get("sourced_by_supplier"):
+			if not frappe.db.get_value("Item", arg["item_code"], "is_customer_provided_item") and not arg.get(
+				"sourced_by_supplier"
+			):
 				if arg.get("bom_no") and self.set_rate_of_sub_assembly_item_based_on_bom:
 					rate = flt(self.get_bom_unitcost(arg["bom_no"])) * (arg.get("conversion_factor") or 1)
 				else:
@@ -464,7 +458,8 @@
 							)
 						else:
 							frappe.msgprint(
-								_("{0} not found for item {1}").format(self.rm_cost_as_per, arg["item_code"]), alert=True
+								_("{0} not found for item {1}").format(self.rm_cost_as_per, arg["item_code"]),
+								alert=True,
 							)
 		return flt(rate) * flt(self.plc_conversion_rate or 1) / (self.conversion_rate or 1)
 
@@ -813,7 +808,7 @@
 				# Only db_update if changed
 				row.db_update()
 
-	def get_rm_rate_map(self) -> Dict[str, float]:
+	def get_rm_rate_map(self) -> dict[str, float]:
 		"Create Raw Material-Rate map for Exploded Items. Fetch rate from Items table or Subassembly BOM."
 		rm_rate_map = {}
 
@@ -1189,9 +1184,7 @@
 
 @frappe.whitelist()
 def get_bom_items(bom, company, qty=1, fetch_exploded=1):
-	items = get_bom_items_as_dict(
-		bom, company, qty, fetch_exploded, include_non_stock_items=True
-	).values()
+	items = get_bom_items_as_dict(bom, company, qty, fetch_exploded, include_non_stock_items=True).values()
 	items = list(items)
 	items.sort(key=functools.cmp_to_key(lambda a, b: a.item_code > b.item_code and 1 or -1))
 	return items
@@ -1323,9 +1316,7 @@
 		)
 
 	if work_order and work_order.additional_operating_cost and work_order.qty:
-		additional_operating_cost_per_unit = flt(work_order.additional_operating_cost) / flt(
-			work_order.qty
-		)
+		additional_operating_cost_per_unit = flt(work_order.additional_operating_cost) / flt(work_order.qty)
 
 		if additional_operating_cost_per_unit:
 			stock_entry.append(
@@ -1402,9 +1393,7 @@
 	order_by = "idx desc, name, item_name"
 
 	fields = ["name", "item_name", "item_group", "description"]
-	fields.extend(
-		[field for field in searchfields if field not in ["name", "item_group", "description"]]
-	)
+	fields.extend([field for field in searchfields if field not in ["name", "item_group", "description"]])
 
 	searchfields = searchfields + [
 		field
@@ -1422,12 +1411,12 @@
 	or_cond_filters = {}
 	if txt:
 		for s_field in searchfields:
-			or_cond_filters[s_field] = ("like", "%{0}%".format(txt))
+			or_cond_filters[s_field] = ("like", f"%{txt}%")
 
 		barcodes = frappe.get_all(
 			"Item Barcode",
 			fields=["distinct parent as item_code"],
-			filters={"barcode": ("like", "%{0}%".format(txt))},
+			filters={"barcode": ("like", f"%{txt}%")},
 		)
 
 		barcodes = [d.item_code for d in barcodes]
@@ -1528,9 +1517,7 @@
 			continue
 
 		qty = flt(row.qty) * flt(qty)
-		items = get_bom_items_as_dict(
-			row.bom_no, company, qty=qty, fetch_exploded=0, fetch_scrap_items=1
-		)
+		items = get_bom_items_as_dict(row.bom_no, company, qty=qty, fetch_exploded=0, fetch_scrap_items=1)
 		scrap_items.update(items)
 
 		get_scrap_items_from_sub_assemblies(row.bom_no, company, qty, scrap_items)
diff --git a/erpnext/manufacturing/doctype/bom/test_bom.py b/erpnext/manufacturing/doctype/bom/test_bom.py
index 2debf91..d02b51c 100644
--- a/erpnext/manufacturing/doctype/bom/test_bom.py
+++ b/erpnext/manufacturing/doctype/bom/test_bom.py
@@ -10,7 +10,6 @@
 from frappe.utils import cstr, flt
 
 from erpnext.controllers.tests.test_subcontracting_controller import (
-	make_stock_in_entry,
 	set_backflush_based_on,
 )
 from erpnext.manufacturing.doctype.bom.bom import BOMRecursionError, item_query, make_variant_bom
@@ -200,9 +199,7 @@
 
 		reset_item_valuation_rate(
 			item_code="_Test Item",
-			warehouse_list=frappe.get_all(
-				"Warehouse", {"is_group": 0, "company": bom.company}, pluck="name"
-			),
+			warehouse_list=frappe.get_all("Warehouse", {"is_group": 0, "company": bom.company}, pluck="name"),
 			qty=200,
 			rate=200,
 		)
@@ -344,7 +341,7 @@
 
 		self.assertEqual(len(reqd_order), len(created_order))
 
-		for reqd_item, created_item in zip(reqd_order, created_order):
+		for reqd_item, created_item in zip(reqd_order, created_order, strict=False):
 			self.assertEqual(reqd_item, created_item.item_code)
 
 	@timeout
@@ -383,7 +380,7 @@
 
 		self.assertEqual(len(reqd_order), len(created_order))
 
-		for reqd_item, created_item in zip(reqd_order, created_order):
+		for reqd_item, created_item in zip(reqd_order, created_order, strict=False):
 			self.assertEqual(reqd_item.item_code, created_item.item_code)
 			self.assertEqual(reqd_item.qty, created_item.qty)
 			self.assertEqual(reqd_item.exploded_qty, created_item.exploded_qty)
@@ -452,9 +449,7 @@
 		test_items = query(txt="_Test")
 		filtered = query(txt="_Test Item 2")
 
-		self.assertNotEqual(
-			len(test_items), len(filtered), msg="Item filtering showing excessive results"
-		)
+		self.assertNotEqual(len(test_items), len(filtered), msg="Item filtering showing excessive results")
 		self.assertTrue(0 < len(filtered) <= 3, msg="Item filtering showing excessive results")
 
 	@timeout
@@ -516,7 +511,6 @@
 
 	@timeout
 	def test_version_index(self):
-
 		bom = frappe.new_doc("BOM")
 
 		version_index_test_cases = [
@@ -571,7 +565,6 @@
 
 	@timeout
 	def test_clear_inpection_quality(self):
-
 		bom = frappe.copy_doc(test_records[2], ignore_no_copy=True)
 		bom.docstatus = 0
 		bom.is_default = 0
@@ -686,9 +679,7 @@
 
 		bom = make_bom(item=fg_item, raw_materials=[rm_item])
 
-		create_stock_reconciliation(
-			item_code=rm_item, warehouse="_Test Warehouse - _TC", qty=100, rate=600
-		)
+		create_stock_reconciliation(item_code=rm_item, warehouse="_Test Warehouse - _TC", qty=100, rate=600)
 
 		bom.load_from_db()
 		bom.update_cost()
@@ -699,8 +690,6 @@
 		self.assertFalse(bom.flags.cost_updated)
 
 	def test_bom_with_service_item_cost(self):
-		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
-
 		rm_item = make_item(properties={"is_stock_item": 1, "valuation_rate": 1000.0}).name
 
 		service_item = make_item(properties={"is_stock_item": 0}).name
@@ -793,7 +782,9 @@
 		for item_code, subtree in bom_tree.items():
 			bom_item_code = prefix + item_code
 			if not frappe.db.exists("Item", bom_item_code):
-				frappe.get_doc(doctype="Item", item_code=bom_item_code, item_group="_Test Item Group").insert()
+				frappe.get_doc(
+					doctype="Item", item_code=bom_item_code, item_group="_Test Item Group"
+				).insert()
 			create_items(subtree)
 
 	create_items(tree)
diff --git a/erpnext/manufacturing/doctype/bom_creator/bom_creator.json b/erpnext/manufacturing/doctype/bom_creator/bom_creator.json
index fb4c6c5..de4d254 100644
--- a/erpnext/manufacturing/doctype/bom_creator/bom_creator.json
+++ b/erpnext/manufacturing/doctype/bom_creator/bom_creator.json
@@ -288,7 +288,7 @@
    "link_fieldname": "bom_creator"
   }
  ],
- "modified": "2023-08-07 15:45:06.176313",
+ "modified": "2024-03-27 13:06:40.535884",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM Creator",
@@ -323,7 +323,7 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/bom_creator/bom_creator.py b/erpnext/manufacturing/doctype/bom_creator/bom_creator.py
index 1709a1f..dcfc798 100644
--- a/erpnext/manufacturing/doctype/bom_creator/bom_creator.py
+++ b/erpnext/manufacturing/doctype/bom_creator/bom_creator.py
@@ -101,9 +101,7 @@
 				has_completed = False
 				break
 
-		if not frappe.get_cached_value(
-			"BOM", {"bom_creator": self.name, "item": self.item_code}, "name"
-		):
+		if not frappe.get_cached_value("BOM", {"bom_creator": self.name, "item": self.item_code}, "name"):
 			has_completed = False
 
 		if has_completed:
@@ -237,7 +235,8 @@
 			if row.is_expandable:
 				if (row.item_code, row.name) not in production_item_wise_rm:
 					production_item_wise_rm.setdefault(
-						(row.item_code, row.name), frappe._dict({"items": [], "bom_no": "", "fg_item_data": row})
+						(row.item_code, row.name),
+						frappe._dict({"items": [], "bom_no": "", "fg_item_data": row}),
 					)
 
 			production_item_wise_rm[(row.fg_item, row.fg_reference_id)]["items"].append(row)
@@ -404,7 +403,6 @@
 				"conversion_factor": 1,
 				"fg_reference_id": name,
 				"stock_qty": bom_item.qty,
-				"fg_reference_id": name,
 				"do_not_explode": 1,
 				"is_expandable": 1,
 				"stock_uom": item_info.stock_uom,
diff --git a/erpnext/manufacturing/doctype/bom_creator/test_bom_creator.py b/erpnext/manufacturing/doctype/bom_creator/test_bom_creator.py
index ee5886c..a835de7 100644
--- a/erpnext/manufacturing/doctype/bom_creator/test_bom_creator.py
+++ b/erpnext/manufacturing/doctype/bom_creator/test_bom_creator.py
@@ -9,8 +9,6 @@
 from erpnext.manufacturing.doctype.bom_creator.bom_creator import (
 	add_item,
 	add_sub_assembly,
-	delete_node,
-	edit_qty,
 )
 from erpnext.stock.doctype.item.test_item import make_item
 
diff --git a/erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json b/erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
index 56acd8a..e9545ac 100644
--- a/erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
+++ b/erpnext/manufacturing/doctype/bom_creator_item/bom_creator_item.json
@@ -230,13 +230,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-11-16 13:34:06.321061",
+ "modified": "2024-03-27 13:06:40.764747",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM Creator Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
index 27ecd57..60a24c4 100644
--- a/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
+++ b/erpnext/manufacturing/doctype/bom_explosion_item/bom_explosion_item.json
@@ -171,14 +171,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-01-02 13:49:36.211586",
+ "modified": "2024-03-27 13:06:40.935882",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM Explosion Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/bom_item/bom_item.json b/erpnext/manufacturing/doctype/bom_item/bom_item.json
index dfd6612..226cfe0 100644
--- a/erpnext/manufacturing/doctype/bom_item/bom_item.json
+++ b/erpnext/manufacturing/doctype/bom_item/bom_item.json
@@ -299,13 +299,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-12-20 16:21:55.477883",
+ "modified": "2024-03-27 13:06:41.079752",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
index 5a734d8..aa62b02 100644
--- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -194,13 +194,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-11-04 17:17:16.986941",
+ "modified": "2024-03-27 13:06:41.248462",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM Operation",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json b/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
index b2ef19b..3d04a2b 100644
--- a/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
+++ b/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
@@ -92,14 +92,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-01-03 14:19:28.460965",
+ "modified": "2024-03-27 13:06:41.395036",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM Scrap Item",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/bom_update_batch/bom_update_batch.json b/erpnext/manufacturing/doctype/bom_update_batch/bom_update_batch.json
index b867d2a..266c22b 100644
--- a/erpnext/manufacturing/doctype/bom_update_batch/bom_update_batch.json
+++ b/erpnext/manufacturing/doctype/bom_update_batch/bom_update_batch.json
@@ -42,13 +42,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-06-06 14:50:35.161062",
+ "modified": "2024-03-27 13:06:41.529935",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM Update Batch",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
-}
+}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
index a926e69..0892b3c 100644
--- a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
+++ b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.json
@@ -98,7 +98,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-06-20 15:43:55.696388",
+ "modified": "2024-03-27 13:06:41.658172",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "BOM Update Log",
@@ -131,7 +131,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py
index 198b9b8..758dc07 100644
--- a/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py
+++ b/erpnext/manufacturing/doctype/bom_update_log/bom_update_log.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 import json
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any
 
 import frappe
 from frappe import _
@@ -51,9 +51,7 @@
 		table = DocType("BOM Update Log")
 		frappe.db.delete(
 			table,
-			filters=(
-				(table.modified < (Now() - Interval(days=days))) & (table.update_type == "Update Cost")
-			),
+			filters=((table.creation < (Now() - Interval(days=days))) & (table.update_type == "Update Cost")),
 		)
 
 	def validate(self):
@@ -123,7 +121,7 @@
 
 def run_replace_bom_job(
 	doc: "BOMUpdateLog",
-	boms: Optional[Dict[str, str]] = None,
+	boms: dict[str, str] | None = None,
 ) -> None:
 	try:
 		doc.db_set("status", "In Progress")
@@ -146,8 +144,8 @@
 
 
 def process_boms_cost_level_wise(
-	update_doc: "BOMUpdateLog", parent_boms: List[str] = None
-) -> Union[None, Tuple]:
+	update_doc: "BOMUpdateLog", parent_boms: list[str] | None = None
+) -> None | tuple:
 	"Queue jobs at the start of new BOM Level in 'Update Cost' Jobs."
 
 	current_boms = {}
@@ -180,9 +178,7 @@
 		handle_exception(update_doc)
 
 
-def queue_bom_cost_jobs(
-	current_boms_list: List[str], update_doc: "BOMUpdateLog", current_level: int
-) -> None:
+def queue_bom_cost_jobs(current_boms_list: list[str], update_doc: "BOMUpdateLog", current_level: int) -> None:
 	"Queue batches of 20k BOMs of the same level to process parallelly"
 	batch_no = 0
 
@@ -266,8 +262,8 @@
 
 
 def get_processed_current_boms(
-	log: Dict[str, Any], bom_batches: Dict[str, Any]
-) -> Tuple[List[str], Dict[str, Any]]:
+	log: dict[str, Any], bom_batches: dict[str, Any]
+) -> tuple[list[str], dict[str, Any]]:
 	"""
 	Aggregate all BOMs from BOM Update Batch rows into 'processed_boms' field
 	and into current boms list.
diff --git a/erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py b/erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py
index f013b88..fed7a00 100644
--- a/erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py
+++ b/erpnext/manufacturing/doctype/bom_update_log/bom_updation_utils.py
@@ -4,7 +4,7 @@
 import copy
 import json
 from collections import defaultdict
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any
 
 if TYPE_CHECKING:
 	from erpnext.manufacturing.doctype.bom_update_log.bom_update_log import BOMUpdateLog
@@ -13,7 +13,7 @@
 from frappe import _
 
 
-def replace_bom(boms: Dict, log_name: str) -> None:
+def replace_bom(boms: dict, log_name: str) -> None:
 	"Replace current BOM with new BOM in parent BOMs."
 
 	current_bom = boms.get("current_bom")
@@ -43,9 +43,7 @@
 		bom_obj.save_version()
 
 
-def update_cost_in_level(
-	doc: "BOMUpdateLog", bom_list: List[str], batch_name: Union[int, str]
-) -> None:
+def update_cost_in_level(doc: "BOMUpdateLog", bom_list: list[str], batch_name: int | str) -> None:
 	"Updates Cost for BOMs within a given level. Runs via background jobs."
 
 	try:
@@ -69,7 +67,7 @@
 			frappe.db.commit()  # nosemgrep
 
 
-def get_ancestor_boms(new_bom: str, bom_list: Optional[List] = None) -> List:
+def get_ancestor_boms(new_bom: str, bom_list: list | None = None) -> list:
 	"Recursively get all ancestors of BOM."
 
 	bom_list = bom_list or []
@@ -101,9 +99,7 @@
 		.set(bom_item.bom_no, new_bom)
 		.set(bom_item.rate, unit_cost)
 		.set(bom_item.amount, (bom_item.stock_qty * unit_cost))
-		.where(
-			(bom_item.bom_no == current_bom) & (bom_item.docstatus < 2) & (bom_item.parenttype == "BOM")
-		)
+		.where((bom_item.bom_no == current_bom) & (bom_item.docstatus < 2) & (bom_item.parenttype == "BOM"))
 	).run()
 
 
@@ -116,7 +112,7 @@
 	return frappe.utils.flt(new_bom_unitcost[0][0])
 
 
-def update_cost_in_boms(bom_list: List[str]) -> None:
+def update_cost_in_boms(bom_list: list[str]) -> None:
 	"Updates cost in given BOMs. Returns current and total updated BOMs."
 
 	for index, bom in enumerate(bom_list):
@@ -128,9 +124,7 @@
 			frappe.db.commit()  # nosemgrep
 
 
-def get_next_higher_level_boms(
-	child_boms: List[str], processed_boms: Dict[str, bool]
-) -> List[str]:
+def get_next_higher_level_boms(child_boms: list[str], processed_boms: dict[str, bool]) -> list[str]:
 	"Generate immediate higher level dependants with no unresolved dependencies (children)."
 
 	def _all_children_are_processed(parent_bom):
@@ -156,7 +150,7 @@
 	return list(resolved_dependants)
 
 
-def get_leaf_boms() -> List[str]:
+def get_leaf_boms() -> list[str]:
 	"Get BOMs that have no dependencies."
 
 	bom = frappe.qb.DocType("BOM")
@@ -209,7 +203,7 @@
 	return child_parent_map, parent_child_map
 
 
-def set_values_in_log(log_name: str, values: Dict[str, Any], commit: bool = False) -> None:
+def set_values_in_log(log_name: str, values: dict[str, Any], commit: bool = False) -> None:
 	"Update BOM Update Log record."
 
 	if not values:
diff --git a/erpnext/manufacturing/doctype/bom_update_log/test_bom_update_log.py b/erpnext/manufacturing/doctype/bom_update_log/test_bom_update_log.py
index 30e6f5e..13bf69f 100644
--- a/erpnext/manufacturing/doctype/bom_update_log/test_bom_update_log.py
+++ b/erpnext/manufacturing/doctype/bom_update_log/test_bom_update_log.py
@@ -81,9 +81,7 @@
 		for item_code in items:
 			remove_bom(item_code)
 
-		bom_tree = {
-			"B-Item A": {"B-Item B": {"B-Item C": {}}, "B-Item D": {"B-Item E": {"B-Item F": {}}}}
-		}
+		bom_tree = {"B-Item A": {"B-Item B": {"B-Item C": {}}, "B-Item D": {"B-Item E": {"B-Item F": {}}}}}
 
 		root_bom = create_nested_bom(bom_tree, prefix="")
 
diff --git a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
index b348bb7..1cbd072 100644
--- a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
+++ b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.json
@@ -1,244 +1,81 @@
 {
- "allow_copy": 1, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2012-12-06 12:10:10", 
- "custom": 0, 
- "description": "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM.\nIt also updates latest price in all the BOMs.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Other", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_copy": 1,
+ "creation": "2012-12-06 12:10:10",
+ "description": "Replace a particular BOM in all other BOMs where it is used. It will replace the old BOM link, update cost and regenerate \"BOM Explosion Item\" table as per new BOM.\nIt also updates latest price in all the BOMs.",
+ "doctype": "DocType",
+ "document_type": "Other",
+ "engine": "InnoDB",
+ "field_order": [
+  "replace_bom_section",
+  "current_bom",
+  "new_bom",
+  "replace",
+  "update_cost_section",
+  "update_latest_price_in_all_boms"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "replace_bom_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Replace BOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "replace_bom_section",
+   "fieldtype": "Section Break",
+   "label": "Replace BOM"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "The BOM which will be replaced", 
-   "fieldname": "current_bom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Current BOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "BOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "description": "The BOM which will be replaced",
+   "fieldname": "current_bom",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Current BOM",
+   "options": "BOM",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "The new BOM after replacement", 
-   "fieldname": "new_bom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "New BOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "BOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "description": "The new BOM after replacement",
+   "fieldname": "new_bom",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "New BOM",
+   "options": "BOM",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "replace", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Replace", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "replace",
+   "fieldtype": "Button",
+   "label": "Replace"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "update_cost_section", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Update Cost", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "update_cost_section",
+   "fieldtype": "Section Break",
+   "label": "Update Cost"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "update_latest_price_in_all_boms", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Update latest price in all BOMs", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "update_latest_price_in_all_boms",
+   "fieldtype": "Button",
+   "label": "Update latest price in all BOMs"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 1, 
- "hide_toolbar": 1, 
- "icon": "icon-magic", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 1, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-07-02 16:17:09.014102", 
- "modified_by": "Administrator", 
- "module": "Manufacturing", 
- "name": "BOM Update Tool", 
- "owner": "Administrator", 
+ ],
+ "hide_toolbar": 1,
+ "icon": "icon-magic",
+ "idx": 1,
+ "in_create": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:41.828828",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "BOM Update Tool",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Manufacturing Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "read": 1,
+   "role": "Manufacturing Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 1, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "track_changes": 0, 
- "track_seen": 0
+ ],
+ "read_only": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
index 9552116..2e8dba1 100644
--- a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
+++ b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
@@ -2,7 +2,7 @@
 # For license information, please see license.txt
 
 import json
-from typing import TYPE_CHECKING, Dict, Literal, Optional, Union
+from typing import TYPE_CHECKING, Literal
 
 if TYPE_CHECKING:
 	from erpnext.manufacturing.doctype.bom_update_log.bom_update_log import BOMUpdateLog
@@ -28,9 +28,7 @@
 
 
 @frappe.whitelist()
-def enqueue_replace_bom(
-	boms: Optional[Union[Dict, str]] = None, args: Optional[Union[Dict, str]] = None
-) -> "BOMUpdateLog":
+def enqueue_replace_bom(boms: dict | str | None = None, args: dict | str | None = None) -> "BOMUpdateLog":
 	"""Returns a BOM Update Log (that queues a job) for BOM Replacement."""
 	boms = boms or args
 	if isinstance(boms, str):
@@ -60,7 +58,7 @@
 
 
 def create_bom_update_log(
-	boms: Optional[Dict[str, str]] = None,
+	boms: dict[str, str] | None = None,
 	update_type: Literal["Replace BOM", "Update Cost"] = "Replace BOM",
 ) -> "BOMUpdateLog":
 	"""Creates a BOM Update Log that handles the background job."""
diff --git a/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json b/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
index b6e20af..860e12a 100644
--- a/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
+++ b/erpnext/manufacturing/doctype/bom_website_item/bom_website_item.json
@@ -1,176 +1,61 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-02-10 05:36:19.757356", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2017-02-10 05:36:19.757356",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "item_code",
+  "item_name",
+  "description",
+  "qty",
+  "website_image"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "item_code",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Code",
+   "options": "Item",
+   "search_index": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 3, 
-   "fieldname": "item_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Item Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Workstation", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 3,
+   "fieldname": "item_name",
+   "fieldtype": "Data",
+   "label": "Item Name",
+   "options": "Workstation"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Item Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "description",
+   "fieldtype": "Text Editor",
+   "label": "Item Description"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 2, 
-   "fieldname": "qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "columns": 2,
+   "fieldname": "qty",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Qty"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "website_image", 
-   "fieldtype": "Attach", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Image", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "website_image",
+   "fieldtype": "Attach",
+   "label": "Image"
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-02-12 12:48:56.949861", 
- "modified_by": "Administrator", 
- "module": "Manufacturing", 
- "name": "BOM Website Item", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:41.946700",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "BOM Website Item",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json b/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
index 3fad2ef..a1e5f80 100644
--- a/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
+++ b/erpnext/manufacturing/doctype/bom_website_operation/bom_website_operation.json
@@ -1,176 +1,60 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-02-10 05:27:16.031403", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2017-02-10 05:27:16.031403",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "operation",
+  "workstation",
+  "time_in_mins",
+  "website_image",
+  "thumbnail"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "operation", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Operation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Operation", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "operation",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Operation",
+   "options": "Operation",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "workstation", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Workstation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Workstation", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "workstation",
+   "fieldtype": "Link",
+   "label": "Workstation",
+   "options": "Workstation"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "time_in_mins", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Operation Time", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "time_in_mins",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Operation Time",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "website_image", 
-   "fieldtype": "Attach", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Image", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "website_image",
+   "fieldtype": "Attach",
+   "label": "Image"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "thumbnail", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Thumbnail", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "thumbnail",
+   "fieldtype": "Data",
+   "label": "Thumbnail"
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-02-12 16:32:44.316447", 
- "modified_by": "Administrator", 
- "module": "Manufacturing", 
- "name": "BOM Website Operation", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:42.076959",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "BOM Website Operation",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.json b/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.json
index b301a9e..e5a50ad 100644
--- a/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.json
+++ b/erpnext/manufacturing/doctype/downtime_entry/downtime_entry.json
@@ -90,7 +90,7 @@
   }
  ],
  "links": [],
- "modified": "2020-05-26 22:14:54.479831",
+ "modified": "2024-03-27 13:08:18.393488",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Downtime Entry",
@@ -134,8 +134,9 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "workstation",
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json
index 0f01704..531c71f 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.json
+++ b/erpnext/manufacturing/doctype/job_card/job_card.json
@@ -511,7 +511,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-28 19:23:14.345214",
+ "modified": "2024-03-27 13:09:56.634418",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Job Card",
@@ -564,7 +564,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "operation",
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index e889c5d..11894a0 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -128,9 +128,7 @@
 	# end: auto-generated types
 
 	def onload(self):
-		excess_transfer = frappe.db.get_single_value(
-			"Manufacturing Settings", "job_card_excess_transfer"
-		)
+		excess_transfer = frappe.db.get_single_value("Manufacturing Settings", "job_card_excess_transfer")
 		self.set_onload("job_card_excess_transfer", excess_transfer)
 		self.set_onload("work_order_closed", self.is_work_order_closed())
 		self.set_onload("has_stock_entry", self.has_stock_entry())
@@ -159,9 +157,7 @@
 
 		wo_qty = flt(frappe.get_cached_value("Work Order", self.work_order, "qty"))
 
-		completed_qty = flt(
-			frappe.db.get_value("Work Order Operation", self.operation_id, "completed_qty")
-		)
+		completed_qty = flt(frappe.db.get_value("Work Order Operation", self.operation_id, "completed_qty"))
 
 		over_production_percentage = flt(
 			frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order")
@@ -454,7 +450,9 @@
 
 				# If remaining time fit in workstation time logs else split hours as per workstation time
 				if time_in_mins > row.remaining_time_in_mins:
-					row.planned_end_time = add_to_date(row.planned_start_time, minutes=row.remaining_time_in_mins)
+					row.planned_end_time = add_to_date(
+						row.planned_start_time, minutes=row.remaining_time_in_mins
+					)
 					row.remaining_time_in_mins = 0
 				else:
 					row.planned_end_time = add_to_date(row.planned_start_time, minutes=time_in_mins)
@@ -490,7 +488,7 @@
 						{
 							"to_time": get_datetime(args.get("complete_time")),
 							"operation": args.get("sub_operation"),
-							"completed_qty": args.get("completed_qty") or 0.0,
+							"completed_qty": (args.get("completed_qty") if last_row.idx == row.idx else 0.0),
 						}
 					)
 		elif args.get("start_time"):
@@ -574,7 +572,9 @@
 					row.completed_time = row.completed_time / len(set(operation_deatils.employee))
 
 					if operation_deatils.completed_qty:
-						row.completed_qty = operation_deatils.completed_qty / len(set(operation_deatils.employee))
+						row.completed_qty = operation_deatils.completed_qty / len(
+							set(operation_deatils.employee)
+						)
 			else:
 				row.status = "Pending"
 				row.completed_time = 0.0
@@ -646,10 +646,7 @@
 			)
 
 	def validate_job_card(self):
-		if (
-			self.work_order
-			and frappe.get_cached_value("Work Order", self.work_order, "status") == "Stopped"
-		):
+		if self.work_order and frappe.get_cached_value("Work Order", self.work_order, "status") == "Stopped":
 			frappe.throw(
 				_("Transaction not allowed against stopped Work Order {0}").format(
 					get_link_to_form("Work Order", self.work_order)
@@ -668,9 +665,7 @@
 			flt(self.total_completed_qty, precision) + flt(self.process_loss_qty, precision)
 		)
 
-		if self.for_quantity and flt(total_completed_qty, precision) != flt(
-			self.for_quantity, precision
-		):
+		if self.for_quantity and flt(total_completed_qty, precision) != flt(self.for_quantity, precision):
 			total_completed_qty_label = bold(_("Total Completed Qty"))
 			qty_to_manufacture = bold(_("Qty to Manufacture"))
 
@@ -730,9 +725,8 @@
 			return
 
 		for_quantity, time_in_mins, process_loss_qty = 0, 0, 0
-		from_time_list, to_time_list = [], []
+		_from_time_list, _to_time_list = [], []
 
-		field = "operation_id"
 		data = self.get_current_operation_data()
 		if data and len(data) > 0:
 			for_quantity = flt(data[0].completed_qty)
@@ -768,9 +762,7 @@
 		if wo.produced_qty > for_quantity + process_loss_qty:
 			first_part_msg = _(
 				"The {0} {1} is used to calculate the valuation cost for the finished good {2}."
-			).format(
-				frappe.bold(_("Job Card")), frappe.bold(self.name), frappe.bold(self.production_item)
-			)
+			).format(frappe.bold(_("Job Card")), frappe.bold(self.name), frappe.bold(self.production_item))
 
 			second_part_msg = _(
 				"Kindly cancel the Manufacturing Entries first against the work order {0}."
@@ -837,9 +829,7 @@
 			from frappe.query_builder.functions import Sum
 
 			job_card_items_transferred_qty = {}
-			job_card_items = [
-				x.get("job_card_item") for x in ste_doc.get("items") if x.get("job_card_item")
-			]
+			job_card_items = [x.get("job_card_item") for x in ste_doc.get("items") if x.get("job_card_item")]
 
 			if job_card_items:
 				se = frappe.qb.DocType("Stock Entry")
@@ -972,9 +962,7 @@
 
 	def set_wip_warehouse(self):
 		if not self.wip_warehouse:
-			self.wip_warehouse = frappe.db.get_single_value(
-				"Manufacturing Settings", "default_wip_warehouse"
-			)
+			self.wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse")
 
 	def validate_operation_id(self):
 		if (
@@ -1014,7 +1002,7 @@
 			order_by="sequence_id, idx",
 		)
 
-		message = "Job Card {0}: As per the sequence of the operations in the work order {1}".format(
+		message = "Job Card {}: As per the sequence of the operations in the work order {}".format(
 			bold(self.name), bold(get_link_to_form("Work Order", self.work_order))
 		)
 
@@ -1085,7 +1073,7 @@
 		return []
 	args = {"parent": filters.get("work_order")}
 	if txt:
-		args["operation"] = ("like", "%{0}%".format(txt))
+		args["operation"] = ("like", f"%{txt}%")
 
 	return frappe.get_all(
 		"Work Order Operation",
@@ -1206,16 +1194,14 @@
 	conditions = get_filters_cond("Job Card", filters, [])
 
 	job_cards = frappe.db.sql(
-		""" SELECT `tabJob Card`.name, `tabJob Card`.work_order,
+		f""" SELECT `tabJob Card`.name, `tabJob Card`.work_order,
 			`tabJob Card`.status, ifnull(`tabJob Card`.remarks, ''),
 			min(`tabJob Card Time Log`.from_time) as from_time,
 			max(`tabJob Card Time Log`.to_time) as to_time
 		FROM `tabJob Card` , `tabJob Card Time Log`
 		WHERE
-			`tabJob Card`.name = `tabJob Card Time Log`.parent {0}
-			group by `tabJob Card`.name""".format(
-			conditions
-		),
+			`tabJob Card`.name = `tabJob Card Time Log`.parent {conditions}
+			group by `tabJob Card`.name""",
 		as_dict=1,
 	)
 
diff --git a/erpnext/manufacturing/doctype/job_card/test_job_card.py b/erpnext/manufacturing/doctype/job_card/test_job_card.py
index bde0548..b0644b4 100644
--- a/erpnext/manufacturing/doctype/job_card/test_job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/test_job_card.py
@@ -59,7 +59,6 @@
 		frappe.db.rollback()
 
 	def test_job_card_operations(self):
-
 		job_cards = frappe.get_all(
 			"Job Card", filters={"work_order": self.work_order.name}, fields=["operation_id", "name"]
 		)
@@ -252,7 +251,6 @@
 
 	@change_settings("Manufacturing Settings", {"job_card_excess_transfer": 0})
 	def test_job_card_excess_material_transfer_block(self):
-
 		self.transfer_material_against = "Job Card"
 		self.source_warehouse = "Stores - _TC"
 
@@ -276,7 +274,6 @@
 
 	@change_settings("Manufacturing Settings", {"job_card_excess_transfer": 0})
 	def test_job_card_excess_material_transfer_with_no_reference(self):
-
 		self.transfer_material_against = "Job Card"
 		self.source_warehouse = "Stores - _TC"
 
diff --git a/erpnext/manufacturing/doctype/job_card_item/job_card_item.json b/erpnext/manufacturing/doctype/job_card_item/job_card_item.json
index d91530d..8a1bd8e 100644
--- a/erpnext/manufacturing/doctype/job_card_item/job_card_item.json
+++ b/erpnext/manufacturing/doctype/job_card_item/job_card_item.json
@@ -105,14 +105,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-04-22 18:50:00.003444",
+ "modified": "2024-03-27 13:09:56.943741",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Job Card Item",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json b/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json
index 9a8692b..8b3e908 100644
--- a/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json
+++ b/erpnext/manufacturing/doctype/job_card_operation/job_card_operation.json
@@ -46,14 +46,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-03-16 18:24:35.399593",
+ "modified": "2024-03-27 13:09:57.090298",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Job Card Operation",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/job_card_scheduled_time/job_card_scheduled_time.json b/erpnext/manufacturing/doctype/job_card_scheduled_time/job_card_scheduled_time.json
index 522cfa3..d5f282a 100644
--- a/erpnext/manufacturing/doctype/job_card_scheduled_time/job_card_scheduled_time.json
+++ b/erpnext/manufacturing/doctype/job_card_scheduled_time/job_card_scheduled_time.json
@@ -33,13 +33,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-06-14 15:27:03.203045",
+ "modified": "2024-03-27 13:09:57.211836",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Job Card Scheduled Time",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json b/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
index 9e9f1c4..a0ba768 100644
--- a/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
+++ b/erpnext/manufacturing/doctype/job_card_scrap_item/job_card_scrap_item.json
@@ -69,14 +69,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-09-14 01:20:48.588052",
+ "modified": "2024-03-27 13:09:57.323835",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Job Card Scrap Item",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json b/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
index a7102d7..80d549e 100644
--- a/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
+++ b/erpnext/manufacturing/doctype/job_card_time_log/job_card_time_log.json
@@ -64,14 +64,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-12-23 14:30:00.970916",
+ "modified": "2024-03-27 13:09:57.448800",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Job Card Time Log",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index 63e3fa3..2949d1c 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -216,7 +216,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-02-08 19:00:37.561244",
+ "modified": "2024-03-27 13:10:04.700433",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Manufacturing Settings",
@@ -230,7 +230,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
index 9a50111..84dbce2 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.py
@@ -42,8 +42,7 @@
 
 def get_mins_between_operations():
 	return relativedelta(
-		minutes=cint(frappe.db.get_single_value("Manufacturing Settings", "mins_between_operations"))
-		or 10
+		minutes=cint(frappe.db.get_single_value("Manufacturing Settings", "mins_between_operations")) or 10
 	)
 
 
diff --git a/erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json b/erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
index 06c1b49..eb0196f 100644
--- a/erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
+++ b/erpnext/manufacturing/doctype/material_request_plan_item/material_request_plan_item.json
@@ -202,14 +202,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-02-11 16:21:11.977018",
+ "modified": "2024-03-27 13:10:05.436575",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Material Request Plan Item",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/operation/operation.json b/erpnext/manufacturing/doctype/operation/operation.json
index 753552c..ba53116 100644
--- a/erpnext/manufacturing/doctype/operation/operation.json
+++ b/erpnext/manufacturing/doctype/operation/operation.json
@@ -104,7 +104,7 @@
  "icon": "fa fa-wrench",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-11-24 19:15:24.357187",
+ "modified": "2024-03-27 13:10:06.841479",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Operation",
@@ -134,7 +134,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/plant_floor/plant_floor.json b/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
index be0052c..af1f8d3 100644
--- a/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
+++ b/erpnext/manufacturing/doctype/plant_floor/plant_floor.json
@@ -71,7 +71,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-30 11:59:07.508535",
+ "modified": "2024-03-27 13:10:13.805390",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Plant Floor",
@@ -91,7 +91,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/plant_floor/plant_floor.py b/erpnext/manufacturing/doctype/plant_floor/plant_floor.py
index d30b7d1..e6fcf1a 100644
--- a/erpnext/manufacturing/doctype/plant_floor/plant_floor.py
+++ b/erpnext/manufacturing/doctype/plant_floor/plant_floor.py
@@ -67,22 +67,15 @@
 
 @frappe.whitelist()
 def get_stock_summary(warehouse, start=0, item_code=None, item_group=None):
-	stock_details = get_stock_details(
-		warehouse, start=start, item_code=item_code, item_group=item_group
-	)
+	stock_details = get_stock_details(warehouse, start=start, item_code=item_code, item_group=item_group)
 
 	max_count = 0.0
 	for d in stock_details:
 		d.actual_or_pending = (
-			d.projected_qty
-			+ d.reserved_qty
-			+ d.reserved_qty_for_production
-			+ d.reserved_qty_for_sub_contract
+			d.projected_qty + d.reserved_qty + d.reserved_qty_for_production + d.reserved_qty_for_sub_contract
 		)
 		d.pending_qty = 0
-		d.total_reserved = (
-			d.reserved_qty + d.reserved_qty_for_production + d.reserved_qty_for_sub_contract
-		)
+		d.total_reserved = d.reserved_qty + d.reserved_qty_for_production + d.reserved_qty_for_sub_contract
 		if d.actual_or_pending > d.actual_qty:
 			d.pending_qty = d.actual_or_pending - d.actual_qty
 
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.json b/erpnext/manufacturing/doctype/production_plan/production_plan.json
index 84bbad5..db0e973 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.json
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.json
@@ -439,7 +439,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-02-27 13:34:20.692211",
+ "modified": "2024-03-27 13:10:19.928403",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Production Plan",
@@ -460,7 +460,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan/production_plan.py b/erpnext/manufacturing/doctype/production_plan/production_plan.py
index c852f84..80b1564 100644
--- a/erpnext/manufacturing/doctype/production_plan/production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/production_plan.py
@@ -387,9 +387,7 @@
 		if not self.get("material_requests") or not self.get_so_mr_list(
 			"material_request", "material_requests"
 		):
-			frappe.throw(
-				_("Please fill the Material Requests table"), title=_("Material Requests Required")
-			)
+			frappe.throw(_("Please fill the Material Requests table"), title=_("Material Requests Required"))
 
 		mr_list = self.get_so_mr_list("material_request", "material_requests")
 
@@ -667,7 +665,10 @@
 				item_dict[(d.item_code, d.material_request_item, d.warehouse)] = item_details
 			else:
 				item_details.update(
-					{"qty": flt(item_dict.get(key, {}).get("qty")) + (flt(d.planned_qty) - flt(d.ordered_qty))}
+					{
+						"qty": flt(item_dict.get(key, {}).get("qty"))
+						+ (flt(d.planned_qty) - flt(d.ordered_qty))
+					}
 				)
 				item_dict[key] = item_details
 
@@ -693,7 +694,7 @@
 	def make_work_order_for_finished_goods(self, wo_list, default_warehouses):
 		items_data = self.get_production_items()
 
-		for key, item in items_data.items():
+		for _key, item in items_data.items():
 			if self.sub_assembly_items:
 				item["use_multi_level_bom"] = 0
 
@@ -880,7 +881,7 @@
 
 		if material_request_list:
 			material_request_list = [
-				"""<a href="/app/Form/Material Request/{0}">{1}</a>""".format(m.name, m.name)
+				f"""<a href="/app/Form/Material Request/{m.name}">{m.name}</a>"""
 				for m in material_request_list
 			]
 			msgprint(_("{0} created").format(comma_and(material_request_list)))
@@ -1006,9 +1007,7 @@
 		return sub_assembly_items_store
 
 	def all_items_completed(self):
-		all_items_produced = all(
-			flt(d.planned_qty) - flt(d.produced_qty) < 0.000001 for d in self.po_items
-		)
+		all_items_produced = all(flt(d.planned_qty) - flt(d.produced_qty) < 0.000001 for d in self.po_items)
 		if not all_items_produced:
 			return False
 
@@ -1051,9 +1050,7 @@
 
 	doc.warehouse = None
 	frappe.flags.show_qty_in_stock_uom = 1
-	items = get_items_for_material_requests(
-		doc, warehouses=warehouses, get_parent_warehouse_data=True
-	)
+	items = get_items_for_material_requests(doc, warehouses=warehouses, get_parent_warehouse_data=True)
 
 	for d in items:
 		item_list.append(
@@ -1097,9 +1094,7 @@
 	build_csv_response(item_list, doc.name)
 
 
-def get_exploded_items(
-	item_details, company, bom_no, include_non_stock_items, planned_qty=1, doc=None
-):
+def get_exploded_items(item_details, company, bom_no, include_non_stock_items, planned_qty=1, doc=None):
 	bei = frappe.qb.DocType("BOM Explosion Item")
 	bom = frappe.qb.DocType("BOM")
 	item = frappe.qb.DocType("Item")
@@ -1252,11 +1247,7 @@
 	elif total_qty > bin_dict.get("projected_qty", 0):
 		required_qty = total_qty - bin_dict.get("projected_qty", 0)
 
-	if (
-		doc.get("consider_minimum_order_qty")
-		and required_qty > 0
-		and required_qty < row["min_order_qty"]
-	):
+	if doc.get("consider_minimum_order_qty") and required_qty > 0 and required_qty < row["min_order_qty"]:
 		required_qty = row["min_order_qty"]
 
 	item_group_defaults = get_item_group_defaults(row.item_code, company)
@@ -1280,9 +1271,7 @@
 	if include_safety_stock:
 		required_qty += flt(row["safety_stock"])
 
-	item_details = frappe.get_cached_value(
-		"Item", row.item_code, ["purchase_uom", "stock_uom"], as_dict=1
-	)
+	item_details = frappe.get_cached_value("Item", row.item_code, ["purchase_uom", "stock_uom"], as_dict=1)
 
 	conversion_factor = 1.0
 	if (
@@ -1335,7 +1324,9 @@
 			& (pi.parent_item == so_item.item_code)
 			& (
 				ExistsCriterion(
-					frappe.qb.from_(bom).select(bom.name).where((bom.item == pi.item_code) & (bom.is_active == 1))
+					frappe.qb.from_(bom)
+					.select(bom.name)
+					.where((bom.item == pi.item_code) & (bom.is_active == 1))
 				)
 			)
 		)
@@ -1378,7 +1369,7 @@
 		)
 
 	open_so_query = open_so_query.where(
-		(ExistsCriterion(open_so_subquery1) | ExistsCriterion(open_so_subquery2))
+		ExistsCriterion(open_so_subquery1) | ExistsCriterion(open_so_subquery2)
 	)
 
 	open_so = open_so_query.run(as_dict=True)
@@ -1500,9 +1491,7 @@
 			data["include_exploded_items"] = 1
 
 		planned_qty = data.get("required_qty") or data.get("planned_qty")
-		ignore_existing_ordered_qty = (
-			data.get("ignore_existing_ordered_qty") or ignore_existing_ordered_qty
-		)
+		ignore_existing_ordered_qty = data.get("ignore_existing_ordered_qty") or ignore_existing_ordered_qty
 		warehouse = doc.get("for_warehouse")
 
 		item_details = {}
@@ -1535,7 +1524,12 @@
 				elif data.get("include_exploded_items") and include_subcontracted_items:
 					# fetch exploded items from BOM
 					item_details = get_exploded_items(
-						item_details, company, bom_no, include_non_stock_items, planned_qty=planned_qty, doc=doc
+						item_details,
+						company,
+						bom_no,
+						include_non_stock_items,
+						planned_qty=planned_qty,
+						doc=doc,
 					)
 				else:
 					item_details = get_subitems(
@@ -1586,7 +1580,7 @@
 				so_item_details[sales_order][item_code] = details
 
 	mr_items = []
-	for sales_order, item_code in so_item_details.items():
+	for sales_order in so_item_details:
 		item_dict = so_item_details[sales_order]
 		for details in item_dict.values():
 			bin_dict = get_bin_details(details, doc.company, warehouse)
@@ -1690,7 +1684,7 @@
 
 	return {
 		"bom_no": item_details.get("bom_no"),
-		"stock_uom": item_details.get("stock_uom")
+		"stock_uom": item_details.get("stock_uom"),
 		# 		"description": item_details.get("description")
 	}
 
@@ -1733,7 +1727,9 @@
 				)
 
 				if d.value:
-					get_sub_assembly_items(d.value, bom_data, stock_qty, company, warehouse, indent=indent + 1)
+					get_sub_assembly_items(
+						d.value, bom_data, stock_qty, company, warehouse, indent=indent + 1
+					)
 
 
 def set_default_warehouses(row, default_warehouses):
@@ -1875,9 +1871,7 @@
 
 
 @frappe.whitelist()
-def sales_order_query(
-	doctype=None, txt=None, searchfield=None, start=None, page_len=None, filters=None
-):
+def sales_order_query(doctype=None, txt=None, searchfield=None, start=None, page_len=None, filters=None):
 	frappe.has_permission("Production Plan", throw=True)
 
 	if not filters:
diff --git a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
index 0bf3705..8957c11 100644
--- a/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
+++ b/erpnext/manufacturing/doctype/production_plan/test_production_plan.py
@@ -110,9 +110,7 @@
 	def test_production_plan_start_date(self):
 		"Test if Work Order has same Planned Start Date as Prod Plan."
 		planned_date = add_to_date(date=None, days=3)
-		plan = create_production_plan(
-			item_code="Test Production Item 1", planned_start_date=planned_date
-		)
+		plan = create_production_plan(item_code="Test Production Item 1", planned_start_date=planned_date)
 		plan.make_work_order()
 
 		work_orders = frappe.get_all(
@@ -213,9 +211,7 @@
 		)
 
 		wo_doc = frappe.get_doc("Work Order", work_order)
-		wo_doc.update(
-			{"wip_warehouse": "Work In Progress - _TC", "fg_warehouse": "Finished Goods - _TC"}
-		)
+		wo_doc.update({"wip_warehouse": "Work In Progress - _TC", "fg_warehouse": "Finished Goods - _TC"})
 		wo_doc.submit()
 
 		so_wo_qty = frappe.db.get_value("Sales Order Item", sales_order_item, "work_order_qty")
@@ -400,7 +396,7 @@
 		from erpnext.manufacturing.doctype.bom.test_bom import create_nested_bom
 
 		bom_tree_1 = {"Test Laptop": {"Test Motherboard": {"Test Motherboard Wires": {}}}}
-		bom = create_nested_bom(bom_tree_1, prefix="")
+		create_nested_bom(bom_tree_1, prefix="")
 
 		item_doc = frappe.get_doc("Item", "Test Motherboard")
 		company = "_Test Company"
@@ -515,14 +511,10 @@
 
 	def test_pp_to_mr_customer_provided(self):
 		"Test Material Request from Production Plan for Customer Provided Item."
-		create_item(
-			"CUST-0987", is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0
-		)
+		create_item("CUST-0987", is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0)
 		create_item("Production Item CUST")
 
-		for item, raw_materials in {
-			"Production Item CUST": ["Raw Material Item 1", "CUST-0987"]
-		}.items():
+		for item, raw_materials in {"Production Item CUST": ["Raw Material Item 1", "CUST-0987"]}.items():
 			if not frappe.db.get_value("BOM", {"item": item}):
 				make_bom(item=item, raw_materials=raw_materials)
 		production_plan = create_production_plan(item_code="Production Item CUST")
@@ -675,7 +667,7 @@
 			items_data[(pln.po_items[0].name, item, None)]["qty"] = qty
 
 			# Create and Submit Work Order for each item in items_data
-			for key, item in items_data.items():
+			for _key, item in items_data.items():
 				if pln.sub_assembly_items:
 					item["use_multi_level_bom"] = 0
 
@@ -844,7 +836,6 @@
 		self.assertEqual(pln.po_items[0].planned_qty, 0.55)
 
 	def test_temporary_name_relinking(self):
-
 		pp = frappe.new_doc("Production Plan")
 
 		# this can not be unittested so mocking data that would be expected
@@ -860,7 +851,7 @@
 			pp.append("sub_assembly_items", {"production_plan_item": po_item.temporary_name})
 		pp._rename_temporary_references()
 
-		for po_item, subassy_item in zip(pp.po_items, pp.sub_assembly_items):
+		for po_item, subassy_item in zip(pp.po_items, pp.sub_assembly_items, strict=False):
 			self.assertEqual(po_item.name, subassy_item.production_plan_item)
 
 		# bad links should be erased
@@ -871,7 +862,7 @@
 
 		# reattempting on same doc shouldn't change anything
 		pp._rename_temporary_references()
-		for po_item, subassy_item in zip(pp.po_items, pp.sub_assembly_items):
+		for po_item, subassy_item in zip(pp.po_items, pp.sub_assembly_items, strict=False):
 			self.assertEqual(po_item.name, subassy_item.production_plan_item)
 
 	def test_produced_qty_for_multi_level_bom_item(self):
@@ -1148,9 +1139,7 @@
 			wo_doc.fg_warehouse = "_Test Warehouse - _TC"
 			wo_doc.submit()
 
-		reserved_qty_after_mr = flt(
-			frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan")
-		)
+		reserved_qty_after_mr = flt(frappe.db.get_value("Bin", bin_name, "reserved_qty_for_production_plan"))
 		self.assertEqual(reserved_qty_after_mr, before_qty)
 
 	def test_from_warehouse_for_purchase_material_request(self):
@@ -1158,7 +1147,7 @@
 		from erpnext.stock.utils import get_or_make_bin
 
 		create_item("RM-TEST-123 For Purchase", valuation_rate=100)
-		bin_name = get_or_make_bin("RM-TEST-123 For Purchase", "_Test Warehouse - _TC")
+		get_or_make_bin("RM-TEST-123 For Purchase", "_Test Warehouse - _TC")
 		t_warehouse = create_warehouse("_Test Store - _TC")
 		make_stock_entry(
 			item_code="Raw Material Item 1",
@@ -1168,9 +1157,7 @@
 		)
 
 		plan = create_production_plan(item_code="Test Production Item 1", do_not_save=1)
-		mr_items = get_items_for_material_requests(
-			plan.as_dict(), warehouses=[{"warehouse": t_warehouse}]
-		)
+		mr_items = get_items_for_material_requests(plan.as_dict(), warehouses=[{"warehouse": t_warehouse}])
 
 		for d in mr_items:
 			plan.append("mr_items", d)
@@ -1468,9 +1455,7 @@
 		)
 
 		pln.for_warehouse = rm_warehouse
-		items = get_items_for_material_requests(
-			pln.as_dict(), warehouses=[{"warehouse": store_warehouse}]
-		)
+		items = get_items_for_material_requests(pln.as_dict(), warehouses=[{"warehouse": store_warehouse}])
 
 		for row in items:
 			self.assertEqual(row.get("quantity"), 10.0)
@@ -1479,9 +1464,7 @@
 			self.assertEqual(row.get("from_warehouse"), store_warehouse)
 			self.assertEqual(row.get("conversion_factor"), 1.0)
 
-		items = get_items_for_material_requests(
-			pln.as_dict(), warehouses=[{"warehouse": pln.for_warehouse}]
-		)
+		items = get_items_for_material_requests(pln.as_dict(), warehouses=[{"warehouse": pln.for_warehouse}])
 
 		for row in items:
 			self.assertEqual(row.get("quantity"), 1.0)
@@ -1496,7 +1479,7 @@
 		fg_item = make_item(properties={"is_stock_item": 1, "stock_uom": "_Test UOM 1"}).name
 		rm_item = make_item(properties={"is_stock_item": 1, "stock_uom": "_Test UOM 1"}).name
 
-		store_warehouse = create_warehouse("Store Warehouse", company="_Test Company")
+		create_warehouse("Store Warehouse", company="_Test Company")
 		rm_warehouse = create_warehouse("RM Warehouse", company="_Test Company")
 
 		make_bom(item=fg_item, raw_materials=[rm_item], source_warehouse="_Test Warehouse - _TC")
@@ -1532,7 +1515,6 @@
 
 	def test_min_order_qty_in_pp(self):
 		from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
-		from erpnext.stock.utils import get_or_make_bin
 
 		fg_item = make_item(properties={"is_stock_item": 1}).name
 		rm_item = make_item(properties={"is_stock_item": 1, "min_order_qty": 1000}).name
@@ -1554,9 +1536,6 @@
 			self.assertEqual(d.get("quantity"), 1000.0)
 
 	def test_fg_item_quantity(self):
-		from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
-		from erpnext.stock.utils import get_or_make_bin
-
 		fg_item = make_item(properties={"is_stock_item": 1}).name
 		rm_item = make_item(properties={"is_stock_item": 1}).name
 
diff --git a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
index 78a3897..ec65408 100644
--- a/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
+++ b/erpnext/manufacturing/doctype/production_plan_item/production_plan_item.json
@@ -220,14 +220,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-27 13:24:43.571844",
+ "modified": "2024-03-27 13:10:20.252166",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Production Plan Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json b/erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
index 15ef207..c5330d7 100644
--- a/erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
+++ b/erpnext/manufacturing/doctype/production_plan_item_reference/production_plan_item_reference.json
@@ -40,13 +40,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-03-31 10:30:14.604051",
+ "modified": "2024-03-27 13:10:20.410593",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Production Plan Item Reference",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json
index b5eb73e..141516a 100644
--- a/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json
+++ b/erpnext/manufacturing/doctype/production_plan_material_request/production_plan_material_request.json
@@ -1,140 +1,53 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "beta": 0, 
- "creation": "2016-02-10 05:09:11.983251", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
+ "actions": [],
+ "autoname": "hash",
+ "creation": "2016-02-10 05:09:11.983251",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "material_request",
+  "col_break1",
+  "material_request_date"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "material_request", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Material Request", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "prevdoc_docname", 
-   "oldfieldtype": "Data", 
-   "options": "Material Request", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "150px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "fieldname": "material_request",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Material Request",
+   "oldfieldname": "prevdoc_docname",
+   "oldfieldtype": "Data",
+   "options": "Material Request",
+   "print_width": "150px",
+   "reqd": 1,
    "width": "150px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "col_break1",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "material_request_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Material Request Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "document_date", 
-   "oldfieldtype": "Date", 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "120px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "fieldname": "material_request_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Material Request Date",
+   "oldfieldname": "document_date",
+   "oldfieldtype": "Date",
+   "print_width": "120px",
+   "read_only": 1,
    "width": "120px"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-10-29 12:31:57.986869", 
- "modified_by": "Administrator", 
- "module": "Manufacturing", 
- "name": "Production Plan Material Request", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "ASC", 
- "track_changes": 0, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:20.526011",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Production Plan Material Request",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan_material_request_warehouse/production_plan_material_request_warehouse.json b/erpnext/manufacturing/doctype/production_plan_material_request_warehouse/production_plan_material_request_warehouse.json
index e72f489..e4ecf54 100644
--- a/erpnext/manufacturing/doctype/production_plan_material_request_warehouse/production_plan_material_request_warehouse.json
+++ b/erpnext/manufacturing/doctype/production_plan_material_request_warehouse/production_plan_material_request_warehouse.json
@@ -19,14 +19,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-10-26 12:55:00.778201",
+ "modified": "2024-03-27 13:10:20.638727",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Production Plan Material Request Warehouse",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
index 40f3662..9b573bd 100644
--- a/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
+++ b/erpnext/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.json
@@ -1,200 +1,75 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "beta": 0, 
- "creation": "2013-02-22 01:27:49", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 1, 
+ "actions": [],
+ "autoname": "hash",
+ "creation": "2013-02-22 01:27:49",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "sales_order",
+  "sales_order_date",
+  "col_break1",
+  "customer",
+  "grand_total"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sales_order", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Sales Order", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "prevdoc_docname", 
-   "oldfieldtype": "Data", 
-   "options": "Sales Order", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "150px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "fieldname": "sales_order",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Sales Order",
+   "oldfieldname": "prevdoc_docname",
+   "oldfieldtype": "Data",
+   "options": "Sales Order",
+   "print_width": "150px",
+   "reqd": 1,
    "width": "150px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sales_order_date", 
-   "fieldtype": "Date", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Sales Order Date", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "document_date", 
-   "oldfieldtype": "Date", 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "120px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "fieldname": "sales_order_date",
+   "fieldtype": "Date",
+   "in_list_view": 1,
+   "label": "Sales Order Date",
+   "oldfieldname": "document_date",
+   "oldfieldtype": "Date",
+   "print_width": "120px",
+   "read_only": 1,
    "width": "120px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "col_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "col_break1",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "150px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Customer",
+   "options": "Customer",
+   "print_width": "150px",
+   "read_only": 1,
    "width": "150px"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "fieldname": "grand_total", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Grand Total", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "120px", 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "fieldname": "grand_total",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Grand Total",
+   "print_width": "120px",
+   "read_only": 1,
    "width": "120px"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2017-10-29 12:29:36.726079", 
- "modified_by": "Administrator", 
- "module": "Manufacturing", 
- "name": "Production Plan Sales Order", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_order": "ASC", 
- "track_changes": 0, 
- "track_seen": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:20.746852",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Production Plan Sales Order",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
index 7965965..3c99bb7 100644
--- a/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
+++ b/erpnext/manufacturing/doctype/production_plan_sub_assembly_item/production_plan_sub_assembly_item.json
@@ -209,14 +209,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-27 13:45:17.422435",
+ "modified": "2024-03-27 13:10:20.876695",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Production Plan Sub Assembly Item",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/routing/routing.json b/erpnext/manufacturing/doctype/routing/routing.json
index e864c0c..e117dbc 100644
--- a/erpnext/manufacturing/doctype/routing/routing.json
+++ b/erpnext/manufacturing/doctype/routing/routing.json
@@ -1,180 +1,71 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:routing_name", 
- "beta": 0, 
- "creation": "2018-07-15 11:03:24.191613", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "autoname": "field:routing_name",
+ "creation": "2018-07-15 11:03:24.191613",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "routing_name",
+  "disabled",
+  "operations"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "routing_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Routing Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "fieldname": "routing_name",
+   "fieldtype": "Data",
+   "label": "Routing Name",
    "unique": 1
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:!doc.__islocal", 
-   "fieldname": "disabled", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Disabled", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "depends_on": "eval:!doc.__islocal",
+   "fieldname": "disabled",
+   "fieldtype": "Check",
+   "label": "Disabled"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "operations", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "BOM Operation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "BOM Operation", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "operations",
+   "fieldtype": "Table",
+   "label": "BOM Operation",
+   "options": "BOM Operation"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-07-15 11:42:41.424793", 
- "modified_by": "Administrator", 
- "module": "Manufacturing", 
- "name": "Routing", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:10:33.725991",
+ "modified_by": "Administrator",
+ "module": "Manufacturing",
+ "name": "Routing",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Manufacturing Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Manufacturing Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Manufacturing User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Manufacturing User",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/routing/routing.py b/erpnext/manufacturing/doctype/routing/routing.py
index 4bef380..70a2a19 100644
--- a/erpnext/manufacturing/doctype/routing/routing.py
+++ b/erpnext/manufacturing/doctype/routing/routing.py
@@ -47,9 +47,9 @@
 				row.sequence_id = sequence_id + 1
 			elif sequence_id and row.sequence_id and cint(sequence_id) > cint(row.sequence_id):
 				frappe.throw(
-					_("At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}").format(
-						row.idx, row.sequence_id, sequence_id
-					)
+					_(
+						"At row #{0}: the sequence id {1} cannot be less than previous row sequence id {2}"
+					).format(row.idx, row.sequence_id, sequence_id)
 				)
 
 			sequence_id = row.sequence_id
diff --git a/erpnext/manufacturing/doctype/sub_operation/sub_operation.json b/erpnext/manufacturing/doctype/sub_operation/sub_operation.json
index 10cee32..8cd8048 100644
--- a/erpnext/manufacturing/doctype/sub_operation/sub_operation.json
+++ b/erpnext/manufacturing/doctype/sub_operation/sub_operation.json
@@ -39,14 +39,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-07-15 16:39:41.635362",
+ "modified": "2024-03-27 13:10:45.777866",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Sub Operation",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py
index b56e9e1..e451898 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-import copy
 
 import frappe
 from frappe.tests.utils import FrappeTestCase, change_settings, timeout
@@ -45,7 +44,6 @@
 		frappe.db.rollback()
 
 	def check_planned_qty(self):
-
 		planned0 = (
 			frappe.db.get_value(
 				"Bin", {"item_code": "_Test FG Item", "warehouse": "_Test Warehouse 1 - _TC"}, "planned_qty"
@@ -134,9 +132,7 @@
 		# reserved qty for production is updated
 		self.assertEqual(cint(bin1_at_start.reserved_qty_for_production) + 2, reserved_qty_on_submission)
 
-		test_stock_entry.make_stock_entry(
-			item_code="_Test Item", target=warehouse, qty=100, basic_rate=100
-		)
+		test_stock_entry.make_stock_entry(item_code="_Test Item", target=warehouse, qty=100, basic_rate=100)
 		test_stock_entry.make_stock_entry(
 			item_code="_Test Item Home Desktop 100", target=warehouse, qty=100, basic_rate=100
 		)
@@ -146,9 +142,7 @@
 
 		bin1_at_completion = get_bin(item, warehouse)
 
-		self.assertEqual(
-			cint(bin1_at_completion.reserved_qty_for_production), reserved_qty_on_submission - 1
-		)
+		self.assertEqual(cint(bin1_at_completion.reserved_qty_for_production), reserved_qty_on_submission - 1)
 
 	def test_production_item(self):
 		wo_order = make_wo_order_test_record(item="_Test FG Item", qty=1, do_not_save=True)
@@ -183,9 +177,7 @@
 			cint(self.bin1_at_start.reserved_qty_for_production) + 2,
 			cint(self.bin1_on_submit.reserved_qty_for_production),
 		)
-		self.assertEqual(
-			cint(self.bin1_at_start.projected_qty), cint(self.bin1_on_submit.projected_qty) + 2
-		)
+		self.assertEqual(cint(self.bin1_at_start.projected_qty), cint(self.bin1_on_submit.projected_qty) + 2)
 
 	def test_reserved_qty_for_production_cancel(self):
 		self.test_reserved_qty_for_production_submit()
@@ -239,7 +231,6 @@
 		)
 
 	def test_reserved_qty_for_production_closed(self):
-
 		wo1 = make_wo_order_test_record(item="_Test FG Item", qty=2, source_warehouse=self.warehouse)
 		item = wo1.required_items[0].item_code
 		bin_before = get_bin(item, self.warehouse)
@@ -371,7 +362,9 @@
 		for item in s.items:
 			if item.bom_no and item.item_code in scrap_item_details:
 				self.assertEqual(wo_order_details.scrap_warehouse, item.t_warehouse)
-				self.assertEqual(flt(wo_order_details.qty) * flt(scrap_item_details[item.item_code]), item.qty)
+				self.assertEqual(
+					flt(wo_order_details.qty) * flt(scrap_item_details[item.item_code]), item.qty
+				)
 
 	def test_allow_overproduction(self):
 		allow_overproduction("overproduction_percentage_for_work_order", 0)
@@ -485,7 +478,7 @@
 		)
 		self.assertEqual(len(job_cards), len(bom.operations))
 
-		for i, job_card in enumerate(job_cards):
+		for _i, job_card in enumerate(job_cards):
 			doc = frappe.get_doc("Job Card", job_card)
 			for row in doc.scheduled_time_logs:
 				doc.append(
@@ -585,9 +578,7 @@
 		for item in ["Test Batch Size Item For BOM", "Test Batch Size Item RM 1 For BOM"]:
 			make_item(item, {"include_item_in_manufacturing": 1, "is_stock_item": 1})
 
-		bom_name = frappe.db.get_value(
-			"BOM", {"item": fg_item, "is_active": 1, "with_operations": 1}, "name"
-		)
+		bom_name = frappe.db.get_value("BOM", {"item": fg_item, "is_active": 1, "with_operations": 1}, "name")
 
 		if not bom_name:
 			bom = make_bom(item=fg_item, rate=1000, raw_materials=[rm1], do_not_save=True)
@@ -639,9 +630,7 @@
 
 			make_item(item, item_args)
 
-		bom_name = frappe.db.get_value(
-			"BOM", {"item": fg_item, "is_active": 1, "with_operations": 1}, "name"
-		)
+		bom_name = frappe.db.get_value("BOM", {"item": fg_item, "is_active": 1, "with_operations": 1}, "name")
 
 		if not bom_name:
 			bom = make_bom(item=fg_item, rate=1000, raw_materials=[rm1], do_not_save=True)
@@ -867,7 +856,6 @@
 		)
 
 		qty = 10
-		scrap_qty = 0.25  # bom item qty = 1, consider as 25% of FG
 		source_warehouse = "Stores - _TC"
 		wip_warehouse = "_Test Warehouse - _TC"
 		fg_item_non_whole, _, bom_item = create_process_loss_bom_items()
@@ -1755,9 +1743,7 @@
 
 		self.assertRaises(frappe.ValidationError, job_card2.save)
 
-		frappe.db.set_single_value(
-			"Manufacturing Settings", "overproduction_percentage_for_work_order", 100
-		)
+		frappe.db.set_single_value("Manufacturing Settings", "overproduction_percentage_for_work_order", 100)
 
 		job_card2 = frappe.copy_doc(job_card_doc)
 		job_card2.time_logs = []
@@ -1766,9 +1752,7 @@
 	def test_op_cost_and_scrap_based_on_sub_assemblies(self):
 		# Make Sub Assembly BOM 1
 
-		frappe.db.set_single_value(
-			"Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies", 1
-		)
+		frappe.db.set_single_value("Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies", 1)
 
 		items = {
 			"Test Final FG Item": 0,
@@ -1784,7 +1768,7 @@
 			if not frappe.db.exists("Item", item):
 				item_properties = {"is_stock_item": 1, "valuation_rate": items[item]}
 
-				make_item(item_code=item, properties=item_properties),
+				(make_item(item_code=item, properties=item_properties),)
 
 		prepare_boms_for_sub_assembly_test()
 
@@ -1805,15 +1789,11 @@
 			if item.is_scrap_item:
 				scrap_items.append(item.item_code)
 
-		self.assertEqual(
-			sorted(scrap_items), sorted(["Test Final Scrap Item 1", "Test Final Scrap Item 2"])
-		)
+		self.assertEqual(sorted(scrap_items), sorted(["Test Final Scrap Item 1", "Test Final Scrap Item 2"]))
 		for row in se_doc.additional_costs:
 			self.assertEqual(row.amount, 3000)
 
-		frappe.db.set_single_value(
-			"Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies", 0
-		)
+		frappe.db.set_single_value("Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies", 0)
 
 	@change_settings(
 		"Manufacturing Settings", {"material_consumption": 1, "get_rm_cost_from_consumption_entry": 1}
@@ -1979,9 +1959,7 @@
 
 		wo_order = make_wo_order_test_record(item=fg_item, qty=10)
 
-		stock_entry = frappe.get_doc(
-			make_stock_entry(wo_order.name, "Material Transfer for Manufacture", 10)
-		)
+		stock_entry = frappe.get_doc(make_stock_entry(wo_order.name, "Material Transfer for Manufacture", 10))
 		stock_entry.submit()
 		stock_entry.reload()
 
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.json b/erpnext/manufacturing/doctype/work_order/work_order.json
index 63c74b6..36b992d 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.json
+++ b/erpnext/manufacturing/doctype/work_order/work_order.json
@@ -593,7 +593,7 @@
  "image_field": "image",
  "is_submittable": 1,
  "links": [],
- "modified": "2024-02-11 15:47:13.454422",
+ "modified": "2024-03-27 13:11:00.129434",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Work Order",
@@ -623,7 +623,7 @@
    "role": "Stock User"
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "title_field": "production_item",
diff --git a/erpnext/manufacturing/doctype/work_order/work_order.py b/erpnext/manufacturing/doctype/work_order/work_order.py
index f897a91..0813961 100644
--- a/erpnext/manufacturing/doctype/work_order/work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/work_order.py
@@ -224,9 +224,7 @@
 
 	def set_default_warehouse(self):
 		if not self.wip_warehouse and not self.skip_transfer:
-			self.wip_warehouse = frappe.db.get_single_value(
-				"Manufacturing Settings", "default_wip_warehouse"
-			)
+			self.wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse")
 		if not self.fg_warehouse:
 			self.fg_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_fg_warehouse")
 
@@ -286,9 +284,7 @@
 		so_qty = flt(so_item_qty) + flt(dnpi_qty)
 
 		allowance_percentage = flt(
-			frappe.db.get_single_value(
-				"Manufacturing Settings", "overproduction_percentage_for_sales_order"
-			)
+			frappe.db.get_single_value("Manufacturing Settings", "overproduction_percentage_for_sales_order")
 		)
 
 		if total_qty > so_qty + (allowance_percentage / 100 * so_qty):
@@ -424,9 +420,7 @@
 			produced_qty = total_qty[0][0] if total_qty else 0
 
 		self.update_status()
-		production_plan.run_method(
-			"update_produced_pending_qty", produced_qty, self.production_plan_item
-		)
+		production_plan.run_method("update_produced_pending_qty", produced_qty, self.production_plan_item)
 
 	def before_submit(self):
 		self.create_serial_no_batch_no()
@@ -650,9 +644,7 @@
 				get_datetime(self.operations[idx - 1].planned_end_time) + get_mins_between_operations()
 			)
 
-		row.planned_end_time = get_datetime(row.planned_start_time) + relativedelta(
-			minutes=row.time_in_mins
-		)
+		row.planned_end_time = get_datetime(row.planned_start_time) + relativedelta(minutes=row.time_in_mins)
 
 		if row.planned_start_time == row.planned_end_time:
 			frappe.throw(_("Capacity Planning Error, planned start time can not be same as end time"))
@@ -719,11 +711,7 @@
 		)
 
 	def update_ordered_qty(self):
-		if (
-			self.production_plan
-			and self.production_plan_item
-			and not self.production_plan_sub_assembly_item
-		):
+		if self.production_plan and self.production_plan_item and not self.production_plan_sub_assembly_item:
 			table = frappe.qb.DocType("Work Order")
 
 			query = (
@@ -763,11 +751,9 @@
 		cond = "product_bundle_item = %s" if self.product_bundle_item else "production_item = %s"
 
 		qty = frappe.db.sql(
-			""" select sum(qty) from
-			`tabWork Order` where sales_order = %s and docstatus = 1 and {0}
-			""".format(
-				cond
-			),
+			f""" select sum(qty) from
+			`tabWork Order` where sales_order = %s and docstatus = 1 and {cond}
+			""",
 			(self.sales_order, (self.product_bundle_item or self.production_item)),
 			as_list=1,
 		)
@@ -917,9 +903,7 @@
 
 	def set_actual_dates(self):
 		if self.get("operations"):
-			actual_start_dates = [
-				d.actual_start_time for d in self.get("operations") if d.actual_start_time
-			]
+			actual_start_dates = [d.actual_start_time for d in self.get("operations") if d.actual_start_time]
 			if actual_start_dates:
 				self.actual_start_date = min(actual_start_dates)
 
@@ -964,11 +948,7 @@
 		if self.qty <= 0:
 			frappe.throw(_("Quantity to Manufacture must be greater than 0."))
 
-		if (
-			self.production_plan
-			and self.production_plan_item
-			and not self.production_plan_sub_assembly_item
-		):
+		if self.production_plan and self.production_plan_item and not self.production_plan_sub_assembly_item:
 			qty_dict = frappe.db.get_value(
 				"Production Plan Item", self.production_plan_item, ["planned_qty", "ordered_qty"], as_dict=1
 			)
@@ -1104,7 +1084,7 @@
 		query = (
 			frappe.qb.from_(ste)
 			.inner_join(ste_child)
-			.on((ste_child.parent == ste.name))
+			.on(ste_child.parent == ste.name)
 			.select(
 				ste_child.item_code,
 				ste_child.original_item,
@@ -1134,7 +1114,7 @@
 		query = (
 			frappe.qb.from_(ste)
 			.inner_join(ste_child)
-			.on((ste_child.parent == ste.name))
+			.on(ste_child.parent == ste.name)
 			.select(
 				ste_child.item_code,
 				ste_child.original_item,
@@ -1384,9 +1364,7 @@
 	)
 
 	if work_order.bom_no:
-		stock_entry.inspection_required = frappe.db.get_value(
-			"BOM", work_order.bom_no, "inspection_required"
-		)
+		stock_entry.inspection_required = frappe.db.get_value("BOM", work_order.bom_no, "inspection_required")
 
 	if purpose == "Material Transfer for Manufacture":
 		stock_entry.to_warehouse = wip_warehouse
@@ -1492,9 +1470,7 @@
 
 
 def split_qty_based_on_batch_size(wo_doc, row, qty):
-	if not cint(
-		frappe.db.get_value("Operation", row.operation, "create_job_card_based_on_batch_size")
-	):
+	if not cint(frappe.db.get_value("Operation", row.operation, "create_job_card_based_on_batch_size")):
 		row.batch_size = row.get("qty") or wo_doc.qty
 
 	row.job_card_qty = row.batch_size
@@ -1589,9 +1565,7 @@
 			doc.schedule_time_logs(row)
 
 		doc.insert()
-		frappe.msgprint(
-			_("Job card {0} created").format(get_link_to_form("Job Card", doc.name)), alert=True
-		)
+		frappe.msgprint(_("Job card {0} created").format(get_link_to_form("Job Card", doc.name)), alert=True)
 
 	if enable_capacity_planning:
 		# automatically added scheduling rows shouldn't change status to WIP
@@ -1654,7 +1628,7 @@
 def get_reserved_qty_for_production(
 	item_code: str,
 	warehouse: str,
-	non_completed_production_plans: list = None,
+	non_completed_production_plans: list | None = None,
 	check_production_plan: bool = False,
 ) -> float:
 	"""Get total reserved quantity for any item in specified warehouse"""
diff --git a/erpnext/manufacturing/doctype/work_order_item/work_order_item.json b/erpnext/manufacturing/doctype/work_order_item/work_order_item.json
index 0f4d693..0d3500a 100644
--- a/erpnext/manufacturing/doctype/work_order_item/work_order_item.json
+++ b/erpnext/manufacturing/doctype/work_order_item/work_order_item.json
@@ -142,14 +142,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-02-11 15:45:32.318374",
+ "modified": "2024-03-27 13:11:00.429838",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Work Order Item",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
index de1f67f..83c27e8 100644
--- a/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
+++ b/erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json
@@ -222,13 +222,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-06-09 14:03:01.612909",
+ "modified": "2024-03-27 13:11:00.595376",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Work Order Operation",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json
index 5912714..97d7216 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.json
+++ b/erpnext/manufacturing/doctype/workstation/workstation.json
@@ -252,7 +252,7 @@
  "idx": 1,
  "image_field": "on_status_image",
  "links": [],
- "modified": "2023-11-30 12:43:35.808845",
+ "modified": "2024-03-27 13:11:00.760717",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Workstation",
@@ -273,7 +273,7 @@
  ],
  "quick_entry": 1,
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py
index 3d40a2d..47cb742 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/workstation.py
@@ -134,7 +134,8 @@
 
 			if existing:
 				frappe.throw(
-					_("Row #{0}: Timings conflicts with row {1}").format(d.idx, comma_and(existing)), OverlapError
+					_("Row #{0}: Timings conflicts with row {1}").format(d.idx, comma_and(existing)),
+					OverlapError,
 				)
 
 	def update_bom_operation(self):
@@ -352,7 +353,9 @@
 
 		if applicable_holidays:
 			frappe.throw(
-				_("Workstation is closed on the following dates as per Holiday List: {0}").format(holiday_list)
+				_("Workstation is closed on the following dates as per Holiday List: {0}").format(
+					holiday_list
+				)
 				+ "\n"
 				+ "\n".join(applicable_holidays),
 				WorkstationHolidayError,
diff --git a/erpnext/manufacturing/doctype/workstation_type/workstation_type.json b/erpnext/manufacturing/doctype/workstation_type/workstation_type.json
index 7d9e36a..5d5776a 100644
--- a/erpnext/manufacturing/doctype/workstation_type/workstation_type.json
+++ b/erpnext/manufacturing/doctype/workstation_type/workstation_type.json
@@ -105,7 +105,7 @@
  ],
  "icon": "icon-wrench",
  "links": [],
- "modified": "2022-11-16 23:11:36.224249",
+ "modified": "2024-03-27 13:11:00.946367",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Workstation Type",
@@ -126,7 +126,7 @@
  ],
  "quick_entry": 1,
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
index b185f7d..80441a0 100644
--- a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
+++ b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
@@ -46,13 +46,13 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-10-25 14:48:29.697498",
+ "modified": "2024-03-27 13:11:01.081988",
  "modified_by": "Administrator",
  "module": "Manufacturing",
  "name": "Workstation Working Hour",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py b/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py
index 550445c..6bc05a4 100644
--- a/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py
+++ b/erpnext/manufacturing/report/bom_stock_calculated/bom_stock_calculated.py
@@ -33,9 +33,7 @@
 		row.item_code,
 		row.description,
 		comma_and(manufacture_details.get(row.item_code, {}).get("manufacturer", []), add_quotes=False),
-		comma_and(
-			manufacture_details.get(row.item_code, {}).get("manufacturer_part", []), add_quotes=False
-		),
+		comma_and(manufacture_details.get(row.item_code, {}).get("manufacturer_part", []), add_quotes=False),
 		qty_per_unit,
 		row.actual_qty,
 		required_qty,
diff --git a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
index 3573a3a..48ffbac 100644
--- a/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
+++ b/erpnext/manufacturing/report/bom_stock_report/bom_stock_report.py
@@ -44,9 +44,7 @@
 	else:
 		bom_item_table = "BOM Item"
 
-	warehouse_details = frappe.db.get_value(
-		"Warehouse", filters.get("warehouse"), ["lft", "rgt"], as_dict=1
-	)
+	warehouse_details = frappe.db.get_value("Warehouse", filters.get("warehouse"), ["lft", "rgt"], as_dict=1)
 
 	BOM = frappe.qb.DocType("BOM")
 	BOM_ITEM = frappe.qb.DocType(bom_item_table)
diff --git a/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
index 481fe51..a86df31 100644
--- a/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
+++ b/erpnext/manufacturing/report/cost_of_poor_quality_report/cost_of_poor_quality_report.py
@@ -20,9 +20,7 @@
 
 		job_card = frappe.qb.DocType("Job Card")
 
-		operating_cost = ((job_card.hour_rate) * (job_card.total_time_in_mins) / 60.0).as_(
-			"operating_cost"
-		)
+		operating_cost = ((job_card.hour_rate) * (job_card.total_time_in_mins) / 60.0).as_("operating_cost")
 		item_code = (job_card.production_item).as_("item_code")
 
 		query = (
@@ -64,7 +62,7 @@
 	):
 		if report_filters.get(field):
 			if field == "serial_no":
-				query = query.where(job_card[field].like("%{}%".format(report_filters.get(field))))
+				query = query.where(job_card[field].like(f"%{report_filters.get(field)}%"))
 			elif field == "operation":
 				query = query.where(job_card[field].isin(operations))
 			else:
diff --git a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
index daef7f6..85648d6 100644
--- a/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
+++ b/erpnext/manufacturing/report/exponential_smoothing_forecasting/exponential_smoothing_forecasting.py
@@ -15,9 +15,9 @@
 	return ForecastingReport(filters).execute_report()
 
 
-class ExponentialSmoothingForecast(object):
+class ExponentialSmoothingForecast:
 	def forecast_future_data(self):
-		for key, value in self.period_wise_data.items():
+		for _key, value in self.period_wise_data.items():
 			forecast_data = []
 			for period in self.period_list:
 				forecast_key = "forecast_" + period.key
@@ -87,7 +87,7 @@
 						entry.get(self.based_on_field)
 					)
 
-		for key, value in self.period_wise_data.items():
+		for value in self.period_wise_data.values():
 			list_of_period_value = [value.get(p.key, 0) for p in self.period_list]
 
 			if list_of_period_value:
@@ -185,7 +185,6 @@
 				"Half-Yearly",
 				"Quarterly",
 			] or period.from_date >= getdate(self.filters.from_date):
-
 				forecast_key = period.key
 				label = _(period.label)
 				if period.from_date >= getdate(self.filters.from_date):
diff --git a/erpnext/manufacturing/report/process_loss_report/process_loss_report.py b/erpnext/manufacturing/report/process_loss_report/process_loss_report.py
index c3dd9cf..51efc6e 100644
--- a/erpnext/manufacturing/report/process_loss_report/process_loss_report.py
+++ b/erpnext/manufacturing/report/process_loss_report/process_loss_report.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-from typing import Dict, List, Tuple
 
 import frappe
 from frappe import _
@@ -9,12 +8,12 @@
 
 Filters = frappe._dict
 Row = frappe._dict
-Data = List[Row]
-Columns = List[Dict[str, str]]
-QueryArgs = Dict[str, str]
+Data = list[Row]
+Columns = list[dict[str, str]]
+QueryArgs = dict[str, str]
 
 
-def execute(filters: Filters) -> Tuple[Columns, Data]:
+def execute(filters: Filters) -> tuple[Columns, Data]:
 	filters = frappe._dict(filters or {})
 	columns = get_columns()
 	data = get_data(filters)
diff --git a/erpnext/manufacturing/report/production_analytics/production_analytics.py b/erpnext/manufacturing/report/production_analytics/production_analytics.py
index 12b5d19..c02c1e6 100644
--- a/erpnext/manufacturing/report/production_analytics/production_analytics.py
+++ b/erpnext/manufacturing/report/production_analytics/production_analytics.py
@@ -20,13 +20,10 @@
 
 	ranges = get_period_date_ranges(filters)
 
-	for dummy, end_date in ranges:
-
+	for _dummy, end_date in ranges:
 		period = get_period(end_date, filters)
 
-		columns.append(
-			{"label": _(period), "fieldname": scrub(period), "fieldtype": "Float", "width": 120}
-		)
+		columns.append({"label": _(period), "fieldname": scrub(period), "fieldtype": "Float", "width": 120})
 
 	return columns
 
@@ -110,7 +107,7 @@
 	for label in labels:
 		work = {}
 		work["Status"] = label
-		for dummy, end_date in ranges:
+		for _dummy, end_date in ranges:
 			period = get_period(end_date, filters)
 			if periodic_data.get(label).get(period):
 				work[scrub(period)] = periodic_data.get(label).get(period)
diff --git a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
index 076690f..5bc9236 100644
--- a/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
+++ b/erpnext/manufacturing/report/production_plan_summary/production_plan_summary.py
@@ -56,14 +56,10 @@
 			}
 		)
 
-		get_production_plan_sub_assembly_item_details(
-			filters, row, production_plan_doc, data, order_details
-		)
+		get_production_plan_sub_assembly_item_details(filters, row, production_plan_doc, data, order_details)
 
 
-def get_production_plan_sub_assembly_item_details(
-	filters, row, production_plan_doc, data, order_details
-):
+def get_production_plan_sub_assembly_item_details(filters, row, production_plan_doc, data, order_details):
 	for item in production_plan_doc.sub_assembly_items:
 		if row.name == item.production_plan_item:
 			subcontracted_item = item.type_of_manufacturing == "Subcontract"
@@ -76,7 +72,9 @@
 				)
 			else:
 				docname = frappe.get_value(
-					"Work Order", {"production_plan_sub_assembly_item": item.name, "docstatus": ("<", 2)}, "name"
+					"Work Order",
+					{"production_plan_sub_assembly_item": item.name, "docstatus": ("<", 2)},
+					"name",
 				)
 
 			data.append(
@@ -88,7 +86,9 @@
 					"document_type": "Work Order" if not subcontracted_item else "Purchase Order",
 					"document_name": docname or "",
 					"bom_level": item.bom_level,
-					"produced_qty": order_details.get((docname, item.production_item), {}).get("produced_qty", 0),
+					"produced_qty": order_details.get((docname, item.production_item), {}).get(
+						"produced_qty", 0
+					),
 					"pending_qty": flt(item.qty)
 					- flt(order_details.get((docname, item.production_item), {}).get("produced_qty", 0)),
 				}
diff --git a/erpnext/manufacturing/report/production_planning_report/production_planning_report.py b/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
index 109d9ab..63af3e5 100644
--- a/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
+++ b/erpnext/manufacturing/report/production_planning_report/production_planning_report.py
@@ -13,7 +13,7 @@
 	return ProductionPlanReport(filters).execute_report()
 
 
-class ProductionPlanReport(object):
+class ProductionPlanReport:
 	def __init__(self, filters=None):
 		self.filters = frappe._dict(filters or {})
 		self.raw_materials_dict = {}
@@ -79,7 +79,10 @@
 				query = query.where(child.parent.isin(self.filters.docnames))
 
 			if doctype == "Sales Order":
-				query = query.select(child.delivery_date, parent.base_grand_total,).where(
+				query = query.select(
+					child.delivery_date,
+					parent.base_grand_total,
+				).where(
 					(child.stock_qty > child.produced_qty)
 					& (parent.per_delivered < 100.0)
 					& (parent.status.notin(["Completed", "Closed"]))
@@ -91,7 +94,9 @@
 					query = query.orderby(parent.base_grand_total, order=Order.desc)
 
 			elif doctype == "Material Request":
-				query = query.select(child.schedule_date,).where(
+				query = query.select(
+					child.schedule_date,
+				).where(
 					(parent.per_ordered < 100)
 					& (parent.material_request_type == "Manufacture")
 					& (parent.status != "Stopped")
@@ -280,9 +285,7 @@
 			d.remaining_qty = d.required_qty
 			self.pick_materials_from_warehouses(d, data, warehouses)
 
-			if (
-				d.remaining_qty and self.filters.raw_material_warehouse and d.remaining_qty != d.required_qty
-			):
+			if d.remaining_qty and self.filters.raw_material_warehouse and d.remaining_qty != d.required_qty:
 				row = self.get_args()
 				d.warehouse = self.filters.raw_material_warehouse
 				d.required_qty = d.remaining_qty
diff --git a/erpnext/manufacturing/report/test_reports.py b/erpnext/manufacturing/report/test_reports.py
index e436fdc..3e20f31 100644
--- a/erpnext/manufacturing/report/test_reports.py
+++ b/erpnext/manufacturing/report/test_reports.py
@@ -1,5 +1,4 @@
 import unittest
-from typing import List, Tuple
 
 import frappe
 
@@ -13,7 +12,7 @@
 }
 
 
-REPORT_FILTER_TEST_CASES: List[Tuple[ReportName, ReportFilters]] = [
+REPORT_FILTER_TEST_CASES: list[tuple[ReportName, ReportFilters]] = [
 	("BOM Explorer", {"bom": frappe.get_last_doc("BOM").name}),
 	("BOM Operations Time", {}),
 	("BOM Stock Calculated", {"bom": frappe.get_last_doc("BOM").name, "qty_to_make": 2}),
diff --git a/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py b/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py
index 14e97d3..64363e2 100644
--- a/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py
+++ b/erpnext/manufacturing/report/work_order_consumed_materials/work_order_consumed_materials.py
@@ -22,7 +22,7 @@
 	wo_items = {}
 
 	work_orders = frappe.get_all("Work Order", filters=filters, fields=fields)
-	returned_materials = get_returned_materials(work_orders)
+	get_returned_materials(work_orders)
 
 	for d in work_orders:
 		d.extra_consumed_qty = 0.0
@@ -33,7 +33,7 @@
 			wo_items.setdefault((d.name, d.production_item), []).append(d)
 
 	data = []
-	for key, wo_data in wo_items.items():
+	for _key, wo_data in wo_items.items():
 		for index, row in enumerate(wo_data):
 			if index != 0:
 				# If one work order has multiple raw materials then show parent data in the first row only
diff --git a/erpnext/patches/v10_0/item_barcode_childtable_migrate.py b/erpnext/patches/v10_0/item_barcode_childtable_migrate.py
index e2d0943..b98e7ab 100644
--- a/erpnext/patches/v10_0/item_barcode_childtable_migrate.py
+++ b/erpnext/patches/v10_0/item_barcode_childtable_migrate.py
@@ -12,9 +12,7 @@
 	if "barcode" not in frappe.db.get_table_columns("Item"):
 		return
 
-	items_barcode = frappe.db.sql(
-		"select name, barcode from tabItem where barcode is not null", as_dict=True
-	)
+	items_barcode = frappe.db.sql("select name, barcode from tabItem where barcode is not null", as_dict=True)
 	frappe.reload_doc("stock", "doctype", "item")
 
 	for item in items_barcode:
diff --git a/erpnext/patches/v10_0/set_currency_in_pricing_rule.py b/erpnext/patches/v10_0/set_currency_in_pricing_rule.py
index d68148e..08f5ed1 100644
--- a/erpnext/patches/v10_0/set_currency_in_pricing_rule.py
+++ b/erpnext/patches/v10_0/set_currency_in_pricing_rule.py
@@ -9,6 +9,4 @@
 		if doc.company:
 			currency = frappe.get_cached_value("Company", doc.company, "default_currency")
 
-		frappe.db.sql(
-			"""update `tabPricing Rule` set currency = %s where name = %s""", (currency, doc.name)
-		)
+		frappe.db.sql("""update `tabPricing Rule` set currency = %s where name = %s""", (currency, doc.name))
diff --git a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
index 87151c1..375c010 100644
--- a/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
+++ b/erpnext/patches/v10_1/transfer_subscription_to_auto_repeat.py
@@ -52,7 +52,6 @@
 		"status",
 		"amended_from",
 	]:
-
 		if field in frappe.db.get_table_columns("Subscription"):
 			fields_to_drop["Subscription"].append(field)
 
diff --git a/erpnext/patches/v11_0/create_department_records_for_each_company.py b/erpnext/patches/v11_0/create_department_records_for_each_company.py
index 7a0641d..fb077af 100644
--- a/erpnext/patches/v11_0/create_department_records_for_each_company.py
+++ b/erpnext/patches/v11_0/create_department_records_for_each_company.py
@@ -53,11 +53,10 @@
 
 		for department in records:
 			when_then.append(
-				"""
-				WHEN company = "%s" and department = "%s"
-				THEN "%s"
+				f"""
+				WHEN company = "{company}" and department = "{department}"
+				THEN "{records[department]}"
 			"""
-				% (company, department, records[department])
 			)
 
 	if not when_then:
@@ -66,11 +65,10 @@
 	frappe.db.sql(
 		"""
 		update
-			`tab%s`
+			`tab{}`
 		set
-			department = CASE %s END
-	"""
-		% (doctype, " ".join(when_then))
+			department = CASE {} END
+	""".format(doctype, " ".join(when_then))
 	)
 
 
@@ -83,11 +81,10 @@
 
 		for department in records:
 			when_then.append(
-				"""
-				WHEN employee = "%s" and department = "%s"
-				THEN "%s"
+				f"""
+				WHEN employee = "{employee.name}" and department = "{department}"
+				THEN "{records[department]}"
 			"""
-				% (employee.name, department, records[department])
 			)
 
 	if not when_then:
diff --git a/erpnext/patches/v11_0/make_italian_localization_fields.py b/erpnext/patches/v11_0/make_italian_localization_fields.py
index 1b9793d..05c7b8a 100644
--- a/erpnext/patches/v11_0/make_italian_localization_fields.py
+++ b/erpnext/patches/v11_0/make_italian_localization_fields.py
@@ -20,19 +20,17 @@
 	# Set state codes
 	condition = ""
 	for state, code in state_codes.items():
-		condition += " when {0} then {1}".format(frappe.db.escape(state), frappe.db.escape(code))
+		condition += f" when {frappe.db.escape(state)} then {frappe.db.escape(code)}"
 
 	if condition:
-		condition = "state_code = (case state {0} end),".format(condition)
+		condition = f"state_code = (case state {condition} end),"
 
 	frappe.db.sql(
-		"""
+		f"""
 		UPDATE tabAddress set {condition} country_code = UPPER(ifnull((select code
 			from `tabCountry` where name = `tabAddress`.country), ''))
 			where country_code is null and state_code is null
-	""".format(
-			condition=condition
-		)
+	"""
 	)
 
 	frappe.db.sql(
diff --git a/erpnext/patches/v11_0/merge_land_unit_with_location.py b/erpnext/patches/v11_0/merge_land_unit_with_location.py
index c1afef6..92d0bc9 100644
--- a/erpnext/patches/v11_0/merge_land_unit_with_location.py
+++ b/erpnext/patches/v11_0/merge_land_unit_with_location.py
@@ -29,9 +29,9 @@
 		rename_field("Linked Location", "land_unit", "location")
 
 	if not frappe.db.exists("Location", "All Land Units"):
-		frappe.get_doc(
-			{"doctype": "Location", "is_group": True, "location_name": "All Land Units"}
-		).insert(ignore_permissions=True)
+		frappe.get_doc({"doctype": "Location", "is_group": True, "location_name": "All Land Units"}).insert(
+			ignore_permissions=True
+		)
 
 	if frappe.db.table_exists("Land Unit"):
 		land_units = frappe.get_all("Land Unit", fields=["*"], order_by="lft")
diff --git a/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py b/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py
index 37c0779..418bb13 100644
--- a/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py
+++ b/erpnext/patches/v11_0/move_item_defaults_to_child_table_for_multicompany.py
@@ -106,8 +106,6 @@
 					`expense_account`, `income_account`, `buying_cost_center`, `selling_cost_center`
 				)
 				VALUES {}
-			""".format(
-					", ".join(["%s"] * len(to_insert_data))
-				),
+			""".format(", ".join(["%s"] * len(to_insert_data))),
 				tuple(to_insert_data),
 			)
diff --git a/erpnext/patches/v11_0/refactor_naming_series.py b/erpnext/patches/v11_0/refactor_naming_series.py
index 9cfb082..53c293c 100644
--- a/erpnext/patches/v11_0/refactor_naming_series.py
+++ b/erpnext/patches/v11_0/refactor_naming_series.py
@@ -124,9 +124,7 @@
 
 def get_series_to_preserve(doctype):
 	series_to_preserve = frappe.db.sql_list(
-		"""select distinct naming_series from `tab{doctype}` where ifnull(naming_series, '') != ''""".format(
-			doctype=doctype
-		)
+		f"""select distinct naming_series from `tab{doctype}` where ifnull(naming_series, '') != ''"""
 	)
 	series_to_preserve.sort()
 	return series_to_preserve
diff --git a/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py b/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py
index c444c16..206e7f5 100644
--- a/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py
+++ b/erpnext/patches/v11_0/rename_asset_adjustment_doctype.py
@@ -6,8 +6,6 @@
 
 
 def execute():
-	if frappe.db.table_exists("Asset Adjustment") and not frappe.db.table_exists(
-		"Asset Value Adjustment"
-	):
+	if frappe.db.table_exists("Asset Adjustment") and not frappe.db.table_exists("Asset Value Adjustment"):
 		frappe.rename_doc("DocType", "Asset Adjustment", "Asset Value Adjustment", force=True)
 		frappe.reload_doc("assets", "doctype", "asset_value_adjustment")
diff --git a/erpnext/patches/v11_0/rename_bom_wo_fields.py b/erpnext/patches/v11_0/rename_bom_wo_fields.py
index fb25eeb..2132ff3 100644
--- a/erpnext/patches/v11_0/rename_bom_wo_fields.py
+++ b/erpnext/patches/v11_0/rename_bom_wo_fields.py
@@ -9,9 +9,7 @@
 def execute():
 	# updating column value to handle field change from Data to Currency
 	changed_field = "base_scrap_material_cost"
-	frappe.db.sql(
-		f"update `tabBOM` set {changed_field} = '0' where trim(coalesce({changed_field}, ''))= ''"
-	)
+	frappe.db.sql(f"update `tabBOM` set {changed_field} = '0' where trim(coalesce({changed_field}, ''))= ''")
 
 	for doctype in ["BOM Explosion Item", "BOM Item", "Work Order Item", "Item"]:
 		if frappe.db.has_column(doctype, "allow_transfer_for_manufacture"):
diff --git a/erpnext/patches/v11_0/rename_production_order_to_work_order.py b/erpnext/patches/v11_0/rename_production_order_to_work_order.py
index b58ac4e..31a9c88 100644
--- a/erpnext/patches/v11_0/rename_production_order_to_work_order.py
+++ b/erpnext/patches/v11_0/rename_production_order_to_work_order.py
@@ -21,14 +21,10 @@
 	rename_field("Timesheet", "production_order", "work_order")
 	rename_field("Stock Entry", "production_order", "work_order")
 
-	frappe.rename_doc(
-		"Report", "Production Orders in Progress", "Work Orders in Progress", force=True
-	)
+	frappe.rename_doc("Report", "Production Orders in Progress", "Work Orders in Progress", force=True)
 	frappe.rename_doc("Report", "Completed Production Orders", "Completed Work Orders", force=True)
 	frappe.rename_doc("Report", "Open Production Orders", "Open Work Orders", force=True)
 	frappe.rename_doc(
 		"Report", "Issued Items Against Production Order", "Issued Items Against Work Order", force=True
 	)
-	frappe.rename_doc(
-		"Report", "Production Order Stock Report", "Work Order Stock Report", force=True
-	)
+	frappe.rename_doc("Report", "Production Order Stock Report", "Work Order Stock Report", force=True)
diff --git a/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py b/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
index 67eb915..1a07c56 100644
--- a/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
+++ b/erpnext/patches/v11_0/rename_supplier_type_to_supplier_group.py
@@ -25,10 +25,8 @@
 
 def build_tree():
 	frappe.db.sql(
-		"""update `tabSupplier Group` set parent_supplier_group = '{0}'
-		where is_group = 0""".format(
-			_("All Supplier Groups")
-		)
+		"""update `tabSupplier Group` set parent_supplier_group = '{}'
+		where is_group = 0""".format(_("All Supplier Groups"))
 	)
 
 	if not frappe.db.exists("Supplier Group", _("All Supplier Groups")):
diff --git a/erpnext/patches/v11_0/set_department_for_doctypes.py b/erpnext/patches/v11_0/set_department_for_doctypes.py
index b784772..70e9c8c 100644
--- a/erpnext/patches/v11_0/set_department_for_doctypes.py
+++ b/erpnext/patches/v11_0/set_department_for_doctypes.py
@@ -4,7 +4,6 @@
 
 
 def execute():
-
 	doctypes_to_update = {
 		"projects": ["Activity Cost", "Timesheet"],
 		"setup": ["Sales Person"],
diff --git a/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py b/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py
index 548a7cb..b6fc1a6 100644
--- a/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py
+++ b/erpnext/patches/v11_0/set_update_field_and_value_in_workflow_state.py
@@ -4,7 +4,6 @@
 
 def execute():
 	for doctype in ["Expense Claim", "Leave Application"]:
-
 		active_workflow = get_workflow_name(doctype)
 		if not active_workflow:
 			continue
diff --git a/erpnext/patches/v11_0/update_allow_transfer_for_manufacture.py b/erpnext/patches/v11_0/update_allow_transfer_for_manufacture.py
index a7351d2..3f59747 100644
--- a/erpnext/patches/v11_0/update_allow_transfer_for_manufacture.py
+++ b/erpnext/patches/v11_0/update_allow_transfer_for_manufacture.py
@@ -16,12 +16,10 @@
 		frappe.reload_doc("manufacturing", "doctype", frappe.scrub(doctype))
 
 		frappe.db.sql(
-			""" update `tab{0}` child, tabItem item
+			f""" update `tab{doctype}` child, tabItem item
 			set
 				child.include_item_in_manufacturing = 1
 			where
 				child.item_code = item.name and ifnull(item.is_stock_item, 0) = 1
-		""".format(
-				doctype
-			)
+		"""
 		)
diff --git a/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py b/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py
index 037dda5..57be8a7 100644
--- a/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py
+++ b/erpnext/patches/v11_0/update_backflush_subcontract_rm_based_on_bom.py
@@ -7,9 +7,7 @@
 
 def execute():
 	frappe.reload_doc("buying", "doctype", "buying_settings")
-	frappe.db.set_single_value(
-		"Buying Settings", "backflush_raw_materials_of_subcontract_based_on", "BOM"
-	)
+	frappe.db.set_single_value("Buying Settings", "backflush_raw_materials_of_subcontract_based_on", "BOM")
 
 	frappe.reload_doc("stock", "doctype", "stock_entry_detail")
 	frappe.db.sql(
diff --git a/erpnext/patches/v11_0/update_department_lft_rgt.py b/erpnext/patches/v11_0/update_department_lft_rgt.py
index 380ca4d..ad66b0c 100644
--- a/erpnext/patches/v11_0/update_department_lft_rgt.py
+++ b/erpnext/patches/v11_0/update_department_lft_rgt.py
@@ -12,10 +12,8 @@
 		).insert(ignore_permissions=True, ignore_mandatory=True)
 
 	frappe.db.sql(
-		"""update `tabDepartment` set parent_department = '{0}'
-		where is_group = 0""".format(
-			_("All Departments")
-		)
+		"""update `tabDepartment` set parent_department = '{}'
+		where is_group = 0""".format(_("All Departments"))
 	)
 
 	rebuild_tree("Department")
diff --git a/erpnext/patches/v11_0/update_sales_partner_type.py b/erpnext/patches/v11_0/update_sales_partner_type.py
index 72fd424..ced77d9 100644
--- a/erpnext/patches/v11_0/update_sales_partner_type.py
+++ b/erpnext/patches/v11_0/update_sales_partner_type.py
@@ -16,7 +16,7 @@
 	# get partner type in existing forms (customized)
 	# and create a document if not created
 	for d in ["Sales Partner"]:
-		partner_type = frappe.db.sql_list("select distinct partner_type from `tab{0}`".format(d))
+		partner_type = frappe.db.sql_list(f"select distinct partner_type from `tab{d}`")
 		for s in partner_type:
 			if s and s not in default_sales_partner_type:
 				insert_sales_partner_type(s)
diff --git a/erpnext/patches/v11_0/update_total_qty_field.py b/erpnext/patches/v11_0/update_total_qty_field.py
index 09fcdb8..3ed7c83 100644
--- a/erpnext/patches/v11_0/update_total_qty_field.py
+++ b/erpnext/patches/v11_0/update_total_qty_field.py
@@ -24,16 +24,14 @@
 
 	for doctype in doctypes:
 		total_qty = frappe.db.sql(
-			"""
+			f"""
 			SELECT
 				parent, SUM(qty) as qty
 			FROM
-				`tab{0} Item`
-			where parenttype = '{0}'
+				`tab{doctype} Item`
+			where parenttype = '{doctype}'
 			GROUP BY parent
-		""".format(
-				doctype
-			),
+		""",
 			as_dict=True,
 		)
 
@@ -53,13 +51,11 @@
 			# This is probably never used anywhere else as of now, but should be
 			values = []
 			for d in batch_transactions:
-				values.append("({0}, {1})".format(frappe.db.escape(d.parent), d.qty))
+				values.append(f"({frappe.db.escape(d.parent)}, {d.qty})")
 			conditions = ",".join(values)
 			frappe.db.sql(
-				"""
-				INSERT INTO `tab{}` (name, total_qty) VALUES {}
+				f"""
+				INSERT INTO `tab{doctype}` (name, total_qty) VALUES {conditions}
 				ON DUPLICATE KEY UPDATE name = VALUES(name), total_qty = VALUES(total_qty)
-			""".format(
-					doctype, conditions
-				)
+			"""
 			)
diff --git a/erpnext/patches/v11_1/make_job_card_time_logs.py b/erpnext/patches/v11_1/make_job_card_time_logs.py
index beb2c4e..14bc4ee 100644
--- a/erpnext/patches/v11_1/make_job_card_time_logs.py
+++ b/erpnext/patches/v11_1/make_job_card_time_logs.py
@@ -8,9 +8,7 @@
 def execute():
 	frappe.reload_doc("manufacturing", "doctype", "job_card_time_log")
 
-	if frappe.db.table_exists("Job Card") and frappe.get_meta("Job Card").has_field(
-		"actual_start_date"
-	):
+	if frappe.db.table_exists("Job Card") and frappe.get_meta("Job Card").has_field("actual_start_date"):
 		time_logs = []
 		for d in frappe.get_all(
 			"Job Card",
@@ -37,9 +35,7 @@
                 `tabJob Card Time Log`
                     (from_time, to_time, time_in_mins, completed_qty, parent, parenttype, parentfield, name)
                 values {values}
-            """.format(
-					values=",".join(["%s"] * len(time_logs))
-				),
+            """.format(values=",".join(["%s"] * len(time_logs))),
 				tuple(time_logs),
 			)
 
diff --git a/erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py b/erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py
index b681f25..b4095ee 100644
--- a/erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py
+++ b/erpnext/patches/v11_1/move_customer_lead_to_dynamic_column.py
@@ -8,14 +8,10 @@
 def execute():
 	frappe.reload_doctype("Quotation")
 	frappe.db.sql(""" UPDATE `tabQuotation` set party_name = lead WHERE quotation_to = 'Lead' """)
-	frappe.db.sql(
-		""" UPDATE `tabQuotation` set party_name = customer WHERE quotation_to = 'Customer' """
-	)
+	frappe.db.sql(""" UPDATE `tabQuotation` set party_name = customer WHERE quotation_to = 'Customer' """)
 
 	frappe.reload_doctype("Opportunity")
-	frappe.db.sql(
-		""" UPDATE `tabOpportunity` set party_name = lead WHERE opportunity_from = 'Lead' """
-	)
+	frappe.db.sql(""" UPDATE `tabOpportunity` set party_name = lead WHERE opportunity_from = 'Lead' """)
 	frappe.db.sql(
 		""" UPDATE `tabOpportunity` set party_name = customer WHERE opportunity_from = 'Customer' """
 	)
diff --git a/erpnext/patches/v11_1/set_missing_opportunity_from.py b/erpnext/patches/v11_1/set_missing_opportunity_from.py
index ae5f620..fd3bf7e 100644
--- a/erpnext/patches/v11_1/set_missing_opportunity_from.py
+++ b/erpnext/patches/v11_1/set_missing_opportunity_from.py
@@ -2,7 +2,6 @@
 
 
 def execute():
-
 	frappe.reload_doctype("Opportunity")
 	if frappe.db.has_column("Opportunity", "enquiry_from"):
 		frappe.db.sql(
@@ -10,9 +9,7 @@
 			where ifnull(opportunity_from, '') = '' and ifnull(enquiry_from, '') != ''"""
 		)
 
-	if frappe.db.has_column("Opportunity", "lead") and frappe.db.has_column(
-		"Opportunity", "enquiry_from"
-	):
+	if frappe.db.has_column("Opportunity", "lead") and frappe.db.has_column("Opportunity", "enquiry_from"):
 		frappe.db.sql(
 			""" UPDATE `tabOpportunity` set party_name = lead
 			where enquiry_from = 'Lead' and ifnull(party_name, '') = '' and ifnull(lead, '') != ''"""
diff --git a/erpnext/patches/v12_0/add_default_buying_selling_terms_in_company.py b/erpnext/patches/v12_0/add_default_buying_selling_terms_in_company.py
index 284b616..0029074 100644
--- a/erpnext/patches/v12_0/add_default_buying_selling_terms_in_company.py
+++ b/erpnext/patches/v12_0/add_default_buying_selling_terms_in_company.py
@@ -11,9 +11,7 @@
 	if frappe.db.has_column("Company", "default_terms"):
 		rename_field("Company", "default_terms", "default_selling_terms")
 
-		for company in frappe.get_all(
-			"Company", ["name", "default_selling_terms", "default_buying_terms"]
-		):
+		for company in frappe.get_all("Company", ["name", "default_selling_terms", "default_buying_terms"]):
 			if company.default_selling_terms and not company.default_buying_terms:
 				frappe.db.set_value(
 					"Company", company.name, "default_buying_terms", company.default_selling_terms
diff --git a/erpnext/patches/v12_0/create_accounting_dimensions_in_missing_doctypes.py b/erpnext/patches/v12_0/create_accounting_dimensions_in_missing_doctypes.py
index 744ea1c..c3bf4a0 100644
--- a/erpnext/patches/v12_0/create_accounting_dimensions_in_missing_doctypes.py
+++ b/erpnext/patches/v12_0/create_accounting_dimensions_in_missing_doctypes.py
@@ -3,7 +3,6 @@
 
 
 def execute():
-
 	frappe.reload_doc("accounts", "doctype", "accounting_dimension")
 
 	accounting_dimensions = frappe.db.sql(
@@ -17,7 +16,6 @@
 
 	count = 1
 	for d in accounting_dimensions:
-
 		if count % 2 == 0:
 			insert_after_field = "dimension_col_break"
 		else:
@@ -31,7 +29,6 @@
 			"Expense Claim Detail",
 			"Expense Taxes and Charges",
 		]:
-
 			field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": d.fieldname})
 
 			if field:
diff --git a/erpnext/patches/v12_0/create_irs_1099_field_united_states.py b/erpnext/patches/v12_0/create_irs_1099_field_united_states.py
index 80e9047..8c7f6bd 100644
--- a/erpnext/patches/v12_0/create_irs_1099_field_united_states.py
+++ b/erpnext/patches/v12_0/create_irs_1099_field_united_states.py
@@ -4,7 +4,6 @@
 
 
 def execute():
-
 	frappe.reload_doc("accounts", "doctype", "allowed_to_transact_with", force=True)
 	frappe.reload_doc("accounts", "doctype", "pricing_rule_detail", force=True)
 	frappe.reload_doc("crm", "doctype", "lost_reason_detail", force=True)
diff --git a/erpnext/patches/v12_0/fix_quotation_expired_status.py b/erpnext/patches/v12_0/fix_quotation_expired_status.py
index 285183b..5d9c810 100644
--- a/erpnext/patches/v12_0/fix_quotation_expired_status.py
+++ b/erpnext/patches/v12_0/fix_quotation_expired_status.py
@@ -16,9 +16,7 @@
 			and qo.valid_till < so.transaction_date"""  # check if SO was created after quotation expired
 
 	frappe.db.sql(
-		"""UPDATE `tabQuotation` qo SET qo.status = 'Expired' WHERE {cond} and exists({invalid_so_against_quo})""".format(
-			cond=cond, invalid_so_against_quo=invalid_so_against_quo
-		)
+		f"""UPDATE `tabQuotation` qo SET qo.status = 'Expired' WHERE {cond} and exists({invalid_so_against_quo})"""
 	)
 
 	valid_so_against_quo = """
@@ -31,7 +29,5 @@
 			and qo.valid_till >= so.transaction_date"""  # check if SO was created before quotation expired
 
 	frappe.db.sql(
-		"""UPDATE `tabQuotation` qo SET qo.status = 'Closed' WHERE {cond} and exists({valid_so_against_quo})""".format(
-			cond=cond, valid_so_against_quo=valid_so_against_quo
-		)
+		f"""UPDATE `tabQuotation` qo SET qo.status = 'Closed' WHERE {cond} and exists({valid_so_against_quo})"""
 	)
diff --git a/erpnext/patches/v12_0/make_item_manufacturer.py b/erpnext/patches/v12_0/make_item_manufacturer.py
index 3f23365..67d6f97 100644
--- a/erpnext/patches/v12_0/make_item_manufacturer.py
+++ b/erpnext/patches/v12_0/make_item_manufacturer.py
@@ -30,8 +30,6 @@
 			"""
 			INSERT INTO `tabItem Manufacturer`
 			(`name`, `item_code`, `manufacturer`, `manufacturer_part_no`, `creation`, `owner`)
-			VALUES {}""".format(
-				", ".join(["%s"] * len(item_manufacturer))
-			),
+			VALUES {}""".format(", ".join(["%s"] * len(item_manufacturer))),
 			tuple(item_manufacturer),
 		)
diff --git a/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py b/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py
index 671dfd1..e6f522b 100644
--- a/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py
+++ b/erpnext/patches/v12_0/move_bank_account_swift_number_to_bank.py
@@ -16,7 +16,7 @@
 				SET b.swift_number = ba.swift_number WHERE b.name = ba.bank
 			"""
 			)
-		except Exception as e:
+		except Exception:
 			frappe.log_error("Bank to Bank Account patch migration failed")
 
 	frappe.reload_doc("accounts", "doctype", "bank_account")
diff --git a/erpnext/patches/v12_0/move_credit_limit_to_customer_credit_limit.py b/erpnext/patches/v12_0/move_credit_limit_to_customer_credit_limit.py
index 17c1966..67fe5db 100644
--- a/erpnext/patches/v12_0/move_credit_limit_to_customer_credit_limit.py
+++ b/erpnext/patches/v12_0/move_credit_limit_to_customer_credit_limit.py
@@ -29,12 +29,10 @@
 			fields = ", bypass_credit_limit_check_at_sales_order"
 
 		credit_limit_records = frappe.db.sql(
-			"""
-			SELECT name, credit_limit {0}
-			FROM `tab{1}` where credit_limit > 0
-		""".format(
-				fields, doctype
-			),
+			f"""
+			SELECT name, credit_limit {fields}
+			FROM `tab{doctype}` where credit_limit > 0
+		""",
 			as_dict=1,
 		)  # nosec
 
diff --git a/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py b/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
index c4c3b69..8ac1991 100644
--- a/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
+++ b/erpnext/patches/v12_0/move_item_tax_to_item_tax_template.py
@@ -80,11 +80,9 @@
 
 	for dt in doctypes:
 		for d in frappe.db.sql(
-			"""select name, parenttype, parent, item_code, item_tax_rate from `tab{0} Item`
+			f"""select name, parenttype, parent, item_code, item_tax_rate from `tab{dt} Item`
 								where ifnull(item_tax_rate, '') not in ('', '{{}}')
-								and item_tax_template is NULL""".format(
-				dt
-			),
+								and item_tax_template is NULL""",
 			as_dict=1,
 		):
 			item_tax_map = json.loads(d.item_tax_rate)
@@ -145,13 +143,23 @@
 				if not parent_account:
 					parent_account = frappe.db.get_value(
 						"Account",
-						filters={"account_type": "Tax", "root_type": "Liability", "is_group": 0, "company": company},
+						filters={
+							"account_type": "Tax",
+							"root_type": "Liability",
+							"is_group": 0,
+							"company": company,
+						},
 						fieldname="parent_account",
 					)
 				if not parent_account:
 					parent_account = frappe.db.get_value(
 						"Account",
-						filters={"account_type": "Tax", "root_type": "Liability", "is_group": 1, "company": company},
+						filters={
+							"account_type": "Tax",
+							"root_type": "Liability",
+							"is_group": 1,
+							"company": company,
+						},
 					)
 				filters = {
 					"account_name": account_name,
diff --git a/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py b/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py
index 7192610..ffd8ddc 100644
--- a/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py
+++ b/erpnext/patches/v12_0/move_target_distribution_from_parent_to_child.py
@@ -18,9 +18,7 @@
             WHERE
                 `tab{child_doc}`.parent = `tab{parent_doc}`.name
                 and `tab{parent_doc}`.distribution_id is not null and `tab{parent_doc}`.distribution_id != ''
-        """.format(
-				parent_doc=d, child_doc="Target Detail"
-			)
+        """.format(parent_doc=d, child_doc="Target Detail")
 		)
 
 	frappe.delete_doc("Report", "Sales Partner-wise Transaction Summary")
diff --git a/erpnext/patches/v12_0/purchase_receipt_status.py b/erpnext/patches/v12_0/purchase_receipt_status.py
index 3b828d6..2869e2b 100644
--- a/erpnext/patches/v12_0/purchase_receipt_status.py
+++ b/erpnext/patches/v12_0/purchase_receipt_status.py
@@ -17,16 +17,14 @@
 	if not affected_purchase_receipts:
 		return
 
-	logger.info(
-		"purchase_receipt_status: begin patch, PR count: {}".format(len(affected_purchase_receipts))
-	)
+	logger.info(f"purchase_receipt_status: begin patch, PR count: {len(affected_purchase_receipts)}")
 
 	frappe.reload_doc("stock", "doctype", "Purchase Receipt")
 	frappe.reload_doc("stock", "doctype", "Purchase Receipt Item")
 
 	for pr in affected_purchase_receipts:
 		pr_name = pr[0]
-		logger.info("purchase_receipt_status: patching PR - {}".format(pr_name))
+		logger.info(f"purchase_receipt_status: patching PR - {pr_name}")
 
 		pr_doc = frappe.get_doc("Purchase Receipt", pr_name)
 
diff --git a/erpnext/patches/v12_0/rename_bank_reconciliation_fields.py b/erpnext/patches/v12_0/rename_bank_reconciliation_fields.py
index e2a3887..dfc2366 100644
--- a/erpnext/patches/v12_0/rename_bank_reconciliation_fields.py
+++ b/erpnext/patches/v12_0/rename_bank_reconciliation_fields.py
@@ -6,12 +6,8 @@
 
 def _rename_single_field(**kwargs):
 	count = frappe.db.sql(
-		"SELECT COUNT(*) FROM tabSingles WHERE doctype='{doctype}' AND field='{new_name}';".format(
-			**kwargs
-		)
-	)[0][
-		0
-	]  # nosec
+		"SELECT COUNT(*) FROM tabSingles WHERE doctype='{doctype}' AND field='{new_name}';".format(**kwargs)
+	)[0][0]  # nosec
 	if count == 0:
 		frappe.db.sql(
 			"UPDATE tabSingles SET field='{new_name}' WHERE doctype='{doctype}' AND field='{old_name}';".format(
@@ -22,7 +18,5 @@
 
 def execute():
 	_rename_single_field(doctype="Bank Clearance", old_name="bank_account", new_name="account")
-	_rename_single_field(
-		doctype="Bank Clearance", old_name="bank_account_no", new_name="bank_account"
-	)
+	_rename_single_field(doctype="Bank Clearance", old_name="bank_account_no", new_name="bank_account")
 	frappe.reload_doc("Accounts", "doctype", "Bank Clearance")
diff --git a/erpnext/patches/v12_0/repost_stock_ledger_entries_for_target_warehouse.py b/erpnext/patches/v12_0/repost_stock_ledger_entries_for_target_warehouse.py
index a4a8587..69ddb60 100644
--- a/erpnext/patches/v12_0/repost_stock_ledger_entries_for_target_warehouse.py
+++ b/erpnext/patches/v12_0/repost_stock_ledger_entries_for_target_warehouse.py
@@ -41,35 +41,29 @@
 			cond = " AND parent_doc.update_stock = 1"
 
 		data = frappe.db.sql(
-			""" SELECT parent_doc.name as name, child_doc.name as child_name
+			f""" SELECT parent_doc.name as name, child_doc.name as child_name
 			FROM
 				`tab{doctype}` parent_doc, `tab{doctype} Item` child_doc
 			WHERE
 				parent_doc.name = child_doc.parent AND parent_doc.docstatus < 2
 				AND child_doc.target_warehouse is not null AND child_doc.target_warehouse != ''
 				AND child_doc.creation > '2020-04-16' {cond}
-		""".format(
-				doctype=doctype, cond=cond
-			),
+		""",
 			as_dict=1,
 		)
 
 		if data:
 			names = [d.child_name for d in data]
 			frappe.db.sql(
-				""" UPDATE `tab{0} Item` set target_warehouse = null
-				WHERE name in ({1}) """.format(
-					doctype, ",".join(["%s"] * len(names))
-				),
+				""" UPDATE `tab{} Item` set target_warehouse = null
+				WHERE name in ({}) """.format(doctype, ",".join(["%s"] * len(names))),
 				tuple(names),
 			)
 
 			frappe.db.sql(
 				""" UPDATE `tabPacked Item` set target_warehouse = null
-				WHERE parenttype = '{0}' and parent_detail_docname in ({1})
-			""".format(
-					doctype, ",".join(["%s"] * len(names))
-				),
+				WHERE parenttype = '{}' and parent_detail_docname in ({})
+			""".format(doctype, ",".join(["%s"] * len(names))),
 				tuple(names),
 			)
 
diff --git a/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py b/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py
index d88593b..5d1cb64 100644
--- a/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py
+++ b/erpnext/patches/v12_0/set_against_blanket_order_in_sales_and_purchase_order.py
@@ -2,17 +2,14 @@
 
 
 def execute():
-
 	frappe.reload_doc("selling", "doctype", "sales_order_item", force=True)
 	frappe.reload_doc("buying", "doctype", "purchase_order_item", force=True)
 
 	for doctype in ("Sales Order Item", "Purchase Order Item"):
 		frappe.db.sql(
-			"""
-			UPDATE `tab{0}`
+			f"""
+			UPDATE `tab{doctype}`
 			SET against_blanket_order = 1
 			WHERE ifnull(blanket_order, '') != ''
-		""".format(
-				doctype
-			)
+		"""
 		)
diff --git a/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py b/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py
index 84dd1c7..fc54635 100644
--- a/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py
+++ b/erpnext/patches/v12_0/set_automatically_process_deferred_accounting_in_accounts_settings.py
@@ -4,6 +4,4 @@
 def execute():
 	frappe.reload_doc("accounts", "doctype", "accounts_settings")
 
-	frappe.db.set_single_value(
-		"Accounts Settings", "automatically_process_deferred_accounting_entry", 1
-	)
+	frappe.db.set_single_value("Accounts Settings", "automatically_process_deferred_accounting_entry", 1)
diff --git a/erpnext/patches/v12_0/set_produced_qty_field_in_sales_order_for_work_order.py b/erpnext/patches/v12_0/set_produced_qty_field_in_sales_order_for_work_order.py
index 562ebed..a5b9f43 100644
--- a/erpnext/patches/v12_0/set_produced_qty_field_in_sales_order_for_work_order.py
+++ b/erpnext/patches/v12_0/set_produced_qty_field_in_sales_order_for_work_order.py
@@ -12,6 +12,5 @@
 		fields=["sales_order", "sales_order_item"],
 		filters={"sales_order": ("!=", ""), "sales_order_item": ("!=", "")},
 	):
-
 		# update produced qty in sales order
 		update_produced_qty_in_so_item(d.sales_order, d.sales_order_item)
diff --git a/erpnext/patches/v12_0/set_purchase_receipt_delivery_note_detail.py b/erpnext/patches/v12_0/set_purchase_receipt_delivery_note_detail.py
index 2edf0f5..e820731 100644
--- a/erpnext/patches/v12_0/set_purchase_receipt_delivery_note_detail.py
+++ b/erpnext/patches/v12_0/set_purchase_receipt_delivery_note_detail.py
@@ -4,7 +4,6 @@
 
 
 def execute():
-
 	frappe.reload_doc("stock", "doctype", "delivery_note_item", force=True)
 	frappe.reload_doc("stock", "doctype", "purchase_receipt_item", force=True)
 
@@ -50,14 +49,12 @@
 		Format => { 'document' : ['return_document_1','return_document_2'] }"""
 
 		return_against_documents = frappe.db.sql(
-			"""
+			f"""
 			SELECT
 				return_against as document, name as return_document
 			FROM `tab{doctype}`
 			WHERE
-				is_return = 1 and docstatus = 1""".format(
-				doctype=doctype
-			),
+				is_return = 1 and docstatus = 1""",
 			as_dict=1,
 		)  # nosec
 
@@ -72,7 +69,7 @@
 		return_document_map = defaultdict(list)
 		detail_field = "purchase_receipt_item" if doctype == "Purchase Receipt" else "dn_detail"
 
-		child_doc = frappe.scrub("{0} Item".format(doctype))
+		child_doc = frappe.scrub(f"{doctype} Item")
 		frappe.reload_doc("stock", "doctype", child_doc)
 
 		return_document_map = make_return_document_map(doctype, return_document_map)
@@ -89,7 +86,8 @@
 				for return_item in return_doc_items:
 					for doc_item in doc_items:
 						if (
-							row_is_mappable(doc_item, return_item, detail_field) and doc_item.get("name") not in mapped
+							row_is_mappable(doc_item, return_item, detail_field)
+							and doc_item.get("name") not in mapped
 						):
 							map_rows(doc_item, return_item, detail_field, doctype)
 							mapped.append(doc_item.get("name"))
diff --git a/erpnext/patches/v12_0/set_quotation_status.py b/erpnext/patches/v12_0/set_quotation_status.py
index bebedd3..edfb4a4 100644
--- a/erpnext/patches/v12_0/set_quotation_status.py
+++ b/erpnext/patches/v12_0/set_quotation_status.py
@@ -2,7 +2,6 @@
 
 
 def execute():
-
 	frappe.db.sql(
 		""" UPDATE `tabQuotation` set status = 'Open'
 		where docstatus = 1 and status = 'Submitted' """
diff --git a/erpnext/patches/v12_0/stock_entry_enhancements.py b/erpnext/patches/v12_0/stock_entry_enhancements.py
index db099a3..75749a4 100644
--- a/erpnext/patches/v12_0/stock_entry_enhancements.py
+++ b/erpnext/patches/v12_0/stock_entry_enhancements.py
@@ -28,7 +28,6 @@
 		"Repack",
 		"Send to Subcontractor",
 	]:
-
 		ste_type = frappe.get_doc({"doctype": "Stock Entry Type", "name": purpose, "purpose": purpose})
 
 		try:
diff --git a/erpnext/patches/v12_0/update_bom_in_so_mr.py b/erpnext/patches/v12_0/update_bom_in_so_mr.py
index d35b4bc..f9de6e8 100644
--- a/erpnext/patches/v12_0/update_bom_in_so_mr.py
+++ b/erpnext/patches/v12_0/update_bom_in_so_mr.py
@@ -6,21 +6,17 @@
 	frappe.reload_doc("selling", "doctype", "sales_order_item")
 
 	for doctype in ["Sales Order", "Material Request"]:
-		condition = (
-			" and child_doc.stock_qty > child_doc.produced_qty and ROUND(doc.per_delivered, 2) < 100"
-		)
+		condition = " and child_doc.stock_qty > child_doc.produced_qty and ROUND(doc.per_delivered, 2) < 100"
 		if doctype == "Material Request":
 			condition = " and doc.per_ordered < 100 and doc.material_request_type = 'Manufacture'"
 
 		frappe.db.sql(
-			""" UPDATE `tab{doc}` as doc, `tab{doc} Item` as child_doc, tabItem as item
+			f""" UPDATE `tab{doctype}` as doc, `tab{doctype} Item` as child_doc, tabItem as item
 			SET
 				child_doc.bom_no = item.default_bom
 			WHERE
 				child_doc.item_code = item.name and child_doc.docstatus < 2
 				and child_doc.parent = doc.name
-				and item.default_bom is not null and item.default_bom != '' {cond}
-		""".format(
-				doc=doctype, cond=condition
-			)
+				and item.default_bom is not null and item.default_bom != '' {condition}
+		"""
 		)
diff --git a/erpnext/patches/v12_0/update_due_date_in_gle.py b/erpnext/patches/v12_0/update_due_date_in_gle.py
index a1c4f51..6933110 100644
--- a/erpnext/patches/v12_0/update_due_date_in_gle.py
+++ b/erpnext/patches/v12_0/update_due_date_in_gle.py
@@ -8,13 +8,11 @@
 		frappe.reload_doc("accounts", "doctype", frappe.scrub(doctype))
 
 		frappe.db.sql(
-			""" UPDATE `tabGL Entry`, `tab{doctype}`
+			f""" UPDATE `tabGL Entry`, `tab{doctype}`
             SET
                 `tabGL Entry`.due_date = `tab{doctype}`.due_date
             WHERE
                 `tabGL Entry`.voucher_no = `tab{doctype}`.name and `tabGL Entry`.party is not null
                 and `tabGL Entry`.voucher_type in ('Sales Invoice', 'Purchase Invoice', 'Journal Entry')
-                and `tabGL Entry`.account in (select name from `tabAccount` where account_type in ('Receivable', 'Payable'))""".format(  # nosec
-				doctype=doctype
-			)
+                and `tabGL Entry`.account in (select name from `tabAccount` where account_type in ('Receivable', 'Payable'))"""
 		)
diff --git a/erpnext/patches/v12_0/update_is_cancelled_field.py b/erpnext/patches/v12_0/update_is_cancelled_field.py
index 398dd70..ea9a06b 100644
--- a/erpnext/patches/v12_0/update_is_cancelled_field.py
+++ b/erpnext/patches/v12_0/update_is_cancelled_field.py
@@ -17,20 +17,16 @@
 			continue
 
 		frappe.db.sql(
-			"""
+			f"""
 				UPDATE `tab{doctype}`
 				SET is_cancelled = 0
-				where is_cancelled in ('', 'No') or is_cancelled is NULL""".format(
-				doctype=doctype
-			)
+				where is_cancelled in ('', 'No') or is_cancelled is NULL"""
 		)
 		frappe.db.sql(
-			"""
+			f"""
 				UPDATE `tab{doctype}`
 				SET is_cancelled = 1
-				where is_cancelled = 'Yes'""".format(
-				doctype=doctype
-			)
+				where is_cancelled = 'Yes'"""
 		)
 
 		frappe.reload_doc(module, "doctype", frappe.scrub(doctype))
diff --git a/erpnext/patches/v12_0/update_owner_fields_in_acc_dimension_custom_fields.py b/erpnext/patches/v12_0/update_owner_fields_in_acc_dimension_custom_fields.py
index 7dc0af9..26db58d 100644
--- a/erpnext/patches/v12_0/update_owner_fields_in_acc_dimension_custom_fields.py
+++ b/erpnext/patches/v12_0/update_owner_fields_in_acc_dimension_custom_fields.py
@@ -19,8 +19,7 @@
 			"""
 			UPDATE `tabCustom Field`
 			SET owner = 'Administrator'
-			WHERE fieldname = %s
-			AND dt IN (%s)"""
-			% ("%s", ", ".join(["%s"] * len(doclist))),  # nosec
-			tuple([dimension.fieldname] + doclist),
+			WHERE fieldname = {}
+			AND dt IN ({})""".format("%s", ", ".join(["%s"] * len(doclist))),  # nosec
+			tuple([dimension.fieldname, *doclist]),
 		)
diff --git a/erpnext/patches/v12_0/update_pricing_rule_fields.py b/erpnext/patches/v12_0/update_pricing_rule_fields.py
index 8da06b0..f4eee85 100644
--- a/erpnext/patches/v12_0/update_pricing_rule_fields.py
+++ b/erpnext/patches/v12_0/update_pricing_rule_fields.py
@@ -8,7 +8,6 @@
 
 
 def execute():
-
 	if not frappe.get_all("Pricing Rule", limit=1):
 		return
 
@@ -33,20 +32,16 @@
 		child_doctype = doctype + " Item"
 
 		frappe.db.sql(
-			""" UPDATE `tab{child_doctype}` SET pricing_rules = pricing_rule
+			f""" UPDATE `tab{child_doctype}` SET pricing_rules = pricing_rule
 			WHERE docstatus < 2 and pricing_rule is not null and pricing_rule != ''
-		""".format(
-				child_doctype=child_doctype
-			)
+		"""
 		)
 
 		data = frappe.db.sql(
-			""" SELECT pricing_rule, name, parent,
+			f""" SELECT pricing_rule, name, parent,
 				parenttype, creation, modified, docstatus, modified_by, owner, name
-			FROM `tab{child_doc}` where docstatus < 2 and pricing_rule is not null
-			and pricing_rule != ''""".format(
-				child_doc=child_doctype
-			),
+			FROM `tab{child_doctype}` where docstatus < 2 and pricing_rule is not null
+			and pricing_rule != ''""",
 			as_dict=1,
 		)
 
@@ -73,9 +68,7 @@
 				""" INSERT INTO
 				`tabPricing Rule Detail` (`pricing_rule`, `child_docname`, `parent`, `parentfield`, `parenttype`,
 				`creation`, `modified`, `docstatus`, `modified_by`, `owner`, `name`)
-			VALUES {values} """.format(
-					values=", ".join(["%s"] * len(values))
-				),
+			VALUES {values} """.format(values=", ".join(["%s"] * len(values))),
 				tuple(values),
 			)
 
@@ -116,8 +109,6 @@
 				""" INSERT INTO
 				`tab{doctype}` ({field}, parent, parentfield, parenttype, creation, modified,
 					owner, modified_by, name)
-			VALUES {values} """.format(
-					doctype=doctype, field=field, values=", ".join(["%s"] * len(values))
-				),
+			VALUES {values} """.format(doctype=doctype, field=field, values=", ".join(["%s"] * len(values))),
 				tuple(values),
 			)
diff --git a/erpnext/patches/v13_0/add_bin_unique_constraint.py b/erpnext/patches/v13_0/add_bin_unique_constraint.py
index 7ad2bec..92fc702 100644
--- a/erpnext/patches/v13_0/add_bin_unique_constraint.py
+++ b/erpnext/patches/v13_0/add_bin_unique_constraint.py
@@ -21,7 +21,6 @@
 
 
 def delete_and_patch_duplicate_bins():
-
 	duplicate_bins = frappe.db.sql(
 		"""
 		SELECT
diff --git a/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py b/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py
index ed764f4..f80233b 100644
--- a/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py
+++ b/erpnext/patches/v13_0/add_missing_fg_item_for_stock_entry.py
@@ -13,9 +13,7 @@
 		return
 
 	frappe.reload_doc("manufacturing", "doctype", "manufacturing_settings")
-	if cint(
-		frappe.db.get_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order")
-	):
+	if cint(frappe.db.get_single_value("Manufacturing Settings", "make_serial_no_batch_from_work_order")):
 		return
 
 	frappe.reload_doc("manufacturing", "doctype", "work_order")
@@ -75,9 +73,7 @@
 def set_expense_account(doc):
 	for row in doc.items:
 		if row.is_finished_item and not row.expense_account:
-			row.expense_account = frappe.get_cached_value(
-				"Company", doc.company, "stock_adjustment_account"
-			)
+			row.expense_account = frappe.get_cached_value("Company", doc.company, "stock_adjustment_account")
 
 
 def repost_stock_entry(doc):
diff --git a/erpnext/patches/v13_0/add_po_to_global_search.py b/erpnext/patches/v13_0/add_po_to_global_search.py
index 514cd34..c07b6d9 100644
--- a/erpnext/patches/v13_0/add_po_to_global_search.py
+++ b/erpnext/patches/v13_0/add_po_to_global_search.py
@@ -4,9 +4,7 @@
 def execute():
 	global_search_settings = frappe.get_single("Global Search Settings")
 
-	if "Purchase Order" in (
-		dt.document_type for dt in global_search_settings.allowed_in_global_search
-	):
+	if "Purchase Order" in (dt.document_type for dt in global_search_settings.allowed_in_global_search):
 		return
 
 	global_search_settings.append("allowed_in_global_search", {"document_type": "Purchase Order"})
diff --git a/erpnext/patches/v13_0/agriculture_deprecation_warning.py b/erpnext/patches/v13_0/agriculture_deprecation_warning.py
index 512444e..053710b 100644
--- a/erpnext/patches/v13_0/agriculture_deprecation_warning.py
+++ b/erpnext/patches/v13_0/agriculture_deprecation_warning.py
@@ -2,7 +2,6 @@
 
 
 def execute():
-
 	click.secho(
 		"Agriculture Domain is moved to a separate app and will be removed from ERPNext in version-14.\n"
 		"Please install the app to continue using the Agriculture domain: https://github.com/frappe/agriculture",
diff --git a/erpnext/patches/v13_0/change_default_item_manufacturer_fieldtype.py b/erpnext/patches/v13_0/change_default_item_manufacturer_fieldtype.py
index 0b00188..5baec0c 100644
--- a/erpnext/patches/v13_0/change_default_item_manufacturer_fieldtype.py
+++ b/erpnext/patches/v13_0/change_default_item_manufacturer_fieldtype.py
@@ -2,7 +2,6 @@
 
 
 def execute():
-
 	# Erase all default item manufacturers that dont exist.
 	item = frappe.qb.DocType("Item")
 	manufacturer = frappe.qb.DocType("Manufacturer")
diff --git a/erpnext/patches/v13_0/convert_qi_parameter_to_link_field.py b/erpnext/patches/v13_0/convert_qi_parameter_to_link_field.py
index 08ddbbf..d0bde56 100644
--- a/erpnext/patches/v13_0/convert_qi_parameter_to_link_field.py
+++ b/erpnext/patches/v13_0/convert_qi_parameter_to_link_field.py
@@ -6,9 +6,7 @@
 	params = set()
 
 	# get all parameters from QI readings table
-	for (p,) in frappe.db.get_all(
-		"Quality Inspection Reading", fields=["specification"], as_list=True
-	):
+	for (p,) in frappe.db.get_all("Quality Inspection Reading", fields=["specification"], as_list=True):
 		params.add(p.strip())
 
 	# get all parameters from QI Template as some may be unused in QI
diff --git a/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py b/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py
index 8e6bce6..84b17a5 100644
--- a/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py
+++ b/erpnext/patches/v13_0/create_accounting_dimensions_in_orders.py
@@ -12,14 +12,12 @@
 
 	count = 1
 	for d in accounting_dimensions:
-
 		if count % 2 == 0:
 			insert_after_field = "dimension_col_break"
 		else:
 			insert_after_field = "accounting_dimensions_section"
 
 		for doctype in ["Purchase Order", "Purchase Receipt", "Sales Order"]:
-
 			field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": d.fieldname})
 
 			if field:
@@ -36,7 +34,7 @@
 			try:
 				create_custom_field(doctype, df, ignore_validate=True)
 				frappe.clear_cache(doctype=doctype)
-			except Exception as e:
+			except Exception:
 				pass
 
 		count += 1
diff --git a/erpnext/patches/v13_0/create_accounting_dimensions_in_pos_doctypes.py b/erpnext/patches/v13_0/create_accounting_dimensions_in_pos_doctypes.py
index 51ab0e8..b9e7033 100644
--- a/erpnext/patches/v13_0/create_accounting_dimensions_in_pos_doctypes.py
+++ b/erpnext/patches/v13_0/create_accounting_dimensions_in_pos_doctypes.py
@@ -15,14 +15,12 @@
 
 	count = 1
 	for d in accounting_dimensions:
-
 		if count % 2 == 0:
 			insert_after_field = "dimension_col_break"
 		else:
 			insert_after_field = "accounting_dimensions_section"
 
 		for doctype in ["POS Invoice", "POS Invoice Item"]:
-
 			field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": d.fieldname})
 
 			if field:
diff --git a/erpnext/patches/v13_0/create_uae_pos_invoice_fields.py b/erpnext/patches/v13_0/create_uae_pos_invoice_fields.py
index 66aae9a..d28f8c9 100644
--- a/erpnext/patches/v13_0/create_uae_pos_invoice_fields.py
+++ b/erpnext/patches/v13_0/create_uae_pos_invoice_fields.py
@@ -8,9 +8,7 @@
 
 
 def execute():
-	company = frappe.get_all(
-		"Company", filters={"country": ["in", ["Saudi Arabia", "United Arab Emirates"]]}
-	)
+	company = frappe.get_all("Company", filters={"country": ["in", ["Saudi Arabia", "United Arab Emirates"]]})
 	if not company:
 		return
 
diff --git a/erpnext/patches/v13_0/delete_bank_reconciliation_detail.py b/erpnext/patches/v13_0/delete_bank_reconciliation_detail.py
index c53eb79..46946a8 100644
--- a/erpnext/patches/v13_0/delete_bank_reconciliation_detail.py
+++ b/erpnext/patches/v13_0/delete_bank_reconciliation_detail.py
@@ -6,9 +6,7 @@
 
 
 def execute():
-
 	if frappe.db.exists("DocType", "Bank Reconciliation Detail") and frappe.db.exists(
 		"DocType", "Bank Clearance Detail"
 	):
-
 		frappe.delete_doc("DocType", "Bank Reconciliation Detail", force=1)
diff --git a/erpnext/patches/v13_0/enable_provisional_accounting.py b/erpnext/patches/v13_0/enable_provisional_accounting.py
index dd18167..6edb423 100644
--- a/erpnext/patches/v13_0/enable_provisional_accounting.py
+++ b/erpnext/patches/v13_0/enable_provisional_accounting.py
@@ -11,6 +11,4 @@
 		company.enable_perpetual_inventory_for_non_stock_items,
 	).set(company.default_provisional_account, company.service_received_but_not_billed).where(
 		company.enable_perpetual_inventory_for_non_stock_items == 1
-	).where(
-		company.service_received_but_not_billed.isnotnull()
-	).run()
+	).where(company.service_received_but_not_billed.isnotnull()).run()
diff --git a/erpnext/patches/v13_0/fix_additional_cost_in_mfg_stock_entry.py b/erpnext/patches/v13_0/fix_additional_cost_in_mfg_stock_entry.py
index aeb8d8e..e305b37 100644
--- a/erpnext/patches/v13_0/fix_additional_cost_in_mfg_stock_entry.py
+++ b/erpnext/patches/v13_0/fix_additional_cost_in_mfg_stock_entry.py
@@ -1,4 +1,4 @@
-from typing import List, NewType
+from typing import NewType
 
 import frappe
 
@@ -13,7 +13,7 @@
 		create_repost_item_valuation(patched_stock_entry)
 
 
-def find_broken_stock_entries() -> List[StockEntryCode]:
+def find_broken_stock_entries() -> list[StockEntryCode]:
 	period_closing_date = frappe.db.get_value(
 		"Period Closing Voucher", {"docstatus": 1}, "posting_date", order_by="posting_date desc"
 	)
diff --git a/erpnext/patches/v13_0/fix_invoice_statuses.py b/erpnext/patches/v13_0/fix_invoice_statuses.py
index 253b425..dc15a01 100644
--- a/erpnext/patches/v13_0/fix_invoice_statuses.py
+++ b/erpnext/patches/v13_0/fix_invoice_statuses.py
@@ -41,7 +41,7 @@
 					("Overdue", "Overdue and Discounted", "Partly Paid", "Partly Paid and Discounted"),
 				),
 				"outstanding_amount": (">", 0),
-				"modified": (">", "2021-01-01")
+				"modified": (">", "2021-01-01"),
 				# an assumption is being made that only invoices modified
 				# after 2021 got affected as incorrectly overdue.
 				# required for performance reasons.
diff --git a/erpnext/patches/v13_0/healthcare_deprecation_warning.py b/erpnext/patches/v13_0/healthcare_deprecation_warning.py
index c6fba59..3fff235 100644
--- a/erpnext/patches/v13_0/healthcare_deprecation_warning.py
+++ b/erpnext/patches/v13_0/healthcare_deprecation_warning.py
@@ -2,7 +2,6 @@
 
 
 def execute():
-
 	click.secho(
 		"Healthcare Module is moved to a separate app and will be removed from ERPNext in version-14.\n"
 		"Please install the app to continue using the module: https://github.com/frappe/healthcare",
diff --git a/erpnext/patches/v13_0/hospitality_deprecation_warning.py b/erpnext/patches/v13_0/hospitality_deprecation_warning.py
index 2708b2c..6416651 100644
--- a/erpnext/patches/v13_0/hospitality_deprecation_warning.py
+++ b/erpnext/patches/v13_0/hospitality_deprecation_warning.py
@@ -2,7 +2,6 @@
 
 
 def execute():
-
 	click.secho(
 		"Hospitality domain is moved to a separate app and will be removed from ERPNext in version-14.\n"
 		"When upgrading to ERPNext version-14, please install the app to continue using the Hospitality domain: https://github.com/frappe/hospitality",
diff --git a/erpnext/patches/v13_0/item_naming_series_not_mandatory.py b/erpnext/patches/v13_0/item_naming_series_not_mandatory.py
index 0235a62..d25da7a 100644
--- a/erpnext/patches/v13_0/item_naming_series_not_mandatory.py
+++ b/erpnext/patches/v13_0/item_naming_series_not_mandatory.py
@@ -4,7 +4,6 @@
 
 
 def execute():
-
 	stock_settings = frappe.get_doc("Stock Settings")
 
 	set_by_naming_series(
diff --git a/erpnext/patches/v13_0/move_branch_code_to_bank_account.py b/erpnext/patches/v13_0/move_branch_code_to_bank_account.py
index 2406127..79c79ff 100644
--- a/erpnext/patches/v13_0/move_branch_code_to_bank_account.py
+++ b/erpnext/patches/v13_0/move_branch_code_to_bank_account.py
@@ -6,13 +6,10 @@
 
 
 def execute():
-
 	frappe.reload_doc("accounts", "doctype", "bank_account")
 	frappe.reload_doc("accounts", "doctype", "bank")
 
-	if frappe.db.has_column("Bank", "branch_code") and frappe.db.has_column(
-		"Bank Account", "branch_code"
-	):
+	if frappe.db.has_column("Bank", "branch_code") and frappe.db.has_column("Bank Account", "branch_code"):
 		frappe.db.sql(
 			"""UPDATE `tabBank` b, `tabBank Account` ba
 			SET ba.branch_code = b.branch_code
diff --git a/erpnext/patches/v13_0/non_profit_deprecation_warning.py b/erpnext/patches/v13_0/non_profit_deprecation_warning.py
index 5b54b25..1736646 100644
--- a/erpnext/patches/v13_0/non_profit_deprecation_warning.py
+++ b/erpnext/patches/v13_0/non_profit_deprecation_warning.py
@@ -2,7 +2,6 @@
 
 
 def execute():
-
 	click.secho(
 		"Non Profit Domain is moved to a separate app and will be removed from ERPNext in version-14.\n"
 		"When upgrading to ERPNext version-14, please install the app to continue using the Non Profit domain: https://github.com/frappe/non_profit",
diff --git a/erpnext/patches/v13_0/rename_issue_doctype_fields.py b/erpnext/patches/v13_0/rename_issue_doctype_fields.py
index a9b6df7..dfa76a7 100644
--- a/erpnext/patches/v13_0/rename_issue_doctype_fields.py
+++ b/erpnext/patches/v13_0/rename_issue_doctype_fields.py
@@ -57,7 +57,11 @@
 		for entry in opportunities:
 			mins_to_first_response = convert_to_seconds(entry.mins_to_first_response, "Minutes")
 			frappe.db.set_value(
-				"Opportunity", entry.name, "first_response_time", mins_to_first_response, update_modified=False
+				"Opportunity",
+				entry.name,
+				"first_response_time",
+				mins_to_first_response,
+				update_modified=False,
 			)
 			# commit after every 100 updates
 			count += 1
diff --git a/erpnext/patches/v13_0/requeue_failed_reposts.py b/erpnext/patches/v13_0/requeue_failed_reposts.py
index 752490d..c7dfaa2 100644
--- a/erpnext/patches/v13_0/requeue_failed_reposts.py
+++ b/erpnext/patches/v13_0/requeue_failed_reposts.py
@@ -3,7 +3,6 @@
 
 
 def execute():
-
 	reposts = frappe.get_all(
 		"Repost Item Valuation",
 		{"status": "Failed", "modified": [">", "2021-10-05"]},
diff --git a/erpnext/patches/v13_0/set_per_billed_in_return_delivery_note.py b/erpnext/patches/v13_0/set_per_billed_in_return_delivery_note.py
index a4d7012..40df73e 100644
--- a/erpnext/patches/v13_0/set_per_billed_in_return_delivery_note.py
+++ b/erpnext/patches/v13_0/set_per_billed_in_return_delivery_note.py
@@ -20,9 +20,9 @@
 		.run(as_dict=True)
 	)
 
-	frappe.qb.update(dn_item).inner_join(dn).on(dn.name == dn_item.parent).set(
-		dn_item.returned_qty, 0
-	).where(dn.is_return == 1).where(dn_item.returned_qty > 0).run()
+	frappe.qb.update(dn_item).inner_join(dn).on(dn.name == dn_item.parent).set(dn_item.returned_qty, 0).where(
+		dn.is_return == 1
+	).where(dn_item.returned_qty > 0).run()
 
 	for d in dn_list:
 		dn_doc = frappe.get_doc("Delivery Note", d.get("name"))
diff --git a/erpnext/patches/v13_0/set_work_order_qty_in_so_from_mr.py b/erpnext/patches/v13_0/set_work_order_qty_in_so_from_mr.py
index 1adf0d8..be30fb1 100644
--- a/erpnext/patches/v13_0/set_work_order_qty_in_so_from_mr.py
+++ b/erpnext/patches/v13_0/set_work_order_qty_in_so_from_mr.py
@@ -28,9 +28,7 @@
 	results = query.run(as_dict=True)
 
 	for row in results:
-		so_item = frappe.get_value(
-			"Material Request Item", row.material_request_item, "sales_order_item"
-		)
+		so_item = frappe.get_value("Material Request Item", row.material_request_item, "sales_order_item")
 		frappe.db.set_value("Work Order", row.name, "sales_order_item", so_item)
 
 		if so_item:
diff --git a/erpnext/patches/v13_0/shopify_deprecation_warning.py b/erpnext/patches/v13_0/shopify_deprecation_warning.py
index 245d1a9..274c35f 100644
--- a/erpnext/patches/v13_0/shopify_deprecation_warning.py
+++ b/erpnext/patches/v13_0/shopify_deprecation_warning.py
@@ -2,7 +2,6 @@
 
 
 def execute():
-
 	click.secho(
 		"Shopify Integration is moved to a separate app and will be removed from ERPNext in version-14.\n"
 		"Please install the app to continue using the integration: https://github.com/frappe/ecommerce_integrations",
diff --git a/erpnext/patches/v13_0/trim_whitespace_from_serial_nos.py b/erpnext/patches/v13_0/trim_whitespace_from_serial_nos.py
index b69a408..182711a 100644
--- a/erpnext/patches/v13_0/trim_whitespace_from_serial_nos.py
+++ b/erpnext/patches/v13_0/trim_whitespace_from_serial_nos.py
@@ -38,9 +38,7 @@
 		if correct_sr_no == sle.serial_no:
 			continue
 
-		frappe.db.set_value(
-			"Stock Ledger Entry", sle.name, "serial_no", correct_sr_no, update_modified=False
-		)
+		frappe.db.set_value("Stock Ledger Entry", sle.name, "serial_no", correct_sr_no, update_modified=False)
 		broken_serial_nos.update(serial_no_list)
 
 	if not broken_serial_nos:
diff --git a/erpnext/patches/v13_0/update_actual_start_and_end_date_in_wo.py b/erpnext/patches/v13_0/update_actual_start_and_end_date_in_wo.py
index 3c6c5b5..2c41a29 100644
--- a/erpnext/patches/v13_0/update_actual_start_and_end_date_in_wo.py
+++ b/erpnext/patches/v13_0/update_actual_start_and_end_date_in_wo.py
@@ -29,7 +29,7 @@
 			)
 
 			if not doc.planned_end_date:
-				planned_end_date = add_to_date(doc.planned_start_date, minutes=doc.lead_time)
+				add_to_date(doc.planned_start_date, minutes=doc.lead_time)
 				doc.db_set("planned_end_date", doc.actual_start_date, update_modified=False)
 
 	frappe.db.sql(
diff --git a/erpnext/patches/v13_0/update_job_card_status.py b/erpnext/patches/v13_0/update_job_card_status.py
index f2d12da..0f54692 100644
--- a/erpnext/patches/v13_0/update_job_card_status.py
+++ b/erpnext/patches/v13_0/update_job_card_status.py
@@ -5,7 +5,6 @@
 
 
 def execute():
-
 	job_card = frappe.qb.DocType("Job Card")
 	(
 		frappe.qb.update(job_card)
diff --git a/erpnext/patches/v13_0/update_maintenance_schedule_field_in_visit.py b/erpnext/patches/v13_0/update_maintenance_schedule_field_in_visit.py
index 136d34e..183cd79 100644
--- a/erpnext/patches/v13_0/update_maintenance_schedule_field_in_visit.py
+++ b/erpnext/patches/v13_0/update_maintenance_schedule_field_in_visit.py
@@ -13,8 +13,6 @@
 
 	frappe.qb.update(mv).join(mvp).on(mvp.parent == mv.name).set(
 		mv.maintenance_schedule, Coalesce(mvp.prevdoc_docname, "")
-	).where(
-		(mv.maintenance_type == "Scheduled") & (mvp.prevdoc_docname.notnull()) & (mv.docstatus < 2)
-	).run(
+	).where((mv.maintenance_type == "Scheduled") & (mvp.prevdoc_docname.notnull()) & (mv.docstatus < 2)).run(
 		as_dict=1
 	)
diff --git a/erpnext/patches/v13_0/update_reserved_qty_closed_wo.py b/erpnext/patches/v13_0/update_reserved_qty_closed_wo.py
index 72e77fe..4bba7b9 100644
--- a/erpnext/patches/v13_0/update_reserved_qty_closed_wo.py
+++ b/erpnext/patches/v13_0/update_reserved_qty_closed_wo.py
@@ -4,7 +4,6 @@
 
 
 def execute():
-
 	wo = frappe.qb.DocType("Work Order")
 	wo_item = frappe.qb.DocType("Work Order Item")
 
diff --git a/erpnext/patches/v13_0/update_sane_transfer_against.py b/erpnext/patches/v13_0/update_sane_transfer_against.py
index 45691e2..0f58775 100644
--- a/erpnext/patches/v13_0/update_sane_transfer_against.py
+++ b/erpnext/patches/v13_0/update_sane_transfer_against.py
@@ -5,7 +5,5 @@
 	bom = frappe.qb.DocType("BOM")
 
 	(
-		frappe.qb.update(bom)
-		.set(bom.transfer_material_against, "Work Order")
-		.where(bom.with_operations == 0)
+		frappe.qb.update(bom).set(bom.transfer_material_against, "Work Order").where(bom.with_operations == 0)
 	).run()
diff --git a/erpnext/patches/v13_0/update_sla_enhancements.py b/erpnext/patches/v13_0/update_sla_enhancements.py
index cf9e185..8464fa8 100644
--- a/erpnext/patches/v13_0/update_sla_enhancements.py
+++ b/erpnext/patches/v13_0/update_sla_enhancements.py
@@ -39,7 +39,9 @@
 		for priority in priorities:
 			if priority.parenttype == "Service Level Agreement":
 				response_time = convert_to_seconds(priority.response_time, priority.response_time_period)
-				resolution_time = convert_to_seconds(priority.resolution_time, priority.resolution_time_period)
+				resolution_time = convert_to_seconds(
+					priority.resolution_time, priority.resolution_time_period
+				)
 				frappe.db.set_value(
 					"Service Level Priority",
 					priority.name,
@@ -86,7 +88,9 @@
 							{
 								"priority": priority.priority,
 								"default_priority": priority.default_priority,
-								"response_time": convert_to_seconds(priority.response_time, priority.response_time_period),
+								"response_time": convert_to_seconds(
+									priority.response_time, priority.response_time_period
+								),
 								"resolution_time": convert_to_seconds(
 									priority.resolution_time, priority.resolution_time_period
 								),
diff --git a/erpnext/patches/v13_0/update_subscription.py b/erpnext/patches/v13_0/update_subscription.py
index 66b3def..96bd146 100644
--- a/erpnext/patches/v13_0/update_subscription.py
+++ b/erpnext/patches/v13_0/update_subscription.py
@@ -6,7 +6,6 @@
 
 
 def execute():
-
 	frappe.reload_doc("accounts", "doctype", "subscription")
 	frappe.reload_doc("accounts", "doctype", "subscription_invoice")
 	frappe.reload_doc("accounts", "doctype", "subscription_plan")
diff --git a/erpnext/patches/v13_0/update_timesheet_changes.py b/erpnext/patches/v13_0/update_timesheet_changes.py
index 02654c1..c54b4cb 100644
--- a/erpnext/patches/v13_0/update_timesheet_changes.py
+++ b/erpnext/patches/v13_0/update_timesheet_changes.py
@@ -20,12 +20,10 @@
 	)
 
 	frappe.db.sql(
-		"""UPDATE `tabTimesheet`
-			SET currency = '{0}',
+		f"""UPDATE `tabTimesheet`
+			SET currency = '{base_currency}',
 			exchange_rate = 1.0,
 			base_total_billable_amount = total_billable_amount,
 			base_total_billed_amount = total_billed_amount,
-			base_total_costing_amount = total_costing_amount""".format(
-			base_currency
-		)
+			base_total_costing_amount = total_costing_amount"""
 	)
diff --git a/erpnext/patches/v13_0/wipe_serial_no_field_for_0_qty.py b/erpnext/patches/v13_0/wipe_serial_no_field_for_0_qty.py
index 693d06d..280635c 100644
--- a/erpnext/patches/v13_0/wipe_serial_no_field_for_0_qty.py
+++ b/erpnext/patches/v13_0/wipe_serial_no_field_for_0_qty.py
@@ -2,7 +2,6 @@
 
 
 def execute():
-
 	doctype = "Stock Reconciliation Item"
 
 	if not frappe.db.has_column(doctype, "current_serial_no"):
@@ -11,6 +10,4 @@
 
 	sr_item = frappe.qb.DocType(doctype)
 
-	(
-		frappe.qb.update(sr_item).set(sr_item.current_serial_no, None).where(sr_item.current_qty == 0)
-	).run()
+	(frappe.qb.update(sr_item).set(sr_item.current_serial_no, None).where(sr_item.current_qty == 0)).run()
diff --git a/erpnext/patches/v14_0/change_is_subcontracted_fieldtype.py b/erpnext/patches/v14_0/change_is_subcontracted_fieldtype.py
index 9b07ba8..a044bb0 100644
--- a/erpnext/patches/v14_0/change_is_subcontracted_fieldtype.py
+++ b/erpnext/patches/v14_0/change_is_subcontracted_fieldtype.py
@@ -7,20 +7,16 @@
 def execute():
 	for doctype in ["Purchase Order", "Purchase Receipt", "Purchase Invoice", "Supplier Quotation"]:
 		frappe.db.sql(
-			"""
+			f"""
 				UPDATE `tab{doctype}`
 				SET is_subcontracted = 0
-				where is_subcontracted in ('', 'No') or is_subcontracted is null""".format(
-				doctype=doctype
-			)
+				where is_subcontracted in ('', 'No') or is_subcontracted is null"""
 		)
 		frappe.db.sql(
-			"""
+			f"""
 				UPDATE `tab{doctype}`
 				SET is_subcontracted = 1
-				where is_subcontracted = 'Yes'""".format(
-				doctype=doctype
-			)
+				where is_subcontracted = 'Yes'"""
 		)
 
 		frappe.reload_doc(frappe.get_meta(doctype).module, "doctype", frappe.scrub(doctype))
diff --git a/erpnext/patches/v14_0/copy_is_subcontracted_value_to_is_old_subcontracting_flow.py b/erpnext/patches/v14_0/copy_is_subcontracted_value_to_is_old_subcontracting_flow.py
index 607ef695..40a408b 100644
--- a/erpnext/patches/v14_0/copy_is_subcontracted_value_to_is_old_subcontracting_flow.py
+++ b/erpnext/patches/v14_0/copy_is_subcontracted_value_to_is_old_subcontracting_flow.py
@@ -7,6 +7,4 @@
 def execute():
 	for doctype in ["Purchase Order", "Purchase Receipt", "Purchase Invoice"]:
 		tab = frappe.qb.DocType(doctype).as_("tab")
-		frappe.qb.update(tab).set(tab.is_old_subcontracting_flow, 1).where(
-			tab.is_subcontracted == 1
-		).run()
+		frappe.qb.update(tab).set(tab.is_old_subcontracting_flow, 1).where(tab.is_subcontracted == 1).run()
diff --git a/erpnext/patches/v14_0/create_accounting_dimensions_in_subcontracting_doctypes.py b/erpnext/patches/v14_0/create_accounting_dimensions_in_subcontracting_doctypes.py
index b349c07..aedf2f1 100644
--- a/erpnext/patches/v14_0/create_accounting_dimensions_in_subcontracting_doctypes.py
+++ b/erpnext/patches/v14_0/create_accounting_dimensions_in_subcontracting_doctypes.py
@@ -12,7 +12,6 @@
 
 	count = 1
 	for d in accounting_dimensions:
-
 		if count % 2 == 0:
 			insert_after_field = "dimension_col_break"
 		else:
@@ -24,7 +23,6 @@
 			"Subcontracting Receipt",
 			"Subcontracting Receipt Item",
 		]:
-
 			field = frappe.db.get_value("Custom Field", {"dt": doctype, "fieldname": d.fieldname})
 
 			if field:
diff --git a/erpnext/patches/v14_0/crm_ux_cleanup.py b/erpnext/patches/v14_0/crm_ux_cleanup.py
index b2df36f..186ccf8 100644
--- a/erpnext/patches/v14_0/crm_ux_cleanup.py
+++ b/erpnext/patches/v14_0/crm_ux_cleanup.py
@@ -45,7 +45,8 @@
 				"owner": d.lead_owner,
 				"subject": ("Contact " + cstr(d.lead_name)),
 				"description": (
-					("Contact " + cstr(d.lead_name)) + (("<br>By: " + cstr(d.contact_by)) if d.contact_by else "")
+					("Contact " + cstr(d.lead_name))
+					+ (("<br>By: " + cstr(d.contact_by)) if d.contact_by else "")
 				),
 				"starts_on": d.contact_date,
 				"ends_on": d.ends_on,
@@ -87,8 +88,6 @@
 			}
 		)
 
-		event.append(
-			"event_participants", {"reference_doctype": "Opportunity", "reference_docname": d.name}
-		)
+		event.append("event_participants", {"reference_doctype": "Opportunity", "reference_docname": d.name})
 
 		event.insert(ignore_permissions=True)
diff --git a/erpnext/patches/v14_0/delete_agriculture_doctypes.py b/erpnext/patches/v14_0/delete_agriculture_doctypes.py
index 8ec0c33..c8f9c93 100644
--- a/erpnext/patches/v14_0/delete_agriculture_doctypes.py
+++ b/erpnext/patches/v14_0/delete_agriculture_doctypes.py
@@ -13,9 +13,7 @@
 	for report in reports:
 		frappe.delete_doc("Report", report, ignore_missing=True, force=True)
 
-	dashboards = frappe.get_all(
-		"Dashboard", {"module": "agriculture", "is_standard": 1}, pluck="name"
-	)
+	dashboards = frappe.get_all("Dashboard", {"module": "agriculture", "is_standard": 1}, pluck="name")
 	for dashboard in dashboards:
 		frappe.delete_doc("Dashboard", dashboard, ignore_missing=True, force=True)
 
diff --git a/erpnext/patches/v14_0/delete_education_doctypes.py b/erpnext/patches/v14_0/delete_education_doctypes.py
index aeeda70..9b99f72 100644
--- a/erpnext/patches/v14_0/delete_education_doctypes.py
+++ b/erpnext/patches/v14_0/delete_education_doctypes.py
@@ -16,9 +16,7 @@
 	for report in reports:
 		frappe.delete_doc("Report", report, ignore_missing=True, force=True)
 
-	print_formats = frappe.get_all(
-		"Print Format", {"module": "education", "standard": "Yes"}, pluck="name"
-	)
+	print_formats = frappe.get_all("Print Format", {"module": "education", "standard": "Yes"}, pluck="name")
 	for print_format in print_formats:
 		frappe.delete_doc("Print Format", print_format, ignore_missing=True, force=True)
 
@@ -31,9 +29,7 @@
 	for dashboard in dashboards:
 		frappe.delete_doc("Dashboard", dashboard, ignore_missing=True, force=True)
 
-	dashboards = frappe.get_all(
-		"Dashboard Chart", {"module": "education", "is_standard": 1}, pluck="name"
-	)
+	dashboards = frappe.get_all("Dashboard Chart", {"module": "education", "is_standard": 1}, pluck="name")
 	for dashboard in dashboards:
 		frappe.delete_doc("Dashboard Chart", dashboard, ignore_missing=True, force=True)
 
diff --git a/erpnext/patches/v14_0/delete_healthcare_doctypes.py b/erpnext/patches/v14_0/delete_healthcare_doctypes.py
index 896a440..b4dde5b 100644
--- a/erpnext/patches/v14_0/delete_healthcare_doctypes.py
+++ b/erpnext/patches/v14_0/delete_healthcare_doctypes.py
@@ -15,9 +15,7 @@
 	for report in reports:
 		frappe.delete_doc("Report", report, ignore_missing=True, force=True)
 
-	print_formats = frappe.get_all(
-		"Print Format", {"module": "healthcare", "standard": "Yes"}, pluck="name"
-	)
+	print_formats = frappe.get_all("Print Format", {"module": "healthcare", "standard": "Yes"}, pluck="name")
 	for print_format in print_formats:
 		frappe.delete_doc("Print Format", print_format, ignore_missing=True, force=True)
 
@@ -30,9 +28,7 @@
 	for dashboard in dashboards:
 		frappe.delete_doc("Dashboard", dashboard, ignore_missing=True, force=True)
 
-	dashboards = frappe.get_all(
-		"Dashboard Chart", {"module": "healthcare", "is_standard": 1}, pluck="name"
-	)
+	dashboards = frappe.get_all("Dashboard Chart", {"module": "healthcare", "is_standard": 1}, pluck="name")
 	for dashboard in dashboards:
 		frappe.delete_doc("Dashboard Chart", dashboard, ignore_missing=True, force=True)
 
diff --git a/erpnext/patches/v14_0/delete_hub_doctypes.py b/erpnext/patches/v14_0/delete_hub_doctypes.py
index 08f4445..451880d 100644
--- a/erpnext/patches/v14_0/delete_hub_doctypes.py
+++ b/erpnext/patches/v14_0/delete_hub_doctypes.py
@@ -2,7 +2,6 @@
 
 
 def execute():
-
 	doctypes = frappe.get_all("DocType", {"module": "Hub Node", "custom": 0}, pluck="name")
 	for doctype in doctypes:
 		frappe.delete_doc("DocType", doctype, ignore_missing=True)
diff --git a/erpnext/patches/v14_0/delete_non_profit_doctypes.py b/erpnext/patches/v14_0/delete_non_profit_doctypes.py
index e9ea8b1..74a73fd 100644
--- a/erpnext/patches/v14_0/delete_non_profit_doctypes.py
+++ b/erpnext/patches/v14_0/delete_non_profit_doctypes.py
@@ -6,9 +6,7 @@
 
 	frappe.delete_doc("Workspace", "Non Profit", ignore_missing=True, force=True)
 
-	print_formats = frappe.get_all(
-		"Print Format", {"module": "Non Profit", "standard": "Yes"}, pluck="name"
-	)
+	print_formats = frappe.get_all("Print Format", {"module": "Non Profit", "standard": "Yes"}, pluck="name")
 	for print_format in print_formats:
 		frappe.delete_doc("Print Format", print_format, ignore_missing=True, force=True)
 
diff --git a/erpnext/patches/v14_0/fix_crm_no_of_employees.py b/erpnext/patches/v14_0/fix_crm_no_of_employees.py
index 268eb95..29c8b05 100644
--- a/erpnext/patches/v14_0/fix_crm_no_of_employees.py
+++ b/erpnext/patches/v14_0/fix_crm_no_of_employees.py
@@ -15,12 +15,10 @@
 		frappe.reload_doctype(doctype)
 		for key, value in options.items():
 			frappe.db.sql(
-				"""
+				f"""
                 update `tab{doctype}`
                 set no_of_employees = %s
                 where no_of_employees = %s
-            """.format(
-					doctype=doctype
-				),
+            """,
 				(value, key),
 			)
diff --git a/erpnext/patches/v14_0/migrate_cost_center_allocations.py b/erpnext/patches/v14_0/migrate_cost_center_allocations.py
index 48f4e6d..03e2b02 100644
--- a/erpnext/patches/v14_0/migrate_cost_center_allocations.py
+++ b/erpnext/patches/v14_0/migrate_cost_center_allocations.py
@@ -44,8 +44,6 @@
 
 	cc_allocations = frappe._dict()
 	for d in records:
-		cc_allocations.setdefault(d.name, frappe._dict()).setdefault(
-			d.cost_center, d.percentage_allocation
-		)
+		cc_allocations.setdefault(d.name, frappe._dict()).setdefault(d.cost_center, d.percentage_allocation)
 
 	return cc_allocations
diff --git a/erpnext/patches/v14_0/migrate_gl_to_payment_ledger.py b/erpnext/patches/v14_0/migrate_gl_to_payment_ledger.py
index 95b5bc5..de9a62e 100644
--- a/erpnext/patches/v14_0/migrate_gl_to_payment_ledger.py
+++ b/erpnext/patches/v14_0/migrate_gl_to_payment_ledger.py
@@ -152,7 +152,8 @@
 						gl.star,
 						ConstantColumn(1).as_("docstatus"),
 						IfNull(
-							ifelse(gl.against_voucher_type == "", None, gl.against_voucher_type), gl.voucher_type
+							ifelse(gl.against_voucher_type == "", None, gl.against_voucher_type),
+							gl.voucher_type,
 						).as_("against_voucher_type"),
 						IfNull(ifelse(gl.against_voucher == "", None, gl.against_voucher), gl.voucher_no).as_(
 							"against_voucher_no"
diff --git a/erpnext/patches/v14_0/remove_hr_and_payroll_modules.py b/erpnext/patches/v14_0/remove_hr_and_payroll_modules.py
index 4d01fcb..3d01f14 100644
--- a/erpnext/patches/v14_0/remove_hr_and_payroll_modules.py
+++ b/erpnext/patches/v14_0/remove_hr_and_payroll_modules.py
@@ -33,9 +33,7 @@
 	]:
 		frappe.delete_doc("Report", report, ignore_missing=True, force=True)
 
-	doctypes = frappe.get_all(
-		"DocType", {"module": ("in", ["HR", "Payroll"]), "custom": 0}, pluck="name"
-	)
+	doctypes = frappe.get_all("DocType", {"module": ("in", ["HR", "Payroll"]), "custom": 0}, pluck="name")
 	for doctype in doctypes:
 		frappe.delete_doc("DocType", doctype, ignore_missing=True, force=True)
 
@@ -51,9 +49,7 @@
 	frappe.delete_doc("User Type", "Employee Self Service", ignore_missing=True, force=True)
 
 	for dt in ["Web Form", "Dashboard", "Dashboard Chart", "Number Card"]:
-		records = frappe.get_all(
-			dt, {"module": ("in", ["HR", "Payroll"]), "is_standard": 1}, pluck="name"
-		)
+		records = frappe.get_all(dt, {"module": ("in", ["HR", "Payroll"]), "is_standard": 1}, pluck="name")
 		for record in records:
 			frappe.delete_doc(dt, record, ignore_missing=True, force=True)
 
diff --git a/erpnext/patches/v14_0/update_closing_balances.py b/erpnext/patches/v14_0/update_closing_balances.py
index 2c84281..cfc29c8 100644
--- a/erpnext/patches/v14_0/update_closing_balances.py
+++ b/erpnext/patches/v14_0/update_closing_balances.py
@@ -22,7 +22,6 @@
 			filters={"docstatus": 1, "company": company},
 			order_by="posting_date",
 		):
-
 			company_wise_order.setdefault(pcv.company, [])
 			if pcv.posting_date not in company_wise_order[pcv.company]:
 				pcv_doc = frappe.get_doc("Period Closing Voucher", pcv.name)
diff --git a/erpnext/patches/v14_0/update_flag_for_return_invoices.py b/erpnext/patches/v14_0/update_flag_for_return_invoices.py
index bea9957..2136d55 100644
--- a/erpnext/patches/v14_0/update_flag_for_return_invoices.py
+++ b/erpnext/patches/v14_0/update_flag_for_return_invoices.py
@@ -22,7 +22,7 @@
 		.where(
 			(si.creation.gte(creation_date))
 			& (si.docstatus == 1)
-			& (si.is_return == True)
+			& (si.is_return.eq(True))
 			& (si.return_against.notnull())
 		)
 		.run()
@@ -51,7 +51,7 @@
 		.where(
 			(pi.creation.gte(creation_date))
 			& (pi.docstatus == 1)
-			& (pi.is_return == True)
+			& (pi.is_return.eq(True))
 			& (pi.return_against.notnull())
 		)
 		.run()
diff --git a/erpnext/patches/v14_0/update_partial_tds_fields.py b/erpnext/patches/v14_0/update_partial_tds_fields.py
index 5ccc2dc..9912013 100644
--- a/erpnext/patches/v14_0/update_partial_tds_fields.py
+++ b/erpnext/patches/v14_0/update_partial_tds_fields.py
@@ -14,32 +14,20 @@
 
 			frappe.qb.update(purchase_invoice).set(
 				purchase_invoice.tax_withholding_net_total, purchase_invoice.net_total
-			).set(
-				purchase_invoice.base_tax_withholding_net_total, purchase_invoice.base_net_total
-			).where(
+			).set(purchase_invoice.base_tax_withholding_net_total, purchase_invoice.base_net_total).where(
 				purchase_invoice.company == company.name
-			).where(
-				purchase_invoice.apply_tds == 1
-			).where(
+			).where(purchase_invoice.apply_tds == 1).where(
 				purchase_invoice.posting_date >= fiscal_year_details.year_start_date
-			).where(
-				purchase_invoice.docstatus == 1
-			).run()
+			).where(purchase_invoice.docstatus == 1).run()
 
 			purchase_order = frappe.qb.DocType("Purchase Order")
 
 			frappe.qb.update(purchase_order).set(
 				purchase_order.tax_withholding_net_total, purchase_order.net_total
-			).set(
-				purchase_order.base_tax_withholding_net_total, purchase_order.base_net_total
-			).where(
+			).set(purchase_order.base_tax_withholding_net_total, purchase_order.base_net_total).where(
 				purchase_order.company == company.name
-			).where(
-				purchase_order.apply_tds == 1
-			).where(
+			).where(purchase_order.apply_tds == 1).where(
 				purchase_order.transaction_date >= fiscal_year_details.year_start_date
-			).where(
-				purchase_order.docstatus == 1
-			).run()
+			).where(purchase_order.docstatus == 1).run()
 		except FiscalYearError:
 			pass
diff --git a/erpnext/patches/v15_0/correct_asset_value_if_je_with_workflow.py b/erpnext/patches/v15_0/correct_asset_value_if_je_with_workflow.py
index aededa2..dba27b4 100644
--- a/erpnext/patches/v15_0/correct_asset_value_if_je_with_workflow.py
+++ b/erpnext/patches/v15_0/correct_asset_value_if_je_with_workflow.py
@@ -39,9 +39,7 @@
 			asset.opening_accumulated_depreciation.as_("opening_accumulated_depreciation"),
 			Sum(gle.debit).as_("depr_amount"),
 		)
-		.where(
-			gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account)
-		)
+		.where(gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account))
 		.where(gle.debit != 0)
 		.where(gle.is_cancelled == 0)
 		.where(asset.docstatus == 1)
@@ -80,9 +78,7 @@
 			asset.opening_accumulated_depreciation.as_("opening_accumulated_depreciation"),
 			Sum(gle.debit).as_("depr_amount"),
 		)
-		.where(
-			gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account)
-		)
+		.where(gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account))
 		.where(gle.debit != 0)
 		.where(gle.is_cancelled == 0)
 		.where(asset.docstatus == 1)
diff --git a/erpnext/patches/v15_0/create_advance_payment_status.py b/erpnext/patches/v15_0/create_advance_payment_status.py
index 18ab9fa..0b7163c 100644
--- a/erpnext/patches/v15_0/create_advance_payment_status.py
+++ b/erpnext/patches/v15_0/create_advance_payment_status.py
@@ -9,16 +9,14 @@
 
 	if frappe.reload_doc("selling", "doctype", "Sales Order"):
 		so = frappe.qb.DocType("Sales Order")
-		frappe.qb.update(so).set(so.advance_payment_status, "Not Requested").where(
-			so.docstatus == 1
-		).where(so.advance_paid == 0.0).run()
-
-		frappe.qb.update(so).set(so.advance_payment_status, "Partially Paid").where(
-			so.docstatus == 1
-		).where(so.advance_payment_status.isnull()).where(
-			so.advance_paid < (so.rounded_total or so.grand_total)
+		frappe.qb.update(so).set(so.advance_payment_status, "Not Requested").where(so.docstatus == 1).where(
+			so.advance_paid == 0.0
 		).run()
 
+		frappe.qb.update(so).set(so.advance_payment_status, "Partially Paid").where(so.docstatus == 1).where(
+			so.advance_payment_status.isnull()
+		).where(so.advance_paid < (so.rounded_total or so.grand_total)).run()
+
 		frappe.qb.update(so).set(so.advance_payment_status, "Fully Paid").where(so.docstatus == 1).where(
 			so.advance_payment_status.isnull()
 		).where(so.advance_paid == (so.rounded_total or so.grand_total)).run()
@@ -32,16 +30,14 @@
 
 	if frappe.reload_doc("buying", "doctype", "Purchase Order"):
 		po = frappe.qb.DocType("Purchase Order")
-		frappe.qb.update(po).set(po.advance_payment_status, "Not Initiated").where(
-			po.docstatus == 1
-		).where(po.advance_paid == 0.0).run()
-
-		frappe.qb.update(po).set(po.advance_payment_status, "Partially Paid").where(
-			po.docstatus == 1
-		).where(po.advance_payment_status.isnull()).where(
-			po.advance_paid < (po.rounded_total or po.grand_total)
+		frappe.qb.update(po).set(po.advance_payment_status, "Not Initiated").where(po.docstatus == 1).where(
+			po.advance_paid == 0.0
 		).run()
 
+		frappe.qb.update(po).set(po.advance_payment_status, "Partially Paid").where(po.docstatus == 1).where(
+			po.advance_payment_status.isnull()
+		).where(po.advance_paid < (po.rounded_total or po.grand_total)).run()
+
 		frappe.qb.update(po).set(po.advance_payment_status, "Fully Paid").where(po.docstatus == 1).where(
 			po.advance_payment_status.isnull()
 		).where(po.advance_paid == (po.rounded_total or po.grand_total)).run()
diff --git a/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py b/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
index ddce997..c31d754 100644
--- a/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
+++ b/erpnext/patches/v15_0/create_asset_depreciation_schedules_from_assets.py
@@ -57,7 +57,7 @@
 	grouped_dict = {}
 
 	for item in records:
-		key = list(item.keys())[0]
+		key = next(iter(item.keys()))
 		value = item[key]
 
 		if value not in grouped_dict:
diff --git a/erpnext/patches/v15_0/remove_loan_management_module.py b/erpnext/patches/v15_0/remove_loan_management_module.py
index 8242f9c..e18b092 100644
--- a/erpnext/patches/v15_0/remove_loan_management_module.py
+++ b/erpnext/patches/v15_0/remove_loan_management_module.py
@@ -15,9 +15,7 @@
 	for print_format in print_formats:
 		frappe.delete_doc("Print Format", print_format, ignore_missing=True, force=True)
 
-	reports = frappe.get_all(
-		"Report", {"module": "Loan Management", "is_standard": "Yes"}, pluck="name"
-	)
+	reports = frappe.get_all("Report", {"module": "Loan Management", "is_standard": "Yes"}, pluck="name")
 	for report in reports:
 		frappe.delete_doc("Report", report, ignore_missing=True, force=True)
 
diff --git a/erpnext/patches/v15_0/update_asset_value_for_manual_depr_entries.py b/erpnext/patches/v15_0/update_asset_value_for_manual_depr_entries.py
index 5d7b5cf..9bdcda0 100644
--- a/erpnext/patches/v15_0/update_asset_value_for_manual_depr_entries.py
+++ b/erpnext/patches/v15_0/update_asset_value_for_manual_depr_entries.py
@@ -17,9 +17,7 @@
 		.join(company)
 		.on(company.name == asset.company)
 		.select(Sum(gle.debit).as_("value"), asset.name.as_("asset_name"))
-		.where(
-			gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account)
-		)
+		.where(gle.account == IfNull(aca.depreciation_expense_account, company.depreciation_expense_account))
 		.where(gle.debit != 0)
 		.where(gle.is_cancelled == 0)
 		.where(asset.docstatus == 1)
@@ -31,8 +29,4 @@
 		asset_total_depr_value_map.asset_name == asset.name
 	).set(
 		asset.value_after_depreciation, asset.value_after_depreciation - asset_total_depr_value_map.value
-	).where(
-		asset.docstatus == 1
-	).where(
-		asset.calculate_depreciation == 0
-	).run()
+	).where(asset.docstatus == 1).where(asset.calculate_depreciation == 0).run()
diff --git a/erpnext/patches/v15_0/update_sre_from_voucher_details.py b/erpnext/patches/v15_0/update_sre_from_voucher_details.py
index 06ba553..83d11cf 100644
--- a/erpnext/patches/v15_0/update_sre_from_voucher_details.py
+++ b/erpnext/patches/v15_0/update_sre_from_voucher_details.py
@@ -12,7 +12,5 @@
 			.set(sre.from_voucher_type, "Pick List")
 			.set(sre.from_voucher_no, sre.against_pick_list)
 			.set(sre.from_voucher_detail_no, sre.against_pick_list_item)
-			.where(
-				(IfNull(sre.against_pick_list, "") != "") & (IfNull(sre.against_pick_list_item, "") != "")
-			)
+			.where((IfNull(sre.against_pick_list, "") != "") & (IfNull(sre.against_pick_list_item, "") != ""))
 		).run()
diff --git a/erpnext/portal/doctype/website_attribute/website_attribute.json b/erpnext/portal/doctype/website_attribute/website_attribute.json
index eed33ec..461c487 100644
--- a/erpnext/portal/doctype/website_attribute/website_attribute.json
+++ b/erpnext/portal/doctype/website_attribute/website_attribute.json
@@ -19,14 +19,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2021-02-18 13:18:57.810536",
+ "modified": "2024-03-27 13:10:59.786446",
  "modified_by": "Administrator",
  "module": "Portal",
  "name": "Website Attribute",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/portal/doctype/website_filter_field/website_filter_field.json b/erpnext/portal/doctype/website_filter_field/website_filter_field.json
index 45543a6..a01df9c 100644
--- a/erpnext/portal/doctype/website_filter_field/website_filter_field.json
+++ b/erpnext/portal/doctype/website_filter_field/website_filter_field.json
@@ -17,14 +17,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-04-18 18:55:17.835666",
+ "modified": "2024-03-27 13:10:59.895736",
  "modified_by": "Administrator",
  "module": "Portal",
  "name": "Website Filter Field",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/projects/doctype/activity_cost/activity_cost.json b/erpnext/projects/doctype/activity_cost/activity_cost.json
index 0e929d9..51c726f 100644
--- a/erpnext/projects/doctype/activity_cost/activity_cost.json
+++ b/erpnext/projects/doctype/activity_cost/activity_cost.json
@@ -1,391 +1,112 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "PROJ-ACC-.#####", 
- "beta": 0, 
- "creation": "2015-03-23 02:00:21.861546", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "PROJ-ACC-.#####",
+ "creation": "2015-03-23 02:00:21.861546",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+  "activity_type",
+  "employee",
+  "column_break_2",
+  "employee_name",
+  "department",
+  "section_break_4",
+  "billing_rate",
+  "column_break_6",
+  "costing_rate",
+  "title"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "activity_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Activity Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Activity Type", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "activity_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Activity Type",
+   "options": "Activity Type",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "employee", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 1, 
-   "label": "Employee", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Employee", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "employee",
+   "fieldtype": "Link",
+   "in_standard_filter": 1,
+   "label": "Employee",
+   "options": "Employee"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_2", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_2",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "employee_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Employee Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "employee_name",
+   "fieldtype": "Data",
+   "label": "Employee Name",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_from": "employee.department", 
-   "fieldname": "department", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Department", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Department", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fetch_from": "employee.department",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "label": "Department",
+   "options": "Department",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_4", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_4",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "description": "per hour", 
-   "fieldname": "billing_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Billing Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "description": "per hour",
+   "fieldname": "billing_rate",
+   "fieldtype": "Currency",
+   "label": "Billing Rate"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_6", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "description": "per hour", 
-   "fieldname": "costing_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Costing Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "description": "per hour",
+   "fieldname": "costing_rate",
+   "fieldtype": "Currency",
+   "label": "Costing Rate"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "title", 
-   "fieldtype": "Data", 
-   "hidden": 1, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "title", 
-   "length": 0, 
-   "no_copy": 1, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "title",
+   "fieldtype": "Data",
+   "hidden": 1,
+   "label": "title",
+   "no_copy": 1,
+   "read_only": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-01-30 11:28:17.991944", 
- "modified_by": "Administrator", 
- "module": "Projects", 
- "name": "Activity Cost", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:05:57.800347",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Activity Cost",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Projects User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Projects User",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "title", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "title"
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/activity_type/activity_type.json b/erpnext/projects/doctype/activity_type/activity_type.json
index dc50a09..4da88b4 100644
--- a/erpnext/projects/doctype/activity_type/activity_type.json
+++ b/erpnext/projects/doctype/activity_type/activity_type.json
@@ -1,255 +1,88 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:activity_type", 
- "beta": 0, 
- "creation": "2013-03-05 10:14:59", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:activity_type",
+ "creation": "2013-03-05 10:14:59",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+  "activity_type",
+  "costing_rate",
+  "column_break_3",
+  "billing_rate",
+  "disabled"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "activity_type", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Activity Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "activity_type",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Activity Type",
+   "reqd": 1,
+   "unique": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "costing_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Default Costing Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "costing_rate",
+   "fieldtype": "Currency",
+   "label": "Default Costing Rate"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_3", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "billing_rate", 
-   "fieldtype": "Currency", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Default Billing Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "billing_rate",
+   "fieldtype": "Currency",
+   "label": "Default Billing Rate"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "disabled", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Disabled", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "default": "0",
+   "fieldname": "disabled",
+   "fieldtype": "Check",
+   "label": "Disabled"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "icon-flag", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-07-25 20:11:05.229092", 
- "modified_by": "Administrator", 
- "module": "Projects", 
- "name": "Activity Type", 
- "owner": "Administrator", 
+ ],
+ "icon": "icon-flag",
+ "idx": 1,
+ "links": [],
+ "modified": "2024-03-27 13:05:57.956050",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Activity Type",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "restrict": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "import": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "restrict": 0, 
-   "role": "Projects User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Projects User",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "is_custom": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "restrict": 0, 
-   "role": "Employee", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
+   "read": 1,
+   "role": "Employee"
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_order": "ASC", 
- "track_changes": 0, 
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/dependent_task/dependent_task.json b/erpnext/projects/doctype/dependent_task/dependent_task.json
index 858a554..2ae72e4 100644
--- a/erpnext/projects/doctype/dependent_task/dependent_task.json
+++ b/erpnext/projects/doctype/dependent_task/dependent_task.json
@@ -1,64 +1,31 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2015-04-29 04:52:48.868079", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2015-04-29 04:52:48.868079",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "task"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "task", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Task", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Task", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 1, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "task",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Task",
+   "options": "Task",
+   "remember_last_selected_value": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2020-09-18 17:26:09.703215", 
- "modified_by": "Administrator", 
- "module": "Projects", 
- "name": "Dependent Task", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:51.107280",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Dependent Task",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 5917e9b..6190d60 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -454,7 +454,7 @@
  "index_web_pages_for_search": 1,
  "links": [],
  "max_attachments": 4,
- "modified": "2024-01-08 16:01:34.598258",
+ "modified": "2024-03-27 13:10:21.057163",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Project",
@@ -494,7 +494,7 @@
  "quick_entry": 1,
  "search_fields": "project_name,customer, status, priority, is_active",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "customer",
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 382437f..ff54fd0 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -38,9 +38,7 @@
 		cost_center: DF.Link | None
 		customer: DF.Link | None
 		daily_time_to_send: DF.Time | None
-		day_to_send: DF.Literal[
-			"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
-		]
+		day_to_send: DF.Literal["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
 		department: DF.Link | None
 		estimated_costing: DF.Currency
 		expected_end_date: DF.Date | None
@@ -107,7 +105,6 @@
 		Copy tasks from template
 		"""
 		if self.project_template and not frappe.db.get_all("Task", dict(project=self.name), limit=1):
-
 			# has a template, and no loaded tasks, so lets create
 			if not self.expected_start_date:
 				# project starts today
@@ -145,6 +142,7 @@
 				is_group=task_details.is_group,
 				color=task_details.color,
 				template_task=task_details.name,
+				priority=task_details.priority,
 			)
 		).insert()
 
@@ -177,7 +175,9 @@
 			for child_task in template_task.get("depends_on"):
 				if project_template_map and project_template_map.get(child_task.task):
 					project_task.reload()  # reload, as it might have been updated in the previous iteration
-					project_task.append("depends_on", {"task": project_template_map.get(child_task.task).name})
+					project_task.append(
+						"depends_on", {"task": project_template_map.get(child_task.task).name}
+					)
 					project_task.save()
 
 	def check_for_parent_tasks(self, template_task, project_task, project_tasks):
@@ -331,7 +331,7 @@
 			frappe.db.set_value("Project", new_name, "copied_from", new_name)
 
 	def send_welcome_email(self):
-		url = get_url("/project/?name={0}".format(self.name))
+		url = get_url(f"/project/?name={self.name}")
 		messages = (
 			_("You have been invited to collaborate on the project: {0}").format(self.name),
 			url,
@@ -346,7 +346,9 @@
 		for user in self.users:
 			if user.welcome_email_sent == 0:
 				frappe.sendmail(
-					user.user, subject=_("Project Collaboration Invitation"), content=content.format(*messages)
+					user.user,
+					subject=_("Project Collaboration Invitation"),
+					content=content.format(*messages),
 				)
 				user.welcome_email_sent = 1
 
@@ -367,9 +369,7 @@
 	)
 
 
-def get_project_list(
-	doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"
-):
+def get_project_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="creation"):
 	customers, suppliers = get_customers_suppliers("Project", frappe.session.user)
 
 	ignore_permissions = False
@@ -670,9 +670,7 @@
 		return
 
 	# Else simply fallback to Daily
-	exists_query = (
-		"(SELECT 1 from `tab{doctype}` where docstatus = 1 and project = `tabProject`.name)"
-	)
+	exists_query = "(SELECT 1 from `tab{doctype}` where docstatus = 1 and project = `tabProject`.name)"
 	project_map = {}
 	for project_details in frappe.db.sql(
 		"""
@@ -735,9 +733,7 @@
 	holiday_list = frappe.get_cached_value("Company", company, "default_holiday_list")
 	if not holiday_list:
 		frappe.throw(
-			_("Please set a default Holiday List for Company {0}").format(
-				frappe.bold(get_default_company())
-			)
+			_("Please set a default Holiday List for Company {0}").format(frappe.bold(get_default_company()))
 		)
 	return holiday_list
 
diff --git a/erpnext/projects/doctype/project/test_project.py b/erpnext/projects/doctype/project/test_project.py
index e49fecd..1b7460f 100644
--- a/erpnext/projects/doctype/project/test_project.py
+++ b/erpnext/projects/doctype/project/test_project.py
@@ -23,20 +23,23 @@
 		task1 = task_exists("Test Template Task with No Parent and Dependency")
 		if not task1:
 			task1 = create_task(
-				subject="Test Template Task with No Parent and Dependency", is_template=1, begin=5, duration=3
+				subject="Test Template Task with No Parent and Dependency",
+				is_template=1,
+				begin=5,
+				duration=3,
+				priority="High",
 			)
 
-		template = make_project_template(
-			"Test Project Template - No Parent and Dependend Tasks", [task1]
-		)
+		template = make_project_template("Test Project Template - No Parent and Dependend Tasks", [task1])
 		project = get_project(project_name, template)
 		tasks = frappe.get_all(
 			"Task",
-			["subject", "exp_end_date", "depends_on_tasks"],
+			["subject", "exp_end_date", "depends_on_tasks", "priority"],
 			dict(project=project.name),
 			order_by="creation asc",
 		)
 
+		self.assertEqual(tasks[0].priority, "High")
 		self.assertEqual(tasks[0].subject, "Test Template Task with No Parent and Dependency")
 		self.assertEqual(getdate(tasks[0].exp_end_date), calculate_end_date(project, 5, 3))
 		self.assertEqual(len(tasks), 1)
@@ -180,9 +183,7 @@
 			template_parent_task3,
 			template_task3,
 		]
-		project_template = make_project_template(
-			"Project template with common Task Subject", template_tasks
-		)
+		project_template = make_project_template("Project template with common Task Subject", template_tasks)
 
 		# Step - 4: Create Project against the Project Template
 		project = get_project("Project with common Task Subject", project_template)
@@ -191,7 +192,7 @@
 		)
 
 		# Test - 1: No. of Project Tasks should be equal to No. of Template Tasks
-		self.assertEquals(len(project_tasks), len(template_tasks))
+		self.assertEqual(len(project_tasks), len(template_tasks))
 
 		# Test - 2: All child Project Tasks should have Parent Task linked
 		for pt in project_tasks:
@@ -200,7 +201,6 @@
 
 
 def get_project(name, template):
-
 	project = frappe.get_doc(
 		dict(
 			doctype="Project",
diff --git a/erpnext/projects/doctype/project_template/project_template.json b/erpnext/projects/doctype/project_template/project_template.json
index 445ad9f..c58ad2d 100644
--- a/erpnext/projects/doctype/project_template/project_template.json
+++ b/erpnext/projects/doctype/project_template/project_template.json
@@ -26,7 +26,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-26 02:23:53.990322",
+ "modified": "2024-03-27 13:10:21.325199",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Project Template",
@@ -46,7 +46,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project_template/test_project_template.py b/erpnext/projects/doctype/project_template/test_project_template.py
index 4fd24bf..382ffd5 100644
--- a/erpnext/projects/doctype/project_template/test_project_template.py
+++ b/erpnext/projects/doctype/project_template/test_project_template.py
@@ -12,7 +12,9 @@
 	pass
 
 
-def make_project_template(project_template_name, project_tasks=[]):
+def make_project_template(project_template_name, project_tasks=None):
+	if project_tasks is None:
+		project_tasks = []
 	if not frappe.db.exists("Project Template", project_template_name):
 		project_tasks = project_tasks or [
 			create_task(subject="_Test Template Task 1", is_template=1, begin=0, duration=3),
diff --git a/erpnext/projects/doctype/project_template_task/project_template_task.json b/erpnext/projects/doctype/project_template_task/project_template_task.json
index 16caaa2..d9adce4 100644
--- a/erpnext/projects/doctype/project_template_task/project_template_task.json
+++ b/erpnext/projects/doctype/project_template_task/project_template_task.json
@@ -29,14 +29,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2021-02-24 15:18:49.095071",
+ "modified": "2024-03-27 13:10:21.458334",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Project Template Task",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project_type/project_type.json b/erpnext/projects/doctype/project_type/project_type.json
index b9a5b54..e8577b3 100644
--- a/erpnext/projects/doctype/project_type/project_type.json
+++ b/erpnext/projects/doctype/project_type/project_type.json
@@ -1,163 +1,74 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "field:project_type", 
- "beta": 0, 
- "creation": "2017-07-18 13:32:46.031115", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:project_type",
+ "creation": "2017-07-18 13:32:46.031115",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "project_type",
+  "description"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "project_type", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Project Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "project_type",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Project Type",
+   "reqd": 1,
+   "unique": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "description",
+   "fieldtype": "Text",
+   "label": "Description"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-07-26 17:19:30.126346", 
- "modified_by": "Administrator", 
- "module": "Projects", 
- "name": "Project Type", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:10:21.571554",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Project Type",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Projects Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Projects Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Projects User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 0
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Projects User",
+   "share": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project_update/project_update.json b/erpnext/projects/doctype/project_update/project_update.json
index c548111..10ccea8 100644
--- a/erpnext/projects/doctype/project_update/project_update.json
+++ b/erpnext/projects/doctype/project_update/project_update.json
@@ -78,7 +78,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2023-06-28 18:59:50.678917",
+ "modified": "2024-03-27 13:10:21.721160",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Project Update",
@@ -99,7 +99,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/projects/doctype/project_update/project_update.py b/erpnext/projects/doctype/project_update/project_update.py
index 53934d0..2153f1b 100644
--- a/erpnext/projects/doctype/project_update/project_update.py
+++ b/erpnext/projects/doctype/project_update/project_update.py
@@ -53,13 +53,8 @@
 		email_sending(project_name, frequency, date_start, date_end, progress, number_of_drafts, update)
 
 
-def email_sending(
-	project_name, frequency, date_start, date_end, progress, number_of_drafts, update
-):
-
-	holiday = frappe.db.sql(
-		"""SELECT holiday_date FROM `tabHoliday` where holiday_date = CURRENT_DATE;"""
-	)
+def email_sending(project_name, frequency, date_start, date_end, progress, number_of_drafts, update):
+	holiday = frappe.db.sql("""SELECT holiday_date FROM `tabHoliday` where holiday_date = CURRENT_DATE;""")
 	msg = (
 		"<p>Project Name: "
 		+ project_name
@@ -106,8 +101,6 @@
 	if len(holiday) == 0:
 		email = frappe.db.sql("""SELECT user from `tabProject User` WHERE parent = %s;""", project_name)
 		for emails in email:
-			frappe.sendmail(
-				recipients=emails, subject=frappe._(project_name + " " + "Summary"), message=msg
-			)
+			frappe.sendmail(recipients=emails, subject=frappe._(project_name + " " + "Summary"), message=msg)
 	else:
 		pass
diff --git a/erpnext/projects/doctype/project_user/project_user.json b/erpnext/projects/doctype/project_user/project_user.json
index 2f452cc..f606a20 100644
--- a/erpnext/projects/doctype/project_user/project_user.json
+++ b/erpnext/projects/doctype/project_user/project_user.json
@@ -77,12 +77,13 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-02-09 23:26:50.321417",
+ "modified": "2024-03-27 13:10:21.859474",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Project User",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/projects_settings/projects_settings.json b/erpnext/projects/doctype/projects_settings/projects_settings.json
index 7fa1558..3284eae 100644
--- a/erpnext/projects/doctype/projects_settings/projects_settings.json
+++ b/erpnext/projects/doctype/projects_settings/projects_settings.json
@@ -1,189 +1,62 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-02-21 16:42:13.882879", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-02-21 16:42:13.882879",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "timesheet_sb",
+  "ignore_workstation_time_overlap",
+  "ignore_user_time_overlap",
+  "ignore_employee_time_overlap"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "timesheet_sb", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Timesheets", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "timesheet_sb",
+   "fieldtype": "Section Break",
+   "label": "Timesheets"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "ignore_workstation_time_overlap", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Ignore Workstation Time Overlap", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "ignore_workstation_time_overlap",
+   "fieldtype": "Check",
+   "label": "Ignore Workstation Time Overlap"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "ignore_user_time_overlap", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Ignore User Time Overlap", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "ignore_user_time_overlap",
+   "fieldtype": "Check",
+   "label": "Ignore User Time Overlap"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "0", 
-   "fieldname": "ignore_employee_time_overlap", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Ignore Employee Time Overlap", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "default": "0",
+   "fieldname": "ignore_employee_time_overlap",
+   "fieldtype": "Check",
+   "label": "Ignore Employee Time Overlap"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-02-21 16:42:42.357209", 
- "modified_by": "Administrator", 
- "module": "Projects", 
- "name": "Projects Settings", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:21.984404",
+ "modified_by": "Administrator",
+ "module": "Projects",
+ "name": "Projects Settings",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index cc9832b..84c1212 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -399,7 +399,7 @@
  "is_tree": 1,
  "links": [],
  "max_attachments": 5,
- "modified": "2024-01-08 16:00:41.296203",
+ "modified": "2024-03-27 13:10:51.476856",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Task",
@@ -423,7 +423,7 @@
  "search_fields": "subject",
  "show_name_in_global_search": 1,
  "show_preview_popup": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "project",
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index 22df846..c03c99b 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -153,14 +153,14 @@
 	def validate_parent_template_task(self):
 		if self.parent_task:
 			if not frappe.db.get_value("Task", self.parent_task, "is_template"):
-				parent_task_format = """<a href="#Form/Task/{0}">{0}</a>""".format(self.parent_task)
+				parent_task_format = f"""<a href="#Form/Task/{self.parent_task}">{self.parent_task}</a>"""
 				frappe.throw(_("Parent Task {0} is not a Template Task").format(parent_task_format))
 
 	def validate_depends_on_tasks(self):
 		if self.depends_on:
 			for task in self.depends_on:
 				if not frappe.db.get_value("Task", task.task, "is_template"):
-					dependent_task_format = """<a href="#Form/Task/{0}">{0}</a>""".format(task.task)
+					dependent_task_format = f"""<a href="#Form/Task/{task.task}">{task.task}</a>"""
 					frappe.throw(_("Dependent Task {0} is not a Template Task").format(dependent_task_format))
 
 	def validate_completed_on(self):
@@ -219,7 +219,7 @@
 			task_list, count = [self.name], 0
 			while len(task_list) > count:
 				tasks = frappe.db.sql(
-					" select %s from `tabTask Depends On` where %s = %s " % (d[0], d[1], "%s"),
+					" select {} from `tabTask Depends On` where {} = {} ".format(d[0], d[1], "%s"),
 					cstr(task_list[count]),
 				)
 				count = count + 1
@@ -311,14 +311,12 @@
 	search_cond = " or " + " or ".join(field + " like %(txt)s" for field in searchfields)
 
 	return frappe.db.sql(
-		""" select name {search_columns} from `tabProject`
+		f""" select name {search_columns} from `tabProject`
 		where %(key)s like %(txt)s
 			%(mcond)s
-			{search_condition}
+			{search_cond}
 		order by name
-		limit %(page_len)s offset %(start)s""".format(
-			search_columns=search_columns, search_condition=search_cond
-		),
+		limit %(page_len)s offset %(start)s""",
 		{
 			"key": searchfield,
 			"txt": "%" + txt + "%",
@@ -379,7 +377,6 @@
 
 @frappe.whitelist()
 def get_children(doctype, parent, task=None, project=None, is_root=False):
-
 	filters = [["docstatus", "<", "2"]]
 
 	if task:
diff --git a/erpnext/projects/doctype/task/test_task.py b/erpnext/projects/doctype/task/test_task.py
index c0333f8..b0194b0 100644
--- a/erpnext/projects/doctype/task/test_task.py
+++ b/erpnext/projects/doctype/task/test_task.py
@@ -122,6 +122,7 @@
 	begin=0,
 	duration=0,
 	save=True,
+	priority=None,
 ):
 	if not frappe.db.exists("Task", subject):
 		task = frappe.new_doc("Task")
@@ -130,15 +131,14 @@
 		task.exp_start_date = start or nowdate()
 		task.exp_end_date = end or nowdate()
 		task.project = (
-			project or None
-			if is_template
-			else frappe.get_value("Project", {"project_name": "_Test Project"})
+			project or None if is_template else frappe.get_value("Project", {"project_name": "_Test Project"})
 		)
 		task.is_template = is_template
 		task.start = begin
 		task.duration = duration
 		task.is_group = is_group
 		task.parent_task = parent_task
+		task.priority = priority
 		if save:
 			task.save()
 	else:
diff --git a/erpnext/projects/doctype/task_depends_on/task_depends_on.json b/erpnext/projects/doctype/task_depends_on/task_depends_on.json
index 3300b7e..1f985f1 100644
--- a/erpnext/projects/doctype/task_depends_on/task_depends_on.json
+++ b/erpnext/projects/doctype/task_depends_on/task_depends_on.json
@@ -40,13 +40,13 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-10-17 12:45:21.536165",
+ "modified": "2024-03-27 13:10:51.702279",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Task Depends On",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/projects/doctype/task_type/task_type.json b/erpnext/projects/doctype/task_type/task_type.json
index b04264e..86b5f17 100644
--- a/erpnext/projects/doctype/task_type/task_type.json
+++ b/erpnext/projects/doctype/task_type/task_type.json
@@ -21,7 +21,7 @@
   }
  ],
  "links": [],
- "modified": "2022-08-29 17:46:41.342979",
+ "modified": "2024-03-27 13:10:51.823692",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Task Type",
@@ -63,7 +63,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/projects/doctype/timesheet/test_timesheet.py b/erpnext/projects/doctype/timesheet/test_timesheet.py
index 828a55e..da042f3 100644
--- a/erpnext/projects/doctype/timesheet/test_timesheet.py
+++ b/erpnext/projects/doctype/timesheet/test_timesheet.py
@@ -5,7 +5,7 @@
 import unittest
 
 import frappe
-from frappe.utils import add_months, add_to_date, now_datetime, nowdate
+from frappe.utils import add_to_date, now_datetime, nowdate
 
 from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
 from erpnext.projects.doctype.timesheet.timesheet import OverlapError, make_sales_invoice
@@ -40,9 +40,7 @@
 		emp = make_employee("test_employee_6@salary.com")
 
 		timesheet = make_timesheet(emp, simulate=True, is_billable=1)
-		sales_invoice = make_sales_invoice(
-			timesheet.name, "_Test Item", "_Test Customer", currency="INR"
-		)
+		sales_invoice = make_sales_invoice(timesheet.name, "_Test Item", "_Test Customer", currency="INR")
 		sales_invoice.due_date = nowdate()
 		sales_invoice.submit()
 		timesheet = frappe.get_doc("Timesheet", timesheet.name)
@@ -211,9 +209,7 @@
 	timesheet_detail.activity_type = activity_type
 	timesheet_detail.from_time = now_datetime()
 	timesheet_detail.hours = 2
-	timesheet_detail.to_time = timesheet_detail.from_time + datetime.timedelta(
-		hours=timesheet_detail.hours
-	)
+	timesheet_detail.to_time = timesheet_detail.from_time + datetime.timedelta(hours=timesheet_detail.hours)
 	timesheet_detail.project = project
 	timesheet_detail.task = task
 
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
index ba6262d..255f7e8 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -310,7 +310,7 @@
  "idx": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-04-20 15:59:11.107831",
+ "modified": "2024-03-27 13:10:53.551907",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Timesheet",
@@ -386,7 +386,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "title_field": "title"
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index d701496..90f4368 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -309,12 +309,10 @@
 @frappe.whitelist()
 def get_timesheet_detail_rate(timelog, currency):
 	timelog_detail = frappe.db.sql(
-		"""SELECT tsd.billing_amount as billing_amount,
+		f"""SELECT tsd.billing_amount as billing_amount,
 		ts.currency as currency FROM `tabTimesheet Detail` tsd
 		INNER JOIN `tabTimesheet` ts ON ts.name=tsd.parent
-		WHERE tsd.name = '{0}'""".format(
-			timelog
-		),
+		WHERE tsd.name = '{timelog}'""",
 		as_dict=1,
 	)[0]
 
@@ -336,14 +334,12 @@
 		condition = "and tsd.project = %(project)s"
 
 	return frappe.db.sql(
-		"""select distinct tsd.parent from `tabTimesheet Detail` tsd,
+		f"""select distinct tsd.parent from `tabTimesheet Detail` tsd,
 			`tabTimesheet` ts where
 			ts.status in ('Submitted', 'Payslip') and tsd.parent = ts.name and
 			tsd.docstatus = 1 and ts.total_billable_amount > 0
 			and tsd.parent LIKE %(txt)s {condition}
-			order by tsd.parent limit %(page_len)s offset %(start)s""".format(
-			condition=condition
-		),
+			order by tsd.parent limit %(page_len)s offset %(start)s""",
 		{
 			"txt": "%" + txt + "%",
 			"start": start,
@@ -469,18 +465,14 @@
 		where `tabTimesheet Detail`.parent = `tabTimesheet`.name
 			and `tabTimesheet`.docstatus < 2
 			and (from_time <= %(end)s and to_time >= %(start)s) {conditions} {match_cond}
-		""".format(
-			conditions=conditions, match_cond=get_match_cond("Timesheet")
-		),
+		""".format(conditions=conditions, match_cond=get_match_cond("Timesheet")),
 		{"start": start, "end": end},
 		as_dict=True,
 		update={"allDay": 0},
 	)
 
 
-def get_timesheets_list(
-	doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"
-):
+def get_timesheets_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="creation"):
 	user = frappe.session.user
 	# find customer name from contact.
 	customer = ""
@@ -499,7 +491,7 @@
 		projects = [d.name for d in frappe.get_all("Project", filters={"customer": customer})]
 		# Return timesheet related data to web portal.
 		timesheets = frappe.db.sql(
-			"""
+			f"""
 			SELECT
 				ts.name, tsd.activity_type, ts.status, ts.total_billable_hours,
 				COALESCE(ts.sales_invoice, tsd.sales_invoice) AS sales_invoice, tsd.project
@@ -511,10 +503,8 @@
 					tsd.project IN %(projects)s
 				)
 			ORDER BY `end_date` ASC
-			LIMIT {1} offset {0}
-		""".format(
-				limit_start, limit_page_length
-			),
+			LIMIT {limit_page_length} offset {limit_start}
+		""",
 			dict(sales_invoices=sales_invoices, projects=projects),
 			as_dict=True,
 		)  # nosec
diff --git a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
index 90fdb83..d6172e2 100644
--- a/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
+++ b/erpnext/projects/doctype/timesheet_detail/timesheet_detail.json
@@ -224,14 +224,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-02-17 16:53:34.878798",
+ "modified": "2024-03-27 13:10:53.799414",
  "modified_by": "Administrator",
  "module": "Projects",
  "name": "Timesheet Detail",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/projects/report/delayed_tasks_summary/test_delayed_tasks_summary.py b/erpnext/projects/report/delayed_tasks_summary/test_delayed_tasks_summary.py
index 91a0607..c288125 100644
--- a/erpnext/projects/report/delayed_tasks_summary/test_delayed_tasks_summary.py
+++ b/erpnext/projects/report/delayed_tasks_summary/test_delayed_tasks_summary.py
@@ -31,14 +31,14 @@
 			{"subject": "_Test Task 98", "status": "Completed", "priority": "Low", "delay": -1},
 		]
 		report = execute(filters)
-		data = list(filter(lambda x: x.subject == "_Test Task 99", report[1]))[0]
+		data = next(filter(lambda x: x.subject == "_Test Task 99", report[1]))
 
 		for key in ["subject", "status", "priority", "delay"]:
 			self.assertEqual(expected_data[0].get(key), data.get(key))
 
 		filters.status = "Completed"
 		report = execute(filters)
-		data = list(filter(lambda x: x.subject == "_Test Task 98", report[1]))[0]
+		data = next(filter(lambda x: x.subject == "_Test Task 98", report[1]))
 
 		for key in ["subject", "status", "priority", "delay"]:
 			self.assertEqual(expected_data[1].get(key), data.get(key))
diff --git a/erpnext/projects/utils.py b/erpnext/projects/utils.py
index 3cc4da4..5046d01 100644
--- a/erpnext/projects/utils.py
+++ b/erpnext/projects/utils.py
@@ -19,13 +19,14 @@
 
 	return frappe.db.sql(
 		"""select name, subject from `tabTask`
-		where (`%s` like %s or `subject` like %s) %s
+		where (`{}` like {} or `subject` like {}) {}
 		order by
-			case when `subject` like %s then 0 else 1 end,
-			case when `%s` like %s then 0 else 1 end,
-			`%s`,
+			case when `subject` like {} then 0 else 1 end,
+			case when `{}` like {} then 0 else 1 end,
+			`{}`,
 			subject
-		limit %s offset %s"""
-		% (searchfield, "%s", "%s", match_conditions, "%s", searchfield, "%s", searchfield, "%s", "%s"),
+		limit {} offset {}""".format(
+			searchfield, "%s", "%s", match_conditions, "%s", searchfield, "%s", searchfield, "%s", "%s"
+		),
 		(search_string, search_string, order_by_string, order_by_string, page_len, start),
 	)
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 63f39b5..8ec5c4d 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -1249,19 +1249,20 @@
 			this.frm.fields_dict.items.grid.toggle_enable("conversion_factor",
 				((item.uom != item.stock_uom) && !frappe.meta.get_docfield(cur_frm.fields_dict.items.grid.doctype, "conversion_factor").read_only)? true: false);
 		}
-
 	}
 
 	qty(doc, cdt, cdn) {
-		let item = frappe.get_doc(cdt, cdn);
-		// item.pricing_rules = ''
-		frappe.run_serially([
-			() => this.remove_pricing_rule_for_item(item),
-			() => this.conversion_factor(doc, cdt, cdn, true),
-			() => this.apply_price_list(item, true), //reapply price list before applying pricing rule
-			() => this.calculate_stock_uom_rate(doc, cdt, cdn),
-			() => this.apply_pricing_rule(item, true)
-		]);
+		if (!this.frm.doc.__onload?.load_after_mapping) {
+			let item = frappe.get_doc(cdt, cdn);
+			// item.pricing_rules = ''
+			frappe.run_serially([
+				() => this.remove_pricing_rule_for_item(item),
+				() => this.conversion_factor(doc, cdt, cdn, true),
+				() => this.apply_price_list(item, true), //reapply price list before applying pricing rule
+				() => this.calculate_stock_uom_rate(doc, cdt, cdn),
+				() => this.apply_pricing_rule(item, true)
+			]);
+		}
 	}
 
 	stock_qty(doc, cdt, cdn) {
@@ -1343,7 +1344,7 @@
 	}
 
 	change_form_labels(company_currency) {
-		var me = this;
+		let me = this;
 
 		this.frm.set_currency_labels(["base_total", "base_net_total", "base_total_taxes_and_charges",
 			"base_discount_amount", "base_grand_total", "base_rounded_total", "base_in_words",
@@ -1361,11 +1362,11 @@
 		this.frm.set_currency_labels(["outstanding_amount", "total_advance"],
 			this.frm.doc.party_account_currency);
 
-		cur_frm.set_df_property("conversion_rate", "description", "1 " + this.frm.doc.currency
+		this.frm.set_df_property("conversion_rate", "description", "1 " + this.frm.doc.currency
 			+ " = [?] " + company_currency);
 
 		if(this.frm.doc.price_list_currency && this.frm.doc.price_list_currency!=company_currency) {
-			cur_frm.set_df_property("plc_conversion_rate", "description", "1 "
+			this.frm.set_df_property("plc_conversion_rate", "description", "1 "
 				+ this.frm.doc.price_list_currency + " = [?] " + company_currency);
 		}
 
@@ -1380,14 +1381,14 @@
 		this.frm.toggle_display(["plc_conversion_rate", "price_list_currency"],
 			this.frm.doc.price_list_currency != company_currency);
 
-		var show = cint(cur_frm.doc.discount_amount) ||
-				((cur_frm.doc.taxes || []).filter(function(d) {return d.included_in_print_rate===1}).length);
+		let show = cint(this.frm.doc.discount_amount) ||
+				((this.frm.doc.taxes || []).filter(function(d) {return d.included_in_print_rate===1}).length);
 
 		if(frappe.meta.get_docfield(cur_frm.doctype, "net_total"))
-			cur_frm.toggle_display("net_total", show);
+			this.frm.toggle_display("net_total", show);
 
 		if(frappe.meta.get_docfield(cur_frm.doctype, "base_net_total"))
-			cur_frm.toggle_display("base_net_total", (show && (me.frm.doc.currency != company_currency)));
+			this.frm.toggle_display("base_net_total", (show && (me.frm.doc.currency != company_currency)));
 
 	}
 
diff --git a/erpnext/public/scss/erpnext.scss b/erpnext/public/scss/erpnext.scss
index 03dd311..3d8ee89 100644
--- a/erpnext/public/scss/erpnext.scss
+++ b/erpnext/public/scss/erpnext.scss
@@ -549,6 +549,14 @@
 	justify-content: center;
 }
 
-.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor {
+.frappe-control[data-fieldname="other_charges_calculation"] .ql-editor,
+.frappe-control[data-fieldname="address_display"] .ql-editor,
+.frappe-control[data-fieldname="shipping_address_display"] .ql-editor,
+.frappe-control[data-fieldname="shipping_address"] .ql-editor,
+.frappe-control[data-fieldname="dispatch_address"] .ql-editor,
+.frappe-control[data-fieldname="source_address_display"] .ql-editor,
+.frappe-control[data-fieldname="target_address_display"] .ql-editor,
+.frappe-control[data-fieldname="billing_address_display"] .ql-editor,
+.frappe-control[data-fieldname="company_address_display"] .ql-editor {
 	white-space: normal;
 }
diff --git a/erpnext/quality_management/doctype/non_conformance/non_conformance.json b/erpnext/quality_management/doctype/non_conformance/non_conformance.json
index e6b8744..8d86b20 100644
--- a/erpnext/quality_management/doctype/non_conformance/non_conformance.json
+++ b/erpnext/quality_management/doctype/non_conformance/non_conformance.json
@@ -65,8 +65,8 @@
    "fetch_from": "procedure.process_owner_full_name",
    "fieldname": "full_name",
    "fieldtype": "Data",
-   "read_only": 1,
-   "label": "Full Name"
+   "label": "Full Name",
+   "read_only": 1
   },
   {
    "fieldname": "corrective_action",
@@ -81,7 +81,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-07-31 08:10:47.247814",
+ "modified": "2024-03-27 13:10:06.304357",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Non Conformance",
@@ -112,7 +112,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/quality_management/doctype/quality_action/quality_action.json b/erpnext/quality_management/doctype/quality_action/quality_action.json
index f0b33b9..712c908 100644
--- a/erpnext/quality_management/doctype/quality_action/quality_action.json
+++ b/erpnext/quality_management/doctype/quality_action/quality_action.json
@@ -91,7 +91,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-08-28 22:33:14.358143",
+ "modified": "2024-03-27 13:10:27.562854",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Action",
@@ -122,7 +122,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/quality_management/doctype/quality_action_resolution/quality_action_resolution.json b/erpnext/quality_management/doctype/quality_action_resolution/quality_action_resolution.json
index 993274b..b027c7b 100644
--- a/erpnext/quality_management/doctype/quality_action_resolution/quality_action_resolution.json
+++ b/erpnext/quality_management/doctype/quality_action_resolution/quality_action_resolution.json
@@ -48,14 +48,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-10-21 12:59:25.566682",
+ "modified": "2024-03-27 13:10:27.714729",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Action Resolution",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/quality_management/doctype/quality_feedback/quality_feedback.json b/erpnext/quality_management/doctype/quality_feedback/quality_feedback.json
index 5fe6375..f1d2a78 100644
--- a/erpnext/quality_management/doctype/quality_feedback/quality_feedback.json
+++ b/erpnext/quality_management/doctype/quality_feedback/quality_feedback.json
@@ -61,7 +61,7 @@
    "link_fieldname": "feedback"
   }
  ],
- "modified": "2023-08-28 22:21:36.144820",
+ "modified": "2024-03-27 13:10:27.838693",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Feedback",
@@ -92,7 +92,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/quality_management/doctype/quality_feedback_parameter/quality_feedback_parameter.json b/erpnext/quality_management/doctype/quality_feedback_parameter/quality_feedback_parameter.json
index ce5d4cf..9b89d46 100644
--- a/erpnext/quality_management/doctype/quality_feedback_parameter/quality_feedback_parameter.json
+++ b/erpnext/quality_management/doctype/quality_feedback_parameter/quality_feedback_parameter.json
@@ -46,14 +46,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-10-27 17:28:12.033145",
+ "modified": "2024-03-27 13:10:28.002632",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Feedback Parameter",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/quality_management/doctype/quality_feedback_template/quality_feedback_template.json b/erpnext/quality_management/doctype/quality_feedback_template/quality_feedback_template.json
index 1696470..2e97be0 100644
--- a/erpnext/quality_management/doctype/quality_feedback_template/quality_feedback_template.json
+++ b/erpnext/quality_management/doctype/quality_feedback_template/quality_feedback_template.json
@@ -38,7 +38,7 @@
    "link_fieldname": "template"
   }
  ],
- "modified": "2020-10-27 16:18:53.579688",
+ "modified": "2024-03-27 13:10:28.126214",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Feedback Template",
@@ -58,7 +58,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/quality_management/doctype/quality_feedback_template_parameter/quality_feedback_template_parameter.json b/erpnext/quality_management/doctype/quality_feedback_template_parameter/quality_feedback_template_parameter.json
index 02a9b03..1c07056 100644
--- a/erpnext/quality_management/doctype/quality_feedback_template_parameter/quality_feedback_template_parameter.json
+++ b/erpnext/quality_management/doctype/quality_feedback_template_parameter/quality_feedback_template_parameter.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-05-26 21:20:40.520197",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -15,14 +16,16 @@
   }
  ],
  "istable": 1,
- "modified": "2019-05-26 21:23:53.574743",
+ "links": [],
+ "modified": "2024-03-27 13:10:28.289038",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Feedback Template Parameter",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/quality_management/doctype/quality_goal/quality_goal.json b/erpnext/quality_management/doctype/quality_goal/quality_goal.json
index f2b6ebc..9ac7557 100644
--- a/erpnext/quality_management/doctype/quality_goal/quality_goal.json
+++ b/erpnext/quality_management/doctype/quality_goal/quality_goal.json
@@ -76,7 +76,7 @@
    "link_fieldname": "goal"
   }
  ],
- "modified": "2023-08-28 22:33:27.718899",
+ "modified": "2024-03-27 13:10:28.400976",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Goal",
@@ -107,7 +107,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/quality_management/doctype/quality_goal_objective/quality_goal_objective.json b/erpnext/quality_management/doctype/quality_goal_objective/quality_goal_objective.json
index 010888d..cb42f87 100644
--- a/erpnext/quality_management/doctype/quality_goal_objective/quality_goal_objective.json
+++ b/erpnext/quality_management/doctype/quality_goal_objective/quality_goal_objective.json
@@ -39,7 +39,7 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-07-28 18:10:23.351246",
+ "modified": "2024-03-27 13:10:28.564795",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Goal Objective",
@@ -47,7 +47,7 @@
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/quality_management/doctype/quality_meeting/quality_meeting.json b/erpnext/quality_management/doctype/quality_meeting/quality_meeting.json
index 7ab28d8..08cc59d 100644
--- a/erpnext/quality_management/doctype/quality_meeting/quality_meeting.json
+++ b/erpnext/quality_management/doctype/quality_meeting/quality_meeting.json
@@ -48,7 +48,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-08-28 22:33:57.447634",
+ "modified": "2024-03-27 13:10:29.470120",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Meeting",
@@ -80,7 +80,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/quality_management/doctype/quality_meeting_agenda/quality_meeting_agenda.json b/erpnext/quality_management/doctype/quality_meeting_agenda/quality_meeting_agenda.json
index e53d186..2cb2f76 100644
--- a/erpnext/quality_management/doctype/quality_meeting_agenda/quality_meeting_agenda.json
+++ b/erpnext/quality_management/doctype/quality_meeting_agenda/quality_meeting_agenda.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-05-26 20:46:57.999300",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -15,14 +16,16 @@
   }
  ],
  "istable": 1,
- "modified": "2019-05-26 20:49:01.328146",
+ "links": [],
+ "modified": "2024-03-27 13:10:29.623622",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Meeting Agenda",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/quality_management/doctype/quality_meeting_minutes/quality_meeting_minutes.json b/erpnext/quality_management/doctype/quality_meeting_minutes/quality_meeting_minutes.json
index 3b9133a..a4b073f 100644
--- a/erpnext/quality_management/doctype/quality_meeting_minutes/quality_meeting_minutes.json
+++ b/erpnext/quality_management/doctype/quality_meeting_minutes/quality_meeting_minutes.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2019-05-26 20:45:26.226428",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -42,14 +43,16 @@
   }
  ],
  "istable": 1,
- "modified": "2019-05-26 22:00:24.833920",
+ "links": [],
+ "modified": "2024-03-27 13:10:29.730732",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Meeting Minutes",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
index fd5a595..0666db8 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
+++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.json
@@ -116,7 +116,7 @@
    "link_fieldname": "procedure"
   }
  ],
- "modified": "2023-08-28 22:33:36.483420",
+ "modified": "2024-03-27 13:10:29.849511",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Procedure",
@@ -148,7 +148,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
index 8a67d92..d65345e 100644
--- a/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
+++ b/erpnext/quality_management/doctype/quality_procedure/quality_procedure.py
@@ -77,7 +77,9 @@
 
 		for process in self.processes:
 			if process.procedure:
-				if not frappe.db.get_value("Quality Procedure", process.procedure, "parent_quality_procedure"):
+				if not frappe.db.get_value(
+					"Quality Procedure", process.procedure, "parent_quality_procedure"
+				):
 					frappe.db.set_value(
 						"Quality Procedure", process.procedure, "parent_quality_procedure", self.name
 					)
@@ -89,9 +91,13 @@
 			if old_child_procedures := set([d.procedure for d in old_doc.processes if d.procedure]):
 				current_child_procedures = set([d.procedure for d in self.processes if d.procedure])
 
-				if removed_child_procedures := list(old_child_procedures.difference(current_child_procedures)):
+				if removed_child_procedures := list(
+					old_child_procedures.difference(current_child_procedures)
+				):
 					for child_procedure in removed_child_procedures:
-						frappe.db.set_value("Quality Procedure", child_procedure, "parent_quality_procedure", None)
+						frappe.db.set_value(
+							"Quality Procedure", child_procedure, "parent_quality_procedure", None
+						)
 
 	def add_child_to_parent(self):
 		"""Add `Child Procedure` to `Parent Procedure`"""
@@ -125,7 +131,8 @@
 		# return the list in order
 		return [
 			dict(
-				value=d.procedure, expandable=frappe.db.get_value("Quality Procedure", d.procedure, "is_group")
+				value=d.procedure,
+				expandable=frappe.db.get_value("Quality Procedure", d.procedure, "is_group"),
 			)
 			for d in parent_procedure.processes
 			if d.procedure
diff --git a/erpnext/quality_management/doctype/quality_procedure_process/quality_procedure_process.json b/erpnext/quality_management/doctype/quality_procedure_process/quality_procedure_process.json
index aeca6ff..d2c3dc8 100644
--- a/erpnext/quality_management/doctype/quality_procedure_process/quality_procedure_process.json
+++ b/erpnext/quality_management/doctype/quality_procedure_process/quality_procedure_process.json
@@ -28,14 +28,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-10-27 13:55:11.252945",
+ "modified": "2024-03-27 13:10:30.055569",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Procedure Process",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/quality_management/doctype/quality_review/quality_review.json b/erpnext/quality_management/doctype/quality_review/quality_review.json
index f38e8a5..6230058 100644
--- a/erpnext/quality_management/doctype/quality_review/quality_review.json
+++ b/erpnext/quality_management/doctype/quality_review/quality_review.json
@@ -84,7 +84,7 @@
    "link_fieldname": "review"
   }
  ],
- "modified": "2023-08-28 22:33:22.472980",
+ "modified": "2024-03-27 13:10:30.167995",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Review",
@@ -127,7 +127,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "goal",
diff --git a/erpnext/quality_management/doctype/quality_review/quality_review.py b/erpnext/quality_management/doctype/quality_review/quality_review.py
index bf4a403..fa5448d 100644
--- a/erpnext/quality_management/doctype/quality_review/quality_review.py
+++ b/erpnext/quality_management/doctype/quality_review/quality_review.py
@@ -67,9 +67,7 @@
 def create_review(goal):
 	goal = frappe.get_doc("Quality Goal", goal)
 
-	review = frappe.get_doc(
-		{"doctype": "Quality Review", "goal": goal.name, "date": frappe.utils.getdate()}
-	)
+	review = frappe.get_doc({"doctype": "Quality Review", "goal": goal.name, "date": frappe.utils.getdate()})
 
 	review.insert(ignore_permissions=True)
 
diff --git a/erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json b/erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json
index 5ddf0f2..f6d4985 100644
--- a/erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json
+++ b/erpnext/quality_management/doctype/quality_review_objective/quality_review_objective.json
@@ -56,8 +56,8 @@
    "fieldtype": "Column Break"
   },
   {
-   "default": "Open",
    "columns": 2,
+   "default": "Open",
    "fieldname": "status",
    "fieldtype": "Select",
    "in_list_view": 1,
@@ -68,13 +68,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-07-31 09:20:20.908637",
+ "modified": "2024-03-27 13:10:30.328235",
  "modified_by": "Administrator",
  "module": "Quality Management",
  "name": "Quality Review Objective",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/regional/address_template/setup.py b/erpnext/regional/address_template/setup.py
index fd1dfa7..684c766 100644
--- a/erpnext/regional/address_template/setup.py
+++ b/erpnext/regional/address_template/setup.py
@@ -1,5 +1,6 @@
 """Import Address Templates from ./templates directory."""
 import os
+
 import frappe
 
 
@@ -26,7 +27,7 @@
 	def get_file_content(file_name):
 		"""Convert 'united_states.html' to '/path/to/united_states.html'."""
 		full_path = os.path.join(template_dir, file_name)
-		with open(full_path, "r") as f:
+		with open(full_path) as f:
 			content = f.read()
 		return content
 
@@ -41,7 +42,7 @@
 def update_address_template(country, html, is_default=0):
 	"""Update existing Address Template or create a new one."""
 	if not frappe.db.exists("Country", country):
-		frappe.log_error("Country {} for regional Address Template does not exist.".format(country))
+		frappe.log_error(f"Country {country} for regional Address Template does not exist.")
 		return
 
 	if frappe.db.exists("Address Template", country):
diff --git a/erpnext/regional/address_template/test_regional_address_template.py b/erpnext/regional/address_template/test_regional_address_template.py
index 523653b..952748b 100644
--- a/erpnext/regional/address_template/test_regional_address_template.py
+++ b/erpnext/regional/address_template/test_regional_address_template.py
@@ -32,7 +32,7 @@
 		"""Update an existing Address Template."""
 		country = ensure_country("Germany")
 		if not frappe.db.exists("Address Template", country.name):
-			template = frappe.get_doc(
+			frappe.get_doc(
 				{"doctype": "Address Template", "country": country.name, "template": "EXISTING"}
 			).insert()
 
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
index afdd54b..d2a7dc3 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.json
@@ -94,13 +94,14 @@
   }
  ],
  "links": [],
- "modified": "2021-04-24 10:33:12.250687",
+ "modified": "2024-03-27 13:09:50.384173",
  "modified_by": "Administrator",
  "module": "Regional",
  "name": "Import Supplier Invoice",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
index bf338d6..fc2dc96 100644
--- a/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
+++ b/erpnext/regional/doctype/import_supplier_invoice/import_supplier_invoice.py
@@ -95,13 +95,13 @@
 			invoices_args["terms"] = get_payment_terms_from_file(file_content)
 
 			supplier_name = create_supplier(self.supplier_group, supp_dict)
-			address = create_address(supplier_name, supp_dict)
+			create_address(supplier_name, supp_dict)
 			pi_name = create_purchase_invoice(supplier_name, file_name, invoices_args, self.name)
 
 			self.file_count += 1
 			if pi_name:
 				self.purchase_invoices_count += 1
-				file_save = save_file(
+				save_file(
 					file_name,
 					encoded_content,
 					"Purchase Invoice",
@@ -179,7 +179,7 @@
 	except UnicodeDecodeError:
 		try:
 			content = encoded_content.decode("utf-16")
-		except UnicodeDecodeError as e:
+		except UnicodeDecodeError:
 			frappe.log_error("UTF-16 encoding error for File Name: " + file_name)
 
 	return content
@@ -297,7 +297,6 @@
 
 		return existing_supplier_name
 	else:
-
 		new_supplier = frappe.new_doc("Supplier")
 		new_supplier.supplier_name = re.sub("&amp", "&", args.supplier)
 		new_supplier.supplier_group = supplier_group
@@ -408,7 +407,7 @@
 		pi.imported_grand_total = calc_total
 		pi.save()
 		return pi.name
-	except Exception as e:
+	except Exception:
 		frappe.db.set_value("Import Supplier Invoice", name, "status", "Error")
 		pi.log_error("Unable to create Puchase Invoice")
 		return None
diff --git a/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json b/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
index ecc198a..981a51c 100644
--- a/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
+++ b/erpnext/regional/doctype/lower_deduction_certificate/lower_deduction_certificate.json
@@ -135,14 +135,14 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-01-24 02:20:26.145996",
+ "modified": "2024-03-27 13:10:02.865812",
  "modified_by": "Administrator",
  "module": "Regional",
  "name": "Lower Deduction Certificate",
  "naming_rule": "By fieldname",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/regional/doctype/south_africa_vat_settings/south_africa_vat_settings.json b/erpnext/regional/doctype/south_africa_vat_settings/south_africa_vat_settings.json
index 8a51829..6d0c411 100644
--- a/erpnext/regional/doctype/south_africa_vat_settings/south_africa_vat_settings.json
+++ b/erpnext/regional/doctype/south_africa_vat_settings/south_africa_vat_settings.json
@@ -29,7 +29,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-07-14 02:17:52.476762",
+ "modified": "2024-03-27 13:10:43.257718",
  "modified_by": "Administrator",
  "module": "Regional",
  "name": "South Africa VAT Settings",
@@ -70,7 +70,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/regional/doctype/uae_vat_account/uae_vat_account.json b/erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
index 73a8169..7648fa3 100644
--- a/erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
+++ b/erpnext/regional/doctype/uae_vat_account/uae_vat_account.json
@@ -22,14 +22,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-09-28 12:02:56.444007",
+ "modified": "2024-03-27 13:10:55.699335",
  "modified_by": "Administrator",
  "module": "Regional",
  "name": "UAE VAT Account",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.json b/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.json
index 1ff5680..32f1436 100644
--- a/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.json
+++ b/erpnext/regional/doctype/uae_vat_settings/uae_vat_settings.json
@@ -29,14 +29,15 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-12-25 20:20:22.342426",
+ "modified": "2024-03-27 13:10:55.812173",
  "modified_by": "Administrator",
  "module": "Regional",
  "name": "UAE VAT Settings",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/regional/italy/setup.py b/erpnext/regional/italy/setup.py
index 1f66b36..23406ea 100644
--- a/erpnext/regional/italy/setup.py
+++ b/erpnext/regional/italy/setup.py
@@ -7,10 +7,11 @@
 from frappe import _
 from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
 from frappe.permissions import add_permission, update_permission_property
+
 from erpnext.regional.italy import (
 	fiscal_regimes,
-	tax_exemption_reasons,
 	mode_of_payment_codes,
+	tax_exemption_reasons,
 	vat_collectability_options,
 )
 
diff --git a/erpnext/regional/italy/utils.py b/erpnext/regional/italy/utils.py
index f5b2e2d..371390b 100644
--- a/erpnext/regional/italy/utils.py
+++ b/erpnext/regional/italy/utils.py
@@ -39,7 +39,7 @@
 
 	attachments = get_e_invoice_attachments(invoices)
 
-	zip_filename = "{0}-einvoices.zip".format(frappe.utils.get_datetime().strftime("%Y%m%d_%H%M%S"))
+	zip_filename = "{}-einvoices.zip".format(frappe.utils.get_datetime().strftime("%Y%m%d_%H%M%S"))
 
 	download_zip(attachments, zip_filename)
 
@@ -159,7 +159,7 @@
 						rate=reference_row.tax_amount,
 						qty=1.0,
 						amount=reference_row.tax_amount,
-						stock_uom=frappe.db.get_single_value("Stock Settings", "stock_uom") or _("Nos"),
+						stock_uom=frappe.db.get_single_value("Stock Settings", "stock_uom") or "Nos",
 						tax_rate=tax.rate,
 						tax_amount=(reference_row.tax_amount * tax.rate) / 100,
 						net_amount=reference_row.tax_amount,
@@ -307,7 +307,9 @@
 		for row in doc.taxes:
 			if row.rate == 0 and row.tax_amount == 0 and not row.tax_exemption_reason:
 				frappe.throw(
-					_("Row {0}: Please set at Tax Exemption Reason in Sales Taxes and Charges").format(row.idx),
+					_("Row {0}: Please set at Tax Exemption Reason in Sales Taxes and Charges").format(
+						row.idx
+					),
 					title=_("E-Invoicing Information Missing"),
 				)
 
@@ -338,9 +340,7 @@
 					_("Row {0}: Please set the Mode of Payment in Payment Schedule").format(schedule.idx),
 					title=_("E-Invoicing Information Missing"),
 				)
-			elif not frappe.db.get_value(
-				"Mode of Payment", schedule.mode_of_payment, "mode_of_payment_code"
-			):
+			elif not frappe.db.get_value("Mode of Payment", schedule.mode_of_payment, "mode_of_payment_code"):
 				frappe.throw(
 					_("Row {0}: Please set the correct code on Mode of Payment {1}").format(
 						schedule.idx, schedule.mode_of_payment
@@ -473,9 +473,7 @@
 			filename = attachment.file_name.split(".xml")[0]
 			return filename, filename.split("_")[1]
 
-	company_tax_id = (
-		doc.company_tax_id if doc.company_tax_id.startswith("IT") else "IT" + doc.company_tax_id
-	)
+	company_tax_id = doc.company_tax_id if doc.company_tax_id.startswith("IT") else "IT" + doc.company_tax_id
 	progressive_name = frappe.model.naming.make_autoname(company_tax_id + "_.#####")
 	progressive_number = progressive_name.split("_")[1]
 
diff --git a/erpnext/regional/report/irs_1099/irs_1099.py b/erpnext/regional/report/irs_1099/irs_1099.py
index c5d8112..41e3761 100644
--- a/erpnext/regional/report/irs_1099/irs_1099.py
+++ b/erpnext/regional/report/irs_1099/irs_1099.py
@@ -34,7 +34,7 @@
 		conditions += "AND s.supplier_group = %s" % frappe.db.escape(filters.get("supplier_group"))
 
 	data = frappe.db.sql(
-		"""
+		f"""
 		SELECT
 			s.supplier_group as "supplier_group",
 			gl.party AS "supplier",
@@ -55,9 +55,7 @@
 			gl.party
 
 		ORDER BY
-			gl.party DESC""".format(
-			conditions=conditions
-		),
+			gl.party DESC""",
 		{"fiscal_year": filters.fiscal_year, "company": filters.company},
 		as_dict=True,
 	)
@@ -117,7 +115,7 @@
 			"Supplier", row.supplier
 		)
 		row["payments"] = fmt_money(row["payments"], precision=0, currency="USD")
-		pdf = get_pdf(render_template(template, row), output=output if output else None)
+		get_pdf(render_template(template, row), output=output if output else None)
 
 	frappe.local.response.filename = (
 		f"{filters.fiscal_year} {filters.company} IRS 1099 Forms{IRS_1099_FORMS_FILE_EXTENSION}"
diff --git a/erpnext/regional/report/uae_vat_201/uae_vat_201.py b/erpnext/regional/report/uae_vat_201/uae_vat_201.py
index 6ef21e5..1b77b3c 100644
--- a/erpnext/regional/report/uae_vat_201/uae_vat_201.py
+++ b/erpnext/regional/report/uae_vat_201/uae_vat_201.py
@@ -62,13 +62,9 @@
 		frappe.format(get_reverse_charge_tax(filters), "Currency"),
 	)
 
-	append_data(
-		data, "4", _("Zero Rated"), frappe.format(get_zero_rated_total(filters), "Currency"), "-"
-	)
+	append_data(data, "4", _("Zero Rated"), frappe.format(get_zero_rated_total(filters), "Currency"), "-")
 
-	append_data(
-		data, "5", _("Exempt Supplies"), frappe.format(get_exempt_total(filters), "Currency"), "-"
-	)
+	append_data(data, "5", _("Exempt Supplies"), frappe.format(get_exempt_total(filters), "Currency"), "-")
 
 	append_data(data, "", "", "", "")
 
@@ -139,7 +135,7 @@
 	conditions = get_conditions(filters)
 	try:
 		return frappe.db.sql(
-			"""
+			f"""
 			select
 				s.vat_emirate as emirate, sum(i.base_net_amount) as total, sum(i.tax_amount)
 			from
@@ -148,12 +144,10 @@
 				i.parent = s.name
 			where
 				s.docstatus = 1 and  i.is_exempt != 1 and i.is_zero_rated != 1
-				{where_conditions}
+				{conditions}
 			group by
 				s.vat_emirate;
-			""".format(
-				where_conditions=conditions
-			),
+			""",
 			filters,
 		)
 	except (IndexError, TypeError):
@@ -198,7 +192,7 @@
 	conditions = get_conditions_join(filters)
 	return (
 		frappe.db.sql(
-			"""
+			f"""
 		select sum(debit)  from
 			`tabPurchase Invoice` p inner join `tabGL Entry` gl
 		on
@@ -208,10 +202,8 @@
 			and p.docstatus = 1
 			and gl.docstatus = 1
 			and account in (select account from `tabUAE VAT Account` where  parent=%(company)s)
-			{where_conditions} ;
-		""".format(
-				where_conditions=conditions
-			),
+			{conditions} ;
+		""",
 			filters,
 		)[0][0]
 		or 0
@@ -240,7 +232,7 @@
 	conditions = get_conditions_join(filters)
 	return (
 		frappe.db.sql(
-			"""
+			f"""
 		select
 			sum(debit * p.recoverable_reverse_charge / 100)
 		from
@@ -253,10 +245,8 @@
 			and p.recoverable_reverse_charge > 0
 			and gl.docstatus = 1
 			and account in (select account from `tabUAE VAT Account` where  parent=%(company)s)
-			{where_conditions} ;
-		""".format(
-				where_conditions=conditions
-			),
+			{conditions} ;
+		""",
 			filters,
 		)[0][0]
 		or 0
@@ -354,7 +344,7 @@
 	try:
 		return (
 			frappe.db.sql(
-				"""
+				f"""
 			select
 				sum(i.base_net_amount) as total
 			from
@@ -363,10 +353,8 @@
 				i.parent = s.name
 			where
 				s.docstatus = 1 and  i.is_zero_rated = 1
-				{where_conditions} ;
-			""".format(
-					where_conditions=conditions
-				),
+				{conditions} ;
+			""",
 				filters,
 			)[0][0]
 			or 0
@@ -381,7 +369,7 @@
 	try:
 		return (
 			frappe.db.sql(
-				"""
+				f"""
 			select
 				sum(i.base_net_amount) as total
 			from
@@ -390,10 +378,8 @@
 				i.parent = s.name
 			where
 				s.docstatus = 1 and  i.is_exempt = 1
-				{where_conditions} ;
-			""".format(
-					where_conditions=conditions
-				),
+				{conditions} ;
+			""",
 				filters,
 			)[0][0]
 			or 0
diff --git a/erpnext/regional/report/vat_audit_report/vat_audit_report.py b/erpnext/regional/report/vat_audit_report/vat_audit_report.py
index 3d486ce..718b6c0 100644
--- a/erpnext/regional/report/vat_audit_report/vat_audit_report.py
+++ b/erpnext/regional/report/vat_audit_report/vat_audit_report.py
@@ -13,7 +13,7 @@
 	return VATAuditReport(filters).run()
 
 
-class VATAuditReport(object):
+class VATAuditReport:
 	def __init__(self, filters=None):
 		self.filters = frappe._dict(filters or {})
 		self.columns = []
@@ -58,19 +58,17 @@
 		self.invoices = frappe._dict()
 
 		invoice_data = frappe.db.sql(
-			"""
+			f"""
 			SELECT
-				{select_columns}
+				{self.select_columns}
 			FROM
 				`tab{doctype}`
 			WHERE
-				docstatus = 1 {where_conditions}
+				docstatus = 1 {conditions}
 				and is_opening = 'No'
 			ORDER BY
 				posting_date DESC
-			""".format(
-				select_columns=self.select_columns, doctype=doctype, where_conditions=conditions
-			),
+			""",
 			self.filters,
 			as_dict=1,
 		)
@@ -86,11 +84,10 @@
 			SELECT
 				item_code, parent, base_net_amount, is_zero_rated
 			FROM
-				`tab%s Item`
+				`tab{} Item`
 			WHERE
-				parent in (%s)
-			"""
-			% (doctype, ", ".join(["%s"] * len(self.invoices))),
+				parent in ({})
+			""".format(doctype, ", ".join(["%s"] * len(self.invoices))),
 			tuple(self.invoices),
 			as_dict=1,
 		)
@@ -111,15 +108,14 @@
 			SELECT
 				parent, account_head, item_wise_tax_detail
 			FROM
-				`tab%s`
+				`tab{}`
 			WHERE
-				parenttype = %s and docstatus = 1
-				and parent in (%s)
+				parenttype = {} and docstatus = 1
+				and parent in ({})
 			ORDER BY
 				account_head
-			"""
-			% (self.tax_doctype, "%s", ", ".join(["%s"] * len(self.invoices.keys()))),
-			tuple([doctype] + list(self.invoices.keys())),
+			""".format(self.tax_doctype, "%s", ", ".join(["%s"] * len(self.invoices.keys()))),
+			tuple([doctype, *list(self.invoices.keys())]),
 		)
 
 		for parent, account, item_wise_tax_detail in self.tax_details:
diff --git a/erpnext/regional/united_arab_emirates/utils.py b/erpnext/regional/united_arab_emirates/utils.py
index 634a152..d71b87b 100644
--- a/erpnext/regional/united_arab_emirates/utils.py
+++ b/erpnext/regional/united_arab_emirates/utils.py
@@ -55,14 +55,12 @@
 def get_tax_accounts(company):
 	"""Get the list of tax accounts for a specific company."""
 	tax_accounts_dict = frappe._dict()
-	tax_accounts_list = frappe.get_all(
-		"UAE VAT Account", filters={"parent": company}, fields=["Account"]
-	)
+	tax_accounts_list = frappe.get_all("UAE VAT Account", filters={"parent": company}, fields=["Account"])
 
 	if not tax_accounts_list and not frappe.flags.in_test:
 		frappe.throw(_('Please set Vat Accounts for Company: "{0}" in UAE VAT Settings').format(company))
 	for tax_account in tax_accounts_list:
-		for account, name in tax_account.items():
+		for _account, name in tax_account.items():
 			tax_accounts_dict[name] = name
 
 	return tax_accounts_dict
@@ -106,7 +104,6 @@
 	doc.grand_total -= vat_tax
 
 	if doc.meta.get_field("rounded_total"):
-
 		if doc.is_rounded_total_disabled():
 			doc.outstanding_amount = doc.grand_total
 
@@ -120,9 +117,7 @@
 			doc.outstanding_amount = doc.rounded_total or doc.grand_total
 
 	doc.in_words = money_in_words(doc.grand_total, doc.currency)
-	doc.base_in_words = money_in_words(
-		doc.base_grand_total, erpnext.get_company_currency(doc.company)
-	)
+	doc.base_in_words = money_in_words(doc.base_grand_total, erpnext.get_company_currency(doc.company))
 	doc.set_payment_schedule()
 
 
diff --git a/erpnext/regional/united_states/test_united_states.py b/erpnext/regional/united_states/test_united_states.py
index 83ba6ed..e54552b 100644
--- a/erpnext/regional/united_states/test_united_states.py
+++ b/erpnext/regional/united_states/test_united_states.py
@@ -10,7 +10,6 @@
 
 class TestUnitedStates(unittest.TestCase):
 	def test_irs_1099_custom_field(self):
-
 		if not frappe.db.exists("Supplier", "_US 1099 Test Supplier"):
 			doc = frappe.new_doc("Supplier")
 			doc.supplier_name = "_US 1099 Test Supplier"
@@ -38,7 +37,6 @@
 
 
 def make_payment_entry_to_irs_1099_supplier():
-
 	frappe.db.sql("delete from `tabGL Entry` where party='_US 1099 Test Supplier'")
 	frappe.db.sql("delete from `tabGL Entry` where against='_US 1099 Test Supplier'")
 	frappe.db.sql("delete from `tabPayment Entry` where party='_US 1099 Test Supplier'")
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index 41c6311..96abf0a 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -583,7 +583,7 @@
    "link_fieldname": "party"
   }
  ],
- "modified": "2024-03-16 19:41:47.971815",
+ "modified": "2024-03-27 13:06:48.056107",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Customer",
@@ -663,7 +663,7 @@
  "quick_entry": 1,
  "search_fields": "customer_group,territory, mobile_no,primary_address",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "customer_name",
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 3744922..bb6481c 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -17,7 +17,7 @@
 from frappe.utils import cint, cstr, flt, get_formatted_email, today
 from frappe.utils.user import get_users_with_role
 
-from erpnext.accounts.party import get_dashboard_info, validate_party_accounts  # noqa
+from erpnext.accounts.party import get_dashboard_info, validate_party_accounts
 from erpnext.controllers.website_list_for_contact import add_role_for_portal_user
 from erpnext.utilities.transaction_base import TransactionBase
 
@@ -106,17 +106,16 @@
 			self.name = set_name_from_naming_options(frappe.get_meta(self.doctype).autoname, self)
 
 	def get_customer_name(self):
-
 		if frappe.db.get_value("Customer", self.customer_name) and not frappe.flags.in_import:
 			count = frappe.db.sql(
 				"""select ifnull(MAX(CAST(SUBSTRING_INDEX(name, ' ', -1) AS UNSIGNED)), 0) from tabCustomer
 				 where name like %s""",
-				"%{0} - %".format(self.customer_name),
+				f"%{self.customer_name} - %",
 				as_list=1,
 			)[0][0]
 			count = cint(count) + 1
 
-			new_customer_name = "{0} - {1}".format(self.customer_name, cstr(count))
+			new_customer_name = f"{self.customer_name} - {cstr(count)}"
 
 			msgprint(
 				_("Changed customer name to '{}' as '{}' already exists.").format(
@@ -326,9 +325,7 @@
 			)
 		]
 
-		current_credit_limits = [
-			d.credit_limit for d in sorted(self.credit_limits, key=lambda k: k.company)
-		]
+		current_credit_limits = [d.credit_limit for d in sorted(self.credit_limits, key=lambda k: k.company)]
 
 		if past_credit_limits == current_credit_limits:
 			return
@@ -492,9 +489,7 @@
 		) and (
 			not loyalty_program.customer_territory
 			or doc.territory
-			in get_nested_links(
-				"Territory", loyalty_program.customer_territory, doc.flags.ignore_permissions
-			)
+			in get_nested_links("Territory", loyalty_program.customer_territory, doc.flags.ignore_permissions)
 		):
 			lp_details.append(loyalty_program.name)
 
@@ -540,12 +535,12 @@
 			]
 			if not credit_controller_users_formatted:
 				frappe.throw(
-					_("Please contact your administrator to extend the credit limits for {0}.").format(customer)
+					_("Please contact your administrator to extend the credit limits for {0}.").format(
+						customer
+					)
 				)
 
-			user_list = "<br><br><ul><li>{0}</li></ul>".format(
-				"<li>".join(credit_controller_users_formatted)
-			)
+			user_list = "<br><br><ul><li>{}</li></ul>".format("<li>".join(credit_controller_users_formatted))
 
 			message += _(
 				"Please contact any of the following users to extend the credit limits for {0}: {1}"
@@ -582,27 +577,21 @@
 	frappe.sendmail(recipients=credit_controller_users_list, subject=subject, message=message)
 
 
-def get_customer_outstanding(
-	customer, company, ignore_outstanding_sales_order=False, cost_center=None
-):
+def get_customer_outstanding(customer, company, ignore_outstanding_sales_order=False, cost_center=None):
 	# Outstanding based on GL Entries
 	cond = ""
 	if cost_center:
 		lft, rgt = frappe.get_cached_value("Cost Center", cost_center, ["lft", "rgt"])
 
-		cond = """ and cost_center in (select name from `tabCost Center` where
-			lft >= {0} and rgt <= {1})""".format(
-			lft, rgt
-		)
+		cond = f""" and cost_center in (select name from `tabCost Center` where
+			lft >= {lft} and rgt <= {rgt})"""
 
 	outstanding_based_on_gle = frappe.db.sql(
-		"""
+		f"""
 		select sum(debit) - sum(credit)
 		from `tabGL Entry` where party_type = 'Customer'
 		and is_cancelled = 0 and party = %s
-		and company=%s {0}""".format(
-			cond
-		),
+		and company=%s {cond}""",
 		(customer, company),
 	)
 
@@ -750,7 +739,7 @@
 	if reqd_fields:
 		msg = _("Following fields are mandatory to create address:")
 		frappe.throw(
-			"{0} <br><br> <ul>{1}</ul>".format(msg, "\n".join(reqd_fields)),
+			"{} <br><br> <ul>{}</ul>".format(msg, "\n".join(reqd_fields)),
 			title=_("Missing Values Required"),
 		)
 
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 7e6d6de..de2172d 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -3,7 +3,6 @@
 
 
 import frappe
-from frappe.custom.doctype.property_setter.property_setter import make_property_setter
 from frappe.test_runner import make_test_records
 from frappe.tests.utils import FrappeTestCase
 from frappe.utils import flt
@@ -268,7 +267,6 @@
 
 	def test_customer_credit_limit(self):
 		from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
-		from erpnext.selling.doctype.sales_order.sales_order import make_sales_invoice
 		from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
 		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
 
@@ -412,17 +410,13 @@
 		customer.credit_limits[-1].db_insert()
 
 
-def create_internal_customer(
-	customer_name=None, represents_company=None, allowed_to_interact_with=None
-):
+def create_internal_customer(customer_name=None, represents_company=None, allowed_to_interact_with=None):
 	if not customer_name:
 		customer_name = represents_company
 	if not allowed_to_interact_with:
 		allowed_to_interact_with = represents_company
 
-	existing_representative = frappe.db.get_value(
-		"Customer", {"represents_company": represents_company}
-	)
+	existing_representative = frappe.db.get_value("Customer", {"represents_company": represents_company})
 	if existing_representative:
 		return existing_representative
 
diff --git a/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json b/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
index 2fd0c67..790cb40 100644
--- a/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
+++ b/erpnext/selling/doctype/customer_credit_limit/customer_credit_limit.json
@@ -41,14 +41,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-11-08 15:19:13.927194",
+ "modified": "2024-03-27 13:06:48.432478",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Customer Credit Limit",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/industry_type/industry_type.json b/erpnext/selling/doctype/industry_type/industry_type.json
index 3c8ab8e..7776b18 100644
--- a/erpnext/selling/doctype/industry_type/industry_type.json
+++ b/erpnext/selling/doctype/industry_type/industry_type.json
@@ -25,7 +25,7 @@
  "icon": "fa fa-flag",
  "idx": 1,
  "links": [],
- "modified": "2023-02-10 03:14:40.735763",
+ "modified": "2024-03-27 13:09:51.081515",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Industry Type",
@@ -61,7 +61,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "translated_doctype": 1
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index 1e22f44..be80a54 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -94,7 +94,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "hidden": 1,
    "label": "Address",
    "read_only": 1
@@ -238,7 +238,7 @@
  "idx": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-02-04 18:20:12.020313",
+ "modified": "2024-03-27 13:09:51.216007",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Installation Note",
@@ -266,9 +266,9 @@
    "role": "Sales User"
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "customer",
  "title_field": "customer_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/selling/doctype/installation_note/installation_note.py b/erpnext/selling/doctype/installation_note/installation_note.py
index d1bfd91..b7dd578 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.py
+++ b/erpnext/selling/doctype/installation_note/installation_note.py
@@ -23,7 +23,7 @@
 			InstallationNoteItem,
 		)
 
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		company: DF.Link
 		contact_display: DF.SmallText | None
@@ -38,13 +38,14 @@
 		inst_time: DF.Time | None
 		items: DF.Table[InstallationNoteItem]
 		naming_series: DF.Literal["MAT-INS-.YYYY.-"]
+		project: DF.Link | None
 		remarks: DF.SmallText | None
 		status: DF.Literal["Draft", "Submitted", "Cancelled"]
 		territory: DF.Link
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(InstallationNote, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.status_updater = [
 			{
 				"source_dt": "Installation Note Item",
diff --git a/erpnext/selling/doctype/installation_note_item/installation_note_item.json b/erpnext/selling/doctype/installation_note_item/installation_note_item.json
index 3e49fc9..6438ca2 100644
--- a/erpnext/selling/doctype/installation_note_item/installation_note_item.json
+++ b/erpnext/selling/doctype/installation_note_item/installation_note_item.json
@@ -112,14 +112,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-03-12 13:47:08.257955",
+ "modified": "2024-03-27 13:09:51.390239",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Installation Note Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/selling/doctype/party_specific_item/party_specific_item.json b/erpnext/selling/doctype/party_specific_item/party_specific_item.json
index a1f9902..999cb61 100644
--- a/erpnext/selling/doctype/party_specific_item/party_specific_item.json
+++ b/erpnext/selling/doctype/party_specific_item/party_specific_item.json
@@ -52,7 +52,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-02-15 13:00:50.379713",
+ "modified": "2024-03-27 13:10:08.752476",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Party Specific Item",
@@ -71,7 +71,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "party",
diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.json b/erpnext/selling/doctype/product_bundle/product_bundle.json
index 1c37b85..9cb95ae 100644
--- a/erpnext/selling/doctype/product_bundle/product_bundle.json
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.json
@@ -77,7 +77,7 @@
  "icon": "fa fa-sitemap",
  "idx": 1,
  "links": [],
- "modified": "2024-01-30 13:57:04.951788",
+ "modified": "2024-03-27 13:10:19.599302",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Product Bundle",
@@ -113,7 +113,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.py b/erpnext/selling/doctype/product_bundle/product_bundle.py
index 6632742..464cff0 100644
--- a/erpnext/selling/doctype/product_bundle/product_bundle.py
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.py
@@ -65,7 +65,7 @@
 
 		if len(invoice_links):
 			frappe.throw(
-				"This Product Bundle is linked with {0}. You will have to cancel these documents in order to delete this Product Bundle".format(
+				"This Product Bundle is linked with {}. You will have to cancel these documents in order to delete this Product Bundle".format(
 					", ".join(invoice_links)
 				),
 				title=_("Not Allowed"),
@@ -97,9 +97,7 @@
 	query = (
 		frappe.qb.from_(item)
 		.select(item.item_code, item.item_name)
-		.where(
-			(item.is_stock_item == 0) & (item.is_fixed_asset == 0) & (item[searchfield].like(f"%{txt}%"))
-		)
+		.where((item.is_stock_item == 0) & (item.is_fixed_asset == 0) & (item[searchfield].like(f"%{txt}%")))
 		.limit(page_len)
 		.offset(start)
 	)
diff --git a/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
index fc8caeb..77c23f5 100644
--- a/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
+++ b/erpnext/selling/doctype/product_bundle_item/product_bundle_item.json
@@ -68,13 +68,13 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-06-27 05:30:18.475150",
+ "modified": "2024-03-27 13:10:19.782002",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Product Bundle Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 982e732..7d0a1bb 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -265,7 +265,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Address",
    "oldfieldname": "customer_address",
    "oldfieldtype": "Small Text",
@@ -318,7 +318,7 @@
   },
   {
    "fieldname": "shipping_address",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Shipping Address",
    "print_hide": 1,
    "read_only": 1
@@ -965,7 +965,7 @@
   },
   {
    "fieldname": "company_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Company Address",
    "read_only": 1
   },
@@ -1073,7 +1073,7 @@
  "idx": 82,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-20 16:04:21.567847",
+ "modified": "2024-03-27 13:10:30.774058",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Quotation",
@@ -1166,7 +1166,7 @@
  ],
  "search_fields": "status,transaction_date,party_name,order_type",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "party_name",
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 633e5f5..17fc2b7 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -34,7 +34,7 @@
 		from erpnext.stock.doctype.packed_item.packed_item import PackedItem
 
 		additional_discount_percentage: DF.Float
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
 		auto_repeat: DF.Link | None
@@ -49,7 +49,7 @@
 		campaign: DF.Link | None
 		company: DF.Link
 		company_address: DF.Link | None
-		company_address_display: DF.SmallText | None
+		company_address_display: DF.TextEditor | None
 		competitors: DF.TableMultiSelect[CompetitorDetail]
 		contact_display: DF.SmallText | None
 		contact_email: DF.Data | None
@@ -93,7 +93,7 @@
 		scan_barcode: DF.Data | None
 		select_print_heading: DF.Link | None
 		selling_price_list: DF.Link
-		shipping_address: DF.SmallText | None
+		shipping_address: DF.TextEditor | None
 		shipping_address_name: DF.Link | None
 		shipping_rule: DF.Link | None
 		source: DF.Link | None
@@ -125,7 +125,7 @@
 			self.indicator_title = "Expired"
 
 	def validate(self):
-		super(Quotation, self).validate()
+		super().validate()
 		self.set_status()
 		self.validate_uom_is_integer("stock_uom", "stock_qty")
 		self.validate_uom_is_integer("uom", "qty")
@@ -188,7 +188,8 @@
 		def is_in_sales_order(row):
 			in_sales_order = bool(
 				frappe.db.exists(
-					"Sales Order Item", {"quotation_item": row.name, "item_code": row.item_code, "docstatus": 1}
+					"Sales Order Item",
+					{"quotation_item": row.name, "item_code": row.item_code, "docstatus": 1},
 				)
 			)
 			return in_sales_order
@@ -278,7 +279,7 @@
 	def on_cancel(self):
 		if self.lost_reasons:
 			self.lost_reasons = []
-		super(Quotation, self).on_cancel()
+		super().on_cancel()
 
 		# update enquiry status
 		self.set_status(update=True)
@@ -453,12 +454,8 @@
 	# if not exists any SO, set status as Expired
 	frappe.db.multisql(
 		{
-			"mariadb": """UPDATE `tabQuotation`  SET `tabQuotation`.status = 'Expired' WHERE {cond} and not exists({so_against_quo})""".format(
-				cond=cond, so_against_quo=so_against_quo
-			),
-			"postgres": """UPDATE `tabQuotation` SET status = 'Expired' FROM `tabSales Order`, `tabSales Order Item` WHERE {cond} and not exists({so_against_quo})""".format(
-				cond=cond, so_against_quo=so_against_quo
-			),
+			"mariadb": f"""UPDATE `tabQuotation`  SET `tabQuotation`.status = 'Expired' WHERE {cond} and not exists({so_against_quo})""",
+			"postgres": f"""UPDATE `tabQuotation` SET status = 'Expired' FROM `tabSales Order`, `tabSales Order Item` WHERE {cond} and not exists({so_against_quo})""",
 		},
 		(nowdate()),
 	)
@@ -547,9 +544,7 @@
 	mandatory_fields = [customer.meta.get_label(field.strip()) for field in mandatory_fields]
 
 	frappe.local.message_log = []
-	message = (
-		_("Could not auto create Customer due to the following missing mandatory field(s):") + "<br>"
-	)
+	message = _("Could not auto create Customer due to the following missing mandatory field(s):") + "<br>"
 	message += "<br><ul><li>" + "</li><li>".join(mandatory_fields) + "</li></ul>"
 	message += _("Please create Customer from Lead {0}.").format(get_link_to_form("Lead", lead_name))
 
diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py
index a525942..57c14db 100644
--- a/erpnext/selling/doctype/quotation/test_quotation.py
+++ b/erpnext/selling/doctype/quotation/test_quotation.py
@@ -152,9 +152,7 @@
 		self.assertEqual(quotation.payment_schedule[0].payment_amount, 8906.00)
 		self.assertEqual(quotation.payment_schedule[0].due_date, quotation.transaction_date)
 		self.assertEqual(quotation.payment_schedule[1].payment_amount, 8906.00)
-		self.assertEqual(
-			quotation.payment_schedule[1].due_date, add_days(quotation.transaction_date, 30)
-		)
+		self.assertEqual(quotation.payment_schedule[1].due_date, add_days(quotation.transaction_date, 30))
 
 		sales_order = make_sales_order(quotation.name)
 
@@ -187,9 +185,7 @@
 	def test_so_from_expired_quotation(self):
 		from erpnext.selling.doctype.quotation.quotation import make_sales_order
 
-		frappe.db.set_single_value(
-			"Selling Settings", "allow_sales_order_creation_for_expired_quotation", 0
-		)
+		frappe.db.set_single_value("Selling Settings", "allow_sales_order_creation_for_expired_quotation", 0)
 
 		quotation = frappe.copy_doc(test_records[0])
 		quotation.valid_till = add_days(nowdate(), -1)
@@ -198,9 +194,7 @@
 
 		self.assertRaises(frappe.ValidationError, make_sales_order, quotation.name)
 
-		frappe.db.set_single_value(
-			"Selling Settings", "allow_sales_order_creation_for_expired_quotation", 1
-		)
+		frappe.db.set_single_value("Selling Settings", "allow_sales_order_creation_for_expired_quotation", 1)
 
 		make_sales_order(quotation.name)
 
@@ -658,7 +652,7 @@
 			).insert()
 
 		if not frappe.db.exists("Item Tax Template", "Vat Template - _TC"):
-			doc = frappe.get_doc(
+			frappe.get_doc(
 				{
 					"doctype": "Item Tax Template",
 					"name": "Vat Template",
@@ -680,9 +674,7 @@
 			item_doc.append("taxes", {"item_tax_template": "Vat Template - _TC"})
 			item_doc.save()
 
-		quotation = make_quotation(
-			item_code="_Test Item Tax Template QTN", qty=1, rate=100, do_not_submit=1
-		)
+		quotation = make_quotation(item_code="_Test Item Tax Template QTN", qty=1, rate=100, do_not_submit=1)
 		self.assertFalse(quotation.taxes)
 
 		quotation.append_taxes_from_item_tax_template()
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index 0e25313..6edc734 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -667,13 +667,13 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-11-14 18:24:24.619832",
+ "modified": "2024-03-27 13:10:31.183320",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Quotation Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 1fb1ae0..3b6810d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -369,7 +369,7 @@
   {
    "allow_on_submit": 1,
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "hide_days": 1,
    "hide_seconds": 1,
    "label": "Address",
@@ -415,7 +415,7 @@
   },
   {
    "fieldname": "company_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "hide_days": 1,
    "hide_seconds": 1,
    "label": "Company Address",
@@ -450,7 +450,7 @@
   {
    "allow_on_submit": 1,
    "fieldname": "shipping_address",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "hide_days": 1,
    "hide_seconds": 1,
    "label": "Shipping Address",
@@ -1525,7 +1525,7 @@
    "allow_on_submit": 1,
    "depends_on": "dispatch_address_name",
    "fieldname": "dispatch_address",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Dispatch Address",
    "read_only": 1
   },
@@ -1657,7 +1657,7 @@
  "idx": 105,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-20 16:04:43.627183",
+ "modified": "2024-03-27 13:10:36.714671",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order",
@@ -1728,7 +1728,7 @@
  ],
  "search_fields": "status,transaction_date,customer,customer_name, territory,order_type,company",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "customer",
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 2896203..6afd4ac 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -64,7 +64,7 @@
 		from erpnext.stock.doctype.packed_item.packed_item import PackedItem
 
 		additional_discount_percentage: DF.Float
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		advance_paid: DF.Currency
 		advance_payment_status: DF.Literal["Not Requested", "Requested", "Partially Paid", "Fully Paid"]
 		amended_from: DF.Link | None
@@ -84,7 +84,7 @@
 		commission_rate: DF.Float
 		company: DF.Link
 		company_address: DF.Link | None
-		company_address_display: DF.SmallText | None
+		company_address_display: DF.TextEditor | None
 		contact_display: DF.SmallText | None
 		contact_email: DF.Data | None
 		contact_mobile: DF.SmallText | None
@@ -104,7 +104,7 @@
 		]
 		disable_rounded_total: DF.Check
 		discount_amount: DF.Currency
-		dispatch_address: DF.SmallText | None
+		dispatch_address: DF.TextEditor | None
 		dispatch_address_name: DF.Link | None
 		from_date: DF.Date | None
 		grand_total: DF.Currency
@@ -147,7 +147,7 @@
 		select_print_heading: DF.Link | None
 		selling_price_list: DF.Link
 		set_warehouse: DF.Link | None
-		shipping_address: DF.SmallText | None
+		shipping_address: DF.TextEditor | None
 		shipping_address_name: DF.Link | None
 		shipping_rule: DF.Link | None
 		skip_delivery_note: DF.Check
@@ -182,7 +182,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(SalesOrder, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 
 	def onload(self) -> None:
 		if frappe.db.get_single_value("Stock Settings", "enable_stock_reservation"):
@@ -193,7 +193,7 @@
 			self.set_onload("has_reserved_stock", True)
 
 	def validate(self):
-		super(SalesOrder, self).validate()
+		super().validate()
 		self.validate_delivery_date()
 		self.validate_proj_cust()
 		self.validate_po()
@@ -236,7 +236,9 @@
 			for d in self.get("items"):
 				if d.delivery_date and getdate(self.po_date) > getdate(d.delivery_date):
 					frappe.throw(
-						_("Row #{0}: Expected Delivery Date cannot be before Purchase Order Date").format(d.idx)
+						_("Row #{0}: Expected Delivery Date cannot be before Purchase Order Date").format(
+							d.idx
+						)
 					)
 
 		if self.po_no and self.customer and not self.skip_delivery_note:
@@ -251,9 +253,9 @@
 					frappe.db.get_single_value("Selling Settings", "allow_against_multiple_purchase_orders")
 				):
 					frappe.msgprint(
-						_("Warning: Sales Order {0} already exists against Customer's Purchase Order {1}").format(
-							frappe.bold(so[0][0]), frappe.bold(self.po_no)
-						),
+						_(
+							"Warning: Sales Order {0} already exists against Customer's Purchase Order {1}"
+						).format(frappe.bold(so[0][0]), frappe.bold(self.po_no)),
 						alert=True,
 					)
 				else:
@@ -263,14 +265,15 @@
 						).format(
 							frappe.bold(so[0][0]),
 							frappe.bold(self.po_no),
-							frappe.bold(_("'Allow Multiple Sales Orders Against a Customer's Purchase Order'")),
+							frappe.bold(
+								_("'Allow Multiple Sales Orders Against a Customer's Purchase Order'")
+							),
 							get_link_to_form("Selling Settings", "Selling Settings"),
 						)
 					)
 
 	def validate_for_items(self):
 		for d in self.get("items"):
-
 			# used for production plan
 			d.transaction_date = self.transaction_date
 
@@ -300,7 +303,9 @@
 					(d.prevdoc_docname, self.order_type),
 				)
 				if not res:
-					frappe.msgprint(_("Quotation {0} not of type {1}").format(d.prevdoc_docname, self.order_type))
+					frappe.msgprint(
+						_("Quotation {0} not of type {1}").format(d.prevdoc_docname, self.order_type)
+					)
 
 	def validate_delivery_date(self):
 		if self.order_type == "Sales" and not self.skip_delivery_note:
@@ -339,13 +344,16 @@
 				)
 
 	def validate_warehouse(self):
-		super(SalesOrder, self).validate_warehouse()
+		super().validate_warehouse()
 
 		for d in self.get("items"):
 			if (
 				(
 					frappe.get_cached_value("Item", d.item_code, "is_stock_item") == 1
-					or (self.has_product_bundle(d.item_code) and self.product_bundle_has_stock_item(d.item_code))
+					or (
+						self.has_product_bundle(d.item_code)
+						and self.product_bundle_has_stock_item(d.item_code)
+					)
 				)
 				and not d.warehouse
 				and not cint(d.delivered_by_supplier)
@@ -355,7 +363,7 @@
 				)
 
 	def validate_with_previous_doc(self):
-		super(SalesOrder, self).validate_with_previous_doc(
+		super().validate_with_previous_doc(
 			{
 				"Quotation": {"ref_dn_field": "prevdoc_docname", "compare_fields": [["company", "="]]},
 				"Quotation Item": {
@@ -416,7 +424,7 @@
 
 	def on_cancel(self):
 		self.ignore_linked_doctypes = ("GL Entry", "Stock Ledger Entry", "Payment Ledger Entry")
-		super(SalesOrder, self).on_cancel()
+		super().on_cancel()
 
 		# Cannot cancel closed SO
 		if self.status == "Closed":
@@ -439,9 +447,7 @@
 			update_coupon_code_count(self.coupon_code, "cancelled")
 
 	def update_project(self):
-		if (
-			frappe.db.get_single_value("Selling Settings", "sales_update_frequency") != "Each Transaction"
-		):
+		if frappe.db.get_single_value("Selling Settings", "sales_update_frequency") != "Each Transaction":
 			return
 
 		if self.project:
@@ -479,7 +485,7 @@
 
 	def check_modified_date(self):
 		mod_db = frappe.db.get_value("Sales Order", self.name, "modified")
-		date_diff = frappe.db.sql("select TIMEDIFF('%s', '%s')" % (mod_db, cstr(self.modified)))
+		date_diff = frappe.db.sql(f"select TIMEDIFF('{mod_db}', '{cstr(self.modified)}')")
 		if date_diff and date_diff[0][0]:
 			frappe.throw(_("{0} {1} has been modified. Please refresh.").format(self.doctype, self.name))
 
@@ -654,9 +660,9 @@
 						)
 					if not frappe.db.exists("BOM", {"item": item.item_code, "is_active": 1}):
 						frappe.throw(
-							_("No active BOM found for item {0}. Delivery by Serial No cannot be ensured").format(
-								item.item_code
-							)
+							_(
+								"No active BOM found for item {0}. Delivery by Serial No cannot be ensured"
+							).format(item.item_code)
 						)
 				reserved_items.append(item.item_code)
 			else:
@@ -672,9 +678,7 @@
 	def validate_reserved_stock(self):
 		"""Clean reserved stock flag for non-stock Item"""
 
-		enable_stock_reservation = frappe.db.get_single_value(
-			"Stock Settings", "enable_stock_reservation"
-		)
+		enable_stock_reservation = frappe.db.get_single_value("Stock Settings", "enable_stock_reservation")
 
 		for item in self.items:
 			if item.reserve_stock and (not enable_stock_reservation or not cint(item.is_stock_item)):
@@ -698,7 +702,7 @@
 	@frappe.whitelist()
 	def create_stock_reservation_entries(
 		self,
-		items_details: list[dict] = None,
+		items_details: list[dict] | None = None,
 		from_voucher_type: Literal["Pick List", "Purchase Receipt"] = None,
 		notify=True,
 	) -> None:
@@ -732,11 +736,7 @@
 	"""Returns the unreserved quantity for the Sales Order Item."""
 
 	existing_reserved_qty = reserved_qty_details.get(item.name, 0)
-	return (
-		item.stock_qty
-		- flt(item.delivered_qty) * item.get("conversion_factor", 1)
-		- existing_reserved_qty
-	)
+	return item.stock_qty - flt(item.delivered_qty) * item.get("conversion_factor", 1) - existing_reserved_qty
 
 
 def get_list_context(context=None):
@@ -757,9 +757,7 @@
 
 @frappe.whitelist()
 def is_enable_cutoff_date_on_bulk_delivery_note_creation():
-	return frappe.db.get_single_value(
-		"Selling Settings", "enable_cutoff_date_on_bulk_delivery_note_creation"
-	)
+	return frappe.db.get_single_value("Selling Settings", "enable_cutoff_date_on_bulk_delivery_note_creation")
 
 
 @frappe.whitelist()
@@ -1190,7 +1188,7 @@
 	conditions = get_event_conditions("Sales Order", filters)
 
 	data = frappe.db.sql(
-		"""
+		f"""
 		select
 			distinct `tabSales Order`.name, `tabSales Order`.customer_name, `tabSales Order`.status,
 			`tabSales Order`.delivery_status, `tabSales Order`.billing_status,
@@ -1203,9 +1201,7 @@
 			and (`tabSales Order Item`.delivery_date between %(start)s and %(end)s)
 			and `tabSales Order`.docstatus < 2
 			{conditions}
-		""".format(
-			conditions=conditions
-		),
+		""",
 		{"start": start, "end": end},
 		as_dict=True,
 		update={"allDay": 0},
@@ -1279,9 +1275,7 @@
 	items_to_map = list(set(items_to_map))
 
 	if not suppliers:
-		frappe.throw(
-			_("Please set a Supplier against the Items to be considered in the Purchase Order.")
-		)
+		frappe.throw(_("Please set a Supplier against the Items to be considered in the Purchase Order."))
 
 	purchase_orders = []
 	for supplier in suppliers:
@@ -1347,9 +1341,7 @@
 		selected_items = json.loads(selected_items)
 
 	items_to_map = [
-		item.get("item_code")
-		for item in selected_items
-		if item.get("item_code") and item.get("item_code")
+		item.get("item_code") for item in selected_items if item.get("item_code") and item.get("item_code")
 	]
 	items_to_map = list(set(items_to_map))
 
@@ -1532,17 +1524,13 @@
 	for item in items.get("items"):
 		item["include_exploded_items"] = items.get("include_exploded_items")
 		item["ignore_existing_ordered_qty"] = items.get("ignore_existing_ordered_qty")
-		item["include_raw_materials_from_sales_order"] = items.get(
-			"include_raw_materials_from_sales_order"
-		)
+		item["include_raw_materials_from_sales_order"] = items.get("include_raw_materials_from_sales_order")
 
 	items.update({"company": company, "sales_order": sales_order})
 
 	raw_materials = get_items_for_material_requests(items)
 	if not raw_materials:
-		frappe.msgprint(
-			_("Material Request not created, as quantity for Raw Materials already available.")
-		)
+		frappe.msgprint(_("Material Request not created, as quantity for Raw Materials already available."))
 		return
 
 	material_request = frappe.new_doc("Material Request")
diff --git a/erpnext/selling/doctype/sales_order/test_sales_order.py b/erpnext/selling/doctype/sales_order/test_sales_order.py
index 7327fde..2c9e887 100644
--- a/erpnext/selling/doctype/sales_order/test_sales_order.py
+++ b/erpnext/selling/doctype/sales_order/test_sales_order.py
@@ -36,9 +36,7 @@
 	def setUpClass(cls):
 		super().setUpClass()
 		cls.unlink_setting = int(
-			frappe.db.get_single_value(
-				"Accounts Settings", "unlink_advance_payment_on_cancelation_of_order"
-			)
+			frappe.db.get_single_value("Accounts Settings", "unlink_advance_payment_on_cancelation_of_order")
 		)
 
 	@classmethod
@@ -329,9 +327,7 @@
 
 	def test_reserved_qty_for_partial_delivery_with_packing_list(self):
 		make_stock_entry(target="_Test Warehouse - _TC", qty=10, rate=100)
-		make_stock_entry(
-			item="_Test Item Home Desktop 100", target="_Test Warehouse - _TC", qty=10, rate=100
-		)
+		make_stock_entry(item="_Test Item Home Desktop 100", target="_Test Warehouse - _TC", qty=10, rate=100)
 
 		existing_reserved_qty_item1 = get_reserved_qty("_Test Item")
 		existing_reserved_qty_item2 = get_reserved_qty("_Test Item Home Desktop 100")
@@ -339,16 +335,12 @@
 		so = make_sales_order(item_code="_Test Product Bundle Item")
 
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1 + 50)
-		self.assertEqual(
-			get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 20
-		)
+		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 20)
 
 		dn = create_dn_against_so(so.name)
 
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1 + 25)
-		self.assertEqual(
-			get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 10
-		)
+		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 10)
 
 		# close so
 		so.load_from_db()
@@ -362,15 +354,11 @@
 		so.update_status("Draft")
 
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1 + 25)
-		self.assertEqual(
-			get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 10
-		)
+		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 10)
 
 		dn.cancel()
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1 + 50)
-		self.assertEqual(
-			get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 20
-		)
+		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 20)
 
 		so.load_from_db()
 		so.cancel()
@@ -386,9 +374,7 @@
 
 	def test_reserved_qty_for_over_delivery_with_packing_list(self):
 		make_stock_entry(target="_Test Warehouse - _TC", qty=10, rate=100)
-		make_stock_entry(
-			item="_Test Item Home Desktop 100", target="_Test Warehouse - _TC", qty=10, rate=100
-		)
+		make_stock_entry(item="_Test Item Home Desktop 100", target="_Test Warehouse - _TC", qty=10, rate=100)
 
 		# set over-delivery allowance
 		frappe.db.set_value("Item", "_Test Product Bundle Item", "over_delivery_receipt_allowance", 50)
@@ -399,9 +385,7 @@
 		so = make_sales_order(item_code="_Test Product Bundle Item")
 
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1 + 50)
-		self.assertEqual(
-			get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 20
-		)
+		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 20)
 
 		dn = create_dn_against_so(so.name, 15)
 
@@ -410,9 +394,7 @@
 
 		dn.cancel()
 		self.assertEqual(get_reserved_qty("_Test Item"), existing_reserved_qty_item1 + 50)
-		self.assertEqual(
-			get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 20
-		)
+		self.assertEqual(get_reserved_qty("_Test Item Home Desktop 100"), existing_reserved_qty_item2 + 20)
 
 	def test_update_child_adding_new_item(self):
 		so = make_sales_order(item_code="_Test Item", qty=4)
@@ -482,9 +464,7 @@
 		trans_item = json.dumps(
 			[{"item_code": "_Test Item 2", "qty": 2, "rate": 500, "docname": so.get("items")[1].name}]
 		)
-		self.assertRaises(
-			frappe.ValidationError, update_child_qty_rate, "Sales Order", trans_item, so.name
-		)
+		self.assertRaises(frappe.ValidationError, update_child_qty_rate, "Sales Order", trans_item, so.name)
 
 		# remove last added item
 		trans_item = json.dumps(
@@ -523,9 +503,7 @@
 		trans_item = json.dumps(
 			[{"item_code": "_Test Item", "rate": 200, "qty": 2, "docname": so.items[0].name}]
 		)
-		self.assertRaises(
-			frappe.ValidationError, update_child_qty_rate, "Sales Order", trans_item, so.name
-		)
+		self.assertRaises(frappe.ValidationError, update_child_qty_rate, "Sales Order", trans_item, so.name)
 
 	def test_update_child_with_precision(self):
 		from frappe.custom.doctype.property_setter.property_setter import make_property_setter
@@ -555,15 +533,11 @@
 		trans_item = json.dumps(
 			[{"item_code": "_Test Item", "rate": 200, "qty": 7, "docname": so.items[0].name}]
 		)
-		self.assertRaises(
-			frappe.ValidationError, update_child_qty_rate, "Sales Order", trans_item, so.name
-		)
+		self.assertRaises(frappe.ValidationError, update_child_qty_rate, "Sales Order", trans_item, so.name)
 
 		# add new item
 		trans_item = json.dumps([{"item_code": "_Test Item", "rate": 100, "qty": 2}])
-		self.assertRaises(
-			frappe.ValidationError, update_child_qty_rate, "Sales Order", trans_item, so.name
-		)
+		self.assertRaises(frappe.ValidationError, update_child_qty_rate, "Sales Order", trans_item, so.name)
 
 	def test_update_child_qty_rate_with_workflow(self):
 		from frappe.model.workflow import apply_workflow
@@ -581,9 +555,7 @@
 		trans_item = json.dumps(
 			[{"item_code": "_Test Item", "rate": 150, "qty": 2, "docname": so.items[0].name}]
 		)
-		self.assertRaises(
-			frappe.ValidationError, update_child_qty_rate, "Sales Order", trans_item, so.name
-		)
+		self.assertRaises(frappe.ValidationError, update_child_qty_rate, "Sales Order", trans_item, so.name)
 
 		frappe.set_user("Administrator")
 		user2 = "test2@example.com"
@@ -841,9 +813,7 @@
 
 		frappe.set_user("Administrator")
 		frappe.permissions.remove_user_permission("Warehouse", "_Test Warehouse 1 - _TC", test_user.name)
-		frappe.permissions.remove_user_permission(
-			"Warehouse", "_Test Warehouse 2 - _TC1", test_user_2.name
-		)
+		frappe.permissions.remove_user_permission("Warehouse", "_Test Warehouse 2 - _TC1", test_user_2.name)
 		frappe.permissions.remove_user_permission("Company", "_Test Company 1", test_user_2.name)
 
 	def test_block_delivery_note_against_cancelled_sales_order(self):
@@ -962,9 +932,7 @@
 		from erpnext.selling.doctype.sales_order.sales_order import update_status as so_update_status
 
 		# make items
-		po_item = make_item(
-			"_Test Item for Drop Shipping", {"is_stock_item": 1, "delivered_by_supplier": 1}
-		)
+		po_item = make_item("_Test Item for Drop Shipping", {"is_stock_item": 1, "delivered_by_supplier": 1})
 		dn_item = make_item("_Test Regular Item", {"is_stock_item": 1})
 
 		so_items = [
@@ -1247,17 +1215,13 @@
 		new_so = frappe.copy_doc(so)
 		new_so.save(ignore_permissions=True)
 
-		self.assertEqual(
-			new_so.get("items")[0].rate, flt((price_list_rate * 25) / 100 + price_list_rate)
-		)
+		self.assertEqual(new_so.get("items")[0].rate, flt((price_list_rate * 25) / 100 + price_list_rate))
 		new_so.items[0].margin_rate_or_amount = 25
 		new_so.payment_schedule = []
 		new_so.save()
 		new_so.submit()
 
-		self.assertEqual(
-			new_so.get("items")[0].rate, flt((price_list_rate * 25) / 100 + price_list_rate)
-		)
+		self.assertEqual(new_so.get("items")[0].rate, flt((price_list_rate * 25) / 100 + price_list_rate))
 
 	def test_terms_auto_added(self):
 		so = make_sales_order(do_not_save=1)
@@ -1327,9 +1291,7 @@
 	def test_advance_payment_entry_unlink_against_sales_order(self):
 		from erpnext.accounts.doctype.payment_entry.test_payment_entry import get_payment_entry
 
-		frappe.db.set_single_value(
-			"Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0
-		)
+		frappe.db.set_single_value("Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0)
 
 		so = make_sales_order()
 
@@ -1382,9 +1344,7 @@
 		so = make_sales_order()
 
 		# disable unlinking of payment entry
-		frappe.db.set_single_value(
-			"Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0
-		)
+		frappe.db.set_single_value("Accounts Settings", "unlink_advance_payment_on_cancelation_of_order", 0)
 
 		# create a payment entry against sales order
 		pe = get_payment_entry("Sales Order", so.name, bank_account="_Test Bank - _TC")
@@ -1515,7 +1475,7 @@
 		Second Sales Order should not add on to Blanket Orders Ordered Quantity.
 		"""
 
-		bo = make_blanket_order(blanket_order_type="Selling", quantity=10, rate=10)
+		make_blanket_order(blanket_order_type="Selling", quantity=10, rate=10)
 
 		so = make_sales_order(item_code="_Test Item", qty=5, against_blanket_order=1)
 		so_doc = frappe.get_doc("Sales Order", so.get("name"))
@@ -1736,7 +1696,10 @@
 
 		wo.submit()
 		make_stock_entry(
-			item_code="_Test Item", target="Work In Progress - _TC", qty=4, basic_rate=100  # Stock RM
+			item_code="_Test Item",
+			target="Work In Progress - _TC",
+			qty=4,
+			basic_rate=100,  # Stock RM
 		)
 		make_stock_entry(
 			item_code="_Test Item Home Desktop 100",  # Stock RM
@@ -1844,10 +1807,6 @@
 
 	def test_delivered_item_material_request(self):
 		"SO -> MR (Manufacture) -> WO. Test if WO Qty is updated in SO."
-		from erpnext.manufacturing.doctype.work_order.work_order import (
-			make_stock_entry as make_se_from_wo,
-		)
-		from erpnext.stock.doctype.material_request.material_request import raise_work_orders
 
 		so = make_sales_order(
 			item_list=[
@@ -1855,9 +1814,7 @@
 			]
 		)
 
-		make_stock_entry(
-			item_code="_Test FG Item", target="Work In Progress - _TC", qty=4, basic_rate=100
-		)
+		make_stock_entry(item_code="_Test FG Item", target="Work In Progress - _TC", qty=4, basic_rate=100)
 
 		dn = make_delivery_note(so.name)
 		dn.items[0].qty = 4
@@ -1882,7 +1839,8 @@
 			if not frappe.db.exists("Item", product_bundle):
 				bundle_item = make_item(product_bundle, {"is_stock_item": 0})
 				bundle_item.append(
-					"item_defaults", {"company": "_Test Company", "default_warehouse": "_Test Warehouse - _TC"}
+					"item_defaults",
+					{"company": "_Test Company", "default_warehouse": "_Test Warehouse - _TC"},
 				)
 				bundle_item.save(ignore_permissions=True)
 
@@ -1952,7 +1910,8 @@
 			if not frappe.db.exists("Item", product_bundle):
 				bundle_item = make_item(product_bundle, {"is_stock_item": 0})
 				bundle_item.append(
-					"item_defaults", {"company": "_Test Company", "default_warehouse": "_Test Warehouse - _TC"}
+					"item_defaults",
+					{"company": "_Test Company", "default_warehouse": "_Test Warehouse - _TC"},
 				)
 				bundle_item.save(ignore_permissions=True)
 
@@ -2002,17 +1961,13 @@
 		from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request
 
 		so = make_sales_order(qty=1, rate=100)
-		self.assertEqual(
-			frappe.db.get_value(so.doctype, so.name, "advance_payment_status"), "Not Requested"
-		)
+		self.assertEqual(frappe.db.get_value(so.doctype, so.name, "advance_payment_status"), "Not Requested")
 
 		pr = make_payment_request(dt=so.doctype, dn=so.name, submit_doc=True, return_doc=True)
 		self.assertEqual(frappe.db.get_value(so.doctype, so.name, "advance_payment_status"), "Requested")
 
 		pe = get_payment_entry(so.doctype, so.name).save().submit()
-		self.assertEqual(
-			frappe.db.get_value(so.doctype, so.name, "advance_payment_status"), "Fully Paid"
-		)
+		self.assertEqual(frappe.db.get_value(so.doctype, so.name, "advance_payment_status"), "Fully Paid")
 
 		pe.reload()
 		pe.cancel()
@@ -2020,9 +1975,7 @@
 
 		pr.reload()
 		pr.cancel()
-		self.assertEqual(
-			frappe.db.get_value(so.doctype, so.name, "advance_payment_status"), "Not Requested"
-		)
+		self.assertEqual(frappe.db.get_value(so.doctype, so.name, "advance_payment_status"), "Not Requested")
 
 	def test_pick_list_without_rejected_materials(self):
 		serial_and_batch_item = make_item(
@@ -2252,9 +2205,7 @@
 
 
 def get_reserved_qty(item_code="_Test Item", warehouse="_Test Warehouse - _TC"):
-	return flt(
-		frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, "reserved_qty")
-	)
+	return flt(frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, "reserved_qty"))
 
 
 test_dependencies = ["Currency Exchange"]
@@ -2267,9 +2218,7 @@
 		doc.save()
 		return doc
 
-	frappe.get_doc(dict(doctype="Role", role_name="Test Junior Approver")).insert(
-		ignore_if_duplicate=True
-	)
+	frappe.get_doc(dict(doctype="Role", role_name="Test Junior Approver")).insert(ignore_if_duplicate=True)
 	frappe.get_doc(dict(doctype="Role", role_name="Test Approver")).insert(ignore_if_duplicate=True)
 	frappe.cache().hdel("roles", frappe.session.user)
 
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index d451768..5c3e01a 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -910,14 +910,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-21 18:15:56.625005",
+ "modified": "2024-03-27 13:10:37.177978",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Order Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/selling/doctype/sales_partner_type/sales_partner_type.json b/erpnext/selling/doctype/sales_partner_type/sales_partner_type.json
index a9b500a..534bd25 100644
--- a/erpnext/selling/doctype/sales_partner_type/sales_partner_type.json
+++ b/erpnext/selling/doctype/sales_partner_type/sales_partner_type.json
@@ -19,7 +19,7 @@
   }
  ],
  "links": [],
- "modified": "2023-02-10 01:00:20.110800",
+ "modified": "2024-03-27 13:10:37.773308",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Partner Type",
@@ -40,7 +40,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "translated_doctype": 1
diff --git a/erpnext/selling/doctype/sales_team/sales_team.json b/erpnext/selling/doctype/sales_team/sales_team.json
index cac5b76..e9d261a 100644
--- a/erpnext/selling/doctype/sales_team/sales_team.json
+++ b/erpnext/selling/doctype/sales_team/sales_team.json
@@ -87,14 +87,15 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-11-09 23:55:20.670475",
+ "modified": "2024-03-27 13:10:38.504580",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Sales Team",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json
index ee3d2bf..c873561 100644
--- a/erpnext/selling/doctype/selling_settings/selling_settings.json
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -214,7 +214,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-03-01 12:07:39.994520",
+ "modified": "2024-03-27 13:10:38.633352",
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Selling Settings",
@@ -239,7 +239,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/selling/doctype/sms_center/sms_center.json b/erpnext/selling/doctype/sms_center/sms_center.json
index 833539a..42c4700 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.json
+++ b/erpnext/selling/doctype/sms_center/sms_center.json
@@ -1,452 +1,132 @@
 {
- "allow_copy": 1, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2013-01-10 16:34:22", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 0, 
+ "actions": [],
+ "allow_copy": 1,
+ "creation": "2013-01-10 16:34:22",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "send_to",
+  "customer",
+  "supplier",
+  "sales_partner",
+  "department",
+  "branch",
+  "create_receiver_list",
+  "receiver_list",
+  "column_break9",
+  "message",
+  "total_characters",
+  "total_messages",
+  "send_sms"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "send_to", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Send To", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "\nAll Contact\nAll Customer Contact\nAll Supplier Contact\nAll Sales Partner Contact\nAll Lead (Open)\nAll Employee (Active)\nAll Sales Person", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "send_to",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Send To",
+   "options": "\nAll Contact\nAll Customer Contact\nAll Supplier Contact\nAll Sales Partner Contact\nAll Lead (Open)\nAll Employee (Active)\nAll Sales Person"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.send_to=='All Customer Contact'", 
-   "fieldname": "customer", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Customer", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.send_to=='All Customer Contact'",
+   "fieldname": "customer",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Customer",
+   "options": "Customer"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.send_to=='All Supplier Contact'", 
-   "fieldname": "supplier", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Supplier", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Supplier", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.send_to=='All Supplier Contact'",
+   "fieldname": "supplier",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Supplier",
+   "options": "Supplier"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.send_to=='All Sales Partner Contact'", 
-   "fieldname": "sales_partner", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sales Partner", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Sales Partner", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.send_to=='All Sales Partner Contact'",
+   "fieldname": "sales_partner",
+   "fieldtype": "Link",
+   "label": "Sales Partner",
+   "options": "Sales Partner"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.send_to=='All Employee (Active)'", 
-   "fieldname": "department", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Department", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Department", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.send_to=='All Employee (Active)'",
+   "fieldname": "department",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Department",
+   "options": "Department"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.send_to=='All Employee (Active)'", 
-   "fieldname": "branch", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Branch", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Branch", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.send_to=='All Employee (Active)'",
+   "fieldname": "branch",
+   "fieldtype": "Link",
+   "label": "Branch",
+   "options": "Branch"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "create_receiver_list", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Create Receiver List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "create_receiver_list", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "create_receiver_list",
+   "fieldtype": "Button",
+   "label": "Create Receiver List",
+   "options": "create_receiver_list"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "receiver_list", 
-   "fieldtype": "Code", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Receiver List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "receiver_list",
+   "fieldtype": "Code",
+   "label": "Receiver List"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break9", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "fieldname": "column_break9",
+   "fieldtype": "Column Break",
    "width": "50%"
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Messages greater than 160 characters will be split into multiple messages", 
-   "fieldname": "message", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Message", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "description": "Messages greater than 160 characters will be split into multiple messages",
+   "fieldname": "message",
+   "fieldtype": "Text",
+   "label": "Message",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_characters", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Characters", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "total_characters",
+   "fieldtype": "Int",
+   "label": "Total Characters",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "total_messages", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Total Message(s)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "total_messages",
+   "fieldtype": "Int",
+   "label": "Total Message(s)",
+   "read_only": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "send_sms", 
-   "fieldtype": "Button", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Send SMS", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "send_sms", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "send_sms",
+   "fieldtype": "Button",
+   "label": "Send SMS",
+   "options": "send_sms"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-mobile-phone", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2017-11-10 18:46:21.021767", 
- "modified_by": "Administrator", 
- "module": "Selling", 
- "name": "SMS Center", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-mobile-phone",
+ "idx": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:43.007491",
+ "modified_by": "Administrator",
+ "module": "Selling",
+ "name": "SMS Center",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 1, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0
+ ],
+ "read_only": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/selling/page/point_of_sale/point_of_sale.py b/erpnext/selling/page/point_of_sale/point_of_sale.py
index fd23381..2bb61a6 100644
--- a/erpnext/selling/page/point_of_sale/point_of_sale.py
+++ b/erpnext/selling/page/point_of_sale/point_of_sale.py
@@ -3,7 +3,6 @@
 
 
 import json
-from typing import Dict, Optional
 
 import frappe
 from frappe.utils import cint
@@ -198,16 +197,14 @@
 
 
 @frappe.whitelist()
-def search_for_serial_or_batch_or_barcode_number(search_value: str) -> Dict[str, Optional[str]]:
+def search_for_serial_or_batch_or_barcode_number(search_value: str) -> dict[str, str | None]:
 	return scan_barcode(search_value)
 
 
 def get_conditions(search_term):
 	condition = "("
 	condition += """item.name like {search_term}
-		or item.item_name like {search_term}""".format(
-		search_term=frappe.db.escape("%" + search_term + "%")
-	)
+		or item.item_name like {search_term}""".format(search_term=frappe.db.escape("%" + search_term + "%"))
 	condition += add_search_fields_condition(search_term)
 	condition += ")"
 
@@ -219,7 +216,7 @@
 	search_fields = frappe.get_all("POS Search Fields", fields=["fieldname"])
 	if search_fields:
 		for field in search_fields:
-			condition += " or item.`{0}` like {1}".format(
+			condition += " or item.`{}` like {}".format(
 				field["fieldname"], frappe.db.escape("%" + search_term + "%")
 			)
 	return condition
@@ -249,10 +246,8 @@
 			cond = cond % tuple(item_groups)
 
 	return frappe.db.sql(
-		""" select distinct name from `tabItem Group`
-			where {condition} and (name like %(txt)s) limit {page_len} offset {start}""".format(
-			condition=cond, start=start, page_len=page_len
-		),
+		f""" select distinct name from `tabItem Group`
+			where {cond} and (name like %(txt)s) limit {page_len} offset {start}""",
 		{"txt": "%%%s%%" % txt},
 	)
 
@@ -297,13 +292,13 @@
 	if search_term and status:
 		invoices_by_customer = frappe.db.get_all(
 			"POS Invoice",
-			filters={"customer": ["like", "%{}%".format(search_term)], "status": status},
+			filters={"customer": ["like", f"%{search_term}%"], "status": status},
 			fields=fields,
 			page_length=limit,
 		)
 		invoices_by_name = frappe.db.get_all(
 			"POS Invoice",
-			filters={"name": ["like", "%{}%".format(search_term)], "status": status},
+			filters={"name": ["like", f"%{search_term}%"], "status": status},
 			fields=fields,
 			page_length=limit,
 		)
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.py b/erpnext/selling/page/sales_funnel/sales_funnel.py
index 6b33a71..24bb0d2 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.py
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.py
@@ -85,7 +85,7 @@
 						* x["probability"]
 						/ 100
 					)
-				}
+				},
 			)
 			for x in opportunities
 		]
@@ -100,7 +100,7 @@
 		pivot_table = []
 		for sales_stage in sales_stages:
 			row = []
-			for source, sales_stage_values in summary.items():
+			for sales_stage_values in summary.values():
 				row.append(flt(sales_stage_values.get(sales_stage)))
 			pivot_table.append({"chartType": "bar", "name": sales_stage, "values": row})
 
@@ -137,7 +137,7 @@
 						* x["probability"]
 						/ 100
 					)
-				}
+				},
 			)
 			for x in opportunities
 		]
diff --git a/erpnext/selling/report/address_and_contacts/address_and_contacts.py b/erpnext/selling/report/address_and_contacts/address_and_contacts.py
index 0a29d43..a165b9f 100644
--- a/erpnext/selling/report/address_and_contacts/address_and_contacts.py
+++ b/erpnext/selling/report/address_and_contacts/address_and_contacts.py
@@ -27,8 +27,8 @@
 	party_type = filters.get("party_type")
 	party_type_value = get_party_group(party_type)
 	columns = [
-		"{party_type}:Link/{party_type}".format(party_type=party_type),
-		"{party_value_type}::150".format(party_value_type=frappe.unscrub(str(party_type_value))),
+		f"{party_type}:Link/{party_type}",
+		f"{frappe.unscrub(str(party_type_value))}::150",
 		"Address Line 1",
 		"Address Line 2",
 		"City",
@@ -127,7 +127,7 @@
 		["Dynamic Link", "link_doctype", "=", party_type],
 		["Dynamic Link", "link_name", "in", party_list],
 	]
-	fields = ["`tabDynamic Link`.link_name"] + field_map.get(doctype, [])
+	fields = ["`tabDynamic Link`.link_name", *field_map.get(doctype, [])]
 
 	records = frappe.get_list(doctype, filters=filters, fields=fields, as_list=True)
 	for d in records:
diff --git a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py
index 3e4bfb2..dcdd252 100644
--- a/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py
+++ b/erpnext/selling/report/customer_acquisition_and_loyalty/customer_acquisition_and_loyalty.py
@@ -77,10 +77,8 @@
 
 	out = []
 	for year in range(from_year, to_year + 1):
-		for month in range(
-			from_month if year == from_year else 1, (to_month + 1) if year == to_year else 13
-		):
-			key = "{year}-{month:02d}".format(year=year, month=month)
+		for month in range(from_month if year == from_year else 1, (to_month + 1) if year == to_year else 13):
+			key = f"{year}-{month:02d}"
 			data = customers_in.get(key)
 			new = data["new"] if data else [0, 0.0]
 			repeat = data["repeat"] if data else [0, 0.0]
@@ -147,7 +145,7 @@
 
 	for ld in loop_data:
 		if ld["parent_territory"]:
-			parent_data = [x for x in data if x["territory"] == ld["parent_territory"]][0]
+			parent_data = next(x for x in data if x["territory"] == ld["parent_territory"])
 			for key in parent_data.keys():
 				if key not in ["indent", "territory", "parent_territory", "bold"]:
 					parent_data[key] += ld[key]
@@ -165,15 +163,12 @@
 	customers_in = {}
 
 	for si in frappe.db.sql(
-		"""select territory, posting_date, customer, base_grand_total from `tabSales Invoice`
+		f"""select territory, posting_date, customer, base_grand_total from `tabSales Invoice`
 		where docstatus=1 and posting_date <= %(to_date)s
-		{company_condition} order by posting_date""".format(
-			company_condition=company_condition
-		),
+		{company_condition} order by posting_date""",
 		filters,
 		as_dict=1,
 	):
-
 		key = si.territory if tree_view else si.posting_date.strftime("%Y-%m")
 		new_or_repeat = "new" if si.customer not in customers else "repeat"
 		customers_in.setdefault(key, {"new": [0, 0.0], "repeat": [0, 0.0]})
diff --git a/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py b/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py
index a584d3a..d64c89c 100644
--- a/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py
+++ b/erpnext/selling/report/customer_credit_balance/customer_credit_balance.py
@@ -77,7 +77,6 @@
 
 
 def get_details(filters):
-
 	sql_query = """SELECT
 						c.name, c.customer_name,
 						ccl.bypass_credit_limit_check,
diff --git a/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py b/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py
index 40aa9ac..84da765 100644
--- a/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py
+++ b/erpnext/selling/report/customer_wise_item_price/customer_wise_item_price.py
@@ -51,7 +51,10 @@
 
 
 def fetch_item_prices(
-	customer: str = None, price_list: str = None, selling_price_list: str = None, items: list = None
+	customer: str | None = None,
+	price_list: str | None = None,
+	selling_price_list: str | None = None,
+	items: list | None = None,
 ):
 	price_list_map = frappe._dict()
 	ip = qb.DocType("Item Price")
@@ -59,10 +62,10 @@
 	or_conditions = []
 	if items:
 		and_conditions.append(ip.item_code.isin([x.item_code for x in items]))
-		and_conditions.append(ip.selling == True)
+		and_conditions.append(ip.selling.eq(True))
 
-		or_conditions.append(ip.customer == None)
-		or_conditions.append(ip.price_list == None)
+		or_conditions.append(ip.customer.isnull())
+		or_conditions.append(ip.price_list.isnull())
 
 		if customer:
 			or_conditions.append(ip.customer == customer)
diff --git a/erpnext/selling/report/inactive_customers/inactive_customers.py b/erpnext/selling/report/inactive_customers/inactive_customers.py
index a166085..7e4ddc1 100644
--- a/erpnext/selling/report/inactive_customers/inactive_customers.py
+++ b/erpnext/selling/report/inactive_customers/inactive_customers.py
@@ -40,19 +40,17 @@
 			DATEDIFF(CURRENT_DATE, max(so.transaction_date)) as 'days_since_last_order'"""
 
 	return frappe.db.sql(
-		"""select
+		f"""select
 			cust.name,
 			cust.customer_name,
 			cust.territory,
 			cust.customer_group,
 			count(distinct(so.name)) as 'num_of_order',
-			sum(base_net_total) as 'total_order_value', {0}
-		from `tabCustomer` cust, `tab{1}` so
+			sum(base_net_total) as 'total_order_value', {cond}
+		from `tabCustomer` cust, `tab{doctype}` so
 		where cust.name = so.customer and so.docstatus = 1
 		group by cust.name
-		order by 'days_since_last_order' desc """.format(
-			cond, doctype
-		),
+		order by 'days_since_last_order' desc """,
 		as_list=1,
 	)
 
@@ -62,11 +60,9 @@
 	if doctype == "Sales Order":
 		cond = "transaction_date"
 	res = frappe.db.sql(
-		"""select base_net_total from `tab{0}`
-		where customer = %s and docstatus = 1 order by {1} desc
-		limit 1""".format(
-			doctype, cond
-		),
+		f"""select base_net_total from `tab{doctype}`
+		where customer = %s and docstatus = 1 order by {cond} desc
+		limit 1""",
 		customer,
 	)
 
diff --git a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
index cd45e7d..9cdb14c 100644
--- a/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
+++ b/erpnext/selling/report/item_wise_sales_history/item_wise_sales_history.py
@@ -128,7 +128,6 @@
 
 
 def get_data(filters):
-
 	data = []
 
 	company_list = get_descendants_of("Company", filters.get("company"))
@@ -181,9 +180,7 @@
 	details = frappe.db.get_all("Item", fields=["name", "item_name", "item_group"])
 	item_details = {}
 	for d in details:
-		item_details.setdefault(
-			d.name, frappe._dict({"item_name": d.item_name, "item_group": d.item_group})
-		)
+		item_details.setdefault(d.name, frappe._dict({"item_name": d.item_name, "item_group": d.item_group}))
 	return item_details
 
 
@@ -246,8 +243,7 @@
 		item_wise_sales_map[item_key] = flt(item_wise_sales_map[item_key]) + flt(row.get("amount"))
 
 	item_wise_sales_map = {
-		item: value
-		for item, value in (sorted(item_wise_sales_map.items(), key=lambda i: i[1], reverse=True))
+		item: value for item, value in (sorted(item_wise_sales_map.items(), key=lambda i: i[1], reverse=True))
 	}
 
 	for key in item_wise_sales_map:
diff --git a/erpnext/selling/report/lost_quotations/lost_quotations.py b/erpnext/selling/report/lost_quotations/lost_quotations.py
index 7c0bfbd..a48e945 100644
--- a/erpnext/selling/report/lost_quotations/lost_quotations.py
+++ b/erpnext/selling/report/lost_quotations/lost_quotations.py
@@ -53,9 +53,7 @@
 	]
 
 
-def get_data(
-	company: str, from_date: str, to_date: str, group_by: Literal["Lost Reason", "Competitor"]
-):
+def get_data(company: str, from_date: str, to_date: str, group_by: Literal["Lost Reason", "Competitor"]):
 	"""Return quotation value grouped by lost reason or competitor"""
 	if group_by == "Lost Reason":
 		fieldname = "lost_reason"
diff --git a/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py b/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py
index 72b7fa2..79e0764 100644
--- a/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py
+++ b/erpnext/selling/report/payment_terms_status_for_sales_order/payment_terms_status_for_sales_order.py
@@ -82,9 +82,7 @@
 	).run()[0]
 
 	# get all children of group node
-	query = (
-		qb.from_(group_doc).select(group_doc.name).where((group_doc.lft >= lft) & (group_doc.rgt <= rgt))
-	)
+	query = qb.from_(group_doc).select(group_doc.name).where((group_doc.lft >= lft) & (group_doc.rgt <= rgt))
 
 	child_nodes = []
 	for x in query.run():
@@ -108,7 +106,9 @@
 					)
 			elif item[0] == "Item Group":
 				if item[3] != "":
-					filter_list.append([doctype, "item_group", "in", get_descendants_of("Item Group", item[3])])
+					filter_list.append(
+						[doctype, "item_group", "in", get_descendants_of("Item Group", item[3])]
+					)
 
 	if searchfield and txt:
 		filter_list.append([doctype, searchfield, "like", "%%%s%%" % txt])
@@ -132,9 +132,7 @@
 
 	conditions.company = filters.company or frappe.defaults.get_user_default("company")
 	conditions.end_date = filters.period_end_date or frappe.utils.today()
-	conditions.start_date = filters.period_start_date or frappe.utils.add_months(
-		conditions.end_date, -1
-	)
+	conditions.start_date = filters.period_start_date or frappe.utils.add_months(conditions.end_date, -1)
 
 	return conditions
 
diff --git a/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py b/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py
index 928ed80..7f9f3fb 100644
--- a/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py
+++ b/erpnext/selling/report/pending_so_items_for_purchase_request/pending_so_items_for_purchase_request.py
@@ -81,9 +81,7 @@
 
 	bundled_item_map = get_packed_items(sales_orders)
 
-	item_with_product_bundle = get_items_with_product_bundle(
-		[row.item_code for row in sales_order_entry]
-	)
+	item_with_product_bundle = get_items_with_product_bundle([row.item_code for row in sales_order_entry])
 
 	materials_request_dict = {}
 
@@ -129,7 +127,9 @@
 						"description": item.description,
 						"sales_order_no": so.name,
 						"date": so.transaction_date,
-						"material_request": ",".join(material_requests_against_so.get("material_requests", [])),
+						"material_request": ",".join(
+							material_requests_against_so.get("material_requests", [])
+						),
 						"customer": so.customer,
 						"territory": so.territory,
 						"so_qty": item.qty,
diff --git a/erpnext/selling/report/quotation_trends/quotation_trends.py b/erpnext/selling/report/quotation_trends/quotation_trends.py
index 4d71ce7..bcb8fe9 100644
--- a/erpnext/selling/report/quotation_trends/quotation_trends.py
+++ b/erpnext/selling/report/quotation_trends/quotation_trends.py
@@ -48,9 +48,7 @@
 	return {
 		"data": {
 			"labels": labels,
-			"datasets": [
-				{"name": _(filters.get("period")) + " " + _("Quoted Amount"), "values": datapoints}
-			],
+			"datasets": [{"name": _(filters.get("period")) + " " + _("Quoted Amount"), "values": datapoints}],
 		},
 		"type": "line",
 		"lineOptions": {"regionFill": 1},
diff --git a/erpnext/selling/report/sales_analytics/sales_analytics.py b/erpnext/selling/report/sales_analytics/sales_analytics.py
index 605d2fa..27d2e6e 100644
--- a/erpnext/selling/report/sales_analytics/sales_analytics.py
+++ b/erpnext/selling/report/sales_analytics/sales_analytics.py
@@ -13,7 +13,7 @@
 	return Analytics(filters).run()
 
 
-class Analytics(object):
+class Analytics:
 	def __init__(self, filters=None):
 		self.filters = frappe._dict(filters or {})
 		self.date_field = (
@@ -87,9 +87,7 @@
 				{"label": _(period), "fieldname": scrub(period), "fieldtype": "Float", "width": 120}
 			)
 
-		self.columns.append(
-			{"label": _("Total"), "fieldname": "total", "fieldtype": "Float", "width": 120}
-		)
+		self.columns.append({"label": _("Total"), "fieldname": "total", "fieldtype": "Float", "width": 120})
 
 	def get_data(self):
 		if self.filters.tree_type in ["Customer", "Supplier"]:
@@ -129,9 +127,7 @@
 			""" select s.order_type as entity, s.{value_field} as value_field, s.{date_field}
 			from `tab{doctype}` s where s.docstatus = 1 and s.company = %s and s.{date_field} between %s and %s
 			and ifnull(s.order_type, '') != '' order by s.order_type
-		""".format(
-				date_field=self.date_field, value_field=value_field, doctype=self.filters.doc_type
-			),
+		""".format(date_field=self.date_field, value_field=value_field, doctype=self.filters.doc_type),
 			(self.filters.company, self.filters.from_date, self.filters.to_date),
 			as_dict=1,
 		)
@@ -166,7 +162,6 @@
 			self.entity_names.setdefault(d.entity, d.entity_name)
 
 	def get_sales_transactions_based_on_items(self):
-
 		if self.filters["value_quantity"] == "Value":
 			value_field = "base_net_amount"
 		else:
@@ -178,9 +173,7 @@
 			from `tab{doctype} Item` i , `tab{doctype}` s
 			where s.name = i.parent and i.docstatus = 1 and s.company = %s
 			and s.{date_field} between %s and %s
-		""".format(
-				date_field=self.date_field, value_field=value_field, doctype=self.filters.doc_type
-			),
+		""".format(date_field=self.date_field, value_field=value_field, doctype=self.filters.doc_type),
 			(self.filters.company, self.filters.from_date, self.filters.to_date),
 			as_dict=1,
 		)
@@ -221,14 +214,12 @@
 			value_field = "qty"
 
 		self.entries = frappe.db.sql(
-			"""
-			select i.item_group as entity, i.{value_field} as value_field, s.{date_field}
-			from `tab{doctype} Item` i , `tab{doctype}` s
+			f"""
+			select i.item_group as entity, i.{value_field} as value_field, s.{self.date_field}
+			from `tab{self.filters.doc_type} Item` i , `tab{self.filters.doc_type}` s
 			where s.name = i.parent and i.docstatus = 1 and s.company = %s
-			and s.{date_field} between %s and %s
-		""".format(
-				date_field=self.date_field, value_field=value_field, doctype=self.filters.doc_type
-			),
+			and s.{self.date_field} between %s and %s
+		""",
 			(self.filters.company, self.filters.from_date, self.filters.to_date),
 			as_dict=1,
 		)
@@ -294,7 +285,7 @@
 				total += amount
 
 			row["total"] = total
-			out = [row] + out
+			out = [row, *out]
 
 		self.data = out
 
@@ -330,9 +321,7 @@
 
 		from_date, to_date = getdate(self.filters.from_date), getdate(self.filters.to_date)
 
-		increment = {"Monthly": 1, "Quarterly": 3, "Half-Yearly": 6, "Yearly": 12}.get(
-			self.filters.range, 1
-		)
+		increment = {"Monthly": 1, "Quarterly": 3, "Half-Yearly": 6, "Yearly": 12}.get(self.filters.range, 1)
 
 		if self.filters.range in ["Monthly", "Quarterly"]:
 			from_date = from_date.replace(day=1)
@@ -342,7 +331,7 @@
 			from_date = from_date + relativedelta(from_date, weekday=MO(-1))
 
 		self.periodic_daterange = []
-		for dummy in range(1, 53):
+		for _dummy in range(1, 53):
 			if self.filters.range == "Weekly":
 				period_end_date = add_days(from_date, 6)
 			else:
@@ -370,10 +359,8 @@
 		self.depth_map = frappe._dict()
 
 		self.group_entries = frappe.db.sql(
-			"""select name, lft, rgt , {parent} as parent
-			from `tab{tree}` order by lft""".format(
-				tree=self.filters.tree_type, parent=parent
-			),
+			f"""select name, lft, rgt , {parent} as parent
+			from `tab{self.filters.tree_type}` order by lft""",
 			as_dict=1,
 		)
 
@@ -387,12 +374,10 @@
 		self.depth_map = frappe._dict()
 
 		self.group_entries = frappe.db.sql(
-			""" select * from (select "Order Types" as name, 0 as lft,
+			f""" select * from (select "Order Types" as name, 0 as lft,
 			2 as rgt, '' as parent union select distinct order_type as name, 1 as lft, 1 as rgt, "Order Types" as parent
-			from `tab{doctype}` where ifnull(order_type, '') != '') as b order by lft, name
-		""".format(
-				doctype=self.filters.doc_type
-			),
+			from `tab{self.filters.doc_type}` where ifnull(order_type, '') != '') as b order by lft, name
+		""",
 			as_dict=1,
 		)
 
diff --git a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
index 1e1d0c0..70b021a 100644
--- a/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
+++ b/erpnext/selling/report/sales_order_analysis/sales_order_analysis.py
@@ -61,7 +61,7 @@
 
 def get_data(conditions, filters):
 	data = frappe.db.sql(
-		"""
+		f"""
 		SELECT
 			so.transaction_date as date,
 			soi.delivery_date as delivery_date,
@@ -91,9 +91,7 @@
 			{conditions}
 		GROUP BY soi.name
 		ORDER BY so.transaction_date ASC, soi.item_code ASC
-	""".format(
-			conditions=conditions
-		),
+	""",
 		filters,
 		as_dict=1,
 	)
@@ -176,7 +174,9 @@
 				so_row = sales_order_map[so_name]
 				so_row["required_date"] = max(getdate(so_row["delivery_date"]), getdate(row["delivery_date"]))
 				so_row["delay"] = (
-					min(so_row["delay"], row["delay"]) if row["delay"] and so_row["delay"] else so_row["delay"]
+					min(so_row["delay"], row["delay"])
+					if row["delay"] and so_row["delay"]
+					else so_row["delay"]
 				)
 
 				# sum numeric columns
diff --git a/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py b/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py
index cf9ea21..844aa86 100644
--- a/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py
+++ b/erpnext/selling/report/sales_partner_commission_summary/sales_partner_commission_summary.py
@@ -75,16 +75,14 @@
 	entries = frappe.db.sql(
 		"""
 		SELECT
-			name, customer, territory, {0} as posting_date, base_net_total as amount,
+			name, customer, territory, {} as posting_date, base_net_total as amount,
 			sales_partner, commission_rate, total_commission
 		FROM
-			`tab{1}`
+			`tab{}`
 		WHERE
-			{2} and docstatus = 1 and sales_partner is not null
+			{} and docstatus = 1 and sales_partner is not null
 			and sales_partner != '' order by name desc, sales_partner
-		""".format(
-			date_field, filters.get("doctype"), conditions
-		),
+		""".format(date_field, filters.get("doctype"), conditions),
 		filters,
 		as_dict=1,
 	)
@@ -97,15 +95,15 @@
 
 	for field in ["company", "customer", "territory"]:
 		if filters.get(field):
-			conditions += " and {0} = %({1})s".format(field, field)
+			conditions += f" and {field} = %({field})s"
 
 	if filters.get("sales_partner"):
 		conditions += " and sales_partner = %(sales_partner)s"
 
 	if filters.get("from_date"):
-		conditions += " and {0} >= %(from_date)s".format(date_field)
+		conditions += f" and {date_field} >= %(from_date)s"
 
 	if filters.get("to_date"):
-		conditions += " and {0} <= %(to_date)s".format(date_field)
+		conditions += f" and {date_field} <= %(to_date)s"
 
 	return conditions
diff --git a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
index 42bdf57..5046ec5 100644
--- a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
+++ b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
@@ -94,8 +94,8 @@
 	]
 
 	for period in period_list:
-		target_key = "target_{}".format(period.key)
-		variance_key = "variance_{}".format(period.key)
+		target_key = f"target_{period.key}"
+		variance_key = f"variance_{period.key}"
 
 		columns.extend(
 			[
@@ -169,9 +169,7 @@
 
 	for d in sales_users_data:
 		key = (d.parent, d.item_group)
-		dist_data = get_periodwise_distribution_data(
-			d.distribution_id, period_list, filters.get("period")
-		)
+		dist_data = get_periodwise_distribution_data(d.distribution_id, period_list, filters.get("period"))
 
 		if key not in rows:
 			rows.setdefault(key, {"total_target": 0, "total_achieved": 0, "total_variance": 0})
@@ -182,8 +180,8 @@
 			if p_key not in details:
 				details[p_key] = 0
 
-			target_key = "target_{}".format(p_key)
-			variance_key = "variance_{}".format(p_key)
+			target_key = f"target_{p_key}"
+			variance_key = f"variance_{p_key}"
 			details[target_key] = (d.get(target_qty_amt_field) * dist_data.get(p_key)) / 100
 			details[variance_key] = 0
 			details["total_target"] += details[target_key]
diff --git a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.py b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.py
index f2b6a54..bad6c94 100644
--- a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.py
+++ b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.py
@@ -8,6 +8,4 @@
 
 
 def execute(filters=None):
-	data = []
-
 	return get_data_column(filters, "Sales Partner")
diff --git a/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py b/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py
index 2049520..216adde 100644
--- a/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py
+++ b/erpnext/selling/report/sales_partner_transaction_summary/sales_partner_transaction_summary.py
@@ -110,9 +110,7 @@
 			{cond} and dt.name = dt_item.parent and dt.docstatus = 1
 			and dt.sales_partner is not null and dt.sales_partner != ''
 			order by dt.name desc, dt.sales_partner
-		""".format(
-			date_field=date_field, doctype=filters.get("doctype"), cond=conditions
-		),
+		""".format(date_field=date_field, doctype=filters.get("doctype"), cond=conditions),
 		filters,
 		as_dict=1,
 	)
@@ -125,13 +123,13 @@
 
 	for field in ["company", "customer", "territory", "sales_partner"]:
 		if filters.get(field):
-			conditions += " and dt.{0} = %({1})s".format(field, field)
+			conditions += f" and dt.{field} = %({field})s"
 
 	if filters.get("from_date"):
-		conditions += " and dt.{0} >= %(from_date)s".format(date_field)
+		conditions += f" and dt.{date_field} >= %(from_date)s"
 
 	if filters.get("to_date"):
-		conditions += " and dt.{0} <= %(to_date)s".format(date_field)
+		conditions += f" and dt.{date_field} <= %(to_date)s"
 
 	if not filters.get("show_return_entries"):
 		conditions += " and dt_item.qty > 0.0"
@@ -142,10 +140,7 @@
 	if filters.get("item_group"):
 		lft, rgt = frappe.get_cached_value("Item Group", filters.get("item_group"), ["lft", "rgt"])
 
-		conditions += """ and dt_item.item_group in (select name from
-			`tabItem Group` where lft >= %s and rgt <= %s)""" % (
-			lft,
-			rgt,
-		)
+		conditions += f""" and dt_item.item_group in (select name from
+			`tabItem Group` where lft >= {lft} and rgt <= {rgt})"""
 
 	return conditions
diff --git a/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py b/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py
index a8df530..16b2d49 100644
--- a/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py
+++ b/erpnext/selling/report/sales_person_commission_summary/sales_person_commission_summary.py
@@ -103,16 +103,15 @@
 	entries = frappe.db.sql(
 		"""
 		select
-			dt.name, dt.customer, dt.territory, dt.%s as posting_date,dt.base_net_total as base_net_amount,
+			dt.name, dt.customer, dt.territory, dt.{} as posting_date,dt.base_net_total as base_net_amount,
 			st.commission_rate,st.sales_person, st.allocated_percentage, st.allocated_amount, st.incentives
 		from
-			`tab%s` dt, `tabSales Team` st
+			`tab{}` dt, `tabSales Team` st
 		where
-			st.parent = dt.name and st.parenttype = %s
-			and dt.docstatus = 1 %s order by dt.name desc,st.sales_person
-		"""
-		% (date_field, filters["doc_type"], "%s", conditions),
-		tuple([filters["doc_type"]] + values),
+			st.parent = dt.name and st.parenttype = {}
+			and dt.docstatus = 1 {} order by dt.name desc,st.sales_person
+		""".format(date_field, filters["doc_type"], "%s", conditions),
+		tuple([filters["doc_type"], *values]),
 		as_dict=1,
 	)
 
@@ -125,18 +124,18 @@
 
 	for field in ["company", "customer", "territory"]:
 		if filters.get(field):
-			conditions.append("dt.{0}=%s".format(field))
+			conditions.append(f"dt.{field}=%s")
 			values.append(filters[field])
 
 	if filters.get("sales_person"):
-		conditions.append("st.sales_person = '{0}'".format(filters.get("sales_person")))
+		conditions.append("st.sales_person = '{}'".format(filters.get("sales_person")))
 
 	if filters.get("from_date"):
-		conditions.append("dt.{0}>=%s".format(date_field))
+		conditions.append(f"dt.{date_field}>=%s")
 		values.append(filters["from_date"])
 
 	if filters.get("to_date"):
-		conditions.append("dt.{0}<=%s".format(date_field))
+		conditions.append(f"dt.{date_field}<=%s")
 		values.append(filters["to_date"])
 
 	return " and ".join(conditions), values
diff --git a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
index 847488f..f8cde14 100644
--- a/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
+++ b/erpnext/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
@@ -156,27 +156,26 @@
 	entries = frappe.db.sql(
 		"""
 		SELECT
-			dt.name, dt.customer, dt.territory, dt.%s as posting_date, dt_item.item_code,
+			dt.name, dt.customer, dt.territory, dt.{} as posting_date, dt_item.item_code,
 			st.sales_person, st.allocated_percentage, dt_item.warehouse,
 		CASE
-			WHEN dt.status = "Closed" THEN dt_item.%s * dt_item.conversion_factor
+			WHEN dt.status = "Closed" THEN dt_item.{} * dt_item.conversion_factor
 			ELSE dt_item.stock_qty
 		END as stock_qty,
 		CASE
-			WHEN dt.status = "Closed" THEN (dt_item.base_net_rate * dt_item.%s * dt_item.conversion_factor)
+			WHEN dt.status = "Closed" THEN (dt_item.base_net_rate * dt_item.{} * dt_item.conversion_factor)
 			ELSE dt_item.base_net_amount
 		END as base_net_amount,
 		CASE
-			WHEN dt.status = "Closed" THEN ((dt_item.base_net_rate * dt_item.%s * dt_item.conversion_factor) * st.allocated_percentage/100)
+			WHEN dt.status = "Closed" THEN ((dt_item.base_net_rate * dt_item.{} * dt_item.conversion_factor) * st.allocated_percentage/100)
 			ELSE dt_item.base_net_amount * st.allocated_percentage/100
 		END as contribution_amt
 		FROM
-			`tab%s` dt, `tab%s Item` dt_item, `tabSales Team` st
+			`tab{}` dt, `tab{} Item` dt_item, `tabSales Team` st
 		WHERE
-			st.parent = dt.name and dt.name = dt_item.parent and st.parenttype = %s
-			and dt.docstatus = 1 %s order by st.sales_person, dt.name desc
-		"""
-		% (
+			st.parent = dt.name and dt.name = dt_item.parent and st.parenttype = {}
+			and dt.docstatus = 1 {} order by st.sales_person, dt.name desc
+		""".format(
 			date_field,
 			qty_field,
 			qty_field,
@@ -186,7 +185,7 @@
 			"%s",
 			conditions,
 		),
-		tuple([filters["doc_type"]] + values),
+		tuple([filters["doc_type"], *values]),
 		as_dict=1,
 	)
 
@@ -199,23 +198,21 @@
 
 	for field in ["company", "customer", "territory"]:
 		if filters.get(field):
-			conditions.append("dt.{0}=%s".format(field))
+			conditions.append(f"dt.{field}=%s")
 			values.append(filters[field])
 
 	if filters.get("sales_person"):
 		lft, rgt = frappe.get_value("Sales Person", filters.get("sales_person"), ["lft", "rgt"])
 		conditions.append(
-			"exists(select name from `tabSales Person` where lft >= {0} and rgt <= {1} and name=st.sales_person)".format(
-				lft, rgt
-			)
+			f"exists(select name from `tabSales Person` where lft >= {lft} and rgt <= {rgt} and name=st.sales_person)"
 		)
 
 	if filters.get("from_date"):
-		conditions.append("dt.{0}>=%s".format(date_field))
+		conditions.append(f"dt.{date_field}>=%s")
 		values.append(filters["from_date"])
 
 	if filters.get("to_date"):
-		conditions.append("dt.{0}<=%s".format(date_field))
+		conditions.append(f"dt.{date_field}<=%s")
 		values.append(filters["to_date"])
 
 	items = get_items(filters)
diff --git a/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.py b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.py
index eee2d42..527e60e 100644
--- a/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.py
+++ b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.py
@@ -8,6 +8,4 @@
 
 
 def execute(filters=None):
-	data = []
-
 	return get_data_column(filters, "Territory")
diff --git a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py
index ecb63d8..e31b259 100644
--- a/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py
+++ b/erpnext/selling/report/territory_wise_sales/territory_wise_sales.py
@@ -107,7 +107,7 @@
 	conditions = ""
 
 	if filters.get("transaction_date"):
-		conditions = " WHERE transaction_date between {0} and {1}".format(
+		conditions = " WHERE transaction_date between {} and {}".format(
 			frappe.db.escape(filters["transaction_date"][0]),
 			frappe.db.escape(filters["transaction_date"][1]),
 		)
@@ -120,12 +120,10 @@
 		conditions += " company = %(company)s"
 
 	return frappe.db.sql(
-		"""
+		f"""
 		SELECT name, territory, opportunity_amount
-		FROM `tabOpportunity` {0}
-	""".format(
-			conditions
-		),
+		FROM `tabOpportunity` {conditions}
+	""",
 		filters,
 		as_dict=1,
 	)  # nosec
@@ -141,10 +139,8 @@
 		"""
 		SELECT `name`,`base_grand_total`, `opportunity`
 		FROM `tabQuotation`
-		WHERE docstatus=1 AND opportunity in ({0})
-	""".format(
-			", ".join(["%s"] * len(opportunity_names))
-		),
+		WHERE docstatus=1 AND opportunity in ({})
+	""".format(", ".join(["%s"] * len(opportunity_names))),
 		tuple(opportunity_names),
 		as_dict=1,
 	)  # nosec
@@ -160,10 +156,8 @@
 		"""
 	SELECT so.`name`, so.`base_grand_total`, soi.prevdoc_docname as quotation
 	FROM `tabSales Order` so, `tabSales Order Item` soi
-	WHERE so.docstatus=1 AND so.name = soi.parent AND soi.prevdoc_docname in ({0})
-	""".format(
-			", ".join(["%s"] * len(quotation_names))
-		),
+	WHERE so.docstatus=1 AND so.name = soi.parent AND soi.prevdoc_docname in ({})
+	""".format(", ".join(["%s"] * len(quotation_names))),
 		tuple(quotation_names),
 		as_dict=1,
 	)  # nosec
@@ -179,10 +173,8 @@
 		"""
 	SELECT si.name, si.base_grand_total, sii.sales_order
 	FROM `tabSales Invoice` si, `tabSales Invoice Item` sii
-	WHERE si.docstatus=1 AND si.name = sii.parent AND sii.sales_order in ({0})
-	""".format(
-			", ".join(["%s"] * len(so_names))
-		),
+	WHERE si.docstatus=1 AND si.name = sii.parent AND sii.sales_order in ({})
+	""".format(", ".join(["%s"] * len(so_names))),
 		tuple(so_names),
 		as_dict=1,
 	)  # nosec
diff --git a/erpnext/setup/demo.py b/erpnext/setup/demo.py
index f48402e..f025352 100644
--- a/erpnext/setup/demo.py
+++ b/erpnext/setup/demo.py
@@ -150,7 +150,6 @@
 				document, filters={"docstatus": 1}, fields=["name", "transaction_date"], limit=6
 			)
 		):
-
 			if document == "Purchase Order":
 				invoice = make_purchase_invoice(order.name)
 			elif document == "Sales Order":
@@ -217,7 +216,7 @@
 
 def read_data_file_using_hooks(doctype):
 	path = os.path.join(os.path.dirname(__file__), "demo_data")
-	with open(os.path.join(path, doctype + ".json"), "r") as f:
+	with open(os.path.join(path, doctype + ".json")) as f:
 		data = f.read()
 
 	return data
diff --git a/erpnext/setup/doctype/authorization_control/authorization_control.json b/erpnext/setup/doctype/authorization_control/authorization_control.json
index 823ff26..e22281d 100644
--- a/erpnext/setup/doctype/authorization_control/authorization_control.json
+++ b/erpnext/setup/doctype/authorization_control/authorization_control.json
@@ -1,26 +1,20 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "creation": "2012-03-27 14:36:18", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "fields": [], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "modified": "2013-12-20 19:22:54", 
- "modified_by": "Administrator", 
- "module": "Setup", 
- "name": "Authorization Control", 
- "owner": "Administrator", 
- "permissions": [], 
- "read_only": 0, 
- "read_only_onload": 0
+ "actions": [],
+ "creation": "2012-03-27 14:36:18",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [],
+ "fields": [],
+ "idx": 1,
+ "issingle": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:36.513715",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "Authorization Control",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/authorization_control/authorization_control.py b/erpnext/setup/doctype/authorization_control/authorization_control.py
index 27313ae..ef703de 100644
--- a/erpnext/setup/doctype/authorization_control/authorization_control.py
+++ b/erpnext/setup/doctype/authorization_control/authorization_control.py
@@ -22,7 +22,7 @@
 
 	def get_appr_user_role(self, det, doctype_name, total, based_on, condition, master_name, company):
 		amt_list, appr_users, appr_roles = [], [], []
-		users, roles = "", ""
+		_users, _roles = "", ""
 		if det:
 			for x in det:
 				amt_list.append(flt(x[0]))
@@ -30,18 +30,20 @@
 
 			app_dtl = frappe.db.sql(
 				"""select approving_user, approving_role from `tabAuthorization Rule`
-				where transaction = %s and (value = %s or value > %s)
-				and docstatus != 2 and based_on = %s and company = %s %s"""
-				% ("%s", "%s", "%s", "%s", "%s", condition),
+				where transaction = {} and (value = {} or value > {})
+				and docstatus != 2 and based_on = {} and company = {} {}""".format(
+					"%s", "%s", "%s", "%s", "%s", condition
+				),
 				(doctype_name, flt(max_amount), total, based_on, company),
 			)
 
 			if not app_dtl:
 				app_dtl = frappe.db.sql(
 					"""select approving_user, approving_role from `tabAuthorization Rule`
-					where transaction = %s and (value = %s or value > %s) and docstatus != 2
-					and based_on = %s and ifnull(company,'') = '' %s"""
-					% ("%s", "%s", "%s", "%s", condition),
+					where transaction = {} and (value = {} or value > {}) and docstatus != 2
+					and based_on = {} and ifnull(company,'') = '' {}""".format(
+						"%s", "%s", "%s", "%s", condition
+					),
 					(doctype_name, flt(max_amount), total, based_on),
 				)
 
@@ -64,18 +66,20 @@
 			add_cond1 += " and master_name = " + frappe.db.escape(cstr(master_name))
 			itemwise_exists = frappe.db.sql(
 				"""select value from `tabAuthorization Rule`
-				where transaction = %s and value <= %s
-				and based_on = %s and company = %s and docstatus != 2 %s %s"""
-				% ("%s", "%s", "%s", "%s", cond, add_cond1),
+				where transaction = {} and value <= {}
+				and based_on = {} and company = {} and docstatus != 2 {} {}""".format(
+					"%s", "%s", "%s", "%s", cond, add_cond1
+				),
 				(doctype_name, total, based_on, company),
 			)
 
 			if not itemwise_exists:
 				itemwise_exists = frappe.db.sql(
 					"""select value from `tabAuthorization Rule`
-					where transaction = %s and value <= %s and based_on = %s
-					and ifnull(company,'') = ''	and docstatus != 2 %s %s"""
-					% ("%s", "%s", "%s", cond, add_cond1),
+					where transaction = {} and value <= {} and based_on = {}
+					and ifnull(company,'') = ''	and docstatus != 2 {} {}""".format(
+						"%s", "%s", "%s", cond, add_cond1
+					),
 					(doctype_name, total, based_on),
 				)
 
@@ -90,18 +94,18 @@
 
 			appr = frappe.db.sql(
 				"""select value from `tabAuthorization Rule`
-				where transaction = %s and value <= %s and based_on = %s
-				and company = %s and docstatus != 2 %s %s"""
-				% ("%s", "%s", "%s", "%s", cond, add_cond2),
+				where transaction = {} and value <= {} and based_on = {}
+				and company = {} and docstatus != 2 {} {}""".format("%s", "%s", "%s", "%s", cond, add_cond2),
 				(doctype_name, total, based_on, company),
 			)
 
 			if not appr:
 				appr = frappe.db.sql(
 					"""select value from `tabAuthorization Rule`
-					where transaction = %s and value <= %s and based_on = %s
-					and ifnull(company,'') = '' and docstatus != 2 %s %s"""
-					% ("%s", "%s", "%s", cond, add_cond2),
+					where transaction = {} and value <= {} and based_on = {}
+					and ifnull(company,'') = '' and docstatus != 2 {} {}""".format(
+						"%s", "%s", "%s", cond, add_cond2
+					),
 					(doctype_name, total, based_on),
 				)
 
@@ -128,7 +132,7 @@
 					customer = doc_obj.customer
 				else:
 					customer = doc_obj.customer_name
-				add_cond = " and master_name = {}".format(frappe.db.escape(customer))
+				add_cond = f" and master_name = {frappe.db.escape(customer)}"
 		if based_on == "Itemwise Discount":
 			if doc_obj:
 				for t in doc_obj.get("items"):
@@ -197,11 +201,10 @@
 			for x in frappe.db.sql(
 				"""select based_on
 			from `tabAuthorization Rule`
-			where transaction = %s and system_role IN (%s) and based_on IN (%s)
-			and (company = %s or ifnull(company,'')='')
+			where transaction = {} and system_role IN ({}) and based_on IN ({})
+			and (company = {} or ifnull(company,'')='')
 			and docstatus != 2
-		"""
-				% (
+		""".format(
 					"%s",
 					"'" + "','".join(frappe.get_roles()) + "'",
 					"'" + "','".join(final_based_on) + "'",
diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.json b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
index d750c7b..1ac7a40 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.json
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
@@ -162,7 +162,7 @@
  "icon": "fa fa-shield",
  "idx": 1,
  "links": [],
- "modified": "2023-09-11 10:29:02.863193",
+ "modified": "2024-03-27 13:06:36.613880",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Authorization Rule",
@@ -183,7 +183,7 @@
  ],
  "search_fields": "transaction,based_on,system_user,system_role,approving_user,approving_role",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.py b/erpnext/setup/doctype/authorization_rule/authorization_rule.py
index b65a327..a52a32a 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.py
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.py
@@ -88,9 +88,7 @@
 			"Itemwise Discount",
 			"Item Group wise Discount",
 		]:
-			frappe.throw(
-				_("Cannot set authorization on basis of Discount for {0}").format(self.transaction)
-			)
+			frappe.throw(_("Cannot set authorization on basis of Discount for {0}").format(self.transaction))
 		elif self.based_on == "Average Discount" and flt(self.value) > 100.00:
 			frappe.throw(_("Discount must be less than 100"))
 		elif self.based_on == "Customerwise Discount" and not self.master_name:
diff --git a/erpnext/setup/doctype/branch/branch.json b/erpnext/setup/doctype/branch/branch.json
index 2aba5dd..9aeef89 100644
--- a/erpnext/setup/doctype/branch/branch.json
+++ b/erpnext/setup/doctype/branch/branch.json
@@ -1,103 +1,61 @@
 {
- "allow_copy": 0,
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:branch",
- "beta": 0,
  "creation": "2013-01-10 16:34:13",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
  "document_type": "Setup",
- "editable_grid": 0,
+ "engine": "InnoDB",
+ "field_order": [
+  "branch"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "branch",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Branch",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "branch",
    "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
    "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "unique": 1
   }
  ],
- "hide_heading": 0,
- "hide_toolbar": 0,
  "icon": "fa fa-code-fork",
  "idx": 1,
- "image_view": 0,
- "in_create": 0,
-
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2016-07-25 05:24:26.534086",
+ "links": [],
+ "modified": "2024-03-27 13:06:42.370664",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Branch",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "HR User",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
-   "export": 0,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "HR Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
  "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "track_seen": 0
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json
index 45b4db8..80b30b3 100644
--- a/erpnext/setup/doctype/brand/brand.json
+++ b/erpnext/setup/doctype/brand/brand.json
@@ -56,7 +56,7 @@
  "idx": 1,
  "image_field": "image",
  "links": [],
- "modified": "2021-03-01 15:57:30.005783",
+ "modified": "2024-03-27 13:06:42.500721",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Brand",
@@ -106,6 +106,7 @@
  ],
  "quick_entry": 1,
  "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "ASC"
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index b9ff3dd..1c4a3a8 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -766,7 +766,7 @@
  "image_field": "company_logo",
  "is_tree": 1,
  "links": [],
- "modified": "2023-10-23 10:19:24.322898",
+ "modified": "2024-03-27 13:06:45.374715",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Company",
@@ -825,7 +825,7 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 3ca14e6..ad2280c 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -122,9 +122,8 @@
 			"Supplier Quotation",
 		]:
 			if frappe.db.sql(
-				"""select name from `tab%s` where company=%s and docstatus=1
-					limit 1"""
-				% (doctype, "%s"),
+				"""select name from `tab{}` where company={} and docstatus=1
+					limit 1""".format(doctype, "%s"),
 				self.name,
 			):
 				exists = True
@@ -157,9 +156,7 @@
 		if not self.abbr.strip():
 			frappe.throw(_("Abbreviation is mandatory"))
 
-		if frappe.db.sql(
-			"select abbr from tabCompany where name!=%s and abbr=%s", (self.name, self.abbr)
-		):
+		if frappe.db.sql("select abbr from tabCompany where name!=%s and abbr=%s", (self.name, self.abbr)):
 			frappe.throw(_("Abbreviation already used for another company"))
 
 	@frappe.whitelist()
@@ -183,7 +180,9 @@
 				for_company = frappe.db.get_value("Account", self.get(account[1]), "company")
 				if for_company != self.name:
 					frappe.throw(
-						_("Account {0} does not belong to company: {1}").format(self.get(account[1]), self.name)
+						_("Account {0} does not belong to company: {1}").format(
+							self.get(account[1]), self.name
+						)
 					)
 
 				if get_account_currency(self.get(account[1])) != self.default_currency:
@@ -195,9 +194,7 @@
 	def validate_currency(self):
 		if self.is_new():
 			return
-		self.previous_default_currency = frappe.get_cached_value(
-			"Company", self.name, "default_currency"
-		)
+		self.previous_default_currency = frappe.get_cached_value("Company", self.name, "default_currency")
 		if (
 			self.default_currency
 			and self.previous_default_currency
@@ -261,17 +258,14 @@
 			{"warehouse_name": _("Finished Goods"), "is_group": 0},
 			{"warehouse_name": _("Goods In Transit"), "is_group": 0, "warehouse_type": "Transit"},
 		]:
-
-			if not frappe.db.exists(
-				"Warehouse", "{0} - {1}".format(wh_detail["warehouse_name"], self.abbr)
-			):
+			if not frappe.db.exists("Warehouse", "{} - {}".format(wh_detail["warehouse_name"], self.abbr)):
 				warehouse = frappe.get_doc(
 					{
 						"doctype": "Warehouse",
 						"warehouse_name": wh_detail["warehouse_name"],
 						"is_group": wh_detail["is_group"],
 						"company": self.name,
-						"parent_warehouse": "{0} - {1}".format(_("All Warehouses"), self.abbr)
+						"parent_warehouse": "{} - {}".format(_("All Warehouses"), self.abbr)
 						if not wh_detail["is_group"]
 						else "",
 						"warehouse_type": wh_detail.get("warehouse_type"),
@@ -296,9 +290,7 @@
 
 		self.db_set(
 			"default_payable_account",
-			frappe.db.get_value(
-				"Account", {"company": self.name, "account_type": "Payable", "is_group": 0}
-			),
+			frappe.db.get_value("Account", {"company": self.name, "account_type": "Payable", "is_group": 0}),
 		)
 
 	def create_default_departments(self):
@@ -425,7 +417,9 @@
 				and not self.default_provisional_account
 			):
 				frappe.throw(
-					_("Set default {0} account for non stock items").format(frappe.bold("Provisional Account"))
+					_("Set default {0} account for non stock items").format(
+						frappe.bold("Provisional Account")
+					)
 				)
 
 			make_property_setter(
@@ -440,9 +434,7 @@
 	def check_country_change(self):
 		frappe.flags.country_change = False
 
-		if not self.is_new() and self.country != frappe.get_cached_value(
-			"Company", self.name, "country"
-		):
+		if not self.is_new() and self.country != frappe.get_cached_value("Company", self.name, "country"):
 			frappe.flags.country_change = True
 
 	def set_chart_of_accounts(self):
@@ -609,14 +601,14 @@
 			)
 
 			for doctype in ["Account", "Cost Center", "Budget", "Party Account"]:
-				frappe.db.sql("delete from `tab{0}` where company = %s".format(doctype), self.name)
+				frappe.db.sql(f"delete from `tab{doctype}` where company = %s", self.name)
 
 		if not frappe.db.get_value("Stock Ledger Entry", {"company": self.name}):
 			frappe.db.sql("""delete from `tabWarehouse` where company=%s""", self.name)
 
 		frappe.defaults.clear_default("company", value=self.name)
 		for doctype in ["Mode of Payment Account", "Item Default"]:
-			frappe.db.sql("delete from `tab{0}` where company = %s".format(doctype), self.name)
+			frappe.db.sql(f"delete from `tab{doctype}` where company = %s", self.name)
 
 		# clear default accounts, warehouses from item
 		warehouses = frappe.db.sql_list("select name from tabWarehouse where company=%s", self.name)
@@ -649,7 +641,7 @@
 			frappe.db.sql("delete from tabBOM where company=%s", self.name)
 			for dt in ("BOM Operation", "BOM Item", "BOM Scrap Item", "BOM Explosion Item"):
 				frappe.db.sql(
-					"delete from `tab%s` where parent in (%s)" "" % (dt, ", ".join(["%s"] * len(boms))),
+					"delete from `tab{}` where parent in ({})" "".format(dt, ", ".join(["%s"] * len(boms))),
 					tuple(boms),
 				)
 
@@ -705,7 +697,7 @@
 	current_month_year = formatdate(today(), "MM-yyyy")
 
 	results = frappe.db.sql(
-		"""
+		f"""
 		SELECT
 			SUM(base_grand_total) AS total,
 			DATE_FORMAT(`posting_date`, '%m-%Y') AS month_year
@@ -714,12 +706,10 @@
 		WHERE
 			DATE_FORMAT(`posting_date`, '%m-%Y') = '{current_month_year}'
 			AND docstatus = 1
-			AND company = {company}
+			AND company = {frappe.db.escape(company)}
 		GROUP BY
 			month_year
-	""".format(
-			current_month_year=current_month_year, company=frappe.db.escape(company)
-		),
+	""",
 		as_dict=True,
 	)
 
@@ -734,9 +724,7 @@
 
 	from frappe.utils.goal import get_monthly_results
 
-	filter_str = "company = {0} and status != 'Draft' and docstatus=1".format(
-		frappe.db.escape(company)
-	)
+	filter_str = f"company = {frappe.db.escape(company)} and status != 'Draft' and docstatus=1"
 	month_to_value_dict = get_monthly_results(
 		"Sales Invoice", "base_grand_total", "posting_date", filter_str, "sum"
 	)
@@ -746,9 +734,7 @@
 
 def update_transactions_annual_history(company, commit=False):
 	transactions_history = get_all_transactions_annual_history(company)
-	frappe.db.set_value(
-		"Company", company, "transactions_annual_history", json.dumps(transactions_history)
-	)
+	frappe.db.set_value("Company", company, "transactions_annual_history", json.dumps(transactions_history))
 
 	if commit:
 		frappe.db.commit()
@@ -764,21 +750,19 @@
 
 @frappe.whitelist()
 def get_children(doctype, parent=None, company=None, is_root=False):
-	if parent == None or parent == "All Companies":
+	if parent is None or parent == "All Companies":
 		parent = ""
 
 	return frappe.db.sql(
-		"""
+		f"""
 		select
 			name as value,
 			is_group as expandable
 		from
 			`tabCompany` comp
 		where
-			ifnull(parent_company, "")={parent}
-		""".format(
-			parent=frappe.db.escape(parent)
-		),
+			ifnull(parent_company, "")={frappe.db.escape(parent)}
+		""",
 		as_dict=1,
 	)
 
@@ -854,7 +838,6 @@
 
 def get_timeline_data(doctype, name):
 	"""returns timeline data based on linked records in dashboard"""
-	out = {}
 	date_to_value_dict = {}
 
 	history = frappe.get_cached_value("Company", name, "transactions_annual_history")
@@ -879,14 +862,13 @@
 
 	out = frappe.db.sql(
 		""" SELECT
-			addr.name, addr.%s
+			addr.name, addr.{}
 		FROM
 			`tabAddress` addr, `tabDynamic Link` dl
 		WHERE
 			dl.parent = addr.name and dl.link_doctype = 'Company' and
-			dl.link_name = %s and ifnull(addr.disabled, 0) = 0
-		"""
-		% (sort_key, "%s"),
+			dl.link_name = {} and ifnull(addr.disabled, 0) = 0
+		""".format(sort_key, "%s"),
 		(name),
 	)  # nosec
 
diff --git a/erpnext/setup/doctype/currency_exchange/currency_exchange.py b/erpnext/setup/doctype/currency_exchange/currency_exchange.py
index 735734b..dab3564 100644
--- a/erpnext/setup/doctype/currency_exchange/currency_exchange.py
+++ b/erpnext/setup/doctype/currency_exchange/currency_exchange.py
@@ -38,7 +38,7 @@
 		if cint(self.for_buying) == 1 and cint(self.for_selling) == 0:
 			purpose = "Buying"
 
-		self.name = "{0}-{1}-{2}{3}".format(
+		self.name = "{}-{}-{}{}".format(
 			formatdate(get_datetime_str(self.date), "yyyy-MM-dd"),
 			self.from_currency,
 			self.to_currency,
diff --git a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
index 8477984..3249c93 100644
--- a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
+++ b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
@@ -49,6 +49,7 @@
 
 test_exchange_values = {"2015-12-15": "66.999", "2016-01-15": "65.1"}
 
+
 # Removing API call from get_exchange_rate
 def patched_requests_get(*args, **kwargs):
 	class PatchResponse:
@@ -83,7 +84,7 @@
 	def clear_cache(self):
 		cache = frappe.cache()
 		for date in test_exchange_values.keys():
-			key = "currency_exchange_rate_{0}:{1}:{2}".format(date, "USD", "INR")
+			key = "currency_exchange_rate_{}:{}:{}".format(date, "USD", "INR")
 			cache.delete(key)
 
 	def tearDown(self):
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index 4c36bc7..f2db724 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -139,7 +139,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2023-06-02 13:40:34.435822",
+ "modified": "2024-03-27 13:06:48.550415",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Customer Group",
@@ -210,7 +210,7 @@
  ],
  "search_fields": "parent_customer_group",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/customer_group/customer_group.py b/erpnext/setup/doctype/customer_group/customer_group.py
index 89b89ad..0b783c0 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.py
+++ b/erpnext/setup/doctype/customer_group/customer_group.py
@@ -41,7 +41,7 @@
 
 	def on_update(self):
 		self.validate_name_with_customer()
-		super(CustomerGroup, self).on_update()
+		super().on_update()
 		self.validate_one_root()
 
 	def validate_name_with_customer(self):
diff --git a/erpnext/setup/doctype/department/department.json b/erpnext/setup/doctype/department/department.json
index 99deca5..ce1ca98 100644
--- a/erpnext/setup/doctype/department/department.json
+++ b/erpnext/setup/doctype/department/department.json
@@ -90,7 +90,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2023-08-28 17:26:46.826501",
+ "modified": "2024-03-27 13:06:50.845700",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Department",
@@ -135,7 +135,7 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/department/department.py b/erpnext/setup/doctype/department/department.py
index b36f032..d40cf6b 100644
--- a/erpnext/setup/doctype/department/department.py
+++ b/erpnext/setup/doctype/department/department.py
@@ -51,10 +51,10 @@
 
 	def on_update(self):
 		if not (frappe.local.flags.ignore_update_nsm or frappe.flags.in_setup_wizard):
-			super(Department, self).on_update()
+			super().on_update()
 
 	def on_trash(self):
-		super(Department, self).on_trash()
+		super().on_trash()
 		delete_events(self.doctype, self.name)
 
 
@@ -64,7 +64,7 @@
 
 def get_abbreviated_name(name, company):
 	abbr = frappe.get_cached_value("Company", company, "abbr")
-	new_name = "{0} - {1}".format(name, abbr)
+	new_name = f"{name} - {abbr}"
 	return new_name
 
 
diff --git a/erpnext/setup/doctype/designation/designation.json b/erpnext/setup/doctype/designation/designation.json
index a5b2ac9..ed37131 100644
--- a/erpnext/setup/doctype/designation/designation.json
+++ b/erpnext/setup/doctype/designation/designation.json
@@ -31,7 +31,7 @@
  "icon": "fa fa-bookmark",
  "idx": 1,
  "links": [],
- "modified": "2023-02-10 01:53:41.319386",
+ "modified": "2024-03-27 13:06:51.361961",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Designation",
@@ -56,7 +56,7 @@
  ],
  "quick_entry": 1,
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "translated_doctype": 1
diff --git a/erpnext/setup/doctype/driver/driver.json b/erpnext/setup/doctype/driver/driver.json
index 2e994b5..79244e6 100644
--- a/erpnext/setup/doctype/driver/driver.json
+++ b/erpnext/setup/doctype/driver/driver.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "naming_series:",
@@ -118,11 +119,11 @@
   }
  ],
  "icon": "fa fa-user",
- "modified": "2022-06-28 10:29:14.151380",
+ "links": [],
+ "modified": "2024-03-27 13:08:18.825438",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Driver",
- "name_case": "Title Case",
  "owner": "Administrator",
  "permissions": [
   {
@@ -178,8 +179,9 @@
  "quick_entry": 1,
  "search_fields": "full_name",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "full_name",
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/driving_license_category/driving_license_category.json b/erpnext/setup/doctype/driving_license_category/driving_license_category.json
index 1f0447c..4350bc1 100644
--- a/erpnext/setup/doctype/driving_license_category/driving_license_category.json
+++ b/erpnext/setup/doctype/driving_license_category/driving_license_category.json
@@ -38,14 +38,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-06-27 10:40:55.209022",
+ "modified": "2024-03-27 13:08:19.062758",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Driving License Category",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/email_digest/email_digest.json b/erpnext/setup/doctype/email_digest/email_digest.json
index 06c98e5..d8cbb45 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.json
+++ b/erpnext/setup/doctype/email_digest/email_digest.json
@@ -310,7 +310,7 @@
  "idx": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-08-24 23:49:00.081695",
+ "modified": "2024-03-27 13:09:36.439936",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Email Digest",
@@ -333,6 +333,7 @@
    "role": "System Manager"
   }
  ],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index 4b07056..3a5933e 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -75,7 +75,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(EmailDigest, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 
 		self.from_date, self.to_date = self.get_from_to_date()
 		self.set_dates()
@@ -90,9 +90,7 @@
 			select name, enabled from tabUser
 			where name not in ({})
 			and user_type != "Website User"
-			order by enabled desc, name asc""".format(
-				", ".join(["%s"] * len(STANDARD_USERS))
-			),
+			order by enabled desc, name asc""".format(", ".join(["%s"] * len(STANDARD_USERS))),
 			STANDARD_USERS,
 			as_dict=1,
 		)
@@ -195,15 +193,11 @@
 		context.text_color = "#36414C"
 		context.h1 = "margin-bottom: 30px; margin-top: 40px; font-weight: 400; font-size: 30px;"
 		context.h2 = "margin-bottom: 30px; margin-top: -20px; font-weight: 400; font-size: 20px;"
-		context.label_css = """display: inline-block; color: {text_muted};
-			padding: 3px 7px; margin-right: 7px;""".format(
-			text_muted=context.text_muted
-		)
+		context.label_css = f"""display: inline-block; color: {context.text_muted};
+			padding: 3px 7px; margin-right: 7px;"""
 		context.section_head = "margin-top: 60px; font-size: 16px;"
 		context.line_item = "padding: 5px 0px; margin: 0; border-bottom: 1px solid #d1d8dd;"
-		context.link_css = "color: {text_color}; text-decoration: none;".format(
-			text_color=context.text_color
-		)
+		context.link_css = f"color: {context.text_color}; text-decoration: none;"
 
 	def get_notifications(self):
 		"""Get notifications for user"""
@@ -226,7 +220,7 @@
 		events = get_events(from_date, to_date)
 
 		event_count = 0
-		for i, e in enumerate(events):
+		for _i, e in enumerate(events):
 			e.starts_on_label = format_time(e.starts_on)
 			e.ends_on_label = format_time(e.ends_on) if e.ends_on else None
 			e.date = formatdate(e.starts)
@@ -277,7 +271,7 @@
 		issue_list = frappe.db.sql(
 			"""select *
 			from `tabIssue` where status in ("Replied","Open")
-			order by modified asc limit 10""",
+			order by creation asc limit 10""",
 			as_dict=True,
 		)
 
@@ -301,7 +295,7 @@
 		project_list = frappe.db.sql(
 			"""select *
 			from `tabProject` where status='Open' and project_type='External'
-			order by modified asc limit 10""",
+			order by creation asc limit 10""",
 			as_dict=True,
 		)
 
@@ -342,11 +336,8 @@
 			"new_quotations",
 			"pending_quotations",
 		):
-
 			if self.get(key):
-				cache_key = "email_digest:card:{0}:{1}:{2}:{3}".format(
-					self.company, self.frequency, key, self.from_date
-				)
+				cache_key = f"email_digest:card:{self.company}:{self.frequency}:{key}:{self.from_date}"
 				card = cache.get(cache_key)
 
 				if card:
@@ -465,9 +456,7 @@
 		return self.get_type_balance("invoiced_amount", "Receivable")
 
 	def get_expenses_booked(self):
-		expenses, past_expenses, count = self.get_period_amounts(
-			self.get_roots("expense"), "expenses_booked"
-		)
+		expenses, past_expenses, count = self.get_period_amounts(self.get_roots("expense"), "expenses_booked")
 
 		expense_account = frappe.db.get_all(
 			"Account",
@@ -603,7 +592,6 @@
 		return {"label": label, "value": value, "count": count}
 
 	def get_type_balance(self, fieldname, account_type, root_type=None):
-
 		if root_type:
 			accounts = [
 				d.name
@@ -693,53 +681,43 @@
 			self._accounts[root_type] = [
 				d.name
 				for d in frappe.db.get_all(
-					"Account", filters={"root_type": root_type.title(), "company": self.company, "is_group": 0}
+					"Account",
+					filters={"root_type": root_type.title(), "company": self.company, "is_group": 0},
 				)
 			]
 		return self._accounts[root_type]
 
 	def get_purchase_order(self):
-
 		return self.get_summary_of_doc("Purchase Order", "purchase_order")
 
 	def get_sales_order(self):
-
 		return self.get_summary_of_doc("Sales Order", "sales_order")
 
 	def get_pending_purchase_orders(self):
-
 		return self.get_summary_of_pending("Purchase Order", "pending_purchase_orders", "per_received")
 
 	def get_pending_sales_orders(self):
-
 		return self.get_summary_of_pending("Sales Order", "pending_sales_orders", "per_delivered")
 
 	def get_sales_invoice(self):
-
 		return self.get_summary_of_doc("Sales Invoice", "sales_invoice")
 
 	def get_purchase_invoice(self):
-
 		return self.get_summary_of_doc("Purchase Invoice", "purchase_invoice")
 
 	def get_new_quotations(self):
-
 		return self.get_summary_of_doc("Quotation", "new_quotations")
 
 	def get_pending_quotations(self):
-
 		return self.get_summary_of_pending_quotations("pending_quotations")
 
 	def get_summary_of_pending(self, doc_type, fieldname, getfield):
-
 		value, count, billed_value, delivered_value = frappe.db.sql(
 			"""select ifnull(sum(grand_total),0), count(*),
-			ifnull(sum(grand_total*per_billed/100),0), ifnull(sum(grand_total*{0}/100),0)  from `tab{1}`
+			ifnull(sum(grand_total*per_billed/100),0), ifnull(sum(grand_total*{}/100),0)  from `tab{}`
 			where (transaction_date <= %(to_date)s)
 			and status not in ('Closed','Cancelled', 'Completed')
-			and company = %(company)s """.format(
-				getfield, doc_type
-			),
+			and company = %(company)s """.format(getfield, doc_type),
 			{"to_date": self.future_to_date, "company": self.company},
 		)[0]
 
@@ -752,7 +730,6 @@
 		}
 
 	def get_summary_of_pending_quotations(self, fieldname):
-
 		value, count = frappe.db.sql(
 			"""select ifnull(sum(grand_total),0), count(*) from `tabQuotation`
 			where (transaction_date <= %(to_date)s)
@@ -785,19 +762,14 @@
 		return {"label": label, "value": value, "last_value": last_value, "count": count}
 
 	def get_summary_of_doc(self, doc_type, fieldname):
-
 		date_field = (
 			"posting_date" if doc_type in ["Sales Invoice", "Purchase Invoice"] else "transaction_date"
 		)
 
-		value = flt(
-			self.get_total_on(doc_type, self.future_from_date, self.future_to_date)[0].grand_total
-		)
+		value = flt(self.get_total_on(doc_type, self.future_from_date, self.future_to_date)[0].grand_total)
 		count = self.get_total_on(doc_type, self.future_from_date, self.future_to_date)[0].count
 
-		last_value = flt(
-			self.get_total_on(doc_type, self.past_from_date, self.past_to_date)[0].grand_total
-		)
+		last_value = flt(self.get_total_on(doc_type, self.past_from_date, self.past_to_date)[0].grand_total)
 
 		filters = {
 			date_field: [[">=", self.future_from_date], ["<=", self.future_to_date]],
@@ -816,7 +788,6 @@
 		return {"label": label, "value": value, "last_value": last_value, "count": count}
 
 	def get_total_on(self, doc_type, from_date, to_date):
-
 		date_field = (
 			"posting_date" if doc_type in ["Sales Invoice", "Purchase Invoice"] else "transaction_date"
 		)
@@ -897,20 +868,16 @@
 			"received_qty, qty - received_qty as missing_qty, rate, amount"
 		)
 
-		sql_po = """select {fields} from `tabPurchase Order Item`
+		sql_po = f"""select {fields_po} from `tabPurchase Order Item`
 			left join `tabPurchase Order` on `tabPurchase Order`.name = `tabPurchase Order Item`.parent
 			where status<>'Closed' and `tabPurchase Order Item`.docstatus=1 and CURRENT_DATE > `tabPurchase Order Item`.schedule_date
 			and received_qty < qty order by `tabPurchase Order Item`.parent DESC,
-			`tabPurchase Order Item`.schedule_date DESC""".format(
-			fields=fields_po
-		)
+			`tabPurchase Order Item`.schedule_date DESC"""
 
-		sql_poi = """select {fields} from `tabPurchase Order Item`
+		sql_poi = f"""select {fields_poi} from `tabPurchase Order Item`
 			left join `tabPurchase Order` on `tabPurchase Order`.name = `tabPurchase Order Item`.parent
 			where status<>'Closed' and `tabPurchase Order Item`.docstatus=1 and CURRENT_DATE > `tabPurchase Order Item`.schedule_date
-			and received_qty < qty order by `tabPurchase Order Item`.idx""".format(
-			fields=fields_poi
-		)
+			and received_qty < qty order by `tabPurchase Order Item`.idx"""
 		purchase_order_list = frappe.db.sql(sql_po, as_dict=True)
 		purchase_order_items_overdue_list = frappe.db.sql(sql_poi, as_dict=True)
 
diff --git a/erpnext/setup/doctype/email_digest_recipient/email_digest_recipient.json b/erpnext/setup/doctype/email_digest_recipient/email_digest_recipient.json
index 8b2a6dc..ba49777 100644
--- a/erpnext/setup/doctype/email_digest_recipient/email_digest_recipient.json
+++ b/erpnext/setup/doctype/email_digest_recipient/email_digest_recipient.json
@@ -20,14 +20,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-08-24 23:10:23.217572",
+ "modified": "2024-03-27 13:09:36.733439",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Email Digest Recipient",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/employee/employee.json b/erpnext/setup/doctype/employee/employee.json
index fc1fc9b..522a5c9 100644
--- a/erpnext/setup/doctype/employee/employee.json
+++ b/erpnext/setup/doctype/employee/employee.json
@@ -824,7 +824,7 @@
  "image_field": "image",
  "is_tree": 1,
  "links": [],
- "modified": "2024-01-24 02:20:26.145996",
+ "modified": "2024-03-27 13:09:36.900706",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Employee",
@@ -868,7 +868,7 @@
  ],
  "search_fields": "employee_name",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "employee_name"
diff --git a/erpnext/setup/doctype/employee/employee.py b/erpnext/setup/doctype/employee/employee.py
index 5237f5a..8f3ba87 100755
--- a/erpnext/setup/doctype/employee/employee.py
+++ b/erpnext/setup/doctype/employee/employee.py
@@ -241,16 +241,12 @@
 
 	user_roles = [d.role for d in doc.get("roles")]
 	if "Employee" in user_roles:
-		frappe.msgprint(
-			_("User {0}: Removed Employee role as there is no mapped employee.").format(doc.name)
-		)
+		frappe.msgprint(_("User {0}: Removed Employee role as there is no mapped employee.").format(doc.name))
 		doc.get("roles").remove(doc.get("roles", {"role": "Employee"})[0])
 
 	if "Employee Self Service" in user_roles:
 		frappe.msgprint(
-			_("User {0}: Removed Employee Self Service role as there is no mapped employee.").format(
-				doc.name
-			)
+			_("User {0}: Removed Employee Self Service role as there is no mapped employee.").format(doc.name)
 		)
 		doc.get("roles").remove(doc.get("roles", {"role": "Employee Self Service"})[0])
 
@@ -266,17 +262,13 @@
 
 def get_employee_email(employee_doc):
 	return (
-		employee_doc.get("user_id")
-		or employee_doc.get("personal_email")
-		or employee_doc.get("company_email")
+		employee_doc.get("user_id") or employee_doc.get("personal_email") or employee_doc.get("company_email")
 	)
 
 
 def get_holiday_list_for_employee(employee, raise_exception=True):
 	if employee:
-		holiday_list, company = frappe.get_cached_value(
-			"Employee", employee, ["holiday_list", "company"]
-		)
+		holiday_list, company = frappe.get_cached_value("Employee", employee, ["holiday_list", "company"])
 	else:
 		holiday_list = ""
 		company = frappe.db.get_single_value("Global Defaults", "default_company")
@@ -292,9 +284,7 @@
 	return holiday_list
 
 
-def is_holiday(
-	employee, date=None, raise_exception=True, only_non_weekly=False, with_description=False
-):
+def is_holiday(employee, date=None, raise_exception=True, only_non_weekly=False, with_description=False):
 	"""
 	Returns True if given Employee has an holiday on the given date
 	        :param employee: Employee `name`
@@ -404,7 +394,6 @@
 
 @frappe.whitelist()
 def get_children(doctype, parent=None, company=None, is_root=False, is_tree=False):
-
 	filters = [["status", "=", "Active"]]
 	if company and company != "All Companies":
 		filters.append(["company", "=", company])
diff --git a/erpnext/setup/doctype/employee_education/employee_education.json b/erpnext/setup/doctype/employee_education/employee_education.json
index 0df09a8..4c0c173 100644
--- a/erpnext/setup/doctype/employee_education/employee_education.json
+++ b/erpnext/setup/doctype/employee_education/employee_education.json
@@ -1,192 +1,80 @@
 {
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
+ "actions": [],
  "creation": "2013-02-22 01:27:45",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
  "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "school_univ",
+  "qualification",
+  "level",
+  "year_of_passing",
+  "class_per",
+  "maj_opt_subj"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "school_univ",
    "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "School/University",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "school_univ",
-   "oldfieldtype": "Small Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "oldfieldtype": "Small Text"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "qualification",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Qualification",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "qualification",
    "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
    "print_width": "100px",
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0,
    "width": "100px"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "level",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Level",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "level",
    "oldfieldtype": "Select",
-   "options": "Graduate\nPost Graduate\nUnder Graduate",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "options": "Graduate\nPost Graduate\nUnder Graduate"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "year_of_passing",
    "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Year of Passing",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "year_of_passing",
-   "oldfieldtype": "Int",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "oldfieldtype": "Int"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "class_per",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Class / Percentage",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "class_per",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "oldfieldtype": "Data"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "maj_opt_subj",
    "fieldtype": "Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Major/Optional Subjects",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "maj_opt_subj",
-   "oldfieldtype": "Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "oldfieldtype": "Text"
   }
  ],
- "hide_heading": 0,
- "hide_toolbar": 0,
  "idx": 1,
- "image_view": 0,
- "in_create": 0,
-
- "is_submittable": 0,
- "issingle": 0,
  "istable": 1,
- "max_attachments": 0,
- "modified": "2016-07-11 03:27:59.995464",
+ "links": [],
+ "modified": "2024-03-27 13:09:38.507746",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Employee Education",
  "owner": "Administrator",
  "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "track_seen": 0
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json b/erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json
index df79e00..5d26eb9 100644
--- a/erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json
+++ b/erpnext/setup/doctype/employee_external_work_history/employee_external_work_history.json
@@ -1,190 +1,78 @@
 {
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
+ "actions": [],
  "creation": "2013-02-22 01:27:45",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
  "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "company_name",
+  "designation",
+  "salary",
+  "address",
+  "contact",
+  "total_experience"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "company_name",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Company",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "company_name",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "oldfieldtype": "Data"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "designation",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Designation",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "designation",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "oldfieldtype": "Data"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "salary",
    "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Salary",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "salary",
    "oldfieldtype": "Currency",
-   "options": "Company:company:default_currency",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "options": "Company:company:default_currency"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "address",
    "fieldtype": "Small Text",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Address",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "address",
-   "oldfieldtype": "Small Text",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "oldfieldtype": "Small Text"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "contact",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Contact",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "contact",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "oldfieldtype": "Data"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "total_experience",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Total Experience",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "total_experience",
-   "oldfieldtype": "Data",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "oldfieldtype": "Data"
   }
  ],
- "hide_heading": 0,
- "hide_toolbar": 0,
  "idx": 1,
- "image_view": 0,
- "in_create": 0,
-
- "is_submittable": 0,
- "issingle": 0,
  "istable": 1,
- "max_attachments": 0,
- "modified": "2016-07-11 03:28:00.088980",
+ "links": [],
+ "modified": "2024-03-27 13:09:38.624280",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Employee External Work History",
  "owner": "Administrator",
  "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "track_seen": 0
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/employee_group/employee_group.json b/erpnext/setup/doctype/employee_group/employee_group.json
index 9c091a2..0114e93 100644
--- a/erpnext/setup/doctype/employee_group/employee_group.json
+++ b/erpnext/setup/doctype/employee_group/employee_group.json
@@ -1,162 +1,59 @@
 {
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "actions": [],
  "autoname": "field:employee_group_name",
- "beta": 0,
  "creation": "2018-11-19 12:33:31.351364",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
- "document_type": "",
  "editable_grid": 1,
  "engine": "InnoDB",
+ "field_order": [
+  "employee_group_name",
+  "section_break_00",
+  "employee_list"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "employee_group_name",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Name",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
    "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
    "unique": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "section_break_00",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Employee",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Employee"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_in_quick_entry": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "employee_list",
    "fieldtype": "Table",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Employee",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Employee Group Table",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "options": "Employee Group Table"
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-12-27 19:52:34.791538",
+ "links": [],
+ "modified": "2024-03-27 13:09:39.303885",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Employee Group",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "System Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   }
  ],
  "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/employee_group_table/employee_group_table.json b/erpnext/setup/doctype/employee_group_table/employee_group_table.json
index c448d8d..7da3a96 100644
--- a/erpnext/setup/doctype/employee_group_table/employee_group_table.json
+++ b/erpnext/setup/doctype/employee_group_table/employee_group_table.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "creation": "2018-11-19 12:39:46.153061",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -33,14 +34,16 @@
   }
  ],
  "istable": 1,
- "modified": "2022-02-13 19:44:21.302938",
+ "links": [],
+ "modified": "2024-03-27 13:09:39.428291",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Employee Group Table",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/employee_internal_work_history/employee_internal_work_history.json b/erpnext/setup/doctype/employee_internal_work_history/employee_internal_work_history.json
index da6329a..927c4c0 100644
--- a/erpnext/setup/doctype/employee_internal_work_history/employee_internal_work_history.json
+++ b/erpnext/setup/doctype/employee_internal_work_history/employee_internal_work_history.json
@@ -1,168 +1,71 @@
 {
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
+ "actions": [],
  "creation": "2013-02-22 01:27:45",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
  "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "branch",
+  "department",
+  "designation",
+  "from_date",
+  "to_date"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "branch",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Branch",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "branch",
    "oldfieldtype": "Select",
-   "options": "Branch",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "options": "Branch"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "department",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Department",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "department",
    "oldfieldtype": "Select",
-   "options": "Department",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "options": "Department"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "designation",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "Designation",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "designation",
    "oldfieldtype": "Select",
-   "options": "Designation",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "options": "Designation"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "from_date",
    "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "From Date",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "from_date",
-   "oldfieldtype": "Date",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "oldfieldtype": "Date"
   },
   {
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
    "fieldname": "to_date",
    "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
    "in_list_view": 1,
    "label": "To Date",
-   "length": 0,
-   "no_copy": 0,
    "oldfieldname": "to_date",
-   "oldfieldtype": "Date",
-   "permlevel": 0,
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "oldfieldtype": "Date"
   }
  ],
- "hide_heading": 0,
- "hide_toolbar": 0,
  "idx": 1,
- "image_view": 0,
- "in_create": 0,
-
- "is_submittable": 0,
- "issingle": 0,
  "istable": 1,
- "max_attachments": 0,
- "modified": "2016-07-11 03:28:00.195130",
+ "links": [],
+ "modified": "2024-03-27 13:09:39.822645",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Employee Internal Work History",
  "owner": "Administrator",
  "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
- "track_seen": 0
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.json b/erpnext/setup/doctype/global_defaults/global_defaults.json
index bd80e1d..d78d74b 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.json
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.json
@@ -87,7 +87,7 @@
  "in_create": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-07-01 19:45:00.323953",
+ "modified": "2024-03-27 13:09:45.400219",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Global Defaults",
@@ -102,7 +102,7 @@
   }
  ],
  "read_only": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/holiday/holiday.json b/erpnext/setup/doctype/holiday/holiday.json
index 3117190..afa928b 100644
--- a/erpnext/setup/doctype/holiday/holiday.json
+++ b/erpnext/setup/doctype/holiday/holiday.json
@@ -49,12 +49,13 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-04-18 19:03:23.507845",
+ "modified": "2024-03-27 13:09:49.810408",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Holiday",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
- "sort_order": "ASC"
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/holiday_list/holiday_list.json b/erpnext/setup/doctype/holiday_list/holiday_list.json
index 45671d1..32f7691 100644
--- a/erpnext/setup/doctype/holiday_list/holiday_list.json
+++ b/erpnext/setup/doctype/holiday_list/holiday_list.json
@@ -141,7 +141,7 @@
  "icon": "fa fa-calendar",
  "idx": 1,
  "links": [],
- "modified": "2023-07-14 13:28:53.156421",
+ "modified": "2024-03-27 13:09:49.920245",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Holiday List",
@@ -160,7 +160,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/holiday_list/holiday_list.py b/erpnext/setup/doctype/holiday_list/holiday_list.py
index 6381234..9d854c7 100644
--- a/erpnext/setup/doctype/holiday_list/holiday_list.py
+++ b/erpnext/setup/doctype/holiday_list/holiday_list.py
@@ -193,9 +193,7 @@
 	if date is None:
 		date = today()
 	if holiday_list:
-		return bool(
-			frappe.db.exists("Holiday", {"parent": holiday_list, "holiday_date": date}, cache=True)
-		)
+		return bool(frappe.db.exists("Holiday", {"parent": holiday_list, "holiday_date": date}, cache=True))
 	else:
 		return False
 
diff --git a/erpnext/setup/doctype/holiday_list/test_holiday_list.py b/erpnext/setup/doctype/holiday_list/test_holiday_list.py
index c0e71f5..0d3c35f 100644
--- a/erpnext/setup/doctype/holiday_list/test_holiday_list.py
+++ b/erpnext/setup/doctype/holiday_list/test_holiday_list.py
@@ -112,9 +112,13 @@
 		frappe.local.lang = lang
 
 
-def make_holiday_list(
-	name, from_date=getdate() - timedelta(days=10), to_date=getdate(), holiday_dates=None
-):
+def make_holiday_list(name, from_date=None, to_date=None, holiday_dates=None):
+	if from_date is None:
+		from_date = getdate() - timedelta(days=10)
+
+	if to_date is None:
+		to_date = getdate()
+
 	frappe.delete_doc_if_exists("Holiday List", name, force=1)
 	doc = frappe.get_doc(
 		{
diff --git a/erpnext/setup/doctype/incoterm/incoterm.py b/erpnext/setup/doctype/incoterm/incoterm.py
index 17305e9..3b4579d 100644
--- a/erpnext/setup/doctype/incoterm/incoterm.py
+++ b/erpnext/setup/doctype/incoterm/incoterm.py
@@ -27,7 +27,7 @@
 	import os
 	from csv import DictReader
 
-	with open(os.path.join(os.path.dirname(__file__), "incoterms.csv"), "r") as f:
+	with open(os.path.join(os.path.dirname(__file__), "incoterms.csv")) as f:
 		for incoterm in DictReader(f):
 			if frappe.db.exists("Incoterm", incoterm["code"]):
 				continue
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index 7c9233f..06468f2 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -135,7 +135,7 @@
  "is_tree": 1,
  "links": [],
  "max_attachments": 3,
- "modified": "2024-01-30 14:08:38.485616",
+ "modified": "2024-03-27 13:09:54.588785",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Item Group",
@@ -204,7 +204,7 @@
  ],
  "search_fields": "parent_item_group",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index fd65ab6..54f57e7 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -47,7 +47,7 @@
 					frappe.throw(
 						_("{0} entered twice {1} in Item Taxes").format(
 							frappe.bold(d.item_tax_template),
-							"for tax category {0}".format(frappe.bold(d.tax_category)) if d.tax_category else "",
+							f"for tax category {frappe.bold(d.tax_category)}" if d.tax_category else "",
 						)
 					)
 				else:
diff --git a/erpnext/setup/doctype/item_group/test_item_group.py b/erpnext/setup/doctype/item_group/test_item_group.py
index d95199d..34d7a68 100644
--- a/erpnext/setup/doctype/item_group/test_item_group.py
+++ b/erpnext/setup/doctype/item_group/test_item_group.py
@@ -124,9 +124,7 @@
 	def print_tree(self):
 		import json
 
-		print(
-			json.dumps(frappe.db.sql("select name, lft, rgt from `tabItem Group` order by lft"), indent=1)
-		)
+		print(json.dumps(frappe.db.sql("select name, lft, rgt from `tabItem Group` order by lft"), indent=1))
 
 	def test_move_leaf_into_another_group(self):
 		# before move
@@ -156,17 +154,13 @@
 
 	def test_delete_leaf(self):
 		# for checking later
-		parent_item_group = frappe.db.get_value(
-			"Item Group", "_Test Item Group B - 3", "parent_item_group"
-		)
-		rgt = frappe.db.get_value("Item Group", parent_item_group, "rgt")
+		parent_item_group = frappe.db.get_value("Item Group", "_Test Item Group B - 3", "parent_item_group")
+		frappe.db.get_value("Item Group", parent_item_group, "rgt")
 
 		ancestors = get_ancestors_of("Item Group", "_Test Item Group B - 3")
 		ancestors = frappe.db.sql(
 			"""select name, rgt from `tabItem Group`
-			where name in ({})""".format(
-				", ".join(["%s"] * len(ancestors))
-			),
+			where name in ({})""".format(", ".join(["%s"] * len(ancestors))),
 			tuple(ancestors),
 			as_dict=True,
 		)
@@ -188,9 +182,7 @@
 
 	def test_delete_group(self):
 		# cannot delete group with child, but can delete leaf
-		self.assertRaises(
-			NestedSetChildExistsError, frappe.delete_doc, "Item Group", "_Test Item Group B"
-		)
+		self.assertRaises(NestedSetChildExistsError, frappe.delete_doc, "Item Group", "_Test Item Group B")
 
 	def test_merge_groups(self):
 		frappe.rename_doc("Item Group", "_Test Item Group B", "_Test Item Group C", merge=True)
@@ -207,7 +199,6 @@
 			"""select name from `tabItem Group`
 			where parent_item_group='_Test Item Group C'"""
 		):
-
 			doc = frappe.get_doc("Item Group", name)
 			doc.parent_item_group = "_Test Item Group B"
 			doc.save()
diff --git a/erpnext/setup/doctype/party_type/party_type.json b/erpnext/setup/doctype/party_type/party_type.json
index 00f06a0..d1daef1 100644
--- a/erpnext/setup/doctype/party_type/party_type.json
+++ b/erpnext/setup/doctype/party_type/party_type.json
@@ -1,164 +1,72 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "field:party_type", 
- "beta": 0, 
- "creation": "2016-12-26 11:26:51.508286", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "autoname": "field:party_type",
+ "creation": "2016-12-26 11:26:51.508286",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "party_type",
+  "account_type"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "party_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Party Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "party_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Party Type",
+   "options": "DocType",
+   "reqd": 1,
+   "unique": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "account_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Account Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Payable\nReceivable", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "account_type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Account Type",
+   "options": "Payable\nReceivable",
+   "reqd": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 1, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-04-26 13:00:49.457439", 
- "modified_by": "Administrator", 
- "module": "Setup", 
- "name": "Party Type", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "in_create": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:08.874345",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "Party Type",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 0
-  }, 
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 0
-  }, 
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts User",
+   "share": 1
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Accounts Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 0
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Accounts Manager",
+   "share": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 1, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "show_name_in_global_search": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/party_type/party_type.py b/erpnext/setup/doctype/party_type/party_type.py
index 76b985b..be8652f 100644
--- a/erpnext/setup/doctype/party_type/party_type.py
+++ b/erpnext/setup/doctype/party_type/party_type.py
@@ -31,10 +31,8 @@
 		cond = "and account_type = '%s'" % account_type
 
 	return frappe.db.sql(
-		"""select name from `tabParty Type`
-			where `{key}` LIKE %(txt)s {cond}
-			order by name limit %(page_len)s offset %(start)s""".format(
-			key=searchfield, cond=cond
-		),
+		f"""select name from `tabParty Type`
+			where `{searchfield}` LIKE %(txt)s {cond}
+			order by name limit %(page_len)s offset %(start)s""",
 		{"txt": "%" + txt + "%", "start": start, "page_len": page_len},
 	)
diff --git a/erpnext/setup/doctype/print_heading/print_heading.json b/erpnext/setup/doctype/print_heading/print_heading.json
index 1083583..6b49b6f 100644
--- a/erpnext/setup/doctype/print_heading/print_heading.json
+++ b/erpnext/setup/doctype/print_heading/print_heading.json
@@ -37,7 +37,7 @@
  "icon": "fa fa-font",
  "idx": 1,
  "links": [],
- "modified": "2023-08-28 22:17:42.041255",
+ "modified": "2024-03-27 13:10:18.334668",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Print Heading",
@@ -62,7 +62,7 @@
  ],
  "quick_entry": 1,
  "search_fields": "print_heading",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
index 0eae08e..ce34751 100644
--- a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
+++ b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
@@ -32,7 +32,7 @@
    "table_fieldname": "lost_reasons"
   }
  ],
- "modified": "2023-11-23 19:31:02.743353",
+ "modified": "2024-03-27 13:10:31.419151",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Quotation Lost Reason",
@@ -52,7 +52,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.json b/erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.json
index 5432141..f242f49 100644
--- a/erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.json
+++ b/erpnext/setup/doctype/quotation_lost_reason_detail/quotation_lost_reason_detail.json
@@ -18,14 +18,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-07-26 17:58:56.373775",
+ "modified": "2024-03-27 13:10:31.568485",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Quotation Lost Reason Detail",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index 0bf9d71..b84669c 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json
@@ -1,921 +1,230 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 1, 
- "allow_rename": 1, 
- "autoname": "field:partner_name", 
- "beta": 0, 
- "creation": "2013-04-12 15:34:06", 
- "custom": 0, 
- "description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 0, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:partner_name",
+ "creation": "2013-04-12 15:34:06",
+ "description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+  "partner_name",
+  "partner_type",
+  "territory",
+  "column_break0",
+  "commission_rate",
+  "address_contacts",
+  "address_desc",
+  "address_html",
+  "column_break1",
+  "contact_desc",
+  "contact_html",
+  "partner_target_details_section_break",
+  "targets",
+  "website",
+  "show_in_website",
+  "column_break_16",
+  "referral_code",
+  "section_break_17",
+  "route",
+  "column_break_20",
+  "logo",
+  "partner_website",
+  "section_break_22",
+  "introduction",
+  "description"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "partner_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sales Partner Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "partner_name", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 1
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "partner_type", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Partner Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "partner_type", 
-   "oldfieldtype": "Select", 
-   "options": "Sales Partner Type", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "territory", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Territory", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Territory", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break0", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0, 
-   "width": "50%"
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "commission_rate", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Commission Rate", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "commission_rate", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "address_contacts", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Address & Contacts", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.__islocal", 
-   "fetch_if_empty": 0, 
-   "fieldname": "address_desc", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Address Desc", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "address_html", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Address HTML", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.__islocal", 
-   "fetch_if_empty": 0, 
-   "fieldname": "contact_desc", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Contact Desc", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "contact_html", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Contact HTML", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 1, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "partner_target_details_section_break", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Sales Partner Target", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldtype": "Section Break", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "targets", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Targets", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "partner_target_details", 
-   "oldfieldtype": "Table", 
-   "options": "Target Detail", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "website", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Website", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "show_in_website", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Show In Website", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_16", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
-  {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "", 
-   "description": "To Track inbound purchase", 
-   "fetch_if_empty": 0, 
-   "fieldname": "referral_code", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Referral Code", 
-   "length": 8, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "fieldname": "partner_name",
+   "fieldtype": "Data",
+   "label": "Sales Partner Name",
+   "oldfieldname": "partner_name",
+   "oldfieldtype": "Data",
+   "reqd": 1,
    "unique": 1
   },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "show_in_website", 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_17", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "partner_type",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Partner Type",
+   "oldfieldname": "partner_type",
+   "oldfieldtype": "Select",
+   "options": "Sales Partner Type"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "route", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Route", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "fieldname": "territory",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Territory",
+   "options": "Territory",
+   "reqd": 1
+  },
+  {
+   "fieldname": "column_break0",
+   "fieldtype": "Column Break",
+   "oldfieldtype": "Column Break",
+   "width": "50%"
+  },
+  {
+   "fieldname": "commission_rate",
+   "fieldtype": "Float",
+   "label": "Commission Rate",
+   "oldfieldname": "commission_rate",
+   "oldfieldtype": "Currency",
+   "reqd": 1
+  },
+  {
+   "fieldname": "address_contacts",
+   "fieldtype": "Section Break",
+   "label": "Address & Contacts"
+  },
+  {
+   "depends_on": "eval:doc.__islocal",
+   "fieldname": "address_desc",
+   "fieldtype": "HTML",
+   "label": "Address Desc"
+  },
+  {
+   "fieldname": "address_html",
+   "fieldtype": "HTML",
+   "label": "Address HTML",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break1",
+   "fieldtype": "Column Break"
+  },
+  {
+   "depends_on": "eval:doc.__islocal",
+   "fieldname": "contact_desc",
+   "fieldtype": "HTML",
+   "label": "Contact Desc"
+  },
+  {
+   "fieldname": "contact_html",
+   "fieldtype": "HTML",
+   "label": "Contact HTML",
+   "read_only": 1
+  },
+  {
+   "fieldname": "partner_target_details_section_break",
+   "fieldtype": "Section Break",
+   "label": "Sales Partner Target",
+   "oldfieldtype": "Section Break"
+  },
+  {
+   "fieldname": "targets",
+   "fieldtype": "Table",
+   "label": "Targets",
+   "oldfieldname": "partner_target_details",
+   "oldfieldtype": "Table",
+   "options": "Target Detail"
+  },
+  {
+   "fieldname": "website",
+   "fieldtype": "Section Break",
+   "label": "Website"
+  },
+  {
+   "default": "0",
+   "fieldname": "show_in_website",
+   "fieldtype": "Check",
+   "label": "Show In Website"
+  },
+  {
+   "fieldname": "column_break_16",
+   "fieldtype": "Column Break"
+  },
+  {
+   "description": "To Track inbound purchase",
+   "fieldname": "referral_code",
+   "fieldtype": "Data",
+   "label": "Referral Code",
+   "length": 8,
    "unique": 1
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "column_break_20", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "show_in_website",
+   "fieldname": "section_break_17",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "logo", 
-   "fieldtype": "Attach", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Logo", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "route",
+   "fieldtype": "Data",
+   "label": "Route",
+   "unique": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "partner_website", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Partner website", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "column_break_20",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "show_in_website", 
-   "fetch_if_empty": 0, 
-   "fieldname": "section_break_22", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "logo",
+   "fieldtype": "Attach",
+   "label": "Logo"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "introduction", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Introduction", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "partner_website",
+   "fieldtype": "Data",
+   "label": "Partner website"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "depends_on": "show_in_website",
+   "fieldname": "section_break_22",
+   "fieldtype": "Section Break"
+  },
+  {
+   "fieldname": "introduction",
+   "fieldtype": "Text",
+   "label": "Introduction"
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Text Editor",
+   "label": "Description"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-user", 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2019-10-14 16:26:45.447265", 
- "modified_by": "Administrator", 
- "module": "Setup", 
- "name": "Sales Partner", 
- "owner": "Administrator", 
+ ],
+ "icon": "fa fa-user",
+ "idx": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:37.455664",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "Sales Partner",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Manager", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }, 
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Manager"
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales User", 
-   "set_user_permissions": 0, 
-   "share": 0, 
-   "submit": 0, 
-   "write": 0
-  }, 
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales User"
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Sales Master Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Sales Master Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 1, 
- "sort_order": "ASC", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "show_name_in_global_search": 1,
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.py b/erpnext/setup/doctype/sales_partner/sales_partner.py
index a8a965d..754e263 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.py
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.py
@@ -49,7 +49,7 @@
 	def validate(self):
 		if not self.route:
 			self.route = "partners/" + self.scrub(self.partner_name)
-		super(SalesPartner, self).validate()
+		super().validate()
 		if self.partner_website and not self.partner_website.startswith("http"):
 			self.partner_website = "http://" + self.partner_website
 
diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index 79bd841..57572c6 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/erpnext/setup/doctype/sales_person/sales_person.json
@@ -145,7 +145,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2024-01-30 13:57:26.436991",
+ "modified": "2024-03-27 13:10:37.891377",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Sales Person",
@@ -181,7 +181,7 @@
  ],
  "search_fields": "parent_sales_person",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/sales_person/sales_person.py b/erpnext/setup/doctype/sales_person/sales_person.py
index c2615d3..b0e42de 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.py
+++ b/erpnext/setup/doctype/sales_person/sales_person.py
@@ -80,7 +80,7 @@
 		self.set_onload("dashboard_info", info)
 
 	def on_update(self):
-		super(SalesPerson, self).on_update()
+		super().on_update()
 		self.validate_one_root()
 
 	def get_email_id(self):
diff --git a/erpnext/setup/doctype/supplier_group/supplier_group.json b/erpnext/setup/doctype/supplier_group/supplier_group.json
index b3ed608..cf1dcc8 100644
--- a/erpnext/setup/doctype/supplier_group/supplier_group.json
+++ b/erpnext/setup/doctype/supplier_group/supplier_group.json
@@ -107,7 +107,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2022-12-24 11:16:12.486719",
+ "modified": "2024-03-27 13:10:48.734325",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Supplier Group",
@@ -139,7 +139,6 @@
    "read": 1,
    "report": 1,
    "role": "Purchase Master Manager",
-   "set_user_permissions": 1,
    "share": 1,
    "write": 1
   },
@@ -169,7 +168,7 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/target_detail/target_detail.json b/erpnext/setup/doctype/target_detail/target_detail.json
index 768cf9f..bbf7067 100644
--- a/erpnext/setup/doctype/target_detail/target_detail.json
+++ b/erpnext/setup/doctype/target_detail/target_detail.json
@@ -1,213 +1,77 @@
 {
- "allow_copy": 0, 
- "allow_events_in_timeline": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2013-02-22 01:27:58", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2013-02-22 01:27:58",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "item_group",
+  "fiscal_year",
+  "target_qty",
+  "target_amount",
+  "distribution_id"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "", 
-   "fetch_if_empty": 0, 
-   "fieldname": "item_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Item Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "item_group", 
-   "oldfieldtype": "Link", 
-   "options": "Item Group", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "item_group",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Item Group",
+   "oldfieldname": "item_group",
+   "oldfieldtype": "Link",
+   "options": "Item Group",
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "fiscal_year", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Fiscal Year", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "fiscal_year", 
-   "oldfieldtype": "Select", 
-   "options": "Fiscal Year", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "fiscal_year",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Fiscal Year",
+   "oldfieldname": "fiscal_year",
+   "oldfieldtype": "Select",
+   "options": "Fiscal Year",
+   "reqd": 1,
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "target_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Target Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "target_qty", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "target_qty",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Target Qty",
+   "oldfieldname": "target_qty",
+   "oldfieldtype": "Currency"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "target_amount", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Target  Amount", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "target_amount", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "target_amount",
+   "fieldtype": "Float",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Target  Amount",
+   "oldfieldname": "target_amount",
+   "oldfieldtype": "Currency",
+   "search_index": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fetch_if_empty": 0, 
-   "fieldname": "distribution_id", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Target Distribution", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Monthly Distribution", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "distribution_id",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Target Distribution",
+   "options": "Monthly Distribution",
+   "reqd": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2019-03-20 16:59:03.578274", 
- "modified_by": "Administrator", 
- "module": "Setup", 
- "name": "Target Detail", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 0, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:51.347225",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "Target Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
index 76e52ae..335780a 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -77,7 +77,7 @@
  "icon": "icon-legal",
  "idx": 1,
  "links": [],
- "modified": "2024-01-30 12:47:52.325531",
+ "modified": "2024-03-27 13:10:53.065872",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Terms and Conditions",
@@ -134,7 +134,7 @@
  ],
  "quick_entry": 1,
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
index 73b5919..40c905b 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
@@ -30,12 +30,7 @@
 	def validate(self):
 		if self.terms:
 			validate_template(self.terms)
-		if (
-			not cint(self.buying)
-			and not cint(self.selling)
-			and not cint(self.hr)
-			and not cint(self.disabled)
-		):
+		if not cint(self.buying) and not cint(self.selling) and not cint(self.hr) and not cint(self.disabled):
 			throw(_("At least one of the Applicable Modules should be selected"))
 
 
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index c3a4993..9ee8b6d 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -123,11 +123,10 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2022-12-24 11:16:39.964956",
+ "modified": "2024-03-27 13:10:53.240951",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Territory",
- "name_case": "Title Case",
  "naming_rule": "By fieldname",
  "nsm_parent_field": "parent_territory",
  "owner": "Administrator",
@@ -142,7 +141,6 @@
    "read": 1,
    "report": 1,
    "role": "Sales Master Manager",
-   "set_user_permissions": 1,
    "share": 1,
    "write": 1
   },
@@ -188,7 +186,7 @@
  ],
  "search_fields": "parent_territory,territory_manager",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/territory/territory.py b/erpnext/setup/doctype/territory/territory.py
index 1cc3f62..119bfe6 100644
--- a/erpnext/setup/doctype/territory/territory.py
+++ b/erpnext/setup/doctype/territory/territory.py
@@ -40,7 +40,7 @@
 				frappe.throw(_("Either target qty or target amount is mandatory"))
 
 	def on_update(self):
-		super(Territory, self).on_update()
+		super().on_update()
 		self.validate_one_root()
 
 
diff --git a/erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py b/erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py
index 432438b..68d856e 100644
--- a/erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py
+++ b/erpnext/setup/doctype/transaction_deletion_record/test_transaction_deletion_record.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
 from frappe.tests.utils import FrappeTestCase
@@ -26,7 +25,7 @@
 			self.assertTrue(contains_company)
 
 	def test_no_of_docs_is_correct(self):
-		for i in range(5):
+		for _i in range(5):
 			create_task("Dunder Mifflin Paper Co")
 		tdr = create_transaction_deletion_doc("Dunder Mifflin Paper Co")
 		tdr.reload()
@@ -52,9 +51,7 @@
 
 
 def create_company(company_name):
-	company = frappe.get_doc(
-		{"doctype": "Company", "company_name": company_name, "default_currency": "INR"}
-	)
+	company = frappe.get_doc({"doctype": "Company", "company_name": company_name, "default_currency": "INR"})
 	company.insert(ignore_if_duplicate=True)
 
 
diff --git a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
index b9f911d..16d23f8 100644
--- a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
+++ b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.json
@@ -144,7 +144,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-21 10:29:19.456413",
+ "modified": "2024-03-27 13:10:54.828051",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Transaction Deletion Record",
@@ -165,7 +165,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
index 00fad5f..c9c3c83 100644
--- a/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
+++ b/erpnext/setup/doctype/transaction_deletion_record/transaction_deletion_record.py
@@ -43,7 +43,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(TransactionDeletionRecord, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.batch_size = 5000
 		# Tasks are listed by their execution order
 		self.task_to_internal_method_map = OrderedDict(
@@ -157,7 +157,7 @@
 			if task := getattr(self, method, None):
 				try:
 					task()
-				except Exception as err:
+				except Exception:
 					frappe.db.rollback()
 					traceback = frappe.get_traceback(with_context=True)
 					if traceback:
@@ -177,7 +177,7 @@
 		for doctype in doctypes_to_be_ignored_list:
 			self.append("doctypes_to_be_ignored", {"doctype_name": doctype})
 
-	def validate_running_task_for_doc(self, job_names: list = None):
+	def validate_running_task_for_doc(self, job_names: list | None = None):
 		# at most only one task should be runnning
 		running_tasks = []
 		for x in job_names:
@@ -226,9 +226,7 @@
 			if leads:
 				addresses = frappe.db.sql_list(
 					"""select parent from `tabDynamic Link` where link_name
-					in ({leads})""".format(
-						leads=",".join(leads)
-					)
+					in ({leads})""".format(leads=",".join(leads))
 				)
 
 				if addresses:
@@ -238,16 +236,12 @@
 						"""delete from `tabAddress` where name in ({addresses}) and
 						name not in (select distinct dl1.parent from `tabDynamic Link` dl1
 						inner join `tabDynamic Link` dl2 on dl1.parent=dl2.parent
-						and dl1.link_doctype<>dl2.link_doctype)""".format(
-							addresses=",".join(addresses)
-						)
+						and dl1.link_doctype<>dl2.link_doctype)""".format(addresses=",".join(addresses))
 					)
 
 					frappe.db.sql(
 						"""delete from `tabDynamic Link` where link_doctype='Lead'
-						and parenttype='Address' and link_name in ({leads})""".format(
-							leads=",".join(leads)
-						)
+						and parenttype='Address' and link_name in ({leads})""".format(leads=",".join(leads))
 					)
 
 				frappe.db.sql(
@@ -289,9 +283,9 @@
 		self.validate_doc_status()
 		if not self.delete_transactions:
 			doctypes_to_be_ignored_list = self.get_doctypes_to_be_ignored_list()
-			docfields = self.get_doctypes_with_company_field(doctypes_to_be_ignored_list)
+			self.get_doctypes_with_company_field(doctypes_to_be_ignored_list)
 
-			tables = self.get_all_child_doctypes()
+			self.get_all_child_doctypes()
 			for docfield in self.doctypes:
 				if docfield.doctype_name != self.doctype and not docfield.done:
 					no_of_docs = self.get_number_of_docs_linked_with_specified_company(
@@ -299,7 +293,9 @@
 					)
 					if no_of_docs > 0:
 						reference_docs = frappe.get_all(
-							docfield.doctype_name, filters={docfield.docfield_name: self.company}, limit=self.batch_size
+							docfield.doctype_name,
+							filters={docfield.docfield_name: self.company},
+							limit=self.batch_size,
 						)
 						reference_doc_names = [r.name for r in reference_docs]
 
@@ -308,7 +304,9 @@
 						self.delete_comments(docfield.doctype_name, reference_doc_names)
 						self.unlink_attachments(docfield.doctype_name, reference_doc_names)
 						self.delete_child_tables(docfield.doctype_name, reference_doc_names)
-						self.delete_docs_linked_with_specified_company(docfield.doctype_name, reference_doc_names)
+						self.delete_docs_linked_with_specified_company(
+							docfield.doctype_name, reference_doc_names
+						)
 						processed = int(docfield.no_of_docs) + len(reference_doc_names)
 						frappe.db.set_value(docfield.doctype, docfield.name, "no_of_docs", processed)
 					else:
@@ -385,10 +383,8 @@
 		else:
 			prefix, hashes = naming_series.rsplit("{", 1)
 		last = frappe.db.sql(
-			"""select max(name) from `tab{0}`
-						where name like %s""".format(
-				doctype_name
-			),
+			f"""select max(name) from `tab{doctype_name}`
+						where name like %s""",
 			prefix + "%",
 		)
 		if last and last[0][0]:
@@ -418,17 +414,11 @@
 			frappe.delete_doc("Communication", batch, ignore_permissions=True)
 
 	def delete_comments(self, doctype, reference_doc_names):
-		comments = frappe.get_all(
-			"Comment",
-			filters={"reference_doctype": doctype, "reference_name": ["in", reference_doc_names]},
-		)
-		comment_names = [c.name for c in comments]
-
-		if not comment_names:
-			return
-
-		for batch in create_batch(comment_names, self.batch_size):
-			frappe.delete_doc("Comment", batch, ignore_permissions=True)
+		if reference_doc_names:
+			comment = qb.DocType("Comment")
+			qb.from_(comment).delete().where(
+				(comment.reference_doctype == doctype) & (comment.reference_name.isin(reference_doc_names))
+			).run()
 
 	def unlink_attachments(self, doctype, reference_doc_names):
 		files = frappe.get_all(
@@ -496,12 +486,7 @@
 def check_for_running_deletion_job(doc, method=None):
 	# Check if DocType has 'company' field
 	df = qb.DocType("DocField")
-	if (
-		not_allowed := qb.from_(df)
-		.select(df.parent)
-		.where((df.fieldname == "company") & (df.parent == doc.doctype))
-		.run()
-	):
+	if qb.from_(df).select(df.parent).where((df.fieldname == "company") & (df.parent == doc.doctype)).run():
 		is_deletion_doc_running(
 			doc.company, _("Cannot make any transactions until the deletion job is completed")
 		)
diff --git a/erpnext/setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json b/erpnext/setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
index 89db636..ee9cc96 100644
--- a/erpnext/setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
+++ b/erpnext/setup/doctype/transaction_deletion_record_item/transaction_deletion_record_item.json
@@ -20,13 +20,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-04 10:56:27.413691",
+ "modified": "2024-03-27 13:10:55.128861",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Transaction Deletion Record Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json
index 844a11f..feb1b41 100644
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json
@@ -8,8 +8,12 @@
  "document_type": "Setup",
  "engine": "InnoDB",
  "field_order": [
-  "enabled",
   "uom_name",
+  "symbol",
+  "common_code",
+  "description",
+  "column_break_obth",
+  "enabled",
   "must_be_whole_number"
  ],
  "fields": [
@@ -35,12 +39,33 @@
    "fieldname": "enabled",
    "fieldtype": "Check",
    "label": "Enabled"
+  },
+  {
+   "fieldname": "symbol",
+   "fieldtype": "Data",
+   "label": "Symbol"
+  },
+  {
+   "description": "According to CEFACT/ICG/2010/IC013 or CEFACT/ICG/2010/IC010",
+   "fieldname": "common_code",
+   "fieldtype": "Data",
+   "label": "Common Code",
+   "length": 3
+  },
+  {
+   "fieldname": "description",
+   "fieldtype": "Small Text",
+   "label": "Description"
+  },
+  {
+   "fieldname": "column_break_obth",
+   "fieldtype": "Column Break"
   }
  ],
  "icon": "fa fa-compass",
  "idx": 1,
  "links": [],
- "modified": "2021-10-18 14:07:43.722144",
+ "modified": "2024-03-27 13:10:57.375141",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "UOM",
@@ -77,6 +102,8 @@
  ],
  "quick_entry": 1,
  "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "ASC"
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": [],
+ "translated_doctype": 1
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/uom/uom.py b/erpnext/setup/doctype/uom/uom.py
index 0e674c1..d47028f 100644
--- a/erpnext/setup/doctype/uom/uom.py
+++ b/erpnext/setup/doctype/uom/uom.py
@@ -14,8 +14,11 @@
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
+		common_code: DF.Data | None
+		description: DF.SmallText | None
 		enabled: DF.Check
 		must_be_whole_number: DF.Check
+		symbol: DF.Data | None
 		uom_name: DF.Data
 	# end: auto-generated types
 
diff --git a/erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json b/erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
index c1d7a9d..8a577ea 100644
--- a/erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
+++ b/erpnext/setup/doctype/uom_conversion_factor/uom_conversion_factor.json
@@ -1,225 +1,81 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "MAT-UOM-CNV-.#####", 
- "beta": 0, 
- "creation": "2018-04-30 17:37:02.347217", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "autoname": "MAT-UOM-CNV-.#####",
+ "creation": "2018-04-30 17:37:02.347217",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "category",
+  "section_break_2",
+  "from_uom",
+  "to_uom",
+  "value"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "category", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "Category", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "UOM Category", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "category",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "Category",
+   "options": "UOM Category",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_2", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_2",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "from_uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "From", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "from_uom",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "From",
+   "options": "UOM",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "to_uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 1, 
-   "label": "To", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "to_uom",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "in_standard_filter": 1,
+   "label": "To",
+   "options": "UOM",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "value", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Value", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "9", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "value",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Value",
+   "precision": "9",
+   "reqd": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-08-21 16:15:50.213986", 
- "modified_by": "Administrator", 
- "module": "Setup", 
- "name": "UOM Conversion Factor", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:10:57.756872",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "UOM Conversion Factor",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/setup/doctype/vehicle/vehicle.json b/erpnext/setup/doctype/vehicle/vehicle.json
index bf1a8c1..d16b23c 100644
--- a/erpnext/setup/doctype/vehicle/vehicle.json
+++ b/erpnext/setup/doctype/vehicle/vehicle.json
@@ -1,864 +1,216 @@
 {
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "actions": [],
  "autoname": "field:license_plate",
- "beta": 0,
  "creation": "2016-09-03 03:33:27.680331",
- "custom": 0,
- "docstatus": 0,
  "doctype": "DocType",
  "document_type": "Document",
  "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "license_plate",
+  "make",
+  "column_break_3",
+  "model",
+  "vehicle_details",
+  "last_odometer",
+  "acquisition_date",
+  "location",
+  "column_break_8",
+  "chassis_no",
+  "vehicle_value",
+  "employee",
+  "insurance_details",
+  "insurance_company",
+  "policy_no",
+  "column_break_15",
+  "start_date",
+  "end_date",
+  "additional_details",
+  "fuel_type",
+  "uom",
+  "carbon_check_date",
+  "column_break_21",
+  "color",
+  "wheels",
+  "doors",
+  "amended_from"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "license_plate",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "License Plate",
-   "length": 0,
    "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
    "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
    "unique": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "make",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Manufacturer",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "column_break_3",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "model",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Model",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "vehicle_details",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Details"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "last_odometer",
    "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Odometer Value (Last)",
-   "length": 0,
    "no_copy": 1,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
    "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 1,
-   "unique": 0
+   "set_only_once": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "acquisition_date",
    "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Acquisition Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Acquisition Date"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "location",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Location",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Location"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "column_break_8",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "chassis_no",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Chassis No",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Chassis No"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "vehicle_value",
    "fieldtype": "Currency",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Vehicle Value",
-   "length": 0,
-   "no_copy": 0,
-   "options": "",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 1,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "print_hide_if_no_value": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "employee",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
    "in_standard_filter": 1,
    "label": "Employee",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Employee",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "options": "Employee"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "insurance_details",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Insurance Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Insurance Details"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "insurance_company",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Insurance Company",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Insurance Company"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "policy_no",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Policy No",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Policy No"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "column_break_15",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "start_date",
    "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Start Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Start Date"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "end_date",
    "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "End Date",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "End Date"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "additional_details",
    "fieldtype": "Section Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Additional Details",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Additional Details"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "fuel_type",
    "fieldtype": "Select",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
    "in_standard_filter": 1,
    "label": "Fuel Type",
-   "length": 0,
-   "no_copy": 0,
    "options": "Petrol\nDiesel\nNatural Gas\nElectric",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
-   "default": "",
    "fieldname": "uom",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
    "label": "Fuel UOM",
-   "length": 0,
-   "no_copy": 0,
    "options": "UOM",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 1,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "reqd": 1
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "carbon_check_date",
    "fieldtype": "Date",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Last Carbon Check",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Last Carbon Check"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "column_break_21",
-   "fieldtype": "Column Break",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "fieldtype": "Column Break"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "color",
    "fieldtype": "Data",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Color",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Color"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "wheels",
    "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Wheels",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Wheels"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "doors",
    "fieldtype": "Int",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
-   "label": "Doors",
-   "length": 0,
-   "no_copy": 0,
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "label": "Doors"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0,
-   "collapsible": 0,
-   "columns": 0,
    "fieldname": "amended_from",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
-   "in_filter": 0,
-   "in_global_search": 0,
-   "in_list_view": 0,
-   "in_standard_filter": 0,
    "label": "Amended From",
-   "length": 0,
    "no_copy": 1,
    "options": "Vehicle",
-   "permlevel": 0,
    "print_hide": 1,
-   "print_hide_if_no_value": 0,
-   "read_only": 1,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "unique": 0
+   "read_only": 1
   }
  ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2022-06-27 14:48:30.813359",
+ "links": [],
+ "modified": "2024-03-27 13:10:58.133410",
  "modified_by": "Administrator",
  "module": "Setup",
  "name": "Vehicle",
- "name_case": "",
  "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0,
-   "apply_user_permissions": 0,
-   "cancel": 0,
    "create": 1,
    "delete": 1,
    "email": 1,
    "export": 1,
-   "if_owner": 0,
-   "import": 0,
-   "permlevel": 0,
    "print": 1,
    "read": 1,
    "report": 1,
    "role": "Fleet Manager",
-   "set_user_permissions": 0,
    "share": 1,
-   "submit": 0,
    "write": 1
   },
   {
@@ -879,13 +231,9 @@
   }
  ],
  "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
  "search_fields": "license_plate,location,model",
- "show_name_in_global_search": 0,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
- "title_field": "",
- "track_changes": 1,
- "track_seen": 0
-}
+ "states": [],
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/website_item_group/website_item_group.json b/erpnext/setup/doctype/website_item_group/website_item_group.json
index 8176e40..150b69c 100644
--- a/erpnext/setup/doctype/website_item_group/website_item_group.json
+++ b/erpnext/setup/doctype/website_item_group/website_item_group.json
@@ -1,61 +1,34 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2013-02-22 01:28:09", 
- "custom": 0, 
- "description": "Cross Listing of Item in multiple groups", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Other", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2013-02-22 01:28:09",
+ "description": "Cross Listing of Item in multiple groups",
+ "doctype": "DocType",
+ "document_type": "Other",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "item_group"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "", 
-   "fieldname": "item_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Item Group", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item Group", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "item_group",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Group",
+   "options": "Item Group",
+   "reqd": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-07-11 03:28:09.919314", 
- "modified_by": "Administrator", 
- "module": "Setup", 
- "name": "Website Item Group", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "track_seen": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:11:00.011403",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "Website Item Group",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index 474296d..ca065be 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -122,7 +122,6 @@
 
 
 def create_default_energy_point_rules():
-
 	for rule in get_default_energy_point_rules():
 		# check if any rule for ref. doctype exists
 		rule_exists = frappe.db.exists(
diff --git a/erpnext/setup/setup_wizard/data/uom_data.json b/erpnext/setup/setup_wizard/data/uom_data.json
index e7f2f84..12f11ce 100644
--- a/erpnext/setup/setup_wizard/data/uom_data.json
+++ b/erpnext/setup/setup_wizard/data/uom_data.json
@@ -1,171 +1,6 @@
 [
 	{
-		"uom_name": "Unit",
-		"must_be_whole_number": 1
-	},
-	{
-		"uom_name": "Box",
-		"must_be_whole_number": 1
-	},	{
-		"uom_name": "Nos",
-		"must_be_whole_number": 1
-	},	{
-		"uom_name": "Pair",
-		"must_be_whole_number": 1
-	},	{
-		"uom_name": "Set",
-		"must_be_whole_number": 1
-	},
-	{
-		"uom_name": "Meter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Barleycorn",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Calibre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cable Length (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cable Length (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cable Length",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Centimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Chain",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Decimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ells (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ems(Pica)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Fathom",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Foot",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Furlong",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Hand",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Hectometer",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Inch",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilometer",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Link",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Micrometer",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Mile",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Mile (Nautical)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Millimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Nanometer",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Rod",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Vara",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Versta",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Yard",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Arshin",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Sazhen",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Medio Metro",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Square Meter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Centiarea",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Area",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Manzana",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Caballeria",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Square Kilometer",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Are",
+		"uom_name": "Abampere",
 		"must_be_whole_number": 0
 	},
 	{
@@ -177,695 +12,7 @@
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Hectare",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Square Yard",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Square Foot",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Square Inch",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Square Centimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Square Mile",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Meter/Second",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Inch/Minute",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Foot/Minute",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Inch/Second",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilometer/Hour",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Foot/Second",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Mile/Hour",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Knot",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Mile/Minute",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Mile/Second",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Carat",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cental",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Dram",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Grain",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Gram",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Hundredweight (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Hundredweight (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Quintal",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kg",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Microgram",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Milligram",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ounce",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pood",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pound",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Slug",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Stone",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Tonne",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kip",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Barrel(Beer)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Barrel (Oil)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Bushel (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Bushel (US Dry Level)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Centilitre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cubic Centimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cubic Decimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cubic Foot",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cubic Inch",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cubic Meter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cubic Millimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cubic Yard",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cup",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Decilitre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Fluid Ounce (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Fluid Ounce (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Gallon (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Gallon Dry (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Gallon Liquid (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Litre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Millilitre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Peck",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pint (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pint, Dry (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pint, Liquid (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Quart (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Quart Dry (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Quart Liquid (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Tablespoon (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Teaspoon",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Day",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Hour",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Minute",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Second",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Millisecond",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Microsecond",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Nanosecond",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Week",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Atmosphere",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pascal",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Bar",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Foot Of Water",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Hectopascal",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Iches Of Water",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Inches Of Mercury",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilopascal",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Meter Of Water",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Microbar",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Milibar",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Millimeter Of Mercury",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Millimeter Of Water",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Technical Atmosphere",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Torr",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Dyne",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Gram-Force",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Joule/Meter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilogram-Force",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilopond",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilopound-Force",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Newton",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ounce-Force",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pond",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pound-Force",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Poundal",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Tonne-Force(Metric)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ton-Force (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ton-Force (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Btu (It)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Btu (Th)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Btu (Mean)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Calorie (It)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Calorie (Th)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Calorie (Mean)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Calorie (Food)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Erg",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Horsepower-Hours",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Inch Pound-Force",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Joule",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilojoule",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilocalorie",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilowatt-Hour",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Litre-Atmosphere",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Megajoule",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Watt-Hour",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Btu/Hour",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Btu/Minutes",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Btu/Seconds",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Calorie/Seconds",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Horsepower",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilowatt",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Megawatt",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Volt-Ampere",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Watt",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Centigram/Litre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Decigram/Litre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Dekagram/Litre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Hectogram/Litre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Gram/Cubic Meter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Gram/Cubic Centimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Gram/Cubic Millimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Gram/Litre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Grain/Gallon (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Grain/Gallon (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Grain/Cubic Foot",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilogram/Cubic Meter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilogram/Cubic Centimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilogram/Litre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Milligram/Cubic Meter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Milligram/Cubic Centimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Milligram/Cubic Millimeter",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Megagram/Litre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Milligram/Litre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Microgram/Litre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Nanogram/Litre",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ounce/Cubic Inch",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ounce/Cubic Foot",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ounce/Gallon (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ounce/Gallon (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pound/Cubic Inch",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pound/Cubic Foot",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pound/Cubic Yard",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pound/Gallon (US)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Pound/Gallon (UK)",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Psi/1000 Feet",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Slug/Cubic Foot",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ton (Short)/Cubic Yard",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Ton (Long)/Cubic Yard",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Celsius",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Fahrenheit",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kelvin",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Cycle/Second",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Nanohertz",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Millihertz",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Hertz",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Kilohertz",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Megahertz",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Wavelength In Gigametres",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Wavelength In Megametres",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Wavelength In Kilometres",
+		"uom_name": "Ampere",
 		"must_be_whole_number": 0
 	},
 	{
@@ -881,39 +28,35 @@
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Coulomb",
+		"uom_name": "Are",
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "EMU Of Charge",
+		"uom_name": "Area",
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Faraday",
+		"uom_name": "Arshin",
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Kilocoulomb",
+		"uom_name": "Atmosphere",
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Megacoulomb",
+		"uom_name": "Bar",
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Millicoulomb",
+		"uom_name": "Barleycorn",
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Nanocoulomb",
+		"uom_name": "Barrel (Oil)",
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Ampere",
-		"must_be_whole_number": 0
-	},
-	{
-		"uom_name": "Abampere",
+		"uom_name": "Barrel(Beer)",
 		"must_be_whole_number": 0
 	},
 	{
@@ -921,15 +64,270 @@
 		"must_be_whole_number": 0
 	},
 	{
+		"uom_name": "Box",
+		"must_be_whole_number": 1,
+		"common_code": "BX"
+	},
+	{
+		"uom_name": "Btu (It)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Btu (Mean)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Btu (Th)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Btu/Hour",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Btu/Minutes",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Btu/Seconds",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Bushel (UK)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Bushel (US Dry Level)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Caballeria",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Cable Length",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Cable Length (UK)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Cable Length (US)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Calibre",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Calorie (Food)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Calorie (It)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Calorie (Mean)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Calorie (Th)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Calorie/Seconds",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Carat",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Celsius",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Cental",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Centiarea",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Centigram/Litre",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Centilitre",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Centimeter",
+		"must_be_whole_number": 0,
+		"common_code": "CMT",
+		"symbol": "cm"
+	},
+	{
+		"uom_name": "Chain",
+		"must_be_whole_number": 0,
+		"common_code": "M49",
+		"symbol": "ch (US survey)"
+	},
+	{
+		"uom_name": "Coulomb",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Cubic Centimeter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Cubic Decimeter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Cubic Foot",
+		"must_be_whole_number": 0,
+		"common_code": "FTQ",
+		"symbol": "ft³"
+	},
+	{
+		"uom_name": "Cubic Inch",
+		"must_be_whole_number": 0,
+		"common_code": "INQ",
+		"symbol": "in³"
+	},
+	{
+		"uom_name": "Cubic Meter",
+		"must_be_whole_number": 0,
+		"common_code": "MTQ",
+		"symbol": "m³"
+	},
+	{
+		"uom_name": "Cubic Millimeter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Cubic Yard",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Cup",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Cycle/Second",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Day",
+		"must_be_whole_number": 0,
+		"common_code": "DAY",
+		"symbol": "d"
+	},
+	{
+		"uom_name": "Decigram/Litre",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Decilitre",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Decimeter",
+		"must_be_whole_number": 0,
+		"common_code": "DMT",
+		"symbol": "dm"
+	},
+	{
+		"uom_name": "Dekagram/Litre",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Dram",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Dyne",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "EMU Of Charge",
+		"must_be_whole_number": 0
+	},
+	{
 		"uom_name": "EMU of current",
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Kiloampere",
+		"uom_name": "Ells (UK)",
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Milliampere",
+		"uom_name": "Ems(Pica)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Erg",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Fahrenheit",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Faraday",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Fathom",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Fluid Ounce (UK)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Fluid Ounce (US)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Foot",
+		"must_be_whole_number": 0,
+		"common_code": "FOT",
+		"symbol": "ft"
+	},
+	{
+		"uom_name": "Foot Of Water",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Foot/Minute",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Foot/Second",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Furlong",
+		"must_be_whole_number": 0,
+		"common_code": "M50",
+		"symbol": "fur"
+	},
+	{
+		"uom_name": "Gallon (UK)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Gallon Dry (US)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Gallon Liquid (US)",
 		"must_be_whole_number": 0
 	},
 	{
@@ -941,16 +339,718 @@
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Tesla",
+		"uom_name": "Grain",
 		"must_be_whole_number": 0
 	},
 	{
+		"uom_name": "Grain/Cubic Foot",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Grain/Gallon (UK)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Grain/Gallon (US)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Gram",
+		"must_be_whole_number": 0,
+		"common_code": "GRM",
+		"symbol": "g"
+	},
+	{
+		"uom_name": "Gram-Force",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Gram/Cubic Centimeter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Gram/Cubic Meter",
+		"must_be_whole_number": 0,
+		"common_code": "A93",
+		"symbol": "g/m³"
+	},
+	{
+		"uom_name": "Gram/Cubic Millimeter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Gram/Litre",
+		"must_be_whole_number": 0,
+		"common_code": "GL",
+		"symbol": "g/l"
+	},
+	{
+		"uom_name": "Hand",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Hectare",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Hectogram/Litre",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Hectometer",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Hectopascal",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Hertz",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Horsepower",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Horsepower-Hours",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Hour",
+		"must_be_whole_number": 0,
+		"common_code": "HUR"
+	},
+	{
+		"uom_name": "Hundredweight (UK)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Hundredweight (US)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Iches Of Water",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Inch",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Inch Pound-Force",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Inch/Minute",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Inch/Second",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Inches Of Mercury",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Joule",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Joule/Meter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kelvin",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kg",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kiloampere",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilocalorie",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilocoulomb",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilogram-Force",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilogram/Cubic Centimeter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilogram/Cubic Meter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilogram/Litre",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilohertz",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilojoule",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilometer",
+		"must_be_whole_number": 0,
+		"common_code": "KMT",
+		"symbol": "km"
+	},
+	{
+		"uom_name": "Kilometer/Hour",
+		"must_be_whole_number": 0,
+		"common_code": "KMH",
+		"symbol": "km/h"
+	},
+	{
+		"uom_name": "Kilopascal",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilopond",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilopound-Force",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilowatt",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kilowatt-Hour",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Kip",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Knot",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Link",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Litre",
+		"must_be_whole_number": 0,
+		"common_code": "LTR",
+		"symbol": "l"
+	},
+	{
+		"uom_name": "Litre-Atmosphere",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Megacoulomb",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Megagram/Litre",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Megahertz",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Megajoule",
+		"must_be_whole_number": 0,
+		"common_code": "3B",
+		"symbol": "MJ"
+	},
+	{
+		"uom_name": "Megawatt",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Meter",
+		"must_be_whole_number": 0,
+		"common_code": "MTR"
+	},
+	{
+		"uom_name": "Meter Of Water",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Meter/Second",
+		"must_be_whole_number": 0,
+		"common_code": "MTS",
+		"symbol": "m/s"
+	},
+	{
+		"uom_name": "Microbar",
+		"must_be_whole_number": 0,
+		"common_code": "B85",
+		"symbol": "µbar"
+	},
+	{
+		"uom_name": "Microgram",
+		"must_be_whole_number": 0,
+		"common_code": "MC",
+		"symbol": "µg"
+	},
+	{
+		"uom_name": "Microgram/Litre",
+		"must_be_whole_number": 0,
+		"common_code": "H29",
+		"symbol": "µg/l"
+	},
+	{
+		"uom_name": "Micrometer",
+		"must_be_whole_number": 0,
+		"common_code": "4H",
+		"symbol": "µm"
+	},
+	{
+		"uom_name": "Microsecond",
+		"must_be_whole_number": 0,
+		"common_code": "B98",
+		"symbol": "µs"
+	},
+	{
+		"uom_name": "Mile",
+		"must_be_whole_number": 0,
+		"common_code": "SMI",
+		"symbol": "mile"
+	},
+	{
+		"uom_name": "Mile (Nautical)",
+		"must_be_whole_number": 0,
+		"common_code": "NMI",
+		"symbol": "n mile"
+	},
+	{
+		"uom_name": "Mile/Hour",
+		"must_be_whole_number": 0,
+		"common_code": "HM",
+		"symbol": "mile/h"
+	},
+	{
+		"uom_name": "Mile/Minute",
+		"must_be_whole_number": 0,
+		"common_code": "M57",
+		"symbol": "mi/min"
+	},
+	{
+		"uom_name": "Mile/Second",
+		"must_be_whole_number": 0,
+		"common_code": "M58",
+		"symbol": "mi/s"
+	},
+	{
+		"uom_name": "Milibar",
+		"must_be_whole_number": 0,
+		"common_code": "MBR",
+		"symbol": "mbar"
+	},
+	{
+		"uom_name": "Milliampere",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Millicoulomb",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Milligram",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Milligram/Cubic Centimeter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Milligram/Cubic Meter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Milligram/Cubic Millimeter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Milligram/Litre",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Millihertz",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Millilitre",
+		"must_be_whole_number": 0,
+		"common_code": "MLT",
+		"symbol": "ml"
+	},
+	{
+		"uom_name": "Millimeter",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Millimeter Of Mercury",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Millimeter Of Water",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Millisecond",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Minute",
+		"must_be_whole_number": 0,
+		"common_code": "MIN"
+	},
+	{
+		"uom_name": "Nanocoulomb",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Nanogram/Litre",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Nanohertz",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Nanometer",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Nanosecond",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Newton",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Nos",
+		"must_be_whole_number": 1,
+		"common_code": "C62"
+	},
+	{
+		"uom_name": "Ounce",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Ounce-Force",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Ounce/Cubic Foot",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Ounce/Cubic Inch",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Ounce/Gallon (UK)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Ounce/Gallon (US)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Pair",
+		"must_be_whole_number": 1
+	},
+	{
+		"uom_name": "Parts Per Million",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Pascal",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Peck (UK)",
+		"must_be_whole_number": 0,
+		"common_code": "L43",
+		"symbol": "pk (UK)"
+	},
+	{
+		"uom_name": "Peck (US)",
+		"must_be_whole_number": 0,
+		"common_code": "G23",
+		"symbol": "pk (US)"
+	},
+	{
 		"uom_name": "Percent",
 		"must_be_whole_number": 0
 	},
 	{
-		"uom_name": "Parts Per Million",
+		"uom_name": "Pint (UK)",
+		"must_be_whole_number": 0,
+		"common_code": "PTI",
+		"symbol": "pt (UK)"
+	},
+	{
+		"uom_name": "Pint (US)",
+		"must_be_whole_number": 0,
+		"common_code": "PT",
+		"symbol": "pt (US)"
+	},
+	{
+		"uom_name": "Pint, Dry (US)",
+		"must_be_whole_number": 0,
+		"common_code": "L61",
+		"symbol": "pt (US dry)"
+	},
+	{
+		"uom_name": "Pint, Liquid (US)",
 		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Pond",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Pood",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Pound",
+		"must_be_whole_number": 0,
+		"common_code": "LBR",
+		"symbol": "lb"
+	},
+	{
+		"uom_name": "Pound-Force",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Pound/Cubic Foot",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Pound/Cubic Inch",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Pound/Cubic Yard",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Pound/Gallon (UK)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Pound/Gallon (US)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Poundal",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Psi/1000 Feet",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Quart (UK)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Quart Dry (US)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Quart Liquid (US)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Quintal",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Rod",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Sazhen",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Second",
+		"must_be_whole_number": 0,
+		"common_code": "SEC"
+	},
+	{
+		"uom_name": "Set",
+		"must_be_whole_number": 1,
+		"common_code": "SX"
+	},
+	{
+		"uom_name": "Slug",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Slug/Cubic Foot",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Square Centimeter",
+		"must_be_whole_number": 0,
+		"common_code": "CMK",
+		"symbol": "cm²"
+	},
+	{
+		"uom_name": "Square Foot",
+		"must_be_whole_number": 0,
+		"common_code": "FTK",
+		"symbol": "ft²"
+	},
+	{
+		"uom_name": "Square Inch",
+		"must_be_whole_number": 0,
+		"common_code": "INK",
+		"symbol": "in²"
+	},
+	{
+		"uom_name": "Square Kilometer",
+		"must_be_whole_number": 0,
+		"common_code": "KMK",
+		"symbol": "km²"
+	},
+	{
+		"uom_name": "Square Meter",
+		"must_be_whole_number": 0,
+		"common_code": "MTK",
+		"symbol": "m²"
+	},
+	{
+		"uom_name": "Square Mile",
+		"must_be_whole_number": 0,
+		"common_code": "MIK",
+		"symbol": "mi²"
+	},
+	{
+		"uom_name": "Square Yard",
+		"must_be_whole_number": 0,
+		"common_code": "YDK",
+		"symbol": "yd²"
+	},
+	{
+		"uom_name": "Stone",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Tablespoon (US)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Teaspoon",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Technical Atmosphere",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Tesla",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Ton (Long)/Cubic Yard",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Ton (Short)/Cubic Yard",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Ton-Force (UK)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Ton-Force (US)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Tonne",
+		"must_be_whole_number": 0,
+		"common_code": "TNE",
+		"symbol": "t"
+	},
+	{
+		"uom_name": "Tonne-Force(Metric)",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Torr",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Unit",
+		"must_be_whole_number": 1,
+		"common_code": "C62"
+	},
+	{
+		"uom_name": "Vara",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Versta",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Volt-Ampere",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Watt",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Watt-Hour",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Wavelength In Gigametres",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Wavelength In Kilometres",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Wavelength In Megametres",
+		"must_be_whole_number": 0
+	},
+	{
+		"uom_name": "Week",
+		"must_be_whole_number": 0,
+		"common_code": "WEE",
+		"symbol": "wk"
+	},
+	{
+		"uom_name": "Yard",
+		"must_be_whole_number": 0,
+		"common_code": "YRD",
+		"symbol": "yd"
 	}
-
-]
\ No newline at end of file
+]
diff --git a/erpnext/setup/setup_wizard/operations/company_setup.py b/erpnext/setup/setup_wizard/operations/company_setup.py
index d4aac5e..034f4ef 100644
--- a/erpnext/setup/setup_wizard/operations/company_setup.py
+++ b/erpnext/setup/setup_wizard/operations/company_setup.py
@@ -2,7 +2,6 @@
 # License: GNU General Public License v3. See license.txt
 
 import frappe
-from frappe import _
 from frappe.utils import cstr, getdate
 
 
diff --git a/erpnext/setup/setup_wizard/operations/defaults_setup.py b/erpnext/setup/setup_wizard/operations/defaults_setup.py
index 756409b..b81d744 100644
--- a/erpnext/setup/setup_wizard/operations/defaults_setup.py
+++ b/erpnext/setup/setup_wizard/operations/defaults_setup.py
@@ -30,10 +30,8 @@
 	stock_settings = frappe.get_doc("Stock Settings")
 	stock_settings.item_naming_by = "Item Code"
 	stock_settings.valuation_method = "FIFO"
-	stock_settings.default_warehouse = frappe.db.get_value(
-		"Warehouse", {"warehouse_name": _("Stores")}
-	)
-	stock_settings.stock_uom = _("Nos")
+	stock_settings.default_warehouse = frappe.db.get_value("Warehouse", {"warehouse_name": _("Stores")})
+	stock_settings.stock_uom = "Nos"
 	stock_settings.auto_indent = 1
 	stock_settings.auto_insert_price_list_rate_if_missing = 1
 	stock_settings.set_qty_in_transactions_based_on_serial_no_input = 1
diff --git a/erpnext/setup/setup_wizard/operations/install_fixtures.py b/erpnext/setup/setup_wizard/operations/install_fixtures.py
index 2205924..1d2530c 100644
--- a/erpnext/setup/setup_wizard/operations/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/operations/install_fixtures.py
@@ -276,9 +276,7 @@
 		records += [{"doctype": doctype, title_field: title} for title in read_lines(filename)]
 
 	base_path = frappe.get_app_path("erpnext", "stock", "doctype")
-	response = frappe.read_file(
-		os.path.join(base_path, "delivery_trip/dispatch_notification_template.html")
-	)
+	response = frappe.read_file(os.path.join(base_path, "delivery_trip/dispatch_notification_template.html"))
 
 	records += [
 		{
@@ -336,16 +334,10 @@
 		open(frappe.get_app_path("erpnext", "setup", "setup_wizard", "data", "uom_data.json")).read()
 	)
 	for d in uoms:
-		if not frappe.db.exists("UOM", _(d.get("uom_name"))):
-			frappe.get_doc(
-				{
-					"doctype": "UOM",
-					"uom_name": _(d.get("uom_name")),
-					"name": _(d.get("uom_name")),
-					"must_be_whole_number": d.get("must_be_whole_number"),
-					"enabled": 1,
-				}
-			).db_insert()
+		if not frappe.db.exists("UOM", d.get("uom_name")):
+			doc = frappe.new_doc("UOM")
+			doc.update(d)
+			doc.save()
 
 	# bootstrap uom conversion factors
 	uom_conversions = json.loads(
@@ -359,14 +351,14 @@
 
 		if not frappe.db.exists(
 			"UOM Conversion Factor",
-			{"from_uom": _(d.get("from_uom")), "to_uom": _(d.get("to_uom"))},
+			{"from_uom": d.get("from_uom"), "to_uom": d.get("to_uom")},
 		):
 			frappe.get_doc(
 				{
 					"doctype": "UOM Conversion Factor",
 					"category": _(d.get("category")),
-					"from_uom": _(d.get("from_uom")),
-					"to_uom": _(d.get("to_uom")),
+					"from_uom": d.get("from_uom"),
+					"to_uom": d.get("to_uom"),
 					"value": d.get("value"),
 				}
 			).db_insert()
@@ -477,10 +469,9 @@
 	stock_settings = frappe.get_doc("Stock Settings")
 	stock_settings.item_naming_by = "Item Code"
 	stock_settings.valuation_method = "FIFO"
-	stock_settings.default_warehouse = frappe.db.get_value(
-		"Warehouse", {"warehouse_name": _("Stores")}
-	)
+	stock_settings.default_warehouse = frappe.db.get_value("Warehouse", {"warehouse_name": _("Stores")})
 	stock_settings.stock_uom = _("Nos")
+	stock_settings.stock_uom = "Nos"
 	stock_settings.auto_indent = 1
 	stock_settings.auto_insert_price_list_rate_if_missing = 1
 	stock_settings.set_qty_in_transactions_based_on_serial_no_input = 1
diff --git a/erpnext/setup/setup_wizard/operations/taxes_setup.py b/erpnext/setup/setup_wizard/operations/taxes_setup.py
index 32d92f6..689af2c 100644
--- a/erpnext/setup/setup_wizard/operations/taxes_setup.py
+++ b/erpnext/setup/setup_wizard/operations/taxes_setup.py
@@ -14,7 +14,7 @@
 		frappe.throw(_("Company {} does not exist yet. Taxes setup aborted.").format(company_name))
 
 	file_path = os.path.join(os.path.dirname(__file__), "..", "data", "country_wise_tax.json")
-	with open(file_path, "r") as json_file:
+	with open(file_path) as json_file:
 		tax_data = json.load(json_file)
 
 	country_wise_tax = tax_data.get(country)
@@ -54,7 +54,12 @@
 					{
 						"title": title,
 						"taxes": [
-							{"tax_type": {"account_name": data.get("account_name"), "tax_rate": data.get("tax_rate")}}
+							{
+								"tax_type": {
+									"account_name": data.get("account_name"),
+									"tax_rate": data.get("tax_rate"),
+								}
+							}
 						],
 					}
 					for title, data in templates.items()
@@ -110,9 +115,7 @@
 	path = frappe.get_app_path("erpnext", "regional", frappe.scrub(country))
 	if os.path.exists(path.encode("utf-8")):
 		try:
-			module_name = "erpnext.regional.{0}.setup.update_regional_tax_settings".format(
-				frappe.scrub(country)
-			)
+			module_name = f"erpnext.regional.{frappe.scrub(country)}.setup.update_regional_tax_settings"
 			frappe.get_attr(module_name)(country, company)
 		except (ImportError, AttributeError):
 			pass
@@ -141,7 +144,7 @@
 
 		# if account_head is a dict, search or create the account and get it's name
 		if isinstance(account_data, dict):
-			tax_row_defaults["description"] = "{0} @ {1}".format(
+			tax_row_defaults["description"] = "{} @ {}".format(
 				account_data.get("account_name"), account_data.get("tax_rate")
 			)
 			tax_row_defaults["rate"] = account_data.get("tax_rate")
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index bab57fe..705fb1f 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -5,7 +5,7 @@
 from frappe import _
 from frappe.utils import add_days, flt, get_datetime_str, nowdate
 from frappe.utils.data import now_datetime
-from frappe.utils.nestedset import get_ancestors_of, get_root_of  # noqa
+from frappe.utils.nestedset import get_root_of
 
 from erpnext import get_default_company
 
@@ -81,14 +81,12 @@
 	if entries:
 		return flt(entries[0].exchange_rate)
 
-	if frappe.get_cached_value(
-		"Currency Exchange Settings", "Currency Exchange Settings", "disabled"
-	):
+	if frappe.get_cached_value("Currency Exchange Settings", "Currency Exchange Settings", "disabled"):
 		return 0.00
 
 	try:
 		cache = frappe.cache()
-		key = "currency_exchange_rate_{0}:{1}:{2}".format(transaction_date, from_currency, to_currency)
+		key = f"currency_exchange_rate_{transaction_date}:{from_currency}:{to_currency}"
 		value = cache.get(key)
 
 		if not value:
diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index d2be1a0..3de2be3 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -13,9 +13,7 @@
 		update_page_info(bootinfo)
 
 		bootinfo.sysdefaults.territory = frappe.db.get_single_value("Selling Settings", "territory")
-		bootinfo.sysdefaults.customer_group = frappe.db.get_single_value(
-			"Selling Settings", "customer_group"
-		)
+		bootinfo.sysdefaults.customer_group = frappe.db.get_single_value("Selling Settings", "customer_group")
 		bootinfo.sysdefaults.allow_stale = cint(
 			frappe.db.get_single_value("Accounts Settings", "allow_stale")
 		)
@@ -28,9 +26,7 @@
 		)
 
 		bootinfo.sysdefaults.allow_sales_order_creation_for_expired_quotation = cint(
-			frappe.db.get_single_value(
-				"Selling Settings", "allow_sales_order_creation_for_expired_quotation"
-			)
+			frappe.db.get_single_value("Selling Settings", "allow_sales_order_creation_for_expired_quotation")
 		)
 
 		# if no company, show a dialog box to create a new company
@@ -54,9 +50,7 @@
 			update={"doctype": ":Company"},
 		)
 
-		party_account_types = frappe.db.sql(
-			""" select name, ifnull(account_type, '') from `tabParty Type`"""
-		)
+		party_account_types = frappe.db.sql(""" select name, ifnull(account_type, '') from `tabParty Type`""")
 		bootinfo.party_account_types = frappe._dict(party_account_types)
 
 		bootinfo.sysdefaults.demo_company = frappe.db.get_single_value("Global Defaults", "demo_company")
diff --git a/erpnext/startup/leaderboard.py b/erpnext/startup/leaderboard.py
index 5a60d2f..06f61fd 100644
--- a/erpnext/startup/leaderboard.py
+++ b/erpnext/startup/leaderboard.py
@@ -93,7 +93,7 @@
 		select_field = "sum(actual_qty)" if field == "available_stock_qty" else "sum(stock_value)"
 		results = frappe.db.get_all(
 			"Bin",
-			fields=["item_code as name", "{0} as value".format(select_field)],
+			fields=["item_code as name", f"{select_field} as value"],
 			group_by="item_code",
 			order_by="value desc",
 			limit=limit,
@@ -224,9 +224,7 @@
 	if date_range:
 		date_range = frappe.parse_json(date_range)
 		from_date, to_date = date_range
-		date_condition = "and {0} between {1} and {2}".format(
-			field, frappe.db.escape(from_date), frappe.db.escape(to_date)
-		)
+		date_condition = f"and {field} between {frappe.db.escape(from_date)} and {frappe.db.escape(to_date)}"
 	return date_condition
 
 
diff --git a/erpnext/stock/__init__.py b/erpnext/stock/__init__.py
index bd16d69..7b58cbb 100644
--- a/erpnext/stock/__init__.py
+++ b/erpnext/stock/__init__.py
@@ -17,9 +17,9 @@
 
 
 def get_warehouse_account_map(company=None):
-	company_warehouse_account_map = company and frappe.flags.setdefault(
-		"warehouse_account_map", {}
-	).get(company)
+	company_warehouse_account_map = company and frappe.flags.setdefault("warehouse_account_map", {}).get(
+		company
+	)
 	warehouse_account_map = frappe.flags.warehouse_account_map
 
 	if not warehouse_account_map or not company_warehouse_account_map or frappe.flags.in_test:
diff --git a/erpnext/stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.py b/erpnext/stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.py
index d488150..cbc4fc7 100644
--- a/erpnext/stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.py
+++ b/erpnext/stock/dashboard_chart_source/warehouse_wise_stock_value/warehouse_wise_stock_value.py
@@ -27,9 +27,7 @@
 	if filters and filters.get("company"):
 		warehouse_filters.append(["company", "=", filters.get("company")])
 
-	warehouses = frappe.get_list(
-		"Warehouse", pluck="name", filters=warehouse_filters, order_by="name"
-	)
+	warehouses = frappe.get_list("Warehouse", pluck="name", filters=warehouse_filters, order_by="name")
 
 	warehouses = frappe.get_list(
 		"Bin",
diff --git a/erpnext/stock/deprecated_serial_batch.py b/erpnext/stock/deprecated_serial_batch.py
index 6e32cc2..bc53878 100644
--- a/erpnext/stock/deprecated_serial_batch.py
+++ b/erpnext/stock/deprecated_serial_batch.py
@@ -139,9 +139,7 @@
 			if not self.non_batchwise_balance_qty:
 				continue
 
-			self.batch_avg_rate[batch_no] = (
-				self.non_batchwise_balance_value / self.non_batchwise_balance_qty
-			)
+			self.batch_avg_rate[batch_no] = self.non_batchwise_balance_value / self.non_batchwise_balance_qty
 
 			stock_value_change = self.batch_avg_rate[batch_no] * ledger.qty
 			self.stock_value_change += stock_value_change
@@ -208,9 +206,9 @@
 		bundle_child = frappe.qb.DocType("Serial and Batch Entry")
 		batch = frappe.qb.DocType("Batch")
 
-		timestamp_condition = CombineDatetime(
-			bundle.posting_date, bundle.posting_time
-		) < CombineDatetime(self.sle.posting_date, self.sle.posting_time)
+		timestamp_condition = CombineDatetime(bundle.posting_date, bundle.posting_time) < CombineDatetime(
+			self.sle.posting_date, self.sle.posting_time
+		)
 
 		if self.sle.creation:
 			timestamp_condition |= (
diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
index e20030a..0520eb7 100644
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json
@@ -208,7 +208,7 @@
  "image_field": "image",
  "links": [],
  "max_attachments": 5,
- "modified": "2023-11-09 12:17:28.339975",
+ "modified": "2024-03-27 13:06:38.677265",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Batch",
@@ -230,7 +230,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "batch_id",
diff --git a/erpnext/stock/doctype/batch/batch.py b/erpnext/stock/doctype/batch/batch.py
index e8e94fd..8726642 100644
--- a/erpnext/stock/doctype/batch/batch.py
+++ b/erpnext/stock/doctype/batch/batch.py
@@ -240,17 +240,13 @@
 def get_batches_by_oldest(item_code, warehouse):
 	"""Returns the oldest batch and qty for the given item_code and warehouse"""
 	batches = get_batch_qty(item_code=item_code, warehouse=warehouse)
-	batches_dates = [
-		[batch, frappe.get_value("Batch", batch.batch_no, "expiry_date")] for batch in batches
-	]
+	batches_dates = [[batch, frappe.get_value("Batch", batch.batch_no, "expiry_date")] for batch in batches]
 	batches_dates.sort(key=lambda tup: tup[1])
 	return batches_dates
 
 
 @frappe.whitelist()
-def split_batch(
-	batch_no: str, item_code: str, warehouse: str, qty: float, new_batch_id: str | None = None
-):
+def split_batch(batch_no: str, item_code: str, warehouse: str, qty: float, new_batch_id: str | None = None):
 	"""Split the batch into a new batch"""
 	batch = frappe.get_doc(dict(doctype="Batch", item=item_code, batch_id=new_batch_id)).insert()
 	qty = flt(qty)
@@ -282,7 +278,10 @@
 			company=company,
 			items=[
 				dict(
-					item_code=item_code, qty=qty, s_warehouse=warehouse, serial_and_batch_bundle=from_bundle_id
+					item_code=item_code,
+					qty=qty,
+					s_warehouse=warehouse,
+					serial_and_batch_bundle=from_bundle_id,
 				),
 				dict(
 					item_code=item_code, qty=qty, t_warehouse=warehouse, serial_and_batch_bundle=to_bundle_id
diff --git a/erpnext/stock/doctype/batch/test_batch.py b/erpnext/stock/doctype/batch/test_batch.py
index 7fb672c..3f37b7b 100644
--- a/erpnext/stock/doctype/batch/test_batch.py
+++ b/erpnext/stock/doctype/batch/test_batch.py
@@ -117,10 +117,10 @@
 		self.assertTrue(receipt2.items[0].serial_and_batch_bundle)
 
 		batchwise_qty = frappe._dict({})
-		for receipt in [receipt, receipt2]:
-			batch_no = get_batch_from_bundle(receipt.items[0].serial_and_batch_bundle)
-			key = (batch_no, receipt.items[0].warehouse)
-			batchwise_qty[key] = receipt.items[0].qty
+		for r in [receipt, receipt2]:
+			batch_no = get_batch_from_bundle(r.items[0].serial_and_batch_bundle)
+			key = (batch_no, r.items[0].warehouse)
+			batchwise_qty[key] = r.items[0].qty
 
 		batches = get_batch_qty(batch_no)
 		for d in batches:
@@ -156,9 +156,7 @@
 
 		bundle = stock_entry.items[0].serial_and_batch_bundle
 		self.assertTrue(bundle)
-		self.assertEqual(
-			get_batch_qty(get_batch_from_bundle(bundle), stock_entry.items[0].t_warehouse), 90
-		)
+		self.assertEqual(get_batch_qty(get_batch_from_bundle(bundle), stock_entry.items[0].t_warehouse), 90)
 
 	def test_delivery_note(self):
 		"""Test automatic batch selection for outgoing items"""
@@ -543,9 +541,7 @@
 			get_batch_from_bundle(pr_2.items[0].serial_and_batch_bundle),
 		)
 
-		self.assertEqual(
-			"BATCHEXISTING002", get_batch_from_bundle(pr_2.items[0].serial_and_batch_bundle)
-		)
+		self.assertEqual("BATCHEXISTING002", get_batch_from_bundle(pr_2.items[0].serial_and_batch_bundle))
 
 
 def create_batch(item_code, rate, create_item_price_for_batch):
diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index 39e0917..7de1aa9 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json
@@ -186,7 +186,7 @@
  "idx": 1,
  "in_create": 1,
  "links": [],
- "modified": "2024-01-16 15:11:46.140323",
+ "modified": "2024-03-27 13:06:39.414036",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Bin",
@@ -232,7 +232,7 @@
  ],
  "quick_entry": 1,
  "search_fields": "item_code,warehouse",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/bin/bin.py b/erpnext/stock/doctype/bin/bin.py
index 9310985..e3a155b 100644
--- a/erpnext/stock/doctype/bin/bin.py
+++ b/erpnext/stock/doctype/bin/bin.py
@@ -83,9 +83,7 @@
 			get_reserved_qty_for_sub_assembly,
 		)
 
-		reserved_qty_for_production_plan = get_reserved_qty_for_sub_assembly(
-			self.item_code, self.warehouse
-		)
+		reserved_qty_for_production_plan = get_reserved_qty_for_sub_assembly(self.item_code, self.warehouse)
 
 		if reserved_qty_for_production_plan is None and not self.reserved_qty_for_production_plan:
 			return
@@ -106,9 +104,7 @@
 		in open work orders"""
 		from erpnext.manufacturing.doctype.work_order.work_order import get_reserved_qty_for_production
 
-		self.reserved_qty_for_production = get_reserved_qty_for_production(
-			self.item_code, self.warehouse
-		)
+		self.reserved_qty_for_production = get_reserved_qty_for_production(self.item_code, self.warehouse)
 
 		self.db_set(
 			"reserved_qty_for_production", flt(self.reserved_qty_for_production), update_modified=True
@@ -156,9 +152,7 @@
 		se_item = frappe.qb.DocType("Stock Entry Detail")
 
 		if frappe.db.field_exists("Stock Entry", "is_return"):
-			qty_field = (
-				Case().when(se.is_return == 1, se_item.transfer_qty * -1).else_(se_item.transfer_qty)
-			)
+			qty_field = Case().when(se.is_return == 1, se_item.transfer_qty * -1).else_(se_item.transfer_qty)
 		else:
 			qty_field = se_item.transfer_qty
 
diff --git a/erpnext/stock/doctype/bin/test_bin.py b/erpnext/stock/doctype/bin/test_bin.py
index b79dee8..e4f5565 100644
--- a/erpnext/stock/doctype/bin/test_bin.py
+++ b/erpnext/stock/doctype/bin/test_bin.py
@@ -31,4 +31,4 @@
 	def test_index_exists(self):
 		indexes = frappe.db.sql("show index from tabBin where Non_unique = 0", as_dict=1)
 		if not any(index.get("Key_name") == "unique_item_warehouse" for index in indexes):
-			self.fail(f"Expected unique index on item-warehouse")
+			self.fail("Expected unique index on item-warehouse")
diff --git a/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json
index 0c4757f..593f3f5 100644
--- a/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json
+++ b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.json
@@ -113,7 +113,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-05-17 11:46:04.448220",
+ "modified": "2024-03-27 13:06:44.967237",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Closing Stock Balance",
@@ -133,7 +133,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
-}
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.py b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.py
index e99a0b1..1cb6305 100644
--- a/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.py
+++ b/erpnext/stock/doctype/closing_stock_balance/closing_stock_balance.py
@@ -149,6 +149,6 @@
 	try:
 		doc.create_closing_stock_balance_entries()
 		doc.db_set("status", "Completed")
-	except Exception as e:
+	except Exception:
 		doc.db_set("status", "Failed")
 		doc.log_error(title="Closing Stock Balance Failed")
diff --git a/erpnext/stock/doctype/customs_tariff_number/customs_tariff_number.json b/erpnext/stock/doctype/customs_tariff_number/customs_tariff_number.json
index 7eeb147..dc76bad 100644
--- a/erpnext/stock/doctype/customs_tariff_number/customs_tariff_number.json
+++ b/erpnext/stock/doctype/customs_tariff_number/customs_tariff_number.json
@@ -1,146 +1,63 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "field:tariff_number", 
- "beta": 0, 
- "creation": "2017-03-24 15:30:36.314639", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:tariff_number",
+ "creation": "2017-03-24 15:30:36.314639",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "tariff_number",
+  "description"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "tariff_number", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Tariff Number", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
+   "fieldname": "tariff_number",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Tariff Number",
+   "reqd": 1,
    "unique": 1
-  }, 
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "description",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Description"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2020-06-26 09:30:03.951743", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Customs Tariff Number", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:06:48.957880",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Customs Tariff Number",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Stock Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Stock Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 0, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Stock User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
-   "write": 0
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Stock User",
+   "share": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
-}
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 87c3333..497f674 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -351,7 +351,7 @@
   },
   {
    "fieldname": "shipping_address",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Shipping Address",
    "read_only": 1
   },
@@ -408,7 +408,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Billing Address",
    "read_only": 1
   },
@@ -420,7 +420,7 @@
   },
   {
    "fieldname": "company_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Company Address",
    "read_only": 1
   },
@@ -1289,7 +1289,7 @@
   {
    "depends_on": "dispatch_address_name",
    "fieldname": "dispatch_address",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Dispatch Address",
    "print_hide": 1,
    "read_only": 1
@@ -1397,7 +1397,7 @@
  "idx": 146,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-20 16:05:02.854990",
+ "modified": "2024-03-27 13:06:49.519676",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Delivery Note",
@@ -1490,7 +1490,7 @@
  ],
  "search_fields": "status,customer,customer_name, territory,base_grand_total",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "customer",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index e17a0a2..7144908 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -35,7 +35,7 @@
 		from erpnext.stock.doctype.packed_item.packed_item import PackedItem
 
 		additional_discount_percentage: DF.Float
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		amount_eligible_for_commission: DF.Currency
 		apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
@@ -52,7 +52,7 @@
 		commission_rate: DF.Float
 		company: DF.Link
 		company_address: DF.Link | None
-		company_address_display: DF.SmallText | None
+		company_address_display: DF.TextEditor | None
 		contact_display: DF.SmallText | None
 		contact_email: DF.Data | None
 		contact_mobile: DF.SmallText | None
@@ -66,7 +66,7 @@
 		customer_name: DF.Data | None
 		disable_rounded_total: DF.Check
 		discount_amount: DF.Currency
-		dispatch_address: DF.SmallText | None
+		dispatch_address: DF.TextEditor | None
 		dispatch_address_name: DF.Link | None
 		driver: DF.Link | None
 		driver_name: DF.Data | None
@@ -117,7 +117,7 @@
 		set_posting_time: DF.Check
 		set_target_warehouse: DF.Link | None
 		set_warehouse: DF.Link | None
-		shipping_address: DF.SmallText | None
+		shipping_address: DF.TextEditor | None
 		shipping_address_name: DF.Link | None
 		shipping_rule: DF.Link | None
 		source: DF.Link | None
@@ -141,7 +141,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(DeliveryNote, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.status_updater = [
 			{
 				"source_dt": "Delivery Note Item",
@@ -229,7 +229,7 @@
 			for f in fieldname:
 				toggle_print_hide(self.meta if key == "parent" else item_meta, f)
 
-		super(DeliveryNote, self).before_print(settings)
+		super().before_print(settings)
 
 	def set_actual_qty(self):
 		for d in self.get("items"):
@@ -250,7 +250,7 @@
 
 	def validate(self):
 		self.validate_posting_time()
-		super(DeliveryNote, self).validate()
+		super().validate()
 		self.validate_references()
 		self.set_status()
 		self.so_required()
@@ -274,11 +274,16 @@
 		self.reset_default_field_value("set_warehouse", "items", "warehouse")
 
 	def validate_with_previous_doc(self):
-		super(DeliveryNote, self).validate_with_previous_doc(
+		super().validate_with_previous_doc(
 			{
 				"Sales Order": {
 					"ref_dn_field": "against_sales_order",
-					"compare_fields": [["customer", "="], ["company", "="], ["project", "="], ["currency", "="]],
+					"compare_fields": [
+						["customer", "="],
+						["company", "="],
+						["project", "="],
+						["currency", "="],
+					],
 				},
 				"Sales Order Item": {
 					"ref_dn_field": "so_detail",
@@ -288,7 +293,12 @@
 				},
 				"Sales Invoice": {
 					"ref_dn_field": "against_sales_invoice",
-					"compare_fields": [["customer", "="], ["company", "="], ["project", "="], ["currency", "="]],
+					"compare_fields": [
+						["customer", "="],
+						["company", "="],
+						["project", "="],
+						["currency", "="],
+					],
 				},
 				"Sales Invoice Item": {
 					"ref_dn_field": "si_detail",
@@ -409,7 +419,7 @@
 				)
 
 	def validate_warehouse(self):
-		super(DeliveryNote, self).validate_warehouse()
+		super().validate_warehouse()
 
 		for d in self.get_item_list():
 			if not d["warehouse"] and frappe.get_cached_value("Item", d["item_code"], "is_stock_item") == 1:
@@ -466,7 +476,7 @@
 		self.repost_future_sle_and_gle()
 
 	def on_cancel(self):
-		super(DeliveryNote, self).on_cancel()
+		super().on_cancel()
 
 		self.check_sales_order_on_hold_or_close("against_sales_order")
 		self.check_next_docstatus()
@@ -555,7 +565,9 @@
 									delivered_batch_qty[entry.batch_no] -= delivered_qty
 					else:
 						# `Delivered Qty` should be less than or equal to `Reserved Qty`.
-						qty_can_be_deliver = min((sre_doc.reserved_qty - sre_doc.delivered_qty), qty_to_deliver)
+						qty_can_be_deliver = min(
+							(sre_doc.reserved_qty - sre_doc.delivered_qty), qty_to_deliver
+						)
 
 					sre_doc.delivered_qty += qty_can_be_deliver
 					sre_doc.db_update()
@@ -613,7 +625,9 @@
 							batch_qty_to_undelivered = {d.batch_no: -1 * d.qty for d in sbb.entries}
 							for entry in sre_doc.sb_entries:
 								if entry.batch_no in batch_qty_to_undelivered:
-									undelivered_qty = min(entry.delivered_qty, batch_qty_to_undelivered[entry.batch_no])
+									undelivered_qty = min(
+										entry.delivered_qty, batch_qty_to_undelivered[entry.batch_no]
+									)
 									entry.delivered_qty -= undelivered_qty
 									entry.db_update()
 									qty_can_be_undelivered += undelivered_qty
@@ -669,7 +683,8 @@
 						frappe.bold(reserved_warehouses[0])
 						if len(reserved_warehouses) == 1
 						else _("{0} and {1}").format(
-							frappe.bold(", ".join(reserved_warehouses[:-1])), frappe.bold(reserved_warehouses[-1])
+							frappe.bold(", ".join(reserved_warehouses[:-1])),
+							frappe.bold(reserved_warehouses[-1]),
 						),
 					)
 					frappe.throw(msg, title=_("Stock Reservation Warehouse Mismatch"))
@@ -1166,7 +1181,7 @@
 			"User", frappe.session.user, ["email", "full_name", "phone", "mobile_no"], as_dict=1
 		)
 		target.pickup_contact_email = user.email
-		pickup_contact_display = "{}".format(user.full_name)
+		pickup_contact_display = f"{user.full_name}"
 		if user:
 			if user.email:
 				pickup_contact_display += "<br>" + user.email
@@ -1182,7 +1197,7 @@
 		contact = frappe.db.get_value(
 			"Contact", source.contact_person, ["email_id", "phone", "mobile_no"], as_dict=1
 		)
-		delivery_contact_display = "{}".format(source.contact_display)
+		delivery_contact_display = f"{source.contact_display}"
 		if contact:
 			if contact.email_id:
 				delivery_contact_display += "<br>" + contact.email_id
@@ -1287,6 +1302,9 @@
 			for tax in get_taxes_and_charges(master_doctype, target.get("taxes_and_charges")):
 				target.append("taxes", tax)
 
+		if not target.get("items"):
+			frappe.throw(_("All items have already been received"))
+
 	def update_details(source_doc, target_doc, source_parent):
 		target_doc.inter_company_invoice_reference = source_doc.name
 		if target_doc.doctype == "Purchase Receipt":
@@ -1342,6 +1360,10 @@
 				shipping_address_name=target_doc.shipping_address_name,
 			)
 
+	def update_item(source, target, source_parent):
+		if source_parent.doctype == "Delivery Note" and source.received_qty:
+			target.qty = flt(source.qty) + flt(source.returned_qty) - flt(source.received_qty)
+
 	doclist = get_mapped_doc(
 		doctype,
 		source_name,
@@ -1351,8 +1373,7 @@
 				"postprocess": update_details,
 				"field_no_map": ["taxes_and_charges", "set_warehouse"],
 			},
-			doctype
-			+ " Item": {
+			doctype + " Item": {
 				"doctype": target_doctype + " Item",
 				"field_map": {
 					source_document_warehouse_field: target_document_warehouse_field,
@@ -1363,6 +1384,8 @@
 					"Material_request_item": "material_request_item",
 				},
 				"field_no_map": ["warehouse"],
+				"condition": lambda item: item.received_qty < item.qty + item.returned_qty,
+				"postprocess": update_item,
 			},
 		},
 		target_doc,
diff --git a/erpnext/stock/doctype/delivery_note/test_delivery_note.py b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
index 905287d..499a4a6 100644
--- a/erpnext/stock/doctype/delivery_note/test_delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/test_delivery_note.py
@@ -68,7 +68,7 @@
 		self.assertRaises(frappe.ValidationError, frappe.get_doc(si).insert)
 
 	def test_delivery_note_no_gl_entry(self):
-		company = frappe.db.get_value("Warehouse", "_Test Warehouse - _TC", "company")
+		frappe.db.get_value("Warehouse", "_Test Warehouse - _TC", "company")
 		make_stock_entry(target="_Test Warehouse - _TC", qty=5, basic_rate=100)
 
 		stock_queue = json.loads(
@@ -85,16 +85,14 @@
 
 		dn = create_delivery_note()
 
-		sle = frappe.get_doc(
-			"Stock Ledger Entry", {"voucher_type": "Delivery Note", "voucher_no": dn.name}
-		)
+		sle = frappe.get_doc("Stock Ledger Entry", {"voucher_type": "Delivery Note", "voucher_no": dn.name})
 
 		self.assertEqual(sle.stock_value_difference, flt(-1 * stock_queue[0][1], 2))
 
 		self.assertFalse(get_gl_entries("Delivery Note", dn.name))
 
 	def test_delivery_note_gl_entry_packing_item(self):
-		company = frappe.db.get_value("Warehouse", "Stores - TCP1", "company")
+		frappe.db.get_value("Warehouse", "Stores - TCP1", "company")
 
 		make_stock_entry(item_code="_Test Item", target="Stores - TCP1", qty=10, basic_rate=100)
 		make_stock_entry(
@@ -141,7 +139,7 @@
 			stock_in_hand_account: [0.0, stock_value_diff],
 			"Cost of Goods Sold - TCP1": [stock_value_diff, 0.0],
 		}
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual([gle.debit, gle.credit], expected_values.get(gle.account))
 
 		# check stock in hand balance
@@ -472,6 +470,98 @@
 
 		self.assertEqual(return_dn.items[0].incoming_rate, 150)
 
+	def test_sales_return_against_serial_batch_bundle(self):
+		frappe.db.set_single_value(
+			"Stock Settings", "do_not_update_serial_batch_on_creation_of_auto_bundle", 1
+		)
+
+		batch_item = make_item(
+			"Test Sales Return Against Batch Item",
+			properties={
+				"has_batch_no": 1,
+				"is_stock_item": 1,
+				"create_new_batch": 1,
+				"batch_number_series": "BATCH-TSRABII.#####",
+			},
+		).name
+
+		serial_item = make_item(
+			"Test Sales Return Against Serial NO Item",
+			properties={
+				"has_serial_no": 1,
+				"is_stock_item": 1,
+				"serial_no_series": "SN-TSRABII.#####",
+			},
+		).name
+
+		make_stock_entry(item_code=batch_item, target="_Test Warehouse - _TC", qty=5, basic_rate=100)
+		make_stock_entry(item_code=serial_item, target="_Test Warehouse - _TC", qty=5, basic_rate=100)
+
+		dn = create_delivery_note(
+			item_code=batch_item,
+			qty=5,
+			rate=500,
+			warehouse="_Test Warehouse - _TC",
+			expense_account="Cost of Goods Sold - _TC",
+			cost_center="Main - _TC",
+			use_serial_batch_fields=0,
+			do_not_submit=1,
+		)
+
+		dn.append(
+			"items",
+			{
+				"item_code": serial_item,
+				"qty": 5,
+				"rate": 500,
+				"warehouse": "_Test Warehouse - _TC",
+				"expense_account": "Cost of Goods Sold - _TC",
+				"cost_center": "Main - _TC",
+				"use_serial_batch_fields": 0,
+			},
+		)
+
+		dn.save()
+		for row in dn.items:
+			self.assertFalse(row.use_serial_batch_fields)
+
+		dn.submit()
+		dn.reload()
+		for row in dn.items:
+			self.assertTrue(row.serial_and_batch_bundle)
+			self.assertFalse(row.use_serial_batch_fields)
+			self.assertFalse(row.serial_no)
+			self.assertFalse(row.batch_no)
+
+		from erpnext.controllers.sales_and_purchase_return import make_return_doc
+
+		return_dn = make_return_doc(dn.doctype, dn.name)
+		for row in return_dn.items:
+			row.qty = -2
+			row.use_serial_batch_fields = 0
+		return_dn.save().submit()
+
+		for row in return_dn.items:
+			total_qty = frappe.db.get_value(
+				"Serial and Batch Bundle", row.serial_and_batch_bundle, "total_qty"
+			)
+
+			self.assertEqual(total_qty, 2)
+
+			doc = frappe.get_doc("Serial and Batch Bundle", row.serial_and_batch_bundle)
+			if doc.has_serial_no:
+				self.assertEqual(len(doc.entries), 2)
+
+			for entry in doc.entries:
+				if doc.has_batch_no:
+					self.assertEqual(entry.qty, 2)
+				else:
+					self.assertEqual(entry.qty, 1)
+
+		frappe.db.set_single_value(
+			"Stock Settings", "do_not_update_serial_batch_on_creation_of_auto_bundle", 0
+		)
+
 	def test_return_single_item_from_bundled_items(self):
 		company = frappe.db.get_value("Warehouse", "Stores - TCP1", "company")
 
@@ -795,7 +885,7 @@
 			"Stock In Hand - TCP1": [0.0, stock_value_difference],
 			target_warehouse: [stock_value_difference, 0.0],
 		}
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual([gle.debit, gle.credit], expected_values.get(gle.account))
 
 		# tear down
@@ -1003,7 +1093,7 @@
 			"Cost of Goods Sold - TCP1": {"cost_center": cost_center},
 			stock_in_hand_account: {"cost_center": cost_center},
 		}
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account]["cost_center"], gle.cost_center)
 
 	def test_delivery_note_cost_center_with_balance_sheet_account(self):
@@ -1032,7 +1122,7 @@
 			"Cost of Goods Sold - TCP1": {"cost_center": cost_center},
 			stock_in_hand_account: {"cost_center": cost_center},
 		}
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account]["cost_center"], gle.cost_center)
 
 	def test_make_sales_invoice_from_dn_for_returned_qty(self):
@@ -1100,9 +1190,7 @@
 			},
 		)
 		make_product_bundle(parent=batched_bundle.name, items=[batched_item.name])
-		make_stock_entry(
-			item_code=batched_item.name, target="_Test Warehouse - _TC", qty=10, basic_rate=42
-		)
+		make_stock_entry(item_code=batched_item.name, target="_Test Warehouse - _TC", qty=10, basic_rate=42)
 
 		dn = create_delivery_note(item_code=batched_bundle.name, qty=1)
 		dn.load_from_db()
@@ -1125,9 +1213,7 @@
 		dn.reload()
 		dn.delete()
 
-		bundle = frappe.db.get_value(
-			"Serial and Batch Bundle", {"voucher_detail_no": packed_name}, "name"
-		)
+		bundle = frappe.db.get_value("Serial and Batch Bundle", {"voucher_detail_no": packed_name}, "name")
 		self.assertFalse(bundle)
 
 		frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
@@ -1306,9 +1392,7 @@
 			warehouse=warehouse,
 			target_warehouse=target,
 		)
-		self.assertFalse(
-			frappe.db.exists("GL Entry", {"voucher_no": dn.name, "voucher_type": dn.doctype})
-		)
+		self.assertFalse(frappe.db.exists("GL Entry", {"voucher_no": dn.name, "voucher_type": dn.doctype}))
 
 	def test_batch_expiry_for_delivery_note(self):
 		from erpnext.controllers.sales_and_purchase_return import make_return_doc
@@ -1435,9 +1519,7 @@
 			basic_rate=100.0,
 			posting_date=add_days(nowdate(), -5),
 		)
-		dn = create_delivery_note(
-			item_code=item_code, qty=5, rate=500, posting_date=add_days(nowdate(), -4)
-		)
+		dn = create_delivery_note(item_code=item_code, qty=5, rate=500, posting_date=add_days(nowdate(), -4))
 		self.assertEqual(dn.items[0].incoming_rate, 100.0)
 
 		make_stock_entry(
@@ -1527,9 +1609,7 @@
 		self.assertAlmostEqual(returned_dn.items[0].incoming_rate, 200.0)
 
 	def test_batch_with_non_stock_uom(self):
-		frappe.db.set_single_value(
-			"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 1
-		)
+		frappe.db.set_single_value("Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 1)
 
 		item = make_item(
 			properties={
@@ -1562,9 +1642,7 @@
 		)
 		self.assertEqual(abs(delivered_batch_qty), 5.0)
 
-		frappe.db.set_single_value(
-			"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0
-		)
+		frappe.db.set_single_value("Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0)
 
 	def test_internal_transfer_for_non_stock_item(self):
 		from erpnext.selling.doctype.customer.test_customer import create_internal_customer
@@ -1604,9 +1682,7 @@
 
 		item_details = {}
 		for item in [serial_item, batch_item]:
-			se = make_stock_entry(
-				item_code=item.name, target="_Test Warehouse - _TC", qty=5, basic_rate=100
-			)
+			se = make_stock_entry(item_code=item.name, target="_Test Warehouse - _TC", qty=5, basic_rate=100)
 			item_details[item.name] = se.items[0].serial_and_batch_bundle
 
 		dn = create_delivery_note(item_code=bundle_item.name, qty=1, do_not_submit=True)
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index b8164b2..c93031e 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -913,14 +913,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-21 18:15:07.603672",
+ "modified": "2024-03-27 13:06:50.061877",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Delivery Note Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_settings/delivery_settings.json b/erpnext/stock/doctype/delivery_settings/delivery_settings.json
index ad0ac45..7455772 100644
--- a/erpnext/stock/doctype/delivery_settings/delivery_settings.json
+++ b/erpnext/stock/doctype/delivery_settings/delivery_settings.json
@@ -1,258 +1,76 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-09-04 23:01:34.458550", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-09-04 23:01:34.458550",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "sb_dispatch",
+  "dispatch_template",
+  "dispatch_attachment",
+  "send_with_attachment",
+  "cb_delivery",
+  "stop_delay"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "sb_dispatch", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Dispatch Settings", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "sb_dispatch",
+   "fieldtype": "Section Break",
+   "label": "Dispatch Settings"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "dispatch_template", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Dispatch Notification Template", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Email Template", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "dispatch_template",
+   "fieldtype": "Link",
+   "label": "Dispatch Notification Template",
+   "options": "Email Template"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "send_with_attachment", 
-   "description": "Leave blank to use the standard Delivery Note format", 
-   "fieldname": "dispatch_attachment", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Dispatch Notification Attachment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Print Format", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "send_with_attachment",
+   "description": "Leave blank to use the standard Delivery Note format",
+   "fieldname": "dispatch_attachment",
+   "fieldtype": "Link",
+   "label": "Dispatch Notification Attachment",
+   "options": "Print Format"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "send_with_attachment", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Send with Attachment", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "send_with_attachment",
+   "fieldtype": "Check",
+   "label": "Send with Attachment"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb_delivery", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "cb_delivery",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_in_quick_entry": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "In minutes", 
-   "fieldname": "stop_delay", 
-   "fieldtype": "Int", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Delay between Delivery Stops", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "description": "In minutes",
+   "fieldname": "stop_delay",
+   "fieldtype": "Int",
+   "label": "Delay between Delivery Stops"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-09-09 23:51:34.279941", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Delivery Settings", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2024-03-27 13:06:50.346239",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Delivery Settings",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
    "role": "Delivery Manager",
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0, 
- "track_views": 0
-}
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_stop/delivery_stop.json b/erpnext/stock/doctype/delivery_stop/delivery_stop.json
index 42560e6..0a748d3 100644
--- a/erpnext/stock/doctype/delivery_stop/delivery_stop.json
+++ b/erpnext/stock/doctype/delivery_stop/delivery_stop.json
@@ -183,14 +183,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-09-29 09:22:53.435161",
+ "modified": "2024-03-27 13:06:50.465672",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Delivery Stop",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.json b/erpnext/stock/doctype/delivery_trip/delivery_trip.json
index ec72af8..d6e5c38 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.json
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.json
@@ -188,7 +188,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2023-10-01 07:06:06.314503",
+ "modified": "2024-03-27 13:06:50.643296",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Delivery Trip",
@@ -256,8 +256,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "driver_name"
-}
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/delivery_trip/delivery_trip.py b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
index cb9fc5b..58f393d 100644
--- a/erpnext/stock/doctype/delivery_trip/delivery_trip.py
+++ b/erpnext/stock/doctype/delivery_trip/delivery_trip.py
@@ -40,7 +40,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(DeliveryTrip, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 
 		# Google Maps returns distances in meters by default
 		self.default_distance_uom = (
@@ -94,9 +94,7 @@
 		        delete (bool, optional): Defaults to `False`. `True` if driver details need to be emptied, else `False`.
 		"""
 
-		delivery_notes = list(
-			set(stop.delivery_note for stop in self.delivery_stops if stop.delivery_note)
-		)
+		delivery_notes = list(set(stop.delivery_note for stop in self.delivery_stops if stop.delivery_note))
 
 		update_fields = {
 			"driver": self.driver,
@@ -342,14 +340,11 @@
 		"Contact", contact, ["first_name", "last_name", "phone", "mobile_no"], as_dict=1
 	)
 
-	contact_info.html = (
-		""" <b>%(first_name)s %(last_name)s</b> <br> %(phone)s <br> %(mobile_no)s"""
-		% {
-			"first_name": contact_info.first_name,
-			"last_name": contact_info.last_name or "",
-			"phone": contact_info.phone or "",
-			"mobile_no": contact_info.mobile_no or "",
-		}
+	contact_info.html = """ <b>{first_name} {last_name}</b> <br> {phone} <br> {mobile_no}""".format(
+		first_name=contact_info.first_name,
+		last_name=contact_info.last_name or "",
+		phone=contact_info.phone or "",
+		mobile_no=contact_info.mobile_no or "",
 	)
 
 	return contact_info.html
diff --git a/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py
index 9b8b46e..09f5b2c 100644
--- a/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py
+++ b/erpnext/stock/doctype/delivery_trip/test_delivery_trip.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
 from frappe.tests.utils import FrappeTestCase
diff --git a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
index 0e40552..7550fd3 100644
--- a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
+++ b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.json
@@ -189,7 +189,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-10-05 12:52:18.705431",
+ "modified": "2024-03-27 13:09:52.561725",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Inventory Dimension",
@@ -233,7 +233,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
index d5eef5a..103d8a1 100644
--- a/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
+++ b/erpnext/stock/doctype/inventory_dimension/inventory_dimension.py
@@ -384,9 +384,7 @@
 
 @frappe.whitelist()
 def get_parent_fields(child_doctype, dimension_name):
-	parent_doctypes = frappe.get_all(
-		"DocField", fields=["parent"], filters={"options": child_doctype}
-	)
+	parent_doctypes = frappe.get_all("DocField", fields=["parent"], filters={"options": child_doctype})
 
 	fields = []
 
diff --git a/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py b/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
index 361c2f8..8ce954d 100644
--- a/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
+++ b/erpnext/stock/doctype/inventory_dimension/test_inventory_dimension.py
@@ -210,9 +210,7 @@
 		)
 
 		self.assertFalse(
-			frappe.db.get_value(
-				"Custom Field", {"fieldname": "project", "dt": "Stock Ledger Entry"}, "name"
-			)
+			frappe.db.get_value("Custom Field", {"fieldname": "project", "dt": "Stock Ledger Entry"}, "name")
 		)
 
 	def test_check_mandatory_dimensions(self):
@@ -296,9 +294,7 @@
 		se_doc.save()
 		se_doc.submit()
 
-		entries = get_voucher_sl_entries(
-			se_doc.name, ["warehouse", "store", "incoming_rate", "actual_qty"]
-		)
+		entries = get_voucher_sl_entries(se_doc.name, ["warehouse", "store", "incoming_rate", "actual_qty"])
 
 		for entry in entries:
 			self.assertEqual(entry.warehouse, warehouse)
@@ -488,7 +484,14 @@
 				"autoname": "field:store_name",
 				"fields": [{"label": "Store Name", "fieldname": "store_name", "fieldtype": "Data"}],
 				"permissions": [
-					{"role": "System Manager", "permlevel": 0, "read": 1, "write": 1, "create": 1, "delete": 1}
+					{
+						"role": "System Manager",
+						"permlevel": 0,
+						"read": 1,
+						"write": 1,
+						"create": 1,
+						"delete": 1,
+					}
 				],
 			}
 		).insert(ignore_permissions=True)
@@ -510,7 +513,14 @@
 				"autoname": "field:shelf_name",
 				"fields": [{"label": "Shelf Name", "fieldname": "shelf_name", "fieldtype": "Data"}],
 				"permissions": [
-					{"role": "System Manager", "permlevel": 0, "read": 1, "write": 1, "create": 1, "delete": 1}
+					{
+						"role": "System Manager",
+						"permlevel": 0,
+						"read": 1,
+						"write": 1,
+						"create": 1,
+						"delete": 1,
+					}
 				],
 			}
 		).insert(ignore_permissions=True)
@@ -532,7 +542,14 @@
 				"autoname": "field:rack_name",
 				"fields": [{"label": "Rack Name", "fieldname": "rack_name", "fieldtype": "Data"}],
 				"permissions": [
-					{"role": "System Manager", "permlevel": 0, "read": 1, "write": 1, "create": 1, "delete": 1}
+					{
+						"role": "System Manager",
+						"permlevel": 0,
+						"read": 1,
+						"write": 1,
+						"create": 1,
+						"delete": 1,
+					}
 				],
 			}
 		).insert(ignore_permissions=True)
@@ -554,7 +571,14 @@
 				"autoname": "field:pallet_name",
 				"fields": [{"label": "Pallet Name", "fieldname": "pallet_name", "fieldtype": "Data"}],
 				"permissions": [
-					{"role": "System Manager", "permlevel": 0, "read": 1, "write": 1, "create": 1, "delete": 1}
+					{
+						"role": "System Manager",
+						"permlevel": 0,
+						"read": 1,
+						"write": 1,
+						"create": 1,
+						"delete": 1,
+					}
 				],
 			}
 		).insert(ignore_permissions=True)
@@ -570,7 +594,14 @@
 				"autoname": "field:site_name",
 				"fields": [{"label": "Site Name", "fieldname": "site_name", "fieldtype": "Data"}],
 				"permissions": [
-					{"role": "System Manager", "permlevel": 0, "read": 1, "write": 1, "create": 1, "delete": 1}
+					{
+						"role": "System Manager",
+						"permlevel": 0,
+						"read": 1,
+						"write": 1,
+						"create": 1,
+						"delete": 1,
+					}
 				],
 			}
 		).insert(ignore_permissions=True)
@@ -623,9 +654,7 @@
 
 	to_warehouse = create_warehouse("_Test Internal Warehouse GIT A", company=company)
 
-	pr_doc = make_purchase_receipt(
-		company=company, warehouse=warehouse, qty=10, rate=100, do_not_submit=True
-	)
+	pr_doc = make_purchase_receipt(company=company, warehouse=warehouse, qty=10, rate=100, do_not_submit=True)
 	pr_doc.items[0].store = "Inter Transfer Store 1"
 	pr_doc.submit()
 
@@ -651,9 +680,7 @@
 
 	expene_account = frappe.db.get_value(
 		"Company", company, "stock_adjustment_account"
-	) or frappe.db.get_value(
-		"Account", {"company": company, "account_type": "Expense Account"}, "name"
-	)
+	) or frappe.db.get_value("Account", {"company": company, "account_type": "Expense Account"}, "name")
 
 	return frappe._dict(
 		{
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 6529bb2..879f243 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -891,7 +891,7 @@
  "index_web_pages_for_search": 1,
  "links": [],
  "make_attachments_public": 1,
- "modified": "2024-01-08 18:09:30.225085",
+ "modified": "2024-03-27 13:09:53.380997",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item",
@@ -959,7 +959,7 @@
  "search_fields": "item_name,description,item_group,customer_code",
  "show_name_in_global_search": 1,
  "show_preview_popup": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "item_name",
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 949c109..063b28d 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -3,7 +3,6 @@
 
 import copy
 import json
-from typing import Dict, List, Optional
 
 import frappe
 from frappe import _
@@ -375,9 +374,9 @@
 		for d in self.get("uoms"):
 			if cstr(d.uom) in check_list:
 				frappe.throw(
-					_("Unit of Measure {0} has been entered more than once in Conversion Factor Table").format(
-						d.uom
-					)
+					_(
+						"Unit of Measure {0} has been entered more than once in Conversion Factor Table"
+					).format(d.uom)
 				)
 			else:
 				check_list.append(cstr(d.uom))
@@ -429,7 +428,7 @@
 					frappe.throw(
 						_("{0} entered twice {1} in Item Taxes").format(
 							frappe.bold(d.item_tax_template),
-							"for tax category {0}".format(frappe.bold(d.tax_category)) if d.tax_category else "",
+							f"for tax category {frappe.bold(d.tax_category)}" if d.tax_category else "",
 						)
 					)
 				else:
@@ -448,7 +447,9 @@
 					)
 					if duplicate:
 						frappe.throw(
-							_("Barcode {0} already used in Item {1}").format(item_barcode.barcode, duplicate[0][0])
+							_("Barcode {0} already used in Item {1}").format(
+								item_barcode.barcode, duplicate[0][0]
+							)
 						)
 
 					item_barcode.barcode_type = (
@@ -477,9 +478,9 @@
 				warehouse_material_request_type += [(d.get("warehouse"), d.get("material_request_type"))]
 			else:
 				frappe.throw(
-					_("Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}.").format(
-						d.idx, d.warehouse, d.material_request_type
-					),
+					_(
+						"Row #{0}: A reorder entry already exists for warehouse {1} with reorder type {2}."
+					).format(d.idx, d.warehouse, d.material_request_type),
 					DuplicateReorderRows,
 				)
 
@@ -547,20 +548,21 @@
 
 		for dt in ("Sales Taxes and Charges", "Purchase Taxes and Charges"):
 			for d in frappe.db.sql(
-				"""select name, item_wise_tax_detail from `tab{0}`
-					where ifnull(item_wise_tax_detail, '') != ''""".format(
-					dt
-				),
+				f"""select name, item_wise_tax_detail from `tab{dt}`
+					where ifnull(item_wise_tax_detail, '') != ''""",
 				as_dict=1,
 			):
-
 				item_wise_tax_detail = json.loads(d.item_wise_tax_detail)
 				if isinstance(item_wise_tax_detail, dict) and old_name in item_wise_tax_detail:
 					item_wise_tax_detail[new_name] = item_wise_tax_detail[old_name]
 					item_wise_tax_detail.pop(old_name)
 
 					frappe.db.set_value(
-						dt, d.name, "item_wise_tax_detail", json.dumps(item_wise_tax_detail), update_modified=False
+						dt,
+						d.name,
+						"item_wise_tax_detail",
+						json.dumps(item_wise_tax_detail),
+						update_modified=False,
 					)
 
 	def delete_old_bins(self, old_name):
@@ -587,9 +589,7 @@
 		)
 
 		msg += " <br>"
-		msg += (
-			", ".join([get_link_to_form("Stock Reconciliation", d.parent) for d in records]) + "<br><br>"
-		)
+		msg += ", ".join([get_link_to_form("Stock Reconciliation", d.parent) for d in records]) + "<br><br>"
 
 		msg += _(
 			"Note: To merge the items, create a separate Stock Reconciliation for the old item {0}"
@@ -612,12 +612,8 @@
 
 	def validate_duplicate_product_bundles_before_merge(self, old_name, new_name):
 		"Block merge if both old and new items have product bundles."
-		old_bundle = frappe.get_value(
-			"Product Bundle", filters={"new_item_code": old_name, "disabled": 0}
-		)
-		new_bundle = frappe.get_value(
-			"Product Bundle", filters={"new_item_code": new_name, "disabled": 0}
-		)
+		old_bundle = frappe.get_value("Product Bundle", filters={"new_item_code": old_name, "disabled": 0})
+		new_bundle = frappe.get_value("Product Bundle", filters={"new_item_code": new_name, "disabled": 0})
 
 		if old_bundle and new_bundle:
 			bundle_link = get_link_to_form("Product Bundle", old_bundle)
@@ -635,9 +631,7 @@
 	def recalculate_bin_qty(self, new_name):
 		from erpnext.stock.stock_balance import repost_stock
 
-		existing_allow_negative_stock = frappe.db.get_single_value(
-			"Stock Settings", "allow_negative_stock"
-		)
+		existing_allow_negative_stock = frappe.db.get_single_value("Stock Settings", "allow_negative_stock")
 		frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
 
 		repost_stock_for_warehouses = frappe.get_all(
@@ -654,9 +648,7 @@
 		for warehouse in repost_stock_for_warehouses:
 			repost_stock(new_name, warehouse)
 
-		frappe.db.set_single_value(
-			"Stock Settings", "allow_negative_stock", existing_allow_negative_stock
-		)
+		frappe.db.set_single_value("Stock Settings", "allow_negative_stock", existing_allow_negative_stock)
 
 	def update_bom_item_desc(self):
 		if self.is_new():
@@ -817,12 +809,10 @@
 			return "<br>".join(docnames)
 
 		def table_row(title, body):
-			return """<tr>
-				<td>{0}</td>
-				<td>{1}</td>
-			</tr>""".format(
-				title, body
-			)
+			return f"""<tr>
+				<td>{title}</td>
+				<td>{body}</td>
+			</tr>"""
 
 		rows = ""
 		for docname, attr_list in not_included.items():
@@ -834,17 +824,15 @@
 		)
 
 		message = """
-			<div>{0}</div><br>
+			<div>{}</div><br>
 			<table class="table">
 				<thead>
-					<td>{1}</td>
-					<td>{2}</td>
+					<td>{}</td>
+					<td>{}</td>
 				</thead>
-				{3}
+				{}
 			</table>
-		""".format(
-			error_description, _("Variant Items"), _("Attributes"), rows
-		)
+		""".format(error_description, _("Variant Items"), _("Attributes"), rows)
 
 		frappe.throw(message, title=_("Variant Attribute Error"), is_minimizable=True, wide=True)
 
@@ -974,7 +962,7 @@
 
 			frappe.throw(msg, title=_("Linked with submitted documents"))
 
-	def _get_linked_submitted_documents(self, changed_fields: List[str]) -> Optional[Dict[str, str]]:
+	def _get_linked_submitted_documents(self, changed_fields: list[str]) -> dict[str, str] | None:
 		linked_doctypes = [
 			"Delivery Note Item",
 			"Sales Invoice Item",
@@ -1163,17 +1151,13 @@
 		last_purchase_receipt and last_purchase_receipt[0].posting_date or "1900-01-01"
 	)
 
-	if last_purchase_order and (
-		purchase_order_date >= purchase_receipt_date or not last_purchase_receipt
-	):
+	if last_purchase_order and (purchase_order_date >= purchase_receipt_date or not last_purchase_receipt):
 		# use purchase order
 
 		last_purchase = last_purchase_order[0]
 		purchase_date = purchase_order_date
 
-	elif last_purchase_receipt and (
-		purchase_receipt_date > purchase_order_date or not last_purchase_order
-	):
+	elif last_purchase_receipt and (purchase_receipt_date > purchase_order_date or not last_purchase_order):
 		# use purchase receipt
 		last_purchase = last_purchase_receipt[0]
 		purchase_date = purchase_receipt_date
@@ -1349,7 +1333,7 @@
 			frappe.publish_progress(count / total * 100, title=_("Updating Variants..."))
 
 
-def validate_item_default_company_links(item_defaults: List[ItemDefault]) -> None:
+def validate_item_default_company_links(item_defaults: list[ItemDefault]) -> None:
 	for item_default in item_defaults:
 		for doctype, field in [
 			["Warehouse", "default_warehouse"],
diff --git a/erpnext/stock/doctype/item/test_item.py b/erpnext/stock/doctype/item/test_item.py
index b237f73..a0ed1f2 100644
--- a/erpnext/stock/doctype/item/test_item.py
+++ b/erpnext/stock/doctype/item/test_item.py
@@ -315,7 +315,6 @@
 			self.assertEqual(value, purchase_item_details.get(key))
 
 	def test_item_default_validations(self):
-
 		with self.assertRaises(frappe.ValidationError) as ve:
 			make_item(
 				"Bad Item defaults",
@@ -469,9 +468,7 @@
 
 		self.assertFalse(frappe.db.exists("Item", old))
 
-		self.assertTrue(
-			frappe.db.get_value("Bin", {"item_code": new, "warehouse": "_Test Warehouse - _TC"})
-		)
+		self.assertTrue(frappe.db.get_value("Bin", {"item_code": new, "warehouse": "_Test Warehouse - _TC"}))
 		self.assertTrue(
 			frappe.db.get_value("Bin", {"item_code": new, "warehouse": "_Test Warehouse 1 - _TC"})
 		)
@@ -729,9 +726,7 @@
 
 	@change_settings("Stock Settings", {"sample_retention_warehouse": "_Test Warehouse - _TC"})
 	def test_retain_sample(self):
-		item = make_item(
-			"_TestRetainSample", {"has_batch_no": 1, "retain_sample": 1, "sample_quantity": 1}
-		)
+		item = make_item("_TestRetainSample", {"has_batch_no": 1, "retain_sample": 1, "sample_quantity": 1})
 
 		self.assertEqual(item.has_batch_no, 1)
 		self.assertEqual(item.retain_sample, 1)
@@ -804,7 +799,7 @@
 	def test_customer_codes_length(self):
 		"""Check if item code with special characters are allowed."""
 		item = make_item(properties={"item_code": "Test Item Code With Special Characters"})
-		for row in range(3):
+		for _row in range(3):
 			item.append("customer_items", {"ref_code": frappe.generate_hash("", 120)})
 		item.save()
 		self.assertTrue(len(item.customer_code) > 140)
@@ -845,9 +840,7 @@
 		make_property_setter("Item", None, "search_fields", "item_name", "Data", for_doctype="Doctype")
 
 		item = make_item(properties={"item_name": "Test Item", "description": "Test Description"})
-		data = item_query(
-			"Item", "Test Item", "", 0, 20, filters={"item_name": "Test Item"}, as_dict=True
-		)
+		data = item_query("Item", "Test Item", "", 0, 20, filters={"item_name": "Test Item"}, as_dict=True)
 		self.assertEqual(data[0].name, item.name)
 		self.assertEqual(data[0].item_name, item.item_name)
 		self.assertTrue("description" not in data[0])
@@ -855,9 +848,7 @@
 		make_property_setter(
 			"Item", None, "search_fields", "item_name, description", "Data", for_doctype="Doctype"
 		)
-		data = item_query(
-			"Item", "Test Item", "", 0, 20, filters={"item_name": "Test Item"}, as_dict=True
-		)
+		data = item_query("Item", "Test Item", "", 0, 20, filters={"item_name": "Test Item"}, as_dict=True)
 		self.assertEqual(data[0].name, item.name)
 		self.assertEqual(data[0].item_name, item.item_name)
 		self.assertEqual(data[0].description, item.description)
diff --git a/erpnext/stock/doctype/item_alternative/item_alternative.json b/erpnext/stock/doctype/item_alternative/item_alternative.json
index fc3b976..945e94d 100644
--- a/erpnext/stock/doctype/item_alternative/item_alternative.json
+++ b/erpnext/stock/doctype/item_alternative/item_alternative.json
@@ -1,291 +1,102 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-02-26 17:39:11.249778", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-02-26 17:39:11.249778",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "item_code",
+  "alternative_item_code",
+  "two_way",
+  "column_break_4",
+  "item_name",
+  "alternative_item_name"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }, 
+   "fieldname": "item_code",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Code",
+   "options": "Item"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "alternative_item_code", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Alternative Item Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }, 
+   "fieldname": "alternative_item_code",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Alternative Item Code",
+   "options": "Item"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "two_way", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Two-way", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }, 
+   "default": "0",
+   "fieldname": "two_way",
+   "fieldtype": "Check",
+   "label": "Two-way"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "column_break_4", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }, 
+   "fieldname": "column_break_4",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fetch_from": "item_code.item_name",
-   "fieldname": "item_name", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Item Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
-  }, 
+   "fieldname": "item_name",
+   "fieldtype": "Read Only",
+   "label": "Item Name"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
    "fetch_from": "alternative_item_code.item_name",
-   "fieldname": "alternative_item_name", 
-   "fieldtype": "Read Only", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Alternative Item Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0
+   "fieldname": "alternative_item_name",
+   "fieldtype": "Read Only",
+   "label": "Alternative Item Name"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-05-16 22:43:35.377291",
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item Alternative", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:09:53.809482",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Alternative",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Stock User", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Stock User",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Stock Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Stock Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "Item Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "Item Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "title_field": "item_code", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "title_field": "item_code",
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_alternative/item_alternative.py b/erpnext/stock/doctype/item_alternative/item_alternative.py
index 83bee9c..a73a82f 100644
--- a/erpnext/stock/doctype/item_alternative/item_alternative.py
+++ b/erpnext/stock/doctype/item_alternative/item_alternative.py
@@ -45,9 +45,7 @@
 			"allow_alternative_item",
 		]
 		item_data = frappe.db.get_value("Item", self.item_code, fields, as_dict=1)
-		alternative_item_data = frappe.db.get_value(
-			"Item", self.alternative_item_code, fields, as_dict=1
-		)
+		alternative_item_data = frappe.db.get_value("Item", self.alternative_item_code, fields, as_dict=1)
 
 		for field in fields:
 			if item_data.get(field) != alternative_item_data.get(field):
@@ -87,14 +85,12 @@
 @frappe.validate_and_sanitize_search_inputs
 def get_alternative_items(doctype, txt, searchfield, start, page_len, filters):
 	return frappe.db.sql(
-		""" (select alternative_item_code from `tabItem Alternative`
+		f""" (select alternative_item_code from `tabItem Alternative`
 			where item_code = %(item_code)s and alternative_item_code like %(txt)s)
 		union
 			(select item_code from `tabItem Alternative`
 			where alternative_item_code = %(item_code)s and item_code like %(txt)s
-			and two_way = 1) limit {1} offset {0}
-		""".format(
-			start, page_len
-		),
+			and two_way = 1) limit {page_len} offset {start}
+		""",
 		{"item_code": filters.get("item_code"), "txt": "%" + txt + "%"},
 	)
diff --git a/erpnext/stock/doctype/item_alternative/test_item_alternative.py b/erpnext/stock/doctype/item_alternative/test_item_alternative.py
index 1996418..11e45ee 100644
--- a/erpnext/stock/doctype/item_alternative/test_item_alternative.py
+++ b/erpnext/stock/doctype/item_alternative/test_item_alternative.py
@@ -54,9 +54,7 @@
 				"fg_item_qty": 5,
 			},
 		]
-		sco = get_subcontracting_order(
-			service_items=service_items, supplier_warehouse=supplier_warehouse
-		)
+		sco = get_subcontracting_order(service_items=service_items, supplier_warehouse=supplier_warehouse)
 		rm_items = [
 			{
 				"item_code": "Test Finished Goods - A",
@@ -106,9 +104,7 @@
 			"reserved_qty_for_sub_contract",
 		)
 
-		self.assertEqual(
-			after_transfer_reserved_qty_for_sub_contract, flt(reserved_qty_for_sub_contract - 5)
-		)
+		self.assertEqual(after_transfer_reserved_qty_for_sub_contract, flt(reserved_qty_for_sub_contract - 5))
 
 		scr = make_subcontracting_receipt(sco.name)
 		scr.save()
@@ -159,9 +155,7 @@
 			"reserved_qty_for_production",
 		)
 
-		self.assertEqual(
-			reserved_qty_for_production_after_transfer, flt(reserved_qty_for_production - 5)
-		)
+		self.assertEqual(reserved_qty_for_production_after_transfer, flt(reserved_qty_for_production - 5))
 		ste1 = frappe.get_doc(make_stock_entry(pro_order.name, "Manufacture", 5))
 
 		status = False
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.json b/erpnext/stock/doctype/item_attribute/item_attribute.json
index 5c46789..d0220a2 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.json
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.json
@@ -75,7 +75,7 @@
  "icon": "fa fa-edit",
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-10-02 12:03:02.359202",
+ "modified": "2024-03-27 13:09:53.963494",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Attribute",
@@ -91,7 +91,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.py b/erpnext/stock/doctype/item_attribute/item_attribute.py
index 7b341b2..04421d6 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.py
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.py
@@ -93,7 +93,9 @@
 		values, abbrs = [], []
 		for d in self.item_attribute_values:
 			if d.attribute_value.lower() in map(str.lower, values):
-				frappe.throw(_("Attribute value: {0} must appear only once").format(d.attribute_value.title()))
+				frappe.throw(
+					_("Attribute value: {0} must appear only once").format(d.attribute_value.title())
+				)
 			values.append(d.attribute_value)
 
 			if d.abbr.lower() in map(str.lower, abbrs):
diff --git a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
index 2807600..2e6f84f 100644
--- a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
+++ b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
@@ -1,90 +1,42 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2014-09-26 03:52:31.161255", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2014-09-26 03:52:31.161255",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "attribute_value",
+  "abbr"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "attribute_value", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Attribute Value", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "attribute_value",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Attribute Value",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "This will be appended to the Item Code of the variant. For example, if your abbreviation is \"SM\", and the item code is \"T-SHIRT\", the item code of the variant will be \"T-SHIRT-SM\"", 
-   "fieldname": "abbr", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Abbreviation", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "unique": 0
+   "description": "This will be appended to the Item Code of the variant. For example, if your abbreviation is \"SM\", and the item code is \"T-SHIRT\", the item code of the variant will be \"T-SHIRT-SM\"",
+   "fieldname": "abbr",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Abbreviation",
+   "reqd": 1,
+   "search_index": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "fa fa-edit", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-07-11 03:28:00.926419", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item Attribute Value", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
+ ],
+ "icon": "fa fa-edit",
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:09:54.109874",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Attribute Value",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_barcode/item_barcode.json b/erpnext/stock/doctype/item_barcode/item_barcode.json
index d9a8347..513f712 100644
--- a/erpnext/stock/doctype/item_barcode/item_barcode.json
+++ b/erpnext/stock/doctype/item_barcode/item_barcode.json
@@ -37,14 +37,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-08-24 19:59:47.871677",
+ "modified": "2024-03-27 13:09:54.217164",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Barcode",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/item_customer_detail/item_customer_detail.json b/erpnext/stock/doctype/item_customer_detail/item_customer_detail.json
index c0305a9..e83e7ae 100644
--- a/erpnext/stock/doctype/item_customer_detail/item_customer_detail.json
+++ b/erpnext/stock/doctype/item_customer_detail/item_customer_detail.json
@@ -1,139 +1,64 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0,
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "beta": 0, 
- "creation": "2013-03-08 15:37:16", 
- "custom": 0, 
- "description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 1, 
+ "actions": [],
+ "autoname": "hash",
+ "creation": "2013-03-08 15:37:16",
+ "description": "For the convenience of customers, these codes can be used in print formats like Invoices and Delivery Notes",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "customer_name",
+  "customer_group",
+  "ref_code"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
-   "bold": 1, 
-   "collapsible": 0, 
-   "columns": 0,
-   "fieldname": "customer_name", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_global_search": 0,
-   "in_list_view": 1, 
-   "in_standard_filter": 0,
-   "label": "Customer Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "price_list_name", 
-   "oldfieldtype": "Select", 
-   "options": "Customer", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "180px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0,
-   "report_hide": 0, 
-   "reqd": 0,
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0, 
-   "width": "180px"
-  }, 
-  {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0, 
    "bold": 1,
-   "collapsible": 0,
-   "columns": 0,
-   "fieldname": "customer_group",
+   "fieldname": "customer_name",
    "fieldtype": "Link",
-   "hidden": 0,
-   "ignore_user_permissions": 0,
-   "ignore_xss_filter": 0,
    "in_filter": 1,
-   "in_global_search": 0,
    "in_list_view": 1,
-   "in_standard_filter": 0,
-   "label": "Customer Group",
-   "length": 0,
-   "no_copy": 0,
-   "options": "Customer Group",
-   "permlevel": 0,
-   "precision": "",
-   "print_hide": 0,
-   "print_hide_if_no_value": 0,
-   "read_only": 0,
-   "remember_last_selected_value": 0,
-   "report_hide": 0,
-   "reqd": 0,
-   "search_index": 0,
-   "set_only_once": 0,
-   "translatable": 0,
-   "unique": 0
+   "label": "Customer Name",
+   "oldfieldname": "price_list_name",
+   "oldfieldtype": "Select",
+   "options": "Customer",
+   "print_width": "180px",
+   "search_index": 1,
+   "width": "180px"
   },
   {
-   "allow_bulk_edit": 0,
-   "allow_on_submit": 0,
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0,
-   "fieldname": "ref_code", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 1, 
-   "in_global_search": 0,
-   "in_list_view": 1, 
-   "in_standard_filter": 0,
-   "label": "Ref Code", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "ref_rate", 
-   "oldfieldtype": "Currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "120px", 
-   "read_only": 0, 
-   "remember_last_selected_value": 0,
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 1, 
-   "set_only_once": 0, 
-   "translatable": 0,
-   "unique": 0, 
+   "bold": 1,
+   "fieldname": "customer_group",
+   "fieldtype": "Link",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Customer Group",
+   "options": "Customer Group"
+  },
+  {
+   "fieldname": "ref_code",
+   "fieldtype": "Data",
+   "in_filter": 1,
+   "in_list_view": 1,
+   "label": "Ref Code",
+   "oldfieldname": "ref_rate",
+   "oldfieldtype": "Currency",
+   "print_width": "120px",
+   "reqd": 1,
+   "search_index": 1,
    "width": "120px"
   }
- ], 
- "has_web_view": 0,
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-03-08 14:22:38.019369",
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item Customer Detail", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0,
- "track_changes": 0,
- "track_seen": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:09:54.332166",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Customer Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_default/item_default.json b/erpnext/stock/doctype/item_default/item_default.json
index 2895661..c3a2244 100644
--- a/erpnext/stock/doctype/item_default/item_default.json
+++ b/erpnext/stock/doctype/item_default/item_default.json
@@ -139,14 +139,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-09-04 12:33:14.607267",
+ "modified": "2024-03-27 13:09:54.445015",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Default",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/item_manufacturer/item_manufacturer.json b/erpnext/stock/doctype/item_manufacturer/item_manufacturer.json
index 0cef6ea..ac16a60 100644
--- a/erpnext/stock/doctype/item_manufacturer/item_manufacturer.json
+++ b/erpnext/stock/doctype/item_manufacturer/item_manufacturer.json
@@ -64,7 +64,7 @@
   }
  ],
  "links": [],
- "modified": "2020-04-07 20:25:55.507905",
+ "modified": "2024-03-27 13:09:54.784023",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Manufacturer",
@@ -108,8 +108,9 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
+ "states": [],
  "title_field": "item_code",
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_manufacturer/item_manufacturer.py b/erpnext/stock/doctype/item_manufacturer/item_manufacturer.py
index ed004d5..715f09b 100644
--- a/erpnext/stock/doctype/item_manufacturer/item_manufacturer.py
+++ b/erpnext/stock/doctype/item_manufacturer/item_manufacturer.py
@@ -57,7 +57,9 @@
 			# if unchecked and default in Item master, clear it.
 			if default_manufacturer == self.manufacturer and default_part_no == self.manufacturer_part_no:
 				frappe.db.set_value(
-					"Item", item.name, {"default_item_manufacturer": None, "default_manufacturer_part_no": None}
+					"Item",
+					item.name,
+					{"default_item_manufacturer": None, "default_manufacturer_part_no": None},
 				)
 
 		elif self.is_default:
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index bf944a4..fbb448c 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -221,7 +221,7 @@
  "idx": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-03-13 12:23:39.630290",
+ "modified": "2024-03-27 13:09:54.930834",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Price",
@@ -256,7 +256,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "title_field": "item_name",
diff --git a/erpnext/stock/doctype/item_price/item_price.py b/erpnext/stock/doctype/item_price/item_price.py
index 25a28b4..ccdf1a0 100644
--- a/erpnext/stock/doctype/item_price/item_price.py
+++ b/erpnext/stock/doctype/item_price/item_price.py
@@ -55,6 +55,11 @@
 		if not frappe.db.exists("Item", self.item_code):
 			frappe.throw(_("Item {0} not found.").format(self.item_code))
 
+		if self.uom and not frappe.db.exists(
+			"UOM Conversion Detail", {"parenttype": "Item", "parent": self.item_code, "uom": self.uom}
+		):
+			frappe.throw(_("UOM {0} not found in Item {1}").format(self.uom, self.item_code))
+
 	def update_price_list_details(self):
 		if self.price_list:
 			price_list_details = frappe.db.get_value(
@@ -63,7 +68,7 @@
 
 			if not price_list_details:
 				link = frappe.utils.get_link_to_form("Price List", self.price_list)
-				frappe.throw("The price list {0} does not exist or is disabled".format(link))
+				frappe.throw(f"The price list {link} does not exist or is disabled")
 
 			self.buying, self.selling, self.currency = price_list_details
 
@@ -80,7 +85,6 @@
 			frappe.throw(_(msg))
 
 	def check_duplicates(self):
-
 		item_price = frappe.qb.DocType("Item Price")
 
 		query = (
diff --git a/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
index 5de45cb..57c7ac8 100644
--- a/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
+++ b/erpnext/stock/doctype/item_quality_inspection_parameter/item_quality_inspection_parameter.json
@@ -90,12 +90,13 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-08-06 15:08:20.911338",
+ "modified": "2024-03-27 13:09:55.104213",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Quality Inspection Parameter",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_reorder/item_reorder.json b/erpnext/stock/doctype/item_reorder/item_reorder.json
index a03bd45..e974232 100644
--- a/erpnext/stock/doctype/item_reorder/item_reorder.json
+++ b/erpnext/stock/doctype/item_reorder/item_reorder.json
@@ -1,161 +1,66 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "beta": 0, 
- "creation": "2013-03-07 11:42:59", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Setup", 
- "editable_grid": 1, 
+ "actions": [],
+ "autoname": "hash",
+ "creation": "2013-03-07 11:42:59",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "warehouse_group",
+  "warehouse",
+  "warehouse_reorder_level",
+  "warehouse_reorder_qty",
+  "material_request_type"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "warehouse_group", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Check in (group)", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "warehouse_group",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Check in (group)",
+   "options": "Warehouse"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "warehouse", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Request for", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Warehouse", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "warehouse",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Request for",
+   "options": "Warehouse",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "warehouse_reorder_level", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Re-order Level", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "warehouse_reorder_level",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Re-order Level"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "warehouse_reorder_qty", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Re-order Qty", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "warehouse_reorder_qty",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Re-order Qty"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "material_request_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Material Request Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Purchase\nTransfer\nMaterial Issue\nManufacture", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "material_request_type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Material Request Type",
+   "options": "Purchase\nTransfer\nMaterial Issue\nManufacture",
+   "reqd": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 1, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2023-06-21 15:13:38.270046", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item Reorder", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_order": "ASC", 
- "track_seen": 0
-}
+ ],
+ "idx": 1,
+ "in_create": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:09:55.227275",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Reorder",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "ASC",
+ "states": []
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_supplier/item_supplier.json b/erpnext/stock/doctype/item_supplier/item_supplier.json
index 84649a6..d8fe015 100644
--- a/erpnext/stock/doctype/item_supplier/item_supplier.json
+++ b/erpnext/stock/doctype/item_supplier/item_supplier.json
@@ -30,13 +30,13 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2022-09-07 12:33:55.780062",
+ "modified": "2024-03-27 13:09:55.339052",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Supplier",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/item_tax/item_tax.json b/erpnext/stock/doctype/item_tax/item_tax.json
index fb10096..685ae10 100644
--- a/erpnext/stock/doctype/item_tax/item_tax.json
+++ b/erpnext/stock/doctype/item_tax/item_tax.json
@@ -53,12 +53,13 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-06-03 13:20:06.982303",
+ "modified": "2024-03-27 13:09:55.445934",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Tax",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_variant/item_variant.json b/erpnext/stock/doctype/item_variant/item_variant.json
index 93005c0..9c5c0b5 100644
--- a/erpnext/stock/doctype/item_variant/item_variant.json
+++ b/erpnext/stock/doctype/item_variant/item_variant.json
@@ -1,91 +1,40 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "", 
- "beta": 0, 
- "creation": "2014-09-26 03:54:04.370259", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "Other", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2014-09-26 03:54:04.370259",
+ "doctype": "DocType",
+ "document_type": "Other",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "item_attribute",
+  "item_attribute_value"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "item_attribute", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Item Attribute", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Item Attribute", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "item_attribute",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Attribute",
+   "options": "Item Attribute",
+   "reqd": 1
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "item_attribute_value", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Item Attribute Value", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "item_attribute_value",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Item Attribute Value",
+   "reqd": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "icon": "", 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-07-11 03:28:01.325414", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item Variant", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:09:55.854357",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Variant",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json b/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
index 9699ecb..e180bfe 100644
--- a/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
+++ b/erpnext/stock/doctype/item_variant_attribute/item_variant_attribute.json
@@ -78,13 +78,13 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-07-14 17:15:19.112119",
+ "modified": "2024-03-27 13:09:55.966900",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Item Variant Attribute",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json
index 14808c2..8aea8a4 100644
--- a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json
+++ b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.json
@@ -1,235 +1,77 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2017-08-29 16:38:31.173830", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2017-08-29 16:38:31.173830",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "section_break_3",
+  "do_not_update_variants",
+  "allow_rename_attribute_value",
+  "copy_fields_to_variant",
+  "fields"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "section_break_3", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "section_break_3",
+   "fieldtype": "Section Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "description": "Fields will be copied over only at time of creation.", 
-   "fieldname": "do_not_update_variants", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Do not update variants on save", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "description": "Fields will be copied over only at time of creation.",
+   "fieldname": "do_not_update_variants",
+   "fieldtype": "Check",
+   "label": "Do not update variants on save"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "default": "", 
-   "description": "Rename Attribute Value in Item Attribute.", 
-   "fieldname": "allow_rename_attribute_value", 
-   "fieldtype": "Check", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Allow Rename Attribute Value", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "default": "0",
+   "description": "Rename Attribute Value in Item Attribute.",
+   "fieldname": "allow_rename_attribute_value",
+   "fieldtype": "Check",
+   "label": "Allow Rename Attribute Value"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "copy_fields_to_variant", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Copy Fields to Variant", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "copy_fields_to_variant",
+   "fieldtype": "Section Break",
+   "label": "Copy Fields to Variant"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "fields", 
-   "fieldtype": "Table", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Fields", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Variant Field", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "fields",
+   "fieldtype": "Table",
+   "label": "Fields",
+   "options": "Variant Field"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-02-19 11:39:54.401128", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item Variant Settings", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "issingle": 1,
+ "links": [],
+ "modified": "2024-03-27 13:09:56.095684",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Variant Settings",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
-  }, 
+  },
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 1, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "Item Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "email": 1,
+   "print": 1,
+   "read": 1,
+   "role": "Item Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py
index a4bdc0b..277042c 100644
--- a/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py
+++ b/erpnext/stock/doctype/item_variant_settings/item_variant_settings.py
@@ -1,6 +1,6 @@
 # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
-
+import typing
 
 import frappe
 from frappe import _
@@ -23,7 +23,7 @@
 		fields: DF.Table[VariantField]
 	# end: auto-generated types
 
-	invalid_fields_for_copy_fields_in_variants = ["barcodes"]
+	invalid_fields_for_copy_fields_in_variants: typing.ClassVar[list] = ["barcodes"]
 
 	def set_default_fields(self):
 		self.fields = []
@@ -64,4 +64,6 @@
 	def validate(self):
 		for d in self.fields:
 			if d.field_name in self.invalid_fields_for_copy_fields_in_variants:
-				frappe.throw(_("Cannot set the field <b>{0}</b> for copying in variants").format(d.field_name))
+				frappe.throw(
+					_("Cannot set the field <b>{0}</b> for copying in variants").format(d.field_name)
+				)
diff --git a/erpnext/stock/doctype/item_website_specification/item_website_specification.json b/erpnext/stock/doctype/item_website_specification/item_website_specification.json
index 618c9f0..fec1ec4 100644
--- a/erpnext/stock/doctype/item_website_specification/item_website_specification.json
+++ b/erpnext/stock/doctype/item_website_specification/item_website_specification.json
@@ -1,86 +1,42 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2013-02-22 01:28:01", 
- "custom": 0, 
- "description": "Table for Item that will be shown in Web Site", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2013-02-22 01:28:01",
+ "description": "Table for Item that will be shown in Web Site",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "label",
+  "description"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "label", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Label", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "150px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "fieldname": "label",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Label",
+   "print_width": "150px",
    "width": "150px"
-  }, 
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "description", 
-   "fieldtype": "Text Editor", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Description", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "print_width": "300px", 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0, 
+   "fieldname": "description",
+   "fieldtype": "Text Editor",
+   "in_list_view": 1,
+   "label": "Description",
+   "print_width": "300px",
    "width": "300px"
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-07-11 03:28:01.497513", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Item Website Specification", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "track_seen": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:09:56.223492",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Website Specification",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json b/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
index c77b993..86d65fd 100644
--- a/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
+++ b/erpnext/stock/doctype/landed_cost_item/landed_cost_item.json
@@ -30,8 +30,6 @@
    "options": "Item",
    "read_only": 1,
    "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1,
    "width": "100px"
   },
   {
@@ -44,8 +42,6 @@
    "print_width": "300px",
    "read_only": 1,
    "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1,
    "width": "120px"
   },
   {
@@ -55,9 +51,7 @@
    "no_copy": 1,
    "options": "Purchase Invoice\nPurchase Receipt",
    "print_hide": 1,
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only": 1
   },
   {
    "fieldname": "receipt_document",
@@ -66,33 +60,25 @@
    "no_copy": 1,
    "options": "receipt_document_type",
    "print_hide": 1,
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only": 1
   },
   {
    "fieldname": "col_break2",
-   "fieldtype": "Column Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Column Break"
   },
   {
    "fieldname": "qty",
    "fieldtype": "Float",
    "in_list_view": 1,
    "label": "Qty",
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only": 1
   },
   {
    "fieldname": "rate",
    "fieldtype": "Currency",
    "label": "Rate",
    "options": "Company:company:default_currency",
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only": 1
   },
   {
    "fieldname": "amount",
@@ -103,9 +89,7 @@
    "oldfieldtype": "Currency",
    "options": "Company:company:default_currency",
    "read_only": 1,
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "fieldname": "applicable_charges",
@@ -113,9 +97,7 @@
    "in_list_view": 1,
    "label": "Applicable Charges",
    "options": "Company:company:default_currency",
-   "read_only_depends_on": "eval:parent.distribute_charges_based_on != 'Distribute Manually'",
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only_depends_on": "eval:parent.distribute_charges_based_on != 'Distribute Manually'"
   },
   {
    "fieldname": "purchase_receipt_item",
@@ -124,30 +106,22 @@
    "label": "Purchase Receipt Item",
    "no_copy": 1,
    "print_hide": 1,
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only": 1
   },
   {
    "fieldname": "cost_center",
    "fieldtype": "Link",
    "label": "Cost Center",
-   "options": "Cost Center",
-   "show_days": 1,
-   "show_seconds": 1
+   "options": "Cost Center"
   },
   {
    "fieldname": "accounting_dimensions_section",
    "fieldtype": "Section Break",
-   "label": "Accounting Dimensions",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Accounting Dimensions"
   },
   {
    "fieldname": "dimension_col_break",
-   "fieldtype": "Column Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Column Break"
   },
   {
    "default": "0",
@@ -156,20 +130,19 @@
    "fieldtype": "Check",
    "hidden": 1,
    "label": "Is Fixed Asset",
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only": 1
   }
  ],
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-01-25 23:09:23.322282",
+ "modified": "2024-03-27 13:09:59.220459",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Landed Cost Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json b/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
index 736eb9d..7251534 100644
--- a/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
+++ b/erpnext/stock/doctype/landed_cost_purchase_receipt/landed_cost_purchase_receipt.json
@@ -65,13 +65,13 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-26 18:41:06.281750",
+ "modified": "2024-03-27 13:09:59.363367",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Landed Cost Purchase Receipt",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
index 9c59c13..df5c0f9 100644
--- a/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
+++ b/erpnext/stock/doctype/landed_cost_taxes_and_charges/landed_cost_taxes_and_charges.json
@@ -67,12 +67,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-05-17 13:57:10.807980",
+ "modified": "2024-03-27 13:09:59.493991",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Landed Cost Taxes and Charges",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
index 059f925..10fc6c9 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
@@ -34,9 +34,7 @@
    "options": "MAT-LCV-.YYYY.-",
    "print_hide": 1,
    "reqd": 1,
-   "set_only_once": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "set_only_once": 1
   },
   {
    "fieldname": "company",
@@ -46,32 +44,24 @@
    "label": "Company",
    "options": "Company",
    "remember_last_selected_value": 1,
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "fieldname": "purchase_receipts",
    "fieldtype": "Table",
    "label": "Purchase Receipts",
    "options": "Landed Cost Purchase Receipt",
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "fieldname": "purchase_receipt_items",
    "fieldtype": "Section Break",
-   "label": "Purchase Receipt Items",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Purchase Receipt Items"
   },
   {
    "fieldname": "get_items_from_purchase_receipts",
    "fieldtype": "Button",
-   "label": "Get Items From Purchase Receipts",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Get Items From Purchase Receipts"
   },
   {
    "fieldname": "items",
@@ -79,31 +69,23 @@
    "label": "Purchase Receipt Items",
    "no_copy": 1,
    "options": "Landed Cost Item",
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "fieldname": "sec_break1",
    "fieldtype": "Section Break",
-   "label": "Applicable Charges",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Applicable Charges"
   },
   {
    "fieldname": "taxes",
    "fieldtype": "Table",
    "label": "Taxes and Charges",
    "options": "Landed Cost Taxes and Charges",
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "fieldname": "section_break_9",
-   "fieldtype": "Section Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Section Break"
   },
   {
    "fieldname": "total_taxes_and_charges",
@@ -111,24 +93,18 @@
    "label": "Total Taxes and Charges (Company Currency)",
    "options": "Company:company:default_currency",
    "read_only": 1,
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "fieldname": "col_break1",
-   "fieldtype": "Column Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Column Break"
   },
   {
    "fieldname": "distribute_charges_based_on",
    "fieldtype": "Select",
    "label": "Distribute Charges Based On",
    "options": "Qty\nAmount\nDistribute Manually",
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "fieldname": "amended_from",
@@ -137,51 +113,39 @@
    "no_copy": 1,
    "options": "Landed Cost Voucher",
    "print_hide": 1,
-   "read_only": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "read_only": 1
   },
   {
    "fieldname": "sec_break2",
-   "fieldtype": "Section Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Section Break"
   },
   {
    "fieldname": "landed_cost_help",
    "fieldtype": "HTML",
-   "label": "Landed Cost Help",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Landed Cost Help"
   },
   {
    "fieldname": "column_break_2",
-   "fieldtype": "Column Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Column Break"
   },
   {
    "default": "Today",
    "fieldname": "posting_date",
    "fieldtype": "Date",
    "label": "Posting Date",
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   },
   {
    "fieldname": "section_break_5",
    "fieldtype": "Section Break",
-   "hide_border": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "hide_border": 1
   }
  ],
  "icon": "icon-usd",
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2021-01-25 23:07:30.468423",
+ "modified": "2024-03-27 13:09:59.624249",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Landed Cost Voucher",
@@ -202,6 +166,7 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "DESC"
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
index baff540..5e5efb5 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.py
@@ -103,13 +103,13 @@
 		for d in self.get("purchase_receipts"):
 			docstatus = frappe.db.get_value(d.receipt_document_type, d.receipt_document, "docstatus")
 			if docstatus != 1:
-				msg = (
-					f"Row {d.idx}: {d.receipt_document_type} {frappe.bold(d.receipt_document)} must be submitted"
-				)
+				msg = f"Row {d.idx}: {d.receipt_document_type} {frappe.bold(d.receipt_document)} must be submitted"
 				frappe.throw(_(msg), title=_("Invalid Document"))
 
 			if d.receipt_document_type == "Purchase Invoice":
-				update_stock = frappe.db.get_value(d.receipt_document_type, d.receipt_document, "update_stock")
+				update_stock = frappe.db.get_value(
+					d.receipt_document_type, d.receipt_document, "update_stock"
+				)
 				if not update_stock:
 					msg = _("Row {0}: Purchase Invoice {1} has no stock impact.").format(
 						d.idx, frappe.bold(d.receipt_document)
@@ -159,7 +159,8 @@
 					)
 
 				item.applicable_charges = flt(
-					flt(item.get(based_on_field)) * (flt(self.total_taxes_and_charges) / flt(total_item_cost)),
+					flt(item.get(based_on_field))
+					* (flt(self.total_taxes_and_charges) / flt(total_item_cost)),
 					item.precision("applicable_charges"),
 				)
 				total_charges += item.applicable_charges
@@ -257,7 +258,9 @@
 		for item in self.get("items"):
 			if item.is_fixed_asset:
 				receipt_document_type = (
-					"purchase_invoice" if item.receipt_document_type == "Purchase Invoice" else "purchase_receipt"
+					"purchase_invoice"
+					if item.receipt_document_type == "Purchase Invoice"
+					else "purchase_receipt"
 				)
 				docs = frappe.db.get_all(
 					"Asset",
@@ -280,9 +283,7 @@
 							frappe.throw(
 								_(
 									"{0} <b>{1}</b> has submitted Assets. Remove Item <b>{2}</b> from table to continue."
-								).format(
-									item.receipt_document_type, item.receipt_document, item.item_code
-								)
+								).format(item.receipt_document_type, item.receipt_document, item.item_code)
 							)
 
 	def update_rate_in_serial_no_for_non_asset_items(self, receipt_document):
@@ -291,10 +292,10 @@
 				serial_nos = get_serial_nos(item.serial_no)
 				if serial_nos:
 					frappe.db.sql(
-						"update `tabSerial No` set purchase_rate=%s where name in ({0})".format(
+						"update `tabSerial No` set purchase_rate=%s where name in ({})".format(
 							", ".join(["%s"] * len(serial_nos))
 						),
-						tuple([item.valuation_rate] + serial_nos),
+						tuple([item.valuation_rate, *serial_nos]),
 					)
 
 
diff --git a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
index 4058aa8..9ec2d69 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
+++ b/erpnext/stock/doctype/landed_cost_voucher/test_landed_cost_voucher.py
@@ -16,9 +16,7 @@
 	make_purchase_receipt,
 )
 from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
-	get_batch_from_bundle,
 	get_serial_nos_from_bundle,
-	make_serial_batch_bundle,
 )
 from erpnext.stock.serial_batch_bundle import SerialNoValuation
 
@@ -68,9 +66,7 @@
 			as_dict=1,
 		)
 
-		self.assertEqual(
-			last_sle.qty_after_transaction, last_sle_after_landed_cost.qty_after_transaction
-		)
+		self.assertEqual(last_sle.qty_after_transaction, last_sle_after_landed_cost.qty_after_transaction)
 		self.assertEqual(last_sle_after_landed_cost.stock_value - last_sle.stock_value, 25.0)
 
 		# assert after submit
@@ -93,7 +89,6 @@
 		self.assertPurchaseReceiptLCVGLEntries(pr)
 
 	def assertPurchaseReceiptLCVGLEntries(self, pr):
-
 		gl_entries = get_gl_entries("Purchase Receipt", pr.name)
 
 		self.assertTrue(gl_entries)
@@ -176,9 +171,7 @@
 			as_dict=1,
 		)
 
-		self.assertEqual(
-			last_sle.qty_after_transaction, last_sle_after_landed_cost.qty_after_transaction
-		)
+		self.assertEqual(last_sle.qty_after_transaction, last_sle_after_landed_cost.qty_after_transaction)
 		self.assertEqual(last_sle_after_landed_cost.stock_value - last_sle.stock_value, 50.0)
 
 	def test_landed_cost_voucher_for_zero_purchase_rate(self):
@@ -235,7 +228,6 @@
 		)
 
 	def test_landed_cost_voucher_against_purchase_invoice(self):
-
 		pi = make_purchase_invoice(
 			update_stock=1,
 			posting_date=frappe.utils.nowdate(),
@@ -280,9 +272,7 @@
 			as_dict=1,
 		)
 
-		self.assertEqual(
-			last_sle.qty_after_transaction, last_sle_after_landed_cost.qty_after_transaction
-		)
+		self.assertEqual(last_sle.qty_after_transaction, last_sle_after_landed_cost.qty_after_transaction)
 
 		self.assertEqual(last_sle_after_landed_cost.stock_value - last_sle.stock_value, 50.0)
 
@@ -436,7 +426,7 @@
 			do_not_save=True,
 		)
 		pr.items[0].cost_center = "Main - TCP1"
-		for x in range(2):
+		for _x in range(2):
 			pr.append(
 				"items",
 				{
diff --git a/erpnext/stock/doctype/manufacturer/manufacturer.json b/erpnext/stock/doctype/manufacturer/manufacturer.json
index 3a64fbe..1073c70 100644
--- a/erpnext/stock/doctype/manufacturer/manufacturer.json
+++ b/erpnext/stock/doctype/manufacturer/manufacturer.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "field:short_name",
@@ -85,7 +86,8 @@
   }
  ],
  "icon": "fa fa-certificate",
- "modified": "2019-07-06 13:06:47.237014",
+ "links": [],
+ "modified": "2024-03-27 13:10:04.558108",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Manufacturer",
@@ -115,6 +117,8 @@
  ],
  "search_fields": "short_name, full_name",
  "show_name_in_global_search": 1,
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "short_name"
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 25c765b..e3a5df1 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -357,7 +357,7 @@
  "idx": 70,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-09-15 12:07:24.789471",
+ "modified": "2024-03-27 13:10:04.971211",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Material Request",
@@ -376,7 +376,6 @@
    "read": 1,
    "report": 1,
    "role": "Purchase Manager",
-   "set_user_permissions": 1,
    "share": 1,
    "submit": 1,
    "write": 1
@@ -427,7 +426,7 @@
  "quick_entry": 1,
  "search_fields": "status,transaction_date",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "title"
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index ace84f8..b52b169 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -107,13 +107,13 @@
 
 				if actual_so_qty and (flt(so_items[so_no][item]) + already_indented > actual_so_qty):
 					frappe.throw(
-						_("Material Request of maximum {0} can be made for Item {1} against Sales Order {2}").format(
-							actual_so_qty - already_indented, item, so_no
-						)
+						_(
+							"Material Request of maximum {0} can be made for Item {1} against Sales Order {2}"
+						).format(actual_so_qty - already_indented, item, so_no)
 					)
 
 	def validate(self):
-		super(MaterialRequest, self).validate()
+		super().validate()
 
 		self.validate_schedule_date()
 		self.check_for_on_hold_or_closed_status("Sales Order", "sales_order")
@@ -187,12 +187,8 @@
 		self.set_status(update=True, status="Cancelled")
 
 	def check_modified_date(self):
-		mod_db = frappe.db.sql(
-			"""select modified from `tabMaterial Request` where name = %s""", self.name
-		)
-		date_diff = frappe.db.sql(
-			"""select TIMEDIFF('%s', '%s')""" % (mod_db[0][0], cstr(self.modified))
-		)
+		mod_db = frappe.db.sql("""select modified from `tabMaterial Request` where name = %s""", self.name)
+		date_diff = frappe.db.sql(f"""select TIMEDIFF('{mod_db[0][0]}', '{cstr(self.modified)}')""")
 
 		if date_diff and date_diff[0][0]:
 			frappe.throw(_("{0} {1} has been modified. Please refresh.").format(_(self.doctype), self.name))
@@ -276,7 +272,9 @@
 					d.ordered_qty = flt(mr_items_ordered_qty.get(d.name))
 
 					if mr_qty_allowance:
-						allowed_qty = flt((d.qty + (d.qty * (mr_qty_allowance / 100))), d.precision("ordered_qty"))
+						allowed_qty = flt(
+							(d.qty + (d.qty * (mr_qty_allowance / 100))), d.precision("ordered_qty")
+						)
 
 						if d.ordered_qty and d.ordered_qty > allowed_qty:
 							frappe.throw(
@@ -371,9 +369,7 @@
 
 
 def set_missing_values(source, target_doc):
-	if target_doc.doctype == "Purchase Order" and getdate(target_doc.schedule_date) < getdate(
-		nowdate()
-	):
+	if target_doc.doctype == "Purchase Order" and getdate(target_doc.schedule_date) < getdate(nowdate()):
 		target_doc.schedule_date = None
 	target_doc.run_method("set_missing_values")
 	target_doc.run_method("calculate_taxes_and_totals")
@@ -503,9 +499,7 @@
 			target_doc.schedule_date = None
 		target_doc.set(
 			"items",
-			[
-				d for d in target_doc.get("items") if d.get("item_code") in supplier_items and d.get("qty") > 0
-			],
+			[d for d in target_doc.get("items") if d.get("item_code") in supplier_items and d.get("qty") > 0],
 		)
 
 		set_missing_values(source, target_doc)
@@ -557,7 +551,7 @@
 
 	if filters.get("transaction_date"):
 		date = filters.get("transaction_date")[1]
-		conditions += "and mr.transaction_date between '{0}' and '{1}' ".format(date[0], date[1])
+		conditions += f"and mr.transaction_date between '{date[0]}' and '{date[1]}' "
 
 	supplier = filters.get("supplier")
 	supplier_items = get_items_based_on_default_supplier(supplier)
@@ -569,18 +563,18 @@
 		"""select distinct mr.name, transaction_date,company
 		from `tabMaterial Request` mr, `tabMaterial Request Item` mr_item
 		where mr.name = mr_item.parent
-			and mr_item.item_code in ({0})
+			and mr_item.item_code in ({})
 			and mr.material_request_type = 'Purchase'
 			and mr.per_ordered < 99.99
 			and mr.docstatus = 1
 			and mr.status != 'Stopped'
 			and mr.company = %s
-			{1}
+			{}
 		order by mr_item.item_code ASC
-		limit {2} offset {3} """.format(
+		limit {} offset {} """.format(
 			", ".join(["%s"] * len(supplier_items)), conditions, cint(page_len), cint(start)
 		),
-		tuple(supplier_items) + (filters.get("company"),),
+		(*tuple(supplier_items), filters.get("company")),
 		as_dict=1,
 	)
 
@@ -708,7 +702,10 @@
 				"doctype": "Stock Entry",
 				"validation": {
 					"docstatus": ["=", 1],
-					"material_request_type": ["in", ["Material Transfer", "Material Issue", "Customer Provided"]],
+					"material_request_type": [
+						"in",
+						["Material Transfer", "Material Issue", "Customer Provided"],
+					],
 				},
 			},
 			"Material Request Item": {
@@ -738,9 +735,7 @@
 	mr = frappe.get_doc("Material Request", material_request)
 	errors = []
 	work_orders = []
-	default_wip_warehouse = frappe.db.get_single_value(
-		"Manufacturing Settings", "default_wip_warehouse"
-	)
+	default_wip_warehouse = frappe.db.get_single_value("Manufacturing Settings", "default_wip_warehouse")
 
 	for d in mr.items:
 		if (d.stock_qty - d.ordered_qty) > 0:
@@ -788,7 +783,9 @@
 			)
 		else:
 			msgprint(
-				_("The {0} {1} created successfully").format(frappe.bold(_("Work Order")), work_orders_list[0])
+				_("The {0} {1} created successfully").format(
+					frappe.bold(_("Work Order")), work_orders_list[0]
+				)
 			)
 
 	if errors:
diff --git a/erpnext/stock/doctype/material_request/test_material_request.py b/erpnext/stock/doctype/material_request/test_material_request.py
index 48397a3..b383078 100644
--- a/erpnext/stock/doctype/material_request/test_material_request.py
+++ b/erpnext/stock/doctype/material_request/test_material_request.py
@@ -756,9 +756,7 @@
 		self.assertEqual(mr.per_ordered, 100)
 
 	def test_customer_provided_parts_mr(self):
-		create_item(
-			"CUST-0987", is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0
-		)
+		create_item("CUST-0987", is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0)
 		existing_requested_qty = self._get_requested_qty("_Test Customer", "_Test Warehouse - _TC")
 
 		mr = make_material_request(item_code="CUST-0987", material_request_type="Customer Provided")
@@ -822,7 +820,7 @@
 		)
 		comapnywise_mr_list.setdefault(mr2.company, []).append(mr2.name)
 
-		for company, mr_list in comapnywise_mr_list.items():
+		for company, _mr_list in comapnywise_mr_list.items():
 			emails = get_email_list(company)
 
 			self.assertTrue(comapnywise_users[company] in emails)
@@ -840,9 +838,7 @@
 			}
 		).insert()
 
-	in_transit_warehouse = frappe.db.exists(
-		"Warehouse", {"warehouse_type": "Transit", "company": company}
-	)
+	in_transit_warehouse = frappe.db.exists("Warehouse", {"warehouse_type": "Transit", "company": company})
 
 	if not in_transit_warehouse:
 		in_transit_warehouse = (
diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json
index c705d59..7789ee5 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -491,14 +491,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-26 18:30:03.684872",
+ "modified": "2024-03-27 13:10:05.224712",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Material Request Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/packed_item/packed_item.json b/erpnext/stock/doctype/packed_item/packed_item.json
index 1daf679..c4d72d8 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.json
+++ b/erpnext/stock/doctype/packed_item/packed_item.json
@@ -295,13 +295,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-04 16:30:44.263964",
+ "modified": "2024-03-27 13:10:07.966447",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Packed Item",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/packed_item/packed_item.py b/erpnext/stock/doctype/packed_item/packed_item.py
index d81ceaf..081d9c5 100644
--- a/erpnext/stock/doctype/packed_item/packed_item.py
+++ b/erpnext/stock/doctype/packed_item/packed_item.py
@@ -69,9 +69,7 @@
 		return
 
 	parent_items_price, reset = {}, False
-	set_price_from_children = frappe.db.get_single_value(
-		"Selling Settings", "editable_bundle_item_rates"
-	)
+	set_price_from_children = frappe.db.get_single_value("Selling Settings", "editable_bundle_item_rates")
 
 	stale_packed_items_table = get_indexed_packed_items_table(doc)
 
@@ -236,9 +234,7 @@
 	bin = get_packed_item_bin_qty(packing_item.item_code, pi_row.warehouse)
 	pi_row.actual_qty = flt(bin.get("actual_qty"))
 	pi_row.projected_qty = flt(bin.get("projected_qty"))
-	pi_row.use_serial_batch_fields = frappe.db.get_single_value(
-		"Stock Settings", "use_serial_batch_fields"
-	)
+	pi_row.use_serial_batch_fields = frappe.db.get_single_value("Stock Settings", "use_serial_batch_fields")
 
 
 def update_packed_item_price_data(pi_row, item_data, doc):
@@ -293,9 +289,7 @@
 def get_cancelled_doc_packed_item_details(old_packed_items):
 	prev_doc_packed_items_map = {}
 	for items in old_packed_items:
-		prev_doc_packed_items_map.setdefault((items.item_code, items.parent_item), []).append(
-			items.as_dict()
-		)
+		prev_doc_packed_items_map.setdefault((items.item_code, items.parent_item), []).append(items.as_dict())
 	return prev_doc_packed_items_map
 
 
diff --git a/erpnext/stock/doctype/packed_item/test_packed_item.py b/erpnext/stock/doctype/packed_item/test_packed_item.py
index ad06732..24a302f 100644
--- a/erpnext/stock/doctype/packed_item/test_packed_item.py
+++ b/erpnext/stock/doctype/packed_item/test_packed_item.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-from typing import List, Optional, Tuple
 
 import frappe
 from frappe.tests.utils import FrappeTestCase, change_settings
@@ -15,8 +14,8 @@
 
 
 def create_product_bundle(
-	quantities: Optional[List[int]] = None, warehouse: Optional[str] = None
-) -> Tuple[str, List[str]]:
+	quantities: list[int] | None = None, warehouse: str | None = None
+) -> tuple[str, list[str]]:
 	"""Get a new product_bundle for use in tests.
 
 	Create 10x required stock if warehouse is specified.
@@ -169,9 +168,7 @@
 
 		# backdated stock entry
 		for item in self.bundle_items:
-			make_stock_entry(
-				item_code=item, to_warehouse=warehouse, qty=10, rate=200, posting_date=yesterday
-			)
+			make_stock_entry(item_code=item, to_warehouse=warehouse, qty=10, rate=200, posting_date=yesterday)
 
 		# assert correct reposting
 		gles = get_gl_entries(dn.doctype, dn.name)
@@ -182,14 +179,15 @@
 	def assertReturns(self, original, returned):
 		self.assertEqual(len(original), len(returned))
 
-		sort_function = lambda p: (p.parent_item, p.item_code, p.qty)
+		def sort_function(p):
+			return p.parent_item, p.item_code, p.qty
 
-		for sent, returned in zip(
-			sorted(original, key=sort_function), sorted(returned, key=sort_function)
+		for sent_item, returned_item in zip(
+			sorted(original, key=sort_function), sorted(returned, key=sort_function), strict=False
 		):
-			self.assertEqual(sent.item_code, returned.item_code)
-			self.assertEqual(sent.parent_item, returned.parent_item)
-			self.assertEqual(sent.qty, -1 * returned.qty)
+			self.assertEqual(sent_item.item_code, returned_item.item_code)
+			self.assertEqual(sent_item.parent_item, returned_item.parent_item)
+			self.assertEqual(sent_item.qty, -1 * returned_item.qty)
 
 	def test_returning_full_bundles(self):
 		from erpnext.stock.doctype.delivery_note.delivery_note import make_sales_return
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index 86ed794..fae7881 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -176,7 +176,7 @@
  "idx": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-04-28 18:01:37.341619",
+ "modified": "2024-03-27 13:10:08.149919",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Packing Slip",
@@ -256,7 +256,7 @@
  ],
  "search_fields": "delivery_note",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.py b/erpnext/stock/doctype/packing_slip/packing_slip.py
index 88acfe8..8f8e8dc 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.py
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.py
@@ -34,7 +34,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs) -> None:
-		super(PackingSlip, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.status_updater = [
 			{
 				"target_dt": "Delivery Note Item",
@@ -87,9 +87,7 @@
 		"""Validate if case nos overlap. If they do, recommend next case no."""
 
 		if cint(self.from_case_no) <= 0:
-			frappe.throw(
-				_("The 'From Package No.' field must neither be empty nor it's value less than 1.")
-			)
+			frappe.throw(_("The 'From Package No.' field must neither be empty nor it's value less than 1."))
 		elif not self.to_case_no:
 			self.to_case_no = self.from_case_no
 		elif cint(self.to_case_no) < cint(self.from_case_no):
@@ -212,9 +210,8 @@
 	return frappe.db.sql(
 		"""select name, item_name, description from `tabItem`
 				where name in ( select item_code FROM `tabDelivery Note Item`
-	 						where parent= %s)
-	 			and %s like "%s" %s
-	 			limit  %s offset %s """
-		% ("%s", searchfield, "%s", get_match_cond(doctype), "%s", "%s"),
+	 						where parent= {})
+	 			and {} like "{}" {}
+	 			limit  {} offset {} """.format("%s", searchfield, "%s", get_match_cond(doctype), "%s", "%s"),
 		((filters or {}).get("delivery_note"), "%%%s%%" % txt, page_len, start),
 	)
diff --git a/erpnext/stock/doctype/packing_slip/test_packing_slip.py b/erpnext/stock/doctype/packing_slip/test_packing_slip.py
index 96da23d..08c70bf 100644
--- a/erpnext/stock/doctype/packing_slip/test_packing_slip.py
+++ b/erpnext/stock/doctype/packing_slip/test_packing_slip.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
 from frappe.tests.utils import FrappeTestCase
diff --git a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
index 4bd9035..1c5ddb6 100644
--- a/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
+++ b/erpnext/stock/doctype/packing_slip_item/packing_slip_item.json
@@ -138,14 +138,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-04-28 15:00:14.079306",
+ "modified": "2024-03-27 13:10:08.352880",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Packing Slip Item",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/pick_list/pick_list.json b/erpnext/stock/doctype/pick_list/pick_list.json
index 0c47434..a5c0cb8 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.json
+++ b/erpnext/stock/doctype/pick_list/pick_list.json
@@ -196,7 +196,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2024-02-02 16:17:44.877426",
+ "modified": "2024-03-27 13:10:13.177072",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Pick List",
@@ -264,8 +264,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/pick_list/pick_list.py b/erpnext/stock/doctype/pick_list/pick_list.py
index 4eab7e8..56bdca5 100644
--- a/erpnext/stock/doctype/pick_list/pick_list.py
+++ b/erpnext/stock/doctype/pick_list/pick_list.py
@@ -4,7 +4,6 @@
 import json
 from collections import OrderedDict, defaultdict
 from itertools import groupby
-from typing import Dict, List
 
 import frappe
 from frappe import _
@@ -381,9 +380,7 @@
 				),
 			)
 
-			locations = get_items_with_location_and_quantity(
-				item_doc, self.item_location_map, self.docstatus
-			)
+			locations = get_items_with_location_and_quantity(item_doc, self.item_location_map, self.docstatus)
 
 			item_doc.idx = None
 			item_doc.name = None
@@ -437,12 +434,10 @@
 		item_map = OrderedDict()
 		for item in locations:
 			if not item.item_code:
-				frappe.throw("Row #{0}: Item Code is Mandatory".format(item.idx))
+				frappe.throw(f"Row #{item.idx}: Item Code is Mandatory")
 			if not cint(
 				frappe.get_cached_value("Item", item.item_code, "is_stock_item")
-			) and not frappe.db.exists(
-				"Product Bundle", {"new_item_code": item.item_code, "disabled": 0}
-			):
+			) and not frappe.db.exists("Product Bundle", {"new_item_code": item.item_code, "disabled": 0}):
 				continue
 			item_code = item.item_code
 			reference = item.sales_order_item or item.material_request_item
@@ -564,7 +559,7 @@
 
 		return picked_items
 
-	def _get_product_bundles(self) -> Dict[str, str]:
+	def _get_product_bundles(self) -> dict[str, str]:
 		# Dict[so_item_row: item_code]
 		product_bundles = {}
 		for item in self.locations:
@@ -577,13 +572,11 @@
 			)
 		return product_bundles
 
-	def _get_product_bundle_qty_map(self, bundles: List[str]) -> Dict[str, Dict[str, float]]:
+	def _get_product_bundle_qty_map(self, bundles: list[str]) -> dict[str, dict[str, float]]:
 		# bundle_item_code: Dict[component, qty]
 		product_bundle_qty_map = {}
 		for bundle_item_code in bundles:
-			bundle = frappe.get_last_doc(
-				"Product Bundle", {"new_item_code": bundle_item_code, "disabled": 0}
-			)
+			bundle = frappe.get_last_doc("Product Bundle", {"new_item_code": bundle_item_code, "disabled": 0})
 			product_bundle_qty_map[bundle_item_code] = {item.item_code: item.qty for item in bundle.items}
 		return product_bundle_qty_map
 
@@ -617,7 +610,11 @@
 	def has_reserved_stock(self):
 		if self.purpose == "Delivery":
 			for location in self.locations:
-				if location.sales_order and location.sales_order_item and flt(location.stock_reserved_qty) > 0:
+				if (
+					location.sales_order
+					and location.sales_order_item
+					and flt(location.stock_reserved_qty) > 0
+				):
 					return True
 
 		return False
@@ -629,7 +626,7 @@
 		doc.run_method("update_status")
 
 
-def get_picked_items_qty(items) -> List[Dict]:
+def get_picked_items_qty(items) -> list[dict]:
 	pi_item = frappe.qb.DocType("Pick List Item")
 	return (
 		frappe.qb.from_(pi_item)
@@ -659,17 +656,13 @@
 	locations = []
 
 	# if stock qty is zero on submitted entry, show positive remaining qty to recalculate in case of restock.
-	remaining_stock_qty = (
-		item_doc.qty if (docstatus == 1 and item_doc.stock_qty == 0) else item_doc.stock_qty
-	)
+	remaining_stock_qty = item_doc.qty if (docstatus == 1 and item_doc.stock_qty == 0) else item_doc.stock_qty
 
 	while flt(remaining_stock_qty) > 0 and available_locations:
 		item_location = available_locations.pop(0)
 		item_location = frappe._dict(item_location)
 
-		stock_qty = (
-			remaining_stock_qty if item_location.qty >= remaining_stock_qty else item_location.qty
-		)
+		stock_qty = remaining_stock_qty if item_location.qty >= remaining_stock_qty else item_location.qty
 		qty = stock_qty / (item_doc.conversion_factor or 1)
 
 		uom_must_be_whole_number = frappe.get_cached_value("UOM", item_doc.uom, "must_be_whole_number")
@@ -705,7 +698,7 @@
 			if item_location.serial_no:
 				# set remaining serial numbers
 				item_location.serial_no = item_location.serial_no[-int(qty_diff) :]
-			available_locations = [item_location] + available_locations
+			available_locations = [item_location, *available_locations]
 
 	# update available locations for the item
 	item_location_map[item_doc.item_code] = available_locations
@@ -920,9 +913,7 @@
 	rejected_warehouses = get_rejected_warehouses()
 
 	for d in data:
-		if (
-			not consider_rejected_warehouses and rejected_warehouses and d.warehouse in rejected_warehouses
-		):
+		if not consider_rejected_warehouses and rejected_warehouses and d.warehouse in rejected_warehouses:
 			continue
 
 		if d.warehouse not in warehouse_wise_batches:
@@ -1033,8 +1024,7 @@
 			"name": "so_detail",
 			"parent": "against_sales_order",
 		},
-		"condition": lambda doc: abs(doc.delivered_qty) < abs(doc.qty)
-		and doc.delivered_by_supplier != 1,
+		"condition": lambda doc: abs(doc.delivered_qty) < abs(doc.qty) and doc.delivered_by_supplier != 1,
 	}
 
 	for customer in sales_dict:
@@ -1056,7 +1046,6 @@
 
 
 def map_pl_locations(pick_list, item_mapper, delivery_note, sales_order=None):
-
 	for location in pick_list.locations:
 		if location.sales_order != sales_order or location.product_bundle_item:
 			continue
@@ -1087,9 +1076,7 @@
 	delivery_note.customer = frappe.get_value("Sales Order", sales_order, "customer")
 
 
-def add_product_bundles_to_delivery_note(
-	pick_list: "PickList", delivery_note, item_mapper
-) -> None:
+def add_product_bundles_to_delivery_note(pick_list: "PickList", delivery_note, item_mapper) -> None:
 	"""Add product bundles found in pick list to delivery note.
 
 	When mapping pick list items, the bundle item itself isn't part of the
@@ -1167,7 +1154,7 @@
 			& (wo.qty > wo.material_transferred_for_manufacturing)
 			& (wo.docstatus == 1)
 			& (wo.company == filters.get("company"))
-			& (wo.name.like("%{0}%".format(txt)))
+			& (wo.name.like(f"%{txt}%"))
 		)
 		.orderby(Case().when(Locate(txt, wo.name) > 0, Locate(txt, wo.name)).else_(99999))
 		.orderby(wo.name)
@@ -1234,9 +1221,7 @@
 	stock_entry.use_multi_level_bom = work_order.use_multi_level_bom
 	stock_entry.fg_completed_qty = pick_list.for_qty
 	if work_order.bom_no:
-		stock_entry.inspection_required = frappe.db.get_value(
-			"BOM", work_order.bom_no, "inspection_required"
-		)
+		stock_entry.inspection_required = frappe.db.get_value("BOM", work_order.bom_no, "inspection_required")
 
 	is_wip_warehouse_group = frappe.db.get_value("Warehouse", work_order.wip_warehouse, "is_group")
 	if not (is_wip_warehouse_group and work_order.skip_transfer):
diff --git a/erpnext/stock/doctype/pick_list/test_pick_list.py b/erpnext/stock/doctype/pick_list/test_pick_list.py
index cffd0d2..0fe869b 100644
--- a/erpnext/stock/doctype/pick_list/test_pick_list.py
+++ b/erpnext/stock/doctype/pick_list/test_pick_list.py
@@ -319,7 +319,6 @@
 		pr2.cancel()
 
 	def test_pick_list_for_items_from_multiple_sales_orders(self):
-
 		item_code = make_item().name
 		try:
 			frappe.get_doc(
@@ -463,9 +462,7 @@
 
 		self.assertEqual(pick_list.locations[0].qty, delivery_note.items[0].qty)
 		self.assertEqual(pick_list.locations[1].qty, delivery_note.items[1].qty)
-		self.assertEqual(
-			sales_order.items[0].conversion_factor, delivery_note.items[0].conversion_factor
-		)
+		self.assertEqual(sales_order.items[0].conversion_factor, delivery_note.items[0].conversion_factor)
 
 		pick_list.cancel()
 		sales_order.cancel()
@@ -514,7 +511,7 @@
 			_dict(item_code="A", warehouse="X", qty=8, picked_qty=3),
 			_dict(item_code="B", warehouse="Y", qty=6, picked_qty=4),
 		]
-		for expected_item, created_item in zip(expected_items, pl.locations):
+		for expected_item, created_item in zip(expected_items, pl.locations, strict=False):
 			_compare_dicts(expected_item, created_item)
 
 	def test_multiple_dn_creation(self):
@@ -624,9 +621,7 @@
 		pick_list_1.set_item_locations()
 		pick_list_1.submit()
 		create_delivery_note(pick_list_1.name)
-		for dn in frappe.get_all(
-			"Delivery Note", filters={"pick_list": pick_list_1.name}, fields={"name"}
-		):
+		for dn in frappe.get_all("Delivery Note", filters={"pick_list": pick_list_1.name}, fields={"name"}):
 			for dn_item in frappe.get_doc("Delivery Note", dn.name).get("items"):
 				if dn_item.item_code == "_Test Item":
 					self.assertEqual(dn_item.qty, 1)
@@ -728,7 +723,9 @@
 			self.assertTrue(loc.serial_and_batch_bundle)
 
 			data = frappe.get_all(
-				"Serial and Batch Entry", fields=["serial_no"], filters={"parent": loc.serial_and_batch_bundle}
+				"Serial and Batch Entry",
+				fields=["serial_no"],
+				filters={"parent": loc.serial_and_batch_bundle},
 			)
 
 			picked_serial_nos = [d.serial_no for d in data]
@@ -760,7 +757,7 @@
 
 		quantities = [5, 2]
 		bundle, components = create_product_bundle(quantities, warehouse=warehouse)
-		bundle_items = dict(zip(components, quantities))
+		bundle_items = dict(zip(components, quantities, strict=False))
 
 		so = make_sales_order(item_code=bundle, qty=3, rate=42)
 
diff --git a/erpnext/stock/doctype/pick_list_item/pick_list_item.json b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
index 962fa9f..6f6091e 100644
--- a/erpnext/stock/doctype/pick_list_item/pick_list_item.json
+++ b/erpnext/stock/doctype/pick_list_item/pick_list_item.json
@@ -240,14 +240,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-02-04 16:12:16.257951",
+ "modified": "2024-03-27 13:10:13.391216",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Pick List Item",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/price_list/price_list.json b/erpnext/stock/doctype/price_list/price_list.json
index 38cd1ee..e0d00ca 100644
--- a/erpnext/stock/doctype/price_list/price_list.json
+++ b/erpnext/stock/doctype/price_list/price_list.json
@@ -84,7 +84,7 @@
  "idx": 1,
  "links": [],
  "max_attachments": 1,
- "modified": "2024-01-30 14:39:26.328837",
+ "modified": "2024-03-27 13:10:17.226079",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Price List",
@@ -128,7 +128,7 @@
  ],
  "search_fields": "currency",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/price_list_country/price_list_country.json b/erpnext/stock/doctype/price_list_country/price_list_country.json
index a0020c5..5e44abe 100644
--- a/erpnext/stock/doctype/price_list_country/price_list_country.json
+++ b/erpnext/stock/doctype/price_list_country/price_list_country.json
@@ -1,63 +1,31 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2015-09-17 06:49:51.810318", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
+ "actions": [],
+ "creation": "2015-09-17 06:49:51.810318",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "country"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "country", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Country", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "Country", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "country",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Country",
+   "options": "Country",
+   "reqd": 1
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-07-11 03:28:03.978049", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "Price List Country", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:17.401786",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Price List Country",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index b926e98..339d508 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -313,7 +313,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Address",
    "read_only": 1
   },
@@ -352,7 +352,7 @@
   },
   {
    "fieldname": "shipping_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Shipping Address",
    "print_hide": 1,
    "read_only": 1
@@ -1095,7 +1095,7 @@
   },
   {
    "fieldname": "billing_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Billing Address",
    "read_only": 1
   },
@@ -1252,7 +1252,7 @@
  "idx": 261,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-20 16:05:31.713453",
+ "modified": "2024-03-27 13:10:25.441066",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt",
@@ -1315,7 +1315,7 @@
  ],
  "search_fields": "status, posting_date, supplier",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "supplier",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 034dd0a..0eb42b1 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -40,7 +40,7 @@
 		from erpnext.stock.doctype.purchase_receipt_item.purchase_receipt_item import PurchaseReceiptItem
 
 		additional_discount_percentage: DF.Float
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		apply_discount_on: DF.Literal["", "Grand Total", "Net Total"]
 		apply_putaway_rule: DF.Check
@@ -56,7 +56,7 @@
 		base_total: DF.Currency
 		base_total_taxes_and_charges: DF.Currency
 		billing_address: DF.Link | None
-		billing_address_display: DF.SmallText | None
+		billing_address_display: DF.TextEditor | None
 		buying_price_list: DF.Link | None
 		company: DF.Link
 		contact_display: DF.SmallText | None
@@ -109,7 +109,7 @@
 		set_posting_time: DF.Check
 		set_warehouse: DF.Link | None
 		shipping_address: DF.Link | None
-		shipping_address_display: DF.SmallText | None
+		shipping_address_display: DF.TextEditor | None
 		shipping_rule: DF.Link | None
 		status: DF.Literal["", "Draft", "To Bill", "Completed", "Return Issued", "Cancelled", "Closed"]
 		subcontracting_receipt: DF.Link | None
@@ -135,7 +135,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(PurchaseReceipt, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.status_updater = [
 			{
 				"target_dt": "Purchase Order Item",
@@ -228,7 +228,7 @@
 
 	def validate(self):
 		self.validate_posting_time()
-		super(PurchaseReceipt, self).validate()
+		super().validate()
 
 		if self._action != "submit":
 			self.set_status()
@@ -258,15 +258,15 @@
 				# Improves UX by not giving messages of "Assets Created" before throwing error of not finding arbnb account
 				self.get_company_default("asset_received_but_not_billed")
 				get_asset_account(
-					"capital_work_in_progress_account", asset_category=item.asset_category, company=self.company
+					"capital_work_in_progress_account",
+					asset_category=item.asset_category,
+					company=self.company,
 				)
 				break
 
 	def validate_provisional_expense_account(self):
 		provisional_accounting_for_non_stock_items = cint(
-			frappe.db.get_value(
-				"Company", self.company, "enable_provisional_accounting_for_non_stock_items"
-			)
+			frappe.db.get_value("Company", self.company, "enable_provisional_accounting_for_non_stock_items")
 		)
 
 		if not provisional_accounting_for_non_stock_items:
@@ -278,7 +278,7 @@
 				item.provisional_expense_account = default_provisional_account
 
 	def validate_with_previous_doc(self):
-		super(PurchaseReceipt, self).validate_with_previous_doc(
+		super().validate_with_previous_doc(
 			{
 				"Purchase Order": {
 					"ref_dn_field": "purchase_order",
@@ -339,24 +339,20 @@
 		return qty and flt(qty[0][0]) or 0.0
 
 	def get_po_qty_and_warehouse(self, po_detail):
-		po_qty, po_warehouse = frappe.db.get_value(
-			"Purchase Order Item", po_detail, ["qty", "warehouse"]
-		)
+		po_qty, po_warehouse = frappe.db.get_value("Purchase Order Item", po_detail, ["qty", "warehouse"])
 		return po_qty, po_warehouse
 
 	# Check for Closed status
 	def check_on_hold_or_closed_status(self):
 		check_list = []
 		for d in self.get("items"):
-			if (
-				d.meta.get_field("purchase_order") and d.purchase_order and d.purchase_order not in check_list
-			):
+			if d.meta.get_field("purchase_order") and d.purchase_order and d.purchase_order not in check_list:
 				check_list.append(d.purchase_order)
 				check_on_hold_or_closed_status("Purchase Order", d.purchase_order)
 
 	# on submit
 	def on_submit(self):
-		super(PurchaseReceipt, self).on_submit()
+		super().on_submit()
 
 		# Check for Approving Authority
 		frappe.get_doc("Authorization Control").validate_approving_authority(
@@ -390,7 +386,7 @@
 			frappe.throw(_("Purchase Invoice {0} is already submitted").format(self.submit_rv[0][0]))
 
 	def on_cancel(self):
-		super(PurchaseReceipt, self).on_cancel()
+		super().on_cancel()
 
 		self.check_on_hold_or_closed_status()
 		# Check if Purchase Invoice has been submitted against current Purchase Order
@@ -437,9 +433,7 @@
 		)
 
 		provisional_accounting_for_non_stock_items = cint(
-			frappe.db.get_value(
-				"Company", self.company, "enable_provisional_accounting_for_non_stock_items"
-			)
+			frappe.db.get_value("Company", self.company, "enable_provisional_accounting_for_non_stock_items")
 		)
 
 		exchange_rate_map, net_rate_map = get_purchase_document_details(self)
@@ -508,7 +502,6 @@
 						and self.conversion_rate != exchange_rate_map[item.purchase_invoice]
 						and item.net_rate == net_rate_map[item.purchase_invoice_item]
 					):
-
 						discrepancy_caused_by_exchange_rate_difference = (item.qty * item.net_rate) * (
 							exchange_rate_map[item.purchase_invoice] - self.conversion_rate
 						)
@@ -691,10 +684,12 @@
 				elif warehouse_account.get(d.warehouse):
 					stock_value_diff = get_stock_value_difference(self.name, d.name, d.warehouse)
 					stock_asset_account_name = warehouse_account[d.warehouse]["account"]
-					supplier_warehouse_account = warehouse_account.get(self.supplier_warehouse, {}).get("account")
-					supplier_warehouse_account_currency = warehouse_account.get(self.supplier_warehouse, {}).get(
-						"account_currency"
+					supplier_warehouse_account = warehouse_account.get(self.supplier_warehouse, {}).get(
+						"account"
 					)
+					supplier_warehouse_account_currency = warehouse_account.get(
+						self.supplier_warehouse, {}
+					).get("account_currency")
 
 					# If PR is sub-contracted and fg item rate is zero
 					# in that case if account for source and target warehouse are same,
@@ -911,7 +906,7 @@
 				so_items_details_map.setdefault(item.sales_order, []).append(item_details)
 
 		if so_items_details_map:
-			if get_datetime("{} {}".format(self.posting_date, self.posting_time)) > get_datetime():
+			if get_datetime(f"{self.posting_date} {self.posting_time}") > get_datetime():
 				return frappe.msgprint(
 					_("Cannot create Stock Reservation Entries for future dated Purchase Receipts.")
 				)
@@ -1172,9 +1167,7 @@
 			frappe.throw(_("All items have already been Invoiced/Returned"))
 
 		doc = frappe.get_doc(target)
-		doc.payment_terms_template = get_payment_terms_template(
-			source.supplier, "Supplier", source.company
-		)
+		doc.payment_terms_template = get_payment_terms_template(source.supplier, "Supplier", source.company)
 		doc.run_method("onload")
 		doc.run_method("set_missing_values")
 
@@ -1186,9 +1179,7 @@
 
 	def update_item(source_doc, target_doc, source_parent):
 		target_doc.qty, returned_qty = get_pending_qty(source_doc)
-		if frappe.db.get_single_value(
-			"Buying Settings", "bill_for_rejected_quantity_in_purchase_invoice"
-		):
+		if frappe.db.get_single_value("Buying Settings", "bill_for_rejected_quantity_in_purchase_invoice"):
 			target_doc.rejected_qty = 0
 		target_doc.stock_qty = flt(target_doc.qty) * flt(
 			target_doc.conversion_factor, target_doc.precision("conversion_factor")
@@ -1197,9 +1188,7 @@
 
 	def get_pending_qty(item_row):
 		qty = item_row.qty
-		if frappe.db.get_single_value(
-			"Buying Settings", "bill_for_rejected_quantity_in_purchase_invoice"
-		):
+		if frappe.db.get_single_value("Buying Settings", "bill_for_rejected_quantity_in_purchase_invoice"):
 			qty = item_row.received_qty
 		pending_qty = qty - invoiced_qty_map.get(item_row.name, 0)
 		returned_qty = flt(returned_qty_map.get(item_row.name, 0))
@@ -1384,15 +1373,11 @@
 					if total_item_cost > 0:
 						item_account_wise_cost[(item.item_code, item.purchase_receipt_item)][
 							account.expense_account
-						]["amount"] += (
-							account.amount * item.get(based_on_field) / total_item_cost
-						)
+						]["amount"] += account.amount * item.get(based_on_field) / total_item_cost
 
 						item_account_wise_cost[(item.item_code, item.purchase_receipt_item)][
 							account.expense_account
-						]["base_amount"] += (
-							account.base_amount * item.get(based_on_field) / total_item_cost
-						)
+						]["base_amount"] += account.base_amount * item.get(based_on_field) / total_item_cost
 					else:
 						item_account_wise_cost[(item.item_code, item.purchase_receipt_item)][
 							account.expense_account
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index 5cf2080..705b0f9 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -63,7 +63,6 @@
 		pr.delete()
 
 	def test_reverse_purchase_receipt_sle(self):
-
 		pr = make_purchase_receipt(qty=0.5, item_code="_Test Item Home Desktop 200")
 
 		sl_entry = frappe.db.get_all(
@@ -150,9 +149,7 @@
 		pi.delete()  # draft PI
 		pr.cancel()
 		frappe.db.set_value("Supplier", "_Test Supplier", "payment_terms", old_template_in_supplier)
-		frappe.get_doc(
-			"Payment Terms Template", "_Test Payment Terms Template For Purchase Invoice"
-		).delete()
+		frappe.get_doc("Payment Terms Template", "_Test Payment Terms Template For Purchase Invoice").delete()
 
 	def test_purchase_receipt_no_gl_entry(self):
 		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
@@ -220,7 +217,6 @@
 
 	def test_duplicate_serial_nos(self):
 		from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
-		from erpnext.stock.serial_batch_bundle import SerialBatchCreation
 
 		item = frappe.db.exists("Item", {"item_name": "Test Serialized Item 123"})
 		if not item:
@@ -243,7 +239,7 @@
 
 		serial_nos = get_serial_nos_from_bundle(bundle_id)
 
-		self.assertEquals(get_serial_nos_from_bundle(pr.items[0].serial_and_batch_bundle), serial_nos)
+		self.assertEqual(get_serial_nos_from_bundle(pr.items[0].serial_and_batch_bundle), serial_nos)
 
 		bundle_id = make_serial_batch_bundle(
 			frappe._dict(
@@ -266,7 +262,7 @@
 		# Then made delivery note to remove the serial nos from stock
 		dn = create_delivery_note(item_code=item.name, qty=2, rate=1500, serial_no=serial_nos)
 		dn.load_from_db()
-		self.assertEquals(get_serial_nos_from_bundle(dn.items[0].serial_and_batch_bundle), serial_nos)
+		self.assertEqual(get_serial_nos_from_bundle(dn.items[0].serial_and_batch_bundle), serial_nos)
 
 		posting_date = add_days(today(), -3)
 
@@ -393,13 +389,12 @@
 				frappe.db.get_value("Serial No", serial_no, "warehouse"), pr.get("items")[0].warehouse
 			)
 
-		rejected_serial_nos = get_serial_nos_from_bundle(
-			pr.get("items")[0].rejected_serial_and_batch_bundle
-		)
+		rejected_serial_nos = get_serial_nos_from_bundle(pr.get("items")[0].rejected_serial_and_batch_bundle)
 		self.assertEqual(len(rejected_serial_nos), 2)
 		for serial_no in rejected_serial_nos:
 			self.assertEqual(
-				frappe.db.get_value("Serial No", serial_no, "warehouse"), pr.get("items")[0].rejected_warehouse
+				frappe.db.get_value("Serial No", serial_no, "warehouse"),
+				pr.get("items")[0].rejected_warehouse,
 			)
 
 		pr.cancel()
@@ -614,8 +609,6 @@
 			for field, value in field_values.items():
 				self.assertEqual(cstr(serial_no.get(field)), value)
 
-		from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
-
 		pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=1)
 
 		serial_no = get_serial_nos_from_bundle(pr.get("items")[0].serial_and_batch_bundle)[0]
@@ -733,7 +726,6 @@
 		po.cancel()
 
 	def test_serial_no_against_purchase_receipt(self):
-
 		item_code = "Test Manual Created Serial No"
 		if not frappe.db.exists("Item", item_code):
 			make_item(item_code, dict(has_serial_no=1))
@@ -884,7 +876,7 @@
 			"Stock Received But Not Billed - TCP1": {"cost_center": cost_center},
 			stock_in_hand_account: {"cost_center": cost_center},
 		}
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account]["cost_center"], gle.cost_center)
 
 		pr.cancel()
@@ -909,7 +901,7 @@
 			"Stock Received But Not Billed - TCP1": {"cost_center": cost_center},
 			stock_in_hand_account: {"cost_center": cost_center},
 		}
-		for i, gle in enumerate(gl_entries):
+		for _i, gle in enumerate(gl_entries):
 			self.assertEqual(expected_values[gle.account]["cost_center"], gle.cost_center)
 
 		pr.cancel()
@@ -1190,9 +1182,7 @@
 		pr.submit()
 
 		# Get exchnage gain and loss account
-		exchange_gain_loss_account = frappe.db.get_value(
-			"Company", pr.company, "exchange_gain_loss_account"
-		)
+		exchange_gain_loss_account = frappe.db.get_value("Company", pr.company, "exchange_gain_loss_account")
 
 		# fetching the latest GL Entry with exchange gain and loss account account
 		amount = frappe.db.get_value(
@@ -1249,9 +1239,7 @@
 		account = "Stock Received But Not Billed - TCP1"
 
 		make_item(item_code)
-		se = make_stock_entry(
-			item_code=item_code, from_warehouse=warehouse, qty=50, do_not_save=True, rate=0
-		)
+		se = make_stock_entry(item_code=item_code, from_warehouse=warehouse, qty=50, do_not_save=True, rate=0)
 		se.items[0].allow_zero_valuation_rate = 1
 		se.save()
 		se.submit()
@@ -1697,7 +1685,6 @@
 		)
 
 		# Step 4: Create Internal Purchase Receipt
-		from erpnext.controllers.status_updater import OverAllowanceError
 		from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
 
 		pr = make_inter_company_purchase_receipt(dn.name)
@@ -1847,7 +1834,6 @@
 		)
 
 		# Step 4: Create Internal Purchase Receipt
-		from erpnext.controllers.status_updater import OverAllowanceError
 		from erpnext.stock.doctype.delivery_note.delivery_note import make_inter_company_purchase_receipt
 
 		pr = make_inter_company_purchase_receipt(dn.name)
@@ -2200,9 +2186,9 @@
 		gl_entries = get_gl_entries(pr_return.doctype, pr_return.name)
 
 		# Test - 1: SLE Stock Value Difference should be equal to Qty * Average Rate
-		average_rate = (
-			(se.items[0].qty * se.items[0].basic_rate) + (pr.items[0].qty * pr.items[0].rate)
-		) / (se.items[0].qty + pr.items[0].qty)
+		average_rate = ((se.items[0].qty * se.items[0].basic_rate) + (pr.items[0].qty * pr.items[0].rate)) / (
+			se.items[0].qty + pr.items[0].qty
+		)
 		expected_stock_value_difference = pr_return.items[0].qty * average_rate
 		self.assertEqual(
 			flt(sl_entries[0].stock_value_difference, 2), flt(expected_stock_value_difference, 2)
@@ -2344,7 +2330,7 @@
 			do_not_save=1,
 		)
 
-		for i in range(9):
+		for _i in range(9):
 			pr.append(
 				"items",
 				{
@@ -2384,7 +2370,7 @@
 			do_not_save=1,
 		)
 
-		for i in range(9):
+		for _i in range(9):
 			pr.append(
 				"items",
 				{
@@ -2678,7 +2664,9 @@
 				self.assertEqual(row.rate, 250.0)
 				serial_nos = get_serial_nos_from_bundle(row.serial_and_batch_bundle)
 				for sn in serial_nos:
-					serial_no_details = frappe.db.get_value("Serial No", sn, ["status", "warehouse"], as_dict=1)
+					serial_no_details = frappe.db.get_value(
+						"Serial No", sn, ["status", "warehouse"], as_dict=1
+					)
 					self.assertTrue(serial_no_details.status == "Active")
 					self.assertEqual(serial_no_details.warehouse, "Work In Progress - TCP1")
 
@@ -2815,7 +2803,9 @@
 				self.assertEqual(row.rate, 250.0)
 				serial_nos = get_serial_nos_from_bundle(row.serial_and_batch_bundle)
 				for sn in serial_nos:
-					serial_no_details = frappe.db.get_value("Serial No", sn, ["status", "warehouse"], as_dict=1)
+					serial_no_details = frappe.db.get_value(
+						"Serial No", sn, ["status", "warehouse"], as_dict=1
+					)
 					self.assertTrue(serial_no_details.status == "Active")
 					self.assertEqual(serial_no_details.warehouse, "Work In Progress - TCP1")
 
@@ -2890,7 +2880,6 @@
 
 
 def get_taxes(**args):
-
 	args = frappe._dict(args)
 
 	return [
@@ -3035,14 +3024,13 @@
 			"rejected_warehouse": args.rejected_warehouse or "_Test Rejected Warehouse - _TC"
 			if rejected_qty != 0
 			else "",
-			"rate": args.rate if args.rate != None else 50,
+			"rate": args.rate if args.rate is not None else 50,
 			"conversion_factor": args.conversion_factor or 1.0,
 			"stock_qty": flt(qty) * (flt(args.conversion_factor) or 1.0),
 			"serial_and_batch_bundle": bundle_id,
 			"stock_uom": args.stock_uom or "_Test UOM",
 			"uom": uom,
-			"cost_center": args.cost_center
-			or frappe.get_cached_value("Company", pr.company, "cost_center"),
+			"cost_center": args.cost_center or frappe.get_cached_value("Company", pr.company, "cost_center"),
 			"asset_location": args.location or "Test Location",
 			"use_serial_batch_fields": args.use_serial_batch_fields or 0,
 			"serial_no": args.serial_no if args.use_serial_batch_fields else "",
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index 6b01047..7cd3799 100644
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -1112,7 +1112,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-04 11:48:06.653771",
+ "modified": "2024-03-27 13:10:25.896543",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Purchase Receipt Item",
@@ -1120,7 +1120,7 @@
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/putaway_rule/putaway_rule.json b/erpnext/stock/doctype/putaway_rule/putaway_rule.json
index a003f49..ec541a8 100644
--- a/erpnext/stock/doctype/putaway_rule/putaway_rule.json
+++ b/erpnext/stock/doctype/putaway_rule/putaway_rule.json
@@ -111,7 +111,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-11-25 20:39:19.973437",
+ "modified": "2024-03-27 13:10:27.240606",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Putaway Rule",
@@ -153,8 +153,9 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "title_field": "item_code",
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/putaway_rule/putaway_rule.py b/erpnext/stock/doctype/putaway_rule/putaway_rule.py
index 7ed6923..923c34e 100644
--- a/erpnext/stock/doctype/putaway_rule/putaway_rule.py
+++ b/erpnext/stock/doctype/putaway_rule/putaway_rule.py
@@ -128,9 +128,7 @@
 			updated_table = add_row(item, pending_qty, source_warehouse or item.warehouse, updated_table)
 			continue
 
-		at_capacity, rules = get_ordered_putaway_rules(
-			item_code, company, source_warehouse=source_warehouse
-		)
+		at_capacity, rules = get_ordered_putaway_rules(item_code, company, source_warehouse=source_warehouse)
 
 		if not rules:
 			warehouse = source_warehouse or item.get("warehouse")
@@ -221,7 +219,7 @@
 	new_sorted = sorted(new, key=sort_key)
 
 	# Once sorted by all relevant keys both tables should align if they are same.
-	for old_item, new_item in zip(old_sorted, new_sorted):
+	for old_item, new_item in zip(old_sorted, new_sorted, strict=False):
 		for key in compare_keys:
 			if old_item.get(key) != new_item.get(key):
 				return True
@@ -270,9 +268,7 @@
 
 	if item.doctype == "Stock Entry Detail":
 		new_updated_table_row.t_warehouse = warehouse
-		new_updated_table_row.transfer_qty = flt(to_allocate) * flt(
-			new_updated_table_row.conversion_factor
-		)
+		new_updated_table_row.transfer_qty = flt(to_allocate) * flt(new_updated_table_row.conversion_factor)
 	else:
 		new_updated_table_row.stock_qty = flt(to_allocate) * flt(new_updated_table_row.conversion_factor)
 		new_updated_table_row.warehouse = warehouse
@@ -294,23 +290,19 @@
 
 	for entry in items_not_accomodated:
 		item_link = frappe.utils.get_link_to_form("Item", entry[0])
-		formatted_item_rows += """
-			<td>{0}</td>
-			<td>{1}</td>
-		</tr>""".format(
-			item_link, frappe.bold(entry[1])
-		)
+		formatted_item_rows += f"""
+			<td>{item_link}</td>
+			<td>{frappe.bold(entry[1])}</td>
+		</tr>"""
 
 	msg += """
 		<table class="table">
 			<thead>
-				<td>{0}</td>
-				<td>{1}</td>
+				<td>{}</td>
+				<td>{}</td>
 			</thead>
-			{2}
+			{}
 		</table>
-	""".format(
-		_("Item"), _("Unassigned Qty"), formatted_item_rows
-	)
+	""".format(_("Item"), _("Unassigned Qty"), formatted_item_rows)
 
 	frappe.msgprint(msg, title=_("Insufficient Capacity"), is_minimizable=True, wide=True)
diff --git a/erpnext/stock/doctype/putaway_rule/test_putaway_rule.py b/erpnext/stock/doctype/putaway_rule/test_putaway_rule.py
index f5bad51..9f7fdec 100644
--- a/erpnext/stock/doctype/putaway_rule/test_putaway_rule.py
+++ b/erpnext/stock/doctype/putaway_rule/test_putaway_rule.py
@@ -10,7 +10,6 @@
 from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
 	get_batch_from_bundle,
 	get_serial_nos_from_bundle,
-	make_serial_batch_bundle,
 )
 from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
 from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
@@ -51,9 +50,7 @@
 
 	def test_putaway_rules_priority(self):
 		"""Test if rule is applied by priority, irrespective of free space."""
-		rule_1 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_1, capacity=200, uom="Kg"
-		)
+		rule_1 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_1, capacity=200, uom="Kg")
 		rule_2 = create_putaway_rule(
 			item_code="_Rice", warehouse=self.warehouse_2, capacity=300, uom="Kg", priority=2
 		)
@@ -74,17 +71,11 @@
 	def test_putaway_rules_with_same_priority(self):
 		"""Test if rule with more free space is applied,
 		among two rules with same priority and capacity."""
-		rule_1 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_1, capacity=500, uom="Kg"
-		)
-		rule_2 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_2, capacity=500, uom="Kg"
-		)
+		rule_1 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_1, capacity=500, uom="Kg")
+		rule_2 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_2, capacity=500, uom="Kg")
 
 		# out of 500 kg capacity, occupy 100 kg in warehouse_1
-		stock_receipt = make_stock_entry(
-			item_code="_Rice", target=self.warehouse_1, qty=100, basic_rate=50
-		)
+		stock_receipt = make_stock_entry(item_code="_Rice", target=self.warehouse_1, qty=100, basic_rate=50)
 
 		pr = make_purchase_receipt(item_code="_Rice", qty=700, apply_putaway_rule=1, do_not_submit=1)
 		self.assertEqual(len(pr.items), 2)
@@ -102,12 +93,8 @@
 
 	def test_putaway_rules_with_insufficient_capacity(self):
 		"""Test if qty exceeding capacity, is handled."""
-		rule_1 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_1, capacity=100, uom="Kg"
-		)
-		rule_2 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_2, capacity=200, uom="Kg"
-		)
+		rule_1 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_1, capacity=100, uom="Kg")
+		rule_2 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_2, capacity=200, uom="Kg")
 
 		pr = make_purchase_receipt(item_code="_Rice", qty=350, apply_putaway_rule=1, do_not_submit=1)
 		self.assertEqual(len(pr.items), 2)
@@ -128,19 +115,13 @@
 			item.append("uoms", {"uom": "Bag", "conversion_factor": 1000})
 			item.save()
 
-		rule_1 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_1, capacity=3, uom="Bag"
-		)
+		rule_1 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_1, capacity=3, uom="Bag")
 		self.assertEqual(rule_1.stock_capacity, 3000)
-		rule_2 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_2, capacity=4, uom="Bag"
-		)
+		rule_2 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_2, capacity=4, uom="Bag")
 		self.assertEqual(rule_2.stock_capacity, 4000)
 
 		# populate 'Rack 1' with 1 Bag, making the free space 2 Bags
-		stock_receipt = make_stock_entry(
-			item_code="_Rice", target=self.warehouse_1, qty=1000, basic_rate=50
-		)
+		stock_receipt = make_stock_entry(item_code="_Rice", target=self.warehouse_1, qty=1000, basic_rate=50)
 
 		pr = make_purchase_receipt(
 			item_code="_Rice",
@@ -172,9 +153,7 @@
 		frappe.db.set_value("UOM", "Bag", "must_be_whole_number", 1)
 
 		# Putaway Rule in different UOM
-		rule_1 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_1, capacity=1, uom="Bag"
-		)
+		rule_1 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_1, capacity=1, uom="Bag")
 		self.assertEqual(rule_1.stock_capacity, 1000)
 		# Putaway Rule in Stock UOM
 		rule_2 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_2, capacity=500)
@@ -204,9 +183,7 @@
 
 	def test_putaway_rules_with_reoccurring_item(self):
 		"""Test rules on same item entered multiple times with different rate."""
-		rule_1 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_1, capacity=200, uom="Kg"
-		)
+		rule_1 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_1, capacity=200, uom="Kg")
 		# total capacity is 200 Kg
 
 		pr = make_purchase_receipt(item_code="_Rice", qty=100, apply_putaway_rule=1, do_not_submit=1)
@@ -242,9 +219,7 @@
 
 	def test_validate_over_receipt_in_warehouse(self):
 		"""Test if overreceipt is blocked in the presence of putaway rules."""
-		rule_1 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_1, capacity=200, uom="Kg"
-		)
+		rule_1 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_1, capacity=200, uom="Kg")
 
 		pr = make_purchase_receipt(item_code="_Rice", qty=300, apply_putaway_rule=1, do_not_submit=1)
 		self.assertEqual(len(pr.items), 1)
@@ -296,9 +271,7 @@
 
 	def test_putaway_rule_on_stock_entry_material_transfer_reoccuring_item(self):
 		"""Test if reoccuring item is correctly considered."""
-		rule_1 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_1, capacity=300, uom="Kg"
-		)
+		rule_1 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_1, capacity=300, uom="Kg")
 		rule_2 = create_putaway_rule(
 			item_code="_Rice", warehouse=self.warehouse_2, capacity=600, uom="Kg", priority=2
 		)
@@ -440,9 +413,7 @@
 		rule_1 = create_putaway_rule(
 			item_code="_Rice", warehouse=self.warehouse_1, capacity=200, uom="Kg"
 		)  # more capacity
-		rule_2 = create_putaway_rule(
-			item_code="_Rice", warehouse=self.warehouse_2, capacity=100, uom="Kg"
-		)
+		rule_2 = create_putaway_rule(item_code="_Rice", warehouse=self.warehouse_2, capacity=100, uom="Kg")
 
 		stock_entry = make_stock_entry(
 			item_code="_Rice",
@@ -492,9 +463,7 @@
 	putaway.capacity = args.capacity or 1
 	putaway.stock_uom = frappe.db.get_value("Item", putaway.item_code, "stock_uom")
 	putaway.uom = args.uom or putaway.stock_uom
-	putaway.conversion_factor = get_conversion_factor(putaway.item_code, putaway.uom)[
-		"conversion_factor"
-	]
+	putaway.conversion_factor = get_conversion_factor(putaway.item_code, putaway.uom)["conversion_factor"]
 
 	if not args.do_not_save:
 		putaway.save()
diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.json b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
index 914a9f3..103207f 100644
--- a/erpnext/stock/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -245,7 +245,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-08-23 11:56:50.282878",
+ "modified": "2024-03-27 13:10:28.680815",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Quality Inspection",
@@ -269,7 +269,7 @@
  ],
  "search_fields": "item_code, report_date, reference_name",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.py b/erpnext/stock/doctype/quality_inspection/quality_inspection.py
index 8816341..536a88f 100644
--- a/erpnext/stock/doctype/quality_inspection/quality_inspection.py
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.py
@@ -125,13 +125,11 @@
 		if self.reference_type == "Job Card":
 			if self.reference_name:
 				frappe.db.sql(
-					"""
-					UPDATE `tab{doctype}`
+					f"""
+					UPDATE `tab{self.reference_type}`
 					SET quality_inspection = %s, modified = %s
 					WHERE name = %s and production_item = %s
-				""".format(
-						doctype=self.reference_type
-					),
+				""",
 					(quality_inspection, self.modified, self.reference_name, self.item_code),
 				)
 
@@ -153,9 +151,9 @@
 					args.append(self.name)
 
 				frappe.db.sql(
-					"""
+					f"""
 					UPDATE
-						`tab{child_doc}` t1, `tab{parent_doc}` t2
+						`tab{doctype}` t1, `tab{self.reference_type}` t2
 					SET
 						t1.quality_inspection = %s, t2.modified = %s
 					WHERE
@@ -163,9 +161,7 @@
 						and t1.item_code = %s
 						and t1.parent = t2.name
 						{conditions}
-				""".format(
-						parent_doc=self.reference_type, child_doc=doctype, conditions=conditions
-					),
+				""",
 					args,
 				)
 
@@ -203,7 +199,9 @@
 			reading_value = reading.get("reading_" + str(i))
 			if reading_value is not None and reading_value.strip():
 				result = (
-					flt(reading.get("min_value")) <= parse_float(reading_value) <= flt(reading.get("max_value"))
+					flt(reading.get("min_value"))
+					<= parse_float(reading_value)
+					<= flt(reading.get("max_value"))
 				)
 				if not result:
 					return False
@@ -225,9 +223,9 @@
 		except NameError as e:
 			field = frappe.bold(e.args[0].split()[1])
 			frappe.throw(
-				_("Row #{0}: {1} is not a valid reading field. Please refer to the field description.").format(
-					reading.idx, field
-				),
+				_(
+					"Row #{0}: {1} is not a valid reading field. Please refer to the field description."
+				).format(reading.idx, field),
 				title=_("Invalid Formula"),
 			)
 		except Exception:
@@ -296,40 +294,26 @@
 			qi_condition = ""
 
 		return frappe.db.sql(
-			"""
+			f"""
 				SELECT item_code
-				FROM `tab{doc}`
+				FROM `tab{from_doctype}`
 				WHERE parent=%(parent)s and docstatus < 2 and item_code like %(txt)s
 				{qi_condition} {cond} {mcond}
-				ORDER BY item_code limit {page_len} offset {start}
-			""".format(
-				doc=from_doctype,
-				cond=cond,
-				mcond=mcond,
-				start=cint(start),
-				page_len=cint(page_len),
-				qi_condition=qi_condition,
-			),
+				ORDER BY item_code limit {cint(page_len)} offset {cint(start)}
+			""",
 			{"parent": filters.get("parent"), "txt": "%%%s%%" % txt},
 		)
 
 	elif filters.get("reference_name"):
 		return frappe.db.sql(
-			"""
+			f"""
 				SELECT production_item
-				FROM `tab{doc}`
+				FROM `tab{from_doctype}`
 				WHERE name = %(reference_name)s and docstatus < 2 and production_item like %(txt)s
 				{qi_condition} {cond} {mcond}
 				ORDER BY production_item
-				limit {page_len} offset {start}
-			""".format(
-				doc=from_doctype,
-				cond=cond,
-				mcond=mcond,
-				start=cint(start),
-				page_len=cint(page_len),
-				qi_condition=qi_condition,
-			),
+				limit {cint(page_len)} offset {cint(start)}
+			""",
 			{"reference_name": filters.get("reference_name"), "txt": "%%%s%%" % txt},
 		)
 
diff --git a/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
index c423ca8..f59d7c3 100644
--- a/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
+++ b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
@@ -159,9 +159,7 @@
 			do_not_submit=True,
 		)
 
-		readings = [
-			{"specification": "Iron Content", "min_value": 0.1, "max_value": 0.9, "reading_1": "1.0"}
-		]
+		readings = [{"specification": "Iron Content", "min_value": 0.1, "max_value": 0.9, "reading_1": "1.0"}]
 
 		qa = create_quality_inspection(
 			reference_type="Stock Entry", reference_name=se.name, readings=readings, status="Rejected"
diff --git a/erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json b/erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json
index 418b482..de7d836 100644
--- a/erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json
+++ b/erpnext/stock/doctype/quality_inspection_parameter/quality_inspection_parameter.json
@@ -34,7 +34,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-02-19 20:33:30.657406",
+ "modified": "2024-03-27 13:10:28.861722",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Quality Inspection Parameter",
@@ -90,7 +90,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/quality_inspection_parameter_group/quality_inspection_parameter_group.json b/erpnext/stock/doctype/quality_inspection_parameter_group/quality_inspection_parameter_group.json
index 5726474..7000ded 100644
--- a/erpnext/stock/doctype/quality_inspection_parameter_group/quality_inspection_parameter_group.json
+++ b/erpnext/stock/doctype/quality_inspection_parameter_group/quality_inspection_parameter_group.json
@@ -20,7 +20,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2021-02-04 18:44:12.223295",
+ "modified": "2024-03-27 13:10:29.001044",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Quality Inspection Parameter Group",
@@ -76,7 +76,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
index 0eff5a8..0976b2a 100644
--- a/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
+++ b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -224,13 +224,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2021-02-04 19:15:37.991221",
+ "modified": "2024-03-27 13:10:29.141984",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Quality Inspection Reading",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/quality_inspection_template/quality_inspection_template.json b/erpnext/stock/doctype/quality_inspection_template/quality_inspection_template.json
index 9646f2d..678670f 100644
--- a/erpnext/stock/doctype/quality_inspection_template/quality_inspection_template.json
+++ b/erpnext/stock/doctype/quality_inspection_template/quality_inspection_template.json
@@ -35,7 +35,7 @@
    "link_fieldname": "quality_inspection_template"
   }
  ],
- "modified": "2020-04-26 20:13:02.810132",
+ "modified": "2024-03-27 13:10:29.303619",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Quality Inspection Template",
@@ -90,7 +90,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.json b/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.json
index 34ae7e6..9639f89 100644
--- a/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.json
+++ b/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.json
@@ -1,5 +1,5 @@
 {
- "_comments": "[]",
+ "actions": [],
  "allow_copy": 1,
  "creation": "2019-09-06 12:01:33.933063",
  "doctype": "DocType",
@@ -98,7 +98,8 @@
  ],
  "hide_toolbar": 1,
  "issingle": 1,
- "modified": "2019-10-04 21:59:48.597497",
+ "links": [],
+ "modified": "2024-03-27 13:10:30.449554",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Quick Stock Balance",
@@ -131,7 +132,8 @@
  ],
  "quick_entry": 1,
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py b/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py
index 34fb68c..7b7bffe 100644
--- a/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py
+++ b/erpnext/stock/doctype/quick_stock_balance/quick_stock_balance.py
@@ -35,17 +35,13 @@
 def get_stock_item_details(warehouse, date, item=None, barcode=None):
 	out = {}
 	if barcode:
-		out["item"] = frappe.db.get_value(
-			"Item Barcode", filters={"barcode": barcode}, fieldname=["parent"]
-		)
+		out["item"] = frappe.db.get_value("Item Barcode", filters={"barcode": barcode}, fieldname=["parent"])
 		if not out["item"]:
 			frappe.throw(_("Invalid Barcode. There is no Item attached to this barcode."))
 	else:
 		out["item"] = item
 
-	barcodes = frappe.db.get_values(
-		"Item Barcode", filters={"parent": out["item"]}, fieldname=["barcode"]
-	)
+	barcodes = frappe.db.get_values("Item Barcode", filters={"parent": out["item"]}, fieldname=["barcode"])
 
 	out["barcodes"] = [x[0] for x in barcodes]
 	out["qty"] = get_stock_balance(out["item"], warehouse, date)
diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
index 1c5b521..ed9b2dc 100644
--- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
+++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.json
@@ -224,7 +224,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-05-31 12:48:57.138693",
+ "modified": "2024-03-27 13:10:32.544839",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Repost Item Valuation",
@@ -273,7 +273,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
index 4b7e0de..73778e3 100644
--- a/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
+++ b/erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py
@@ -63,7 +63,7 @@
 		frappe.db.delete(
 			table,
 			filters=(
-				(table.modified < (Now() - Interval(days=days)))
+				(table.creation < (Now() - Interval(days=days)))
 				& (table.status.isin(["Completed", "Skipped"]))
 			),
 		)
@@ -144,15 +144,12 @@
 		if not acc_settings.acc_frozen_upto:
 			return
 		if getdate(self.posting_date) <= getdate(acc_settings.acc_frozen_upto):
-			if (
+			if acc_settings.frozen_accounts_modifier and frappe.session.user in get_users_with_role(
 				acc_settings.frozen_accounts_modifier
-				and frappe.session.user in get_users_with_role(acc_settings.frozen_accounts_modifier)
 			):
 				frappe.msgprint(_("Caution: This might alter frozen accounts."))
 				return
-			frappe.throw(
-				_("You cannot repost item valuation before {}").format(acc_settings.acc_frozen_upto)
-			)
+			frappe.throw(_("You cannot repost item valuation before {}").format(acc_settings.acc_frozen_upto))
 
 	def reset_field_values(self):
 		if self.based_on == "Transaction":
diff --git a/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py b/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
index f96a612..7aa2fc3 100644
--- a/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
+++ b/erpnext/stock/doctype/repost_item_valuation/test_repost_item_valuation.py
@@ -99,7 +99,7 @@
 			).insert(ignore_permissions=True)
 
 			repost_doc.load_from_db()
-			repost_doc.modified = add_days(now(), days=-i * 10)
+			repost_doc.creation = add_days(now(), days=-i * 10)
 			repost_doc.db_update_all()
 
 		logs = frappe.get_all("Repost Item Valuation", filters={"status": "Skipped"})
@@ -175,7 +175,6 @@
 		riv3.set_status("Skipped")
 
 	def test_stock_freeze_validation(self):
-
 		today = nowdate()
 
 		riv = frappe.get_doc(
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
index 59ef43e..edca95f 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.json
@@ -251,7 +251,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-03-15 15:22:24.003486",
+ "modified": "2024-03-27 13:10:38.796503",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Serial and Batch Bundle",
@@ -385,7 +385,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "item_code"
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
index 58971e8..7503531 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/serial_and_batch_bundle.py
@@ -4,7 +4,6 @@
 import collections
 import csv
 from collections import Counter, defaultdict
-from typing import Dict, List
 
 import frappe
 from frappe import _, _dict, bold
@@ -149,9 +148,7 @@
 			serial_no_warehouse[data.serial_no] = data.warehouse
 
 		for serial_no in serial_nos:
-			if (
-				not serial_no_warehouse.get(serial_no) or serial_no_warehouse.get(serial_no) != self.warehouse
-			):
+			if not serial_no_warehouse.get(serial_no) or serial_no_warehouse.get(serial_no) != self.warehouse:
 				self.throw_error_message(
 					f"Serial No {bold(serial_no)} is not present in the warehouse {bold(self.warehouse)}.",
 					SerialNoWarehouseError,
@@ -229,9 +226,7 @@
 	def get_serial_nos(self):
 		return [d.serial_no for d in self.entries if d.serial_no]
 
-	def set_incoming_rate_for_outward_transaction(
-		self, row=None, save=False, allow_negative_stock=False
-	):
+	def set_incoming_rate_for_outward_transaction(self, row=None, save=False, allow_negative_stock=False):
 		sle = self.get_sle_for_outward_transaction()
 
 		if self.has_serial_no:
@@ -352,14 +347,10 @@
 		if not self.voucher_detail_no or self.voucher_detail_no != row.name:
 			values_to_set["voucher_detail_no"] = row.name
 
-		if parent.get("posting_date") and (
-			not self.posting_date or self.posting_date != parent.posting_date
-		):
+		if parent.get("posting_date") and (not self.posting_date or self.posting_date != parent.posting_date):
 			values_to_set["posting_date"] = parent.posting_date or today()
 
-		if parent.get("posting_time") and (
-			not self.posting_time or self.posting_time != parent.posting_time
-		):
+		if parent.get("posting_time") and (not self.posting_time or self.posting_time != parent.posting_time):
 			values_to_set["posting_time"] = parent.posting_time
 
 		if parent.doctype in [
@@ -384,6 +375,9 @@
 		if self.docstatus == 0:
 			self.set_incoming_rate(save=True, row=row)
 
+		if self.docstatus == 0 and parent.get("is_return") and parent.is_new():
+			self.reset_qty(row, qty_field=qty_field)
+
 		self.calculate_qty_and_amount(save=True)
 		self.validate_quantity(row, qty_field=qty_field)
 		self.set_warranty_expiry_date()
@@ -417,7 +411,11 @@
 		if not (self.voucher_type and self.voucher_no):
 			return
 
-		if self.voucher_no and not frappe.db.exists(self.voucher_type, self.voucher_no):
+		if (
+			self.docstatus == 1
+			and self.voucher_no
+			and not frappe.db.exists(self.voucher_type, self.voucher_no)
+		):
 			self.throw_error_message(f"The {self.voucher_type} # {self.voucher_no} does not exist")
 
 		if self.flags.ignore_voucher_validation:
@@ -441,9 +439,9 @@
 		parent = frappe.qb.DocType("Serial and Batch Bundle")
 		child = frappe.qb.DocType("Serial and Batch Entry")
 
-		timestamp_condition = CombineDatetime(
-			parent.posting_date, parent.posting_time
-		) > CombineDatetime(self.posting_date, self.posting_time)
+		timestamp_condition = CombineDatetime(parent.posting_date, parent.posting_time) > CombineDatetime(
+			self.posting_date, self.posting_time
+		)
 
 		future_entries = (
 			frappe.qb.from_(parent)
@@ -481,24 +479,57 @@
 
 			frappe.throw(_(msg), title=_(title), exc=SerialNoExistsInFutureTransactionError)
 
+	def reset_qty(self, row, qty_field=None):
+		qty_field = self.get_qty_field(row, qty_field=qty_field)
+		qty = abs(row.get(qty_field))
+
+		idx = None
+		while qty > 0:
+			for d in self.entries:
+				row_qty = abs(d.qty)
+				if row_qty >= qty:
+					d.db_set("qty", qty if self.type_of_transaction == "Inward" else qty * -1)
+					qty = 0
+					idx = d.idx
+					break
+				else:
+					qty -= row_qty
+					idx = d.idx
+
+		if idx and len(self.entries) > idx:
+			remove_rows = []
+			for d in self.entries:
+				if d.idx > idx:
+					remove_rows.append(d)
+
+			for d in remove_rows:
+				self.entries.remove(d)
+
+			self.flags.ignore_links = True
+			self.save()
+
 	def validate_quantity(self, row, qty_field=None):
+		qty_field = self.get_qty_field(row, qty_field=qty_field)
+		qty = row.get(qty_field)
+		if qty_field == "qty" and row.get("stock_qty"):
+			qty = row.get("stock_qty")
+
+		precision = row.precision
+		if abs(abs(flt(self.total_qty, precision)) - abs(flt(qty, precision))) > 0.01:
+			self.throw_error_message(
+				f"Total quantity {abs(flt(self.total_qty))} in the Serial and Batch Bundle {bold(self.name)} does not match with the quantity {abs(flt(row.get(qty_field)))} for the Item {bold(self.item_code)} in the {self.voucher_type} # {self.voucher_no}"
+			)
+
+	def get_qty_field(self, row, qty_field=None) -> str:
 		if not qty_field:
 			qty_field = "qty"
 
-		precision = row.precision
 		if row.get("doctype") == "Subcontracting Receipt Supplied Item":
 			qty_field = "consumed_qty"
 		elif row.get("doctype") == "Stock Entry Detail":
 			qty_field = "transfer_qty"
 
-		qty = row.get(qty_field)
-		if qty_field == "qty" and row.get("stock_qty"):
-			qty = row.get("stock_qty")
-
-		if abs(abs(flt(self.total_qty, precision)) - abs(flt(qty, precision))) > 0.01:
-			self.throw_error_message(
-				f"Total quantity {abs(flt(self.total_qty))} in the Serial and Batch Bundle {bold(self.name)} does not match with the quantity {abs(flt(row.get(qty_field)))} for the Item {bold(self.item_code)} in the {self.voucher_type} # {self.voucher_no}"
-			)
+		return qty_field
 
 	def set_is_outward(self):
 		for row in self.entries:
@@ -615,7 +646,6 @@
 				)
 
 	def validate_incorrect_serial_nos(self, serial_nos):
-
 		if self.voucher_type == "Stock Entry" and self.voucher_no:
 			if frappe.get_cached_value("Stock Entry", self.voucher_no, "purpose") == "Repack":
 				return
@@ -942,7 +972,7 @@
 	serial_nos = []
 	batch_nos = []
 
-	with open(file_path, "r") as f:
+	with open(file_path) as f:
 		reader = csv.reader(f)
 		serial_nos, batch_nos = parse_csv_file_to_get_serial_batch(reader)
 
@@ -1217,10 +1247,7 @@
 def create_serial_batch_no_ledgers(
 	entries, child_row, parent_doc, warehouse=None, do_not_save=False
 ) -> object:
-
-	warehouse = warehouse or (
-		child_row.rejected_warehouse if child_row.is_rejected else child_row.warehouse
-	)
+	warehouse = warehouse or (child_row.rejected_warehouse if child_row.is_rejected else child_row.warehouse)
 
 	type_of_transaction = get_type_of_transaction(parent_doc, child_row)
 	if parent_doc.get("doctype") == "Stock Entry":
@@ -1706,9 +1733,7 @@
 	reserved_batches_details = frappe._dict()
 	if data:
 		reserved_batches_details = frappe._dict(
-			{
-				(d.batch_no, d.warehouse): frappe._dict({"warehouse": d.warehouse, "qty": d.qty}) for d in data
-			}
+			{(d.batch_no, d.warehouse): frappe._dict({"warehouse": d.warehouse, "qty": d.qty}) for d in data}
 		)
 
 	return reserved_batches_details
@@ -1856,7 +1881,7 @@
 
 
 # For work order and subcontracting
-def get_voucher_wise_serial_batch_from_bundle(**kwargs) -> Dict[str, Dict]:
+def get_voucher_wise_serial_batch_from_bundle(**kwargs) -> dict[str, dict]:
 	data = get_ledgers_from_serial_batch_bundle(**kwargs)
 	if not data:
 		return {}
@@ -1984,7 +2009,7 @@
 	return [row.serial_no for row in data if row.serial_no]
 
 
-def get_ledgers_from_serial_batch_bundle(**kwargs) -> List[frappe._dict]:
+def get_ledgers_from_serial_batch_bundle(**kwargs) -> list[frappe._dict]:
 	bundle_table = frappe.qb.DocType("Serial and Batch Bundle")
 	serial_batch_table = frappe.qb.DocType("Serial and Batch Entry")
 
@@ -2045,7 +2070,7 @@
 			stock_ledger_entry.serial_no,
 			stock_ledger_entry.serial_and_batch_bundle,
 		)
-		.where((stock_ledger_entry.is_cancelled == 0))
+		.where(stock_ledger_entry.is_cancelled == 0)
 	)
 
 	if kwargs.get("posting_date"):
diff --git a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
index 826ac03..5f75b40 100644
--- a/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
+++ b/erpnext/stock/doctype/serial_and_batch_bundle/test_serial_and_batch_bundle.py
@@ -650,7 +650,7 @@
 
 	batches = get_batch_nos(bundle)
 
-	return list(batches.keys())[0]
+	return next(iter(batches.keys()))
 
 
 def get_serial_nos_from_bundle(bundle):
diff --git a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
index 844270b..73cbbfc 100644
--- a/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
+++ b/erpnext/stock/doctype/serial_and_batch_entry/serial_and_batch_entry.json
@@ -122,13 +122,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-23 12:44:18.054270",
+ "modified": "2024-03-27 13:10:39.060322",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Serial and Batch Entry",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 2d7fcac..b255f83 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -272,7 +272,7 @@
  "icon": "fa fa-barcode",
  "idx": 1,
  "links": [],
- "modified": "2023-12-17 10:52:55.767839",
+ "modified": "2024-03-27 13:10:39.196284",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Serial No",
@@ -312,7 +312,7 @@
  ],
  "search_fields": "item_code",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/serial_no/serial_no.py b/erpnext/stock/doctype/serial_no/serial_no.py
index 5f4f393..4c693d8 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.py
+++ b/erpnext/stock/doctype/serial_no/serial_no.py
@@ -3,7 +3,6 @@
 
 
 import json
-from typing import List, Optional, Union
 
 import frappe
 from frappe import ValidationError, _
@@ -47,9 +46,7 @@
 		item_group: DF.Link | None
 		item_name: DF.Data | None
 		location: DF.Link | None
-		maintenance_status: DF.Literal[
-			"", "Under Warranty", "Out of Warranty", "Under AMC", "Out of AMC"
-		]
+		maintenance_status: DF.Literal["", "Under Warranty", "Out of Warranty", "Under AMC", "Out of AMC"]
 		purchase_document_no: DF.Data | None
 		purchase_rate: DF.Float
 		serial_no: DF.Data
@@ -61,7 +58,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(SerialNo, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.via_stock_ledger = False
 
 	def validate(self):
@@ -121,9 +118,9 @@
 			)
 
 
-def get_available_serial_nos(serial_no_series, qty) -> List[str]:
+def get_available_serial_nos(serial_no_series, qty) -> list[str]:
 	serial_nos = []
-	for i in range(cint(qty)):
+	for _i in range(cint(qty)):
 		serial_nos.append(get_new_serial_number(serial_no_series))
 
 	return serial_nos
@@ -138,13 +135,11 @@
 
 def get_items_html(serial_nos, item_code):
 	body = ", ".join(serial_nos)
-	return """<details><summary>
-		<b>{0}:</b> {1} Serial Numbers <span class="caret"></span>
+	return f"""<details><summary>
+		<b>{item_code}:</b> {len(serial_nos)} Serial Numbers <span class="caret"></span>
 	</summary>
-	<div class="small">{2}</div></details>
-	""".format(
-		item_code, len(serial_nos), body
-	)
+	<div class="small">{body}</div></details>
+	"""
 
 
 def get_serial_nos(serial_no):
@@ -177,11 +172,9 @@
 def get_delivery_note_serial_no(item_code, qty, delivery_note):
 	serial_nos = ""
 	dn_serial_nos = frappe.db.sql_list(
-		""" select name from `tabSerial No`
+		f""" select name from `tabSerial No`
 		where item_code = %(item_code)s and delivery_document_no = %(delivery_note)s
-		and sales_invoice is null limit {0}""".format(
-			cint(qty)
-		),
+		and sales_invoice is null limit {cint(qty)}""",
 		{"item_code": item_code, "delivery_note": delivery_note},
 	)
 
@@ -196,12 +189,11 @@
 	qty: int,
 	item_code: str,
 	warehouse: str,
-	posting_date: Optional[str] = None,
-	batch_nos: Optional[Union[str, List[str]]] = None,
-	for_doctype: Optional[str] = None,
+	posting_date: str | None = None,
+	batch_nos: str | list[str] | None = None,
+	for_doctype: str | None = None,
 	exclude_sr_nos=None,
-) -> List[str]:
-
+) -> list[str]:
 	filters = frappe._dict({"item_code": item_code, "warehouse": warehouse})
 
 	if exclude_sr_nos is None:
diff --git a/erpnext/stock/doctype/serial_no/test_serial_no.py b/erpnext/stock/doctype/serial_no/test_serial_no.py
index 5a5c403..79291af 100644
--- a/erpnext/stock/doctype/serial_no/test_serial_no.py
+++ b/erpnext/stock/doctype/serial_no/test_serial_no.py
@@ -6,9 +6,8 @@
 
 
 import frappe
-from frappe import _, _dict
+from frappe import _dict
 from frappe.tests.utils import FrappeTestCase
-from frappe.utils import today
 
 from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
 from erpnext.stock.doctype.item.test_item import make_item
@@ -16,10 +15,8 @@
 from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
 	get_batch_from_bundle,
 	get_serial_nos_from_bundle,
-	make_serial_batch_bundle,
 )
 from erpnext.stock.doctype.serial_no.serial_no import *
-from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 from erpnext.stock.doctype.stock_entry.test_stock_entry import make_serialized_item
 from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
@@ -53,9 +50,7 @@
 		se = make_serialized_item(target_warehouse="_Test Warehouse - _TC")
 		serial_nos = get_serial_nos_from_bundle(se.get("items")[0].serial_and_batch_bundle)
 
-		dn = create_delivery_note(
-			item_code="_Test Serialized Item With Series", qty=1, serial_no=[serial_nos[0]]
-		)
+		create_delivery_note(item_code="_Test Serialized Item With Series", qty=1, serial_no=[serial_nos[0]])
 
 		serial_no = frappe.get_doc("Serial No", serial_nos[0])
 
@@ -63,7 +58,7 @@
 		self.assertEqual(serial_no.warehouse, None)
 
 		wh = create_warehouse("_Test Warehouse", company="_Test Company 1")
-		pr = make_purchase_receipt(
+		make_purchase_receipt(
 			item_code="_Test Serialized Item With Series",
 			qty=1,
 			serial_no=[serial_nos[0]],
@@ -118,7 +113,7 @@
 		self.assertRaises(frappe.ValidationError, dn.cancel)
 
 		# deliver from second company
-		dn_2 = create_delivery_note(
+		create_delivery_note(
 			item_code="_Test Serialized Item With Series",
 			qty=1,
 			serial_no=[serial_nos[0]],
@@ -201,16 +196,14 @@
 					{"doctype": "Serial No", "item_code": item_code, "serial_no": serial_no}
 				).insert()
 
-		in1 = make_stock_entry(
+		make_stock_entry(
 			item_code=item_code, to_warehouse=warehouse, qty=1, rate=42, serial_no=[serial_nos[0]]
 		)
-		in2 = make_stock_entry(
+		make_stock_entry(
 			item_code=item_code, to_warehouse=warehouse, qty=1, rate=113, serial_no=[serial_nos[1]]
 		)
 
-		out = create_delivery_note(
-			item_code=item_code, qty=1, serial_no=[serial_nos[0]], do_not_submit=True
-		)
+		out = create_delivery_note(item_code=item_code, qty=1, serial_no=[serial_nos[0]], do_not_submit=True)
 
 		bundle = out.items[0].serial_and_batch_bundle
 		doc = frappe.get_doc("Serial and Batch Bundle", bundle)
diff --git a/erpnext/stock/doctype/shipment/shipment.json b/erpnext/stock/doctype/shipment/shipment.json
index 53b549d..e3df214 100644
--- a/erpnext/stock/doctype/shipment/shipment.json
+++ b/erpnext/stock/doctype/shipment/shipment.json
@@ -433,7 +433,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2022-11-17 17:23:27.025802",
+ "modified": "2024-03-27 13:10:41.030764",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Shipment",
@@ -469,7 +469,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/shipment/test_shipment.py b/erpnext/stock/doctype/shipment/test_shipment.py
index 726dff4..4d4eadc 100644
--- a/erpnext/stock/doctype/shipment/test_shipment.py
+++ b/erpnext/stock/doctype/shipment/test_shipment.py
@@ -76,9 +76,7 @@
 	shipment.description_of_content = "unit test entry"
 	for delivery_note in delivery_notes:
 		shipment.append("shipment_delivery_note", {"delivery_note": delivery_note.name})
-	shipment.append(
-		"shipment_parcel", {"length": 5, "width": 5, "height": 5, "weight": 5, "count": 5}
-	)
+	shipment.append("shipment_parcel", {"length": 5, "width": 5, "height": 5, "weight": 5, "count": 5})
 	shipment.insert()
 	return shipment
 
@@ -96,9 +94,7 @@
 
 def get_shipment_customer_address(customer_name):
 	address_title = customer_name + " address 123"
-	customer_address = frappe.get_all(
-		"Address", fields=["name"], filters={"address_title": address_title}
-	)
+	customer_address = frappe.get_all("Address", fields=["name"], filters={"address_title": address_title})
 	if len(customer_address):
 		return customer_address[0]
 	else:
@@ -160,9 +156,7 @@
 	customer.is_primary_contact = 1
 	customer.is_billing_contact = 1
 	customer.append("email_ids", {"email_id": "randomme@email.com", "is_primary": 1})
-	customer.append(
-		"phone_nos", {"phone": "123123123", "is_primary_phone": 1, "is_primary_mobile_no": 1}
-	)
+	customer.append("phone_nos", {"phone": "123123123", "is_primary_phone": 1, "is_primary_mobile_no": 1})
 	customer.status = "Passive"
 	customer.insert()
 	return customer
diff --git a/erpnext/stock/doctype/shipment_delivery_note/shipment_delivery_note.json b/erpnext/stock/doctype/shipment_delivery_note/shipment_delivery_note.json
index 8625913..1ab79f6 100644
--- a/erpnext/stock/doctype/shipment_delivery_note/shipment_delivery_note.json
+++ b/erpnext/stock/doctype/shipment_delivery_note/shipment_delivery_note.json
@@ -27,14 +27,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-12-02 15:44:34.028703",
+ "modified": "2024-03-27 13:10:41.282195",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Shipment Delivery Note",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/shipment_parcel/shipment_parcel.json b/erpnext/stock/doctype/shipment_parcel/shipment_parcel.json
index 0dc4fd1..321599e 100644
--- a/erpnext/stock/doctype/shipment_parcel/shipment_parcel.json
+++ b/erpnext/stock/doctype/shipment_parcel/shipment_parcel.json
@@ -49,14 +49,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-03-06 16:48:57.355757",
+ "modified": "2024-03-27 13:10:41.396354",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Shipment Parcel",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/shipment_parcel_template/shipment_parcel_template.json b/erpnext/stock/doctype/shipment_parcel_template/shipment_parcel_template.json
index 4735d9f..9eb9ba4 100644
--- a/erpnext/stock/doctype/shipment_parcel_template/shipment_parcel_template.json
+++ b/erpnext/stock/doctype/shipment_parcel_template/shipment_parcel_template.json
@@ -52,7 +52,7 @@
   }
  ],
  "links": [],
- "modified": "2020-09-28 12:51:00.320421",
+ "modified": "2024-03-27 13:10:41.521126",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Shipment Parcel Template",
@@ -72,7 +72,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 96a9209..8348804 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -408,12 +408,26 @@
 			erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
 		}
 
+		frm.events.set_route_options_for_new_doc(frm);
+	},
+
+	set_route_options_for_new_doc(frm) {
+		let batch_no_field = frm.get_docfield("items", "batch_no");
+		if (batch_no_field) {
+			batch_no_field.get_route_options_for_new_doc = function (row) {
+				return {
+					item: row.doc.item_code,
+				};
+			};
+		}
+
 		let sbb_field = frm.get_docfield("items", "serial_and_batch_bundle");
 		if (sbb_field) {
 			sbb_field.get_route_options_for_new_doc = (row) => {
 				return {
 					item_code: row.doc.item_code,
 					voucher_type: frm.doc.doctype,
+					warehouse: row.doc.s_warehouse || row.doc.t_warehouse,
 				};
 			};
 		}
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index d45296f..7f671d2 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -306,7 +306,7 @@
   },
   {
    "fieldname": "source_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Source Warehouse Address",
    "read_only": 1
   },
@@ -336,7 +336,7 @@
   },
   {
    "fieldname": "target_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Target Warehouse Address",
    "read_only": 1
   },
@@ -464,7 +464,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Address"
   },
   {
@@ -681,7 +681,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-01-12 11:56:58.644882",
+ "modified": "2024-03-27 13:10:43.701839",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Entry",
@@ -749,7 +749,7 @@
  ],
  "search_fields": "posting_date, from_warehouse, to_warehouse, purpose, remarks",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "stock_entry_type",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index b75ce21..9bb607c 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -4,7 +4,6 @@
 
 import json
 from collections import defaultdict
-from typing import List
 
 import frappe
 from frappe import _
@@ -85,7 +84,7 @@
 
 		add_to_transit: DF.Check
 		additional_costs: DF.Table[LandedCostTaxesandCharges]
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		apply_putaway_rule: DF.Check
 		bom_no: DF.Link | None
@@ -127,14 +126,14 @@
 		scan_barcode: DF.Data | None
 		select_print_heading: DF.Link | None
 		set_posting_time: DF.Check
-		source_address_display: DF.SmallText | None
+		source_address_display: DF.TextEditor | None
 		source_warehouse_address: DF.Link | None
 		stock_entry_type: DF.Link
 		subcontracting_order: DF.Link | None
 		supplier: DF.Link | None
 		supplier_address: DF.Link | None
 		supplier_name: DF.Data | None
-		target_address_display: DF.SmallText | None
+		target_address_display: DF.TextEditor | None
 		target_warehouse_address: DF.Link | None
 		to_warehouse: DF.Link | None
 		total_additional_costs: DF.Currency
@@ -147,7 +146,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(StockEntry, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		if self.purchase_order:
 			self.subcontract_data = frappe._dict(
 				{
@@ -174,9 +173,7 @@
 	def before_validate(self):
 		from erpnext.stock.doctype.putaway_rule.putaway_rule import apply_putaway_rule
 
-		apply_rule = self.apply_putaway_rule and (
-			self.purpose in ["Material Transfer", "Material Receipt"]
-		)
+		apply_rule = self.apply_putaway_rule and (self.purpose in ["Material Transfer", "Material Receipt"])
 
 		if self.get("items") and apply_rule:
 			apply_putaway_rule(self.doctype, self.get("items"), self.company, purpose=self.purpose)
@@ -345,7 +342,11 @@
 		if self.purpose == "Send to Warehouse":
 			for d in frappe.get_all(
 				"Stock Entry",
-				filters={"docstatus": 0, "outgoing_stock_entry": self.name, "purpose": "Receive at Warehouse"},
+				filters={
+					"docstatus": 0,
+					"outgoing_stock_entry": self.name,
+					"purpose": "Receive at Warehouse",
+				},
 			):
 				frappe.delete_doc("Stock Entry", d.name)
 
@@ -487,7 +488,7 @@
 			return
 
 		precision = frappe.get_precision("Stock Entry Detail", "qty")
-		fg_item = list(fg_qty.keys())[0]
+		fg_item = next(iter(fg_qty.keys()))
 		fg_item_qty = flt(fg_qty[fg_item], precision)
 		fg_completed_qty = flt(self.fg_completed_qty, precision)
 
@@ -670,14 +671,13 @@
 			production_item, qty = frappe.db.get_value(
 				"Work Order", self.work_order, ["production_item", "qty"]
 			)
-			args = other_ste + [production_item]
+			args = [*other_ste, production_item]
 			fg_qty_already_entered = frappe.db.sql(
 				"""select sum(transfer_qty)
 				from `tabStock Entry Detail`
-				where parent in (%s)
-					and item_code = %s
-					and ifnull(s_warehouse,'')='' """
-				% (", ".join(["%s" * len(other_ste)]), "%s"),
+				where parent in ({})
+					and item_code = {}
+					and ifnull(s_warehouse,'')='' """.format(", ".join(["%s" * len(other_ste)]), "%s"),
 				args,
 			)[0][0]
 			if fg_qty_already_entered and fg_qty_already_entered >= qty:
@@ -758,9 +758,7 @@
 		Set rate for outgoing, scrapped and finished items
 		"""
 		# Set rate for outgoing items
-		outgoing_items_cost = self.set_rate_for_outgoing_items(
-			reset_outgoing_rate, raise_error_if_no_rate
-		)
+		outgoing_items_cost = self.set_rate_for_outgoing_items(reset_outgoing_rate, raise_error_if_no_rate)
 		finished_item_qty = sum(d.transfer_qty for d in self.items if d.is_finished_item)
 
 		items = []
@@ -867,7 +865,6 @@
 
 		if settings.material_consumption:
 			if settings.get_rm_cost_from_consumption_entry and self.work_order:
-
 				# Validate only if Material Consumption Entry exists for the Work Order.
 				if frappe.db.exists(
 					"Stock Entry",
@@ -879,7 +876,9 @@
 				):
 					for item in self.items:
 						if not item.is_finished_item and not item.is_scrap_item:
-							label = frappe.get_meta(settings.doctype).get_label("get_rm_cost_from_consumption_entry")
+							label = frappe.get_meta(settings.doctype).get_label(
+								"get_rm_cost_from_consumption_entry"
+							)
 							frappe.throw(
 								_(
 									"Row {0}: As {1} is enabled, raw materials cannot be added to {2} entry. Use {3} entry to consume raw materials."
@@ -892,7 +891,8 @@
 							)
 
 					if frappe.db.exists(
-						"Stock Entry", {"docstatus": 1, "work_order": self.work_order, "purpose": "Manufacture"}
+						"Stock Entry",
+						{"docstatus": 1, "work_order": self.work_order, "purpose": "Manufacture"},
 					):
 						frappe.throw(
 							_("Only one {0} entry can be created against the Work Order {1}").format(
@@ -1060,13 +1060,17 @@
 				item_code = se_item.original_item or se_item.item_code
 				precision = cint(frappe.db.get_default("float_precision")) or 3
 				required_qty = sum(
-					[flt(d.required_qty) for d in subcontract_order.supplied_items if d.rm_item_code == item_code]
+					[
+						flt(d.required_qty)
+						for d in subcontract_order.supplied_items
+						if d.rm_item_code == item_code
+					]
 				)
 
 				total_allowed = required_qty + (required_qty * (qty_allowance / 100))
 
 				if not required_qty:
-					bom_no = frappe.db.get_value(
+					frappe.db.get_value(
 						f"{self.subcontract_data.order_doctype} Item",
 						{
 							"parent": self.get(self.subcontract_data.order_field),
@@ -1112,7 +1116,10 @@
 						& (se.docstatus == 1)
 						& (se_detail.item_code == se_item.item_code)
 						& (
-							((se.purchase_order == self.purchase_order) & (se_detail.po_detail == se_item.po_detail))
+							(
+								(se.purchase_order == self.purchase_order)
+								& (se_detail.po_detail == se_item.po_detail)
+							)
 							if self.subcontract_data.order_doctype == "Purchase Order"
 							else (
 								(se.subcontracting_order == self.subcontracting_order)
@@ -1165,7 +1172,9 @@
 					else:
 						if not se_item.allow_alternative_item:
 							frappe.throw(
-								_("Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}").format(
+								_(
+									"Row {0}# Item {1} not found in 'Raw Materials Supplied' table in {2} {3}"
+								).format(
 									se_item.idx,
 									se_item.item_code,
 									self.subcontract_data.order_doctype,
@@ -1342,12 +1351,18 @@
 		for d in self.get("items"):
 			if cstr(d.s_warehouse):
 				sle = self.get_sl_entries(
-					d, {"warehouse": cstr(d.s_warehouse), "actual_qty": -flt(d.transfer_qty), "incoming_rate": 0}
+					d,
+					{
+						"warehouse": cstr(d.s_warehouse),
+						"actual_qty": -flt(d.transfer_qty),
+						"incoming_rate": 0,
+					},
 				)
 				if cstr(d.t_warehouse):
 					sle.dependant_sle_voucher_detail_no = d.name
 				elif finished_item_row and (
-					finished_item_row.item_code != d.item_code or finished_item_row.t_warehouse != d.s_warehouse
+					finished_item_row.item_code != d.item_code
+					or finished_item_row.t_warehouse != d.s_warehouse
 				):
 					sle.dependant_sle_voucher_detail_no = finished_item_row.name
 
@@ -1419,7 +1434,7 @@
 				sl_entries.append(sle)
 
 	def get_gl_entries(self, warehouse_account):
-		gl_entries = super(StockEntry, self).get_gl_entries(warehouse_account)
+		gl_entries = super().get_gl_entries(warehouse_account)
 
 		if self.purpose in ("Repack", "Manufacture"):
 			total_basic_amount = sum(flt(t.basic_amount) for t in self.get("items") if t.is_finished_item)
@@ -1452,9 +1467,9 @@
 					flt(t.amount * multiply_based_on) / divide_based_on
 				)
 
-				item_account_wise_additional_cost[(d.item_code, d.name)][t.expense_account]["base_amount"] += (
-					flt(t.base_amount * multiply_based_on) / divide_based_on
-				)
+				item_account_wise_additional_cost[(d.item_code, d.name)][t.expense_account][
+					"base_amount"
+				] += flt(t.base_amount * multiply_based_on) / divide_based_on
 
 		if item_account_wise_additional_cost:
 			for d in self.get("items"):
@@ -1486,7 +1501,9 @@
 								"cost_center": d.cost_center,
 								"remarks": self.get("remarks") or _("Accounting Entry for Stock"),
 								"credit": -1
-								* amount["base_amount"],  # put it as negative credit instead of debit purposefully
+								* amount[
+									"base_amount"
+								],  # put it as negative credit instead of debit purposefully
 							},
 							item=d,
 						)
@@ -1607,7 +1624,10 @@
 		):
 			subcontract_items = frappe.get_all(
 				self.subcontract_data.order_supplied_items_field,
-				{"parent": self.get(self.subcontract_data.order_field), "rm_item_code": args.get("item_code")},
+				{
+					"parent": self.get(self.subcontract_data.order_field),
+					"rm_item_code": args.get("item_code"),
+				},
 				"main_item_code",
 			)
 
@@ -1655,7 +1675,6 @@
 		)
 
 		if self.bom_no:
-
 			backflush_based_on = frappe.db.get_single_value(
 				"Manufacturing Settings", "backflush_raw_materials_based_on"
 			)
@@ -1669,7 +1688,6 @@
 				"Material Transfer for Manufacture",
 				"Material Consumption for Manufacture",
 			]:
-
 				if self.work_order and self.purpose == "Material Transfer for Manufacture":
 					item_dict = self.get_pending_raw_materials(backflush_based_on)
 					if self.to_warehouse and self.pro_doc:
@@ -1679,7 +1697,10 @@
 
 				elif (
 					self.work_order
-					and (self.purpose == "Manufacture" or self.purpose == "Material Consumption for Manufacture")
+					and (
+						self.purpose == "Manufacture"
+						or self.purpose == "Material Consumption for Manufacture"
+					)
 					and not self.pro_doc.skip_transfer
 					and self.flags.backflush_based_on == "Material Transferred for Manufacture"
 				):
@@ -1687,7 +1708,10 @@
 
 				elif (
 					self.work_order
-					and (self.purpose == "Manufacture" or self.purpose == "Material Consumption for Manufacture")
+					and (
+						self.purpose == "Manufacture"
+						or self.purpose == "Material Consumption for Manufacture"
+					)
 					and self.flags.backflush_based_on == "BOM"
 					and frappe.db.get_single_value("Manufacturing Settings", "material_consumption") == 1
 				):
@@ -1700,7 +1724,10 @@
 					item_dict = self.get_bom_raw_materials(self.fg_completed_qty)
 
 					# Get Subcontract Order Supplied Items Details
-					if self.get(self.subcontract_data.order_field) and self.purpose == "Send to Subcontractor":
+					if (
+						self.get(self.subcontract_data.order_field)
+						and self.purpose == "Send to Subcontractor"
+					):
 						# Get Subcontract Order Supplied Items Details
 						parent = frappe.qb.DocType(self.subcontract_data.order_doctype)
 						child = frappe.qb.DocType(self.subcontract_data.order_supplied_items_field)
@@ -1719,9 +1746,14 @@
 						if self.pro_doc and cint(self.pro_doc.from_wip_warehouse):
 							item["from_warehouse"] = self.pro_doc.wip_warehouse
 						# Get Reserve Warehouse from Subcontract Order
-						if self.get(self.subcontract_data.order_field) and self.purpose == "Send to Subcontractor":
+						if (
+							self.get(self.subcontract_data.order_field)
+							and self.purpose == "Send to Subcontractor"
+						):
 							item["from_warehouse"] = item_wh.get(item.item_code)
-						item["to_warehouse"] = self.to_warehouse if self.purpose == "Send to Subcontractor" else ""
+						item["to_warehouse"] = (
+							self.to_warehouse if self.purpose == "Send to Subcontractor" else ""
+						)
 
 					self.add_to_stock_entry_detail(item_dict)
 
@@ -1911,9 +1943,7 @@
 		from erpnext.manufacturing.doctype.bom.bom import get_bom_items_as_dict
 
 		if (
-			frappe.db.get_single_value(
-				"Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies"
-			)
+			frappe.db.get_single_value("Manufacturing Settings", "set_op_cost_and_scrape_from_sub_assemblies")
 			and self.work_order
 			and frappe.get_cached_value("Work Order", self.work_order, "use_multi_level_bom")
 		):
@@ -2070,7 +2100,7 @@
 		)
 
 		precision = frappe.get_precision("Stock Entry Detail", "qty")
-		for key, row in available_materials.items():
+		for _key, row in available_materials.items():
 			remaining_qty_to_produce = flt(wo_data.trans_qty) - flt(wo_data.produced_qty)
 			if remaining_qty_to_produce <= 0 and not self.is_return:
 				continue
@@ -2244,9 +2274,7 @@
 				continue
 
 			transfer_pending = flt(d.required_qty) > flt(d.transferred_qty)
-			can_transfer = transfer_pending or (
-				backflush_based_on == "Material Transferred for Manufacture"
-			)
+			can_transfer = transfer_pending or (backflush_based_on == "Material Transferred for Manufacture")
 
 			if not can_transfer:
 				continue
@@ -2261,7 +2289,9 @@
 					)
 					item_row["job_card_item"] = job_card_item or None
 
-				if d.source_warehouse and not frappe.db.get_value("Warehouse", d.source_warehouse, "is_group"):
+				if d.source_warehouse and not frappe.db.get_value(
+					"Warehouse", d.source_warehouse, "is_group"
+				):
 					item_row["from_warehouse"] = d.source_warehouse
 
 				item_row["to_warehouse"] = wip_warehouse
@@ -2318,9 +2348,9 @@
 				if item_row.get(field):
 					se_child.set(field, item_row.get(field))
 
-			if se_child.s_warehouse == None:
+			if se_child.s_warehouse is None:
 				se_child.s_warehouse = self.from_warehouse
-			if se_child.t_warehouse == None:
+			if se_child.t_warehouse is None:
 				se_child.t_warehouse = self.to_warehouse
 
 			# in stock uom
@@ -2376,15 +2406,20 @@
 						expiry_date = frappe.db.get_value("Batch", item.batch_no, "expiry_date")
 						if expiry_date:
 							if getdate(self.posting_date) > getdate(expiry_date):
-								frappe.throw(_("Batch {0} of Item {1} has expired.").format(item.batch_no, item.item_code))
+								frappe.throw(
+									_("Batch {0} of Item {1} has expired.").format(
+										item.batch_no, item.item_code
+									)
+								)
 					else:
-						frappe.throw(_("Batch {0} of Item {1} is disabled.").format(item.batch_no, item.item_code))
+						frappe.throw(
+							_("Batch {0} of Item {1} is disabled.").format(item.batch_no, item.item_code)
+						)
 
 	def update_subcontract_order_supplied_items(self):
 		if self.get(self.subcontract_data.order_field) and (
 			self.purpose in ["Send to Subcontractor", "Material Transfer"] or self.is_return
 		):
-
 			# Get Subcontract Order Supplied Items Details
 			order_supplied_items = frappe.db.get_all(
 				self.subcontract_data.order_supplied_items_field,
@@ -2449,8 +2484,8 @@
 
 			cond = ""
 			for data, transferred_qty in stock_entries.items():
-				cond += """ WHEN (parent = %s and name = %s) THEN %s
-					""" % (
+				cond += """ WHEN (parent = {} and name = {}) THEN {}
+					""".format(
 					frappe.db.escape(data[0]),
 					frappe.db.escape(data[1]),
 					transferred_qty,
@@ -2506,7 +2541,9 @@
 			material_request = item.material_request or None
 			if self.purpose == "Material Transfer" and material_request not in material_requests:
 				if self.outgoing_stock_entry and parent_se:
-					material_request = frappe.get_value("Stock Entry Detail", item.ste_detail, "material_request")
+					material_request = frappe.get_value(
+						"Stock Entry Detail", item.ste_detail, "material_request"
+					)
 
 			if material_request and material_request not in material_requests:
 				material_requests.append(material_request)
@@ -2543,7 +2580,7 @@
 					d.serial_and_batch_bundle = id
 					d.use_serial_batch_fields = 0
 
-	def get_available_serial_nos(self) -> List[str]:
+	def get_available_serial_nos(self) -> list[str]:
 		serial_nos = []
 		data = frappe.get_all(
 			"Serial No",
@@ -2738,9 +2775,7 @@
 			)
 		)
 	):
-		operating_cost_per_unit += flt(work_order.corrective_operation_cost) / flt(
-			work_order.produced_qty
-		)
+		operating_cost_per_unit += flt(work_order.corrective_operation_cost) / flt(work_order.produced_qty)
 
 	return operating_cost_per_unit
 
@@ -2753,24 +2788,20 @@
 	if subcontract_order:
 		cond = f"and ste.purpose = 'Send to Subcontractor' and ste.{subcontract_order_field} = '{subcontract_order}'"
 	elif work_order:
-		cond = "and ste.purpose = 'Material Transfer for Manufacture' and ste.work_order = '{0}'".format(
-			work_order
-		)
+		cond = f"and ste.purpose = 'Material Transfer for Manufacture' and ste.work_order = '{work_order}'"
 
 	if not cond:
 		return {}
 
 	used_alternative_items = {}
 	data = frappe.db.sql(
-		""" select sted.original_item, sted.uom, sted.conversion_factor,
+		f""" select sted.original_item, sted.uom, sted.conversion_factor,
 			sted.item_code, sted.item_name, sted.conversion_factor,sted.stock_uom, sted.description
 		from
 			`tabStock Entry` ste, `tabStock Entry Detail` sted
 		where
 			sted.parent = ste.name and ste.docstatus = 1 and sted.original_item !=  sted.item_code
-			{0} """.format(
-			cond
-		),
+			{cond} """,
 		as_dict=1,
 	)
 
@@ -2808,9 +2839,7 @@
 	conversion_factor = get_conversion_factor(item_code, uom).get("conversion_factor")
 
 	if not conversion_factor:
-		frappe.msgprint(
-			_("UOM conversion factor required for UOM: {0} in Item: {1}").format(uom, item_code)
-		)
+		frappe.msgprint(_("UOM conversion factor required for UOM: {0} in Item: {1}").format(uom, item_code))
 		ret = {"uom": ""}
 	else:
 		ret = {
@@ -2920,9 +2949,7 @@
 		else:
 			supplied_item.supplied_qty += row.transfer_qty
 
-		supplied_item.total_supplied_qty = flt(supplied_item.supplied_qty) - flt(
-			supplied_item.returned_qty
-		)
+		supplied_item.total_supplied_qty = flt(supplied_item.supplied_qty) - flt(supplied_item.returned_qty)
 
 	return supplied_item_details
 
@@ -3034,7 +3061,11 @@
 			& (stock_entry_detail.s_warehouse.isnotnull())
 			& (
 				stock_entry.purpose.isin(
-					["Manufacture", "Material Consumption for Manufacture", "Material Transfer for Manufacture"]
+					[
+						"Manufacture",
+						"Material Consumption for Manufacture",
+						"Material Transfer for Manufacture",
+					]
 				)
 			)
 		)
@@ -3086,7 +3117,6 @@
 		doc.has_batch_no = 1
 		batchwise_serial_nos = get_batchwise_serial_nos(child.item_code, row)
 		for batch_no, qty in row.batches_to_be_consume.items():
-
 			while qty > 0:
 				qty -= 1
 				doc.append(
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
index 271cbbc..e5f4e73 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_utils.py
@@ -2,7 +2,7 @@
 # See license.txt
 
 
-from typing import TYPE_CHECKING, Optional, overload
+from typing import TYPE_CHECKING, overload
 
 import frappe
 from frappe.utils import cint, flt
@@ -18,15 +18,15 @@
 	*,
 	item_code: str,
 	qty: float,
-	company: Optional[str] = None,
-	from_warehouse: Optional[str] = None,
-	to_warehouse: Optional[str] = None,
-	rate: Optional[float] = None,
-	serial_no: Optional[str] = None,
-	batch_no: Optional[str] = None,
-	posting_date: Optional[str] = None,
-	posting_time: Optional[str] = None,
-	purpose: Optional[str] = None,
+	company: str | None = None,
+	from_warehouse: str | None = None,
+	to_warehouse: str | None = None,
+	rate: float | None = None,
+	serial_no: str | None = None,
+	batch_no: str | None = None,
+	posting_date: str | None = None,
+	posting_time: str | None = None,
+	purpose: str | None = None,
 	do_not_save: bool = False,
 	do_not_submit: bool = False,
 	inspection_required: bool = False,
diff --git a/erpnext/stock/doctype/stock_entry/test_stock_entry.py b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
index 01a43b3..9d7e3ba 100644
--- a/erpnext/stock/doctype/stock_entry/test_stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/test_stock_entry.py
@@ -2,10 +2,9 @@
 # License: GNU General Public License v3. See license.txt
 
 
-import frappe
 from frappe.permissions import add_user_permission, remove_user_permission
 from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, add_to_date, flt, nowdate, nowtime, today
+from frappe.utils import add_days, flt, nowtime, today
 
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
 from erpnext.controllers.accounts_controller import InvalidQtyError
@@ -20,7 +19,7 @@
 	get_serial_nos_from_bundle,
 	make_serial_batch_bundle,
 )
-from erpnext.stock.doctype.serial_no.serial_no import *  # noqa
+from erpnext.stock.doctype.serial_no.serial_no import *
 from erpnext.stock.doctype.stock_entry.stock_entry import FinishedGoodError, make_stock_in_entry
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
 from erpnext.stock.doctype.stock_ledger_entry.stock_ledger_entry import StockFreezeError
@@ -38,7 +37,7 @@
 	condition, values = "", []
 	for key, value in args.items():
 		condition += " and " if condition else " where "
-		condition += "`{0}`=%s".format(key)
+		condition += f"`{key}`=%s"
 		values.append(value)
 
 	return frappe.db.sql(
@@ -151,8 +150,7 @@
 		)
 
 		projected_qty = (
-			frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, "projected_qty")
-			or 0
+			frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, "projected_qty") or 0
 		)
 
 		frappe.db.set_single_value("Stock Settings", "auto_indent", 1)
@@ -534,10 +532,10 @@
 		self.assertTrue(sle)
 		sle.sort(key=lambda x: x[1])
 
-		for i, sle in enumerate(sle):
-			self.assertEqual(expected_sle[i][0], sle[0])
-			self.assertEqual(expected_sle[i][1], sle[1])
-			self.assertEqual(expected_sle[i][2], sle[2])
+		for i, sle_value in enumerate(sle):
+			self.assertEqual(expected_sle[i][0], sle_value[0])
+			self.assertEqual(expected_sle[i][1], sle_value[1])
+			self.assertEqual(expected_sle[i][2], sle_value[2])
 
 	def check_gl_entries(self, voucher_type, voucher_no, expected_gl_entries):
 		expected_gl_entries.sort(key=lambda x: x[0])
@@ -693,14 +691,10 @@
 		se.set_stock_entry_type()
 		se.insert()
 		se.submit()
-		self.assertTrue(
-			frappe.db.get_value("Serial No", serial_no, "warehouse"), "_Test Warehouse 1 - _TC"
-		)
+		self.assertTrue(frappe.db.get_value("Serial No", serial_no, "warehouse"), "_Test Warehouse 1 - _TC")
 
 		se.cancel()
-		self.assertTrue(
-			frappe.db.get_value("Serial No", serial_no, "warehouse"), "_Test Warehouse - _TC"
-		)
+		self.assertTrue(frappe.db.get_value("Serial No", serial_no, "warehouse"), "_Test Warehouse - _TC")
 		frappe.flags.use_serial_and_batch_fields = False
 
 	def test_serial_cancel(self):
@@ -732,9 +726,7 @@
 		else:
 			item = frappe.get_doc("Item", {"item_name": "Batched and Serialised Item"})
 
-		se = make_stock_entry(
-			item_code=item.item_code, target="_Test Warehouse - _TC", qty=1, basic_rate=100
-		)
+		se = make_stock_entry(item_code=item.item_code, target="_Test Warehouse - _TC", qty=1, basic_rate=100)
 		batch_no = get_batch_from_bundle(se.items[0].serial_and_batch_bundle)
 		serial_no = get_serial_nos_from_bundle(se.items[0].serial_and_batch_bundle)[0]
 		batch_qty = get_batch_qty(batch_no, "_Test Warehouse - _TC", item.item_code)
@@ -750,7 +742,7 @@
 		self.assertEqual(frappe.db.get_value("Serial No", serial_no, "warehouse"), None)
 
 	def test_warehouse_company_validation(self):
-		company = frappe.db.get_value("Warehouse", "_Test Warehouse 2 - _TC1", "company")
+		frappe.db.get_value("Warehouse", "_Test Warehouse 2 - _TC1", "company")
 		frappe.get_doc("User", "test2@example.com").add_roles(
 			"Sales User", "Sales Manager", "Stock User", "Stock Manager"
 		)
@@ -856,12 +848,8 @@
 		for d in stock_entry.get("items"):
 			if d.item_code != "_Test FG Item 2":
 				rm_cost += flt(d.amount)
-		fg_cost = list(filter(lambda x: x.item_code == "_Test FG Item 2", stock_entry.get("items")))[
-			0
-		].amount
-		self.assertEqual(
-			fg_cost, flt(rm_cost + bom_operation_cost + work_order.additional_operating_cost, 2)
-		)
+		fg_cost = next(filter(lambda x: x.item_code == "_Test FG Item 2", stock_entry.get("items"))).amount
+		self.assertEqual(fg_cost, flt(rm_cost + bom_operation_cost + work_order.additional_operating_cost, 2))
 
 	@change_settings("Manufacturing Settings", {"material_consumption": 1})
 	def test_work_order_manufacture_with_material_consumption(self):
@@ -904,8 +892,8 @@
 		for d in s.get("items"):
 			if d.s_warehouse:
 				rm_cost += d.amount
-		fg_cost = list(filter(lambda x: x.item_code == "_Test FG Item", s.get("items")))[0].amount
-		scrap_cost = list(filter(lambda x: x.is_scrap_item, s.get("items")))[0].amount
+		fg_cost = next(filter(lambda x: x.item_code == "_Test FG Item", s.get("items"))).amount
+		scrap_cost = next(filter(lambda x: x.is_scrap_item, s.get("items"))).amount
 		self.assertEqual(fg_cost, flt(rm_cost - scrap_cost, 2))
 
 		# When Stock Entry has only FG + Scrap
@@ -919,13 +907,11 @@
 				rm_cost += d.amount
 		self.assertEqual(rm_cost, 0)
 		expected_fg_cost = s.get_basic_rate_for_manufactured_item(1)
-		fg_cost = list(filter(lambda x: x.item_code == "_Test FG Item", s.get("items")))[0].amount
+		fg_cost = next(filter(lambda x: x.item_code == "_Test FG Item", s.get("items"))).amount
 		self.assertEqual(flt(fg_cost, 2), flt(expected_fg_cost, 2))
 
 	def test_variant_work_order(self):
-		bom_no = frappe.db.get_value(
-			"BOM", {"item": "_Test Variant Item", "is_default": 1, "docstatus": 1}
-		)
+		bom_no = frappe.db.get_value("BOM", {"item": "_Test Variant Item", "is_default": 1, "docstatus": 1})
 
 		make_item_variant()  # make variant of _Test Variant Item if absent
 
@@ -1061,9 +1047,7 @@
 		self.assertRaises(frappe.ValidationError, repack.submit)
 
 	def test_customer_provided_parts_se(self):
-		create_item(
-			"CUST-0987", is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0
-		)
+		create_item("CUST-0987", is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0)
 		se = make_stock_entry(
 			item_code="CUST-0987", purpose="Material Receipt", qty=4, to_warehouse="_Test Warehouse - _TC"
 		)
@@ -1178,9 +1162,7 @@
 		self.check_gl_entries(
 			"Stock Entry",
 			se.name,
-			sorted(
-				[["Stock Adjustment - TCP1", 100.0, 0.0], ["Miscellaneous Expenses - TCP1", 0.0, 100.0]]
-			),
+			sorted([["Stock Adjustment - TCP1", 100.0, 0.0], ["Miscellaneous Expenses - TCP1", 0.0, 100.0]]),
 		)
 
 	def test_conversion_factor_change(self):
@@ -1344,7 +1326,7 @@
 		)
 		batch_nos.append(get_batch_from_bundle(se2.items[0].serial_and_batch_bundle))
 
-		with self.assertRaises(frappe.ValidationError) as nse:
+		with self.assertRaises(frappe.ValidationError):
 			make_stock_entry(
 				item_code=item_code,
 				qty=1,
@@ -1604,15 +1586,12 @@
 		self.assertRaises(BatchExpiredError, se.save)
 
 	def test_negative_stock_reco(self):
-		from erpnext.controllers.stock_controller import BatchExpiredError
-		from erpnext.stock.doctype.batch.test_batch import make_new_batch
-
 		frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 0)
 
 		item_code = "Test Negative Item - 001"
-		item_doc = create_item(item_code=item_code, is_stock_item=1, valuation_rate=10)
+		create_item(item_code=item_code, is_stock_item=1, valuation_rate=10)
 
-		se1 = make_stock_entry(
+		make_stock_entry(
 			item_code=item_code,
 			posting_date=add_days(today(), -3),
 			posting_time="00:00:00",
@@ -1621,7 +1600,7 @@
 			to_warehouse="_Test Warehouse - _TC",
 		)
 
-		se2 = make_stock_entry(
+		make_stock_entry(
 			item_code=item_code,
 			posting_date=today(),
 			posting_time="00:00:00",
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 48fc31a..c19eaf2 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -610,14 +610,14 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-25 15:58:40.982582",
+ "modified": "2024-03-27 13:10:44.056282",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Entry Detail",
  "naming_rule": "Random",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry_type/stock_entry_type.json b/erpnext/stock/doctype/stock_entry_type/stock_entry_type.json
index eee38be..198fbec 100644
--- a/erpnext/stock/doctype/stock_entry_type/stock_entry_type.json
+++ b/erpnext/stock/doctype/stock_entry_type/stock_entry_type.json
@@ -29,7 +29,7 @@
   }
  ],
  "links": [],
- "modified": "2021-05-21 11:27:01.144110",
+ "modified": "2024-03-27 13:10:44.322729",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Entry Type",
@@ -85,7 +85,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index e8e82af..91dfcfd 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -360,7 +360,7 @@
  "in_create": 1,
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2024-03-13 09:56:13.021696",
+ "modified": "2024-03-27 13:10:44.486742",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Ledger Entry",
@@ -381,7 +381,7 @@
    "role": "Accounts Manager"
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
index b49fe22..a3166a8 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
@@ -232,9 +232,7 @@
 			if not self.serial_and_batch_bundle:
 				self.throw_error_message(f"Serial No / Batch No are mandatory for Item {self.item_code}")
 
-		if (
-			self.serial_and_batch_bundle and not item_detail.has_serial_no and not item_detail.has_batch_no
-		):
+		if self.serial_and_batch_bundle and not item_detail.has_serial_no and not item_detail.has_batch_no:
 			self.throw_error_message(f"Serial No and Batch No are not allowed for Item {self.item_code}")
 
 	def throw_error_message(self, message, exception=frappe.ValidationError):
@@ -262,7 +260,9 @@
 			)
 			if older_than_x_days_ago and stock_settings.stock_auth_role not in frappe.get_roles():
 				frappe.throw(
-					_("Not allowed to update stock transactions older than {0}").format(stock_frozen_upto_days),
+					_("Not allowed to update stock transactions older than {0}").format(
+						stock_frozen_upto_days
+					),
 					StockFreezeError,
 				)
 
@@ -280,7 +280,9 @@
 			expiry_date = frappe.db.get_value("Batch", self.batch_no, "expiry_date")
 			if expiry_date:
 				if getdate(self.posting_date) > getdate(expiry_date):
-					frappe.throw(_("Batch {0} of Item {1} has expired.").format(self.batch_no, self.item_code))
+					frappe.throw(
+						_("Batch {0} of Item {1} has expired.").format(self.batch_no, self.item_code)
+					)
 
 	def validate_and_set_fiscal_year(self):
 		if not self.fiscal_year:
@@ -313,7 +315,7 @@
 					(self.item_code, self.warehouse),
 				)[0][0]
 
-				cur_doc_posting_datetime = "%s %s" % (
+				cur_doc_posting_datetime = "{} {}".format(
 					self.posting_date,
 					self.get("posting_time") or "00:00:00",
 				)
@@ -322,7 +324,9 @@
 					last_transaction_time
 				):
 					msg = _("Last Stock Transaction for item {0} under warehouse {1} was on {2}.").format(
-						frappe.bold(self.item_code), frappe.bold(self.warehouse), frappe.bold(last_transaction_time)
+						frappe.bold(self.item_code),
+						frappe.bold(self.warehouse),
+						frappe.bold(last_transaction_time),
 					)
 
 					msg += "<br><br>" + _(
diff --git a/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py b/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
index 40a2d5a..ce50155 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
+++ b/erpnext/stock/doctype/stock_ledger_entry/test_stock_ledger_entry.py
@@ -8,7 +8,6 @@
 import frappe
 from frappe.core.page.permission_manager.permission_manager import reset
 from frappe.custom.doctype.property_setter.property_setter import make_property_setter
-from frappe.query_builder.functions import CombineDatetime
 from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils import add_days, add_to_date, flt, today
 
@@ -20,8 +19,6 @@
 )
 from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import make_purchase_receipt
 from erpnext.stock.doctype.serial_and_batch_bundle.test_serial_and_batch_bundle import (
-	get_batch_from_bundle,
-	get_serial_nos_from_bundle,
 	make_serial_batch_bundle,
 )
 from erpnext.stock.doctype.stock_entry.stock_entry_utils import make_stock_entry
@@ -40,8 +37,7 @@
 
 		# delete SLE and BINs for all items
 		frappe.db.sql(
-			"delete from `tabStock Ledger Entry` where item_code in (%s)"
-			% (", ".join(["%s"] * len(items))),
+			"delete from `tabStock Ledger Entry` where item_code in (%s)" % (", ".join(["%s"] * len(items))),
 			items,
 		)
 		frappe.db.sql(
@@ -127,7 +123,7 @@
 		self.assertEqual(finished_item_sle.get("valuation_rate"), 540)
 
 		# Reconciliation for _Test Item for Reposting at Stores on 12-04-2020: Qty = 50, Rate = 150
-		sr = create_stock_reconciliation(
+		create_stock_reconciliation(
 			item_code="_Test Item for Reposting",
 			warehouse="Stores - _TC",
 			qty=50,
@@ -491,7 +487,7 @@
 		expected_incoming_rates = expected_abs_svd = [75.0, 125.0, 75.0, 125.0]
 
 		self.assertEqual(expected_abs_svd, svd_list, "Incorrect 'Stock Value Difference' values")
-		for dn, incoming_rate in zip(dns, expected_incoming_rates):
+		for dn, _incoming_rate in zip(dns, expected_incoming_rates, strict=False):
 			self.assertTrue(
 				dn.items[0].incoming_rate in expected_abs_svd,
 				"Incorrect 'Incoming Rate' values fetched for DN items",
@@ -567,9 +563,7 @@
 			],
 		)
 
-		reciept = make_stock_entry(
-			item_code=item_code, target=source, batch_no=batches[0], qty=5, rate=10
-		)
+		reciept = make_stock_entry(item_code=item_code, target=source, batch_no=batches[0], qty=5, rate=10)
 		self.assertSLEs(
 			reciept,
 			[
@@ -691,9 +685,7 @@
 			],
 		)
 
-		consume_today = make_stock_entry(
-			item_code=item_code, source=warehouse, batch_no=batches[0], qty=1
-		)
+		consume_today = make_stock_entry(item_code=item_code, source=warehouse, batch_no=batches[0], qty=1)
 		self.assertSLEs(
 			consume_today,
 			[
@@ -726,8 +718,8 @@
 		item, warehouses, batches = setup_item_valuation_test()
 
 		def check_sle_details_against_expected(sle_details, expected_sle_details, detail, columns):
-			for i, (sle_vals, ex_sle_vals) in enumerate(zip(sle_details, expected_sle_details)):
-				for col, sle_val, ex_sle_val in zip(columns, sle_vals, ex_sle_vals):
+			for i, (sle_vals, ex_sle_vals) in enumerate(zip(sle_details, expected_sle_details, strict=False)):
+				for col, sle_val, ex_sle_val in zip(columns, sle_vals, ex_sle_vals, strict=False):
 					if col == "stock_queue":
 						sle_val = get_stock_value_from_q(sle_val)
 						ex_sle_val = get_stock_value_from_q(ex_sle_val)
@@ -757,9 +749,7 @@
 		se_entry_list_mi = [
 			(item, warehouses[0], None, batches[1], 1, None, "2021-01-29"),
 		]
-		ses = create_stock_entry_entries_for_batchwise_item_valuation_test(
-			se_entry_list_mi, "Material Issue"
-		)
+		ses = create_stock_entry_entries_for_batchwise_item_valuation_test(se_entry_list_mi, "Material Issue")
 		sle_details = fetch_sle_details_for_doc_list(ses, columns=columns, as_dict=0)
 		expected_sle_details = [(-100.0, 50.0, -1.0, 1.0, "[]")]
 		details_list.append((sle_details, expected_sle_details, "Material Issue Entries", columns))
@@ -925,14 +915,14 @@
 		receipt.submit()
 
 		expected_queues = []
-		for idx, rate in enumerate(rates, start=1):
+		for idx in range(1, len(rates) + 1):
 			expected_queues.append({"stock_queue": [[10, 10 * i] for i in range(1, idx + 1)]})
 		self.assertSLEs(receipt, expected_queues)
 
 		transfer = make_stock_entry(
 			item_code=item.name, source=source, target=target, qty=10, do_not_save=True, rate=10
 		)
-		for rate in rates[1:]:
+		for _ in rates[1:]:
 			row = frappe.copy_doc(transfer.items[0], ignore_no_copy=False)
 			transfer.append("items", row)
 
@@ -949,9 +939,7 @@
 
 		rates = [10 * i for i in range(1, 5)]
 
-		receipt = make_stock_entry(
-			item_code=rm.name, target=warehouse, qty=10, do_not_save=True, rate=10
-		)
+		receipt = make_stock_entry(item_code=rm.name, target=warehouse, qty=10, do_not_save=True, rate=10)
 		for rate in rates[1:]:
 			row = frappe.copy_doc(receipt.items[0], ignore_no_copy=False)
 			row.basic_rate = rate
@@ -963,7 +951,7 @@
 		repack = make_stock_entry(
 			item_code=rm.name, source=warehouse, qty=10, do_not_save=True, rate=10, purpose="Repack"
 		)
-		for rate in rates[1:]:
+		for _ in rates[1:]:
 			row = frappe.copy_doc(repack.items[0], ignore_no_copy=False)
 			repack.append("items", row)
 
@@ -981,9 +969,7 @@
 		repack.submit()
 
 		# same exact queue should be transferred
-		self.assertSLEs(
-			repack, [{"incoming_rate": sum(rates) * 10}], sle_filters={"item_code": packed.name}
-		)
+		self.assertSLEs(repack, [{"incoming_rate": sum(rates) * 10}], sle_filters={"item_code": packed.name})
 
 	def test_negative_fifo_valuation(self):
 		"""
@@ -993,7 +979,7 @@
 		item = make_item(properties={"allow_negative_stock": 1}).name
 		warehouse = "_Test Warehouse - _TC"
 
-		receipt = make_stock_entry(item_code=item, target=warehouse, qty=10, rate=10)
+		make_stock_entry(item_code=item, target=warehouse, qty=10, rate=10)
 		consume1 = make_stock_entry(item_code=item, source=warehouse, qty=15)
 
 		self.assertSLEs(consume1, [{"stock_value": -5 * 10, "stock_queue": [[-5, 10]]}])
@@ -1033,27 +1019,21 @@
 		self.assertEqual(50, _get_stock_credit(depdendent_consumption))
 
 		# backdated receipt - should trigger GL repost of all previous stock entries
-		bd_receipt = make_stock_entry(
-			item_code=item, to_warehouse=A, qty=5, rate=20, posting_date=_day(-1)
-		)
+		bd_receipt = make_stock_entry(item_code=item, to_warehouse=A, qty=5, rate=20, posting_date=_day(-1))
 		self.assertEqual(100, _get_stock_credit(depdendent_consumption))
 
 		# cancelling receipt should reset it back
 		bd_receipt.cancel()
 		self.assertEqual(50, _get_stock_credit(depdendent_consumption))
 
-		bd_receipt2 = make_stock_entry(
-			item_code=item, to_warehouse=A, qty=2, rate=20, posting_date=_day(-2)
-		)
+		bd_receipt2 = make_stock_entry(item_code=item, to_warehouse=A, qty=2, rate=20, posting_date=_day(-2))
 		# total as per FIFO -> 2 * 20 + 3 * 10 = 70
 		self.assertEqual(70, _get_stock_credit(depdendent_consumption))
 
 		# transfer WIP material to final destination and consume it all
 		depdendent_consumption.cancel()
 		make_stock_entry(item_code=item, from_warehouse=B, to_warehouse=C, qty=5, posting_date=_day(3))
-		final_consumption = make_stock_entry(
-			item_code=item, from_warehouse=C, qty=5, posting_date=_day(4)
-		)
+		final_consumption = make_stock_entry(item_code=item, from_warehouse=C, qty=5, posting_date=_day(4))
 		# exact amount gets consumed
 		self.assertEqual(70, _get_stock_credit(final_consumption))
 
@@ -1120,11 +1100,10 @@
 		self.assertEqual([1], ordered_qty_after_transaction())
 
 	def test_timestamp_clash(self):
-
 		item = make_item().name
 		warehouse = "_Test Warehouse - _TC"
 
-		reciept = make_stock_entry(
+		make_stock_entry(
 			item_code=item,
 			to_warehouse=warehouse,
 			qty=100,
@@ -1133,7 +1112,7 @@
 			posting_time="01:00:00",
 		)
 
-		consumption = make_stock_entry(
+		make_stock_entry(
 			item_code=item,
 			from_warehouse=warehouse,
 			qty=50,
@@ -1152,11 +1131,10 @@
 
 		try:
 			backdated_receipt.cancel()
-		except Exception as e:
+		except Exception:
 			self.fail("Double processing of qty for clashing timestamp.")
 
 	def test_previous_sle_with_clashed_timestamp(self):
-
 		item = make_item().name
 		warehouse = "_Test Warehouse - _TC"
 
@@ -1197,7 +1175,6 @@
 		self.assertEqual(sle[0].actual_qty, 5)
 
 	def test_backdated_sle_with_same_timestamp(self):
-
 		item = make_item().name
 		warehouse = "_Test Warehouse - _TC"
 
@@ -1440,12 +1417,13 @@
 
 
 def setup_item_valuation_test(
-	valuation_method="FIFO", suffix=None, use_batchwise_valuation=1, batches_list=["X", "Y"]
+	valuation_method="FIFO", suffix=None, use_batchwise_valuation=1, batches_list=None
 ):
-	from erpnext.stock.doctype.batch.batch import make_batch
 	from erpnext.stock.doctype.item.test_item import make_item
 	from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
 
+	if batches_list is None:
+		batches_list = ["X", "Y"]
 	if not suffix:
 		suffix = get_unique_suffix()
 
@@ -1459,7 +1437,7 @@
 	for i, batch_id in enumerate(batches):
 		if not frappe.db.exists("Batch", batch_id):
 			ubw = use_batchwise_valuation
-			if isinstance(use_batchwise_valuation, (list, tuple)):
+			if isinstance(use_batchwise_valuation, list | tuple):
 				ubw = use_batchwise_valuation[i]
 			batch = frappe.get_doc(
 				frappe._dict(
@@ -1490,9 +1468,7 @@
 
 	dns = []
 	for item, warehouse, batch_no, qty, rate in dn_entry_list:
-		so = make_sales_order(
-			rate=rate, qty=qty, item=item, warehouse=warehouse, against_blanket_order=0
-		)
+		so = make_sales_order(rate=rate, qty=qty, item=item, warehouse=warehouse, against_blanket_order=0)
 
 		dn = make_delivery_note(so.name)
 
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
index 9a85431..41cefee 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
@@ -183,7 +183,7 @@
  "idx": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-05-11 09:10:26.327652",
+ "modified": "2024-03-27 13:10:44.699413",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Reconciliation",
@@ -205,7 +205,7 @@
  ],
  "search_fields": "posting_date",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 0311481..913051a 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-from typing import Optional
 
 import frappe
 from frappe import _, bold, msgprint
@@ -58,7 +57,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(StockReconciliation, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.head_row = ["Item Code", "Warehouse", "Quantity", "Valuation Rate"]
 
 	def validate(self):
@@ -142,7 +141,9 @@
 						"type_of_transaction": "Outward",
 						"company": self.company,
 						"is_rejected": 0,
-						"serial_nos": get_serial_nos(row.current_serial_no) if row.current_serial_no else None,
+						"serial_nos": get_serial_nos(row.current_serial_no)
+						if row.current_serial_no
+						else None,
 						"batches": frappe._dict({row.batch_no: row.current_qty}) if row.batch_no else None,
 						"batch_no": row.batch_no,
 						"do_not_submit": True,
@@ -327,7 +328,9 @@
 			if not item.batch_no and not item.serial_no:
 				for dimension in get_inventory_dimensions():
 					if item.get(dimension.get("fieldname")):
-						inventory_dimensions_dict[dimension.get("fieldname")] = item.get(dimension.get("fieldname"))
+						inventory_dimensions_dict[dimension.get("fieldname")] = item.get(
+							dimension.get("fieldname")
+						)
 
 			item_dict = get_stock_balance_for(
 				item.item_code,
@@ -432,11 +435,17 @@
 
 			# do not allow negative valuation
 			if flt(row.valuation_rate) < 0:
-				self.validation_messages.append(_get_msg(row_num, _("Negative Valuation Rate is not allowed")))
+				self.validation_messages.append(
+					_get_msg(row_num, _("Negative Valuation Rate is not allowed"))
+				)
 
 			if row.qty and row.valuation_rate in ["", None]:
 				row.valuation_rate = get_stock_balance(
-					row.item_code, row.warehouse, self.posting_date, self.posting_time, with_valuation_rate=True
+					row.item_code,
+					row.warehouse,
+					self.posting_date,
+					self.posting_time,
+					with_valuation_rate=True,
 				)[1]
 				if not row.valuation_rate:
 					# try if there is a buying price list in default currency
@@ -508,7 +517,7 @@
 			else:
 				items_html = ""
 				for d in data:
-					items_html += "<li>{0} units of Item {1} in Warehouse {2}</li>".format(
+					items_html += "<li>{} units of Item {} in Warehouse {}</li>".format(
 						bold(d[2]), bold(d[0]), bold(d[1])
 					)
 
@@ -528,7 +537,6 @@
 
 		sl_entries = []
 		for row in self.items:
-
 			if not row.qty and not row.valuation_rate and not row.current_qty:
 				self.make_adjustment_entry(row, sl_entries)
 				continue
@@ -578,9 +586,7 @@
 				sl_entries.append(self.get_sle_for_items(row))
 
 		if sl_entries:
-			allow_negative_stock = cint(
-				frappe.db.get_single_value("Stock Settings", "allow_negative_stock")
-			)
+			allow_negative_stock = cint(frappe.db.get_single_value("Stock Settings", "allow_negative_stock"))
 			self.make_sl_entries(sl_entries, allow_negative_stock=allow_negative_stock)
 
 	def make_adjustment_entry(self, row, sl_entries):
@@ -688,9 +694,7 @@
 				data.valuation_rate = flt(row.valuation_rate)
 				data.stock_value_difference = -1 * flt(row.amount_difference)
 
-		elif (
-			self.docstatus == 1 and has_dimensions and (not row.batch_no or not row.serial_and_batch_bundle)
-		):
+		elif self.docstatus == 1 and has_dimensions and (not row.batch_no or not row.serial_and_batch_bundle):
 			data.actual_qty = row.qty
 			data.qty_after_transaction = 0.0
 			data.incoming_rate = flt(row.valuation_rate)
@@ -711,9 +715,7 @@
 				sl_entries = self.merge_similar_item_serial_nos(sl_entries)
 
 			sl_entries.reverse()
-			allow_negative_stock = cint(
-				frappe.db.get_single_value("Stock Settings", "allow_negative_stock")
-			)
+			allow_negative_stock = cint(frappe.db.get_single_value("Stock Settings", "allow_negative_stock"))
 			self.make_sl_entries(sl_entries, allow_negative_stock=allow_negative_stock)
 
 	def merge_similar_item_serial_nos(self, sl_entries):
@@ -741,18 +743,14 @@
 
 				data.incoming_rate = (data.total_amount) / data.actual_qty
 
-		for key, value in merge_similar_entries.items():
-			new_sl_entries.append(value)
-
+		new_sl_entries.extend(merge_similar_entries.values())
 		return new_sl_entries
 
 	def get_gl_entries(self, warehouse_account=None):
 		if not self.cost_center:
 			msgprint(_("Please enter Cost Center"), raise_exception=1)
 
-		return super(StockReconciliation, self).get_gl_entries(
-			warehouse_account, self.expense_account, self.cost_center
-		)
+		return super().get_gl_entries(warehouse_account, self.expense_account, self.cost_center)
 
 	def validate_expense_account(self):
 		if not cint(erpnext.is_perpetual_inventory_enabled(self.company)):
@@ -851,7 +849,12 @@
 				val_rate = item_dict.get("rate")
 			elif row.batch_no:
 				current_qty = get_batch_qty_for_stock_reco(
-					row.item_code, row.warehouse, row.batch_no, self.posting_date, self.posting_time, self.name
+					row.item_code,
+					row.warehouse,
+					row.batch_no,
+					self.posting_date,
+					self.posting_time,
+					self.name,
 				)
 
 			precesion = row.precision("current_qty")
@@ -986,9 +989,7 @@
 		return current_qty
 
 
-def get_batch_qty_for_stock_reco(
-	item_code, warehouse, batch_no, posting_date, posting_time, voucher_no
-):
+def get_batch_qty_for_stock_reco(item_code, warehouse, batch_no, posting_date, posting_time, voucher_no):
 	ledger = frappe.qb.DocType("Stock Ledger Entry")
 
 	query = (
@@ -1018,9 +1019,7 @@
 
 
 @frappe.whitelist()
-def get_items(
-	warehouse, posting_date, posting_time, company, item_code=None, ignore_empty_stock=False
-):
+def get_items(warehouse, posting_date, posting_time, company, item_code=None, ignore_empty_stock=False):
 	ignore_empty_stock = cint(ignore_empty_stock)
 	items = [frappe._dict({"item_code": item_code, "warehouse": warehouse})]
 
@@ -1175,15 +1174,13 @@
 	warehouse: str,
 	posting_date,
 	posting_time,
-	batch_no: Optional[str] = None,
+	batch_no: str | None = None,
 	with_valuation_rate: bool = True,
 	inventory_dimensions_dict=None,
 ):
 	frappe.has_permission("Stock Reconciliation", "write", throw=True)
 
-	item_dict = frappe.get_cached_value(
-		"Item", item_code, ["has_serial_no", "has_batch_no"], as_dict=1
-	)
+	item_dict = frappe.get_cached_value("Item", item_code, ["has_serial_no", "has_batch_no"], as_dict=1)
 
 	if not item_dict:
 		# In cases of data upload to Items table
@@ -1222,9 +1219,7 @@
 		qty, rate = data
 
 	if item_dict.get("has_batch_no"):
-		qty = (
-			get_batch_qty(batch_no, warehouse, posting_date=posting_date, posting_time=posting_time) or 0
-		)
+		qty = get_batch_qty(batch_no, warehouse, posting_date=posting_date, posting_time=posting_time) or 0
 
 	return {
 		"qty": qty,
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index 479a74a..0ffcdd5 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -7,7 +7,7 @@
 
 import frappe
 from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, cstr, flt, nowdate, nowtime, random_string
+from frappe.utils import add_days, cstr, flt, nowdate, nowtime
 
 from erpnext.accounts.utils import get_stock_and_account_balance
 from erpnext.stock.doctype.item.test_item import create_item
@@ -17,7 +17,6 @@
 	get_serial_nos_from_bundle,
 	make_serial_batch_bundle,
 )
-from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
 from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import (
 	EmptyStockReconciliationItemsError,
 	get_items,
@@ -106,7 +105,8 @@
 				# no gl entries
 				self.assertTrue(
 					frappe.db.get_value(
-						"Stock Ledger Entry", {"voucher_type": "Stock Reconciliation", "voucher_no": stock_reco.name}
+						"Stock Ledger Entry",
+						{"voucher_type": "Stock Reconciliation", "voucher_no": stock_reco.name},
 					)
 				)
 
@@ -152,7 +152,6 @@
 
 	def test_stock_reco_for_serialized_item(self):
 		to_delete_records = []
-		to_delete_serial_nos = []
 
 		# Add new serial nos
 		serial_item_code = "Stock-Reco-Serial-Item-1"
@@ -344,9 +343,7 @@
 
 	def test_customer_provided_items(self):
 		item_code = "Stock-Reco-customer-Item-100"
-		create_item(
-			item_code, is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0
-		)
+		create_item(item_code, is_customer_provided_item=1, customer="_Test Customer", is_purchase_item=0)
 
 		sr = create_stock_reconciliation(item_code=item_code, qty=10, rate=420)
 
@@ -529,18 +526,18 @@
 		item_code = self.make_item().name
 		warehouse = "_Test Warehouse - _TC"
 
-		sr = create_stock_reconciliation(
+		create_stock_reconciliation(
 			item_code=item_code, warehouse=warehouse, qty=10, rate=100, posting_date=add_days(nowdate(), 10)
 		)
 
-		dn = create_delivery_note(
+		create_delivery_note(
 			item_code=item_code, warehouse=warehouse, qty=5, rate=120, posting_date=add_days(nowdate(), 12)
 		)
 		old_bin_qty = frappe.db.get_value(
 			"Bin", {"item_code": item_code, "warehouse": warehouse}, "actual_qty"
 		)
 
-		sr2 = create_stock_reconciliation(
+		create_stock_reconciliation(
 			item_code=item_code, warehouse=warehouse, qty=11, rate=100, posting_date=add_days(nowdate(), 11)
 		)
 		new_bin_qty = frappe.db.get_value(
@@ -760,8 +757,6 @@
 		self.assertEqual(flt(sle[0].actual_qty), flt(-100.0))
 
 	def test_backdated_stock_reco_entry_with_batch(self):
-		from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
-
 		item_code = self.make_item(
 			"Test New Batch Item ABCVSD",
 			{
@@ -813,7 +808,7 @@
 		)
 
 		stock_reco1.reload()
-		new_batch_no = get_batch_from_bundle(stock_reco1.items[0].serial_and_batch_bundle)
+		get_batch_from_bundle(stock_reco1.items[0].serial_and_batch_bundle)
 
 		self.assertEqual(len(sles), 2)
 
@@ -828,7 +823,7 @@
 		warehouse = "_Test Warehouse - _TC"
 
 		# Stock Value => 100 * 100 = 10000
-		se = make_stock_entry(
+		make_stock_entry(
 			item_code=item_code,
 			target=warehouse,
 			qty=100,
@@ -988,9 +983,7 @@
 				self.assertEqual(d.actual_qty, 5.0)
 				self.assertAlmostEqual(d.stock_value_difference, 500.0)
 
-		active_serial_no = frappe.get_all(
-			"Serial No", filters={"status": "Active", "item_code": item_code}
-		)
+		active_serial_no = frappe.get_all("Serial No", filters={"status": "Active", "item_code": item_code})
 		self.assertEqual(len(active_serial_no), 5)
 
 
@@ -1083,9 +1076,7 @@
 			)
 		)
 		if frappe.get_all("Stock Ledger Entry", {"company": sr.company})
-		else frappe.get_cached_value(
-			"Account", {"account_type": "Temporary", "company": sr.company}, "name"
-		)
+		else frappe.get_cached_value("Account", {"account_type": "Temporary", "company": sr.company}, "name")
 	)
 	sr.cost_center = (
 		args.cost_center
diff --git a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
index 7342259..7cd14d5 100644
--- a/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
+++ b/erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
@@ -247,14 +247,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2024-02-04 16:19:44.576022",
+ "modified": "2024-03-27 13:10:44.893356",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Reconciliation Item",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
index 68afd99..3eea2fd 100644
--- a/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
+++ b/erpnext/stock/doctype/stock_reposting_settings/stock_reposting_settings.json
@@ -70,7 +70,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2023-11-01 16:14:29.080697",
+ "modified": "2024-03-27 13:10:45.069645",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Reposting Settings",
@@ -87,7 +87,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
index bf5ea74..3de76fa 100644
--- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
+++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.json
@@ -315,7 +315,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2024-02-07 16:05:17.772098",
+ "modified": "2024-03-27 13:10:45.186573",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Reservation Entry",
@@ -421,7 +421,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
index 26fe8e1..91a7375 100644
--- a/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
+++ b/erpnext/stock/doctype/stock_reservation_entry/stock_reservation_entry.py
@@ -153,7 +153,7 @@
 		if self.reservation_based_on == "Qty":
 			self.validate_with_allowed_qty(self.reserved_qty)
 
-	def auto_reserve_serial_and_batch(self, based_on: str = None) -> None:
+	def auto_reserve_serial_and_batch(self, based_on: str | None = None) -> None:
 		"""Auto pick Serial and Batch Nos to reserve when `Reservation Based On` is `Serial and Batch`."""
 
 		if (
@@ -272,9 +272,7 @@
 					if cint(frappe.db.get_value("Batch", entry.batch_no, "disabled")):
 						msg = _(
 							"Row #{0}: Stock cannot be reserved for Item {1} against a disabled Batch {2}."
-						).format(
-							entry.idx, frappe.bold(self.item_code), frappe.bold(entry.batch_no)
-						)
+						).format(entry.idx, frappe.bold(self.item_code), frappe.bold(entry.batch_no))
 						frappe.throw(msg)
 
 					available_qty_to_reserve = get_available_qty_to_reserve(
@@ -360,9 +358,7 @@
 	) -> None:
 		"""Updates total reserved qty in the Pick List."""
 
-		if (
-			self.from_voucher_type == "Pick List" and self.from_voucher_no and self.from_voucher_detail_no
-		):
+		if self.from_voucher_type == "Pick List" and self.from_voucher_no and self.from_voucher_detail_no:
 			sre = frappe.qb.DocType("Stock Reservation Entry")
 			reserved_qty = (
 				frappe.qb.from_(sre)
@@ -390,7 +386,7 @@
 		bin_doc = frappe.get_cached_doc("Bin", bin_name)
 		bin_doc.update_reserved_stock()
 
-	def update_status(self, status: str = None, update_modified: bool = True) -> None:
+	def update_status(self, status: str | None = None, update_modified: bool = True) -> None:
 		"""Updates status based on Voucher Qty, Reserved Qty and Delivered Qty."""
 
 		if not status:
@@ -448,9 +444,7 @@
 			)
 			voucher_delivered_qty = flt(delivered_qty) * flt(conversion_factor)
 
-		allowed_qty = min(
-			self.available_qty, (self.voucher_qty - voucher_delivered_qty - total_reserved_qty)
-		)
+		allowed_qty = min(self.available_qty, (self.voucher_qty - voucher_delivered_qty - total_reserved_qty))
 
 		if self.get("_action") != "submit" and self.voucher_type == "Sales Order" and allowed_qty <= 0:
 			msg = _("Item {0} is already reserved/delivered against Sales Order {1}.").format(
@@ -466,16 +460,16 @@
 		if qty_to_be_reserved > allowed_qty:
 			actual_qty = get_stock_balance(self.item_code, self.warehouse)
 			msg = """
-				Cannot reserve more than Allowed Qty {0} {1} for Item {2} against {3} {4}.<br /><br />
+				Cannot reserve more than Allowed Qty {} {} for Item {} against {} {}.<br /><br />
 				The <b>Allowed Qty</b> is calculated as follows:<br />
 				<ul>
-					<li>Actual Qty [Available Qty at Warehouse] = {5}</li>
-					<li>Reserved Stock [Ignore current SRE] = {6}</li>
-					<li>Available Qty To Reserve [Actual Qty - Reserved Stock] = {7}</li>
-					<li>Voucher Qty [Voucher Item Qty] = {8}</li>
-					<li>Delivered Qty [Qty delivered against the Voucher Item] = {9}</li>
-					<li>Total Reserved Qty [Qty reserved against the Voucher Item] = {10}</li>
-					<li>Allowed Qty [Minimum of (Available Qty To Reserve, (Voucher Qty - Delivered Qty - Total Reserved Qty))] = {11}</li>
+					<li>Actual Qty [Available Qty at Warehouse] = {}</li>
+					<li>Reserved Stock [Ignore current SRE] = {}</li>
+					<li>Available Qty To Reserve [Actual Qty - Reserved Stock] = {}</li>
+					<li>Voucher Qty [Voucher Item Qty] = {}</li>
+					<li>Delivered Qty [Qty delivered against the Voucher Item] = {}</li>
+					<li>Total Reserved Qty [Qty reserved against the Voucher Item] = {}</li>
+					<li>Allowed Qty [Minimum of (Available Qty To Reserve, (Voucher Qty - Delivered Qty - Total Reserved Qty))] = {}</li>
 				</ul>
 			""".format(
 				frappe.bold(allowed_qty),
@@ -511,14 +505,12 @@
 	allowed_voucher_types = ["Sales Order"]
 
 	if voucher.doctype not in allowed_voucher_types:
-		msg = _("Stock Reservation can only be created against {0}.").format(
-			", ".join(allowed_voucher_types)
-		)
+		msg = _("Stock Reservation can only be created against {0}.").format(", ".join(allowed_voucher_types))
 		frappe.throw(msg)
 
 
 def get_available_qty_to_reserve(
-	item_code: str, warehouse: str, batch_no: str = None, ignore_sre=None
+	item_code: str, warehouse: str, batch_no: str | None = None, ignore_sre=None
 ) -> float:
 	"""Returns `Available Qty to Reserve (Actual Qty - Reserved Qty)` for Item, Warehouse and Batch combination."""
 
@@ -611,7 +603,7 @@
 	return available_serial_nos_list
 
 
-def get_sre_reserved_qty_for_item_and_warehouse(item_code: str, warehouse: str = None) -> float:
+def get_sre_reserved_qty_for_item_and_warehouse(item_code: str, warehouse: str | None = None) -> float:
 	"""Returns current `Reserved Qty` for Item and Warehouse combination."""
 
 	sre = frappe.qb.DocType("Stock Reservation Entry")
@@ -635,7 +627,7 @@
 
 
 def get_sre_reserved_qty_for_items_and_warehouses(
-	item_code_list: list, warehouse_list: list = None
+	item_code_list: list, warehouse_list: list | None = None
 ) -> dict:
 	"""Returns a dict like {("item_code", "warehouse"): "reserved_qty", ... }."""
 
@@ -689,7 +681,7 @@
 
 
 def get_sre_reserved_warehouses_for_voucher(
-	voucher_type: str, voucher_no: str, voucher_detail_no: str = None
+	voucher_type: str, voucher_no: str, voucher_detail_no: str | None = None
 ) -> list:
 	"""Returns a list of warehouses where the stock is reserved for the provided voucher."""
 
@@ -744,7 +736,7 @@
 
 
 def get_sre_reserved_serial_nos_details(
-	item_code: str, warehouse: str, serial_nos: list = None
+	item_code: str, warehouse: str, serial_nos: list | None = None
 ) -> dict:
 	"""Returns a dict of `Serial No` reserved in Stock Reservation Entry. The dict is like {serial_no: sre_name, ...}"""
 
@@ -772,9 +764,7 @@
 	return frappe._dict(query.run())
 
 
-def get_sre_reserved_batch_nos_details(
-	item_code: str, warehouse: str, batch_nos: list = None
-) -> dict:
+def get_sre_reserved_batch_nos_details(item_code: str, warehouse: str, batch_nos: list | None = None) -> dict:
 	"""Returns a dict of `Batch Qty` reserved in Stock Reservation Entry. The dict is like {batch_no: qty, ...}"""
 
 	sre = frappe.qb.DocType("Stock Reservation Entry")
@@ -849,9 +839,7 @@
 			sb_entry.batch_no,
 			(sb_entry.qty - sb_entry.delivered_qty).as_("qty"),
 		)
-		.where(
-			(sre.docstatus == 1) & (sre.name == sre_name) & (sre.status.notin(["Delivered", "Cancelled"]))
-		)
+		.where((sre.docstatus == 1) & (sre.name == sre_name) & (sre.status.notin(["Delivered", "Cancelled"])))
 		.where(sb_entry.qty > sb_entry.delivered_qty)
 		.orderby(sb_entry.creation)
 	).run(as_dict=True)
@@ -880,7 +868,7 @@
 		return bundle.name
 
 
-def has_reserved_stock(voucher_type: str, voucher_no: str, voucher_detail_no: str = None) -> bool:
+def has_reserved_stock(voucher_type: str, voucher_no: str, voucher_detail_no: str | None = None) -> bool:
 	"""Returns True if there is any Stock Reservation Entry for the given voucher."""
 
 	if get_stock_reservation_entries_for_voucher(
@@ -893,7 +881,7 @@
 
 def create_stock_reservation_entries_for_so_items(
 	sales_order: object,
-	items_details: list[dict] = None,
+	items_details: list[dict] | None = None,
 	from_voucher_type: Literal["Pick List", "Purchase Receipt"] = None,
 	notify=True,
 ) -> None:
@@ -914,9 +902,7 @@
 
 	validate_stock_reservation_settings(sales_order)
 
-	allow_partial_reservation = frappe.db.get_single_value(
-		"Stock Settings", "allow_partial_reservation"
-	)
+	allow_partial_reservation = frappe.db.get_single_value("Stock Settings", "allow_partial_reservation")
 
 	items = []
 	if items_details:
@@ -1041,7 +1027,9 @@
 			# Skip the item if `Partial Reservation` is disabled in the Stock Settings.
 			if not allow_partial_reservation:
 				if qty_to_be_reserved == flt(item.get("qty_to_reserve")):
-					msg = _("Enable Allow Partial Reservation in the Stock Settings to reserve partial stock.")
+					msg = _(
+						"Enable Allow Partial Reservation in the Stock Settings to reserve partial stock."
+					)
 					frappe.msgprint(msg, title=_("Partial Stock Reservation"), indicator="yellow")
 
 				continue
@@ -1099,13 +1087,13 @@
 
 
 def cancel_stock_reservation_entries(
-	voucher_type: str = None,
-	voucher_no: str = None,
-	voucher_detail_no: str = None,
+	voucher_type: str | None = None,
+	voucher_no: str | None = None,
+	voucher_detail_no: str | None = None,
 	from_voucher_type: Literal["Pick List", "Purchase Receipt"] = None,
-	from_voucher_no: str = None,
-	from_voucher_detail_no: str = None,
-	sre_list: list = None,
+	from_voucher_no: str | None = None,
+	from_voucher_detail_no: str | None = None,
+	sre_list: list | None = None,
 	notify: bool = True,
 ) -> None:
 	"""Cancel Stock Reservation Entries."""
@@ -1151,8 +1139,8 @@
 def get_stock_reservation_entries_for_voucher(
 	voucher_type: str,
 	voucher_no: str,
-	voucher_detail_no: str = None,
-	fields: list[str] = None,
+	voucher_detail_no: str | None = None,
+	fields: list[str] | None = None,
 	ignore_status: bool = False,
 ) -> list[dict]:
 	"""Returns list of Stock Reservation Entries against a Voucher."""
@@ -1171,9 +1159,7 @@
 	sre = frappe.qb.DocType("Stock Reservation Entry")
 	query = (
 		frappe.qb.from_(sre)
-		.where(
-			(sre.docstatus == 1) & (sre.voucher_type == voucher_type) & (sre.voucher_no == voucher_no)
-		)
+		.where((sre.docstatus == 1) & (sre.voucher_type == voucher_type) & (sre.voucher_no == voucher_no))
 		.orderby(sre.creation)
 	)
 
diff --git a/erpnext/stock/doctype/stock_reservation_entry/test_stock_reservation_entry.py b/erpnext/stock/doctype/stock_reservation_entry/test_stock_reservation_entry.py
index dd023e2..ddbf0b2 100644
--- a/erpnext/stock/doctype/stock_reservation_entry/test_stock_reservation_entry.py
+++ b/erpnext/stock/doctype/stock_reservation_entry/test_stock_reservation_entry.py
@@ -25,9 +25,7 @@
 	def setUp(self) -> None:
 		self.warehouse = "_Test Warehouse - _TC"
 		self.sr_item = make_item(properties={"is_stock_item": 1, "valuation_rate": 100})
-		create_material_receipt(
-			items={self.sr_item.name: self.sr_item}, warehouse=self.warehouse, qty=100
-		)
+		create_material_receipt(items={self.sr_item.name: self.sr_item}, warehouse=self.warehouse, qty=100)
 
 	@change_settings("Stock Settings", {"allow_negative_stock": 0})
 	def test_validate_stock_reservation_settings(self) -> None:
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index 51036ad..62881c9 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -444,7 +444,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2024-02-25 16:32:01.084453",
+ "modified": "2024-03-27 13:10:45.423987",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Stock Settings",
@@ -465,7 +465,7 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py
index d975c29..7fcda1d 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.py
@@ -112,9 +112,9 @@
 		for field in warehouse_fields:
 			if frappe.db.get_value("Warehouse", self.get(field), "is_group"):
 				frappe.throw(
-					_("Group Warehouses cannot be used in transactions. Please change the value of {0}").format(
-						frappe.bold(self.meta.get_field(field).label)
-					),
+					_(
+						"Group Warehouses cannot be used in transactions. Please change the value of {0}"
+					).format(frappe.bold(self.meta.get_field(field).label)),
 					title=_("Incorrect Warehouse"),
 				)
 
@@ -160,7 +160,6 @@
 
 		# Change in value of `Allow Negative Stock`
 		if self.has_value_changed("allow_negative_stock"):
-
 			# Disable -> Enable: Don't allow if `Stock Reservation` is enabled
 			if self.allow_negative_stock and self.enable_stock_reservation:
 				frappe.throw(
@@ -171,10 +170,8 @@
 
 		# Change in value of `Enable Stock Reservation`
 		if self.has_value_changed("enable_stock_reservation"):
-
 			# Disable -> Enable
 			if self.enable_stock_reservation:
-
 				# Don't allow if `Allow Negative Stock` is enabled
 				if self.allow_negative_stock:
 					frappe.throw(
@@ -190,7 +187,10 @@
 					precision = frappe.db.get_single_value("System Settings", "float_precision") or 3
 					bin = frappe.qb.DocType("Bin")
 					bin_with_negative_stock = (
-						frappe.qb.from_(bin).select(bin.name).where(Round(bin.actual_qty, precision) < 0).limit(1)
+						frappe.qb.from_(bin)
+						.select(bin.name)
+						.where(Round(bin.actual_qty, precision) < 0)
+						.limit(1)
 					).run()
 
 					if bin_with_negative_stock:
diff --git a/erpnext/stock/doctype/stock_settings/test_stock_settings.py b/erpnext/stock/doctype/stock_settings/test_stock_settings.py
index cda739e..4b5ae43 100644
--- a/erpnext/stock/doctype/stock_settings/test_stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/test_stock_settings.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2017, Frappe Technologies Pvt. Ltd. and Contributors
 # See license.txt
 
-import unittest
 
 import frappe
 from frappe.tests.utils import FrappeTestCase
diff --git a/erpnext/stock/doctype/uom_category/uom_category.json b/erpnext/stock/doctype/uom_category/uom_category.json
index c5c38a0..1d2c42d 100644
--- a/erpnext/stock/doctype/uom_category/uom_category.json
+++ b/erpnext/stock/doctype/uom_category/uom_category.json
@@ -1,93 +1,47 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 1, 
- "autoname": "field:category_name", 
- "beta": 0, 
- "creation": "2018-04-30 17:27:14.742005", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "allow_rename": 1,
+ "autoname": "field:category_name",
+ "creation": "2018-04-30 17:27:14.742005",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "category_name"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "category_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Category Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "category_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Category Name",
+   "reqd": 1,
+   "unique": 1
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 0, 
- "max_attachments": 0, 
- "modified": "2018-04-30 17:33:25.638223", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "UOM Category", 
- "name_case": "", 
- "owner": "Administrator", 
+ ],
+ "links": [],
+ "modified": "2024-03-27 13:10:57.525335",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "UOM Category",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 1, 
-   "email": 1, 
-   "export": 1, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "delete": 1,
+   "email": 1,
+   "export": 1,
+   "print": 1,
+   "read": 1,
+   "report": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
index 6f28651..a5b880e 100644
--- a/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
+++ b/erpnext/stock/doctype/uom_conversion_detail/uom_conversion_detail.json
@@ -1,87 +1,43 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "autoname": "hash", 
- "beta": 0, 
- "creation": "2013-02-22 01:28:04", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "editable_grid": 1, 
+ "actions": [],
+ "autoname": "hash",
+ "creation": "2013-02-22 01:28:04",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "uom",
+  "conversion_factor"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "uom", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "UOM", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "uom", 
-   "oldfieldtype": "Link", 
-   "options": "UOM", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "uom",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "UOM",
+   "oldfieldname": "uom",
+   "oldfieldtype": "Link",
+   "options": "UOM"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "conversion_factor", 
-   "fieldtype": "Float", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_list_view": 1, 
-   "label": "Conversion Factor", 
-   "length": 0, 
-   "no_copy": 0, 
-   "oldfieldname": "conversion_factor", 
-   "oldfieldtype": "Float", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "conversion_factor",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Conversion Factor",
+   "oldfieldname": "conversion_factor",
+   "oldfieldtype": "Float"
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 1, 
- "image_view": 0, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2016-07-11 03:28:09.626948", 
- "modified_by": "Administrator", 
- "module": "Stock", 
- "name": "UOM Conversion Detail", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 0, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "track_seen": 0
+ ],
+ "idx": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:57.645955",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "UOM Conversion Detail",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/stock/doctype/variant_field/variant_field.json b/erpnext/stock/doctype/variant_field/variant_field.json
index 5a7da15..c3c8155 100644
--- a/erpnext/stock/doctype/variant_field/variant_field.json
+++ b/erpnext/stock/doctype/variant_field/variant_field.json
@@ -18,14 +18,14 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2022-03-25 05:48:30.946201",
+ "modified": "2024-03-27 13:10:58.011300",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Variant Field",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/stock/doctype/warehouse/test_warehouse.py b/erpnext/stock/doctype/warehouse/test_warehouse.py
index 5a7228a..02d64ca 100644
--- a/erpnext/stock/doctype/warehouse/test_warehouse.py
+++ b/erpnext/stock/doctype/warehouse/test_warehouse.py
@@ -58,7 +58,7 @@
 			warehouse_ids.append(warehouse_id)
 
 		item_names = [f"_Test Item {i} for Unlinking" for i in range(2)]
-		for item, warehouse in zip(item_names, warehouse_ids):
+		for item, warehouse in zip(item_names, warehouse_ids, strict=False):
 			create_item(item, warehouse=warehouse, company=company)
 
 		# Delete warehouses
@@ -78,7 +78,6 @@
 				)
 
 	def test_group_non_group_conversion(self):
-
 		warehouse = frappe.get_doc("Warehouse", create_warehouse("TestGroupConversion"))
 
 		convert_to_group_or_ledger(warehouse.name)
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index 7b0cade..b4c4383 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -263,7 +263,7 @@
  "idx": 1,
  "is_tree": 1,
  "links": [],
- "modified": "2024-01-24 16:27:28.299520",
+ "modified": "2024-03-27 13:10:59.216651",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Warehouse",
@@ -317,7 +317,7 @@
   }
  ],
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "title_field": "warehouse_name",
diff --git a/erpnext/stock/doctype/warehouse/warehouse.py b/erpnext/stock/doctype/warehouse/warehouse.py
index 07b354a..b05e31c 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.py
+++ b/erpnext/stock/doctype/warehouse/warehouse.py
@@ -55,9 +55,7 @@
 
 	def onload(self):
 		"""load account name for General Ledger Report"""
-		if self.company and cint(
-			frappe.db.get_value("Company", self.company, "enable_perpetual_inventory")
-		):
+		if self.company and cint(frappe.db.get_value("Company", self.company, "enable_perpetual_inventory")):
 			account = self.account or get_warehouse_account(self)
 
 			if account:
@@ -224,7 +222,7 @@
 	from frappe.utils.nestedset import get_descendants_of
 
 	children = get_descendants_of("Warehouse", warehouse, ignore_permissions=True, order_by="lft")
-	return children + [warehouse]  # append self for backward compatibility
+	return [*children, warehouse]  # append self for backward compatibility
 
 
 def get_warehouses_based_on_account(account, company=None):
diff --git a/erpnext/stock/doctype/warehouse_type/warehouse_type.json b/erpnext/stock/doctype/warehouse_type/warehouse_type.json
index 9993bfd..c9105df 100644
--- a/erpnext/stock/doctype/warehouse_type/warehouse_type.json
+++ b/erpnext/stock/doctype/warehouse_type/warehouse_type.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "Prompt",
  "creation": "2019-05-21 15:27:06.514511",
  "doctype": "DocType",
@@ -13,7 +14,8 @@
    "label": "Description"
   }
  ],
- "modified": "2019-05-27 18:35:33.354571",
+ "links": [],
+ "modified": "2024-03-27 13:10:59.427114",
  "modified_by": "Administrator",
  "module": "Stock",
  "name": "Warehouse Type",
@@ -102,7 +104,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index ebbc18d..ee2f9cb 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -156,19 +156,14 @@
 
 
 def update_bin_details(args, out, doc):
-	if (
-		args.get("doctype") == "Material Request"
-		and args.get("material_request_type") == "Material Transfer"
-	):
+	if args.get("doctype") == "Material Request" and args.get("material_request_type") == "Material Transfer":
 		out.update(get_bin_details(args.item_code, args.get("from_warehouse")))
 
 	elif out.get("warehouse"):
 		company = args.company if (doc and doc.get("doctype") == "Purchase Order") else None
 
 		# calculate company_total_stock only for po
-		bin_details = get_bin_details(
-			args.item_code, out.warehouse, company, include_child_warehouses=True
-		)
+		bin_details = get_bin_details(args.item_code, out.warehouse, company, include_child_warehouses=True)
 
 		out.update(bin_details)
 
@@ -274,9 +269,7 @@
 	if not item:
 		item = frappe.get_doc("Item", args.get("item_code"))
 
-	if (
-		item.variant_of and not item.taxes and frappe.db.exists("Item Tax", {"parent": item.variant_of})
-	):
+	if item.variant_of and not item.taxes and frappe.db.exists("Item Tax", {"parent": item.variant_of}):
 		item.update_template_tables()
 
 	item_defaults = get_item_defaults(item.name, args.company)
@@ -321,9 +314,7 @@
 	# Set stock UOM in args, so that it can be used while fetching item price
 	args.stock_uom = item.stock_uom
 
-	if args.get("batch_no") and item.name != frappe.get_cached_value(
-		"Batch", args.get("batch_no"), "item"
-	):
+	if args.get("batch_no") and item.name != frappe.get_cached_value("Batch", args.get("batch_no"), "item"):
 		args["batch_no"] = ""
 
 	out = frappe._dict(
@@ -344,9 +335,7 @@
 			"provisional_expense_account": get_provisional_account(
 				args, item_defaults, item_group_defaults, brand_defaults
 			),
-			"cost_center": get_default_cost_center(
-				args, item_defaults, item_group_defaults, brand_defaults
-			),
+			"cost_center": get_default_cost_center(args, item_defaults, item_group_defaults, brand_defaults),
 			"has_serial_no": item.has_serial_no,
 			"has_batch_no": item.has_batch_no,
 			"batch_no": args.get("batch_no"),
@@ -372,9 +361,7 @@
 			if args.get("doctype") in ["Sales Order", "Sales Invoice"]
 			else 0,
 			"is_fixed_asset": item.is_fixed_asset,
-			"last_purchase_rate": item.last_purchase_rate
-			if args.get("doctype") in ["Purchase Order"]
-			else 0,
+			"last_purchase_rate": item.last_purchase_rate if args.get("doctype") in ["Purchase Order"] else 0,
 			"transaction_date": args.get("transaction_date"),
 			"against_blanket_order": args.get("against_blanket_order"),
 			"bom_no": item.get("default_bom"),
@@ -510,9 +497,7 @@
 
 	itemwise_barcode = {}
 	for item in items_list:
-		barcodes = frappe.db.get_all(
-			"Item Barcode", filters={"parent": item.item_code}, fields="barcode"
-		)
+		barcodes = frappe.db.get_all("Item Barcode", filters={"parent": item.item_code}, fields="barcode")
 
 		for barcode in barcodes:
 			if item.item_code not in itemwise_barcode:
@@ -532,13 +517,13 @@
 	if item_rates is None:
 		item_rates = {}
 
-	if isinstance(item_codes, (str,)):
+	if isinstance(item_codes, str):
 		item_codes = json.loads(item_codes)
 
-	if isinstance(item_rates, (str,)):
+	if isinstance(item_rates, str):
 		item_rates = json.loads(item_rates)
 
-	if isinstance(item_tax_templates, (str,)):
+	if isinstance(item_tax_templates, str):
 		item_tax_templates = json.loads(item_tax_templates)
 
 	for item_code in item_codes:
@@ -606,9 +591,7 @@
 				taxes_with_no_validity.append(tax)
 
 	if taxes_with_validity:
-		taxes = sorted(
-			taxes_with_validity, key=lambda i: i.valid_from or tax.maximum_net_rate, reverse=True
-		)
+		taxes = sorted(taxes_with_validity, key=lambda i: i.valid_from or tax.maximum_net_rate, reverse=True)
 	else:
 		taxes = taxes_with_no_validity
 
@@ -761,7 +744,7 @@
 
 	elif not cost_center and args.get("item_code") and company:
 		for method in ["get_item_defaults", "get_item_group_defaults", "get_brand_defaults"]:
-			path = "erpnext.stock.get_item_details.{0}".format(method)
+			path = f"erpnext.stock.get_item_details.{method}"
 			data = frappe.get_attr(path)(args.get("item_code"), company)
 
 			if data and (data.selling_cost_center or data.buying_cost_center):
@@ -776,11 +759,7 @@
 	if not cost_center and args.get("cost_center"):
 		cost_center = args.get("cost_center")
 
-	if (
-		company
-		and cost_center
-		and frappe.get_cached_value("Cost Center", cost_center, "company") != company
-	):
+	if company and cost_center and frappe.get_cached_value("Cost Center", cost_center, "company") != company:
 		return None
 
 	if not cost_center and company:
@@ -790,11 +769,7 @@
 
 
 def get_default_supplier(args, item, item_group, brand):
-	return (
-		item.get("default_supplier")
-		or item_group.get("default_supplier")
-		or brand.get("default_supplier")
-	)
+	return item.get("default_supplier") or item_group.get("default_supplier") or brand.get("default_supplier")
 
 
 def get_price_list_rate(args, item_doc, out=None):
@@ -829,9 +804,7 @@
 			if not price_list_rate:
 				return out
 
-		out.price_list_rate = (
-			flt(price_list_rate) * flt(args.plc_conversion_rate) / flt(args.conversion_rate)
-		)
+		out.price_list_rate = flt(price_list_rate) * flt(args.plc_conversion_rate) / flt(args.conversion_rate)
 
 		if frappe.db.get_single_value("Buying Settings", "disable_last_purchase_rate"):
 			return out
@@ -846,9 +819,7 @@
 
 def insert_item_price(args):
 	"""Insert Item Price if Price List and Price List Rate are specified and currency is the same"""
-	if frappe.db.get_value(
-		"Price List", args.price_list, "currency", cache=True
-	) == args.currency and cint(
+	if frappe.db.get_value("Price List", args.price_list, "currency", cache=True) == args.currency and cint(
 		frappe.db.get_single_value("Stock Settings", "auto_insert_price_list_rate_if_missing")
 	):
 		if frappe.has_permission("Item Price", "write"):
@@ -870,7 +841,9 @@
 				):
 					frappe.db.set_value("Item Price", item_price.name, "price_list_rate", price_list_rate)
 					frappe.msgprint(
-						_("Item Price updated for {0} in Price List {1}").format(args.item_code, args.price_list),
+						_("Item Price updated for {0} in Price List {1}").format(
+							args.item_code, args.price_list
+						),
 						alert=True,
 					)
 			else:
@@ -891,7 +864,7 @@
 				)
 
 
-def get_item_price(args, item_code, ignore_party=False):
+def get_item_price(args, item_code, ignore_party=False) -> list[dict]:
 	"""
 	Get name, price_list_rate from Item Price based on conditions
 	        Check if the desired qty is within the increment of the packing list.
@@ -913,6 +886,7 @@
 		.orderby(ip.valid_from, order=frappe.qb.desc)
 		.orderby(IfNull(ip.batch_no, ""), order=frappe.qb.desc)
 		.orderby(ip.uom, order=frappe.qb.desc)
+		.limit(1)
 	)
 
 	if not ignore_party:
@@ -929,7 +903,7 @@
 			& (IfNull(ip.valid_upto, "2500-12-31") >= args["transaction_date"])
 		)
 
-	return query.run()
+	return query.run(as_dict=True)
 
 
 def get_price_list_rate_for(args, item_code):
@@ -955,7 +929,7 @@
 	price_list_rate = get_item_price(item_price_args, item_code)
 	if price_list_rate:
 		desired_qty = args.get("qty")
-		if desired_qty and check_packing_list(price_list_rate[0][0], desired_qty, item_code):
+		if desired_qty and check_packing_list(price_list_rate[0].name, desired_qty, item_code):
 			item_price_data = price_list_rate
 	else:
 		for field in ["customer", "supplier"]:
@@ -975,12 +949,12 @@
 			item_price_data = general_price_list_rate
 
 	if item_price_data:
-		if item_price_data[0][2] == args.get("uom"):
-			return item_price_data[0][1]
+		if item_price_data[0].uom == args.get("uom"):
+			return item_price_data[0].price_list_rate
 		elif not args.get("price_list_uom_dependant"):
-			return flt(item_price_data[0][1] * flt(args.get("conversion_factor", 1)))
+			return flt(item_price_data[0].price_list_rate * flt(args.get("conversion_factor", 1)))
 		else:
-			return item_price_data[0][1]
+			return item_price_data[0].price_list_rate
 
 
 def check_packing_list(price_list_rate_name, desired_qty, item_code):
@@ -1010,11 +984,7 @@
 	if not args.conversion_rate and args.currency == company_currency:
 		args.conversion_rate = 1.0
 
-	if (
-		not args.ignore_conversion_rate
-		and args.conversion_rate == 1
-		and args.currency != company_currency
-	):
+	if not args.ignore_conversion_rate and args.conversion_rate == 1 and args.currency != company_currency:
 		args.conversion_rate = (
 			get_exchange_rate(args.currency, company_currency, args.transaction_date, "for_buying") or 1.0
 		)
@@ -1049,7 +1019,9 @@
 			if meta.get_field("plc_conversion_rate"):
 				args.plc_conversion_rate = flt(
 					args.plc_conversion_rate,
-					get_field_precision(meta.get_field("plc_conversion_rate"), frappe._dict({"fields": args})),
+					get_field_precision(
+						meta.get_field("plc_conversion_rate"), frappe._dict({"fields": args})
+					),
 				)
 
 
@@ -1287,9 +1259,7 @@
 	company_currency = get_company_currency(args.company)
 
 	if (not plc_conversion_rate) or (
-		price_list_currency
-		and args.price_list_currency
-		and price_list_currency != args.price_list_currency
+		price_list_currency and args.price_list_currency and price_list_currency != args.price_list_currency
 	):
 		# cksgb 19/09/2016: added args.transaction_date as posting_date argument for get_exchange_rate
 		plc_conversion_rate = (
@@ -1311,9 +1281,7 @@
 @frappe.whitelist()
 def get_default_bom(item_code=None):
 	def _get_bom(item):
-		bom = frappe.get_all(
-			"BOM", dict(item=item, is_active=True, is_default=True, docstatus=1), limit=1
-		)
+		bom = frappe.get_all("BOM", dict(item=item, is_active=True, is_default=True, docstatus=1), limit=1)
 		return bom[0].name if bom else None
 
 	if not item_code:
@@ -1353,7 +1321,7 @@
 		pi_item = frappe.qb.DocType("Purchase Invoice Item")
 		valuation_rate = (
 			frappe.qb.from_(pi_item)
-			.select((Sum(pi_item.base_net_amount) / Sum(pi_item.qty * pi_item.conversion_factor)))
+			.select(Sum(pi_item.base_net_amount) / Sum(pi_item.qty * pi_item.conversion_factor))
 			.where((pi_item.docstatus == 1) & (pi_item.item_code == item_code))
 		).run()
 
diff --git a/erpnext/stock/reorder_item.py b/erpnext/stock/reorder_item.py
index 59f8b20..a24e852 100644
--- a/erpnext/stock/reorder_item.py
+++ b/erpnext/stock/reorder_item.py
@@ -58,9 +58,7 @@
 				item_warehouse_projected_qty.get(kwargs.item_code, {}).get(kwargs.warehouse_group)
 			)
 		else:
-			projected_qty = flt(
-				item_warehouse_projected_qty.get(kwargs.item_code, {}).get(kwargs.warehouse)
-			)
+			projected_qty = flt(item_warehouse_projected_qty.get(kwargs.item_code, {}).get(kwargs.warehouse))
 
 		if (reorder_level or reorder_qty) and projected_qty <= reorder_level:
 			deficiency = reorder_level - projected_qty
@@ -188,13 +186,12 @@
 
 	for item_code, warehouse, projected_qty in frappe.db.sql(
 		"""select item_code, warehouse, projected_qty
-		from tabBin where item_code in ({0})
+		from tabBin where item_code in ({})
 			and (warehouse != '' and warehouse is not null)""".format(
 			", ".join(["%s"] * len(items_to_consider))
 		),
 		items_to_consider,
 	):
-
 		if item_code not in item_warehouse_projected_qty:
 			item_warehouse_projected_qty.setdefault(item_code, {})
 
@@ -242,7 +239,9 @@
 					{
 						"company": company,
 						"transaction_date": nowdate(),
-						"material_request_type": "Material Transfer" if request_type == "Transfer" else request_type,
+						"material_request_type": "Material Transfer"
+						if request_type == "Transfer"
+						else request_type,
 					}
 				)
 
@@ -257,7 +256,9 @@
 						if uom != item.stock_uom:
 							conversion_factor = (
 								frappe.db.get_value(
-									"UOM Conversion Detail", {"parent": item.name, "uom": uom}, "conversion_factor"
+									"UOM Conversion Detail",
+									{"parent": item.name, "uom": uom},
+									"conversion_factor",
 								)
 								or 1.0
 							)
@@ -323,9 +324,7 @@
 
 		msg = frappe.render_template("templates/emails/reorder_item.html", {"mr_list": mr_list})
 
-		frappe.sendmail(
-			recipients=email_list, subject=_("Auto Material Requests Generated"), message=msg
-		)
+		frappe.sendmail(recipients=email_list, subject=_("Auto Material Requests Generated"), message=msg)
 
 
 def get_email_list(company):
@@ -378,7 +377,7 @@
 	for exception in exceptions_list:
 		try:
 			exception = json.loads(exception)
-			error_message = """<div class='small text-muted'>{0}</div><br>""".format(
+			error_message = """<div class='small text-muted'>{}</div><br>""".format(
 				_(exception.get("message"))
 			)
 			content += error_message
diff --git a/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py
index 5661e8b..3820b3e 100644
--- a/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py
+++ b/erpnext/stock/report/batch_item_expiry_status/batch_item_expiry_status.py
@@ -28,15 +28,15 @@
 
 
 def get_columns():
-	return (
-		[_("Item") + ":Link/Item:150"]
-		+ [_("Item Name") + "::150"]
-		+ [_("Batch") + ":Link/Batch:150"]
-		+ [_("Stock UOM") + ":Link/UOM:100"]
-		+ [_("Quantity") + ":Float:100"]
-		+ [_("Expires On") + ":Date:100"]
-		+ [_("Expiry (In Days)") + ":Int:130"]
-	)
+	return [
+		_("Item") + ":Link/Item:150",
+		_("Item Name") + "::150",
+		_("Batch") + ":Link/Batch:150",
+		_("Stock UOM") + ":Link/UOM:100",
+		_("Quantity") + ":Float:100",
+		_("Expires On") + ":Date:100",
+		_("Expiry (In Days)") + ":Int:130",
+	]
 
 
 def get_data(filters):
@@ -76,9 +76,7 @@
 		.where(
 			(batch.disabled == 0)
 			& (batch.batch_qty > 0)
-			& (
-				(Date(batch.creation) >= filters["from_date"]) & (Date(batch.creation) <= filters["to_date"])
-			)
+			& ((Date(batch.creation) >= filters["from_date"]) & (Date(batch.creation) <= filters["to_date"]))
 		)
 		.orderby(batch.creation)
 	)
diff --git a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
index 7f2608e..fe0cefd 100644
--- a/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
+++ b/erpnext/stock/report/batch_wise_balance_history/batch_wise_balance_history.py
@@ -70,18 +70,18 @@
 def get_columns(filters):
 	"""return columns based on filters"""
 
-	columns = (
-		[_("Item") + ":Link/Item:100"]
-		+ [_("Item Name") + "::150"]
-		+ [_("Description") + "::150"]
-		+ [_("Warehouse") + ":Link/Warehouse:100"]
-		+ [_("Batch") + ":Link/Batch:100"]
-		+ [_("Opening Qty") + ":Float:90"]
-		+ [_("In Qty") + ":Float:80"]
-		+ [_("Out Qty") + ":Float:80"]
-		+ [_("Balance Qty") + ":Float:90"]
-		+ [_("UOM") + "::90"]
-	)
+	columns = [
+		_("Item") + ":Link/Item:100",
+		_("Item Name") + "::150",
+		_("Description") + "::150",
+		_("Warehouse") + ":Link/Warehouse:100",
+		_("Batch") + ":Link/Batch:100",
+		_("Opening Qty") + ":Float:90",
+		_("In Qty") + ":Float:80",
+		_("Out Qty") + ":Float:80",
+		_("Balance Qty") + ":Float:90",
+		_("UOM") + "::90",
+	]
 
 	return columns
 
@@ -195,9 +195,7 @@
 
 def get_item_details(filters):
 	item_map = {}
-	for d in (frappe.qb.from_("Item").select("name", "item_name", "description", "stock_uom")).run(
-		as_dict=1
-	):
+	for d in (frappe.qb.from_("Item").select("name", "item_name", "description", "stock_uom")).run(as_dict=1):
 		item_map.setdefault(d.name, d)
 
 	return item_map
diff --git a/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py b/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py
index 4642a53..0711941 100644
--- a/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py
+++ b/erpnext/stock/report/cogs_by_item_group/cogs_by_item_group.py
@@ -3,7 +3,6 @@
 
 import datetime
 from collections import OrderedDict
-from typing import Dict, List, Tuple, Union
 
 import frappe
 from frappe import _
@@ -13,15 +12,15 @@
 
 Filters = frappe._dict
 Row = frappe._dict
-Data = List[Row]
-Columns = List[Dict[str, str]]
-DateTime = Union[datetime.date, datetime.datetime]
-FilteredEntries = List[Dict[str, Union[str, float, DateTime, None]]]
-ItemGroupsDict = Dict[Tuple[int, int], Dict[str, Union[str, int]]]
-SVDList = List[frappe._dict]
+Data = list[Row]
+Columns = list[dict[str, str]]
+DateTime = datetime.date | datetime.datetime
+FilteredEntries = list[dict[str, str | float | DateTime | None]]
+ItemGroupsDict = dict[tuple[int, int], dict[str, str | int]]
+SVDList = list[frappe._dict]
 
 
-def execute(filters: Filters) -> Tuple[Columns, Data]:
+def execute(filters: Filters) -> tuple[Columns, Data]:
 	update_filters_with_account(filters)
 	validate_filters(filters)
 	columns = get_columns()
@@ -158,7 +157,7 @@
 		item.item_group = ig_map[item.get("item_code")]
 
 
-def get_item_groups_map(svd_list: SVDList) -> Dict[str, str]:
+def get_item_groups_map(svd_list: SVDList) -> dict[str, str]:
 	item_codes = set(i["item_code"] for i in svd_list)
 	ig_list = frappe.get_list(
 		"Item", fields=["item_code", "item_group"], filters=[("item_code", "in", item_codes)]
@@ -168,9 +167,7 @@
 
 def get_item_groups_dict() -> ItemGroupsDict:
 	item_groups_list = frappe.get_all("Item Group", fields=("name", "is_group", "lft", "rgt"))
-	return {
-		(i["lft"], i["rgt"]): {"name": i["name"], "is_group": i["is_group"]} for i in item_groups_list
-	}
+	return {(i["lft"], i["rgt"]): {"name": i["name"], "is_group": i["is_group"]} for i in item_groups_list}
 
 
 def update_leveled_dict(leveled_dict: OrderedDict) -> None:
diff --git a/erpnext/stock/report/delayed_item_report/delayed_item_report.py b/erpnext/stock/report/delayed_item_report/delayed_item_report.py
index 546a834..0bfb4da 100644
--- a/erpnext/stock/report/delayed_item_report/delayed_item_report.py
+++ b/erpnext/stock/report/delayed_item_report/delayed_item_report.py
@@ -13,7 +13,7 @@
 	return data, columns
 
 
-class DelayedItemReport(object):
+class DelayedItemReport:
 	def __init__(self, filters=None):
 		self.filters = frappe._dict(filters or {})
 
diff --git a/erpnext/stock/report/delayed_order_report/delayed_order_report.py b/erpnext/stock/report/delayed_order_report/delayed_order_report.py
index 197218d..24be939 100644
--- a/erpnext/stock/report/delayed_order_report/delayed_order_report.py
+++ b/erpnext/stock/report/delayed_order_report/delayed_order_report.py
@@ -20,7 +20,7 @@
 		return self.get_columns(), self.get_data(consolidated=True) or []
 
 	def get_data(self, consolidated=False):
-		data = super(DelayedOrderReport, self).get_data(consolidated) or []
+		data = super().get_data(consolidated) or []
 
 		so_list = []
 		result = []
diff --git a/erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py b/erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py
index 9e14033..404a58b 100644
--- a/erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py
+++ b/erpnext/stock/report/fifo_queue_vs_qty_after_transaction_comparison/fifo_queue_vs_qty_after_transaction_comparison.py
@@ -40,19 +40,18 @@
 
 
 def get_stock_ledger_entries(filters):
-
 	sle_filters = {"is_cancelled": 0}
 
 	if filters.warehouse:
 		children = get_descendants_of("Warehouse", filters.warehouse)
-		sle_filters["warehouse"] = ("in", children + [filters.warehouse])
+		sle_filters["warehouse"] = ("in", [*children, filters.warehouse])
 
 	if filters.item_code:
 		sle_filters["item_code"] = filters.item_code
 	elif filters.get("item_group"):
 		item_group = filters.get("item_group")
 		children = get_descendants_of("Item Group", item_group)
-		item_group_filter = {"item_group": ("in", children + [item_group])}
+		item_group_filter = {"item_group": ("in", [*children, item_group])}
 		sle_filters["item_code"] = (
 			"in",
 			frappe.get_all("Item", filters=item_group_filter, pluck="name", order_by=None),
diff --git a/erpnext/stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py b/erpnext/stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py
index b68db35..163e7ab 100644
--- a/erpnext/stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py
+++ b/erpnext/stock/report/incorrect_balance_qty_after_transaction/incorrect_balance_qty_after_transaction.py
@@ -27,7 +27,7 @@
 
 def validate_data(itewise_balance_qty):
 	res = []
-	for key, data in itewise_balance_qty.items():
+	for _key, data in itewise_balance_qty.items():
 		row = get_incorrect_data(data)
 		if row:
 			res.append(row)
diff --git a/erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py b/erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py
index 39d84a7..4d740bd 100644
--- a/erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py
+++ b/erpnext/stock/report/incorrect_serial_no_valuation/incorrect_serial_no_valuation.py
@@ -43,11 +43,9 @@
 def get_incorrect_serial_nos(serial_nos_data):
 	result = []
 
-	total_value = frappe._dict(
-		{"qty": 0, "valuation_rate": 0, "serial_no": frappe.bold(_("Balance"))}
-	)
+	total_value = frappe._dict({"qty": 0, "valuation_rate": 0, "serial_no": frappe.bold(_("Balance"))})
 
-	for serial_no, data in serial_nos_data.items():
+	for _serial_no, data in serial_nos_data.items():
 		total_dict = frappe._dict({"qty": 0, "valuation_rate": 0, "serial_no": frappe.bold(_("Total"))})
 
 		if check_incorrect_serial_data(data, total_dict):
diff --git a/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py b/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
index da958a8..7be8831 100644
--- a/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
+++ b/erpnext/stock/report/incorrect_stock_value_report/incorrect_stock_value_report.py
@@ -16,9 +16,7 @@
 def execute(filters=None):
 	if not erpnext.is_perpetual_inventory_enabled(filters.company):
 		frappe.throw(
-			_("Perpetual inventory required for the company {0} to view this report.").format(
-				filters.company
-			)
+			_("Perpetual inventory required for the company {0} to view this report.").format(filters.company)
 		)
 
 	data = get_data(filters)
@@ -83,9 +81,7 @@
 
 	closing_date = add_days(from_date, -1)
 	for key, stock_data in voucher_wise_dict.items():
-		prev_stock_value = get_stock_value_on(
-			posting_date=closing_date, item_code=key[0], warehouses=key[1]
-		)
+		prev_stock_value = get_stock_value_on(posting_date=closing_date, item_code=key[0], warehouses=key[1])
 		for data in stock_data:
 			expected_stock_value = prev_stock_value + data.stock_value_difference
 			if abs(data.stock_value - expected_stock_value) > 0.1:
diff --git a/erpnext/stock/report/item_prices/item_prices.py b/erpnext/stock/report/item_prices/item_prices.py
index a53a9f2..5c5b84f 100644
--- a/erpnext/stock/report/item_prices/item_prices.py
+++ b/erpnext/stock/report/item_prices/item_prices.py
@@ -111,9 +111,7 @@
 	).run(as_dict=True)
 
 	for d in price_list:
-		d.update(
-			{"price": "{0} {1} - {2}".format(d.currency, round(d.price_list_rate, 2), d.price_list)}
-		)
+		d.update({"price": f"{d.currency} {round(d.price_list_rate, 2)} - {d.price_list}"})
 		d.pop("currency")
 		d.pop("price_list_rate")
 		d.pop("price_list")
diff --git a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
index c4358b8..dffe948 100644
--- a/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
+++ b/erpnext/stock/report/itemwise_recommended_reorder_level/itemwise_recommended_reorder_level.py
@@ -24,9 +24,7 @@
 
 	data = []
 	for item in items:
-		total_outgoing = flt(consumed_item_map.get(item.name, 0)) + flt(
-			delivered_item_map.get(item.name, 0)
-		)
+		total_outgoing = flt(consumed_item_map.get(item.name, 0)) + flt(delivered_item_map.get(item.name, 0))
 		avg_daily_outgoing = flt(total_outgoing / diff, float_precision)
 		reorder_level = (avg_daily_outgoing * flt(item.lead_time_days)) + flt(item.safety_stock)
 
diff --git a/erpnext/stock/report/reserved_stock/reserved_stock.py b/erpnext/stock/report/reserved_stock/reserved_stock.py
index 21ce203..7963851 100644
--- a/erpnext/stock/report/reserved_stock/reserved_stock.py
+++ b/erpnext/stock/report/reserved_stock/reserved_stock.py
@@ -73,10 +73,10 @@
 		"project",
 	]:
 		if value := filters.get(field):
-			query = query.where((sre[field] == value))
+			query = query.where(sre[field] == value)
 
 	if value := filters.get("stock_reservation_entry"):
-		query = query.where((sre.name == value))
+		query = query.where(sre.name == value)
 
 	data = query.run(as_list=True)
 
diff --git a/erpnext/stock/report/reserved_stock/test_reserved_stock.py b/erpnext/stock/report/reserved_stock/test_reserved_stock.py
index 6ef89f9..16906fb 100644
--- a/erpnext/stock/report/reserved_stock/test_reserved_stock.py
+++ b/erpnext/stock/report/reserved_stock/test_reserved_stock.py
@@ -2,7 +2,6 @@
 # See license.txt
 from random import randint
 
-import frappe
 from frappe.tests.utils import FrappeTestCase, change_settings
 from frappe.utils.data import today
 
diff --git a/erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py b/erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py
index 3ea5e82..7bd8d70 100644
--- a/erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py
+++ b/erpnext/stock/report/serial_and_batch_summary/serial_and_batch_summary.py
@@ -146,9 +146,7 @@
 		)
 
 	if not item_details or item_details.get("has_serial_no"):
-		columns.append(
-			{"label": _("Serial No"), "fieldname": "serial_no", "fieldtype": "Data", "width": 120}
-		)
+		columns.append({"label": _("Serial No"), "fieldname": "serial_no", "fieldtype": "Data", "width": 120})
 
 	if not item_details or item_details.get("has_batch_no"):
 		columns.extend(
@@ -184,7 +182,7 @@
 
 	query_filters = {"options": ["in", [d.parent for d in child_doctypes]]}
 	if txt:
-		query_filters["parent"] = ["like", "%{}%".format(txt)]
+		query_filters["parent"] = ["like", f"%{txt}%"]
 
 	return frappe.get_all("DocField", filters=query_filters, fields=["distinct parent"], as_list=True)
 
diff --git a/erpnext/stock/report/serial_no_ledger/serial_no_ledger.py b/erpnext/stock/report/serial_no_ledger/serial_no_ledger.py
index 3f5216b..f229f73 100644
--- a/erpnext/stock/report/serial_no_ledger/serial_no_ledger.py
+++ b/erpnext/stock/report/serial_no_ledger/serial_no_ledger.py
@@ -84,9 +84,7 @@
 		return []
 
 	data = []
-	serial_bundle_ids = [
-		d.serial_and_batch_bundle for d in stock_ledgers if d.serial_and_batch_bundle
-	]
+	serial_bundle_ids = [d.serial_and_batch_bundle for d in stock_ledgers if d.serial_and_batch_bundle]
 
 	bundle_wise_serial_nos = get_serial_nos(filters, serial_bundle_ids)
 
diff --git a/erpnext/stock/report/stock_ageing/stock_ageing.py b/erpnext/stock/report/stock_ageing/stock_ageing.py
index 02ac8c6..efa736c 100644
--- a/erpnext/stock/report/stock_ageing/stock_ageing.py
+++ b/erpnext/stock/report/stock_ageing/stock_ageing.py
@@ -2,8 +2,8 @@
 # License: GNU General Public License v3. See license.txt
 
 
+from collections.abc import Iterator
 from operator import itemgetter
-from typing import Dict, Iterator, List, Tuple, Union
 
 import frappe
 from frappe import _
@@ -14,7 +14,7 @@
 Filters = frappe._dict
 
 
-def execute(filters: Filters = None) -> Tuple:
+def execute(filters: Filters = None) -> tuple:
 	to_date = filters["to_date"]
 	columns = get_columns(filters)
 
@@ -26,14 +26,14 @@
 	return columns, data, None, chart_data
 
 
-def format_report_data(filters: Filters, item_details: Dict, to_date: str) -> List[Dict]:
+def format_report_data(filters: Filters, item_details: dict, to_date: str) -> list[dict]:
 	"Returns ordered, formatted data with ranges."
 	_func = itemgetter(1)
 	data = []
 
 	precision = cint(frappe.db.get_single_value("System Settings", "float_precision", cache=True))
 
-	for item, item_dict in item_details.items():
+	for _item, item_dict in item_details.items():
 		if not flt(item_dict.get("total_qty"), precision):
 			continue
 
@@ -74,12 +74,12 @@
 	return data
 
 
-def get_average_age(fifo_queue: List, to_date: str) -> float:
+def get_average_age(fifo_queue: list, to_date: str) -> float:
 	batch_age = age_qty = total_qty = 0.0
 	for batch in fifo_queue:
 		batch_age = date_diff(to_date, batch[1])
 
-		if isinstance(batch[0], (int, float)):
+		if isinstance(batch[0], int | float):
 			age_qty += batch_age * batch[0]
 			total_qty += batch[0]
 		else:
@@ -89,8 +89,7 @@
 	return flt(age_qty / total_qty, 2) if total_qty else 0.0
 
 
-def get_range_age(filters: Filters, fifo_queue: List, to_date: str, item_dict: Dict) -> Tuple:
-
+def get_range_age(filters: Filters, fifo_queue: list, to_date: str, item_dict: dict) -> tuple:
 	precision = cint(frappe.db.get_single_value("System Settings", "float_precision", cache=True))
 
 	range1 = range2 = range3 = above_range3 = 0.0
@@ -111,7 +110,7 @@
 	return range1, range2, range3, above_range3
 
 
-def get_columns(filters: Filters) -> List[Dict]:
+def get_columns(filters: Filters) -> list[dict]:
 	range_columns = []
 	setup_ageing_columns(filters, range_columns)
 	columns = [
@@ -169,7 +168,7 @@
 	return columns
 
 
-def get_chart_data(data: List, filters: Filters) -> Dict:
+def get_chart_data(data: list, filters: Filters) -> dict:
 	if not data:
 		return []
 
@@ -193,7 +192,7 @@
 	}
 
 
-def setup_ageing_columns(filters: Filters, range_columns: List):
+def setup_ageing_columns(filters: Filters, range_columns: list):
 	ranges = [
 		f"0 - {filters['range1']}",
 		f"{cint(filters['range1']) + 1} - {cint(filters['range2'])}",
@@ -205,23 +204,21 @@
 		add_column(range_columns, label=_("Age ({0})").format(label), fieldname=fieldname)
 
 
-def add_column(
-	range_columns: List, label: str, fieldname: str, fieldtype: str = "Float", width: int = 140
-):
+def add_column(range_columns: list, label: str, fieldname: str, fieldtype: str = "Float", width: int = 140):
 	range_columns.append(dict(label=label, fieldname=fieldname, fieldtype=fieldtype, width=width))
 
 
 class FIFOSlots:
 	"Returns FIFO computed slots of inwarded stock as per date."
 
-	def __init__(self, filters: Dict = None, sle: List = None):
+	def __init__(self, filters: dict | None = None, sle: list | None = None):
 		self.item_details = {}
 		self.transferred_item_details = {}
 		self.serial_no_batch_purchase_details = {}
 		self.filters = filters
 		self.sle = sle
 
-	def generate(self) -> Dict:
+	def generate(self) -> dict:
 		"""
 		Returns dict of the foll.g structure:
 		Key = Item A / (Item A, Warehouse A)
@@ -264,7 +261,7 @@
 
 		return self.item_details
 
-	def __init_key_stores(self, row: Dict) -> Tuple:
+	def __init_key_stores(self, row: dict) -> tuple:
 		"Initialise keys and FIFO Queue."
 
 		key = (row.name, row.warehouse)
@@ -276,9 +273,7 @@
 
 		return key, fifo_queue, transferred_item_key
 
-	def __compute_incoming_stock(
-		self, row: Dict, fifo_queue: List, transfer_key: Tuple, serial_nos: List
-	):
+	def __compute_incoming_stock(self, row: dict, fifo_queue: list, transfer_key: tuple, serial_nos: list):
 		"Update FIFO Queue on inward stock."
 
 		transfer_data = self.transferred_item_details.get(transfer_key)
@@ -304,9 +299,7 @@
 					self.serial_no_batch_purchase_details.setdefault(serial_no, row.posting_date)
 					fifo_queue.append([serial_no, row.posting_date])
 
-	def __compute_outgoing_stock(
-		self, row: Dict, fifo_queue: List, transfer_key: Tuple, serial_nos: List
-	):
+	def __compute_outgoing_stock(self, row: dict, fifo_queue: list, transfer_key: tuple, serial_nos: list):
 		"Update FIFO Queue on outward stock."
 		if serial_nos:
 			fifo_queue[:] = [serial_no for serial_no in fifo_queue if serial_no[0] not in serial_nos]
@@ -332,7 +325,7 @@
 				self.transferred_item_details[transfer_key].append([qty_to_pop, slot[1]])
 				qty_to_pop = 0
 
-	def __adjust_incoming_transfer_qty(self, transfer_data: Dict, fifo_queue: List, row: Dict):
+	def __adjust_incoming_transfer_qty(self, transfer_data: dict, fifo_queue: list, row: dict):
 		"Add previously removed stock back to FIFO Queue."
 		transfer_qty_to_pop = flt(row.actual_qty)
 
@@ -359,7 +352,7 @@
 				add_to_fifo_queue([transfer_qty_to_pop, transfer_data[0][1]])
 				transfer_qty_to_pop = 0
 
-	def __update_balances(self, row: Dict, key: Union[Tuple, str]):
+	def __update_balances(self, row: dict, key: tuple | str):
 		self.item_details[key]["qty_after_transaction"] = row.qty_after_transaction
 
 		if "total_qty" not in self.item_details[key]:
@@ -369,7 +362,7 @@
 
 		self.item_details[key]["has_serial_no"] = row.has_serial_no
 
-	def __aggregate_details_by_item(self, wh_wise_data: Dict) -> Dict:
+	def __aggregate_details_by_item(self, wh_wise_data: dict) -> dict:
 		"Aggregate Item-Wh wise data into single Item entry."
 		item_aggregated_data = {}
 		for key, row in wh_wise_data.items():
@@ -377,7 +370,12 @@
 			if not item_aggregated_data.get(item):
 				item_aggregated_data.setdefault(
 					item,
-					{"details": frappe._dict(), "fifo_queue": [], "qty_after_transaction": 0.0, "total_qty": 0.0},
+					{
+						"details": frappe._dict(),
+						"fifo_queue": [],
+						"qty_after_transaction": 0.0,
+						"total_qty": 0.0,
+					},
 				)
 			item_row = item_aggregated_data.get(item)
 			item_row["details"].update(row["details"])
@@ -388,7 +386,7 @@
 
 		return item_aggregated_data
 
-	def __get_stock_ledger_entries(self) -> Iterator[Dict]:
+	def __get_stock_ledger_entries(self) -> Iterator[dict]:
 		sle = frappe.qb.DocType("Stock Ledger Entry")
 		item = self.__get_item_query()  # used as derived table in sle query
 
diff --git a/erpnext/stock/report/stock_analytics/stock_analytics.py b/erpnext/stock/report/stock_analytics/stock_analytics.py
index ab48181..920c315 100644
--- a/erpnext/stock/report/stock_analytics/stock_analytics.py
+++ b/erpnext/stock/report/stock_analytics/stock_analytics.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2013, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 import datetime
-from typing import List
 
 import frappe
 from frappe import _, scrub
@@ -48,12 +47,10 @@
 
 	ranges = get_period_date_ranges(filters)
 
-	for dummy, end_date in ranges:
+	for _dummy, end_date in ranges:
 		period = get_period(end_date, filters)
 
-		columns.append(
-			{"label": _(period), "fieldname": scrub(period), "fieldtype": "Float", "width": 120}
-		)
+		columns.append({"label": _(period), "fieldname": scrub(period), "fieldtype": "Float", "width": 120})
 
 	return columns
 
@@ -67,7 +64,7 @@
 	increment = {"Monthly": 1, "Quarterly": 3, "Half-Yearly": 6, "Yearly": 12}.get(filters.range, 1)
 
 	periodic_daterange = []
-	for dummy in range(1, 53, increment):
+	for _dummy in range(1, 53, increment):
 		if filters.range == "Weekly":
 			period_end_date = from_date + relativedelta(days=6)
 		else:
@@ -116,9 +113,7 @@
 	elif filters.range == "Monthly":
 		period = _(str(months[posting_date.month - 1])) + " " + str(posting_date.year)
 	elif filters.range == "Quarterly":
-		period = _("Quarter {0} {1}").format(
-			str(((posting_date.month - 1) // 3) + 1), str(posting_date.year)
-		)
+		period = _("Quarter {0} {1}").format(str(((posting_date.month - 1) // 3) + 1), str(posting_date.year))
 	else:
 		year = get_fiscal_year(posting_date, company=filters.company)
 		period = str(year[2])
@@ -188,15 +183,13 @@
 		periodic_data.setdefault(d.item_code, {}).setdefault(period, {}).setdefault(d.warehouse, 0.0)
 
 		periodic_data[d.item_code]["balance"][d.warehouse] += value
-		periodic_data[d.item_code][period][d.warehouse] = periodic_data[d.item_code]["balance"][
-			d.warehouse
-		]
+		periodic_data[d.item_code][period][d.warehouse] = periodic_data[d.item_code]["balance"][d.warehouse]
 
 	return periodic_data
 
 
 def fill_intermediate_periods(
-	periodic_data, item_code: str, current_period: str, all_periods: List[str]
+	periodic_data, item_code: str, current_period: str, all_periods: list[str]
 ) -> None:
 	"""There might be intermediate periods where no stock ledger entry exists, copy previous previous data.
 
@@ -235,7 +228,7 @@
 
 	today = getdate()
 
-	for dummy, item_data in item_details.items():
+	for _dummy, item_data in item_details.items():
 		row = {
 			"name": item_data.name,
 			"item_name": item_data.item_name,
@@ -273,7 +266,7 @@
 		item_filters = {"is_stock_item": 1}
 		if item_group := filters.get("item_group"):
 			children = get_descendants_of("Item Group", item_group, ignore_permissions=True)
-			item_filters["item_group"] = ("in", children + [item_group])
+			item_filters["item_group"] = ("in", [*children, item_group])
 		if brand := filters.get("brand"):
 			item_filters["brand"] = brand
 
diff --git a/erpnext/stock/report/stock_analytics/test_stock_analytics.py b/erpnext/stock/report/stock_analytics/test_stock_analytics.py
index dd8f8d8..b4f086c 100644
--- a/erpnext/stock/report/stock_analytics/test_stock_analytics.py
+++ b/erpnext/stock/report/stock_analytics/test_stock_analytics.py
@@ -3,7 +3,7 @@
 import frappe
 from frappe import _dict
 from frappe.tests.utils import FrappeTestCase
-from frappe.utils.data import add_to_date, get_datetime, getdate, nowdate
+from frappe.utils.data import add_to_date, getdate
 
 from erpnext.accounts.utils import get_fiscal_year
 from erpnext.stock.doctype.item.test_item import make_item
@@ -55,7 +55,6 @@
 		self.assertEqual(actual_buckets, expected_buckets)
 
 	def test_get_period_date_ranges(self):
-
 		filters = _dict(range="Monthly", from_date="2020-12-28", to_date="2021-02-06")
 
 		ranges = get_period_date_ranges(filters)
@@ -69,7 +68,6 @@
 		self.assertEqual(ranges, expected_ranges)
 
 	def test_get_period_date_ranges_yearly(self):
-
 		filters = _dict(range="Yearly", from_date="2021-01-28", to_date="2021-02-06")
 
 		ranges = get_period_date_ranges(filters)
diff --git a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
index 416cf48..67e340d 100644
--- a/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
+++ b/erpnext/stock/report/stock_and_account_value_comparison/stock_and_account_value_comparison.py
@@ -14,9 +14,7 @@
 def execute(filters=None):
 	if not erpnext.is_perpetual_inventory_enabled(filters.company):
 		frappe.throw(
-			_("Perpetual inventory required for the company {0} to view this report.").format(
-				filters.company
-			)
+			_("Perpetual inventory required for the company {0} to view this report.").format(filters.company)
 		)
 
 	data = get_data(filters)
@@ -34,7 +32,7 @@
 		"posting_date": ("<=", report_filters.as_on_date),
 	}
 
-	currency_precision = get_currency_precision() or 2
+	get_currency_precision() or 2
 	stock_ledger_entries = get_stock_ledger_data(report_filters, filters)
 	voucher_wise_gl_data = get_gl_data(report_filters, filters)
 
diff --git a/erpnext/stock/report/stock_balance/stock_balance.py b/erpnext/stock/report/stock_balance/stock_balance.py
index 500affa..0d31398 100644
--- a/erpnext/stock/report/stock_balance/stock_balance.py
+++ b/erpnext/stock/report/stock_balance/stock_balance.py
@@ -3,7 +3,7 @@
 
 
 from operator import itemgetter
-from typing import Any, Dict, List, Optional, TypedDict
+from typing import Any, TypedDict
 
 import frappe
 from frappe import _
@@ -20,27 +20,27 @@
 
 
 class StockBalanceFilter(TypedDict):
-	company: Optional[str]
+	company: str | None
 	from_date: str
 	to_date: str
-	item_group: Optional[str]
-	item: Optional[str]
-	warehouse: Optional[str]
-	warehouse_type: Optional[str]
-	include_uom: Optional[str]  # include extra info in converted UOM
+	item_group: str | None
+	item: str | None
+	warehouse: str | None
+	warehouse_type: str | None
+	include_uom: str | None  # include extra info in converted UOM
 	show_stock_ageing_data: bool
 	show_variant_attributes: bool
 
 
-SLEntry = Dict[str, Any]
+SLEntry = dict[str, Any]
 
 
-def execute(filters: Optional[StockBalanceFilter] = None):
+def execute(filters: StockBalanceFilter | None = None):
 	return StockBalanceReport(filters).run()
 
 
-class StockBalanceReport(object):
-	def __init__(self, filters: Optional[StockBalanceFilter]) -> None:
+class StockBalanceReport:
+	def __init__(self, filters: StockBalanceFilter | None) -> None:
 		self.filters = filters
 		self.from_date = getdate(filters.get("from_date"))
 		self.to_date = getdate(filters.get("to_date"))
@@ -48,7 +48,7 @@
 		self.start_from = None
 		self.data = []
 		self.columns = []
-		self.sle_entries: List[SLEntry] = []
+		self.sle_entries: list[SLEntry] = []
 		self.set_company_currency()
 
 	def set_company_currency(self) -> None:
@@ -106,7 +106,7 @@
 		if self.filters.get("show_variant_attributes"):
 			variant_values = self.get_variant_values_for()
 
-		for key, report_data in self.item_warehouse_map.items():
+		for _key, report_data in self.item_warehouse_map.items():
 			if variant_data := variant_values.get(report_data.item_code):
 				report_data.update(variant_data)
 
@@ -201,7 +201,6 @@
 			qty_dict.opening_val += value_diff
 
 		elif entry.posting_date >= self.from_date and entry.posting_date <= self.to_date:
-
 			if flt(qty_diff, self.float_precision) >= 0:
 				qty_dict.in_qty += qty_diff
 				qty_dict.in_val += value_diff
@@ -247,7 +246,7 @@
 
 		return tuple(group_by_key)
 
-	def get_closing_balance(self) -> List[Dict[str, Any]]:
+	def get_closing_balance(self) -> list[dict[str, Any]]:
 		if self.filters.get("ignore_closing_balance"):
 			return []
 
@@ -342,7 +341,7 @@
 	def apply_items_filters(self, query, item_table) -> str:
 		if item_group := self.filters.get("item_group"):
 			children = get_descendants_of("Item Group", item_group, ignore_permissions=True)
-			query = query.where(item_table.item_group.isin(children + [item_group]))
+			query = query.where(item_table.item_group.isin([*children, item_group]))
 
 		for field in ["item_code", "brand"]:
 			if not self.filters.get(field):
@@ -566,7 +565,9 @@
 					frappe.qb.from_(sr)
 					.select(sr.name, Coalesce("Stock Reconciliation").as_("voucher_type"))
 					.where(
-						(sr.docstatus == 1) & (sr.posting_date <= self.to_date) & (sr.purpose == "Opening Stock")
+						(sr.docstatus == 1)
+						& (sr.posting_date <= self.to_date)
+						& (sr.purpose == "Opening Stock")
 					)
 				)
 			).select("voucher_type", "name")
@@ -592,7 +593,7 @@
 
 
 def filter_items_with_no_transactions(
-	iwb_map, float_precision: float, inventory_dimensions: list = None
+	iwb_map, float_precision: float, inventory_dimensions: list | None = None
 ):
 	pop_keys = []
 	for group_by_key in iwb_map:
@@ -629,6 +630,6 @@
 	return iwb_map
 
 
-def get_variants_attributes() -> List[str]:
+def get_variants_attributes() -> list[str]:
 	"""Return all item variant attributes."""
 	return frappe.get_all("Item Attribute", pluck="name")
diff --git a/erpnext/stock/report/stock_balance/test_stock_balance.py b/erpnext/stock/report/stock_balance/test_stock_balance.py
index e963de2..8b3dbee 100644
--- a/erpnext/stock/report/stock_balance/test_stock_balance.py
+++ b/erpnext/stock/report/stock_balance/test_stock_balance.py
@@ -1,4 +1,4 @@
-from typing import Any, Dict
+from typing import Any
 
 import frappe
 from frappe import _dict
@@ -32,12 +32,11 @@
 	def tearDown(self):
 		frappe.db.rollback()
 
-	def assertPartialDictEq(self, expected: Dict[str, Any], actual: Dict[str, Any]):
+	def assertPartialDictEq(self, expected: dict[str, Any], actual: dict[str, Any]):
 		for k, v in expected.items():
 			self.assertEqual(v, actual[k], msg=f"{expected=}\n{actual=}")
 
 	def generate_stock_ledger(self, item_code: str, movements):
-
 		for movement in map(_dict, movements):
 			if "to_warehouse" not in movement:
 				movement.to_warehouse = "_Test Warehouse - _TC"
@@ -128,7 +127,6 @@
 		self.assertPartialDictEq({"opening_qty": 6, "in_qty": 0}, rows[0])
 
 	def test_uom_converted_info(self):
-
 		self.item.append("uoms", {"conversion_factor": 5, "uom": "Box"})
 		self.item.save()
 
@@ -167,8 +165,6 @@
 		variant.save()
 
 		self.generate_stock_ledger(variant.name, [_dict(qty=5, rate=10)])
-		rows = stock_balance(
-			self.filters.update({"show_variant_attributes": 1, "item_code": variant.name})
-		)
+		rows = stock_balance(self.filters.update({"show_variant_attributes": 1, "item_code": variant.name}))
 		self.assertPartialDictEq(attributes, rows[0])
 		self.assertInvariants(rows)
diff --git a/erpnext/stock/report/stock_ledger/stock_ledger.py b/erpnext/stock/report/stock_ledger/stock_ledger.py
index e98351a..97e2f55 100644
--- a/erpnext/stock/report/stock_ledger/stock_ledger.py
+++ b/erpnext/stock/report/stock_ledger/stock_ledger.py
@@ -547,11 +547,8 @@
 def get_warehouse_condition(warehouse):
 	warehouse_details = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"], as_dict=1)
 	if warehouse_details:
-		return (
-			" exists (select name from `tabWarehouse` wh \
-			where wh.lft >= %s and wh.rgt <= %s and warehouse = wh.name)"
-			% (warehouse_details.lft, warehouse_details.rgt)
-		)
+		return f" exists (select name from `tabWarehouse` wh \
+			where wh.lft >= {warehouse_details.lft} and wh.rgt <= {warehouse_details.rgt} and warehouse = wh.name)"
 
 	return ""
 
@@ -562,22 +559,17 @@
 		if item_table:
 			ig = frappe.qb.DocType("Item Group")
 			return item_table.item_group.isin(
-				(
-					frappe.qb.from_(ig)
-					.select(ig.name)
-					.where(
-						(ig.lft >= item_group_details.lft)
-						& (ig.rgt <= item_group_details.rgt)
-						& (item_table.item_group == ig.name)
-					)
+				frappe.qb.from_(ig)
+				.select(ig.name)
+				.where(
+					(ig.lft >= item_group_details.lft)
+					& (ig.rgt <= item_group_details.rgt)
+					& (item_table.item_group == ig.name)
 				)
 			)
 		else:
-			return (
-				"item.item_group in (select ig.name from `tabItem Group` ig \
-				where ig.lft >= %s and ig.rgt <= %s and item.item_group = ig.name)"
-				% (item_group_details.lft, item_group_details.rgt)
-			)
+			return f"item.item_group in (select ig.name from `tabItem Group` ig \
+				where ig.lft >= {item_group_details.lft} and ig.rgt <= {item_group_details.rgt} and item.item_group = ig.name)"
 
 
 def check_inventory_dimension_filters_applied(filters) -> bool:
diff --git a/erpnext/stock/report/stock_ledger/test_stock_ledger_report.py b/erpnext/stock/report/stock_ledger/test_stock_ledger_report.py
index c3c85aa..12800f2 100644
--- a/erpnext/stock/report/stock_ledger/test_stock_ledger_report.py
+++ b/erpnext/stock/report/stock_ledger/test_stock_ledger_report.py
@@ -8,9 +8,6 @@
 from erpnext.maintenance.doctype.maintenance_schedule.test_maintenance_schedule import (
 	make_serial_item_with_serial,
 )
-from erpnext.stock.doctype.delivery_note.test_delivery_note import create_delivery_note
-from erpnext.stock.doctype.serial_no.serial_no import get_serial_nos
-from erpnext.stock.report.stock_ledger.stock_ledger import execute
 
 
 class TestStockLedgerReeport(FrappeTestCase):
diff --git a/erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py b/erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py
index 189a90a..0b7e551 100644
--- a/erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py
+++ b/erpnext/stock/report/stock_ledger_variance/stock_ledger_variance.py
@@ -228,7 +228,7 @@
 	return data
 
 
-def get_item_warehouse_combinations(filters: dict = None) -> dict:
+def get_item_warehouse_combinations(filters: dict | None = None) -> dict:
 	filters = frappe._dict(filters or {})
 
 	bin = frappe.qb.DocType("Bin")
@@ -284,7 +284,5 @@
 		return True
 	elif difference_in == "Valuation" and valuation_diff:
 		return True
-	elif difference_in not in ["Qty", "Value", "Valuation"] and (
-		qty_diff or value_diff or valuation_diff
-	):
+	elif difference_in not in ["Qty", "Value", "Valuation"] and (qty_diff or value_diff or valuation_diff):
 		return True
diff --git a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
index 31c756d..743656c 100644
--- a/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
+++ b/erpnext/stock/report/stock_projected_qty/stock_projected_qty.py
@@ -250,9 +250,7 @@
 		query = query.where(bin.item_code == filters.item_code)
 
 	if filters.warehouse:
-		warehouse_details = frappe.db.get_value(
-			"Warehouse", filters.warehouse, ["lft", "rgt"], as_dict=1
-		)
+		warehouse_details = frappe.db.get_value("Warehouse", filters.warehouse, ["lft", "rgt"], as_dict=1)
 
 		if warehouse_details:
 			wh = frappe.qb.DocType("Warehouse")
@@ -286,7 +284,9 @@
 			(item.is_stock_item == 1)
 			& (item.disabled == 0)
 			& (
-				(item.end_of_life > today()) | (item.end_of_life.isnull()) | (item.end_of_life == "0000-00-00")
+				(item.end_of_life > today())
+				| (item.end_of_life.isnull())
+				| (item.end_of_life == "0000-00-00")
 			)
 			& (ExistsCriterion(frappe.qb.from_(bin).select(bin.name).where(bin.item_code == item.name)))
 		)
diff --git a/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py b/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
index 8c76908..e28b2d7 100644
--- a/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
+++ b/erpnext/stock/report/supplier_wise_sales_analytics/supplier_wise_sales_analytics.py
@@ -20,7 +20,6 @@
 		total_qty = total_amount = 0.0
 		if consumed_details.get(item_code):
 			for cd in consumed_details.get(item_code):
-
 				if cd.voucher_no not in material_transfer_vouchers:
 					if cd.voucher_type in ["Delivery Note", "Sales Invoice"]:
 						delivered_qty += abs(flt(cd.actual_qty))
@@ -54,19 +53,19 @@
 def get_columns(filters):
 	"""return columns based on filters"""
 
-	columns = (
-		[_("Item") + ":Link/Item:100"]
-		+ [_("Item Name") + "::100"]
-		+ [_("Description") + "::150"]
-		+ [_("UOM") + ":Link/UOM:90"]
-		+ [_("Consumed Qty") + ":Float:110"]
-		+ [_("Consumed Amount") + ":Currency:130"]
-		+ [_("Delivered Qty") + ":Float:110"]
-		+ [_("Delivered Amount") + ":Currency:130"]
-		+ [_("Total Qty") + ":Float:110"]
-		+ [_("Total Amount") + ":Currency:130"]
-		+ [_("Supplier(s)") + "::250"]
-	)
+	columns = [
+		_("Item") + ":Link/Item:100",
+		_("Item Name") + "::100",
+		_("Description") + "::150",
+		_("UOM") + ":Link/UOM:90",
+		_("Consumed Qty") + ":Float:110",
+		_("Consumed Amount") + ":Currency:130",
+		_("Delivered Qty") + ":Float:110",
+		_("Delivered Amount") + ":Currency:130",
+		_("Total Qty") + ":Float:110",
+		_("Total Amount") + ":Currency:130",
+		_("Supplier(s)") + "::250",
+	]
 
 	return columns
 
@@ -173,9 +172,7 @@
 def get_material_transfer_vouchers():
 	se = frappe.qb.DocType("Stock Entry")
 	query = (
-		frappe.qb.from_(se)
-		.select(se.name)
-		.where((se.purpose == "Material Transfer") & (se.docstatus == 1))
+		frappe.qb.from_(se).select(se.name).where((se.purpose == "Material Transfer") & (se.docstatus == 1))
 	)
 
 	return [r[0] for r in query.run()]
diff --git a/erpnext/stock/report/test_reports.py b/erpnext/stock/report/test_reports.py
index d118d8e..74c6afa 100644
--- a/erpnext/stock/report/test_reports.py
+++ b/erpnext/stock/report/test_reports.py
@@ -1,5 +1,4 @@
 import unittest
-from typing import List, Tuple
 
 import frappe
 
@@ -14,7 +13,7 @@
 
 batch = frappe.db.get_value("Batch", fieldname=["name"], as_dict=True, order_by="creation desc")
 
-REPORT_FILTER_TEST_CASES: List[Tuple[ReportName, ReportFilters]] = [
+REPORT_FILTER_TEST_CASES: list[tuple[ReportName, ReportFilters]] = [
 	("Stock Ledger", {"_optional": True}),
 	("Stock Ledger", {"batch_no": batch}),
 	("Stock Ledger", {"item_code": "_Test Item", "warehouse": "_Test Warehouse - _TC"}),
diff --git a/erpnext/stock/report/total_stock_summary/total_stock_summary.py b/erpnext/stock/report/total_stock_summary/total_stock_summary.py
index c3155bd..4848c21 100644
--- a/erpnext/stock/report/total_stock_summary/total_stock_summary.py
+++ b/erpnext/stock/report/total_stock_summary/total_stock_summary.py
@@ -8,7 +8,6 @@
 
 
 def execute(filters=None):
-
 	if not filters:
 		filters = {}
 	columns = get_columns(filters)
@@ -54,8 +53,8 @@
 	else:
 		query = query.select(wh.company).groupby(wh.company)
 
-	query = query.select(
-		item.item_code, item.description, Sum(bin.actual_qty).as_("actual_qty")
-	).groupby(item.item_code)
+	query = query.select(item.item_code, item.description, Sum(bin.actual_qty).as_("actual_qty")).groupby(
+		item.item_code
+	)
 
 	return query.run()
diff --git a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
index 5dbdcef..e1cce31 100644
--- a/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
+++ b/erpnext/stock/report/warehouse_wise_item_balance_age_and_value/warehouse_wise_item_balance_age_and_value.py
@@ -40,7 +40,7 @@
 	item_balance = {}
 	item_value = {}
 
-	for (company, item, warehouse) in sorted(iwb_map):
+	for company, item, warehouse in sorted(iwb_map):
 		if not item_map.get(item):
 			continue
 
@@ -71,7 +71,7 @@
 
 		row += [average_age]
 
-		bal_qty = [sum(bal_qty) for bal_qty in zip(*wh_balance)]
+		bal_qty = [sum(bal_qty) for bal_qty in zip(*wh_balance, strict=False)]
 		total_qty = sum(bal_qty)
 		if len(warehouse_list) > 1:
 			row += [total_qty]
diff --git a/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py b/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py
index a0e9944..39baa54 100644
--- a/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py
+++ b/erpnext/stock/report/warehouse_wise_stock_balance/warehouse_wise_stock_balance.py
@@ -1,7 +1,7 @@
 # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and contributors
 # For license information, please see license.txt
 
-from typing import Any, Dict, List, Optional, TypedDict
+from typing import Any, TypedDict
 
 import frappe
 from frappe import _
@@ -9,12 +9,12 @@
 
 
 class StockBalanceFilter(TypedDict):
-	company: Optional[str]
-	warehouse: Optional[str]
-	show_disabled_warehouses: Optional[int]
+	company: str | None
+	warehouse: str | None
+	show_disabled_warehouses: int | None
 
 
-SLEntry = Dict[str, Any]
+SLEntry = dict[str, Any]
 
 
 def execute(filters=None):
@@ -25,7 +25,7 @@
 	return columns, data
 
 
-def get_warehouse_wise_balance(filters: StockBalanceFilter) -> List[SLEntry]:
+def get_warehouse_wise_balance(filters: StockBalanceFilter) -> list[SLEntry]:
 	sle = frappe.qb.DocType("Stock Ledger Entry")
 
 	query = (
@@ -95,7 +95,7 @@
 		update_balance(warehouse, warehouse.stock_balance)
 
 
-def get_columns(filters: StockBalanceFilter) -> List[Dict]:
+def get_columns(filters: StockBalanceFilter) -> list[dict]:
 	columns = [
 		{
 			"label": _("Warehouse"),
diff --git a/erpnext/stock/serial_batch_bundle.py b/erpnext/stock/serial_batch_bundle.py
index 7b42103..d9f3473 100644
--- a/erpnext/stock/serial_batch_bundle.py
+++ b/erpnext/stock/serial_batch_bundle.py
@@ -1,5 +1,4 @@
 from collections import defaultdict
-from typing import List
 
 import frappe
 from frappe import _, bold
@@ -130,13 +129,14 @@
 			frappe.throw(_(error_msg))
 
 	def set_serial_and_batch_bundle(self, sn_doc):
-		self.sle.db_set(
-			{"serial_and_batch_bundle": sn_doc.name, "auto_created_serial_and_batch_bundle": 1}
-		)
+		self.sle.db_set({"serial_and_batch_bundle": sn_doc.name, "auto_created_serial_and_batch_bundle": 1})
 
 		if sn_doc.is_rejected:
 			frappe.db.set_value(
-				self.child_doctype, self.sle.voucher_detail_no, "rejected_serial_and_batch_bundle", sn_doc.name
+				self.child_doctype,
+				self.sle.voucher_detail_no,
+				"rejected_serial_and_batch_bundle",
+				sn_doc.name,
 			)
 		else:
 			values_to_update = {
@@ -157,9 +157,7 @@
 	def child_doctype(self):
 		child_doctype = self.sle.voucher_type + " Item"
 
-		if (
-			self.sle.voucher_type == "Subcontracting Receipt" and self.sle.dependant_sle_voucher_detail_no
-		):
+		if self.sle.voucher_type == "Subcontracting Receipt" and self.sle.dependant_sle_voucher_detail_no:
 			child_doctype = "Subcontracting Receipt Supplied Item"
 
 		if self.sle.voucher_type == "Stock Entry":
@@ -343,9 +341,7 @@
 	if serial_nos:
 		filters["serial_no"] = ("in", serial_nos)
 
-	entries = frappe.get_all(
-		"Serial and Batch Entry", fields=["serial_no"], filters=filters, order_by="idx"
-	)
+	entries = frappe.get_all("Serial and Batch Entry", fields=["serial_no"], filters=filters, order_by="idx")
 	if not entries:
 		return []
 
@@ -497,9 +493,7 @@
 				# else it remains the same as that of previous entry
 				self.wh_data.valuation_rate = new_stock_value / new_stock_qty
 
-		if (
-			not self.wh_data.valuation_rate and self.sle.voucher_detail_no and not self.is_rejected_entry()
-		):
+		if not self.wh_data.valuation_rate and self.sle.voucher_detail_no and not self.is_rejected_entry():
 			allow_zero_rate = self.sle_self.check_if_allow_zero_valuation_rate(
 				self.sle.voucher_type, self.sle.voucher_detail_no
 			)
@@ -507,9 +501,7 @@
 				self.wh_data.valuation_rate = self.sle_self.get_fallback_rate(self.sle)
 
 		self.wh_data.qty_after_transaction += self.sle.actual_qty
-		self.wh_data.stock_value = flt(self.wh_data.qty_after_transaction) * flt(
-			self.wh_data.valuation_rate
-		)
+		self.wh_data.stock_value = flt(self.wh_data.qty_after_transaction) * flt(self.wh_data.valuation_rate)
 
 	def is_rejected_entry(self):
 		return is_rejected(self.sle.voucher_type, self.sle.voucher_detail_no, self.sle.warehouse)
@@ -560,7 +552,7 @@
 			self.calculate_avg_rate_for_non_batchwise_valuation()
 			self.set_stock_value_difference()
 
-	def get_batch_no_ledgers(self) -> List[dict]:
+	def get_batch_no_ledgers(self) -> list[dict]:
 		if not self.batchwise_valuation_batches:
 			return []
 
@@ -620,9 +612,7 @@
 		for batch in batches:
 			self.batchwise_valuation_batches.append(batch.name)
 
-		self.non_batchwise_valuation_batches = list(
-			set(self.batches) - set(self.batchwise_valuation_batches)
-		)
+		self.non_batchwise_valuation_batches = list(set(self.batches) - set(self.batchwise_valuation_batches))
 
 	def get_batch_nos(self) -> list:
 		if self.sle.get("batch_nos"):
@@ -659,9 +649,7 @@
 		if not hasattr(self, "wh_data"):
 			return
 
-		self.wh_data.stock_value = round_off_if_near_zero(
-			self.wh_data.stock_value + self.stock_value_change
-		)
+		self.wh_data.stock_value = round_off_if_near_zero(self.wh_data.stock_value + self.stock_value_change)
 
 		self.wh_data.qty_after_transaction += self.sle.actual_qty
 		if self.wh_data.qty_after_transaction:
@@ -796,17 +784,17 @@
 
 	def set_other_details(self):
 		if not self.get("posting_date"):
-			setattr(self, "posting_date", today())
+			self.posting_date = today()
 			self.__dict__["posting_date"] = self.posting_date
 
 		if not self.get("actual_qty"):
 			qty = self.get("qty") or self.get("total_qty")
 
-			setattr(self, "actual_qty", qty)
+			self.actual_qty = qty
 			self.__dict__["actual_qty"] = self.actual_qty
 
 		if not hasattr(self, "use_serial_batch_fields"):
-			setattr(self, "use_serial_batch_fields", 0)
+			self.use_serial_batch_fields = 0
 
 	def duplicate_package(self):
 		if not self.serial_and_batch_bundle:
@@ -888,11 +876,11 @@
 		return doc
 
 	def validate_qty(self, doc):
-		if doc.type_of_transaction == "Outward":
+		if doc.type_of_transaction == "Outward" and self.actual_qty and doc.total_qty:
 			precision = doc.precision("total_qty")
 
-			total_qty = abs(flt(doc.total_qty, precision))
-			required_qty = abs(flt(self.actual_qty, precision))
+			total_qty = flt(abs(doc.total_qty), precision)
+			required_qty = flt(abs(self.actual_qty), precision)
 
 			if required_qty - total_qty > 0:
 				msg = f"For the item {bold(doc.item_code)}, the Avaliable qty {bold(total_qty)} is less than the Required Qty {bold(required_qty)} in the warehouse {bold(doc.warehouse)}. Please add sufficient qty in the warehouse."
@@ -920,9 +908,7 @@
 			self.batches = get_available_batches(kwargs)
 
 	def set_auto_serial_batch_entries_for_inward(self):
-		if (self.get("batches") and self.has_batch_no) or (
-			self.get("serial_nos") and self.has_serial_no
-		):
+		if (self.get("batches") and self.has_batch_no) or (self.get("serial_nos") and self.has_serial_no):
 			if self.use_serial_batch_fields and self.get("serial_nos"):
 				self.make_serial_no_if_not_exists()
 
@@ -950,7 +936,7 @@
 		serial_nos_details = []
 		batch_no = None
 		if self.batches:
-			batch_no = list(self.batches.keys())[0]
+			batch_no = next(iter(self.batches.keys()))
 
 		for serial_no in serial_nos:
 			serial_nos_details.append(
@@ -1040,7 +1026,7 @@
 			msg = f"Please set Serial No Series in the item {self.item_code} or create Serial and Batch Bundle manually."
 			frappe.throw(_(msg))
 
-		for i in range(abs(cint(self.actual_qty))):
+		for _i in range(abs(cint(self.actual_qty))):
 			serial_no = make_autoname(self.serial_no_series, "Serial No")
 			sr_nos.append(serial_no)
 			serial_nos_details.append(
diff --git a/erpnext/stock/stock_balance.py b/erpnext/stock/stock_balance.py
index ba03ff2..20bd4ca 100644
--- a/erpnext/stock/stock_balance.py
+++ b/erpnext/stock/stock_balance.py
@@ -15,9 +15,7 @@
 	frappe.db.auto_commit_on_many_writes = 1
 
 	if allow_negative_stock:
-		existing_allow_negative_stock = frappe.db.get_single_value(
-			"Stock Settings", "allow_negative_stock"
-		)
+		existing_allow_negative_stock = frappe.db.get_single_value("Stock Settings", "allow_negative_stock")
 		frappe.db.set_single_value("Stock Settings", "allow_negative_stock", 1)
 
 	item_warehouses = frappe.db.sql(
@@ -37,9 +35,7 @@
 			frappe.db.rollback()
 
 	if allow_negative_stock:
-		frappe.db.set_single_value(
-			"Stock Settings", "allow_negative_stock", existing_allow_negative_stock
-		)
+		frappe.db.set_single_value("Stock Settings", "allow_negative_stock", existing_allow_negative_stock)
 	frappe.db.auto_commit_on_many_writes = 0
 
 
@@ -51,7 +47,6 @@
 	only_bin=False,
 	allow_negative_stock=False,
 ):
-
 	if not only_bin:
 		repost_actual_qty(item_code, warehouse, allow_zero_rate, allow_negative_stock)
 
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index aef1a82..edb4df6 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -4,7 +4,6 @@
 import copy
 import gzip
 import json
-from typing import Optional, Set, Tuple
 
 import frappe
 from frappe import _, scrub
@@ -272,12 +271,10 @@
 		)
 		affected_transactions.update(obj.affected_transactions)
 
-		distinct_item_warehouses[
-			(args[i].get("item_code"), args[i].get("warehouse"))
-		].reposting_status = True
+		distinct_item_warehouses[(args[i].get("item_code"), args[i].get("warehouse"))].reposting_status = True
 
 		if obj.new_items_found:
-			for item_wh, data in distinct_item_warehouses.items():
+			for _item_wh, data in distinct_item_warehouses.items():
 				if ("args_idx" not in data and not data.reposting_status) or (
 					data.sle_changed and data.reposting_status
 				):
@@ -324,9 +321,7 @@
 			frappe.throw(_(validation_msg))
 
 
-def update_args_in_repost_item_valuation(
-	doc, index, args, distinct_item_warehouses, affected_transactions
-):
+def update_args_in_repost_item_valuation(doc, index, args, distinct_item_warehouses, affected_transactions):
 	if not doc.items_to_be_repost:
 		file_name = ""
 		if doc.reposting_data_file:
@@ -478,7 +473,7 @@
 	return new_dict
 
 
-def get_affected_transactions(doc, reposting_data=None) -> Set[Tuple[str, str]]:
+def get_affected_transactions(doc, reposting_data=None) -> set[tuple[str, str]]:
 	if not reposting_data and doc and doc.reposting_data_file:
 		reposting_data = get_reposting_data(doc.reposting_data_file)
 
@@ -497,7 +492,7 @@
 		return doc.current_index
 
 
-class update_entries_after(object):
+class update_entries_after:
 	"""
 	update valution rate and qty after transaction
 	from the current time-bucket onwards
@@ -539,7 +534,7 @@
 
 		self.new_items_found = False
 		self.distinct_item_warehouses = args.get("distinct_item_warehouses", frappe._dict())
-		self.affected_transactions: Set[Tuple[str, str]] = set()
+		self.affected_transactions: set[tuple[str, str]] = set()
 		self.reserved_stock = flt(self.args.reserved_stock)
 
 		self.data = frappe._dict()
@@ -618,9 +613,7 @@
 			self.process_sle(sle)
 
 	def get_sle_against_current_voucher(self):
-		self.args["posting_datetime"] = get_combine_datetime(
-			self.args.posting_date, self.args.posting_time
-		)
+		self.args["posting_datetime"] = get_combine_datetime(self.args.posting_date, self.args.posting_time)
 
 		return frappe.db.sql(
 			"""
@@ -658,9 +651,7 @@
 
 		if not dependant_sle:
 			return entries_to_fix
-		elif (
-			dependant_sle.item_code == self.item_code and dependant_sle.warehouse == self.args.warehouse
-		):
+		elif dependant_sle.item_code == self.item_code and dependant_sle.warehouse == self.args.warehouse:
 			return entries_to_fix
 		elif dependant_sle.item_code != self.item_code:
 			self.update_distinct_item_warehouses(dependant_sle)
@@ -680,9 +671,7 @@
 			self.distinct_item_warehouses[key] = val
 			self.new_items_found = True
 		else:
-			existing_sle_posting_date = (
-				self.distinct_item_warehouses[key].get("sle", {}).get("posting_date")
-			)
+			existing_sle_posting_date = self.distinct_item_warehouses[key].get("sle", {}).get("posting_date")
 
 			dependent_voucher_detail_nos = self.get_dependent_voucher_detail_nos(key)
 
@@ -774,7 +763,9 @@
 					self.wh_data.valuation_rate
 				)
 				if self.valuation_method != "Moving Average":
-					self.wh_data.stock_queue = [[self.wh_data.qty_after_transaction, self.wh_data.valuation_rate]]
+					self.wh_data.stock_queue = [
+						[self.wh_data.qty_after_transaction, self.wh_data.valuation_rate]
+					]
 			else:
 				if self.valuation_method == "Moving Average":
 					self.get_moving_average_values(sle)
@@ -843,9 +834,7 @@
 				self.wh_data.valuation_rate = new_stock_value / new_stock_qty
 
 		if not self.wh_data.valuation_rate and sle.voucher_detail_no:
-			allow_zero_rate = self.check_if_allow_zero_valuation_rate(
-				sle.voucher_type, sle.voucher_detail_no
-			)
+			allow_zero_rate = self.check_if_allow_zero_valuation_rate(sle.voucher_type, sle.voucher_detail_no)
 			if not allow_zero_rate:
 				self.wh_data.valuation_rate = self.get_fallback_rate(sle)
 
@@ -862,9 +851,7 @@
 			if abs(sle.actual_qty) == 0.0:
 				sle.is_cancelled = 1
 
-		if sle.serial_and_batch_bundle and frappe.get_cached_value(
-			"Item", sle.item_code, "has_serial_no"
-		):
+		if sle.serial_and_batch_bundle and frappe.get_cached_value("Item", sle.item_code, "has_serial_no"):
 			self.update_serial_no_status(sle)
 
 	def update_serial_no_status(self, sle):
@@ -1265,9 +1252,7 @@
 		stock_value_difference = stock_value - prev_stock_value
 
 		self.wh_data.stock_queue = stock_queue.state
-		self.wh_data.stock_value = round_off_if_near_zero(
-			self.wh_data.stock_value + stock_value_difference
-		)
+		self.wh_data.stock_value = round_off_if_near_zero(self.wh_data.stock_value + stock_value_difference)
 
 		if not self.wh_data.stock_queue:
 			self.wh_data.stock_queue.append(
@@ -1305,9 +1290,7 @@
 				outgoing_rate = self.get_fallback_rate(sle)
 			stock_value_difference = outgoing_rate * actual_qty
 
-		self.wh_data.stock_value = round_off_if_near_zero(
-			self.wh_data.stock_value + stock_value_difference
-		)
+		self.wh_data.stock_value = round_off_if_near_zero(self.wh_data.stock_value + stock_value_difference)
 		if self.wh_data.qty_after_transaction:
 			self.wh_data.valuation_rate = self.wh_data.stock_value / self.wh_data.qty_after_transaction
 
@@ -1356,7 +1339,6 @@
 				exceptions[0]["voucher_type"],
 				exceptions[0]["voucher_no"],
 			) in frappe.local.flags.currently_saving:
-
 				msg = _("{0} units of {1} needed in {2} to complete this transaction.").format(
 					frappe.bold(abs(deficiency)),
 					frappe.get_desk_link("Item", exceptions[0]["item_code"]),
@@ -1379,13 +1361,11 @@
 					allowed_qty = abs(exceptions[0]["actual_qty"]) - abs(exceptions[0]["diff"])
 
 					if allowed_qty > 0:
-						msg = "{0} As {1} units are reserved for other sales orders, you are allowed to consume only {2} units.".format(
+						msg = "{} As {} units are reserved for other sales orders, you are allowed to consume only {} units.".format(
 							msg, frappe.bold(self.reserved_stock), frappe.bold(allowed_qty)
 						)
 					else:
-						msg = "{0} As the full stock is reserved for other sales orders, you're not allowed to consume the stock.".format(
-							msg,
-						)
+						msg = f"{msg} As the full stock is reserved for other sales orders, you're not allowed to consume the stock."
 
 				msg_list.append(msg)
 
@@ -1434,7 +1414,7 @@
 		voucher_condition = f"and voucher_no != '{voucher_no}'"
 
 	sle = frappe.db.sql(
-		"""
+		f"""
 		select *, posting_datetime as "timestamp"
 		from `tabStock Ledger Entry`
 		where item_code = %(item_code)s
@@ -1446,10 +1426,7 @@
 			)
 		order by posting_datetime desc, creation desc
 		limit 1
-		for update""".format(
-			operator=operator,
-			voucher_condition=voucher_condition,
-		),
+		for update""",
 		args,
 		as_dict=1,
 	)
@@ -1489,7 +1466,7 @@
 	extra_cond=None,
 ):
 	"""get stock ledger entries filtered by specific posting datetime conditions"""
-	conditions = " and posting_datetime {0} %(posting_datetime)s".format(operator)
+	conditions = f" and posting_datetime {operator} %(posting_datetime)s"
 	if previous_sle.get("warehouse"):
 		conditions += " and warehouse = %(warehouse)s"
 	elif previous_sle.get("warehouse_condition"):
@@ -1501,17 +1478,17 @@
 		conditions += (
 			""" and
 			(
-				serial_no = {0}
-				or serial_no like {1}
-				or serial_no like {2}
-				or serial_no like {3}
+				serial_no = {}
+				or serial_no like {}
+				or serial_no like {}
+				or serial_no like {}
 			)
 		"""
 		).format(
 			frappe.db.escape(serial_no),
-			frappe.db.escape("{}\n%".format(serial_no)),
-			frappe.db.escape("%\n{}".format(serial_no)),
-			frappe.db.escape("%\n{}\n%".format(serial_no)),
+			frappe.db.escape(f"{serial_no}\n%"),
+			frappe.db.escape(f"%\n{serial_no}"),
+			frappe.db.escape(f"%\n{serial_no}\n%"),
 		)
 
 	if not previous_sle.get("posting_date"):
@@ -1531,17 +1508,16 @@
 		"""
 		select *, posting_datetime as "timestamp"
 		from `tabStock Ledger Entry`
-		where item_code = %%(item_code)s
+		where item_code = %(item_code)s
 		and is_cancelled = 0
-		%(conditions)s
-		order by posting_datetime %(order)s, creation %(order)s
-		%(limit)s %(for_update)s"""
-		% {
-			"conditions": conditions,
-			"limit": limit or "",
-			"for_update": for_update and "for update" or "",
-			"order": order,
-		},
+		{conditions}
+		order by posting_datetime {order}, creation {order}
+		{limit} {for_update}""".format(
+			conditions=conditions,
+			limit=limit or "",
+			for_update=for_update and "for update" or "",
+			order=order,
+		),
 		previous_sle,
 		as_dict=1,
 		debug=debug,
@@ -1566,17 +1542,14 @@
 	)
 
 
-def get_batch_incoming_rate(
-	item_code, warehouse, batch_no, posting_date, posting_time, creation=None
-):
-
+def get_batch_incoming_rate(item_code, warehouse, batch_no, posting_date, posting_time, creation=None):
 	sle = frappe.qb.DocType("Stock Ledger Entry")
 
 	timestamp_condition = sle.posting_datetime < get_combine_datetime(posting_date, posting_time)
 	if creation:
-		timestamp_condition |= (
-			sle.posting_datetime == get_combine_datetime(posting_date, posting_time)
-		) & (sle.creation < creation)
+		timestamp_condition |= (sle.posting_datetime == get_combine_datetime(posting_date, posting_time)) & (
+			sle.creation < creation
+		)
 
 	batch_details = (
 		frappe.qb.from_(sle)
@@ -1606,7 +1579,6 @@
 	batch_no=None,
 	serial_and_batch_bundle=None,
 ):
-
 	from erpnext.stock.serial_batch_bundle import BatchNoValuation
 
 	if not company:
@@ -1697,7 +1669,7 @@
 		solutions += (
 			"<li>"
 			+ _("If not, you can Cancel / Submit this entry")
-			+ " {0} ".format(frappe.bold(_("after")))
+			+ " {} ".format(frappe.bold(_("after")))
 			+ _("performing either one below:")
 			+ "</li>"
 		)
@@ -1833,9 +1805,7 @@
 	neg_sle = get_future_sle_with_negative_qty(args)
 
 	if is_negative_with_precision(neg_sle):
-		message = _(
-			"{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction."
-		).format(
+		message = _("{0} units of {1} needed in {2} on {3} {4} for {5} to complete this transaction.").format(
 			abs(neg_sle[0]["qty_after_transaction"]),
 			frappe.get_desk_link("Item", args.item_code),
 			frappe.get_desk_link("Warehouse", args.warehouse),
@@ -1970,12 +1940,8 @@
 
 
 def validate_reserved_serial_nos(item_code, warehouse, serial_nos):
-	if reserved_serial_nos_details := get_sre_reserved_serial_nos_details(
-		item_code, warehouse, serial_nos
-	):
-		if common_serial_nos := list(
-			set(serial_nos).intersection(set(reserved_serial_nos_details.keys()))
-		):
+	if reserved_serial_nos_details := get_sre_reserved_serial_nos_details(item_code, warehouse, serial_nos):
+		if common_serial_nos := list(set(serial_nos).intersection(set(reserved_serial_nos_details.keys()))):
 			msg = _(
 				"Serial Nos are reserved in Stock Reservation Entries, you need to unreserve them before proceeding."
 			)
@@ -2019,7 +1985,7 @@
 				frappe.throw(msg, title=_("Reserved Stock for Batch"))
 
 
-def is_negative_stock_allowed(*, item_code: Optional[str] = None) -> bool:
+def is_negative_stock_allowed(*, item_code: str | None = None) -> bool:
 	if cint(frappe.db.get_single_value("Stock Settings", "allow_negative_stock", cache=True)):
 		return True
 	if item_code and cint(frappe.db.get_value("Item", item_code, "allow_negative_stock", cache=True)):
diff --git a/erpnext/stock/tests/test_get_item_details.py b/erpnext/stock/tests/test_get_item_details.py
index b53e29e..30f748a 100644
--- a/erpnext/stock/tests/test_get_item_details.py
+++ b/erpnext/stock/tests/test_get_item_details.py
@@ -1,5 +1,3 @@
-import json
-
 import frappe
 from frappe.test_runner import make_test_records
 from frappe.tests.utils import FrappeTestCase
@@ -16,7 +14,6 @@
 		super().setUp()
 
 	def test_get_item_detail_purchase_order(self):
-
 		args = frappe._dict(
 			{
 				"item_code": "_Test Item",
@@ -29,7 +26,6 @@
 				"name": None,
 				"supplier": "_Test Supplier",
 				"transaction_date": None,
-				"conversion_rate": 1.0,
 				"price_list": "_Test Buying Price List",
 				"is_subcontracted": 0,
 				"ignore_pricing_rule": 1,
diff --git a/erpnext/stock/tests/test_utils.py b/erpnext/stock/tests/test_utils.py
index 4e93ac9..bc646fa 100644
--- a/erpnext/stock/tests/test_utils.py
+++ b/erpnext/stock/tests/test_utils.py
@@ -28,7 +28,7 @@
 		)
 		self.assertGreaterEqual(len(sles), len(expected_sles))
 
-		for exp_sle, act_sle in zip(expected_sles, sles):
+		for exp_sle, act_sle in zip(expected_sles, sles, strict=False):
 			for k, v in exp_sle.items():
 				act_value = act_sle[k]
 				if k == "stock_queue":
@@ -51,7 +51,7 @@
 			order_by=order_by or "posting_date, creation",
 		)
 		self.assertGreaterEqual(len(actual_gles), len(expected_gles))
-		for exp_gle, act_gle in zip(expected_gles, actual_gles):
+		for exp_gle, act_gle in zip(expected_gles, actual_gles, strict=False):
 			for k, exp_value in exp_gle.items():
 				act_value = act_gle[k]
 				self.assertEqual(exp_value, act_value, msg=f"{k} doesn't match \n{exp_gle}\n{act_gle}")
diff --git a/erpnext/stock/tests/test_valuation.py b/erpnext/stock/tests/test_valuation.py
index 4d8990a..47b8f0b 100644
--- a/erpnext/stock/tests/test_valuation.py
+++ b/erpnext/stock/tests/test_valuation.py
@@ -28,9 +28,7 @@
 		self.assertAlmostEqual(sum(q for q, _ in self.queue), qty, msg=f"queue: {self.queue}", places=4)
 
 	def assertTotalValue(self, value):
-		self.assertAlmostEqual(
-			sum(q * r for q, r in self.queue), value, msg=f"queue: {self.queue}", places=2
-		)
+		self.assertAlmostEqual(sum(q * r for q, r in self.queue), value, msg=f"queue: {self.queue}", places=2)
 
 	def test_simple_addition(self):
 		self.queue.add_stock(1, 10)
@@ -210,9 +208,7 @@
 		self.assertAlmostEqual(sum(q for q, _ in self.stack), qty, msg=f"stack: {self.stack}", places=4)
 
 	def assertTotalValue(self, value):
-		self.assertAlmostEqual(
-			sum(q * r for q, r in self.stack), value, msg=f"stack: {self.stack}", places=2
-		)
+		self.assertAlmostEqual(sum(q * r for q, r in self.stack), value, msg=f"stack: {self.stack}", places=2)
 
 	def test_simple_addition(self):
 		self.stack.add_stock(1, 10)
@@ -355,7 +351,6 @@
 			self.assertEqual(stock_queue, expected_queue)
 
 	def test_lifo_values(self):
-
 		in1 = self._make_stock_entry(1, 1)
 		self.assertStockQueue(in1, [[1, 1]])
 
diff --git a/erpnext/stock/utils.py b/erpnext/stock/utils.py
index 93e2fa4..64c239a 100644
--- a/erpnext/stock/utils.py
+++ b/erpnext/stock/utils.py
@@ -3,7 +3,6 @@
 
 
 import json
-from typing import Dict, Optional
 
 import frappe
 from frappe import _
@@ -18,7 +17,7 @@
 from erpnext.stock.serial_batch_bundle import BatchNoValuation, SerialNoValuation
 from erpnext.stock.valuation import FIFOValuation, LIFOValuation
 
-BarcodeScanResult = Dict[str, Optional[str]]
+BarcodeScanResult = dict[str, str | None]
 
 
 class InvalidWarehouseCompany(frappe.ValidationError):
@@ -59,7 +58,7 @@
 
 
 def get_stock_value_on(
-	warehouses: list | str = None, posting_date: str = None, item_code: str = None
+	warehouses: list | str | None = None, posting_date: str | None = None, item_code: str | None = None
 ) -> float:
 	if not posting_date:
 		posting_date = nowdate()
@@ -150,9 +149,7 @@
 				else (0.0, 0.0, None)
 			)
 		else:
-			return (
-				(last_entry.qty_after_transaction, last_entry.valuation_rate) if last_entry else (0.0, 0.0)
-			)
+			return (last_entry.qty_after_transaction, last_entry.valuation_rate) if last_entry else (0.0, 0.0)
 	else:
 		return last_entry.qty_after_transaction if last_entry else 0.0
 
@@ -180,10 +177,8 @@
 			condition += " AND warehouse = %s"
 
 	actual_qty = frappe.db.sql(
-		"""select sum(actual_qty) from tabBin
-		where item_code=%s {0}""".format(
-			condition
-		),
+		f"""select sum(actual_qty) from tabBin
+		where item_code=%s {condition}""",
 		values,
 	)[0][0]
 
@@ -278,9 +273,7 @@
 		args.actual_qty = args.qty
 		args.serial_nos = get_serial_nos_data(args.get("serial_no"))
 
-		sn_obj = SerialNoValuation(
-			sle=args, warehouse=args.get("warehouse"), item_code=args.get("item_code")
-		)
+		sn_obj = SerialNoValuation(sle=args, warehouse=args.get("warehouse"), item_code=args.get("item_code"))
 
 		return sn_obj.get_incoming_rate()
 	elif (
@@ -288,7 +281,6 @@
 		and frappe.db.get_value("Batch", args.get("batch_no"), "use_batchwise_valuation", cache=True)
 		and not args.get("serial_and_batch_bundle")
 	):
-
 		args.actual_qty = args.qty
 		args.batch_nos = frappe._dict({args.batch_no: args})
 
@@ -329,10 +321,7 @@
 	return flt(in_rate)
 
 
-def get_batch_incoming_rate(
-	item_code, warehouse, batch_no, posting_date, posting_time, creation=None
-):
-
+def get_batch_incoming_rate(item_code, warehouse, batch_no, posting_date, posting_time, creation=None):
 	sle = frappe.qb.DocType("Stock Ledger Entry")
 
 	timestamp_condition = CombineDatetime(sle.posting_date, sle.posting_time) < CombineDatetime(
@@ -340,8 +329,7 @@
 	)
 	if creation:
 		timestamp_condition |= (
-			CombineDatetime(sle.posting_date, sle.posting_time)
-			== CombineDatetime(posting_date, posting_time)
+			CombineDatetime(sle.posting_date, sle.posting_time) == CombineDatetime(posting_date, posting_time)
 		) & (sle.creation < creation)
 
 	batch_details = (
@@ -379,9 +367,7 @@
 	"""get valuation method from item or default"""
 	val_method = frappe.db.get_value("Item", item_code, "valuation_method", cache=True)
 	if not val_method:
-		val_method = (
-			frappe.db.get_single_value("Stock Settings", "valuation_method", cache=True) or "FIFO"
-		)
+		val_method = frappe.db.get_single_value("Stock Settings", "valuation_method", cache=True) or "FIFO"
 	return val_method
 
 
@@ -456,7 +442,6 @@
 	if not include_uom or not conversion_factors:
 		return
 
-	convertible_cols = {}
 	is_dict_obj = False
 	if isinstance(result[0], dict):
 		is_dict_obj = True
@@ -471,8 +456,8 @@
 			columns.insert(
 				idx + 1,
 				{
-					"label": "{0} (per {1})".format(d.get("label"), include_uom),
-					"fieldname": "{0}_{1}".format(d.get("fieldname"), frappe.scrub(include_uom)),
+					"label": "{} (per {})".format(d.get("label"), include_uom),
+					"fieldname": "{}_{}".format(d.get("fieldname"), frappe.scrub(include_uom)),
 					"fieldtype": "Currency" if d.get("convertible") == "rate" else "Float",
 				},
 			)
@@ -495,7 +480,7 @@
 			if not is_dict_obj:
 				row.insert(key + 1, new_value)
 			else:
-				new_key = "{0}_{1}".format(key, frappe.scrub(include_uom))
+				new_key = f"{key}_{frappe.scrub(include_uom)}"
 				update_dict_values.append([row, new_key, new_value])
 
 	for data in update_dict_values:
@@ -518,9 +503,9 @@
 				{"converted_col": columns[next_col]["fieldname"], "for_type": col.get("convertible")}
 			)
 			if col.get("convertible") == "rate":
-				columns[next_col]["label"] += " (per {})".format(include_uom)
+				columns[next_col]["label"] += f" (per {include_uom})"
 			else:
-				columns[next_col]["label"] += " ({})".format(include_uom)
+				columns[next_col]["label"] += f" ({include_uom})"
 
 	for row_idx, row in enumerate(result):
 		for convertible_col, data in convertible_column_map.items():
@@ -594,7 +579,7 @@
 	def set_cache(data: BarcodeScanResult):
 		frappe.cache().set_value(f"erpnext:barcode_scan:{search_value}", data, expires_in_sec=120)
 
-	def get_cache() -> Optional[BarcodeScanResult]:
+	def get_cache() -> BarcodeScanResult | None:
 		if data := frappe.cache().get_value(f"erpnext:barcode_scan:{search_value}"):
 			return data
 
@@ -647,7 +632,7 @@
 	return {}
 
 
-def _update_item_info(scan_result: Dict[str, Optional[str]]) -> Dict[str, Optional[str]]:
+def _update_item_info(scan_result: dict[str, str | None]) -> dict[str, str | None]:
 	if item_code := scan_result.get("item_code"):
 		if item_info := frappe.get_cached_value(
 			"Item",
diff --git a/erpnext/stock/valuation.py b/erpnext/stock/valuation.py
index 35f4f12..b1df982 100644
--- a/erpnext/stock/valuation.py
+++ b/erpnext/stock/valuation.py
@@ -1,9 +1,10 @@
 from abc import ABC, abstractmethod, abstractproperty
-from typing import Callable, List, NewType, Optional, Tuple
+from collections.abc import Callable
+from typing import NewType
 
 from frappe.utils import flt
 
-StockBin = NewType("StockBin", List[float])  # [[qty, rate], ...]
+StockBin = NewType("StockBin", list[float])  # [[qty, rate], ...]
 
 # Indexes of values inside FIFO bin 2-tuple
 QTY = 0
@@ -17,15 +18,15 @@
 
 	@abstractmethod
 	def remove_stock(
-		self, qty: float, outgoing_rate: float = 0.0, rate_generator: Callable[[], float] = None
-	) -> List[StockBin]:
+		self, qty: float, outgoing_rate: float = 0.0, rate_generator: Callable[[], float] | None = None
+	) -> list[StockBin]:
 		pass
 
 	@abstractproperty
-	def state(self) -> List[StockBin]:
+	def state(self) -> list[StockBin]:
 		pass
 
-	def get_total_stock_and_value(self) -> Tuple[float, float]:
+	def get_total_stock_and_value(self) -> tuple[float, float]:
 		total_qty = 0.0
 		total_value = 0.0
 
@@ -62,11 +63,11 @@
 	# ref: https://docs.python.org/3/reference/datamodel.html#slots
 	__slots__ = ["queue"]
 
-	def __init__(self, state: Optional[List[StockBin]]):
-		self.queue: List[StockBin] = state if state is not None else []
+	def __init__(self, state: list[StockBin] | None):
+		self.queue: list[StockBin] = state if state is not None else []
 
 	@property
-	def state(self) -> List[StockBin]:
+	def state(self) -> list[StockBin]:
 		"""Get current state of queue."""
 		return self.queue
 
@@ -95,8 +96,8 @@
 					self.queue[-1][QTY] = qty
 
 	def remove_stock(
-		self, qty: float, outgoing_rate: float = 0.0, rate_generator: Callable[[], float] = None
-	) -> List[StockBin]:
+		self, qty: float, outgoing_rate: float = 0.0, rate_generator: Callable[[], float] | None = None
+	) -> list[StockBin]:
 		"""Remove stock from the queue and return popped bins.
 
 		args:
@@ -166,11 +167,11 @@
 	# ref: https://docs.python.org/3/reference/datamodel.html#slots
 	__slots__ = ["stack"]
 
-	def __init__(self, state: Optional[List[StockBin]]):
-		self.stack: List[StockBin] = state if state is not None else []
+	def __init__(self, state: list[StockBin] | None):
+		self.stack: list[StockBin] = state if state is not None else []
 
 	@property
-	def state(self) -> List[StockBin]:
+	def state(self) -> list[StockBin]:
 		"""Get current state of stack."""
 		return self.stack
 
@@ -201,8 +202,8 @@
 					self.stack[-1][QTY] = qty
 
 	def remove_stock(
-		self, qty: float, outgoing_rate: float = 0.0, rate_generator: Callable[[], float] = None
-	) -> List[StockBin]:
+		self, qty: float, outgoing_rate: float = 0.0, rate_generator: Callable[[], float] | None = None
+	) -> list[StockBin]:
 		"""Remove stock from the stack and return popped bins.
 
 		args:
diff --git a/erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.json b/erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.json
index b258afc..b55f02f 100644
--- a/erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.json
+++ b/erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.json
@@ -128,7 +128,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2023-09-03 16:51:43.558295",
+ "modified": "2024-03-27 13:10:45.904619",
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting BOM",
@@ -148,7 +148,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.py b/erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.py
index 6a889b1..a7a9b42 100644
--- a/erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.py
+++ b/erpnext/subcontracting/doctype/subcontracting_bom/subcontracting_bom.py
@@ -45,9 +45,7 @@
 		if disabled:
 			frappe.throw(_("Finished Good {0} is disabled.").format(frappe.bold(self.finished_good)))
 		if not is_stock_item:
-			frappe.throw(
-				_("Finished Good {0} must be a stock item.").format(frappe.bold(self.finished_good))
-			)
+			frappe.throw(_("Finished Good {0} must be a stock item.").format(frappe.bold(self.finished_good)))
 		if not default_bom:
 			frappe.throw(
 				_("Finished Good {0} does not have a default BOM.").format(frappe.bold(self.finished_good))
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
index 507e233..2c23e59 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.json
@@ -182,7 +182,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Supplier Address Details",
    "read_only": 1
   },
@@ -230,7 +230,7 @@
   },
   {
    "fieldname": "shipping_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Shipping Address Details",
    "print_hide": 1,
    "read_only": 1
@@ -243,7 +243,7 @@
   },
   {
    "fieldname": "billing_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Billing Address Details",
    "read_only": 1
   },
@@ -454,7 +454,7 @@
  "icon": "fa fa-file-text",
  "is_submittable": 1,
  "links": [],
- "modified": "2024-01-03 20:56:04.670380",
+ "modified": "2024-03-27 13:10:46.060843",
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Order",
@@ -503,7 +503,7 @@
  ],
  "search_fields": "status, transaction_date, supplier",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "supplier",
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
index daccbbb..4d3441a 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
+++ b/erpnext/subcontracting/doctype/subcontracting_order/subcontracting_order.py
@@ -36,10 +36,10 @@
 		)
 
 		additional_costs: DF.Table[LandedCostTaxesandCharges]
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		billing_address: DF.Link | None
-		billing_address_display: DF.SmallText | None
+		billing_address_display: DF.TextEditor | None
 		company: DF.Link
 		contact_display: DF.SmallText | None
 		contact_email: DF.SmallText | None
@@ -59,7 +59,7 @@
 		set_reserve_warehouse: DF.Link | None
 		set_warehouse: DF.Link | None
 		shipping_address: DF.Link | None
-		shipping_address_display: DF.SmallText | None
+		shipping_address_display: DF.TextEditor | None
 		status: DF.Literal[
 			"Draft",
 			"Open",
@@ -83,7 +83,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(SubcontractingOrder, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 
 		self.status_updater = [
 			{
@@ -100,10 +100,10 @@
 		]
 
 	def before_validate(self):
-		super(SubcontractingOrder, self).before_validate()
+		super().before_validate()
 
 	def validate(self):
-		super(SubcontractingOrder, self).validate()
+		super().validate()
 		self.validate_purchase_order_for_subcontracting()
 		self.validate_items()
 		self.validate_service_items()
@@ -198,9 +198,7 @@
 			):
 				item_wh_list.append([item.item_code, item.warehouse])
 		for item_code, warehouse in item_wh_list:
-			update_bin_qty(
-				item_code, warehouse, {"ordered_qty": self.get_ordered_qty(item_code, warehouse)}
-			)
+			update_bin_qty(item_code, warehouse, {"ordered_qty": self.get_ordered_qty(item_code, warehouse)})
 
 	@staticmethod
 	def get_ordered_qty(item_code, warehouse):
@@ -239,7 +237,9 @@
 				item = frappe.get_doc("Item", si.fg_item)
 				bom = (
 					frappe.db.get_value(
-						"Subcontracting BOM", {"finished_good": item.item_code, "is_active": 1}, "finished_good_bom"
+						"Subcontracting BOM",
+						{"finished_good": item.item_code, "is_active": 1},
+						"finished_good_bom",
 					)
 					or item.default_bom
 				)
diff --git a/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py b/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
index 6c0ee45..0ae0799 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
+++ b/erpnext/subcontracting/doctype/subcontracting_order/test_subcontracting_order.py
@@ -211,7 +211,7 @@
 			item["qty"] -= 1
 			itemwise_transfer_qty[item["item_code"]] += item["qty"]
 
-		ste = make_stock_transfer_entry(
+		make_stock_transfer_entry(
 			sco_no=sco.name,
 			rm_items=rm_items,
 			itemwise_details=copy.deepcopy(itemwise_details),
@@ -713,7 +713,7 @@
 		warehouses.add(item.warehouse)
 
 	if len(warehouses) == 1:
-		sco.set_warehouse = list(warehouses)[0]
+		sco.set_warehouse = next(iter(warehouses))
 
 	if not args.do_not_save:
 		sco.insert()
diff --git a/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json b/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
index 1ca90c3..c0ab514 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order_item/subcontracting_order_item.json
@@ -384,7 +384,7 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-11-30 15:29:43.744618",
+ "modified": "2024-03-27 13:10:46.343298",
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Order Item",
@@ -393,7 +393,7 @@
  "permissions": [],
  "quick_entry": 1,
  "search_fields": "item_name",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json b/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
index f1e94e1..0a74c2f 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order_service_item/subcontracting_order_service_item.json
@@ -155,7 +155,7 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2023-11-30 13:29:31.017440",
+ "modified": "2024-03-27 13:10:46.534662",
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Order Service Item",
@@ -164,7 +164,7 @@
  "permissions": [],
  "quick_entry": 1,
  "search_fields": "item_name",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json b/erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json
index 8f7128b..f4f8d54 100644
--- a/erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_order_supplied_item/subcontracting_order_supplied_item.json
@@ -1,177 +1,177 @@
 {
-    "actions": [],
-    "creation": "2022-04-01 19:29:30.923800",
-    "doctype": "DocType",
-    "editable_grid": 1,
-    "engine": "InnoDB",
-    "field_order": [
-        "main_item_code",
-        "rm_item_code",
-        "column_break_3",
-        "stock_uom",
-        "conversion_factor",
-        "reserve_warehouse",
-        "column_break_6",
-        "bom_detail_no",
-        "reference_name",
-        "section_break_9",
-        "rate",
-        "column_break_11",
-        "amount",
-        "section_break_13",
-        "required_qty",
-        "supplied_qty",
-        "column_break_16",
-        "consumed_qty",
-        "returned_qty",
-        "total_supplied_qty"
-    ],
-    "fields": [
-        {
-            "columns": 2,
-            "fieldname": "main_item_code",
-            "fieldtype": "Link",
-            "in_list_view": 1,
-            "label": "Item Code",
-            "options": "Item",
-            "read_only": 1
-        },
-        {
-            "columns": 2,
-            "fieldname": "rm_item_code",
-            "fieldtype": "Link",
-            "in_list_view": 1,
-            "label": "Raw Material Item Code",
-            "options": "Item",
-            "read_only": 1
-        },
-        {
-            "fieldname": "column_break_3",
-            "fieldtype": "Column Break"
-        },
-        {
-            "fieldname": "stock_uom",
-            "fieldtype": "Link",
-            "label": "Stock Uom",
-            "options": "UOM",
-            "read_only": 1
-        },
-        {
-            "default": "1",
-            "fieldname": "conversion_factor",
-            "fieldtype": "Float",
-            "hidden": 1,
-            "label": "Conversion Factor",
-            "read_only": 1
-        },
-        {
-            "columns": 2,
-            "fieldname": "reserve_warehouse",
-            "fieldtype": "Link",
-            "in_list_view": 1,
-            "label": "Reserve Warehouse",
-            "options": "Warehouse"
-        },
-        {
-            "fieldname": "column_break_6",
-            "fieldtype": "Column Break"
-        },
-        {
-            "fieldname": "bom_detail_no",
-            "fieldtype": "Data",
-            "label": "BOM Detail No",
-            "read_only": 1
-        },
-        {
-            "fieldname": "reference_name",
-            "fieldtype": "Data",
-            "label": "Reference Name",
-            "read_only": 1
-        },
-        {
-            "fieldname": "section_break_9",
-            "fieldtype": "Section Break"
-        },
-        {
-            "columns": 2,
-            "fieldname": "rate",
-            "fieldtype": "Currency",
-            "in_list_view": 1,
-            "label": "Rate",
-            "options": "Company:company:default_currency"
-        },
-        {
-            "fieldname": "column_break_11",
-            "fieldtype": "Column Break"
-        },
-        {
-            "fieldname": "amount",
-            "fieldtype": "Currency",
-            "label": "Amount",
-            "options": "Company:company:default_currency",
-            "read_only": 1
-        },
-        {
-            "fieldname": "section_break_13",
-            "fieldtype": "Section Break"
-        },
-        {
-            "columns": 2,
-            "fieldname": "required_qty",
-            "fieldtype": "Float",
-            "in_list_view": 1,
-            "label": "Required Qty",
-            "read_only": 1
-        },
-        {
-            "fieldname": "supplied_qty",
-            "fieldtype": "Float",
-            "in_list_view": 1,
-            "label": "Supplied Qty",
-            "no_copy": 1,
-            "print_hide": 1,
-            "read_only": 1
-        },
-        {
-            "fieldname": "column_break_16",
-            "fieldtype": "Column Break"
-        },
-        {
-            "fieldname": "consumed_qty",
-            "fieldtype": "Float",
-            "label": "Consumed Qty",
-            "no_copy": 1,
-            "print_hide": 1,
-            "read_only": 1
-        },
-        {
-            "fieldname": "returned_qty",
-            "fieldtype": "Float",
-            "label": "Returned Qty",
-            "no_copy": 1,
-            "print_hide": 1,
-            "read_only": 1
-        },
-        {
-            "fieldname": "total_supplied_qty",
-            "fieldtype": "Float",
-            "hidden": 1,
-            "label": "Total Supplied Qty",
-            "no_copy": 1,
-            "print_hide": 1,
-            "read_only": 1
-        }
-    ],
-    "hide_toolbar": 1,
-    "istable": 1,
-    "links": [],
-    "modified": "2022-08-26 16:04:56.125951",
-    "modified_by": "Administrator",
-    "module": "Subcontracting",
-    "name": "Subcontracting Order Supplied Item",
-    "owner": "Administrator",
-    "permissions": [],
-    "sort_field": "modified",
-    "sort_order": "DESC",
-    "states": []
+ "actions": [],
+ "creation": "2022-04-01 19:29:30.923800",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "main_item_code",
+  "rm_item_code",
+  "column_break_3",
+  "stock_uom",
+  "conversion_factor",
+  "reserve_warehouse",
+  "column_break_6",
+  "bom_detail_no",
+  "reference_name",
+  "section_break_9",
+  "rate",
+  "column_break_11",
+  "amount",
+  "section_break_13",
+  "required_qty",
+  "supplied_qty",
+  "column_break_16",
+  "consumed_qty",
+  "returned_qty",
+  "total_supplied_qty"
+ ],
+ "fields": [
+  {
+   "columns": 2,
+   "fieldname": "main_item_code",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Item Code",
+   "options": "Item",
+   "read_only": 1
+  },
+  {
+   "columns": 2,
+   "fieldname": "rm_item_code",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Raw Material Item Code",
+   "options": "Item",
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_3",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "stock_uom",
+   "fieldtype": "Link",
+   "label": "Stock Uom",
+   "options": "UOM",
+   "read_only": 1
+  },
+  {
+   "default": "1",
+   "fieldname": "conversion_factor",
+   "fieldtype": "Float",
+   "hidden": 1,
+   "label": "Conversion Factor",
+   "read_only": 1
+  },
+  {
+   "columns": 2,
+   "fieldname": "reserve_warehouse",
+   "fieldtype": "Link",
+   "in_list_view": 1,
+   "label": "Reserve Warehouse",
+   "options": "Warehouse"
+  },
+  {
+   "fieldname": "column_break_6",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "bom_detail_no",
+   "fieldtype": "Data",
+   "label": "BOM Detail No",
+   "read_only": 1
+  },
+  {
+   "fieldname": "reference_name",
+   "fieldtype": "Data",
+   "label": "Reference Name",
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_9",
+   "fieldtype": "Section Break"
+  },
+  {
+   "columns": 2,
+   "fieldname": "rate",
+   "fieldtype": "Currency",
+   "in_list_view": 1,
+   "label": "Rate",
+   "options": "Company:company:default_currency"
+  },
+  {
+   "fieldname": "column_break_11",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "amount",
+   "fieldtype": "Currency",
+   "label": "Amount",
+   "options": "Company:company:default_currency",
+   "read_only": 1
+  },
+  {
+   "fieldname": "section_break_13",
+   "fieldtype": "Section Break"
+  },
+  {
+   "columns": 2,
+   "fieldname": "required_qty",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Required Qty",
+   "read_only": 1
+  },
+  {
+   "fieldname": "supplied_qty",
+   "fieldtype": "Float",
+   "in_list_view": 1,
+   "label": "Supplied Qty",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "column_break_16",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "consumed_qty",
+   "fieldtype": "Float",
+   "label": "Consumed Qty",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "returned_qty",
+   "fieldtype": "Float",
+   "label": "Returned Qty",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  },
+  {
+   "fieldname": "total_supplied_qty",
+   "fieldtype": "Float",
+   "hidden": 1,
+   "label": "Total Supplied Qty",
+   "no_copy": 1,
+   "print_hide": 1,
+   "read_only": 1
+  }
+ ],
+ "hide_toolbar": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:46.680164",
+ "modified_by": "Administrator",
+ "module": "Subcontracting",
+ "name": "Subcontracting Order Supplied Item",
+ "owner": "Administrator",
+ "permissions": [],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
index 383a83b..2024f6e 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.json
@@ -192,7 +192,7 @@
   },
   {
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Address",
    "read_only": 1
   },
@@ -231,7 +231,7 @@
   },
   {
    "fieldname": "shipping_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Shipping Address",
    "print_hide": 1,
    "read_only": 1
@@ -521,7 +521,7 @@
   },
   {
    "fieldname": "billing_address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Billing Address",
    "read_only": 1
   },
@@ -645,7 +645,7 @@
  "in_create": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2023-11-16 13:04:00.710534",
+ "modified": "2024-03-27 13:10:46.856728",
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Receipt",
@@ -708,7 +708,7 @@
  ],
  "search_fields": "status, posting_date, supplier",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "supplier",
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
index 0ffe5c9..49b7b0f 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/subcontracting_receipt.py
@@ -33,13 +33,13 @@
 		)
 
 		additional_costs: DF.Table[LandedCostTaxesandCharges]
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amended_from: DF.Link | None
 		auto_repeat: DF.Link | None
 		bill_date: DF.Date | None
 		bill_no: DF.Data | None
 		billing_address: DF.Link | None
-		billing_address_display: DF.SmallText | None
+		billing_address_display: DF.TextEditor | None
 		company: DF.Link
 		contact_display: DF.SmallText | None
 		contact_email: DF.SmallText | None
@@ -69,7 +69,7 @@
 		set_posting_time: DF.Check
 		set_warehouse: DF.Link | None
 		shipping_address: DF.Link | None
-		shipping_address_display: DF.SmallText | None
+		shipping_address_display: DF.TextEditor | None
 		status: DF.Literal["", "Draft", "Completed", "Return", "Return Issued", "Cancelled", "Closed"]
 		supplied_items: DF.Table[SubcontractingReceiptSuppliedItem]
 		supplier: DF.Link
@@ -85,7 +85,7 @@
 	# end: auto-generated types
 
 	def __init__(self, *args, **kwargs):
-		super(SubcontractingReceipt, self).__init__(*args, **kwargs)
+		super().__init__(*args, **kwargs)
 		self.status_updater = [
 			{
 				"target_dt": "Subcontracting Order Item",
@@ -104,13 +104,11 @@
 	def onload(self):
 		self.set_onload(
 			"backflush_based_on",
-			frappe.db.get_single_value(
-				"Buying Settings", "backflush_raw_materials_of_subcontract_based_on"
-			),
+			frappe.db.get_single_value("Buying Settings", "backflush_raw_materials_of_subcontract_based_on"),
 		)
 
 	def before_validate(self):
-		super(SubcontractingReceipt, self).before_validate()
+		super().before_validate()
 		self.validate_items_qty()
 		self.set_items_bom()
 		self.set_items_cost_center()
@@ -126,7 +124,7 @@
 		if getdate(self.posting_date) > getdate(nowdate()):
 			frappe.throw(_("Posting Date cannot be future date"))
 
-		super(SubcontractingReceipt, self).validate()
+		super().validate()
 
 		if self.is_new() and self.get("_action") == "save" and not frappe.flags.in_test:
 			self.get_scrap_items()
@@ -190,7 +188,9 @@
 		for item in self.items:
 			if not (item.qty or item.rejected_qty):
 				frappe.throw(
-					_("Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time.").format(item.idx)
+					_("Row {0}: Accepted Qty and Rejected Qty can't be zero at the same time.").format(
+						item.idx
+					)
 				)
 
 	def set_items_bom(self):
@@ -306,7 +306,9 @@
 				.select(
 					sco_supplied_item.rm_item_code,
 					sco_supplied_item.reference_name,
-					(sco_supplied_item.total_supplied_qty - sco_supplied_item.consumed_qty).as_("available_qty"),
+					(sco_supplied_item.total_supplied_qty - sco_supplied_item.consumed_qty).as_(
+						"available_qty"
+					),
 				)
 				.where(
 					(sco_supplied_item.parent == item.subcontracting_order)
@@ -319,7 +321,9 @@
 				supplied_items_details[item.name] = {}
 
 				for supplied_item in supplied_items:
-					supplied_items_details[item.name][supplied_item.rm_item_code] = supplied_item.available_qty
+					supplied_items_details[item.name][
+						supplied_item.rm_item_code
+					] = supplied_item.available_qty
 		else:
 			for item in self.get("supplied_items"):
 				item.available_qty_for_consumption = supplied_items_details.get(item.reference_name, {}).get(
@@ -515,10 +519,12 @@
 
 					warehouse_account_name = warehouse_account[item.warehouse]["account"]
 					warehouse_account_currency = warehouse_account[item.warehouse]["account_currency"]
-					supplier_warehouse_account = warehouse_account.get(self.supplier_warehouse, {}).get("account")
-					supplier_warehouse_account_currency = warehouse_account.get(self.supplier_warehouse, {}).get(
-						"account_currency"
+					supplier_warehouse_account = warehouse_account.get(self.supplier_warehouse, {}).get(
+						"account"
 					)
+					supplier_warehouse_account_currency = warehouse_account.get(
+						self.supplier_warehouse, {}
+					).get("account_currency")
 					remarks = self.get("remarks") or _("Accounting Entry for Stock")
 
 					# FG Warehouse Account (Debit)
@@ -662,7 +668,9 @@
 			if item.purchase_order and item.purchase_order_item:
 				if item.purchase_order not in po_items_details:
 					po_doc = frappe.get_doc("Purchase Order", item.purchase_order)
-					po_items_details[item.purchase_order] = {po_item.name: po_item for po_item in po_doc.items}
+					po_items_details[item.purchase_order] = {
+						po_item.name: po_item for po_item in po_doc.items
+					}
 
 				if po_item := po_items_details[item.purchase_order].get(item.purchase_order_item):
 					conversion_factor = flt(po_item.qty) / flt(po_item.fg_item_qty)
diff --git a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
index 4f4a1bd..564096f 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt/test_subcontracting_receipt.py
@@ -6,7 +6,7 @@
 
 import frappe
 from frappe.tests.utils import FrappeTestCase, change_settings
-from frappe.utils import add_days, cint, cstr, flt, nowtime, today
+from frappe.utils import add_days, cint, flt, nowtime, today
 
 import erpnext
 from erpnext.accounts.doctype.account.test_account import get_inventory_account
@@ -48,9 +48,7 @@
 
 	def test_subcontracting(self):
 		set_backflush_based_on("BOM")
-		make_stock_entry(
-			item_code="_Test Item", qty=100, target="_Test Warehouse 1 - _TC", basic_rate=100
-		)
+		make_stock_entry(item_code="_Test Item", qty=100, target="_Test Warehouse 1 - _TC", basic_rate=100)
 		make_stock_entry(
 			item_code="_Test Item Home Desktop 100",
 			qty=100,
@@ -82,9 +80,7 @@
 		self.assertEqual(scr.get("items")[0].rm_supp_cost, flt(rm_supp_cost))
 
 	def test_available_qty_for_consumption(self):
-		make_stock_entry(
-			item_code="_Test Item", qty=100, target="_Test Warehouse 1 - _TC", basic_rate=100
-		)
+		make_stock_entry(item_code="_Test Item", qty=100, target="_Test Warehouse 1 - _TC", basic_rate=100)
 		make_stock_entry(
 			item_code="_Test Item Home Desktop 100",
 			qty=100,
@@ -185,9 +181,6 @@
 		from erpnext.subcontracting.doctype.subcontracting_order.subcontracting_order import (
 			make_subcontracting_receipt,
 		)
-		from erpnext.subcontracting.doctype.subcontracting_order.test_subcontracting_order import (
-			make_subcontracted_item,
-		)
 
 		set_backflush_based_on("Material Transferred for Subcontract")
 		item_code = "_Test Subcontracted FG Item 1"
@@ -211,12 +204,8 @@
 		make_stock_entry(
 			target="_Test Warehouse - _TC", item_code="Test Extra Item 1", qty=10, basic_rate=100
 		)
-		make_stock_entry(
-			target="_Test Warehouse - _TC", item_code="_Test FG Item", qty=1, basic_rate=100
-		)
-		make_stock_entry(
-			target="_Test Warehouse - _TC", item_code="Test Extra Item 2", qty=1, basic_rate=100
-		)
+		make_stock_entry(target="_Test Warehouse - _TC", item_code="_Test FG Item", qty=1, basic_rate=100)
+		make_stock_entry(target="_Test Warehouse - _TC", item_code="Test Extra Item 2", qty=1, basic_rate=100)
 
 		rm_items = [
 			{
@@ -397,9 +386,7 @@
 		set_backflush_based_on("Material Transferred for Subcontract")
 
 		# Create Material Receipt for RM's
-		make_stock_entry(
-			item_code="_Test Item", qty=100, target="_Test Warehouse 1 - _TC", basic_rate=100
-		)
+		make_stock_entry(item_code="_Test Item", qty=100, target="_Test Warehouse 1 - _TC", basic_rate=100)
 		make_stock_entry(
 			item_code="_Test Item Home Desktop 100",
 			qty=100,
@@ -614,7 +601,6 @@
 
 		bom = make_bom(item=fg_item, raw_materials=[rm_item1, rm_item2, rm_item3])
 
-		rm_batch_no = None
 		for row in bom.items:
 			make_stock_entry(
 				item_code=row.item_code,
@@ -642,9 +628,7 @@
 		]
 		sco = get_subcontracting_order(service_items=service_items)
 
-		frappe.db.set_single_value(
-			"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 1
-		)
+		frappe.db.set_single_value("Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 1)
 		scr = make_subcontracting_receipt(sco.name)
 		scr.save()
 		scr.submit()
@@ -663,9 +647,7 @@
 
 		self.assertEqual(scr.items[0].rm_cost_per_qty, 900)
 		self.assertEqual(scr.items[0].service_cost_per_qty, 100)
-		frappe.db.set_single_value(
-			"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0
-		)
+		frappe.db.set_single_value("Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0)
 
 	def test_subcontracting_receipt_valuation_for_fg_with_auto_created_serial_batch_bundle(self):
 		frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 0)
@@ -711,7 +693,6 @@
 
 		bom = make_bom(item=fg_item, raw_materials=[rm_item1, rm_item2, rm_item3])
 
-		rm_batch_no = None
 		for row in bom.items:
 			make_stock_entry(
 				item_code=row.item_code,
@@ -732,9 +713,7 @@
 		]
 		sco = get_subcontracting_order(service_items=service_items)
 
-		frappe.db.set_single_value(
-			"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 1
-		)
+		frappe.db.set_single_value("Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 1)
 		scr = make_subcontracting_receipt(sco.name)
 		scr.save()
 		scr.submit()
@@ -762,9 +741,7 @@
 
 		self.assertEqual(flt(valuation_rate), flt(1000))
 
-		frappe.db.set_single_value(
-			"Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0
-		)
+		frappe.db.set_single_value("Stock Settings", "auto_create_serial_and_batch_bundle_for_outward", 0)
 		frappe.db.set_single_value("Stock Settings", "use_serial_batch_fields", 1)
 
 	def test_subcontracting_receipt_raw_material_rate(self):
@@ -1225,9 +1202,7 @@
 def make_return_subcontracting_receipt(**args):
 	args = frappe._dict(args)
 	return_doc = make_return_doc("Subcontracting Receipt", args.scr_name)
-	return_doc.supplier_warehouse = (
-		args.supplier_warehouse or args.warehouse or "_Test Warehouse 1 - _TC"
-	)
+	return_doc.supplier_warehouse = args.supplier_warehouse or args.warehouse or "_Test Warehouse 1 - _TC"
 
 	if args.qty:
 		for item in return_doc.items:
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 ca14f09..7ad364a 100644
--- a/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
+++ b/erpnext/subcontracting/doctype/subcontracting_receipt_item/subcontracting_receipt_item.json
@@ -568,7 +568,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-03-07 11:43:38.954262",
+ "modified": "2024-03-27 13:10:47.165943",
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Receipt Item",
@@ -576,7 +576,7 @@
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "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 957b6a2..12f67ad 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
@@ -229,14 +229,14 @@
  "idx": 1,
  "istable": 1,
  "links": [],
- "modified": "2024-02-04 16:32:17.534162",
+ "modified": "2024-03-27 13:10:47.405161",
  "modified_by": "Administrator",
  "module": "Subcontracting",
  "name": "Subcontracting Receipt Supplied Item",
  "naming_rule": "Autoincrement",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index 3ff7d02..d3244a7 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -391,7 +391,7 @@
  "icon": "fa fa-ticket",
  "idx": 7,
  "links": [],
- "modified": "2021-11-24 13:13:10.276630",
+ "modified": "2024-03-27 13:09:52.921791",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Issue",
@@ -413,8 +413,9 @@
  "quick_entry": 1,
  "search_fields": "status,customer,subject,raised_by",
  "sender_field": "raised_by",
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "subject_field": "subject",
  "timeline_field": "customer",
  "title_field": "subject",
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index e4c4d60..c8b85db 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -163,7 +163,7 @@
 				"comment_type": "Info",
 				"reference_doctype": "Issue",
 				"reference_name": replicated_issue.name,
-				"content": " - Split the Issue from <a href='/app/Form/Issue/{0}'>{1}</a>".format(
+				"content": " - Split the Issue from <a href='/app/Form/Issue/{}'>{}</a>".format(
 					self.name, frappe.bold(self.name)
 				),
 			}
@@ -217,7 +217,6 @@
 
 @frappe.whitelist()
 def set_multiple_status(names, status):
-
 	for name in json.loads(names):
 		frappe.db.set_value("Issue", name, "status", status)
 
@@ -229,9 +228,7 @@
 
 def auto_close_tickets():
 	"""Auto-close replied support tickets after 7 days"""
-	auto_close_after_days = (
-		frappe.db.get_single_value("Support Settings", "close_issue_after_days") or 7
-	)
+	auto_close_after_days = frappe.db.get_single_value("Support Settings", "close_issue_after_days") or 7
 
 	table = frappe.qb.DocType("Issue")
 	issues = (
@@ -299,9 +296,7 @@
 	if communication.get("reference_doctype") == "Issue":
 		issue = get_parent_doc(communication)
 		if is_first_response(issue) and issue.service_level_agreement:
-			first_response_time = calculate_first_response_time(
-				issue, get_datetime(issue.first_responded_on)
-			)
+			first_response_time = calculate_first_response_time(issue, get_datetime(issue.first_responded_on))
 			issue.db_set("first_response_time", first_response_time)
 
 
diff --git a/erpnext/support/doctype/issue/test_issue.py b/erpnext/support/doctype/issue/test_issue.py
index b30b699..acad115 100644
--- a/erpnext/support/doctype/issue/test_issue.py
+++ b/erpnext/support/doctype/issue/test_issue.py
@@ -29,23 +29,21 @@
 		creation = get_datetime("2019-03-04 12:00")
 
 		# make issue with customer specific SLA
-		customer = create_customer("_Test Customer", "__Test SLA Customer Group", "__Test SLA Territory")
+		create_customer("_Test Customer", "__Test SLA Customer Group", "__Test SLA Territory")
 		issue = make_issue(creation, "_Test Customer", 1)
 
 		self.assertEqual(issue.response_by, get_datetime("2019-03-04 14:00"))
 		self.assertEqual(issue.resolution_by, get_datetime("2019-03-04 15:00"))
 
 		# make issue with customer_group specific SLA
-		customer = create_customer("__Test Customer", "_Test SLA Customer Group", "__Test SLA Territory")
+		create_customer("__Test Customer", "_Test SLA Customer Group", "__Test SLA Territory")
 		issue = make_issue(creation, "__Test Customer", 2)
 
 		self.assertEqual(issue.response_by, get_datetime("2019-03-04 14:00"))
 		self.assertEqual(issue.resolution_by, get_datetime("2019-03-04 15:00"))
 
 		# make issue with territory specific SLA
-		customer = create_customer(
-			"___Test Customer", "__Test SLA Customer Group", "_Test SLA Territory"
-		)
+		create_customer("___Test Customer", "__Test SLA Customer Group", "_Test SLA Territory")
 		issue = make_issue(creation, "___Test Customer", 3)
 
 		self.assertEqual(issue.response_by, get_datetime("2019-03-04 14:00"))
@@ -147,16 +145,15 @@
 		self.assertEqual(issue.agreement_status, "Fulfilled")
 
 	def test_issue_open_after_closed(self):
-
 		# Created on -> 1 pm, Response Time -> 4 hrs, Resolution Time -> 6 hrs
 		frappe.flags.current_time = get_datetime("2021-11-01 13:00")
 		issue = make_issue(
 			frappe.flags.current_time, index=1, issue_type="Critical"
 		)  # Applies 24hr working time SLA
 		create_communication(issue.name, "test@example.com", "Received", frappe.flags.current_time)
-		self.assertEquals(issue.agreement_status, "First Response Due")
-		self.assertEquals(issue.response_by, get_datetime("2021-11-01 17:00"))
-		self.assertEquals(issue.resolution_by, get_datetime("2021-11-01 19:00"))
+		self.assertEqual(issue.agreement_status, "First Response Due")
+		self.assertEqual(issue.response_by, get_datetime("2021-11-01 17:00"))
+		self.assertEqual(issue.resolution_by, get_datetime("2021-11-01 19:00"))
 
 		# Replied on → 2 pm
 		frappe.flags.current_time = get_datetime("2021-11-01 14:00")
@@ -164,19 +161,19 @@
 		issue.reload()
 		issue.status = "Replied"
 		issue.save()
-		self.assertEquals(issue.agreement_status, "Resolution Due")
-		self.assertEquals(issue.on_hold_since, frappe.flags.current_time)
-		self.assertEquals(issue.first_responded_on, frappe.flags.current_time)
+		self.assertEqual(issue.agreement_status, "Resolution Due")
+		self.assertEqual(issue.on_hold_since, frappe.flags.current_time)
+		self.assertEqual(issue.first_responded_on, frappe.flags.current_time)
 
 		# Customer Replied → 3 pm
 		frappe.flags.current_time = get_datetime("2021-11-01 15:00")
 		create_communication(issue.name, "test@example.com", "Received", frappe.flags.current_time)
 		issue.reload()
-		self.assertEquals(issue.status, "Open")
+		self.assertEqual(issue.status, "Open")
 		# Hold Time + 1 Hrs
-		self.assertEquals(issue.total_hold_time, 3600)
+		self.assertEqual(issue.total_hold_time, 3600)
 		# Resolution By should increase by one hrs
-		self.assertEquals(issue.resolution_by, get_datetime("2021-11-01 20:00"))
+		self.assertEqual(issue.resolution_by, get_datetime("2021-11-01 20:00"))
 
 		# Replied on → 4 pm, Open → 1 hr, Resolution Due → 8 pm
 		frappe.flags.current_time = get_datetime("2021-11-01 16:00")
@@ -184,37 +181,37 @@
 		issue.reload()
 		issue.status = "Replied"
 		issue.save()
-		self.assertEquals(issue.agreement_status, "Resolution Due")
+		self.assertEqual(issue.agreement_status, "Resolution Due")
 
 		# Customer Closed → 10 pm
 		frappe.flags.current_time = get_datetime("2021-11-01 22:00")
 		issue.status = "Closed"
 		issue.save()
 		# Hold Time + 6 Hrs
-		self.assertEquals(issue.total_hold_time, 3600 + 21600)
+		self.assertEqual(issue.total_hold_time, 3600 + 21600)
 		# Resolution By should increase by 6 hrs
-		self.assertEquals(issue.resolution_by, get_datetime("2021-11-02 02:00"))
-		self.assertEquals(issue.agreement_status, "Fulfilled")
-		self.assertEquals(issue.resolution_date, frappe.flags.current_time)
+		self.assertEqual(issue.resolution_by, get_datetime("2021-11-02 02:00"))
+		self.assertEqual(issue.agreement_status, "Fulfilled")
+		self.assertEqual(issue.resolution_date, frappe.flags.current_time)
 
 		# Customer Open → 3 am i.e after resolution by is crossed
 		frappe.flags.current_time = get_datetime("2021-11-02 03:00")
 		create_communication(issue.name, "test@example.com", "Received", frappe.flags.current_time)
 		issue.reload()
 		# Since issue was Resolved, Resolution By should be increased by 5 hrs (3am - 10pm)
-		self.assertEquals(issue.total_hold_time, 3600 + 21600 + 18000)
+		self.assertEqual(issue.total_hold_time, 3600 + 21600 + 18000)
 		# Resolution By should increase by 5 hrs
-		self.assertEquals(issue.resolution_by, get_datetime("2021-11-02 07:00"))
-		self.assertEquals(issue.agreement_status, "Resolution Due")
+		self.assertEqual(issue.resolution_by, get_datetime("2021-11-02 07:00"))
+		self.assertEqual(issue.agreement_status, "Resolution Due")
 		self.assertFalse(issue.resolution_date)
 
 		# We Closed → 4 am, SLA should be Fulfilled
 		frappe.flags.current_time = get_datetime("2021-11-02 04:00")
 		issue.status = "Closed"
 		issue.save()
-		self.assertEquals(issue.resolution_by, get_datetime("2021-11-02 07:00"))
-		self.assertEquals(issue.agreement_status, "Fulfilled")
-		self.assertEquals(issue.resolution_date, frappe.flags.current_time)
+		self.assertEqual(issue.resolution_by, get_datetime("2021-11-02 07:00"))
+		self.assertEqual(issue.agreement_status, "Fulfilled")
+		self.assertEqual(issue.resolution_date, frappe.flags.current_time)
 
 	def test_recording_of_assignment_on_first_reponse_failure(self):
 		from frappe.desk.form.assign_to import add as add_assignment
@@ -255,8 +252,8 @@
 		create_communication(issue.name, "test@admin.com", "Sent", frappe.flags.current_time)
 
 		issue.reload()
-		self.assertEquals(issue.first_responded_on, frappe.flags.current_time)
-		self.assertEquals(issue.agreement_status, "Resolution Due")
+		self.assertEqual(issue.first_responded_on, frappe.flags.current_time)
+		self.assertEqual(issue.agreement_status, "Resolution Due")
 
 
 class TestFirstResponseTime(TestSetUp):
@@ -547,7 +544,7 @@
 	issue = frappe.get_doc(
 		{
 			"doctype": "Issue",
-			"subject": "Service Level Agreement Issue {0}".format(index),
+			"subject": f"Service Level Agreement Issue {index}",
 			"customer": customer,
 			"raised_by": "test@example.com",
 			"description": "Service Level Agreement Issue",
@@ -564,7 +561,6 @@
 
 
 def create_customer(name, customer_group, territory):
-
 	create_customer_group(customer_group)
 	create_territory(territory)
 
@@ -580,7 +576,6 @@
 
 
 def create_customer_group(customer_group):
-
 	if not frappe.db.exists("Customer Group", {"customer_group_name": customer_group}):
 		frappe.get_doc({"doctype": "Customer Group", "customer_group_name": customer_group}).insert(
 			ignore_permissions=True
@@ -588,7 +583,6 @@
 
 
 def create_territory(territory):
-
 	if not frappe.db.exists("Territory", {"territory_name": territory}):
 		frappe.get_doc(
 			{
diff --git a/erpnext/support/doctype/issue_priority/issue_priority.json b/erpnext/support/doctype/issue_priority/issue_priority.json
index 38a187b..6f131c9 100644
--- a/erpnext/support/doctype/issue_priority/issue_priority.json
+++ b/erpnext/support/doctype/issue_priority/issue_priority.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "autoname": "Prompt",
  "creation": "2019-05-20 15:14:21.604447",
  "doctype": "DocType",
@@ -13,7 +14,8 @@
    "label": "Description"
   }
  ],
- "modified": "2019-05-20 17:06:38.095647",
+ "links": [],
+ "modified": "2024-03-27 13:09:53.126034",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Issue Priority",
@@ -33,7 +35,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "ASC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/support/doctype/issue_type/issue_type.json b/erpnext/support/doctype/issue_type/issue_type.json
index d10a0e4..40fa8d6 100644
--- a/erpnext/support/doctype/issue_type/issue_type.json
+++ b/erpnext/support/doctype/issue_type/issue_type.json
@@ -1,4 +1,5 @@
 {
+ "actions": [],
  "allow_import": 1,
  "allow_rename": 1,
  "autoname": "Prompt",
@@ -17,11 +18,11 @@
    "label": "Description"
   }
  ],
- "modified": "2019-06-26 16:56:39.863392",
+ "links": [],
+ "modified": "2024-03-27 13:09:53.242486",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Issue Type",
- "name_case": "Title Case",
  "owner": "Administrator",
  "permissions": [
   {
@@ -50,7 +51,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/support/doctype/pause_sla_on_status/pause_sla_on_status.json b/erpnext/support/doctype/pause_sla_on_status/pause_sla_on_status.json
index 5b03f25..8efb9ea 100644
--- a/erpnext/support/doctype/pause_sla_on_status/pause_sla_on_status.json
+++ b/erpnext/support/doctype/pause_sla_on_status/pause_sla_on_status.json
@@ -13,21 +13,20 @@
    "fieldtype": "Select",
    "in_list_view": 1,
    "label": "Status",
-   "reqd": 1,
-   "show_days": 1,
-   "show_seconds": 1
+   "reqd": 1
   }
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-06-05 15:15:29.986608",
+ "modified": "2024-03-27 13:10:09.017196",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Pause SLA On Status",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/support/doctype/service_day/service_day.json b/erpnext/support/doctype/service_day/service_day.json
index 9662130..a273718 100644
--- a/erpnext/support/doctype/service_day/service_day.json
+++ b/erpnext/support/doctype/service_day/service_day.json
@@ -45,14 +45,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2020-07-06 13:28:47.303873",
+ "modified": "2024-03-27 13:10:39.401960",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Service Day",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json
index 5882033..60a24cb 100644
--- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.json
+++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.json
@@ -192,7 +192,7 @@
   }
  ],
  "links": [],
- "modified": "2023-08-28 22:17:54.740924",
+ "modified": "2024-03-27 13:10:39.518860",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Service Level Agreement",
@@ -216,7 +216,7 @@
    "role": "Desk User"
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "track_changes": 1
diff --git a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py
index f6b3a13..0fa2d61 100644
--- a/erpnext/support/doctype/service_level_agreement/service_level_agreement.py
+++ b/erpnext/support/doctype/service_level_agreement/service_level_agreement.py
@@ -79,22 +79,26 @@
 			# Check if response and resolution time is set for every priority
 			if not priority.response_time:
 				frappe.throw(
-					_("Set Response Time for Priority {0} in row {1}.").format(priority.priority, priority.idx)
+					_("Set Response Time for Priority {0} in row {1}.").format(
+						priority.priority, priority.idx
+					)
 				)
 
 			if self.apply_sla_for_resolution:
 				if not priority.resolution_time:
 					frappe.throw(
-						_("Set Response Time for Priority {0} in row {1}.").format(priority.priority, priority.idx)
+						_("Set Response Time for Priority {0} in row {1}.").format(
+							priority.priority, priority.idx
+						)
 					)
 
 				response = priority.response_time
 				resolution = priority.resolution_time
 				if response > resolution:
 					frappe.throw(
-						_("Response Time for {0} priority in row {1} can't be greater than Resolution Time.").format(
-							priority.priority, priority.idx
-						)
+						_(
+							"Response Time for {0} priority in row {1} can't be greater than Resolution Time."
+						).format(priority.priority, priority.idx)
 					)
 
 			priorities.append(priority.priority)
@@ -358,7 +362,7 @@
 					"Service Level Agreement",
 					"entity",
 					"in",
-					[customer] + get_customer_group(customer) + get_customer_territory(customer),
+					[customer, *get_customer_group(customer), *get_customer_territory(customer)],
 				],
 				["Service Level Agreement", "entity_type", "is", "not set"],
 			]
@@ -366,9 +370,7 @@
 	else:
 		or_filters.append(["Service Level Agreement", "entity_type", "is", "not set"])
 
-	default_sla_filter = filters + [
-		["Service Level Agreement", "default_service_level_agreement", "=", 1]
-	]
+	default_sla_filter = [*filters, ["Service Level Agreement", "default_service_level_agreement", "=", 1]]
 	default_sla = frappe.get_all(
 		"Service Level Agreement",
 		filters=default_sla_filter,
@@ -409,7 +411,7 @@
 	customer_group = frappe.db.get_value("Customer", customer, "customer_group") if customer else None
 	if customer_group:
 		ancestors = get_ancestors_of("Customer Group", customer_group)
-		customer_groups = [customer_group] + ancestors
+		customer_groups = [customer_group, *ancestors]
 
 	return customer_groups
 
@@ -419,7 +421,7 @@
 	customer_territory = frappe.db.get_value("Customer", customer, "territory") if customer else None
 	if customer_territory:
 		ancestors = get_ancestors_of("Territory", customer_territory)
-		customer_territories = [customer_territory] + ancestors
+		customer_territories = [customer_territory, *ancestors]
 
 	return customer_territories
 
@@ -443,7 +445,7 @@
 				"Service Level Agreement",
 				"entity",
 				"in",
-				[""] + [customer] + get_customer_group(customer) + get_customer_territory(customer),
+				["", customer, *get_customer_group(customer), *get_customer_territory(customer)],
 			]
 		)
 
@@ -455,8 +457,7 @@
 			)
 		],
 		"service_level_agreements": [
-			d.name
-			for d in frappe.get_all("Service Level Agreement", filters=filters, or_filters=or_filters)
+			d.name for d in frappe.get_all("Service Level Agreement", filters=filters, or_filters=or_filters)
 		],
 	}
 
@@ -517,7 +518,6 @@
 
 
 def process_sla(doc, sla):
-
 	if not doc.creation:
 		doc.creation = now_datetime(doc.get("owner"))
 		if doc.meta.has_field("service_level_agreement_creation"):
@@ -747,16 +747,13 @@
 		and frappe.db.exists("Issue", self.name)
 		and frappe.db.get_single_value("Support Settings", "track_service_level_agreement")
 	):
-
 		if self.priority != frappe.db.get_value("Issue", self.name, "priority"):
 			self.set_response_and_resolution_time(
 				priority=self.priority, service_level_agreement=self.service_level_agreement
 			)
 			frappe.msgprint(_("Priority has been changed to {0}.").format(self.priority))
 
-		if self.service_level_agreement != frappe.db.get_value(
-			"Issue", self.name, "service_level_agreement"
-		):
+		if self.service_level_agreement != frappe.db.get_value("Issue", self.name, "service_level_agreement"):
 			self.set_response_and_resolution_time(
 				priority=self.priority, service_level_agreement=self.service_level_agreement
 			)
@@ -768,9 +765,7 @@
 def get_response_and_resolution_duration(doc):
 	sla = frappe.get_doc("Service Level Agreement", doc.service_level_agreement)
 	priority = sla.get_service_level_agreement_priority(doc.priority)
-	priority.update(
-		{"support_and_resolution": sla.support_and_resolution, "holiday_list": sla.holiday_list}
-	)
+	priority.update({"support_and_resolution": sla.support_and_resolution, "holiday_list": sla.holiday_list})
 	return priority
 
 
@@ -787,7 +782,7 @@
 			"reference_doctype": doc.doctype,
 			"reference_name": doc.name,
 			"comment_email": user,
-			"content": " resetted Service Level Agreement - {0}".format(_(reason)),
+			"content": f" resetted Service Level Agreement - {_(reason)}",
 		}
 	).insert(ignore_permissions=True)
 
@@ -895,7 +890,7 @@
 	if assigned_users:
 		from frappe.utils import get_fullname
 
-		assigned_users = ", ".join((get_fullname(user) for user in assigned_users))
+		assigned_users = ", ".join(get_fullname(user) for user in assigned_users)
 		message = _("First Response SLA Failed by {}").format(assigned_users)
 		doc.add_comment(comment_type="Assigned", text=message)
 
diff --git a/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py b/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py
index 1f8f4a2..47ea251 100644
--- a/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py
+++ b/erpnext/support/doctype/service_level_agreement/test_service_level_agreement.py
@@ -51,9 +51,7 @@
 			resolution_time=21600,
 		)
 
-		get_default_service_level_agreement = get_service_level_agreement(
-			default_service_level_agreement=1
-		)
+		get_default_service_level_agreement = get_service_level_agreement(default_service_level_agreement=1)
 
 		self.assertEqual(
 			create_default_service_level_agreement.name, get_default_service_level_agreement.name
@@ -198,9 +196,7 @@
 		)
 
 		# check default SLA for custom dt
-		default_sla = get_service_level_agreement(
-			default_service_level_agreement=1, doctype=doctype.name
-		)
+		default_sla = get_service_level_agreement(default_service_level_agreement=1, doctype=doctype.name)
 		self.assertEqual(sla.name, default_sla.name)
 
 		# check SLA docfields created
@@ -390,14 +386,17 @@
 	resolution_time=0,
 	doctype="Issue",
 	condition="",
-	sla_fulfilled_on=[],
-	pause_sla_on=[],
+	sla_fulfilled_on=None,
+	pause_sla_on=None,
 	apply_sla_for_resolution=1,
 	service_level=None,
 	start_time="10:00:00",
 	end_time="18:00:00",
 ):
-
+	if pause_sla_on is None:
+		pause_sla_on = []
+	if sla_fulfilled_on is None:
+		sla_fulfilled_on = []
 	make_holiday_list()
 	make_priorities()
 
@@ -484,9 +483,7 @@
 	if sla:
 		frappe.delete_doc("Service Level Agreement", sla, force=1)
 
-	return frappe.get_doc(service_level_agreement).insert(
-		ignore_permissions=True, ignore_if_duplicate=True
-	)
+	return frappe.get_doc(service_level_agreement).insert(ignore_permissions=True, ignore_if_duplicate=True)
 
 
 def create_customer():
@@ -615,7 +612,12 @@
 				"fields": [
 					{"label": "Date", "fieldname": "date", "fieldtype": "Date"},
 					{"label": "Description", "fieldname": "desc", "fieldtype": "Long Text"},
-					{"label": "Email ID", "fieldname": "email_id", "fieldtype": "Link", "options": "Customer"},
+					{
+						"label": "Email ID",
+						"fieldname": "email_id",
+						"fieldtype": "Link",
+						"options": "Customer",
+					},
 					{
 						"label": "Status",
 						"fieldname": "status",
@@ -637,8 +639,8 @@
 	return frappe.get_doc(
 		{
 			"doctype": "Lead",
-			"email_id": "test_lead1@example{0}.com".format(index),
-			"lead_name": "_Test Lead {0}".format(index),
+			"email_id": f"test_lead1@example{index}.com",
+			"lead_name": f"_Test Lead {index}",
 			"status": "Open",
 			"creation": creation,
 			"service_level_agreement_creation": creation,
diff --git a/erpnext/support/doctype/service_level_priority/service_level_priority.json b/erpnext/support/doctype/service_level_priority/service_level_priority.json
index b410fe6..cb2f454 100644
--- a/erpnext/support/doctype/service_level_priority/service_level_priority.json
+++ b/erpnext/support/doctype/service_level_priority/service_level_priority.json
@@ -64,14 +64,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2021-06-21 12:00:58.089962",
+ "modified": "2024-03-27 13:10:39.731977",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Service Level Priority",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/support/doctype/sla_fulfilled_on_status/sla_fulfilled_on_status.json b/erpnext/support/doctype/sla_fulfilled_on_status/sla_fulfilled_on_status.json
index 87124de..5370259 100644
--- a/erpnext/support/doctype/sla_fulfilled_on_status/sla_fulfilled_on_status.json
+++ b/erpnext/support/doctype/sla_fulfilled_on_status/sla_fulfilled_on_status.json
@@ -18,14 +18,15 @@
  ],
  "istable": 1,
  "links": [],
- "modified": "2021-05-26 21:11:29.176369",
+ "modified": "2024-03-27 13:10:42.898951",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "SLA Fulfilled On Status",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/support/doctype/support_search_source/support_search_source.json b/erpnext/support/doctype/support_search_source/support_search_source.json
index db3a7bb..e3d050c 100644
--- a/erpnext/support/doctype/support_search_source/support_search_source.json
+++ b/erpnext/support/doctype/support_search_source/support_search_source.json
@@ -1,668 +1,151 @@
 {
- "allow_copy": 0, 
- "allow_guest_to_view": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "beta": 0, 
- "creation": "2018-05-16 21:15:21.207007", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
- "document_type": "", 
- "editable_grid": 1, 
- "engine": "InnoDB", 
+ "actions": [],
+ "creation": "2018-05-16 21:15:21.207007",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+  "source_name",
+  "source_type",
+  "api_sb",
+  "base_url",
+  "query_options_sb",
+  "query_route",
+  "cb_1",
+  "search_term_param_name",
+  "response_options_sb",
+  "response_result_key_path",
+  "post_route",
+  "post_route_key_list",
+  "response_post_cb",
+  "post_title_key",
+  "post_description_key",
+  "link_options_sb",
+  "source_doctype",
+  "result_title_field",
+  "result_preview_field",
+  "result_route_field"
+ ],
  "fields": [
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "source_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Source Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "source_name",
+   "fieldtype": "Data",
+   "in_list_view": 1,
+   "label": "Source Name"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "source_type", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 1, 
-   "in_standard_filter": 0, 
-   "label": "Source Type", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "API\nLink", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 1, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "source_type",
+   "fieldtype": "Select",
+   "in_list_view": 1,
+   "label": "Source Type",
+   "options": "API\nLink",
+   "reqd": 1
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "depends_on": "eval:doc.source_type==\"API\"", 
-   "fieldname": "api_sb", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "API", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.source_type==\"API\"",
+   "fieldname": "api_sb",
+   "fieldtype": "Section Break",
+   "label": "API"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "base_url", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Base URL", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "base_url",
+   "fieldtype": "Data",
+   "label": "Base URL"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "depends_on": "eval:doc.source_type==\"API\"", 
-   "fieldname": "query_options_sb", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Query Options", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.source_type==\"API\"",
+   "fieldname": "query_options_sb",
+   "fieldtype": "Section Break",
+   "label": "Query Options"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "query_route", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Query Route String", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "query_route",
+   "fieldtype": "Data",
+   "label": "Query Route String"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "cb_1", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "cb_1",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "search_term_param_name", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Search Term Param Name", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "search_term_param_name",
+   "fieldtype": "Data",
+   "label": "Search Term Param Name"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "depends_on": "eval:doc.source_type==\"API\"", 
-   "fieldname": "response_options_sb", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Response Options", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.source_type==\"API\"",
+   "fieldname": "response_options_sb",
+   "fieldtype": "Section Break",
+   "label": "Response Options"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "response_result_key_path", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Response Result Key Path", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "response_result_key_path",
+   "fieldtype": "Data",
+   "label": "Response Result Key Path"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "post_route", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Post Route String", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "post_route",
+   "fieldtype": "Data",
+   "label": "Post Route String"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "post_route_key_list", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Post Route Key List", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "post_route_key_list",
+   "fieldtype": "Data",
+   "label": "Post Route Key List"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "response_post_cb", 
-   "fieldtype": "Column Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "response_post_cb",
+   "fieldtype": "Column Break"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "post_title_key", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Post Title Key", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "post_title_key",
+   "fieldtype": "Data",
+   "label": "Post Title Key"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "post_description_key", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Post Description Key", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "post_description_key",
+   "fieldtype": "Data",
+   "label": "Post Description Key"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "collapsible_depends_on": "", 
-   "columns": 0, 
-   "depends_on": "eval:doc.source_type==\"Link\"", 
-   "fieldname": "link_options_sb", 
-   "fieldtype": "Section Break", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Link Options", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "depends_on": "eval:doc.source_type==\"Link\"",
+   "fieldname": "link_options_sb",
+   "fieldtype": "Section Break",
+   "label": "Link Options"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "source_doctype", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Source DocType", 
-   "length": 0, 
-   "no_copy": 0, 
-   "options": "DocType", 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "source_doctype",
+   "fieldtype": "Link",
+   "label": "Source DocType",
+   "options": "DocType"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "result_title_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Result Title Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "result_title_field",
+   "fieldtype": "Data",
+   "label": "Result Title Field"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "result_preview_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Result Preview Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
-  }, 
+   "fieldname": "result_preview_field",
+   "fieldtype": "Data",
+   "label": "Result Preview Field"
+  },
   {
-   "allow_bulk_edit": 0, 
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "columns": 0, 
-   "fieldname": "result_route_field", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "ignore_xss_filter": 0, 
-   "in_filter": 0, 
-   "in_global_search": 0, 
-   "in_list_view": 0, 
-   "in_standard_filter": 0, 
-   "label": "Result Route Field", 
-   "length": 0, 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "precision": "", 
-   "print_hide": 0, 
-   "print_hide_if_no_value": 0, 
-   "read_only": 0, 
-   "remember_last_selected_value": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "translatable": 0, 
-   "unique": 0
+   "fieldname": "result_route_field",
+   "fieldtype": "Data",
+   "label": "Result Route Field"
   }
- ], 
- "has_web_view": 0, 
- "hide_heading": 0, 
- "hide_toolbar": 0, 
- "idx": 0, 
- "image_view": 0, 
- "in_create": 0, 
- "is_submittable": 0, 
- "issingle": 0, 
- "istable": 1, 
- "max_attachments": 0, 
- "modified": "2018-05-18 18:36:37.129830", 
- "modified_by": "Administrator", 
- "module": "Support", 
- "name": "Support Search Source", 
- "name_case": "", 
- "owner": "Administrator", 
- "permissions": [], 
- "quick_entry": 1, 
- "read_only": 0, 
- "read_only_onload": 0, 
- "show_name_in_global_search": 0, 
- "sort_field": "modified", 
- "sort_order": "DESC", 
- "track_changes": 1, 
- "track_seen": 0
+ ],
+ "istable": 1,
+ "links": [],
+ "modified": "2024-03-27 13:10:50.849602",
+ "modified_by": "Administrator",
+ "module": "Support",
+ "name": "Support Search Source",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": [],
+ "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/support/doctype/support_settings/support_settings.json b/erpnext/support/doctype/support_settings/support_settings.json
index bf1daa1..82b6f36 100644
--- a/erpnext/support/doctype/support_settings/support_settings.json
+++ b/erpnext/support/doctype/support_settings/support_settings.json
@@ -1,5 +1,5 @@
 {
- "actions": "",
+ "actions": [],
  "creation": "2017-02-17 13:07:35.686409",
  "doctype": "DocType",
  "editable_grid": 1,
@@ -135,35 +135,27 @@
    "default": "We're here to help",
    "fieldname": "greeting_title",
    "fieldtype": "Data",
-   "label": "Greeting Title",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Greeting Title"
   },
   {
    "fieldname": "column_break_19",
-   "fieldtype": "Column Break",
-   "show_days": 1,
-   "show_seconds": 1
+   "fieldtype": "Column Break"
   },
   {
    "default": "Browse help topics",
    "fieldname": "greeting_subtitle",
    "fieldtype": "Data",
-   "label": "Greeting Subtitle",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Greeting Subtitle"
   },
   {
    "fieldname": "greetings_section_section",
    "fieldtype": "Section Break",
-   "label": "Greetings Section",
-   "show_days": 1,
-   "show_seconds": 1
+   "label": "Greetings Section"
   }
  ],
  "issingle": 1,
  "links": [],
- "modified": "2021-10-14 13:08:38.473616",
+ "modified": "2024-03-27 13:10:50.989111",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Support Settings",
@@ -181,7 +173,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
-}
+}
\ No newline at end of file
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index 9af2b46..7e41245 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -311,7 +311,7 @@
   {
    "depends_on": "customer",
    "fieldname": "address_display",
-   "fieldtype": "Small Text",
+   "fieldtype": "Text Editor",
    "label": "Address",
    "read_only": 1
   },
@@ -379,7 +379,7 @@
  "icon": "fa fa-bug",
  "idx": 1,
  "links": [],
- "modified": "2023-11-28 17:30:35.676410",
+ "modified": "2024-03-27 13:10:59.601423",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "Warranty Claim",
@@ -400,7 +400,7 @@
  ],
  "search_fields": "status,customer,customer_name,territory",
  "show_name_in_global_search": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": [],
  "timeline_field": "customer",
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.py b/erpnext/support/doctype/warranty_claim/warranty_claim.py
index e0eb5a3..644f47e 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.py
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.py
@@ -18,7 +18,7 @@
 	if TYPE_CHECKING:
 		from frappe.types import DF
 
-		address_display: DF.SmallText | None
+		address_display: DF.TextEditor | None
 		amc_expiry_date: DF.Date | None
 		amended_from: DF.Link | None
 		company: DF.Link
@@ -45,9 +45,7 @@
 		service_address: DF.SmallText | None
 		status: DF.Literal["", "Open", "Closed", "Work In Progress", "Cancelled"]
 		territory: DF.Link | None
-		warranty_amc_status: DF.Literal[
-			"", "Under Warranty", "Out of Warranty", "Under AMC", "Out of AMC"
-		]
+		warranty_amc_status: DF.Literal["", "Under Warranty", "Out of Warranty", "Under AMC", "Out of AMC"]
 		warranty_expiry_date: DF.Date | None
 	# end: auto-generated types
 
diff --git a/erpnext/support/report/issue_analytics/issue_analytics.py b/erpnext/support/report/issue_analytics/issue_analytics.py
index 00ba25a..7f02372 100644
--- a/erpnext/support/report/issue_analytics/issue_analytics.py
+++ b/erpnext/support/report/issue_analytics/issue_analytics.py
@@ -15,7 +15,7 @@
 	return IssueAnalytics(filters).run()
 
 
-class IssueAnalytics(object):
+class IssueAnalytics:
 	def __init__(self, filters=None):
 		"""Issue Analytics Report"""
 		self.filters = frappe._dict(filters or {})
@@ -44,7 +44,13 @@
 
 		elif self.filters.based_on == "Assigned To":
 			self.columns.append(
-				{"label": _("User"), "fieldname": "user", "fieldtype": "Link", "options": "User", "width": 200}
+				{
+					"label": _("User"),
+					"fieldname": "user",
+					"fieldtype": "Link",
+					"options": "User",
+					"width": 200,
+				}
 			)
 
 		elif self.filters.based_on == "Issue Type":
@@ -75,9 +81,7 @@
 				{"label": _(period), "fieldname": scrub(period), "fieldtype": "Int", "width": 120}
 			)
 
-		self.columns.append(
-			{"label": _("Total"), "fieldname": "total", "fieldtype": "Int", "width": 120}
-		)
+		self.columns.append({"label": _("Total"), "fieldname": "total", "fieldtype": "Int", "width": 120})
 
 	def get_data(self):
 		self.get_issues()
@@ -109,9 +113,7 @@
 
 		from_date, to_date = getdate(self.filters.from_date), getdate(self.filters.to_date)
 
-		increment = {"Monthly": 1, "Quarterly": 3, "Half-Yearly": 6, "Yearly": 12}.get(
-			self.filters.range, 1
-		)
+		increment = {"Monthly": 1, "Quarterly": 3, "Half-Yearly": 6, "Yearly": 12}.get(self.filters.range, 1)
 
 		if self.filters.range in ["Monthly", "Quarterly"]:
 			from_date = from_date.replace(day=1)
@@ -121,7 +123,7 @@
 			from_date = from_date + relativedelta(from_date, weekday=MO(-1))
 
 		self.periodic_daterange = []
-		for dummy in range(1, 53):
+		for _dummy in range(1, 53):
 			if self.filters.range == "Weekly":
 				period_end_date = add_days(from_date, 6)
 			else:
diff --git a/erpnext/support/report/issue_summary/issue_summary.py b/erpnext/support/report/issue_summary/issue_summary.py
index c80ce88..d976c28 100644
--- a/erpnext/support/report/issue_summary/issue_summary.py
+++ b/erpnext/support/report/issue_summary/issue_summary.py
@@ -13,7 +13,7 @@
 	return IssueSummary(filters).run()
 
 
-class IssueSummary(object):
+class IssueSummary:
 	def __init__(self, filters=None):
 		self.filters = frappe._dict(filters or {})
 
@@ -41,7 +41,13 @@
 
 		elif self.filters.based_on == "Assigned To":
 			self.columns.append(
-				{"label": _("User"), "fieldname": "user", "fieldtype": "Link", "options": "User", "width": 200}
+				{
+					"label": _("User"),
+					"fieldname": "user",
+					"fieldtype": "Link",
+					"options": "User",
+					"width": 200,
+				}
 			)
 
 		elif self.filters.based_on == "Issue Type":
@@ -84,9 +90,7 @@
 		}
 
 		for label, fieldname in self.sla_status_map.items():
-			self.columns.append(
-				{"label": _(label), "fieldname": fieldname, "fieldtype": "Int", "width": 100}
-			)
+			self.columns.append({"label": _(label), "fieldname": fieldname, "fieldtype": "Int", "width": 100})
 
 		self.metrics = [
 			"Avg First Response Time",
@@ -185,8 +189,12 @@
 				if d._assign:
 					for entry in json.loads(d._assign):
 						self.issue_summary_data.setdefault(entry, frappe._dict()).setdefault(status, 0.0)
-						self.issue_summary_data.setdefault(entry, frappe._dict()).setdefault(agreement_status, 0.0)
-						self.issue_summary_data.setdefault(entry, frappe._dict()).setdefault("total_issues", 0.0)
+						self.issue_summary_data.setdefault(entry, frappe._dict()).setdefault(
+							agreement_status, 0.0
+						)
+						self.issue_summary_data.setdefault(entry, frappe._dict()).setdefault(
+							"total_issues", 0.0
+						)
 						self.issue_summary_data[entry][status] += 1
 						self.issue_summary_data[entry][agreement_status] += 1
 						self.issue_summary_data[entry]["total_issues"] += 1
@@ -229,14 +237,20 @@
 					if d._assign:
 						for entry in json.loads(d._assign):
 							for metric in metrics_list:
-								self.issue_summary_data.setdefault(entry, frappe._dict()).setdefault(metric, 0.0)
+								self.issue_summary_data.setdefault(entry, frappe._dict()).setdefault(
+									metric, 0.0
+								)
 
-							self.issue_summary_data[entry]["avg_response_time"] += d.get("avg_response_time") or 0.0
+							self.issue_summary_data[entry]["avg_response_time"] += (
+								d.get("avg_response_time") or 0.0
+							)
 							self.issue_summary_data[entry]["avg_first_response_time"] += (
 								d.get("first_response_time") or 0.0
 							)
 							self.issue_summary_data[entry]["avg_hold_time"] += d.get("total_hold_time") or 0.0
-							self.issue_summary_data[entry]["avg_resolution_time"] += d.get("resolution_time") or 0.0
+							self.issue_summary_data[entry]["avg_resolution_time"] += (
+								d.get("resolution_time") or 0.0
+							)
 							self.issue_summary_data[entry]["avg_user_resolution_time"] += (
 								d.get("user_resolution_time") or 0.0
 							)
@@ -251,9 +265,9 @@
 
 			else:
 				data = frappe.db.sql(
-					"""
+					f"""
 					SELECT
-						{0}, AVG(first_response_time) as avg_frt,
+						{field}, AVG(first_response_time) as avg_frt,
 						AVG(avg_response_time) as avg_resp_time,
 						AVG(total_hold_time) as avg_hold_time,
 						AVG(resolution_time) as avg_resolution_time,
@@ -261,10 +275,8 @@
 					FROM `tabIssue`
 					WHERE
 						name IN %(issues)s
-					GROUP BY {0}
-				""".format(
-						field
-					),
+					GROUP BY {field}
+				""",
 					{"issues": issues},
 					as_dict=1,
 				)
diff --git a/erpnext/support/report/support_hour_distribution/support_hour_distribution.py b/erpnext/support/report/support_hour_distribution/support_hour_distribution.py
index 5496721..2a97831 100644
--- a/erpnext/support/report/support_hour_distribution/support_hour_distribution.py
+++ b/erpnext/support/report/support_hour_distribution/support_hour_distribution.py
@@ -37,8 +37,8 @@
 		hours_count = {"date": start_date}
 		for key, value in time_slots.items():
 			start_time, end_time = value.split("-")
-			start_time = get_datetime("{0} {1}".format(start_date.strftime("%Y-%m-%d"), start_time))
-			end_time = get_datetime("{0} {1}".format(start_date.strftime("%Y-%m-%d"), end_time))
+			start_time = get_datetime("{} {}".format(start_date.strftime("%Y-%m-%d"), start_time))
+			end_time = get_datetime("{} {}".format(start_date.strftime("%Y-%m-%d"), end_time))
 			hours_count[key] = get_hours_count(start_time, end_time)
 			time_slot_wise_total_count[key] = time_slot_wise_total_count.get(key, 0) + hours_count[key]
 
diff --git a/erpnext/support/web_form/issues/issues.json b/erpnext/support/web_form/issues/issues.json
index 1df9fb7..f3834c7 100644
--- a/erpnext/support/web_form/issues/issues.json
+++ b/erpnext/support/web_form/issues/issues.json
@@ -1,14 +1,14 @@
 {
- "accept_payment": 0,
  "allow_comments": 1,
  "allow_delete": 1,
  "allow_edit": 1,
  "allow_incomplete": 0,
  "allow_multiple": 1,
  "allow_print": 0,
- "amount": 0.0,
- "amount_based_on_field": 0,
+ "anonymous": 0,
+ "apply_document_permissions": 0,
  "breadcrumbs": "[{\"label\":_(\"Issues\"), \"route\":\"issues\"}]",
+ "condition_json": "[]",
  "creation": "2016-06-24 15:50:33.186483",
  "doc_type": "Issue",
  "docstatus": 0,
@@ -16,20 +16,19 @@
  "idx": 0,
  "introduction_text": "",
  "is_standard": 1,
+ "list_columns": [],
  "login_required": 1,
  "max_attachment_size": 0,
- "modified": "2020-05-19 13:01:10.729088",
+ "modified": "2024-03-27 16:16:03.621730",
  "modified_by": "Administrator",
  "module": "Support",
  "name": "issues",
  "owner": "Administrator",
  "published": 1,
  "route": "issues",
- "route_to_success_link": 0,
  "show_attachments": 0,
- "show_in_grid": 0,
+ "show_list": 1,
  "show_sidebar": 1,
- "sidebar_items": [],
  "success_message": "",
  "success_url": "/issues",
  "title": "Issue",
diff --git a/erpnext/telephony/doctype/call_log/call_log.py b/erpnext/telephony/doctype/call_log/call_log.py
index 259f55b..7afa06f 100644
--- a/erpnext/telephony/doctype/call_log/call_log.py
+++ b/erpnext/telephony/doctype/call_log/call_log.py
@@ -68,9 +68,7 @@
 	def on_update(self):
 		def _is_call_missed(doc_before_save, doc_after_save):
 			# FIXME: This works for Exotel but not for all telepony providers
-			return (
-				doc_before_save.to != doc_after_save.to and doc_after_save.status not in END_CALL_STATUSES
-			)
+			return doc_before_save.to != doc_after_save.to and doc_after_save.status not in END_CALL_STATUSES
 
 		def _is_call_ended(doc_before_save, doc_after_save):
 			return doc_before_save.status not in END_CALL_STATUSES and self.status in END_CALL_STATUSES
@@ -83,11 +81,11 @@
 			self.update_received_by()
 
 		if _is_call_missed(doc_before_save, self):
-			frappe.publish_realtime("call_{id}_missed".format(id=self.id), self)
+			frappe.publish_realtime(f"call_{self.id}_missed", self)
 			self.trigger_call_popup()
 
 		if _is_call_ended(doc_before_save, self):
-			frappe.publish_realtime("call_{id}_ended".format(id=self.id), self)
+			frappe.publish_realtime(f"call_{self.id}_ended", self)
 
 	def is_incoming_call(self):
 		return self.type == "Incoming"
diff --git a/erpnext/telephony/doctype/incoming_call_handling_schedule/incoming_call_handling_schedule.json b/erpnext/telephony/doctype/incoming_call_handling_schedule/incoming_call_handling_schedule.json
index 6d46b4e..e1cb27e 100644
--- a/erpnext/telephony/doctype/incoming_call_handling_schedule/incoming_call_handling_schedule.json
+++ b/erpnext/telephony/doctype/incoming_call_handling_schedule/incoming_call_handling_schedule.json
@@ -47,14 +47,15 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2020-11-19 11:15:54.967710",
+ "modified": "2024-03-27 13:09:50.824179",
  "modified_by": "Administrator",
  "module": "Telephony",
  "name": "Incoming Call Handling Schedule",
  "owner": "Administrator",
  "permissions": [],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/telephony/doctype/incoming_call_handling_schedule/incoming_call_handling_schedule.py b/erpnext/telephony/doctype/incoming_call_handling_schedule/incoming_call_handling_schedule.py
index ddc86c4..33d65bd 100644
--- a/erpnext/telephony/doctype/incoming_call_handling_schedule/incoming_call_handling_schedule.py
+++ b/erpnext/telephony/doctype/incoming_call_handling_schedule/incoming_call_handling_schedule.py
@@ -16,9 +16,7 @@
 		from frappe.types import DF
 
 		agent_group: DF.Link
-		day_of_week: DF.Literal[
-			"Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
-		]
+		day_of_week: DF.Literal["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
 		from_time: DF.Time
 		parent: DF.Data
 		parentfield: DF.Data
diff --git a/erpnext/telephony/doctype/incoming_call_settings/incoming_call_settings.json b/erpnext/telephony/doctype/incoming_call_settings/incoming_call_settings.json
index 3ffb3e4..50f477e 100644
--- a/erpnext/telephony/doctype/incoming_call_settings/incoming_call_settings.json
+++ b/erpnext/telephony/doctype/incoming_call_settings/incoming_call_settings.json
@@ -56,7 +56,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-11-19 11:17:14.527862",
+ "modified": "2024-03-27 13:09:50.947071",
  "modified_by": "Administrator",
  "module": "Telephony",
  "name": "Incoming Call Settings",
@@ -76,7 +76,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/telephony/doctype/incoming_call_settings/incoming_call_settings.py b/erpnext/telephony/doctype/incoming_call_settings/incoming_call_settings.py
index f80c2d2..a036533 100644
--- a/erpnext/telephony/doctype/incoming_call_settings/incoming_call_settings.py
+++ b/erpnext/telephony/doctype/incoming_call_settings/incoming_call_settings.py
@@ -3,7 +3,6 @@
 
 
 from datetime import datetime
-from typing import Tuple
 
 import frappe
 from frappe import _
@@ -73,7 +72,7 @@
 					frappe.throw(_("Please fix overlapping time slots for {0}.").format(day))
 
 	@staticmethod
-	def check_timeslots_overlap(ts1: Tuple[int, int], ts2: Tuple[int, int]) -> bool:
+	def check_timeslots_overlap(ts1: tuple[int, int], ts2: tuple[int, int]) -> bool:
 		if (ts1[0] < ts2[0] and ts1[1] <= ts2[0]) or (ts1[0] >= ts2[1] and ts1[1] > ts2[1]):
 			return False
 		return True
diff --git a/erpnext/telephony/doctype/telephony_call_type/telephony_call_type.json b/erpnext/telephony/doctype/telephony_call_type/telephony_call_type.json
index 603709e..3489fa8 100644
--- a/erpnext/telephony/doctype/telephony_call_type/telephony_call_type.json
+++ b/erpnext/telephony/doctype/telephony_call_type/telephony_call_type.json
@@ -32,7 +32,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
- "modified": "2022-02-25 16:14:07.087461",
+ "modified": "2024-03-27 13:10:52.942655",
  "modified_by": "Administrator",
  "module": "Telephony",
  "name": "Telephony Call Type",
@@ -52,7 +52,7 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/telephony/doctype/voice_call_settings/voice_call_settings.json b/erpnext/telephony/doctype/voice_call_settings/voice_call_settings.json
index 25e55a2..4c2e43a 100644
--- a/erpnext/telephony/doctype/voice_call_settings/voice_call_settings.json
+++ b/erpnext/telephony/doctype/voice_call_settings/voice_call_settings.json
@@ -53,7 +53,7 @@
  ],
  "index_web_pages_for_search": 1,
  "links": [],
- "modified": "2020-12-14 18:49:34.600194",
+ "modified": "2024-03-27 13:10:59.080888",
  "modified_by": "Administrator",
  "module": "Telephony",
  "name": "Voice Call Settings",
@@ -118,7 +118,8 @@
    "share": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/templates/pages/order.py b/erpnext/templates/pages/order.py
index 41b1384..d8e6334 100644
--- a/erpnext/templates/pages/order.py
+++ b/erpnext/templates/pages/order.py
@@ -36,9 +36,7 @@
 	context.available_loyalty_points = 0.0
 	if context.doc.get("customer"):
 		# check for the loyalty program of the customer
-		customer_loyalty_program = frappe.db.get_value(
-			"Customer", context.doc.customer, "loyalty_program"
-		)
+		customer_loyalty_program = frappe.db.get_value("Customer", context.doc.customer, "loyalty_program")
 
 		if customer_loyalty_program:
 			from erpnext.accounts.doctype.loyalty_program.loyalty_program import (
@@ -67,9 +65,12 @@
 
 def get_payment_details(doc):
 	show_pay_button, amount = (
-		"payments" in frappe.get_installed_apps()
-		and frappe.db.get_single_value("Buying Settings", "show_pay_button")
-	), 0
+		(
+			"payments" in frappe.get_installed_apps()
+			and frappe.db.get_single_value("Buying Settings", "show_pay_button")
+		),
+		0,
+	)
 	if not show_pay_button:
 		return show_pay_button, amount
 	amount = get_amount(doc)
diff --git a/erpnext/templates/pages/projects.py b/erpnext/templates/pages/projects.py
index 4b3089b..e3e26fc 100644
--- a/erpnext/templates/pages/projects.py
+++ b/erpnext/templates/pages/projects.py
@@ -12,9 +12,7 @@
 		["user", "view_attachments"],
 		as_dict=True,
 	)
-	if frappe.session.user != "Administrator" and (
-		not project_user or frappe.session.user == "Guest"
-	):
+	if frappe.session.user != "Administrator" and (not project_user or frappe.session.user == "Guest"):
 		raise frappe.PermissionError
 
 	context.no_cache = 1
@@ -38,7 +36,7 @@
 def get_tasks(project, start=0, search=None, item_status=None):
 	filters = {"project": project}
 	if search:
-		filters["subject"] = ("like", "%{0}%".format(search))
+		filters["subject"] = ("like", f"%{search}%")
 	tasks = frappe.get_all(
 		"Task",
 		filters=filters,
@@ -83,7 +81,7 @@
 def get_timesheets(project, start=0, search=None):
 	filters = {"project": project}
 	if search:
-		filters["activity_type"] = ("like", "%{0}%".format(search))
+		filters["activity_type"] = ("like", f"%{search}%")
 
 	timesheets = frappe.get_all(
 		"Timesheet Detail",
diff --git a/erpnext/templates/pages/rfq.py b/erpnext/templates/pages/rfq.py
index 4b83642..8431486 100644
--- a/erpnext/templates/pages/rfq.py
+++ b/erpnext/templates/pages/rfq.py
@@ -23,9 +23,7 @@
 
 def get_supplier():
 	doctype = frappe.form_dict.doctype
-	parties_doctype = (
-		"Request for Quotation Supplier" if doctype == "Request for Quotation" else doctype
-	)
+	parties_doctype = "Request for Quotation Supplier" if doctype == "Request for Quotation" else doctype
 	customers, suppliers = get_customers_suppliers(parties_doctype, frappe.session.user)
 
 	return suppliers[0] if suppliers else ""
@@ -44,7 +42,7 @@
 
 def unauthorized_user(supplier):
 	status = check_supplier_has_docname_access(supplier) or False
-	if status == False:
+	if status is False:
 		frappe.throw(_("Not Permitted"), frappe.PermissionError)
 
 
@@ -53,9 +51,7 @@
 	context.doc.currency = supplier_doc.default_currency or frappe.get_cached_value(
 		"Company", context.doc.company, "default_currency"
 	)
-	context.doc.currency_symbol = frappe.db.get_value(
-		"Currency", context.doc.currency, "symbol", cache=True
-	)
+	context.doc.currency_symbol = frappe.db.get_value("Currency", context.doc.currency, "symbol", cache=True)
 	context.doc.number_format = frappe.db.get_value(
 		"Currency", context.doc.currency, "number_format", cache=True
 	)
diff --git a/erpnext/templates/pages/search_help.py b/erpnext/templates/pages/search_help.py
index d158167..18a0a67 100644
--- a/erpnext/templates/pages/search_help.py
+++ b/erpnext/templates/pages/search_help.py
@@ -47,9 +47,7 @@
 
 
 def get_response(api, text):
-	response = requests.get(
-		api.base_url + "/" + api.query_route, data={api.search_term_param_name: text}
-	)
+	response = requests.get(api.base_url + "/" + api.query_route, data={api.search_term_param_name: text})
 
 	response.raise_for_status()
 	return response.json()
diff --git a/erpnext/tests/test_init.py b/erpnext/tests/test_init.py
index 18ce93a..2b4ea9f 100644
--- a/erpnext/tests/test_init.py
+++ b/erpnext/tests/test_init.py
@@ -9,36 +9,35 @@
 
 class TestInit(unittest.TestCase):
 	def test_encode_company_abbr(self):
-
 		abbr = "NFECT"
 
 		names = [
 			"Warehouse Name",
 			"ERPNext Foundation India",
-			"Gold - Member - {a}".format(a=abbr),
-			" - {a}".format(a=abbr),
+			f"Gold - Member - {abbr}",
+			f" - {abbr}",
 			"ERPNext - Foundation - India",
-			"ERPNext Foundation India - {a}".format(a=abbr),
-			"No-Space-{a}".format(a=abbr),
+			f"ERPNext Foundation India - {abbr}",
+			f"No-Space-{abbr}",
 			"- Warehouse",
 		]
 
 		expected_names = [
-			"Warehouse Name - {a}".format(a=abbr),
-			"ERPNext Foundation India - {a}".format(a=abbr),
-			"Gold - Member - {a}".format(a=abbr),
-			" - {a}".format(a=abbr),
-			"ERPNext - Foundation - India - {a}".format(a=abbr),
-			"ERPNext Foundation India - {a}".format(a=abbr),
-			"No-Space-{a} - {a}".format(a=abbr),
-			"- Warehouse - {a}".format(a=abbr),
+			f"Warehouse Name - {abbr}",
+			f"ERPNext Foundation India - {abbr}",
+			f"Gold - Member - {abbr}",
+			f" - {abbr}",
+			f"ERPNext - Foundation - India - {abbr}",
+			f"ERPNext Foundation India - {abbr}",
+			f"No-Space-{abbr} - {abbr}",
+			f"- Warehouse - {abbr}",
 		]
 
 		for i in range(len(names)):
 			enc_name = encode_company_abbr(names[i], abbr=abbr)
 			self.assertTrue(
 				enc_name == expected_names[i],
-				"{enc} is not same as {exp}".format(enc=enc_name, exp=expected_names[i]),
+				f"{enc_name} is not same as {expected_names[i]}",
 			)
 
 	def test_translation_files(self):
diff --git a/erpnext/tests/test_webform.py b/erpnext/tests/test_webform.py
index af50a05..8de0ca6 100644
--- a/erpnext/tests/test_webform.py
+++ b/erpnext/tests/test_webform.py
@@ -47,7 +47,7 @@
 	webform_list_contexts = frappe.get_hooks("webform_list_context")
 	if webform_list_contexts:
 		context = frappe._dict(frappe.get_attr(webform_list_contexts[0])("Buying") or {})
-	kwargs = dict(doctype="Order Assignment", order_by="modified desc")
+	kwargs = dict(doctype="Order Assignment", order_by="creation desc")
 	return context.get_list(**kwargs)
 
 
diff --git a/erpnext/tests/test_zform_loads.py b/erpnext/tests/test_zform_loads.py
index 26e60c0..203a27e 100644
--- a/erpnext/tests/test_zform_loads.py
+++ b/erpnext/tests/test_zform_loads.py
@@ -17,7 +17,7 @@
 		)
 
 		for doctype in doctypes:
-			last_doc = frappe.db.get_value(doctype, {}, "name", order_by="modified desc")
+			last_doc = frappe.db.get_value(doctype, {}, "name", order_by="creation desc")
 			if not last_doc:
 				continue
 			with self.subTest(msg=f"Loading {doctype} - {last_doc}", doctype=doctype, last_doc=last_doc):
diff --git a/erpnext/tests/utils.py b/erpnext/tests/utils.py
index b553a7c..7ed8451 100644
--- a/erpnext/tests/utils.py
+++ b/erpnext/tests/utils.py
@@ -1,12 +1,12 @@
 # Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors
 # License: GNU General Public License v3. See license.txt
 
-from typing import Any, Dict, NewType, Optional
+from typing import Any, NewType
 
 import frappe
 from frappe.core.doctype.report.report import get_report_module_dotted_path
 
-ReportFilters = Dict[str, Any]
+ReportFilters = dict[str, Any]
 ReportName = NewType("ReportName", str)
 
 
@@ -57,8 +57,8 @@
 	report_name: ReportName,
 	module: str,
 	filters: ReportFilters,
-	default_filters: Optional[ReportFilters] = None,
-	optional_filters: Optional[ReportFilters] = None,
+	default_filters: ReportFilters | None = None,
+	optional_filters: ReportFilters | None = None,
 ):
 	"""Util for testing execution of a report with specified filters.
 
@@ -77,9 +77,7 @@
 		default_filters = {}
 
 	test_filters = []
-	report_execute_fn = frappe.get_attr(
-		get_report_module_dotted_path(module, report_name) + ".execute"
-	)
+	report_execute_fn = frappe.get_attr(get_report_module_dotted_path(module, report_name) + ".execute")
 	report_filters = frappe._dict(default_filters).copy().update(filters)
 
 	test_filters.append(report_filters)
diff --git a/erpnext/utilities/activation.py b/erpnext/utilities/activation.py
index 581b53d..1a70c6b 100644
--- a/erpnext/utilities/activation.py
+++ b/erpnext/utilities/activation.py
@@ -54,9 +54,7 @@
 	sales_data.append({"Communication": communication_number})
 
 	# recent login
-	if frappe.db.sql(
-		"select name from tabUser where last_login > date_sub(now(), interval 2 day) limit 1"
-	):
+	if frappe.db.sql("select name from tabUser where last_login > date_sub(now(), interval 2 day) limit 1"):
 		activation_level += 1
 
 	level = {"activation_level": activation_level, "sales_data": sales_data}
diff --git a/erpnext/utilities/bulk_transaction.py b/erpnext/utilities/bulk_transaction.py
index 343a881..bff83f9 100644
--- a/erpnext/utilities/bulk_transaction.py
+++ b/erpnext/utilities/bulk_transaction.py
@@ -18,9 +18,7 @@
 
 	length_of_data = len(deserialized_data)
 
-	frappe.msgprint(
-		_("Started a background job to create {1} {0}").format(to_doctype, length_of_data)
-	)
+	frappe.msgprint(_("Started a background job to create {1} {0}").format(to_doctype, length_of_data))
 	frappe.enqueue(
 		job,
 		deserialized_data=deserialized_data,
@@ -61,7 +59,7 @@
 			try:
 				frappe.db.savepoint("before_creation_state")
 				task(log.transaction_name, log.from_doctype, log.to_doctype)
-			except Exception as e:
+			except Exception:
 				frappe.db.rollback(save_point="before_creation_state")
 				update_log(log.name, "Failed", 1, str(frappe.get_traceback(with_context=True)))
 			else:
@@ -87,7 +85,7 @@
 			doc_name = d.get("name")
 			frappe.db.savepoint("before_creation_state")
 			task(doc_name, from_doctype, to_doctype)
-		except Exception as e:
+		except Exception:
 			frappe.db.rollback(save_point="before_creation_state")
 			fail_count += 1
 			create_log(
@@ -99,9 +97,7 @@
 				log_date=str(date.today()),
 			)
 		else:
-			create_log(
-				doc_name, None, from_doctype, to_doctype, status="Success", log_date=str(date.today())
-			)
+			create_log(doc_name, None, from_doctype, to_doctype, status="Success", log_date=str(date.today()))
 
 	show_job_status(fail_count, len(deserialized_data), to_doctype)
 
diff --git a/erpnext/utilities/doctype/portal_user/portal_user.json b/erpnext/utilities/doctype/portal_user/portal_user.json
index 361166c..842dae9 100644
--- a/erpnext/utilities/doctype/portal_user/portal_user.json
+++ b/erpnext/utilities/doctype/portal_user/portal_user.json
@@ -22,13 +22,13 @@
  "index_web_pages_for_search": 1,
  "istable": 1,
  "links": [],
- "modified": "2023-06-26 14:15:34.695605",
+ "modified": "2024-03-27 13:10:13.951962",
  "modified_by": "Administrator",
  "module": "Utilities",
  "name": "Portal User",
  "owner": "Administrator",
  "permissions": [],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
  "states": []
 }
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/rename_tool/rename_tool.json b/erpnext/utilities/doctype/rename_tool/rename_tool.json
index 617354d..231cfa6 100644
--- a/erpnext/utilities/doctype/rename_tool/rename_tool.json
+++ b/erpnext/utilities/doctype/rename_tool/rename_tool.json
@@ -1,115 +1,53 @@
 {
- "allow_copy": 0, 
- "allow_import": 0, 
- "allow_rename": 0, 
- "creation": "2012-12-03 10:25:59", 
- "custom": 0, 
- "docstatus": 0, 
- "doctype": "DocType", 
+ "actions": [],
+ "creation": "2012-12-03 10:25:59",
+ "doctype": "DocType",
+ "engine": "InnoDB",
+ "field_order": [
+  "select_doctype",
+  "file_to_rename",
+  "rename_log"
+ ],
  "fields": [
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "Type of document to rename.", 
-   "fieldname": "select_doctype", 
-   "fieldtype": "Select", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Select DocType", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "description": "Type of document to rename.",
+   "fieldname": "select_doctype",
+   "fieldtype": "Select",
+   "label": "Select DocType"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "description": "Attach .csv file with two columns, one for the old name and one for the new name", 
-   "fieldname": "file_to_rename", 
-   "fieldtype": "Attach", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "File to Rename", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
-  }, 
+   "description": "Attach .csv file with two columns, one for the old name and one for the new name",
+   "fieldname": "file_to_rename",
+   "fieldtype": "Attach",
+   "label": "File to Rename"
+  },
   {
-   "allow_on_submit": 0, 
-   "bold": 0, 
-   "collapsible": 0, 
-   "fieldname": "rename_log", 
-   "fieldtype": "HTML", 
-   "hidden": 0, 
-   "ignore_user_permissions": 0, 
-   "in_filter": 0, 
-   "in_list_view": 0, 
-   "label": "Rename Log", 
-   "no_copy": 0, 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0, 
-   "set_only_once": 0, 
-   "unique": 0
+   "fieldname": "rename_log",
+   "fieldtype": "HTML",
+   "label": "Rename Log"
   }
- ], 
- "hide_heading": 0, 
- "hide_toolbar": 1, 
- "icon": "fa fa-magic", 
- "idx": 1, 
- "in_create": 0, 
-
- "is_submittable": 0, 
- "issingle": 1, 
- "istable": 0, 
- "max_attachments": 1, 
- "modified": "2015-10-19 03:04:49.097140", 
- "modified_by": "Administrator", 
- "module": "Utilities", 
- "name": "Rename Tool", 
- "owner": "Administrator", 
+ ],
+ "hide_toolbar": 1,
+ "icon": "fa fa-magic",
+ "idx": 1,
+ "issingle": 1,
+ "links": [],
+ "max_attachments": 1,
+ "modified": "2024-03-27 13:10:31.899697",
+ "modified_by": "Administrator",
+ "module": "Utilities",
+ "name": "Rename Tool",
+ "owner": "Administrator",
  "permissions": [
   {
-   "amend": 0, 
-   "apply_user_permissions": 0, 
-   "cancel": 0, 
-   "create": 1, 
-   "delete": 0, 
-   "email": 0, 
-   "export": 0, 
-   "if_owner": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 0, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "set_user_permissions": 0, 
-   "share": 1, 
-   "submit": 0, 
+   "create": 1,
+   "read": 1,
+   "role": "System Manager",
+   "share": 1,
    "write": 1
   }
- ], 
- "read_only": 0, 
- "read_only_onload": 0
+ ],
+ "sort_field": "creation",
+ "sort_order": "DESC",
+ "states": []
 }
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/video/video.json b/erpnext/utilities/doctype/video/video.json
index 2a82db2..b0f7c36 100644
--- a/erpnext/utilities/doctype/video/video.json
+++ b/erpnext/utilities/doctype/video/video.json
@@ -130,7 +130,7 @@
  ],
  "image_field": "image",
  "links": [],
- "modified": "2020-09-07 17:02:20.185794",
+ "modified": "2024-03-27 13:10:58.743905",
  "modified_by": "Administrator",
  "module": "Utilities",
  "name": "Video",
@@ -162,7 +162,8 @@
    "write": 1
   }
  ],
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/utilities/doctype/video/video.py b/erpnext/utilities/doctype/video/video.py
index 875c4e7..bee00a8 100644
--- a/erpnext/utilities/doctype/video/video.py
+++ b/erpnext/utilities/doctype/video/video.py
@@ -112,9 +112,7 @@
 	if not isinstance(url, str):
 		frappe.throw(_("URL can only be a string"), title=_("Invalid URL"))
 
-	pattern = re.compile(
-		r'[a-z\:\//\.]+(youtube|youtu)\.(com|be)/(watch\?v=|embed/|.+\?v=)?([^"&?\s]{11})?'
-	)
+	pattern = re.compile(r'[a-z\:\//\.]+(youtube|youtu)\.(com|be)/(watch\?v=|embed/|.+\?v=)?([^"&?\s]{11})?')
 	id = pattern.match(url)
 	return id.groups()[-1]
 
diff --git a/erpnext/utilities/doctype/video_settings/video_settings.json b/erpnext/utilities/doctype/video_settings/video_settings.json
index fb3274d..ec5c3c5 100644
--- a/erpnext/utilities/doctype/video_settings/video_settings.json
+++ b/erpnext/utilities/doctype/video_settings/video_settings.json
@@ -36,7 +36,7 @@
  "index_web_pages_for_search": 1,
  "issingle": 1,
  "links": [],
- "modified": "2020-09-07 16:09:00.360668",
+ "modified": "2024-03-27 13:10:58.942609",
  "modified_by": "Administrator",
  "module": "Utilities",
  "name": "Video Settings",
@@ -54,7 +54,8 @@
   }
  ],
  "quick_entry": 1,
- "sort_field": "modified",
+ "sort_field": "creation",
  "sort_order": "DESC",
+ "states": [],
  "track_changes": 1
 }
\ No newline at end of file
diff --git a/erpnext/utilities/naming.py b/erpnext/utilities/naming.py
index 52bbade..84079ef 100644
--- a/erpnext/utilities/naming.py
+++ b/erpnext/utilities/naming.py
@@ -6,9 +6,7 @@
 	pass
 
 
-def set_by_naming_series(
-	doctype, fieldname, naming_series, hide_name_field=True, make_mandatory=1
-):
+def set_by_naming_series(doctype, fieldname, naming_series, hide_name_field=True, make_mandatory=1):
 	"""Change a doctype's naming to user naming series"""
 	from frappe.custom.doctype.property_setter.property_setter import make_property_setter
 
@@ -24,9 +22,7 @@
 		try:
 			frappe.db.sql(
 				"""update `tab{doctype}` set naming_series={s} where
-				ifnull(naming_series, '')=''""".format(
-					doctype=doctype, s="%s"
-				),
+				ifnull(naming_series, '')=''""".format(doctype=doctype, s="%s"),
 				get_default_naming_series(doctype),
 			)
 		except NamingSeriesNotSetError:
@@ -34,27 +30,19 @@
 
 		if hide_name_field:
 			make_property_setter(doctype, fieldname, "reqd", 0, "Check", validate_fields_for_doctype=False)
-			make_property_setter(
-				doctype, fieldname, "hidden", 1, "Check", validate_fields_for_doctype=False
-			)
+			make_property_setter(doctype, fieldname, "hidden", 1, "Check", validate_fields_for_doctype=False)
 	else:
-		make_property_setter(
-			doctype, "naming_series", "reqd", 0, "Check", validate_fields_for_doctype=False
-		)
+		make_property_setter(doctype, "naming_series", "reqd", 0, "Check", validate_fields_for_doctype=False)
 		make_property_setter(
 			doctype, "naming_series", "hidden", 1, "Check", validate_fields_for_doctype=False
 		)
 
 		if hide_name_field:
-			make_property_setter(
-				doctype, fieldname, "hidden", 0, "Check", validate_fields_for_doctype=False
-			)
+			make_property_setter(doctype, fieldname, "hidden", 0, "Check", validate_fields_for_doctype=False)
 			make_property_setter(doctype, fieldname, "reqd", 1, "Check", validate_fields_for_doctype=False)
 
 			# set values for mandatory
 			frappe.db.sql(
-				"""update `tab{doctype}` set `{fieldname}`=`name` where
-				ifnull({fieldname}, '')=''""".format(
-					doctype=doctype, fieldname=fieldname
-				)
+				f"""update `tab{doctype}` set `{fieldname}`=`name` where
+				ifnull({fieldname}, '')=''"""
 			)
diff --git a/erpnext/utilities/product.py b/erpnext/utilities/product.py
index 7897c15..029af44 100644
--- a/erpnext/utilities/product.py
+++ b/erpnext/utilities/product.py
@@ -61,7 +61,9 @@
 				if pricing_rule.pricing_rule_for == "Rate":
 					rate_discount = flt(mrp) - flt(pricing_rule.price_list_rate)
 					if rate_discount > 0:
-						price_obj.formatted_discount_rate = fmt_money(rate_discount, currency=price_obj["currency"])
+						price_obj.formatted_discount_rate = fmt_money(
+							rate_discount, currency=price_obj["currency"]
+						)
 					price_obj.price_list_rate = pricing_rule.price_list_rate or 0
 
 			if price_obj:
@@ -131,7 +133,7 @@
 		else:
 			variant_of_query = ""
 
-		query = """
+		query = f"""
 			SELECT
 				t1.parent
 			FROM
@@ -154,9 +156,7 @@
 				t1.parent
 			ORDER BY
 				NULL
-		""".format(
-			attribute_query=attribute_query, variant_of_query=variant_of_query
-		)
+		"""
 
 		item_codes = set([r[0] for r in frappe.db.sql(query, query_values)])
 		items.append(item_codes)
diff --git a/erpnext/utilities/transaction_base.py b/erpnext/utilities/transaction_base.py
index b083614..d89095e 100644
--- a/erpnext/utilities/transaction_base.py
+++ b/erpnext/utilities/transaction_base.py
@@ -58,9 +58,7 @@
 
 	def compare_values(self, ref_doc, fields, doc=None):
 		for reference_doctype, ref_dn_list in ref_doc.items():
-			prev_doc_detail_map = self.get_prev_doc_reference_details(
-				ref_dn_list, reference_doctype, fields
-			)
+			prev_doc_detail_map = self.get_prev_doc_reference_details(ref_dn_list, reference_doctype, fields)
 			for reference_name in ref_dn_list:
 				prevdoc_values = prev_doc_detail_map.get(reference_name)
 				if not prevdoc_values:
diff --git a/erpnext/www/support/index.py b/erpnext/www/support/index.py
index aa00e92..83fb895 100644
--- a/erpnext/www/support/index.py
+++ b/erpnext/www/support/index.py
@@ -76,7 +76,7 @@
 			"Help Article",
 			fields="*",
 			filters={"category": category.name, "published": 1},
-			order_by="modified desc",
+			order_by="creation desc",
 			limit=5,
 		)
 		if help_articles:
diff --git a/pyproject.toml b/pyproject.toml
index 8a0f12c..25db9c3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -28,17 +28,42 @@
 requires = ["flit_core >=3.4,<4"]
 build-backend = "flit_core.buildapi"
 
-[tool.black]
-line-length = 99
-
-[tool.isort]
-line_length = 99
-multi_line_output = 3
-include_trailing_comma = true
-force_grid_wrap = 0
-use_parentheses = true
-ensure_newline_before_comments = true
-indent = "\t"
-
 [tool.bench.frappe-dependencies]
 frappe = ">=16.0.0-dev,<17.0.0"
+
+[tool.ruff]
+line-length = 110
+target-version = "py310"
+
+[tool.ruff.lint]
+select = [
+    "F",
+    "E",
+    "W",
+    "I",
+    "UP",
+    "B",
+    "RUF",
+]
+ignore = [
+    "B017", # assertRaises(Exception) - should be more specific
+    "B018", # useless expression, not assigned to anything
+    "B023", # function doesn't bind loop variable - will have last iteration's value
+    "B904", # raise inside except without from
+    "E101", # indentation contains mixed spaces and tabs
+    "E402", # module level import not at top of file
+    "E501", # line too long
+    "E741", # ambiguous variable name
+    "F401", # "unused" imports
+    "F403", # can't detect undefined names from * import
+    "F405", # can't detect undefined names from * import
+    "F722", # syntax error in forward type annotation
+    "W191", # indentation contains tabs
+    "RUF001", # string contains ambiguous unicode character
+]
+typing-modules = ["frappe.types.DF"]
+
+[tool.ruff.format]
+quote-style = "double"
+indent-style = "tab"
+docstring-code-format = true